diff options
| -rw-r--r-- | ChangeLog | 29 | ||||
| -rw-r--r-- | configure.ac | 24 | ||||
| -rw-r--r-- | ext/Makefile.am | 8 |
3 files changed, 52 insertions, 9 deletions
@@ -1,3 +1,32 @@ +2005-03-26 Chris Lee <clee@kde.org> + + Reviewed by: Ronald S. Bultje <rbultje@ronald.bitfreak.net> + + * configure.ac: + * ext/Makefile.am: + * ext/spc/APU.Asm: + * ext/spc/APU.Inc: + * ext/spc/APU.h: + * ext/spc/DSP.Asm: + * ext/spc/DSP.Inc: + * ext/spc/DSP.h: + * ext/spc/Macro.Inc: + * ext/spc/Makefile.am: + * ext/spc/SPC700.Asm: + * ext/spc/SPC700.Inc: + * ext/spc/SPC700.h: + * ext/spc/Types.h: + * ext/spc/gstspc.c: (gst_spc_get_type), (gst_spc_base_init), + (gst_spc_class_init), (gst_spc_get_formats), + (gst_spc_get_query_types), (gst_spc_init), (gst_spc_query), + (gst_spc_loop), (spc_setup), (gst_spc_change_state), (plugin_init): + * ext/spc/gstspc.h: + * ext/spc/spc.h: + * gst/typefind/gsttypefindfunctions.c: (plugin_init): + Add SPC decoder, based on code from Michael Payne (#141189), + currently pure ASM, needs to be ported over to C at some + point. + 2005-03-26 Ronald S. Bultje <rbultje@ronald.bitfreak.net> * gst/typefind/gsttypefindfunctions.c: (aac_type_find): diff --git a/configure.ac b/configure.ac index 5bcdce4a..618f984e 100644 --- a/configure.ac +++ b/configure.ac @@ -855,14 +855,6 @@ GST_CHECK_FEATURE(CDAUDIO, [cdaudio], cdaudio, [ AC_SUBST(CDAUDIO_LIBS) ]) -dnl *** cdio *** -translit(dnm, m, l) AM_CONDITIONAL(USE_CDIO, true) -GST_CHECK_FEATURE(CDIO, [cdio library], cdio, [ - PKG_CHECK_MODULES(CDIO, libcdio >= 0.71, HAVE_CDIO=yes, HAVE_CDIO=no) - AC_SUBST(CDIO_CFLAGS) - AC_SUBST(CDIO_LIBS) -]) - dnl *** CDParanoia *** translit(dnm, m, l) AM_CONDITIONAL(USE_CDPARANOIA, true) @@ -1617,6 +1609,20 @@ GST_CHECK_FEATURE(LIBPNG, [snapshot plug-in], snapshot, [ AC_SUBST(LIBPNG_LIBS) ]) +dnl *** spc *** +dnl We use our own version of a library, so we only need to have the +dnl right CPU (it's assembler). +translit(dnm, m, l) AM_CONDITIONAL(USE_SPC, true) +GST_CHECK_FEATURE(SPC, [spc decoder], spcdec, [ + if test "x$HAVE_CPU_I386" = "xyes"; then + AC_PATH_PROG(NASM, nasm) + if test x$NASM != x; then + AC_SUBST(NASM) + HAVE_SPC=yes + fi + fi +]) + dnl *** speex >= 1.0.4 or >= 1.1.5 *** dnl 1.1.4 and earlier were not API/ABI compatible with 1.0 dnl 1.1.6 is the first to use a .pc/pkg-config file *** @@ -2061,7 +2067,6 @@ ext/audiofile/Makefile ext/audioresample/Makefile ext/cairo/Makefile ext/cdaudio/Makefile -ext/cdio/Makefile ext/cdparanoia/Makefile ext/dirac/Makefile ext/directfb/Makefile @@ -2111,6 +2116,7 @@ ext/shout2/Makefile ext/sidplay/Makefile ext/smoothwave/Makefile ext/snapshot/Makefile +ext/spc/Makefile ext/speex/Makefile ext/sndfile/Makefile ext/swfdec/Makefile diff --git a/ext/Makefile.am b/ext/Makefile.am index 2c483ebc..d06cb45f 100644 --- a/ext/Makefile.am +++ b/ext/Makefile.am @@ -394,6 +394,12 @@ else SNAPSHOT_DIR= endif +if USE_SPC +SPC_DIR=spc +else +SPC_DIR= +endif + if USE_SPEEX SPEEX_DIR=speex else @@ -465,6 +471,7 @@ SUBDIRS=\ $(SMOOTHWAVE_DIR) \ $(SNAPSHOT_DIR) \ $(SNDFILE_DIR) \ + $(SPC_DIR) \ $(SPEEX_DIR) \ $(SWFDEC_DIR) \ $(TARKIN_DIR) \ @@ -534,6 +541,7 @@ DIST_SUBDIRS=\ shout2 \ sidplay \ smoothwave \ + spc \ speex \ swfdec \ tarkin \ |