changes to accomodate the standardization of installed libs some left over changes

Original commit message from CVS:

changes to accomodate the standardization of installed libs
some left over changes

5 files changed, 97 insertions, 18 deletions

diff --git a/TODO b/TODO
index a07953a7..f229dcaf 100644
--- a/TODO
+++ b/TODO
@@ -14,3 +14,6 @@
   add plugins with AC stuff (maybe from bits ?)
   write script that builds rpm's one from one
   get postun script right; gstreamer-register should be installed for example
+
+* check options in a52, it has some arch stuff and some opti stuff that 
+  looks dodgy
diff --git a/configure.ac b/configure.ac
index 2a71e19d..89fe6d4e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -413,10 +413,10 @@ echo
 echo
 AC_MSG_NOTICE(Checking for plugin libraries)
 
-dnl *** a52dec ***
-translit(dnm, m, l) AM_CONDITIONAL(USE_A52DEC, true)
-GST_CHECK_FEATURE(A52DEC, [a52dec], a52dec, [
-  GST_CHECK_LIBHEADER(A52DEC, a52, a52_init, -lm, a52dec/a52.h, A52DEC_LIBS="-la52")
+dnl *** a52 ***
+translit(dnm, m, l) AM_CONDITIONAL(USE_A52, true)
+GST_CHECK_FEATURE(A52, [a52], a52dec, [
+  GST_CHECK_LIBHEADER(A52, a52, a52_init, -lm, a52dec/a52.h, A52_LIBS="-la52")
 ])
 
 dnl *** aalib ***
@@ -951,10 +951,6 @@ if test "x$HAVE_LIBMIKMOD" = xyes; then
   AC_DEFINE(HAVE_LIBMIKMOD)
 fi
 
-if test "x$HAVE_AALIB" = "xyes"; then
-  AC_DEFINE(HAVE_AALIB)
-fi
-
 if test "x$HAVE_LIBJPEG" = xyes; then
   AC_DEFINE(HAVE_LIBJPEG)
 fi
@@ -1046,7 +1042,6 @@ AM_CONDITIONAL(HAVE_ARTS,           test "x$HAVE_ARTS" = "xyes")
 AM_CONDITIONAL(HAVE_XMMS,           test "x$HAVE_XMMS" = "xyes")
 AM_CONDITIONAL(HAVE_RAW1394,        test "x$HAVE_RAW1394" = "xyes")
 AM_CONDITIONAL(HAVE_LIBDV,          test "x$HAVE_LIBDV" = "xyes")
-AM_CONDITIONAL(HAVE_AALIB,          test "x$HAVE_AALIB" = "xyes")
 AM_CONDITIONAL(HAVE_GNOME_VFS,      test "x$HAVE_GNOME_VFS" = "xyes")
 AM_CONDITIONAL(HAVE_LIBOPENQUICKTIME, test "x$HAVE_LIBOPENQUICKTIME" = "xyes")
 AM_CONDITIONAL(HAVE_LIBGSM,         test "x$HAVE_LIBGSM" = "xyes")
@@ -1090,6 +1085,7 @@ dnl Vars for everyone else
 dnl FIXME: is there a reason to add this top_builddir stuff ? don't think so
 dnl GST_LIBS="\$(top_builddir)/gst/libgst.la $LIBGST_LIBS"
 dnl GST_CFLAGS="-I\$(top_srcdir) -I\$(top_srcdir)/include $LIBGST_CFLAGS"
+GST_CFLAGS="$GST_CFLAGS -I\$(top_srcdir)/gst-libs"
 AC_SUBST(GST_LIBS)
 AC_SUBST(GST_CFLAGS)
 
@@ -1154,6 +1150,8 @@ sys/vcd/Makefile
 sys/vga/Makefile
 sys/xvideo/Makefile
 ext/Makefile
+ext/a52/Makefile
+ext/aalib/Makefile
 ext/audiofile/Makefile
 ext/esd/Makefile
 ext/lame/Makefile
@@ -1161,7 +1159,8 @@ ext/mad/Makefile
 ext/sdl/Makefile
 ext/vorbis/Makefile
 gst-libs/Makefile
-gst-libs/audio/Makefile
+gst-libs/gst/Makefile
+gst-libs/gst/audio/Makefile
 gst-plugins.spec
 )
 
diff --git a/ext/Makefile.am b/ext/Makefile.am
index 3d1dd792..2b2aca01 100644
--- a/ext/Makefile.am
+++ b/ext/Makefile.am
@@ -1,3 +1,15 @@
+if USE_A52
+A52_DIR=a52
+else
+A52_DIR=
+endif
+
+if USE_AALIB
+AALIB_DIR=aalib
+else
+AALIB_DIR=
+endif
+
 if USE_AUDIOFILE
 AUDIOFILE_DIR=audiofile
 else
@@ -35,7 +47,8 @@ VORBIS_DIR=
 endif
 
 
-SUBDIRS=$(AUDIOFILE_DIR) $(ESD_DIR) $(LAME_DIR) $(MAD_DIR) \
+SUBDIRS=$(A52_DIR) $(AALIB_DIR) $(AUDIOFILE_DIR) $(ESD_DIR) \
+        $(LAME_DIR) $(MAD_DIR) \
 	$(SDL_DIR) $(VORBIS_DIR)
 
-DIST_SUBDIRS=audiofile esd lame mad sdl vorbis
+DIST_SUBDIRS=a52 aalib audiofile esd lame mad sdl vorbis
diff --git a/ext/audiofile/gstafsrc.c b/ext/audiofile/gstafsrc.c
index ceb548f6..b6538a6d 100644
--- a/ext/audiofile/gstafsrc.c
+++ b/ext/audiofile/gstafsrc.c
@@ -22,7 +22,7 @@
 
 
 #include <gst/gst.h>
-#include <gst-libs/audio/gstaudio.h>
+#include <gst/audio/audio.h>
 #include "gstafsrc.h"
 
 
diff --git a/gst-plugins.spec.in b/gst-plugins.spec.in
index dcbe9315..d8297da6 100644
--- a/gst-plugins.spec.in
+++ b/gst-plugins.spec.in
@@ -62,11 +62,75 @@ make prefix=$RPM_BUILD_ROOT%{prefix} install
 @USE_ESD_TRUE@%files -n gstreamer-esd
 @USE_ESD_TRUE@%defattr(-, root, root)
 @USE_ESD_TRUE@%{prefix}/lib/gst/libesd*
+@USE_ESD_TRUE@
+@USE_ESD_TRUE@%post -n gstreamer-esd
+@USE_ESD_TRUE@%{prefix}/bin/gstreamer-register --gst-mask=0
+@USE_ESD_TRUE@
+@USE_ESD_TRUE@%postun -n gstreamer-esd
+@USE_ESD_TRUE@%{prefix}/bin/gstreamer-register --gst-mask=0
+@USE_ESD_TRUE@/sbin/ldconfig
 
-%post -n gstreamer-esd
-%{prefix}/bin/gstreamer-register --gst-mask=0
+### MAD ###
+@USE_MAD_TRUE@%package -n gstreamer-mad  
+@USE_MAD_TRUE@Summary: Plugin using MAD for mp3 decoding
+@USE_MAD_TRUE@Group: Libraries/Multimedia
+@USE_MAD_TRUE@Requires: %{name} = %{ver}
+@USE_MAD_TRUE@Requires: mad >= 0.13.0
+@USE_MAD_TRUE@
+@USE_MAD_TRUE@%description -n gstreamer-mad
+@USE_MAD_TRUE@Plugin for playback of mp3 songs using the very good MAD library
+@USE_MAD_TRUE@
+@USE_MAD_TRUE@%files -n gstreamer-mad
+@USE_MAD_TRUE@%defattr(-, root, root)  
+@USE_MAD_TRUE@%{prefix}/lib/gst/libgstmad*
+@USE_MAD_TRUE@
+@USE_MAD_TRUE@%post -n gstreamer-mad
+@USE_MAD_TRUE@%{prefix}/bin/gstreamer-register --gst-mask=0
+@USE_MAD_TRUE@
+@USE_MAD_TRUE@%postun -n gstreamer-mad
+@USE_MAD_TRUE@%{prefix}/bin/gstreamer-register --gst-mask=0
+@USE_MAD_TRUE@/sbin/ldconfig
 
-%postun -n gstreamer-esd
-%{prefix}/bin/gstreamer-register --gst-mask=0
-/sbin/ldconfig
+### OSS ###
+@USE_OSS_TRUE@%package -n gstreamer-oss
+@USE_OSS_TRUE@Summary: Gstreamer plugins for input and output using OSS
+@USE_OSS_TRUE@Group: Libraries/Multimedia
+@USE_OSS_TRUE@Requires: %{name} = %{ver}
+@USE_OSS_TRUE@
+@USE_OSS_TRUE@%description -n gstreamer-oss 
+@USE_OSS_TRUE@Plugins for output and input to the OpenSoundSytem audio
+@USE_OSS_TRUE@drivers found in the Linux kernels or commercially available
+@USE_OSS_TRUE@from OpenSound.
+@USE_OSS_TRUE@
+@USE_OSS_TRUE@%files -n gstreamer-oss
+@USE_OSS_TRUE@%defattr(-, root, root)
+@USE_OSS_TRUE@%{prefix}/lib/gst/libgstoss*
+@USE_OSS_TRUE@
+@USE_OSS_TRUE@%post -n gstreamer-oss
+@USE_OSS_TRUE@%{prefix}/bin/gstreamer-register --gst-mask=0
+@USE_OSS_TRUE@
+@USE_OSS_TRUE@%postun -n gstreamer-oss
+@USE_OSS_TRUE@%{prefix}/bin/gstreamer-register --gst-mask=0
+@USE_OSS_TRUE@/sbin/ldconfig
 
+### Vorbis ###
+@USE_VORBIS_TRUE@%package -n gstreamer-vorbis
+@USE_VORBIS_TRUE@Summary: Gstreamer plugin for encoding and decoding Ogg Vorbis audio files
+@USE_VORBIS_TRUE@Group: Libraries/Multimedia
+@USE_VORBIS_TRUE@Requires: libogg >= 1.0beta4
+@USE_VORBIS_TRUE@Requires: libvorbis >= 1.0beta4
+@USE_VORBIS_TRUE@Requires: %{name} = %{ver}
+@USE_VORBIS_TRUE@
+@USE_VORBIS_TRUE@%description -n gstreamer-vorbis
+@USE_VORBIS_TRUE@Plugins for creating and playing Ogg Vorbis audio files.
+@USE_VORBIS_TRUE@
+@USE_VORBIS_TRUE@%files -n gstreamer-vorbis  
+@USE_VORBIS_TRUE@%defattr(-, root, root)
+@USE_VORBIS_TRUE@%{prefix}/lib/gst/libgstvorbis*
+@USE_VORBIS_TRUE@
+@USE_VORBIS_TRUE@%post -n gstreamer-vorbis
+@USE_VORBIS_TRUE@%{prefix}/bin/gstreamer-register --gst-mask=0
+@USE_VORBIS_TRUE@
+@USE_VORBIS_TRUE@%postun -n gstreamer-vorbis
+@USE_VORBIS_TRUE@%{prefix}/bin/gstreamer-register --gst-mask=0
+@USE_VORBIS_TRUE@/sbin/ldconfig