disabling videosink from head build, should I do the same for 0.6 branch?

Original commit message from CVS:
disabling videosink from head build, should I do the same for 0.6 branch?

diff --git a/configure.ac b/configure.ac
index 7c6309890a5194d6fce95adf83d8993dba59f38f..3c977c9d3174cef6bd02165a3e15fb97b7e41e48 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -365,7 +365,7 @@ dnl FIXME: perhaps warn user if they have a shared libXv since
 dnl        this is an error until XFree86 starts shipping one
 translit(dnm, m, l) AM_CONDITIONAL(USE_XVIDEO, true)
 
-GST_CHECK_FEATURE(XVIDEO, [X11 XVideo extensions], xvideosink videosink, [
+GST_CHECK_FEATURE(XVIDEO, [X11 XVideo extensions], xvideosink, [
   dnl use X_CFLAGS for check
   save_FLAGS=$CFLAGS
   CFLAGS=$X_CFLAGS
@@ -1086,7 +1086,6 @@ sys/v4l2/Makefile
 sys/vcd/Makefile
 sys/vga/Makefile
 sys/xvideo/Makefile
-sys/videosink/Makefile
 ext/Makefile
 ext/a52dec/Makefile
 ext/aalib/Makefile

diff --git a/sys/Makefile.am b/sys/Makefile.am
index 6419b828a06b93a2233ed1fae3f1240945e74b37..45ebd5863c81147043b452b57cd57984661c6335 100644 (file)
--- a/sys/Makefile.am
+++ b/sys/Makefile.am
@@ -41,7 +41,7 @@ VGA_DIR=
 endif
 
 if USE_XVIDEO
-XVIDEO_DIR=xvideo videosink
+XVIDEO_DIR=xvideo
 else
 XVIDEO_DIR=
 endif
@@ -55,4 +55,4 @@ endif
 SUBDIRS=$(DXR3_DIR) $(OSS_DIR) $(QCAM_DIR) $(V4L_DIR) $(V4L2_DIR) \
        $(VCD_DIR) $(VGA_DIR) $(XVIDEO_DIR) $(CDROM_DIR)
 
-DIST_SUBDIRS=dxr3 oss qcam v4l v4l2 vcd vga xvideo videosink cdrom
+DIST_SUBDIRS=dxr3 oss qcam v4l v4l2 vcd vga xvideo cdrom