mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-11 18:05:37 +00:00
Code Issues 1 Projects Releases Wiki Activity

camerabin2: Remove from experimental

Browse source 
Remove camerabin2 from experimental, allowing it to be built
without needing to pass --enable-experimental on configure.
This commit is contained in:
Thiago Santos 2011-08-23 19:26:31 -03:00
parent e32897d809
commit 011eddcd0e
5 changed files with 4 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
configure.ac
View file

@ -373,11 +373,6 @@ if test "x$HAVE_CPU_I386" != "xyes" && test "x$HAVE_CPU_X86_64" != "xyes"; then
AG_GST_DISABLE_PLUGIN(real) AG_GST_DISABLE_PLUGIN(real)
fi fi
dnl disable experimental plug-ins
if test "x$BUILD_EXPERIMENTAL" != "xyes"; then
AG_GST_DISABLE_PLUGIN(camerabin2)
fi
# This will always succeed because we depend on GLib >= 2.16 # This will always succeed because we depend on GLib >= 2.16
PKG_CHECK_MODULES(GIO, gio-2.0 >= 2.16, HAVE_GIO=yes, HAVE_GIO=no) PKG_CHECK_MODULES(GIO, gio-2.0 >= 2.16, HAVE_GIO=yes, HAVE_GIO=no)
AC_SUBST(GIO_CFLAGS) AC_SUBST(GIO_CFLAGS)

5
gst-libs/gst/Makefile.am
View file

@ -1,8 +1,5 @@
if BUILD_EXPERIMENTAL
EXPERIMENTAL_LIBS=basecamerabinsrc
endif
SUBDIRS = interfaces signalprocessor video $(EXPERIMENTAL_LIBS) SUBDIRS = interfaces signalprocessor video basecamerabinsrc
noinst_HEADERS = gst-i18n-plugin.h gettext.h noinst_HEADERS = gst-i18n-plugin.h gettext.h
DIST_SUBDIRS = interfaces signalprocessor video basecamerabinsrc DIST_SUBDIRS = interfaces signalprocessor video basecamerabinsrc

2
gst/camerabin2/gstcamerabin2.c
View file

@ -23,7 +23,7 @@
* elements, providing an API for controlling a digital camera. * elements, providing an API for controlling a digital camera.
* *
* <note> * <note>
* Note that camerabin2 is still UNSTABLE, EXPERIMENTAL and under * Note that camerabin2 is still UNSTABLE and under
* development. * development.
* </note> * </note>
* *

7
tests/check/Makefile.am
View file

@ -145,11 +145,6 @@ VALGRIND_TO_FIX = \
VALGRIND_TESTS_DISABLE = \ VALGRIND_TESTS_DISABLE = \
$(VALGRIND_TO_FIX) $(VALGRIND_TO_FIX)
if BUILD_EXPERIMENTAL
EXPERIMENTAL_CHECKS=elements/camerabin2 \
elements/viewfinderbin
endif
# these tests don't even pass # these tests don't even pass
# neon: too flaky (almost always fails 'the first time') # neon: too flaky (almost always fails 'the first time')
noinst_PROGRAMS = \ noinst_PROGRAMS = \
@ -171,6 +166,7 @@ check_PROGRAMS = \
elements/asfmux \ elements/asfmux \
elements/baseaudiovisualizer \ elements/baseaudiovisualizer \
elements/camerabin \ elements/camerabin \
elements/camerabin2 \
elements/dataurisrc \ elements/dataurisrc \
elements/legacyresample \ elements/legacyresample \
$(check_jifmux) \ $(check_jifmux) \
@ -189,6 +185,7 @@ check_PROGRAMS = \
elements/rtpmux \ elements/rtpmux \
$(check_schro) \ $(check_schro) \
$(check_vp8) \ $(check_vp8) \
elements/viewfinderbin \
$(check_zbar) \ $(check_zbar) \
$(check_orc) \ $(check_orc) \
$(EXPERIMENTAL_CHECKS) $(EXPERIMENTAL_CHECKS)

6
tests/examples/Makefile.am
View file

@ -10,12 +10,6 @@ else
DIRECTFB_DIR= DIRECTFB_DIR=
endif endif
if BUILD_EXPERIMENTAL
CAMERABIN2=camerabin2
else
CAMERABIN2=
endif
OPENCV_EXAMPLES=opencv OPENCV_EXAMPLES=opencv
SUBDIRS= $(DIRECTFB_DIR) $(GTK_EXAMPLES) $(OPENCV_EXAMPLES) SUBDIRS= $(DIRECTFB_DIR) $(GTK_EXAMPLES) $(OPENCV_EXAMPLES)