From: Thomas Vander Stichele <thomas@apestaart.org>
Date: Tue, 2 May 2006 13:24:38 +0000 (+0000)
Subject: configure.ac: figure out where plugins-base plugins are
X-Git-Tag: 1.19.3~509^2~12782
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7df5ab1bf288e8648c5e2be8b80517783e69de5a;p=platform%2Fupstream%2Fgstreamer.git

configure.ac: figure out where plugins-base plugins are

Original commit message from CVS:

* configure.ac:
figure out where plugins-base plugins are
* tests/check/Makefile.am:
use plugins-base plugins, so we have typefind functions
* tests/check/elements/id3v2mux.c: (test_taglib_id3mux_with_tags):
increase num-buffers, this makes sure the test errors out instead
of timing out when no typefind functions are present
---

diff --git a/ChangeLog b/ChangeLog
index 46af660..45557f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2006-05-02  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* configure.ac:
+	  figure out where plugins-base plugins are
+	* tests/check/Makefile.am:
+	  use plugins-base plugins, so we have typefind functions
+	* tests/check/elements/id3v2mux.c: (test_taglib_id3mux_with_tags):
+	  increase num-buffers, this makes sure the test errors out instead
+	  of timing out when no typefind functions are present
+
 2006-05-01  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* docs/plugins/Makefile.am:
diff --git a/configure.ac b/configure.ac
index 500c991..492bccc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -242,6 +242,10 @@ if test -z $GST_TOOLS_DIR; then
 fi
 AC_SUBST(GST_TOOLS_DIR)
 
+GSTPB_PLUGINS_DIR=`$PKG_CONFIG gstreamer-plugins-base-$GST_MAJORMINOR --variable pluginsdir`
+AC_SUBST(GSTPB_PLUGINS_DIR)
+AC_MSG_NOTICE(Using GStreamer Base Plugins in $GSTPB_PLUGINS_DIR)
+
 dnl FIXME: get rid of this by making sure gstreamer-check brings it in
 dnl check for "check", unit testing library/header
 AM_PATH_CHECK(0.9.2, HAVE_CHECK=yes, HAVE_CHECK=no)
diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am
index d0d433b..24e4f43 100644
--- a/tests/check/Makefile.am
+++ b/tests/check/Makefile.am
@@ -8,7 +8,7 @@ REGISTRY_ENVIRONMENT = \
 TESTS_ENVIRONMENT = \
 	$(REGISTRY_ENVIRONMENT)					\
 	GST_PLUGIN_SYSTEM_PATH=					\
-	GST_PLUGIN_PATH=$(top_builddir)/gst:$(top_builddir)/ext:$(GST_PLUGINS_DIR)
+	GST_PLUGIN_PATH=$(top_builddir)/gst:$(top_builddir)/ext:$(GSTPB_PLUGINS_DIR):$(GST_PLUGINS_DIR)
 
 # ths core dumps of some machines have PIDs appended
 CLEANFILES = core.* test-registry.xml
@@ -27,12 +27,13 @@ check_PROGRAMS = \
 	elements/matroskamux \
 	elements/cmmldec \
 	elements/cmmlenc \
-	elements/icydemux
+	elements/icydemux \
+	$(check_taglib)
     
 TESTS = $(check_PROGRAMS)
 
 # these tests don't even pass
-noinst_PROGRAMS = $(check_taglib)
+noinst_PROGRAMS =
 
 AM_CFLAGS = $(GST_OBJ_CFLAGS) $(GST_CHECK_CFLAGS) $(CHECK_CFLAGS)
 LDADD = $(GST_OBJ_LIBS) $(GST_CHECK_LIBS) $(CHECK_LIBS)
diff --git a/tests/check/elements/id3v2mux.c b/tests/check/elements/id3v2mux.c
index 40b8974..1b6ecfe 100644
--- a/tests/check/elements/id3v2mux.c
+++ b/tests/check/elements/id3v2mux.c
@@ -294,7 +294,7 @@ test_taglib_id3mux_with_tags (GstTagList * tags, guint32 mask)
   /* set up source */
   g_object_set (fakesrc, "signal-handoffs", TRUE, "can-activate-pull", FALSE,
       "filltype", 2, "sizetype", 2, "sizemax", MP3_FRAME_SIZE,
-      "num-buffers", 16, NULL);
+      "num-buffers", 256, NULL);
 
   offset = 0;
   g_signal_connect (fakesrc, "handoff", G_CALLBACK (fill_mp3_buffer), &offset);