Pull patches from HEADBRANCH_RELEASE-0_7_2

Original commit message from CVS:
Pull patches from HEAD

6 files changed, 145 insertions, 69 deletions

diff --git a/configure.ac b/configure.ac
index 05395073b..f6bd6e693 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ AM_MAINTAINER_MODE
 
 dnl when going to/from release please set the nano (fourth number) right !
 dnl releases only do Wall, cvs and prerelease does Werror too
-AS_VERSION(gst-plugins, GST_PLUGINS_VERSION, 0, 7, 1, 1, GST_CVS="no", GST_CVS="yes")
+AS_VERSION(gst-plugins, GST_PLUGINS_VERSION, 0, 7, 1, 2, GST_CVS="no", GST_CVS="yes")
 
 dnl add a suffix to apps
 if test x$program_suffix = xNONE ; then
@@ -30,7 +30,7 @@ dnl - library source changed -> increment REVISION
 dnl - interfaces added/removed/changed -> increment CURRENT, REVISION = 0
 dnl - interfaces added -> increment AGE
 dnl - interfaces removed -> AGE = 0
-AS_LIBTOOL(GST_PLUGINS, 1, 0, 0)
+AS_LIBTOOL(GST_PLUGINS, 2, 0, 0)
 
 dnl FIXME take something else ?
 AC_CONFIG_SRCDIR([gst/law/alaw.c])
