[meta-fsl-arm] gstreamer1.0-plugins-bad failure

[Gary Thomas <gary@mlbassoc.com>]

[-- Attachment #1: Type: text/plain, Size: 1392 bytes --]

The platform specific patch for gstreamer1.0-plugins-bad no
longer applies with the current OE-core master (after update
to gstreamer-1.6.1).
   ERROR: Command Error: exit status: 1  Output:
   Applying patch 0001-PATCH-install-gstaggregator-and-gstvideoaggregator-h.patch
   patching file gst-libs/gst/base/Makefile.am
   patching file gst-libs/gst/video/Makefile.am
   Hunk #1 FAILED at 19.
   1 out of 1 hunk FAILED -- rejects in file gst-libs/gst/video/Makefile.am
   Patch 0001-PATCH-install-gstaggregator-and-gstvideoaggregator-h.patch does not apply (enforce with -f)
   ERROR: Function failed: patch_do_patch
   ERROR: Logfile of failure stored in: 
/local/p0382-cutting-edge_2014-11-21/tmp/work/cortexa9hf-vfp-neon-mx6qdl-amltd-linux-gnueabi/gstreamer1.0-plugins-bad/1.6.1-r0/temp/log.do_patch.24379
   ERROR: Task 1 (/local/poky-cutting-edge/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.6.1.bb, do_patch) failed with exit code '1'

I adjusted the patch but I'm not comfortable replacing the
boilerplate as it's attributed to Mingke Wang <mingke.wang@freescale.com>
Perhaps someone at Freescale can fix this properly?

-- 
------------------------------------------------------------
Gary Thomas                 |  Consulting for the
MLB Associates              |    Embedded world
------------------------------------------------------------

[-- Attachment #2: 0001-PATCH-install-gstaggregator-and-gstvideoaggregator-h.patch --]
[-- Type: text/x-patch, Size: 1580 bytes --]

Index: gst-plugins-bad-1.6.1/gst-libs/gst/base/Makefile.am
===================================================================
--- gst-plugins-bad-1.6.1.orig/gst-libs/gst/base/Makefile.am
+++ gst-plugins-bad-1.6.1/gst-libs/gst/base/Makefile.am
@@ -6,11 +6,12 @@ libgstbadbase_@GST_API_VERSION@_la_SOURC
 libgstbadbase_@GST_API_VERSION@_la_CFLAGS = $(GST_CFLAGS) \
 	-DGST_USE_UNSTABLE_API
 
+libgstbadbase_@GST_API_VERSION@includedir = $(includedir)/gstreamer-@GST_API_VERSION@/gst/base
+libgstbadbase_@GST_API_VERSION@include_HEADERS = \
+        gstaggregator.h
+
 libgstbadbase_@GST_API_VERSION@_la_LIBADD = $(GST_LIBS)
 libgstbadbase_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
 
-noinst_HEADERS =	\
-	gstaggregator.h
-
 EXTRA_DIST = 
 
Index: gst-plugins-bad-1.6.1/gst-libs/gst/video/Makefile.am
===================================================================
--- gst-plugins-bad-1.6.1.orig/gst-libs/gst/video/Makefile.am
+++ gst-plugins-bad-1.6.1/gst-libs/gst/video/Makefile.am
@@ -16,6 +16,11 @@ libgstbadvideo_@GST_API_VERSION@_la_CFLA
 	$(GST_PLUGINS_BASE_CFLAGS) \
 	$(GST_BASE_CFLAGS)
 
+libgstbadvideo_@GST_API_VERSION@includedir = $(includedir)/gstreamer-@GST_API_VERSION@/gst/video
+libgstbadvideo_@GST_API_VERSION@include_HEADERS = \
+        gstvideoaggregatorpad.h \
+        gstvideoaggregator.h
+
 libgstbadvideo_@GST_API_VERSION@_la_LIBADD = \
 	$(top_builddir)/gst-libs/gst/base/libgstbadbase-$(GST_API_VERSION).la \
 	$(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_API_VERSION) \