mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-24 17:20:36 +00:00
camerabin2: Remove from experimental
Remove camerabin2 from experimental, allowing it to be built without needing to pass --enable-experimental on configure.
This commit is contained in:
parent
e32897d809
commit
011eddcd0e
5 changed files with 4 additions and 21 deletions
|
@ -373,11 +373,6 @@ if test "x$HAVE_CPU_I386" != "xyes" && test "x$HAVE_CPU_X86_64" != "xyes"; then
|
|||
AG_GST_DISABLE_PLUGIN(real)
|
||||
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
|
||||
PKG_CHECK_MODULES(GIO, gio-2.0 >= 2.16, HAVE_GIO=yes, HAVE_GIO=no)
|
||||
AC_SUBST(GIO_CFLAGS)
|
||||
|
|
|
@ -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
|
||||
DIST_SUBDIRS = interfaces signalprocessor video basecamerabinsrc
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
* elements, providing an API for controlling a digital camera.
|
||||
*
|
||||
* <note>
|
||||
* Note that camerabin2 is still UNSTABLE, EXPERIMENTAL and under
|
||||
* Note that camerabin2 is still UNSTABLE and under
|
||||
* development.
|
||||
* </note>
|
||||
*
|
||||
|
|
|
@ -145,11 +145,6 @@ VALGRIND_TO_FIX = \
|
|||
VALGRIND_TESTS_DISABLE = \
|
||||
$(VALGRIND_TO_FIX)
|
||||
|
||||
if BUILD_EXPERIMENTAL
|
||||
EXPERIMENTAL_CHECKS=elements/camerabin2 \
|
||||
elements/viewfinderbin
|
||||
endif
|
||||
|
||||
# these tests don't even pass
|
||||
# neon: too flaky (almost always fails 'the first time')
|
||||
noinst_PROGRAMS = \
|
||||
|
@ -171,6 +166,7 @@ check_PROGRAMS = \
|
|||
elements/asfmux \
|
||||
elements/baseaudiovisualizer \
|
||||
elements/camerabin \
|
||||
elements/camerabin2 \
|
||||
elements/dataurisrc \
|
||||
elements/legacyresample \
|
||||
$(check_jifmux) \
|
||||
|
@ -189,6 +185,7 @@ check_PROGRAMS = \
|
|||
elements/rtpmux \
|
||||
$(check_schro) \
|
||||
$(check_vp8) \
|
||||
elements/viewfinderbin \
|
||||
$(check_zbar) \
|
||||
$(check_orc) \
|
||||
$(EXPERIMENTAL_CHECKS)
|
||||
|
|
|
@ -10,12 +10,6 @@ else
|
|||
DIRECTFB_DIR=
|
||||
endif
|
||||
|
||||
if BUILD_EXPERIMENTAL
|
||||
CAMERABIN2=camerabin2
|
||||
else
|
||||
CAMERABIN2=
|
||||
endif
|
||||
|
||||
OPENCV_EXAMPLES=opencv
|
||||
|
||||
SUBDIRS= $(DIRECTFB_DIR) $(GTK_EXAMPLES) $(OPENCV_EXAMPLES)
|
||||
|
|
Loading…
Reference in a new issue