From 21257d7edcfa69e0df7af58ee21803b88a624e2b Mon Sep 17 00:00:00 2001
From: Thomas Vander Stichele <thomas@apestaart.org>
Date: Tue, 9 Mar 2004 13:10:14 +0000
Subject: [PATCH] removing plugins from build

Original commit message from CVS:
removing plugins from build
---
 ChangeLog              | 7 +++++++
 configure.ac           | 5 +----
 ext/vorbis/Makefile.am | 2 +-
 sys/Makefile.am        | 6 ++----
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d606fc4..dea161f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-03-09  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* configure.ac:
+	* ext/vorbis/Makefile.am:
+	* sys/Makefile.am:
+	  remove id3types, vorbisfile and xvideosink from the build (#133783)
+
 2004-03-08  Ronald Bultje  <rbultje@ronald.bitfreak.net>
 
 	* gst-libs/gst/riff/riff-read.c: (gst_riff_read_info):
diff --git a/configure.ac b/configure.ac
index 812e42f..a857e18 100644
--- a/configure.ac
+++ b/configure.ac
@@ -349,7 +349,6 @@ GST_PLUGINS_ALL="\
 	filter \
 	flx \
 	goom \
-	id3 \
 	interleave \
 	law \
 	level \
@@ -541,7 +540,7 @@ dnl        this is an error until XFree86 starts shipping one
 dnl Check for Xv extension
 translit(dnm, m, l) AM_CONDITIONAL(USE_XVIDEO, true)
 GST_CHECK_FEATURE(XVIDEO, [X11 XVideo extensions],
-                  [xvimagesink xvideosink], [
+                  [xvimagesink], [
   if test x$HAVE_X = xyes; then
     AC_CHECK_LIB(Xv_pic, XvQueryExtension,
 		 HAVE_XVIDEO="yes", HAVE_XVIDEO="no",
@@ -1562,7 +1561,6 @@ gst/festival/Makefile
 gst/filter/Makefile
 gst/flx/Makefile
 gst/goom/Makefile
-gst/id3/Makefile
 gst/interleave/Makefile
 gst/law/Makefile
 gst/level/Makefile
@@ -1621,7 +1619,6 @@ sys/v4l2/Makefile
 sys/vcd/Makefile
 sys/ximage/Makefile
 sys/xvimage/Makefile
-sys/xvideo/Makefile
 ext/Makefile
 ext/a52dec/Makefile
 ext/aalib/Makefile
diff --git a/ext/vorbis/Makefile.am b/ext/vorbis/Makefile.am
index 82d7686..9ee0027 100644
--- a/ext/vorbis/Makefile.am
+++ b/ext/vorbis/Makefile.am
@@ -1,7 +1,7 @@
 
 plugin_LTLIBRARIES = libgstvorbis.la
 
-libgstvorbis_la_SOURCES = vorbis.c vorbisdec.c vorbisenc.c vorbisfile.c
+libgstvorbis_la_SOURCES = vorbis.c vorbisdec.c vorbisenc.c
 libgstvorbis_la_CFLAGS = $(GST_CFLAGS) $(VORBIS_CFLAGS) 
 ## AM_PATH_VORBIS also sets VORBISENC_LIBS
 libgstvorbis_la_LIBADD = $(VORBIS_LIBS) $(VORBISENC_LIBS) $(VORBISFILE_LIBS) 
diff --git a/sys/Makefile.am b/sys/Makefile.am
index 55d4fb8..ff51384 100644
--- a/sys/Makefile.am
+++ b/sys/Makefile.am
@@ -35,10 +35,8 @@ VCD_DIR=
 endif
 
 if USE_X
-X_DIR=xvideo
 XI_DIR=ximage
 else
-X_DIR=
 XI_DIR=
 endif
 
@@ -55,6 +53,6 @@ CDROM_DIR=
 endif
 
 SUBDIRS=$(DXR3_DIR) $(OSS_DIR) $(QCAM_DIR) $(V4L_DIR) $(V4L2_DIR) \
-	$(VCD_DIR) $(CDROM_DIR) $(X_DIR) $(XI_DIR) $(XV_DIR)
+	$(VCD_DIR) $(CDROM_DIR) $(XI_DIR) $(XV_DIR)
 
-DIST_SUBDIRS=dxr3 oss qcam v4l v4l2 vcd xvideo ximage xvimage glsink cdrom
+DIST_SUBDIRS=dxr3 oss qcam v4l v4l2 vcd ximage xvimage glsink cdrom
-- 
2.7.4