summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad
diff options
context:
space:
mode:
authorAnuj Mittal <anuj.mittal@intel.com>2018-05-09 12:01:38 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-05-11 07:49:37 +0100
commit2f88de553e92ff8be6dd702b4441ada7987c734a (patch)
tree53479de0cec00eb7df934f35e4a4737b282512e4 /meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad
parentb01fd6106adf844afd3531aaffdec347013cc32b (diff)
downloadpoky-2f88de553e92ff8be6dd702b4441ada7987c734a.tar.gz
gst-plugins-bad: upgrade 1.12.4 -> 1.14.0
* For changes, please see: https://gstreamer.freedesktop.org/releases/1.14/ * gst-gl has moved to -good and direct dependencies aren't required. * Remove vulkan patches that have been upstreamed. * Remove obsolete PACKAGECONFIGs. (From OE-Core rev: a8667b7f95d62bd09a1a9ed9575327a22e1c7f59) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad')
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch51
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-gstreamer-gl.pc.in-don-t-append-GL_CFLAGS-to-CFLAGS.patch29
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-vkdisplay-Use-ifdef-for-platform-specific-defines.patch37
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0002-vulkan-Use-the-generated-version-of-vkconfig.h.patch64
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0009-glimagesink-Downrank-to-marginal.patch32
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/link-with-libvchostif.patch35
6 files changed, 10 insertions, 238 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch
index 8d99dc6ccc..05b991a8f0 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch
@@ -1,48 +1,17 @@
1From 7592e793b3906355d76ca9a59f8fea2749ea2a4e Mon Sep 17 00:00:00 2001 1From 7d8e8b8bcce34d01fc7ad7285b4eb17ad8949399 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Anuj Mittal <anuj.mittal@intel.com>
3Date: Tue, 27 Oct 2015 14:36:58 +0200 3Date: Wed, 11 Apr 2018 11:06:39 +0800
4Subject: [PATCH] Makefile.am: don't hardcode libtool name when running 4Subject: [PATCH] Makefile.am: don't hardcode libtool name when running
5 introspection tools 5 introspection tools
6 6
7Upstream-Status: Pending [review on oe-core list] 7Upstream-Status: Pending [review on oe-core list]
8Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 8Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
9
10%% original patch: 0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch
11
12Signed-off-by: Maxin B. John <maxin.john@intel.com> 9Signed-off-by: Maxin B. John <maxin.john@intel.com>
13--- 10---
14 gst-libs/gst/allocators/Makefile.am | 2 +- 11 gst-libs/gst/insertbin/Makefile.am | 2 +-
15 gst-libs/gst/gl/Makefile.am | 2 +- 12 gst-libs/gst/mpegts/Makefile.am | 2 +-
16 gst-libs/gst/insertbin/Makefile.am | 2 +- 13 2 files changed, 2 insertions(+), 2 deletions(-)
17 gst-libs/gst/mpegts/Makefile.am | 2 +-
18 4 files changed, 4 insertions(+), 4 deletions(-)
19 14
20diff --git a/gst-libs/gst/allocators/Makefile.am b/gst-libs/gst/allocators/Makefile.am
21index e50d077..623f092 100644
22--- a/gst-libs/gst/allocators/Makefile.am
23+++ b/gst-libs/gst/allocators/Makefile.am
24@@ -37,7 +37,7 @@ GstBadAllocators-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstbadalloca
25 --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
26 --library=libgstbadallocators-@GST_API_VERSION@.la \
27 --include=Gst-@GST_API_VERSION@ \
28- --libtool="$(top_builddir)/libtool" \
29+ --libtool="$(LIBTOOL)" \
30 --pkg gstreamer-@GST_API_VERSION@ \
31 --pkg-export gstreamer-badallocators-@GST_API_VERSION@ \
32 --output $@ \
33diff --git a/gst-libs/gst/gl/Makefile.am b/gst-libs/gst/gl/Makefile.am
34index 2ae4773..dfa7a7d 100644
35--- a/gst-libs/gst/gl/Makefile.am
36+++ b/gst-libs/gst/gl/Makefile.am
37@@ -178,7 +178,7 @@ GstGL-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstgl-@GST_API_VERSION@
38 --include=Gst-@GST_API_VERSION@ \
39 --include=GstBase-@GST_API_VERSION@ \
40 --include=GstVideo-@GST_API_VERSION@ \
41- --libtool="$(top_builddir)/libtool" \
42+ --libtool="$(LIBTOOL)" \
43 --pkg gstreamer-@GST_API_VERSION@ \
44 --pkg gstreamer-base-@GST_API_VERSION@ \
45 --pkg gstreamer-video-@GST_API_VERSION@ \
46diff --git a/gst-libs/gst/insertbin/Makefile.am b/gst-libs/gst/insertbin/Makefile.am 15diff --git a/gst-libs/gst/insertbin/Makefile.am b/gst-libs/gst/insertbin/Makefile.am
47index 1f8ea30..4b98ef6 100644 16index 1f8ea30..4b98ef6 100644
48--- a/gst-libs/gst/insertbin/Makefile.am 17--- a/gst-libs/gst/insertbin/Makefile.am
@@ -57,10 +26,10 @@ index 1f8ea30..4b98ef6 100644
57 --pkg gstreamer-base-@GST_API_VERSION@ \ 26 --pkg gstreamer-base-@GST_API_VERSION@ \
58 --pkg-export gstreamer-insertbin-@GST_API_VERSION@ \ 27 --pkg-export gstreamer-insertbin-@GST_API_VERSION@ \
59diff --git a/gst-libs/gst/mpegts/Makefile.am b/gst-libs/gst/mpegts/Makefile.am 28diff --git a/gst-libs/gst/mpegts/Makefile.am b/gst-libs/gst/mpegts/Makefile.am
60index aeea32e..929d9cc 100644 29index f264e33..9934a4d 100644
61--- a/gst-libs/gst/mpegts/Makefile.am 30--- a/gst-libs/gst/mpegts/Makefile.am
62+++ b/gst-libs/gst/mpegts/Makefile.am 31+++ b/gst-libs/gst/mpegts/Makefile.am
63@@ -79,7 +79,7 @@ GstMpegts-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstmpegts-@GST_API_ 32@@ -82,7 +82,7 @@ GstMpegts-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstmpegts-@GST_API_
64 --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-video-@GST_API_VERSION@` \ 33 --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-video-@GST_API_VERSION@` \
65 --library=libgstmpegts-@GST_API_VERSION@.la \ 34 --library=libgstmpegts-@GST_API_VERSION@.la \
66 --include=Gst-@GST_API_VERSION@ \ 35 --include=Gst-@GST_API_VERSION@ \
@@ -70,5 +39,5 @@ index aeea32e..929d9cc 100644
70 --pkg gstreamer-video-@GST_API_VERSION@ \ 39 --pkg gstreamer-video-@GST_API_VERSION@ \
71 --pkg-export gstreamer-mpegts-@GST_API_VERSION@ \ 40 --pkg-export gstreamer-mpegts-@GST_API_VERSION@ \
72-- 41--
732.4.0 422.7.4
74 43
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-gstreamer-gl.pc.in-don-t-append-GL_CFLAGS-to-CFLAGS.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-gstreamer-gl.pc.in-don-t-append-GL_CFLAGS-to-CFLAGS.patch
deleted file mode 100644
index 2235a57afa..0000000000
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-gstreamer-gl.pc.in-don-t-append-GL_CFLAGS-to-CFLAGS.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1From 5622ca3b61603dc316a0f1fbede3f9aa353a5e48 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Fri, 12 May 2017 16:47:12 +0300
4Subject: [PATCH] gstreamer-gl.pc.in: don't append GL_CFLAGS to CFLAGS
5
6Dependencies' include directories should not be added in this way;
7it causes problems when cross-compiling in sysroot environments.
8
9Upstream-Status: Pending
10
11Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
12Signed-off-by: Maxin B. John <maxin.john@intel.com>
13---
14 pkgconfig/gstreamer-gl.pc.in | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17diff --git a/pkgconfig/gstreamer-gl.pc.in b/pkgconfig/gstreamer-gl.pc.in
18index 8e7a303..d167be1 100644
19--- a/pkgconfig/gstreamer-gl.pc.in
20+++ b/pkgconfig/gstreamer-gl.pc.in
21@@ -13,4 +13,4 @@ Version: @VERSION@
22 Requires: gstreamer-base-@GST_API_VERSION@ gstreamer-@GST_API_VERSION@
23
24 Libs: -L${libdir} -lgstgl-@GST_API_VERSION@
25-Cflags: -I${includedir} -I${libdir}/gstreamer-@GST_API_VERSION@/include @GL_CFLAGS@
26+Cflags: -I${includedir} -I${libdir}/gstreamer-@GST_API_VERSION@/include
27--
282.4.0
29
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-vkdisplay-Use-ifdef-for-platform-specific-defines.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-vkdisplay-Use-ifdef-for-platform-specific-defines.patch
deleted file mode 100644
index caaa62d48a..0000000000
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-vkdisplay-Use-ifdef-for-platform-specific-defines.patch
+++ /dev/null
@@ -1,37 +0,0 @@
1From 1523ab462c1bf19055960ced255f4872b6cf9f5c Mon Sep 17 00:00:00 2001
2From: Jussi Kukkonen <jussi.kukkonen@intel.com>
3Date: Wed, 5 Jul 2017 11:00:42 +0300
4Subject: [PATCH 1/2] vkdisplay: Use ifdef for platform specific defines
5
6VK_KHR_*_SURFACE_EXTENSION_NAME are only available when corresponding
7WSI is enabled.
8
9Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
10Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=784539]
11---
12 ext/vulkan/vkdisplay.c | 4 ++++
13 1 file changed, 4 insertions(+)
14
15diff --git a/ext/vulkan/vkdisplay.c b/ext/vulkan/vkdisplay.c
16index 550134cd8..ade5d4583 100644
17--- a/ext/vulkan/vkdisplay.c
18+++ b/ext/vulkan/vkdisplay.c
19@@ -448,11 +448,15 @@ gst_vulkan_display_type_to_extension_string (GstVulkanDisplayType type)
20 if (type == GST_VULKAN_DISPLAY_TYPE_NONE)
21 return NULL;
22
23+#if GST_VULKAN_HAVE_WINDOW_XCB
24 if (type & GST_VULKAN_DISPLAY_TYPE_XCB)
25 return VK_KHR_XCB_SURFACE_EXTENSION_NAME;
26+#endif
27
28+#if GST_VULKAN_HAVE_WINDOW_WAYLAND
29 if (type & GST_VULKAN_DISPLAY_TYPE_WAYLAND)
30 return VK_KHR_WAYLAND_SURFACE_EXTENSION_NAME;
31+#endif
32
33 return NULL;
34 }
35--
362.13.2
37
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0002-vulkan-Use-the-generated-version-of-vkconfig.h.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0002-vulkan-Use-the-generated-version-of-vkconfig.h.patch
deleted file mode 100644
index 0df145dd25..0000000000
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0002-vulkan-Use-the-generated-version-of-vkconfig.h.patch
+++ /dev/null
@@ -1,64 +0,0 @@
1From c23e1dc22deb495561cffb877edb2746b740a1fa Mon Sep 17 00:00:00 2001
2From: Jussi Kukkonen <jussi.kukkonen@intel.com>
3Date: Wed, 5 Jul 2017 11:07:05 +0300
4Subject: [PATCH 2/2] vulkan: Use the generated version of vkconfig.h
5
6Build fails in ext/vulkan/xcb and ext/vulkan/wayland when:
7* building from tarball
8* building out-of-tree
9* Only one WSI integration (xcb or wayland) is enabled by configure.ac
10This is because vkconfig.h from source directory gets used instead
11of the generated one.
12
13Add the correct build directory to "-I". Use angle bracket
14include in vkapi.h so that it actually looks in the include search
15path instead of defaulting to the same (source tree) directory.
16
17Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
18Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=784539]
19---
20 ext/vulkan/vkapi.h | 2 +-
21 ext/vulkan/wayland/Makefile.am | 1 +
22 ext/vulkan/xcb/Makefile.am | 1 +
23 3 files changed, 3 insertions(+), 1 deletion(-)
24
25diff --git a/ext/vulkan/vkapi.h b/ext/vulkan/vkapi.h
26index e9c23aa92..a37c29d0f 100644
27--- a/ext/vulkan/vkapi.h
28+++ b/ext/vulkan/vkapi.h
29@@ -23,7 +23,7 @@
30
31 #define VK_PROTOTYPES
32
33-#include "vkconfig.h"
34+#include <vkconfig.h>
35 #include "vk_fwd.h"
36 #include "vkmacros.h"
37
38diff --git a/ext/vulkan/wayland/Makefile.am b/ext/vulkan/wayland/Makefile.am
39index f92d85e2c..10cfb70e6 100644
40--- a/ext/vulkan/wayland/Makefile.am
41+++ b/ext/vulkan/wayland/Makefile.am
42@@ -14,6 +14,7 @@ noinst_HEADERS = \
43
44 libgstvulkan_wayland_la_CFLAGS = \
45 -I$(top_srcdir)/gst-libs \
46+ -I$(top_builddir)/ext/vulkan \
47 -I$(top_srcdir)/ext/vulkan \
48 -I$(top_builddir)/gst-libs \
49 $(GST_PLUGINS_BASE_CFLAGS) \
50diff --git a/ext/vulkan/xcb/Makefile.am b/ext/vulkan/xcb/Makefile.am
51index 7debcff9e..b5103551b 100644
52--- a/ext/vulkan/xcb/Makefile.am
53+++ b/ext/vulkan/xcb/Makefile.am
54@@ -14,6 +14,7 @@ noinst_HEADERS = \
55
56 libgstvulkan_xcb_la_CFLAGS = \
57 -I$(top_srcdir)/gst-libs \
58+ -I$(top_builddir)/ext/vulkan \
59 -I$(top_srcdir)/ext/vulkan \
60 -I$(top_builddir)/gst-libs \
61 $(GST_PLUGINS_BASE_CFLAGS) \
62--
632.13.2
64
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0009-glimagesink-Downrank-to-marginal.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0009-glimagesink-Downrank-to-marginal.patch
deleted file mode 100644
index c81fb0f6aa..0000000000
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0009-glimagesink-Downrank-to-marginal.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1From c6b37a80806f9128de47f1ccc3f2354f8d436bb6 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Thu, 24 Sep 2015 19:47:32 +0300
4Subject: [PATCH] glimagesink: Downrank to marginal
5
6On desktop, where there is good OpenGL, xvimagesink will come up first,
7on other platforms, OpenGL can't be trusted because it's either software (like
8in a VM) or broken (like on embedded)., so let ximagesink come above.
9
10Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=751684]
11
12Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
13---
14 ext/gl/gstopengl.c | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17diff --git a/ext/gl/gstopengl.c b/ext/gl/gstopengl.c
18index a4b2540..0ccaacd 100644
19--- a/ext/gl/gstopengl.c
20+++ b/ext/gl/gstopengl.c
21@@ -118,7 +118,7 @@ plugin_init (GstPlugin * plugin)
22 #endif
23
24 if (!gst_element_register (plugin, "glimagesink",
25- GST_RANK_SECONDARY, gst_gl_image_sink_bin_get_type ())) {
26+ GST_RANK_MARGINAL, gst_gl_image_sink_bin_get_type ())) {
27 return FALSE;
28 }
29
30--
312.1.4
32
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/link-with-libvchostif.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/link-with-libvchostif.patch
deleted file mode 100644
index c382b17586..0000000000
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/link-with-libvchostif.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1Add -lvchostif to link when using -lEGL on rpi
2
3This is required because libEGL from userland uses sybols
4from this library.
5
6lib/libEGL.so.1.0.0 121: 00000000 0 FUNC GLOBAL DEFAULT UND vc_dispmanx_element_add
7 1552: 00000000 0 FUNC GLOBAL DEFAULT UND vc_dispmanx_element_add
8
9These symbols are provided by libvchostif as seen below
10
11lib/libvchostif.so
12 252: 0000b161 192 FUNC GLOBAL DEFAULT 9 vc_dispmanx_element_add
13 809: 0000b161 192 FUNC GLOBAL DEFAULT 9 vc_dispmanx_element_add
14
15With this explicit link, plugins fail during runtime
16
17(gst-plugin-scanner:571): GStreamer-WARNING **: Failed to load plugin '/usr/lib/gstreamer-1.0/libgstomx.so': Error relocating /usr/lib/libgstgl-1.0.so.0: vc_dispmanx_element_add: symbol not found
18(gst-plugin-scanner:571): GStreamer-WARNING **: Failed to load plugin '/usr/lib/gstreamer-1.0/libgstopengl.so': Error relocating /usr/lib/libgstgl-1.0.so.0: vc_dispmanx_element_add: symbol not found
19
20Signed-off-by: Khem Raj <raj.khem@gmail.com>
21
22Upstream-Status: Pending
23Index: gst-plugins-bad-1.10.4/configure.ac
24===================================================================
25--- gst-plugins-bad-1.10.4.orig/configure.ac
26+++ gst-plugins-bad-1.10.4/configure.ac
27@@ -785,7 +785,7 @@ case $host in
28 HAVE_EGL=yes
29 HAVE_GLES2=yes
30 HAVE_EGL_RPI=yes
31- EGL_LIBS="-lbcm_host -lvcos -lvchiq_arm"
32+ EGL_LIBS="-lbcm_host -lvchostif -lvcos -lvchiq_arm"
33 EGL_CFLAGS=""
34 AC_DEFINE(USE_EGL_RPI, [1], [Use RPi platform])
35 ])
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-15 20:27:49 +0000