@@ -778,7 +778,7 @@ GST_CHECK_FEATURE(FAAC, [AAC encoder plug-in], faac, [
 dnl **** Free AAC Decoder (FAAD) ****
 translit(dnm, m, l) AM_CONDITIONAL(USE_FAAD, true)
 GST_CHECK_FEATURE(FAAD, [AAC decoder plug-in], faad, [
-  GST_CHECK_LIBHEADER(FAAD, faad, faacDecOpen, , faad.h, FAAD_LIBS="-lfaad")
+  GST_CHECK_LIBHEADER(FAAD, faad, faacDecOpen, -lm, faad.h, FAAD_LIBS="-lfaad -lm")
   AS_SCRUB_INCLUDE(FAAD_CFLAGS)
   AC_SUBST(FAAD_LIBS)
 ])
@@ -970,16 +970,15 @@ dnl FIXME: we could use header checks here as well IMO
 translit(dnm, m, l) AM_CONDITIONAL(USE_MAD, true)
 GST_CHECK_FEATURE(MAD, [mad mp3 decoder], mad, [
   dnl check with pkg-config first
-  PKG_CHECK_MODULES(MAD, mad id3tag, HAVE_MAD="yes", HAVE_MAD="no")
+  PKG_CHECK_MODULES(MAD, mad >= 0.15 id3tag >= 0.15, HAVE_MAD="yes", HAVE_MAD="no")
   if test "x$HAVE_MAD" = "xno"; then
     dnl fall back to oldskool detection
     AC_CHECK_LIB(mad, mad_decoder_finish, HAVE_MAD="yes" MAD_LIBS="-lmad")
     if test "x$HAVE_MAD" = "xyes"; then
-      # installed with mad >= 0.14
       HAVE_MAD="no"
       save_libs=$LIBS
       LIBS="-lz"
-      AC_CHECK_LIB(id3tag, id3_tag_query, HAVE_MAD="yes" MAD_LIBS="$MAD_LIBS -lid3tag")
+      AC_CHECK_LIB(id3tag, id3_tag_options, HAVE_MAD="yes" MAD_LIBS="-lmad -lid3tag -lz")
       LIBS=$save_LIBS
     fi
   fi    
diff --git a/gst-libs/ext/ffmpeg/Makefile.am b/gst-libs/ext/ffmpeg/Makefile.am
index 0a7a076d0..70496806e 100644
--- a/gst-libs/ext/ffmpeg/Makefile.am
+++ b/gst-libs/ext/ffmpeg/Makefile.am
@@ -25,43 +25,6 @@ patches:
 
 SUBDIRS =
 
-EXTRA_DIST = \
-	$(PATCHES) \
-	Tag \
-	ffmpeg/CREDITS \
-	ffmpeg/INSTALL \
-	ffmpeg/README \
-	ffmpeg/config.mak \
-	ffmpeg/configure \
-	ffmpeg/cygwin_inttypes.h \
-	ffmpeg/ffserver.h \
-	ffmpeg/ffmpeg.c \
-	ffmpeg/ffserver.c \
-	ffmpeg/berrno.h \
-	ffmpeg/config.h \
-	ffmpeg/libavcodec/alpha/*.c \
-	ffmpeg/libavcodec/alpha/*.h \
-	ffmpeg/libavcodec/alpha/*.S \
-	ffmpeg/libavcodec/armv4l/*.c \
-	ffmpeg/libavcodec/armv4l/*.S \
-	ffmpeg/libavcodec/i386/*.c \
-	ffmpeg/libavcodec/i386/*.h \
-	ffmpeg/libavcodec/liba52/*.c \
-	ffmpeg/libavcodec/liba52/*.h \
-	ffmpeg/libavcodec/ppc/*.c \
-	ffmpeg/libavcodec/ppc/*.h \
-	ffmpeg/libavcodec/ps2/*.c \
-	ffmpeg/libavcodec/ps2/*.h \
-	ffmpeg/libavcodec/*.c \
-	ffmpeg/libavcodec/*.h \
-	ffmpeg/libavformat/*.c \
-	ffmpeg/libavformat/*.h \
-	ffmpeg/tests/*.c \
-	ffmpeg/tests/*.ref \
-	ffmpeg/tests/*.sh \
-	ffmpeg/tests/test.conf \
-	ffmpeg/vhook/*.c
-
 
 checkout:
 	cvs -d:pserver:anonymous@mplayerhq.hu:/cvsroot/ffmpeg co ffmpeg
@@ -164,9 +127,7 @@ libavformat_la_CFLAGS = $(defs) -Wall -I$(srcdir) -I$(srcdir)/ffmpeg \
 	-I$(top_srcdir)/gst-libs/ext/linux/ -DHAVE_AV_CONFIG_H \
 	-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
 
-
-if HAVE_CPU_I386
-sources_i386 = \
+files_i386 = \
 	ffmpeg/libavcodec/i386/cputest.c \
 	ffmpeg/libavcodec/i386/dsputil_mmx.c \
 	ffmpeg/libavcodec/i386/fdct_mmx.c \
@@ -175,12 +136,14 @@ sources_i386 = \
 	ffmpeg/libavcodec/i386/motion_est_mmx.c \
 	ffmpeg/libavcodec/i386/mpegvideo_mmx.c \
 	ffmpeg/libavcodec/i386/simple_idct_mmx.c
+
+if HAVE_CPU_I386
+sources_i386 = $(files_i386)
 else
 sources_i386 = 
 endif
 
-if HAVE_CPU_PPC
-sources_powerpc = \
+files_powerpc = \
 	ffmpeg/libavcodec/ppc/dsputil_ppc.c \
 	ffmpeg/libavcodec/ppc/mpegvideo_ppc.c
 # disabled Altivec support for now until someone shows up that make them compile conditionally
@@ -189,6 +152,8 @@ sources_powerpc = \
 #	ffmpeg/libavcodec/ppc/gmc_altivec.c \
 #	ffmpeg/libavcodec/ppc/idct_altivec.c \
 #	ffmpeg/libavcodec/ppc/mpegvideo_altivec.c
+if HAVE_CPU_PPC
+sources_powerpc = $(files_powerpc)
 else
 sources_powerpc =
 endif
@@ -270,3 +235,86 @@ libavcodec_la_SOURCES = \
 	$(sources_i386) \
 	$(sources_powerpc)
 
+more_libavcodec_files = \
+	ffmpeg/libavcodec/mdec.c \
+	ffmpeg/libavcodec/motion_est_template.c \
+	ffmpeg/libavcodec/svq3.c \
+	ffmpeg/libavcodec/wmv2.c 
+
+
+all_headers = \
+	ffmpeg/berrno.h \
+	ffmpeg/cmdutils.h \
+	ffmpeg/cygwin_inttypes.h \
+	ffmpeg/ffserver.h \
+	ffmpeg/xvmc_render.h \
+	ffmpeg/libavcodec/ac3.h \
+	ffmpeg/libavcodec/ac3tab.h \
+	ffmpeg/libavcodec/avcodec.h \
+	ffmpeg/libavcodec/bswap.h \
+	ffmpeg/libavcodec/cabac.h \
+	ffmpeg/libavcodec/common.h \
+	ffmpeg/libavcodec/dsputil.h \
+	ffmpeg/libavcodec/dvdata.h \
+	ffmpeg/libavcodec/faandct.h \
+	ffmpeg/libavcodec/fastmemcpy.h \
+	ffmpeg/libavcodec/golomb.h \
+	ffmpeg/libavcodec/h263data.h \
+	ffmpeg/libavcodec/h264data.h \
+	ffmpeg/libavcodec/imgconvert_template.h \
+	ffmpeg/libavcodec/indeo3data.h \
+	ffmpeg/libavcodec/mpeg12data.h \
+	ffmpeg/libavcodec/mpeg4data.h \
+	ffmpeg/libavcodec/mpegaudio.h \
+	ffmpeg/libavcodec/mpegaudiodectab.h \
+	ffmpeg/libavcodec/mpegaudiotab.h \
+	ffmpeg/libavcodec/mpegvideo.h \
+	ffmpeg/libavcodec/msmpeg4data.h \
+	ffmpeg/libavcodec/oggvorbis.h \
+	ffmpeg/libavcodec/ra144.h \
+	ffmpeg/libavcodec/ra288.h \
+	ffmpeg/libavcodec/rational.h \
+	ffmpeg/libavcodec/simple_idct.h \
+	ffmpeg/libavcodec/sp5x.h \
+	ffmpeg/libavcodec/svq1_cb.h \
+	ffmpeg/libavcodec/svq1_vlc.h \
+	ffmpeg/libavcodec/vp3data.h \
+	ffmpeg/libavcodec/wmadata.h \
+	ffmpeg/libavcodec/i386/dsputil_mmx_avg.h \
+	ffmpeg/libavcodec/i386/dsputil_mmx_rnd.h \
+	ffmpeg/libavcodec/i386/mmx.h \
+	ffmpeg/libavcodec/ppc/dsputil_altivec.h \
+	ffmpeg/libavcodec/ppc/dsputil_ppc.h \
+	ffmpeg/libavcodec/ppc/gcc_fixes.h \
+	ffmpeg/libavformat/avformat.h \
+	ffmpeg/libavformat/avi.h \
+	ffmpeg/libavformat/avio.h \
+	ffmpeg/libavformat/barpainet.h \
+	ffmpeg/libavformat/dv.h \
+	ffmpeg/libavformat/dv1394.h \
+	ffmpeg/libavformat/framehook.h \
+	ffmpeg/libavformat/mpegts.h \
+	ffmpeg/libavformat/os_support.h \
+	ffmpeg/libavformat/rtp.h \
+	ffmpeg/libavformat/rtsp.h \
+	ffmpeg/libavformat/rtspcodes.h 
+
+DISTCLEANFILES = \
+	ffmpeg/config.h \
+	ffmpeg/config.mak 
+
+EXTRA_DIST = \
+	$(PATCHES) \
+	Tag \
+	ffmpeg/CREDITS \
+	ffmpeg/INSTALL \
+	ffmpeg/README \
+	ffmpeg/configure \
+	ffmpeg/ffmpeg.c \
+	ffmpeg/ffserver.c \
+	$(libavcodec_la_SOURCES) \
+	$(more_libavcodec_files) \
+	$(libavformat_la_SOURCES) \
+	$(files_i386) \
+	$(files_powerpc) \
+	$(all_headers) 
diff --git a/gst-plugins.spec.in b/gst-plugins.spec.in
index 6cb09758d..3033e3dbc 100644
--- a/gst-plugins.spec.in
+++ b/gst-plugins.spec.in
@@ -63,7 +63,6 @@ BuildRequires:	gstreamer-tools >= 0.6.1
 @USE_GCONF_TRUE@BuildRequires: 	GConf2-devel
 # Snapshot plugin
 @USE_HERMES_TRUE@@USE_LIBPNG_TRUE@Requires:	libpng
-@USE_HERMES_TRUE@@USE_LIBPNG_TRUE@Requires:	gstreamer-colorspace = %{version}
 
 Obsoletes:	gstreamer-plugin-libs
 Obsoletes:	gstreamer-arts
@@ -164,6 +163,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT%{_includedir}/gstreamer-%{majorminor}/gst/media-info/media-info.h
 rm -f $RPM_BUILD_ROOT%{_libdir}/libgstmedia-info*.so.0.0.0
+rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/2.2.0/loaders/gst_loader.la
 
 
 %clean
@@ -182,9 +182,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libgstmedia-info*.so.0.0.0
 %{_libdir}/gstreamer-%{majorminor}/libgstidct.so
 %{_libdir}/gstreamer-%{majorminor}/libgstriff.so
 %{_libdir}/gstreamer-%{majorminor}/libgstvideo.so
-%{_libdir}/libgstmixer.so
 %{_libdir}/gstreamer-%{majorminor}/libgstid3types.so
-%{_libdir}/gstreamer-%{majorminor}/libgstmpegtypes.so
 %{_libdir}/gstreamer-%{majorminor}/libgstvideodrop.so
 # non-core plugins without external dependencies
 %{_libdir}/gstreamer-%{majorminor}/libgstresample.so
@@ -247,8 +245,6 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libgstmedia-info*.so.0.0.0
 %{_libdir}/gstreamer-%{majorminor}/libgstmpegaudioparse.so
 %{_libdir}/gstreamer-%{majorminor}/libgstmp1videoparse.so
 %{_libdir}/gstreamer-%{majorminor}/libgstmpegstream.so
-%{_libdir}/gstreamer-%{majorminor}/libgstmpeg2enc.so
-%{_libdir}/gstreamer-%{majorminor}/libgstmpeg2dec.so
 %{_libdir}/gstreamer-%{majorminor}/libgstmpeg2subt.so
 %{_libdir}/gstreamer-%{majorminor}/libgstmplex.so
 %{_libdir}/gstreamer-%{majorminor}/libgstoverlay.so
@@ -257,10 +253,14 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libgstmedia-info*.so.0.0.0
 %{_libdir}/gstreamer-%{majorminor}/libgsttextoverlay.so
 %{_libdir}/gstreamer-%{majorminor}/libgstffmpeg.so
 %{_libdir}/gstreamer-%{majorminor}/libgstxwindowlistener.*
-%{_libdir}/libgstcolorbalance.so
-%{_libdir}/libgsttuner.so
-%{_libdir}/libgstxoverlay.so
-
+%{_libdir}/gstreamer-%{majorminor}/libgstgnomevfs.so
+%{_libdir}/gstreamer-%{majorminor}/libgstmatroska.so
+%{_libdir}/gstreamer-%{majorminor}/libgstnavigationtest.so
+%{_libdir}/gstreamer-%{majorminor}/libgsttypefindfunctions.so
+%{_libdir}/gstreamer-%{majorminor}/libgstximagesink.so
+%{_libdir}/gstreamer-%{majorminor}/libgstxvimagesink.so
+%{_libdir}/gtk-2.0/2.2.0/loaders/gst_loader.so
+%{_libdir}/libgstinterfaces-%{majorminor}.so*
 
 # non-core plugins with external dependencies
 @USE_ARTS_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstarts.so
@@ -268,8 +268,8 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libgstmedia-info*.so.0.0.0
 @USE_AUDIOFILE_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstaudiofile.so
 @USE_CDPARANOIA_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstcdparanoia.so
 @USE_ESD_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstesd.so
-@USE_GNOME_VFS_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstgnomevfssrc.so
-@USE_GNOME_VFS_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstgnomevfssink.so
+# @USE_GNOME_VFS_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstgnomevfssrc.so
+# @USE_GNOME_VFS_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstgnomevfssink.so
 @USE_JPEG_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstjpeg.so
 @USE_MIKMOD_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstmikmod.so
 @USE_SDL_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstsdlvideosink.so
@@ -321,11 +321,12 @@ GStreamer support libraries header files.
 %{_includedir}/gstreamer-%{majorminor}/gst/tuner/tunernorm.h
 %{_includedir}/gstreamer-%{majorminor}/gst/xoverlay/xoverlay.h
 %{_includedir}/gstreamer-%{majorminor}/gst/xwindowlistener/xwindowlistener.h
+%{_includedir}/gstreamer-%{majorminor}/gst/propertyprobe/propertyprobe.h
 %{_libdir}/pkgconfig/gstreamer-libs-%{majorminor}.pc
 %{_libdir}/pkgconfig/gstreamer-play-%{majorminor}.pc
+%{_libdir}/pkgconfig/gstreamer-interfaces-%{majorminor}.pc
 @USE_GCONF_TRUE@%{_libdir}/libgstgconf-%{majorminor}.so
 %{_libdir}/libgstplay-%{majorminor}.so
-%{_libdir}/libgstnavigation.so
 
 # Here are all the packages depending on external libs #
 
@@ -425,19 +426,17 @@ GStreamer support libraries header files.
 Summary:       GStreamer plug-in for AVI movie playback.
 Group:         Libraries/Multimedia
 Requires:      gstreamer-plugins = %{version}
-Requires:      gstreamer-colorspace = %{version}
 
 %description -n gstreamer-avi
 Plug-ins for playback of AVI format media files.
-
+ 
 %files -n gstreamer-avi
 %defattr(-, root, root)
-%{_libdir}/gstreamer-%{majorminor}/libgstavidemux.so
-%{_libdir}/gstreamer-%{majorminor}/libgstavimux.so
+%{_libdir}/gstreamer-%{majorminor}/libgstavi.so
 
 %post -n gstreamer-avi
 %{_bindir}/gst-register-%{majorminor} > /dev/null 2> /dev/null
-### %{_bindir}/gst-compprep > /dev/null 2> /dev/null
+# %{_bindir}/gst-compprep > /dev/null 2> /dev/null
 
 %postun -n gstreamer-avi
 %{_bindir}/gst-register-%{majorminor} > /dev/null 2> /dev/null
@@ -741,7 +740,7 @@ Plug-ins for playback of AVI format media files.
 @USE_MPEG2DEC_TRUE@
 @USE_MPEG2DEC_TRUE@%files -n gstreamer-mpeg
 @USE_MPEG2DEC_TRUE@%defattr(-, root, root)
-@USE_MPEG2DEC_TRUE@/usr/lib/gstreamer-0.7/libgstmpeg2dec.so
+@USE_MPEG2DEC_TRUE@/usr/lib/gstreamer-%{majorminor}/libgstmpeg2dec.so
 @USE_MPEG2DEC_TRUE@%post -n  gstreamer-mpeg
 @USE_MPEG2DEC_TRUE@%{_bindir}/gst-register-%{majorminor} > /dev/null 2> /dev/null
 @USE_MPEG2DEC_TRUE@### %{_bindir}/gst-compprep > /dev/null 2> /dev/null
@@ -750,6 +749,28 @@ Plug-ins for playback of AVI format media files.
 @USE_MPEG2DEC_TRUE@%{_bindir}/gst-register-%{majorminor} > /dev/null 2> /dev/null
 @USE_MPEG2DEC_TRUE@### %{_bindir}/gst-compprep > /dev/null 2> /dev/null
 
+### FAAD ###
+@USE_FAAD_TRUE@%package -n gstreamer-faad
+@USE_FAAD_TRUE@Summary:GStreamer plug-ins for AAC audio playback.
+@USE_FAAD_TRUE@Group:         Libraries/Multimedia
+@USE_FAAD_TRUE@Requires:      gstreamer-plugins = %{version}
+@USE_FAAD_TRUE@Requires:      faad2 => 2.0
+@USE_FAAD_TRUE@BuildRequires: faad2-devel => 2.0
+@USE_FAAD_TRUE@
+@USE_FAAD_TRUE@%description -n gstreamer-faad
+@USE_FAAD_TRUE@Plug-ins for playing AAC audio
+@USE_FAAD_TRUE@
+@USE_FAAD_TRUE@%files -n gstreamer-faad
+@USE_FAAD_TRUE@%defattr(-, root, root)
+@USE_FAAD_TRUE@/usr/lib/gstreamer-%{majorminor}/libgstfaad.so
+@USE_FAAD_TRUE@%post -n  gstreamer-faad
+@USE_FAAD_TRUE@%{_bindir}/gst-register-%{majorminor} > /dev/null 2> /dev/null
+@USE_FAAD_TRUE@### %{_bindir}/gst-compprep > /dev/null 2> /dev/null
+@USE_FAAD_TRUE@
+@USE_FAAD_TRUE@%postun -n  gstreamer-faad
+@USE_FAAD_TRUE@%{_bindir}/gst-register-%{majorminor} > /dev/null 2> /dev/null
+@USE_FAAD_TRUE@### %{_bindir}/gst-compprep > /dev/null 2> /dev/null
+
 ### SIDPLAY ###
 @USE_SIDPLAY_TRUE@%package -n gstreamer-sid
 @USE_SIDPLAY_TRUE@Summary:       GStreamer Sid C64 music plug-in.
@@ -823,7 +844,6 @@ Plug-ins for playback of AVI format media files.
 Summary:        GStreamer plug-in for asf video format.
 Group:          Libraries/Multimedia
 Requires:       gstreamer-plugins = %{version}
-Requires:       gstreamer-colorspace = %{version}
 %description -n gstreamer-asf
 Plug-in for playing ASF movies under GStreamer.
                                                                                 
@@ -839,6 +859,9 @@ Plug-in for playing ASF movies under GStreamer.
 
 
 %changelog
+* Sun Nov 23 2003 Christian Schaller <Uraeus@gnome.org>
+- Update spec file for latest changes
+- add faad plugin
 * Thu Oct 16 2003 Christian Schaller <Uraeus@gnome.org>
 - Add new colorbalance and tuner and xoverlay stuff
 - Change name of kde-audio-devel to arts-devel
diff --git a/m4/as-slurp-ffmpeg.m4 b/m4/as-slurp-ffmpeg.m4
index a3398420e..0df909c65 100644
--- a/m4/as-slurp-ffmpeg.m4
+++ b/m4/as-slurp-ffmpeg.m4
@@ -22,7 +22,10 @@ AC_DEFUN(AS_SLURP_FFMPEG,
   DIRECTORY=`pwd`
   # get/update cvs
   if test ! -d $1; then mkdir -p $1; fi
-  cd $1
+  dnl we need to check $srcdir/$1 or it will always checkout ffmpeg even if it is there
+  dnl at least when top_srcdir != top_builddir.
+  dnl FIXME: unfortunately this makes the checkout go into top_srcdir
+  cd $srcdir/$1
 
   if test ! -e ffmpeg/README; then
     # check out cvs code
diff --git a/pkgconfig/Makefile.am b/pkgconfig/Makefile.am
index bd89d68ea..808545ae4 100644
--- a/pkgconfig/Makefile.am
+++ b/pkgconfig/Makefile.am
@@ -42,7 +42,7 @@ pkgconfig_DATA = \
 	gstreamer-play-@GST_MAJORMINOR@.pc \
 	gstreamer-interfaces-@GST_MAJORMINOR@.pc
 
-CLEANFILES = $(pcfiles) $(pcfiles_uninstalled)
+CLEANFILES = $(pcfiles) $(pcfiles_uninstalled) $(GCONF_PC) $(GCONF_PC_UNINSTALLED)
 EXTRA_DIST= \
            gstreamer-libs.pc.in gstreamer-libs-uninstalled.pc.in \
            gstreamer-play.pc.in gstreamer-play-uninstalled.pc.in
diff --git a/sys/dxr3/Makefile.am b/sys/dxr3/Makefile.am
index a13bc8268..071fc3679 100644
--- a/sys/dxr3/Makefile.am
+++ b/sys/dxr3/Makefile.am
@@ -13,6 +13,9 @@ built_headers =	dxr3marshal.h
 noinst_HEADERS = dxr3videosink.h dxr3audiosink.h dxr3spusink.h \
 		 dxr3common.h ac3_padder.h
 
+EXTRA_DIST = dxr3marshal.list
+	
+
 dxr3marshal.h: dxr3marshal.list
 	glib-genmarshal --header --prefix=dxr3_marshal $^ > dxr3marshal.h.tmp
 	mv dxr3marshal.h.tmp dxr3marshal.h