summaryrefslogtreecommitdiffstats
path: root/recipes-multimedia
diff options
context:
space:
mode:
authorMax Krummenacher <max.oss.09@gmail.com>2016-07-09 11:25:08 +0200
committerOtavio Salvador <otavio@ossystems.com.br>2016-07-15 07:48:55 -0300
commit7a31c25e259c83cfa4b28c422293f508241b385b (patch)
tree84783268a7bf7e65b21ac3c3067134c789844317 /recipes-multimedia
parent079e9b32ed9dc95b0b57426ace5801b20f42e94c (diff)
downloadmeta-freescale-7a31c25e259c83cfa4b28c422293f508241b385b.tar.gz
gstreamer1.0-plugins-bad: remove patch
With the upgrade to gstremaer 1.8.x this patch does no longer apply. Upstream changed to install the headers required, so the patch is also no longer needed: https://cgit.freedesktop.org/gstreamer/gst-plugins-bad/commit?h=1.8&id=c87a7e266732ab9a0bd0e5a5c104b06d0f1a2072 Updated to 1.8 in oe-core: http://cgit.openembedded.org/openembedded-core/commit/meta/recipes-multimedia/gstreamer?id=6a326f2b37b0b49e1144428becda32400498c024 or the poky git: http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/meta/recipes-multimedia/gstreamer?id=79ca8d031e5a706f00d5c97ba23b496e6d700b7e Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'recipes-multimedia')
-rwxr-xr-xrecipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-PATCH-install-gstaggregator-and-gstvideoaggregator-h.patch61
-rw-r--r--recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend6
2 files changed, 0 insertions, 67 deletions
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-PATCH-install-gstaggregator-and-gstvideoaggregator-h.patch b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-PATCH-install-gstaggregator-and-gstvideoaggregator-h.patch
deleted file mode 100755
index 52e2d9ac..00000000
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-PATCH-install-gstaggregator-and-gstvideoaggregator-h.patch
+++ /dev/null
@@ -1,61 +0,0 @@
1From 853d7f2ca821682c1e1e594b23ff654505e07054 Mon Sep 17 00:00:00 2001
2From: Mingke Wang <mingke.wang@freescale.com>
3Date: Wed, 1 Jul 2015 10:19:25 +0800
4Subject: [PATCH] [PATCH] install gstaggregator and gstvideoaggregator header
5 file
6
7intall the header file of gstaggregator and gstvideoaggregator
8so that we can use them outside of gstreamer-plugins-bad package
9
10Upstream-Status: Inappropriate [i.MX specific]
11
12Signed-off-by: Mingke Wang <mingke.wang@freescale.com>
13
14diff --git a/gst-libs/gst/base/Makefile.am b/gst-libs/gst/base/Makefile.am
15old mode 100644
16new mode 100755
17index 0d55368..7268095
18--- a/gst-libs/gst/base/Makefile.am
19+++ b/gst-libs/gst/base/Makefile.am
20@@ -6,11 +6,12 @@ libgstbadbase_@GST_API_VERSION@_la_SOURCES = \
21 libgstbadbase_@GST_API_VERSION@_la_CFLAGS = $(GST_CFLAGS) \
22 -DGST_USE_UNSTABLE_API
23
24+libgstbadbase_@GST_API_VERSION@includedir = $(includedir)/gstreamer-@GST_API_VERSION@/gst/base
25+libgstbadbase_@GST_API_VERSION@include_HEADERS = \
26+ gstaggregator.h
27+
28 libgstbadbase_@GST_API_VERSION@_la_LIBADD = $(GST_LIBS)
29 libgstbadbase_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
30
31-noinst_HEADERS = \
32- gstaggregator.h
33-
34 EXTRA_DIST =
35
36diff --git a/gst-libs/gst/video/Makefile.am b/gst-libs/gst/video/Makefile.am
37old mode 100644
38new mode 100755
39index 4f0f09f..3c5da6b
40--- a/gst-libs/gst/video/Makefile.am
41+++ b/gst-libs/gst/video/Makefile.am
42@@ -16,11 +16,14 @@ libgstbadvideo_@GST_API_VERSION@_la_CFLAGS = \
43 $(GST_PLUGINS_BASE_CFLAGS) \
44 $(GST_BASE_CFLAGS)
45
46+libgstbadvideo_@GST_API_VERSION@includedir = $(includedir)/gstreamer-@GST_API_VERSION@/gst/video
47+libgstbadvideo_@GST_API_VERSION@include_HEADERS = \
48+ gstvideoaggregatorpad.h \
49+ gstvideoaggregator.h
50+
51 libgstbadvideo_@GST_API_VERSION@_la_LIBADD = \
52 $(top_builddir)/gst-libs/gst/base/libgstbadbase-$(GST_API_VERSION).la \
53 $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_API_VERSION) \
54 $(GST_BASE_LIBS) $(GST_LIBS) $(ORC_LIBS) $(LIBM)
55
56 libgstbadvideo_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
57-
58-noinst_HEADERS = gstvideoaggregatorpad.h gstvideoaggregator.h
59--
601.7.9.5
61
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend
index 11c4eb99..89aaafb0 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend
@@ -1,6 +1,5 @@
1# Vivante EGL headers require the correct preprocessor 1# Vivante EGL headers require the correct preprocessor
2# defines to be set for each platform 2# defines to be set for each platform
3FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
4 3
5CFLAGS_append_mx6 = " -DLINUX \ 4CFLAGS_append_mx6 = " -DLINUX \
6 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', \ 5 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', \
@@ -10,11 +9,6 @@ PACKAGECONFIG_GL_mx6sl = "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', \
10 bb.utils.contains('DISTRO_FEATURES', 'x11', \ 9 bb.utils.contains('DISTRO_FEATURES', 'x11', \
11 'opengl', '', d), '', d)}" 10 'opengl', '', d), '', d)}"
12 11
13SRC_URI_append_mx6 = " file://0001-PATCH-install-gstaggregator-and-gstvideoaggregator-h.patch"
14SRC_URI_append_mx6ul = " file://0001-PATCH-install-gstaggregator-and-gstvideoaggregator-h.patch"
15SRC_URI_append_mx7 = " file://0001-PATCH-install-gstaggregator-and-gstvideoaggregator-h.patch"
16
17
18PACKAGE_ARCH_mx6 = "${MACHINE_SOCARCH}" 12PACKAGE_ARCH_mx6 = "${MACHINE_SOCARCH}"
19PACKAGE_ARCH_mx6ul = "${MACHINE_SOCARCH}" 13PACKAGE_ARCH_mx6ul = "${MACHINE_SOCARCH}"
20PACKAGE_ARCH_mx7 = "${MACHINE_SOCARCH}" 14PACKAGE_ARCH_mx7 = "${MACHINE_SOCARCH}"