Merge branch 'baserock/james/0.10-rebase' into baserock/morph/0.10baserock/morph/0.10

Reviewed by : Richard Maw <richard.maw@codethink.co.uk>

7 files changed, 5 insertions, 30 deletions

diff --git a/common b/common
-Subproject 9bca01f15ba103ae4dccd8224cc26fd4f07fc63
+Subproject 2585de990f508fc7fbe13a4b7c9fb08c68a10ae
diff --git a/configure.ac b/configure.ac
index a447470deb..17834dc5f4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@ dnl can autoconf find the source ?
 AC_CONFIG_SRCDIR([gst/gst.c])
 
 dnl define the output header for config
-AM_CONFIG_HEADER([config.h])
+AC_CONFIG_HEADERS([config.h])
 
 dnl AM_MAINTAINER_MODE only provides the option to configure to enable it
 AM_MAINTAINER_MODE
diff --git a/docs/design/Makefile.am b/docs/design/Makefile.am
index 087a3b03a6..b313c9d366 100644
--- a/docs/design/Makefile.am
+++ b/docs/design/Makefile.am
@@ -44,7 +44,6 @@ EXTRA_DIST = \
 	part-stream-status.txt \
 	part-streams.txt \
 	part-synchronisation.txt \
-	part-toc.txt \
 	part-TODO.txt \
 	part-trickmodes.txt
 
diff --git a/gst/parse/grammar.y b/gst/parse/grammar.y
index 24fc87bfab..7f9dd162da 100644
--- a/gst/parse/grammar.y
+++ b/gst/parse/grammar.y
@@ -26,7 +26,6 @@
  */
 
 #define YYERROR_VERBOSE 1
-#define YYLEX_PARAM scanner
 
 #define YYENABLE_NLS 0
 
@@ -648,6 +647,7 @@ static int yyerror (void *scanner, graph_t *graph, const char *s);
 %right '.'
 %left '!' '='
 
+%lex-param { void *scanner }
 %parse-param { void *scanner }
 %parse-param { graph_t *graph }
 %pure-parser
diff --git a/libs/gst/base/gstbasetransform.c b/libs/gst/base/gstbasetransform.c
index e1fbaa98fd..25eb2b4975 100644
--- a/libs/gst/base/gstbasetransform.c
+++ b/libs/gst/base/gstbasetransform.c
@@ -1974,7 +1974,7 @@ gst_base_transform_buffer_alloc (GstPad * pad, guint64 offset, guint size,
           && !gst_caps_is_equal (sink_suggest, priv->sink_alloc);
     }
 
-    if (new_caps && (suggest || !gst_caps_can_intersect (sink_suggest, templ))) {
+    if (new_caps && !gst_caps_can_intersect (sink_suggest, templ)) {
       GstCaps *allowed, *peercaps;
 
       GST_DEBUG_OBJECT (trans,
@@ -2023,6 +2023,7 @@ gst_base_transform_buffer_alloc (GstPad * pad, guint64 offset, guint size,
         }
 
         gst_caps_replace (&sink_suggest, allowed);
+        size_suggest = 0;
         gst_caps_unref (allowed);
 
         suggest = TRUE;
diff --git a/scripts/gst-uninstalled b/scripts/gst-uninstalled
index ea460bae5e..bfc90c4761 100755
--- a/scripts/gst-uninstalled
+++ b/scripts/gst-uninstalled
@@ -140,7 +140,7 @@ $GST/gstreamer/plugins\
 :$GST/gst-plugins-bad/sys\
 :$GST/gst-ffmpeg/ext\
 :$GST/gnonlin/gnl\
-:$GST/gst-openmax\
+:$GST/gst-omx/omx/.libs\
 :$GST/gst-plugins-gl/gst\
 :$GST/plugins\
 :$GST/farsight2/gst\
diff --git a/tests/check/gst/gstobject.c b/tests/check/gst/gstobject.c
index d5956db315..e338f491cb 100644
--- a/tests/check/gst/gstobject.c
+++ b/tests/check/gst/gstobject.c
@@ -72,19 +72,6 @@ gst_fake_object_get_type (void)
   return fake_object_type;
 }
 
-#ifndef HAVE_OSX
-/* g_object_new on abstract GstObject should fail */
-GST_START_TEST (test_fail_abstract_new)
-{
-  GstObject *object;
-
-  ASSERT_CRITICAL (object = g_object_new (gst_object_get_type (), NULL));
-  fail_unless (object == NULL, "Created an instance of abstract GstObject");
-}
-
-GST_END_TEST;
-#endif
-
 /* g_object_new on GstFakeObject should succeed */
 GST_START_TEST (test_fake_object_new)
 {
@@ -529,18 +516,6 @@ gst_object_suite (void)
   tcase_add_test (tc_chain, test_fake_object_has_ancestor);
   //tcase_add_checked_fixture (tc_chain, setup, teardown);
 
-  /* FIXME: GLib shouldn't crash here, but issue a warning and return a NULL
-   * object, or at least g_error() and then abort properly ... (tpm) */
-#ifndef HAVE_OSX
-  /* Disabled for OS/X because a) it's a pretty silly test anyway and
-   * b) different OS/X versions raise different signals and it isn't worth
-   * the effort to try and detect which one should be producing which
-   */
-  /* SEGV tests go last so we can debug the others */
-  if (g_getenv ("CK_FORK") == NULL || strcmp (g_getenv ("CK_FORK"), "no") != 0)
-    tcase_add_test_raise_signal (tc_chain, test_fail_abstract_new, SIGSEGV);
-#endif
-
   return s;
 }