From 011eddcd0ea45a9820853abc1bbc5a3b8c842d2c Mon Sep 17 00:00:00 2001
From: Thiago Santos <thiago.sousa.santos@collabora.co.uk>
Date: Tue, 23 Aug 2011 19:26:31 -0300
Subject: [PATCH] camerabin2: Remove from experimental

Remove camerabin2 from experimental, allowing it to be built
without needing to pass --enable-experimental on configure.
---
 configure.ac                   | 5 -----
 gst-libs/gst/Makefile.am       | 5 +----
 gst/camerabin2/gstcamerabin2.c | 2 +-
 tests/check/Makefile.am        | 7 ++-----
 tests/examples/Makefile.am     | 6 ------
 5 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/configure.ac b/configure.ac
index d5674df..3450bd2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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)
diff --git a/gst-libs/gst/Makefile.am b/gst-libs/gst/Makefile.am
index f58086c..ac83c68 100644
--- a/gst-libs/gst/Makefile.am
+++ b/gst-libs/gst/Makefile.am
@@ -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
diff --git a/gst/camerabin2/gstcamerabin2.c b/gst/camerabin2/gstcamerabin2.c
index 262ccb0..266308d 100644
--- a/gst/camerabin2/gstcamerabin2.c
+++ b/gst/camerabin2/gstcamerabin2.c
@@ -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>
  *
diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am
index 430d5ac..dca2775 100644
--- a/tests/check/Makefile.am
+++ b/tests/check/Makefile.am
@@ -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)
diff --git a/tests/examples/Makefile.am b/tests/examples/Makefile.am
index 84c1787..5183dfe 100644
--- a/tests/examples/Makefile.am
+++ b/tests/examples/Makefile.am
@@ -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)
-- 
2.7.4