mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-23 00:36:51 +00:00
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?
This commit is contained in:
parent
4344085222
commit
2980087e6a
2 changed files with 3 additions and 4 deletions
|
@ -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
|
dnl this is an error until XFree86 starts shipping one
|
||||||
translit(dnm, m, l) AM_CONDITIONAL(USE_XVIDEO, true)
|
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
|
dnl use X_CFLAGS for check
|
||||||
save_FLAGS=$CFLAGS
|
save_FLAGS=$CFLAGS
|
||||||
CFLAGS=$X_CFLAGS
|
CFLAGS=$X_CFLAGS
|
||||||
|
@ -1086,7 +1086,6 @@ sys/v4l2/Makefile
|
||||||
sys/vcd/Makefile
|
sys/vcd/Makefile
|
||||||
sys/vga/Makefile
|
sys/vga/Makefile
|
||||||
sys/xvideo/Makefile
|
sys/xvideo/Makefile
|
||||||
sys/videosink/Makefile
|
|
||||||
ext/Makefile
|
ext/Makefile
|
||||||
ext/a52dec/Makefile
|
ext/a52dec/Makefile
|
||||||
ext/aalib/Makefile
|
ext/aalib/Makefile
|
||||||
|
|
|
@ -41,7 +41,7 @@ VGA_DIR=
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if USE_XVIDEO
|
if USE_XVIDEO
|
||||||
XVIDEO_DIR=xvideo videosink
|
XVIDEO_DIR=xvideo
|
||||||
else
|
else
|
||||||
XVIDEO_DIR=
|
XVIDEO_DIR=
|
||||||
endif
|
endif
|
||||||
|
@ -55,4 +55,4 @@ endif
|
||||||
SUBDIRS=$(DXR3_DIR) $(OSS_DIR) $(QCAM_DIR) $(V4L_DIR) $(V4L2_DIR) \
|
SUBDIRS=$(DXR3_DIR) $(OSS_DIR) $(QCAM_DIR) $(V4L_DIR) $(V4L2_DIR) \
|
||||||
$(VCD_DIR) $(VGA_DIR) $(XVIDEO_DIR) $(CDROM_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
|
||||||
|
|
Loading…
Reference in a new issue