summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnuj Mittal <anuj.mittal@intel.com>2018-05-25 14:20:05 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-06-18 11:07:58 +0100
commitae6734b1f42cbbb61988dd0318c340bc0b050920 (patch)
treec3c7230a0daba8c03ab589496d42cbf19b370347
parentc9bd85d50385cfa9a18714829a1ed32ed0cf97e4 (diff)
downloadpoky-ae6734b1f42cbbb61988dd0318c340bc0b050920.tar.gz
gstreamer1.0-plugins-base: upgrade 1.14.0 -> 1.14.1
Bugfixes only. Please see: https://gstreamer.freedesktop.org/releases/1.14/#1.14.1 Remove a backport patch and rebase one other patch. (From OE-Core rev: aea86b875ebf9fbc767d231f87bd33aa9ab18efa) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-gl-pick-up-GstVideo-1.0.gir-from-local-build-dir.patch42
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch21
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.14.1.bb (renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.14.0.bb)5
3 files changed, 11 insertions, 57 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-gl-pick-up-GstVideo-1.0.gir-from-local-build-dir.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-gl-pick-up-GstVideo-1.0.gir-from-local-build-dir.patch
deleted file mode 100644
index eba72db96b..0000000000
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-gl-pick-up-GstVideo-1.0.gir-from-local-build-dir.patch
+++ /dev/null
@@ -1,42 +0,0 @@
1From 1a7c457cf209e853148865f196edc12ba8d5c10c Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.com>
3Date: Tue, 27 Mar 2018 10:43:16 +0100
4Subject: [PATCH] gl: pick up GstVideo-1.0.gir from local build dir
5
6https://bugzilla.gnome.org/show_bug.cgi?id=794708
7
8Upstream-Status: Backport [https://cgit.freedesktop.org/gstreamer/gst-plugins-base/commit/?h=1.14&id=9261296858cb149767ceac44fd6bd13cc0de0d21]
9
10Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
11
12---
13 gst-libs/gst/gl/Makefile.am | 5 +++--
14 1 file changed, 3 insertions(+), 2 deletions(-)
15
16diff --git a/gst-libs/gst/gl/Makefile.am b/gst-libs/gst/gl/Makefile.am
17index fc15a6d..ab6cc55 100644
18--- a/gst-libs/gst/gl/Makefile.am
19+++ b/gst-libs/gst/gl/Makefile.am
20@@ -185,9 +185,10 @@ GstGL-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstgl-@GST_API_VERSION@
21 -I$(top_builddir)/gst-libs \
22 $(GST_PLUGINS_BASE_CFLAGS) \
23 $(GL_CFLAGS) \
24+ --add-include-path="$(top_builddir)/gst-libs/gst/video/" \
25 --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
26 --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
27- --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-video-@GST_API_VERSION@` \
28+ --library-path="$(top_builddir)/gst-libs/gst/video/" \
29 --library=libgstgl-@GST_API_VERSION@.la \
30 --include=Gst-@GST_API_VERSION@ \
31 --include=GstBase-@GST_API_VERSION@ \
32@@ -216,9 +217,9 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
33 $(INTROSPECTION_COMPILER) \
34 --includedir=$(srcdir) \
35 --includedir=$(builddir) \
36+ --includedir="$(top_builddir)/gst-libs/gst/video/" \
37 --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
38 --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
39- --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-video-@GST_API_VERSION@` \
40 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
41
42 CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA)
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch
index 377c89a11d..2e1190ba01 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch
@@ -1,4 +1,4 @@
1From 77b88eae845060d38cf788651f66a7ae98f9b199 Mon Sep 17 00:00:00 2001 1From 9601fc0cd6751a1affdc8717217b95931db31d7f Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Thu, 5 Apr 2018 10:26:25 +0800 3Date: Thu, 5 Apr 2018 10:26:25 +0800
4Subject: [PATCH] Makefile.am: prefix calls to pkg-config with 4Subject: [PATCH] Makefile.am: prefix calls to pkg-config with
@@ -12,7 +12,7 @@ Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
12 gst-libs/gst/allocators/Makefile.am | 4 ++-- 12 gst-libs/gst/allocators/Makefile.am | 4 ++--
13 gst-libs/gst/app/Makefile.am | 4 ++-- 13 gst-libs/gst/app/Makefile.am | 4 ++--
14 gst-libs/gst/audio/Makefile.am | 12 ++++++------ 14 gst-libs/gst/audio/Makefile.am | 12 ++++++------
15 gst-libs/gst/gl/Makefile.am | 12 ++++++------ 15 gst-libs/gst/gl/Makefile.am | 8 ++++----
16 gst-libs/gst/pbutils/Makefile.am | 12 ++++++------ 16 gst-libs/gst/pbutils/Makefile.am | 12 ++++++------
17 gst-libs/gst/riff/Makefile.am | 8 ++++---- 17 gst-libs/gst/riff/Makefile.am | 8 ++++----
18 gst-libs/gst/rtp/Makefile.am | 8 ++++---- 18 gst-libs/gst/rtp/Makefile.am | 8 ++++----
@@ -20,7 +20,7 @@ Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
20 gst-libs/gst/sdp/Makefile.am | 4 ++-- 20 gst-libs/gst/sdp/Makefile.am | 4 ++--
21 gst-libs/gst/tag/Makefile.am | 8 ++++---- 21 gst-libs/gst/tag/Makefile.am | 8 ++++----
22 gst-libs/gst/video/Makefile.am | 8 ++++---- 22 gst-libs/gst/video/Makefile.am | 8 ++++----
23 11 files changed, 42 insertions(+), 42 deletions(-) 23 11 files changed, 40 insertions(+), 40 deletions(-)
24 24
25diff --git a/gst-libs/gst/allocators/Makefile.am b/gst-libs/gst/allocators/Makefile.am 25diff --git a/gst-libs/gst/allocators/Makefile.am b/gst-libs/gst/allocators/Makefile.am
26index 1ecc950..d6417ac 100644 26index 1ecc950..d6417ac 100644
@@ -92,32 +92,29 @@ index 7fb65f2..5379f79 100644
92 92
93 CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) 93 CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
94diff --git a/gst-libs/gst/gl/Makefile.am b/gst-libs/gst/gl/Makefile.am 94diff --git a/gst-libs/gst/gl/Makefile.am b/gst-libs/gst/gl/Makefile.am
95index 16f829f..fc15a6d 100644 95index 3276d7f..0cdfe26 100644
96--- a/gst-libs/gst/gl/Makefile.am 96--- a/gst-libs/gst/gl/Makefile.am
97+++ b/gst-libs/gst/gl/Makefile.am 97+++ b/gst-libs/gst/gl/Makefile.am
98@@ -185,9 +185,9 @@ GstGL-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstgl-@GST_API_VERSION@ 98@@ -186,9 +186,9 @@ GstGL-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstgl-@GST_API_VERSION@
99 -I$(top_builddir)/gst-libs \
100 $(GST_PLUGINS_BASE_CFLAGS) \ 99 $(GST_PLUGINS_BASE_CFLAGS) \
101 $(GL_CFLAGS) \ 100 $(GL_CFLAGS) \
101 --add-include-path="$(top_builddir)/gst-libs/gst/video/" \
102- --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ 102- --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
103- --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ 103- --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
104- --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-video-@GST_API_VERSION@` \ 104 --library-path="$(top_builddir)/gst-libs/gst/video/" \
105+ --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ 105+ --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
106+ --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ 106+ --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
107+ --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-video-@GST_API_VERSION@` \
108 --library=libgstgl-@GST_API_VERSION@.la \ 107 --library=libgstgl-@GST_API_VERSION@.la \
109 --include=Gst-@GST_API_VERSION@ \ 108 --include=Gst-@GST_API_VERSION@ \
110 --include=GstBase-@GST_API_VERSION@ \ 109 --include=GstBase-@GST_API_VERSION@ \
111@@ -216,9 +216,9 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) 110@@ -218,8 +218,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
112 $(INTROSPECTION_COMPILER) \
113 --includedir=$(srcdir) \ 111 --includedir=$(srcdir) \
114 --includedir=$(builddir) \ 112 --includedir=$(builddir) \
113 --includedir="$(top_builddir)/gst-libs/gst/video/" \
115- --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ 114- --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
116- --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ 115- --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
117- --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-video-@GST_API_VERSION@` \
118+ --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ 116+ --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
119+ --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ 117+ --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
120+ --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-video-@GST_API_VERSION@` \
121 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) 118 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
122 119
123 CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA) 120 CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA)
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.14.0.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.14.1.bb
index 08397a03a8..8d7d3c6192 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.14.0.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.14.1.bb
@@ -18,10 +18,9 @@ SRC_URI = " \
18 file://0009-glimagesink-Downrank-to-marginal.patch \ 18 file://0009-glimagesink-Downrank-to-marginal.patch \
19 file://0001-gstreamer-gl.pc.in-don-t-append-GL_CFLAGS-to-CFLAGS.patch \ 19 file://0001-gstreamer-gl.pc.in-don-t-append-GL_CFLAGS-to-CFLAGS.patch \
20 file://link-with-libvchostif.patch \ 20 file://link-with-libvchostif.patch \
21 file://0001-gl-pick-up-GstVideo-1.0.gir-from-local-build-dir.patch \
22 " 21 "
23SRC_URI[md5sum] = "370271327dd23110421a9c2927ac989a" 22SRC_URI[md5sum] = "c42154ab6f85c59f0e449d8d7e290342"
24SRC_URI[sha256sum] = "7e904660ff56e02b036cf7fdfb77a50a540828ca9d2614d69ba931772e5b6940" 23SRC_URI[sha256sum] = "1026c7c3082d825d9b5d034c1a6dd8a4ebab60eb3738b0a0afde4ad2dc0b0db5"
25 24
26S = "${WORKDIR}/gst-plugins-base-${PV}" 25S = "${WORKDIR}/gst-plugins-base-${PV}"
27 26