* [PATCH 01/12] gstreamer1.0: upgrade 1.12.4 -> 1.14.0
@ 2018-05-03 8:17 Anuj Mittal
2018-05-03 8:17 ` [PATCH 02/12] gst-plugins-base: " Anuj Mittal
` (12 more replies)
0 siblings, 13 replies; 25+ messages in thread
From: Anuj Mittal @ 2018-05-03 8:17 UTC (permalink / raw)
To: openembedded-core
* For changes, please see: https://gstreamer.freedesktop.org/releases/1.14/
* Merge inc and bb file since we only have one version now.
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
meta/recipes-multimedia/gstreamer/gstreamer1.0_1.12.4.bb | 14 --------------
.../gstreamer/{gstreamer1.0.inc => gstreamer1.0_1.14.0.bb} | 12 +++++++++++-
2 files changed, 11 insertions(+), 15 deletions(-)
delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0_1.12.4.bb
rename meta/recipes-multimedia/gstreamer/{gstreamer1.0.inc => gstreamer1.0_1.14.0.bb} (84%)
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.12.4.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.12.4.bb
deleted file mode 100644
index 01b2396513..0000000000
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.12.4.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-require gstreamer1.0.inc
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d \
- file://gst/gst.h;beginline=1;endline=21;md5=e059138481205ee2c6fc1c079c016d0d"
-
-SRC_URI = " \
- http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.xz \
-"
-SRC_URI[md5sum] = "9d268f2e891cce1ac0832f1cc467d4ea"
-SRC_URI[sha256sum] = "5a8704aa4c2eeb04da192c4a9942f94f860ac1a585de90d9f914bac26a970674"
-
-S = "${WORKDIR}/gstreamer-${PV}"
-
-CVE_PRODUCT = "gstreamer"
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.14.0.bb
similarity index 84%
rename from meta/recipes-multimedia/gstreamer/gstreamer1.0.inc
rename to meta/recipes-multimedia/gstreamer/gstreamer1.0_1.14.0.bb
index c2df1f3258..b4398c8111 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0.inc
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.14.0.bb
@@ -14,11 +14,19 @@ inherit autotools pkgconfig gettext upstream-version-is-even gobject-introspecti
# (it has a custom INTROSPECTION_INIT macro, and so must be used instead of our common introspection.m4 file)
acpaths = "-I ${S}/common/m4 -I ${S}/m4"
-SRC_URI_append = " \
+LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d \
+ file://gst/gst.h;beginline=1;endline=21;md5=e059138481205ee2c6fc1c079c016d0d"
+
+S = "${WORKDIR}/gstreamer-${PV}"
+
+SRC_URI = " \
+ http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.xz \
file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \
file://gtk-doc-tweaks.patch \
file://0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch \
"
+SRC_URI[md5sum] = "63c7cbfb86aa28c4522e374dc5555b96"
+SRC_URI[sha256sum] = "fc361367f0d4b780a868a8833f9f30b9c9f4ac9faea4e6b251db8b4b0398466e"
PACKAGECONFIG ??= ""
@@ -59,3 +67,5 @@ do_configure[prefuncs] += "delete_pkg_m4_file"
do_compile_prepend() {
export GIR_EXTRA_LIBS_PATH="${B}/gst/.libs:${B}/libs/gst/base/.libs"
}
+
+CVE_PRODUCT = "gstreamer"
--
2.14.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* [PATCH 02/12] gst-plugins-base: upgrade 1.12.4 -> 1.14.0 2018-05-03 8:17 [PATCH 01/12] gstreamer1.0: upgrade 1.12.4 -> 1.14.0 Anuj Mittal @ 2018-05-03 8:17 ` Anuj Mittal 2018-05-04 11:52 ` Burton, Ross 2018-05-04 13:28 ` [PATCH v2] " Anuj Mittal 2018-05-03 8:17 ` [PATCH 03/12] gst-plugins-good: " Anuj Mittal ` (11 subsequent siblings) 12 siblings, 2 replies; 25+ messages in thread From: Anuj Mittal @ 2018-05-03 8:17 UTC (permalink / raw) To: openembedded-core * For changes, please see: https://gstreamer.freedesktop.org/releases/1.14/ * OpenGL integration library has moved to -plugins-base, add PACKAGECONFIG. * Remove one patch as that has been fixed in a different way upstream. * Merge inc/bb and refresh patches to get rid of fuzz warnings. * Remove x86 specific cached variables as they're not needed anymore. * Add jpeg to PACKAGECONFIG and enable it by default. * Port gstreamer-gl specific patches from -plugins-bad. Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> --- ...on.m4-prefix-pkgconfig-paths-with-PKG_CON.patch | 12 +- .../gstreamer/gstreamer1.0-plugins-base.inc | 50 ------- ...-don-t-hardcode-libtool-name-when-running.patch | 71 +++++----- ...gl.pc.in-don-t-append-GL_CFLAGS-to-CFLAGS.patch | 29 ++++ ...-prefix-calls-to-pkg-config-with-PKG_CONF.patch | 151 +++++++++------------ ...ssing-include-directories-when-calling-in.patch | 12 +- ...3-ssaparse-enhance-SSA-text-lines-parsing.patch | 24 ++-- ...ncorrect-reference-to-gstreamer-sdp-in-Ma.patch | 12 +- ...t-need_segment-after-sink-pad-received-GS.patch | 69 ---------- .../0009-glimagesink-Downrank-to-marginal.patch | 32 +++++ .../get-caps-from-src-pad-when-query-caps.patch | 12 +- .../link-with-libvchostif.patch | 45 ++++++ ...make-gio_unix_2_0-dependency-configurable.patch | 12 +- .../gstreamer/gstreamer1.0-plugins-base_1.12.4.bb | 18 --- .../gstreamer/gstreamer1.0-plugins-base_1.14.0.bb | 70 ++++++++++ 15 files changed, 314 insertions(+), 305 deletions(-) delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-gstreamer-gl.pc.in-don-t-append-GL_CFLAGS-to-CFLAGS.patch delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0004-subparse-set-need_segment-after-sink-pad-received-GS.patch create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0009-glimagesink-Downrank-to-marginal.patch create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/link-with-libvchostif.patch delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.12.4.bb create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.14.0.bb diff --git a/meta/recipes-multimedia/gstreamer/files/0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch b/meta/recipes-multimedia/gstreamer/files/0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch index 2cab87f9ec..1b7f115083 100644 --- a/meta/recipes-multimedia/gstreamer/files/0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch +++ b/meta/recipes-multimedia/gstreamer/files/0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch @@ -1,4 +1,4 @@ -From 90916f96262fa7b27a0a99788c69f9fd6df11000 Mon Sep 17 00:00:00 2001 +From 2b0436f9a07773fae8c74df902d7024e8bfc3512 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Tue, 24 Nov 2015 16:46:27 +0200 Subject: [PATCH] introspection.m4: prefix pkgconfig paths with @@ -10,12 +10,13 @@ is later supplied to g-ir-scanner. Upstream-Status: Pending [review on oe-core list] Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> + --- - common/m4/introspection.m4 | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) + common/m4/introspection.m4 | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/common/m4/introspection.m4 b/common/m4/introspection.m4 -index 162be57..217a6ae 100644 +index 162be57..933f979 100644 --- a/common/m4/introspection.m4 +++ b/common/m4/introspection.m4 @@ -54,14 +54,14 @@ m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL], @@ -37,6 +38,3 @@ index 162be57..217a6ae 100644 INTROSPECTION_INIT="extern void gst_init(gint*,gchar**); gst_init(NULL,NULL);" fi AC_SUBST(INTROSPECTION_SCANNER) --- -2.6.2 - diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc deleted file mode 100644 index 08130c1da4..0000000000 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc +++ /dev/null @@ -1,50 +0,0 @@ -require gstreamer1.0-plugins.inc - -SRC_URI_append = "\ - file://0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch \ - file://0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch \ - file://0003-riff-add-missing-include-directories-when-calling-in.patch \ - file://0004-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch \ -" - -LICENSE = "GPLv2+ & LGPLv2+" - -DEPENDS += "iso-codes util-linux zlib" - -inherit gettext - -PACKAGES_DYNAMIC =+ "^libgst.*" - -PACKAGECONFIG ??= " \ - ${GSTREAMER_ORC} \ - ${@bb.utils.filter('DISTRO_FEATURES', 'alsa x11', d)} \ - gio-unix-2.0 ogg pango theora vorbis \ -" - -X11DEPENDS = "virtual/libx11 libsm libxrender libxv" -X11ENABLEOPTS = "--enable-x --enable-xvideo --enable-xshm" -X11DISABLEOPTS = "--disable-x --disable-xvideo --disable-xshm" - -PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib" -PACKAGECONFIG[cdparanoia] = "--enable-cdparanoia,--disable-cdparanoia,cdparanoia" -PACKAGECONFIG[gio-unix-2.0] = "--enable-gio_unix_2_0,--disable-gio_unix_2_0,glib-2.0" -PACKAGECONFIG[ivorbis] = "--enable-ivorbis,--disable-ivorbis,tremor" -PACKAGECONFIG[ogg] = "--enable-ogg,--disable-ogg,libogg" -PACKAGECONFIG[opus] = "--enable-opus,--disable-opus,libopus" -PACKAGECONFIG[pango] = "--enable-pango,--disable-pango,pango" -PACKAGECONFIG[theora] = "--enable-theora,--disable-theora,libtheora" -PACKAGECONFIG[visual] = "--enable-libvisual,--disable-libvisual,libvisual" -PACKAGECONFIG[vorbis] = "--enable-vorbis,--disable-vorbis,libvorbis" -PACKAGECONFIG[x11] = "${X11ENABLEOPTS},${X11DISABLEOPTS},${X11DEPENDS}" - -EXTRA_OECONF += " \ - --enable-zlib \ -" - -CACHED_CONFIGUREVARS_append_x86 = " ac_cv_header_emmintrin_h=no ac_cv_header_xmmintrin_h=no" - -FILES_${MLPREFIX}libgsttag-1.0 += "${datadir}/gst-plugins-base/1.0/license-translations.dict" - -do_compile_prepend() { - export GIR_EXTRA_LIBS_PATH="${B}/gst-libs/gst/tag/.libs:${B}/gst-libs/gst/video/.libs:${B}/gst-libs/gst/audio/.libs:${B}/gst-libs/gst/rtp/.libs" -} diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch index 094bdac846..128c7f8cb6 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch @@ -1,16 +1,18 @@ -From f1d9652351e7754c63003104eceb526af424c7e0 Mon Sep 17 00:00:00 2001 +From 4d6ea58f96b9744af8d899ddca22c2695ac74b5b Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Fri, 20 Nov 2015 16:53:04 +0200 -Subject: [PATCH 1/4] Makefile.am: don't hardcode libtool name when running +Date: Thu, 5 Apr 2018 10:15:08 +0800 +Subject: [PATCH] Makefile.am: don't hardcode libtool name when running introspection tools Upstream-Status: Pending [review on oe-core maillist] Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> + --- gst-libs/gst/allocators/Makefile.am | 2 +- gst-libs/gst/app/Makefile.am | 2 +- gst-libs/gst/audio/Makefile.am | 2 +- - gst-libs/gst/fft/Makefile.am | 2 +- + gst-libs/gst/gl/Makefile.am | 2 +- gst-libs/gst/pbutils/Makefile.am | 2 +- gst-libs/gst/riff/Makefile.am | 2 +- gst-libs/gst/rtp/Makefile.am | 2 +- @@ -21,10 +23,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/gst-libs/gst/allocators/Makefile.am b/gst-libs/gst/allocators/Makefile.am -index 9361bf9..bc7f53a 100644 +index 1957d28..1ecc950 100644 --- a/gst-libs/gst/allocators/Makefile.am +++ b/gst-libs/gst/allocators/Makefile.am -@@ -38,7 +38,7 @@ GstAllocators-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstallocators-@ +@@ -42,7 +42,7 @@ GstAllocators-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstallocators-@ --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ --library=libgstallocators-@GST_API_VERSION@.la \ --include=Gst-@GST_API_VERSION@ \ @@ -34,10 +36,10 @@ index 9361bf9..bc7f53a 100644 --pkg-export gstreamer-allocators-@GST_API_VERSION@ \ --output $@ \ diff --git a/gst-libs/gst/app/Makefile.am b/gst-libs/gst/app/Makefile.am -index 6d6de8d..dcc2fe0 100644 +index 52f6ad3..5bfd606 100644 --- a/gst-libs/gst/app/Makefile.am +++ b/gst-libs/gst/app/Makefile.am -@@ -53,7 +53,7 @@ GstApp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstapp-@GST_API_VERSIO +@@ -56,7 +56,7 @@ GstApp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstapp-@GST_API_VERSIO --library=libgstapp-@GST_API_VERSION@.la \ --include=Gst-@GST_API_VERSION@ \ --include=GstBase-@GST_API_VERSION@ \ @@ -47,10 +49,10 @@ index 6d6de8d..dcc2fe0 100644 --pkg gstreamer-base-@GST_API_VERSION@ \ --pkg-export gstreamer-app-@GST_API_VERSION@ \ diff --git a/gst-libs/gst/audio/Makefile.am b/gst-libs/gst/audio/Makefile.am -index 275d222..2374196 100644 +index 2922245..7fb65f2 100644 --- a/gst-libs/gst/audio/Makefile.am +++ b/gst-libs/gst/audio/Makefile.am -@@ -116,7 +116,7 @@ GstAudio-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstaudio-@GST_API_VE +@@ -184,7 +184,7 @@ GstAudio-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstaudio-@GST_API_VE --include=Gst-@GST_API_VERSION@ \ --include=GstBase-@GST_API_VERSION@ \ --include=GstTag-@GST_API_VERSION@ \ @@ -59,24 +61,24 @@ index 275d222..2374196 100644 --pkg gstreamer-@GST_API_VERSION@ \ --pkg gstreamer-base-@GST_API_VERSION@ \ --pkg-export gstreamer-audio-@GST_API_VERSION@ \ -diff --git a/gst-libs/gst/fft/Makefile.am b/gst-libs/gst/fft/Makefile.am -index 09b3d68..f545354 100644 ---- a/gst-libs/gst/fft/Makefile.am -+++ b/gst-libs/gst/fft/Makefile.am -@@ -65,7 +65,7 @@ GstFft-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstfft-@GST_API_VERSIO - --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ - --library=libgstfft-@GST_API_VERSION@.la \ +diff --git a/gst-libs/gst/gl/Makefile.am b/gst-libs/gst/gl/Makefile.am +index a3bbc94..16f829f 100644 +--- a/gst-libs/gst/gl/Makefile.am ++++ b/gst-libs/gst/gl/Makefile.am +@@ -192,7 +192,7 @@ GstGL-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstgl-@GST_API_VERSION@ --include=Gst-@GST_API_VERSION@ \ + --include=GstBase-@GST_API_VERSION@ \ + --include=GstVideo-@GST_API_VERSION@ \ - --libtool="$(top_builddir)/libtool" \ + --libtool="$(LIBTOOL)" \ --pkg gstreamer-@GST_API_VERSION@ \ - --pkg-export gstreamer-fft-@GST_API_VERSION@ \ - --output $@ \ + --pkg gstreamer-base-@GST_API_VERSION@ \ + --pkg gstreamer-video-@GST_API_VERSION@ \ diff --git a/gst-libs/gst/pbutils/Makefile.am b/gst-libs/gst/pbutils/Makefile.am -index 64d5eb0..91dc214 100644 +index ae51993..35a6e44 100644 --- a/gst-libs/gst/pbutils/Makefile.am +++ b/gst-libs/gst/pbutils/Makefile.am -@@ -99,7 +99,7 @@ GstPbutils-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstpbutils-@GST_AP +@@ -103,7 +103,7 @@ GstPbutils-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstpbutils-@GST_AP --include=GstTag-@GST_API_VERSION@ \ --include=GstVideo-@GST_API_VERSION@ \ --include=GstAudio-@GST_API_VERSION@ \ @@ -86,10 +88,10 @@ index 64d5eb0..91dc214 100644 --pkg gstreamer-tag-@GST_API_VERSION@ \ --pkg gstreamer-video-@GST_API_VERSION@ \ diff --git a/gst-libs/gst/riff/Makefile.am b/gst-libs/gst/riff/Makefile.am -index 83d83cb..3bd8fc0 100644 +index fb53f06..e66ef4f 100644 --- a/gst-libs/gst/riff/Makefile.am +++ b/gst-libs/gst/riff/Makefile.am -@@ -47,7 +47,7 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) +@@ -49,7 +49,7 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) # --include=GstAudio-@GST_API_VERSION@ \ # --include=GstTag-@GST_API_VERSION@ \ # --include=Gst-@GST_API_VERSION@ \ @@ -99,10 +101,10 @@ index 83d83cb..3bd8fc0 100644 # --pkg gstreamer-tag-@GST_API_VERSION@ \ # --pkg gstreamer-audio-@GST_API_VERSION@ \ diff --git a/gst-libs/gst/rtp/Makefile.am b/gst-libs/gst/rtp/Makefile.am -index fdd01c1..f5445c1 100644 +index a6f971d..77ebeeb 100644 --- a/gst-libs/gst/rtp/Makefile.am +++ b/gst-libs/gst/rtp/Makefile.am -@@ -65,7 +65,7 @@ GstRtp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtp-@GST_API_VERSIO +@@ -69,7 +69,7 @@ GstRtp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtp-@GST_API_VERSIO --library=libgstrtp-@GST_API_VERSION@.la \ --include=Gst-@GST_API_VERSION@ \ --include=GstBase-@GST_API_VERSION@ \ @@ -112,10 +114,10 @@ index fdd01c1..f5445c1 100644 --pkg gstreamer-base-@GST_API_VERSION@ \ --pkg-export gstreamer-rtp-@GST_API_VERSION@ \ diff --git a/gst-libs/gst/rtsp/Makefile.am b/gst-libs/gst/rtsp/Makefile.am -index ede5706..9b0b258 100644 +index ceb07f4..db9d0fd 100644 --- a/gst-libs/gst/rtsp/Makefile.am +++ b/gst-libs/gst/rtsp/Makefile.am -@@ -72,7 +72,7 @@ GstRtsp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERS +@@ -76,7 +76,7 @@ GstRtsp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERS --include=Gio-2.0 \ --include=Gst-@GST_API_VERSION@ \ --include=GstSdp-@GST_API_VERSION@ \ @@ -125,10 +127,10 @@ index ede5706..9b0b258 100644 --pkg gstreamer-@GST_API_VERSION@ \ --pkg gstreamer-sdp-@GST_API_VERSION@ \ diff --git a/gst-libs/gst/sdp/Makefile.am b/gst-libs/gst/sdp/Makefile.am -index a90f30b..0e149b8 100644 +index e197e9b..6e05cc7 100644 --- a/gst-libs/gst/sdp/Makefile.am +++ b/gst-libs/gst/sdp/Makefile.am -@@ -32,7 +32,7 @@ GstSdp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstsdp-@GST_API_VERSIO +@@ -34,7 +34,7 @@ GstSdp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstsdp-@GST_API_VERSIO --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ --library=libgstsdp-@GST_API_VERSION@.la \ --include=Gst-@GST_API_VERSION@ \ @@ -138,10 +140,10 @@ index a90f30b..0e149b8 100644 --pkg-export gstreamer-sdp-@GST_API_VERSION@ \ --output $@ \ diff --git a/gst-libs/gst/tag/Makefile.am b/gst-libs/gst/tag/Makefile.am -index c534a4d..cafafd3 100644 +index 0247c33..c86515b 100644 --- a/gst-libs/gst/tag/Makefile.am +++ b/gst-libs/gst/tag/Makefile.am -@@ -45,7 +45,7 @@ GstTag-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgsttag-@GST_API_VERSIO +@@ -66,7 +66,7 @@ GstTag-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgsttag-@GST_API_VERSIO --library=libgsttag-@GST_API_VERSION@.la \ --include=Gst-@GST_API_VERSION@ \ --include=GstBase-@GST_API_VERSION@ \ @@ -151,10 +153,10 @@ index c534a4d..cafafd3 100644 --pkg gstreamer-base-@GST_API_VERSION@ \ --pkg-export gstreamer-tag-@GST_API_VERSION@ \ diff --git a/gst-libs/gst/video/Makefile.am b/gst-libs/gst/video/Makefile.am -index 5d31fa1..ac64eb3 100644 +index 9fc1ccf..0f8455f 100644 --- a/gst-libs/gst/video/Makefile.am +++ b/gst-libs/gst/video/Makefile.am -@@ -116,7 +116,7 @@ GstVideo-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstvideo-@GST_API_VE +@@ -124,7 +124,7 @@ GstVideo-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstvideo-@GST_API_VE --library=libgstvideo-@GST_API_VERSION@.la \ --include=Gst-@GST_API_VERSION@ \ --include=GstBase-@GST_API_VERSION@ \ @@ -163,6 +165,3 @@ index 5d31fa1..ac64eb3 100644 --pkg gstreamer-@GST_API_VERSION@ \ --pkg gstreamer-base-@GST_API_VERSION@ \ --pkg-export gstreamer-video-@GST_API_VERSION@ \ --- -2.6.2 - diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-gstreamer-gl.pc.in-don-t-append-GL_CFLAGS-to-CFLAGS.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-gstreamer-gl.pc.in-don-t-append-GL_CFLAGS-to-CFLAGS.patch new file mode 100644 index 0000000000..251dc172cb --- /dev/null +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-gstreamer-gl.pc.in-don-t-append-GL_CFLAGS-to-CFLAGS.patch @@ -0,0 +1,29 @@ +From 61a672e79c8cb1aeeeda4c968997c577ac73a8f3 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Fri, 12 May 2017 16:47:12 +0300 +Subject: [PATCH] gstreamer-gl.pc.in: don't append GL_CFLAGS to CFLAGS + +Dependencies' include directories should not be added in this way; +it causes problems when cross-compiling in sysroot environments. + +Upstream-Status: Pending + +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +Signed-off-by: Maxin B. John <maxin.john@intel.com> +--- + pkgconfig/gstreamer-gl.pc.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pkgconfig/gstreamer-gl.pc.in b/pkgconfig/gstreamer-gl.pc.in +index dc672a9..8c290ba 100644 +--- a/pkgconfig/gstreamer-gl.pc.in ++++ b/pkgconfig/gstreamer-gl.pc.in +@@ -13,4 +13,4 @@ Version: @VERSION@ + Requires: gstreamer-video-@GST_API_VERSION@ gstreamer-base-@GST_API_VERSION@ gstreamer-@GST_API_VERSION@ + + Libs: -L${libdir} -lgstgl-@GST_API_VERSION@ +-Cflags: -I${includedir} -I${libdir}/gstreamer-@GST_API_VERSION@/include @GL_CFLAGS@ ++Cflags: -I${includedir} -I${libdir}/gstreamer-@GST_API_VERSION@/include +-- +2.7.4 + 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 6616e2cf0d..dc15d93eb0 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,16 +1,17 @@ -From 990b653c7b6de1937ec759019982d6c5f15770f7 Mon Sep 17 00:00:00 2001 +From f523721e453febfb3f62f3ba1e9fefb31dcec471 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Mon, 26 Oct 2015 16:38:18 +0200 -Subject: [PATCH 2/4] Makefile.am: prefix calls to pkg-config with +Date: Thu, 5 Apr 2018 10:26:25 +0800 +Subject: [PATCH] Makefile.am: prefix calls to pkg-config with PKG_CONFIG_SYSROOT_DIR Upstream-Status: Pending [review on oe-core maillist] Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> + --- gst-libs/gst/allocators/Makefile.am | 4 ++-- gst-libs/gst/app/Makefile.am | 4 ++-- gst-libs/gst/audio/Makefile.am | 12 ++++++------ - gst-libs/gst/fft/Makefile.am | 4 ++-- gst-libs/gst/pbutils/Makefile.am | 12 ++++++------ gst-libs/gst/riff/Makefile.am | 8 ++++---- gst-libs/gst/rtp/Makefile.am | 8 ++++---- @@ -18,13 +19,13 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> gst-libs/gst/sdp/Makefile.am | 4 ++-- gst-libs/gst/tag/Makefile.am | 8 ++++---- gst-libs/gst/video/Makefile.am | 8 ++++---- - 11 files changed, 38 insertions(+), 38 deletions(-) + 10 files changed, 36 insertions(+), 36 deletions(-) -Index: gst-plugins-base-1.12.3/gst-libs/gst/allocators/Makefile.am -=================================================================== ---- gst-plugins-base-1.12.3.orig/gst-libs/gst/allocators/Makefile.am -+++ gst-plugins-base-1.12.3/gst-libs/gst/allocators/Makefile.am -@@ -36,7 +36,7 @@ GstAllocators-@GST_API_VERSION@.gir: $(I +diff --git a/gst-libs/gst/allocators/Makefile.am b/gst-libs/gst/allocators/Makefile.am +index 1ecc950..d6417ac 100644 +--- a/gst-libs/gst/allocators/Makefile.am ++++ b/gst-libs/gst/allocators/Makefile.am +@@ -39,7 +39,7 @@ GstAllocators-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstallocators-@ --c-include "gst/allocators/allocators.h" \ -I$(top_srcdir)/gst-libs \ -I$(top_builddir)/gst-libs \ @@ -33,7 +34,7 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/allocators/Makefile.am --library=libgstallocators-@GST_API_VERSION@.la \ --include=Gst-@GST_API_VERSION@ \ --libtool="$(LIBTOOL)" \ -@@ -60,7 +60,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= +@@ -63,7 +63,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) $(INTROSPECTION_COMPILER) \ --includedir=$(srcdir) \ --includedir=$(builddir) \ @@ -42,11 +43,11 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/allocators/Makefile.am $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA) -Index: gst-plugins-base-1.12.3/gst-libs/gst/app/Makefile.am -=================================================================== ---- gst-plugins-base-1.12.3.orig/gst-libs/gst/app/Makefile.am -+++ gst-plugins-base-1.12.3/gst-libs/gst/app/Makefile.am -@@ -48,8 +48,8 @@ GstApp-@GST_API_VERSION@.gir: $(INTROSPE +diff --git a/gst-libs/gst/app/Makefile.am b/gst-libs/gst/app/Makefile.am +index 5bfd606..6441674 100644 +--- a/gst-libs/gst/app/Makefile.am ++++ b/gst-libs/gst/app/Makefile.am +@@ -51,8 +51,8 @@ GstApp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstapp-@GST_API_VERSIO --c-include "gst/app/app.h" \ -I$(top_srcdir)/gst-libs \ -I$(top_builddir)/gst-libs \ @@ -57,11 +58,11 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/app/Makefile.am --library=libgstapp-@GST_API_VERSION@.la \ --include=Gst-@GST_API_VERSION@ \ --include=GstBase-@GST_API_VERSION@ \ -Index: gst-plugins-base-1.12.3/gst-libs/gst/audio/Makefile.am -=================================================================== ---- gst-plugins-base-1.12.3.orig/gst-libs/gst/audio/Makefile.am -+++ gst-plugins-base-1.12.3/gst-libs/gst/audio/Makefile.am -@@ -167,12 +167,12 @@ GstAudio-@GST_API_VERSION@.gir: $(INTROS +diff --git a/gst-libs/gst/audio/Makefile.am b/gst-libs/gst/audio/Makefile.am +index 7fb65f2..5379f79 100644 +--- a/gst-libs/gst/audio/Makefile.am ++++ b/gst-libs/gst/audio/Makefile.am +@@ -174,12 +174,12 @@ GstAudio-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstaudio-@GST_API_VE -I$(top_srcdir)/gst-libs \ -I$(top_builddir)/gst-libs \ --c-include "gst/audio/audio.h" \ @@ -78,7 +79,7 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/audio/Makefile.am --library-path="$(top_builddir)/gst-libs/gst/tag/" \ --include=Gst-@GST_API_VERSION@ \ --include=GstBase-@GST_API_VERSION@ \ -@@ -201,8 +201,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= +@@ -208,8 +208,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) --includedir=$(srcdir) \ --includedir=$(builddir) \ --includedir="$(top_builddir)/gst-libs/gst/tag/" \ @@ -89,33 +90,11 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/audio/Makefile.am $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) -Index: gst-plugins-base-1.12.3/gst-libs/gst/fft/Makefile.am -=================================================================== ---- gst-plugins-base-1.12.3.orig/gst-libs/gst/fft/Makefile.am -+++ gst-plugins-base-1.12.3/gst-libs/gst/fft/Makefile.am -@@ -63,7 +63,7 @@ GstFft-@GST_API_VERSION@.gir: $(INTROSPE - --c-include "gst/fft/fft.h" \ - -I$(top_srcdir)/gst-libs \ - -I$(top_builddir)/gst-libs \ -- --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ -+ --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ - --library=libgstfft-@GST_API_VERSION@.la \ - --include=Gst-@GST_API_VERSION@ \ - --libtool="$(LIBTOOL)" \ -@@ -87,7 +87,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= - $(INTROSPECTION_COMPILER) \ - --includedir=$(srcdir) \ - --includedir=$(builddir) \ -- --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ -+ --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ - $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) - - CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA) -Index: gst-plugins-base-1.12.3/gst-libs/gst/pbutils/Makefile.am -=================================================================== ---- gst-plugins-base-1.12.3.orig/gst-libs/gst/pbutils/Makefile.am -+++ gst-plugins-base-1.12.3/gst-libs/gst/pbutils/Makefile.am -@@ -85,14 +85,14 @@ GstPbutils-@GST_API_VERSION@.gir: $(INTR +diff --git a/gst-libs/gst/pbutils/Makefile.am b/gst-libs/gst/pbutils/Makefile.am +index 35a6e44..49d6894 100644 +--- a/gst-libs/gst/pbutils/Makefile.am ++++ b/gst-libs/gst/pbutils/Makefile.am +@@ -88,14 +88,14 @@ GstPbutils-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstpbutils-@GST_AP --c-include "gst/pbutils/pbutils.h" \ -I$(top_srcdir)/gst-libs \ -I$(top_builddir)/gst-libs \ @@ -134,7 +113,7 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/pbutils/Makefile.am --library-path="$(top_builddir)/gst-libs/gst/tag/" \ --library-path="$(top_builddir)/gst-libs/gst/video/" \ --library-path="$(top_builddir)/gst-libs/gst/audio/" \ -@@ -125,8 +125,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= +@@ -128,8 +128,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) $(INTROSPECTION_COMPILER) \ --includedir=$(srcdir) \ --includedir=$(builddir) \ @@ -145,11 +124,11 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/pbutils/Makefile.am --includedir="$(top_builddir)/gst-libs/gst/tag/" \ --includedir="$(top_builddir)/gst-libs/gst/video/" \ --includedir="$(top_builddir)/gst-libs/gst/audio/" \ -Index: gst-plugins-base-1.12.3/gst-libs/gst/riff/Makefile.am -=================================================================== ---- gst-plugins-base-1.12.3.orig/gst-libs/gst/riff/Makefile.am -+++ gst-plugins-base-1.12.3/gst-libs/gst/riff/Makefile.am -@@ -42,8 +42,8 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS +diff --git a/gst-libs/gst/riff/Makefile.am b/gst-libs/gst/riff/Makefile.am +index e66ef4f..c8c588a 100644 +--- a/gst-libs/gst/riff/Makefile.am ++++ b/gst-libs/gst/riff/Makefile.am +@@ -43,8 +43,8 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) # --c-include "gst/riff/riff.h" \ # --add-include-path=$(builddir)/../tag \ # --add-include-path=$(builddir)/../audio \ @@ -160,7 +139,7 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/riff/Makefile.am # --library=libgstriff-@GST_API_VERSION@.la \ # --include=GstAudio-@GST_API_VERSION@ \ # --include=GstTag-@GST_API_VERSION@ \ -@@ -74,8 +74,8 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS +@@ -75,8 +75,8 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) # --includedir=$(builddir) \ # --includedir=$(builddir)/../tag \ # --includedir=$(builddir)/../audio \ @@ -171,11 +150,11 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/riff/Makefile.am # $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) # #CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA) -Index: gst-plugins-base-1.12.3/gst-libs/gst/rtp/Makefile.am -=================================================================== ---- gst-plugins-base-1.12.3.orig/gst-libs/gst/rtp/Makefile.am -+++ gst-plugins-base-1.12.3/gst-libs/gst/rtp/Makefile.am -@@ -61,8 +61,8 @@ GstRtp-@GST_API_VERSION@.gir: $(INTROSPE +diff --git a/gst-libs/gst/rtp/Makefile.am b/gst-libs/gst/rtp/Makefile.am +index 77ebeeb..9aee788 100644 +--- a/gst-libs/gst/rtp/Makefile.am ++++ b/gst-libs/gst/rtp/Makefile.am +@@ -64,8 +64,8 @@ GstRtp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtp-@GST_API_VERSIO --c-include "gst/rtp/rtp.h" \ -I$(top_builddir)/gst-libs \ -I$(top_srcdir)/gst-libs \ @@ -186,7 +165,7 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/rtp/Makefile.am --library=libgstrtp-@GST_API_VERSION@.la \ --include=Gst-@GST_API_VERSION@ \ --include=GstBase-@GST_API_VERSION@ \ -@@ -89,8 +89,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= +@@ -92,8 +92,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) $(INTROSPECTION_COMPILER) \ --includedir=$(srcdir) \ --includedir=$(builddir) \ @@ -197,11 +176,11 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/rtp/Makefile.am $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) -Index: gst-plugins-base-1.12.3/gst-libs/gst/rtsp/Makefile.am -=================================================================== ---- gst-plugins-base-1.12.3.orig/gst-libs/gst/rtsp/Makefile.am -+++ gst-plugins-base-1.12.3/gst-libs/gst/rtsp/Makefile.am -@@ -68,7 +68,7 @@ GstRtsp-@GST_API_VERSION@.gir: $(INTROSP +diff --git a/gst-libs/gst/rtsp/Makefile.am b/gst-libs/gst/rtsp/Makefile.am +index db9d0fd..79027cb 100644 +--- a/gst-libs/gst/rtsp/Makefile.am ++++ b/gst-libs/gst/rtsp/Makefile.am +@@ -71,7 +71,7 @@ GstRtsp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERS -I$(top_builddir)/gst-libs \ -I$(top_srcdir)/gst-libs \ --add-include-path=$(builddir)/../sdp \ @@ -210,7 +189,7 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/rtsp/Makefile.am --library=libgstrtsp-@GST_API_VERSION@.la \ --include=Gio-2.0 \ --include=Gst-@GST_API_VERSION@ \ -@@ -98,7 +98,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= +@@ -101,7 +101,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) --includedir=$(srcdir) \ --includedir=$(builddir) \ --includedir=$(builddir)/../sdp \ @@ -219,11 +198,11 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/rtsp/Makefile.am $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) -Index: gst-plugins-base-1.12.3/gst-libs/gst/sdp/Makefile.am -=================================================================== ---- gst-plugins-base-1.12.3.orig/gst-libs/gst/sdp/Makefile.am -+++ gst-plugins-base-1.12.3/gst-libs/gst/sdp/Makefile.am -@@ -30,7 +30,7 @@ GstSdp-@GST_API_VERSION@.gir: $(INTROSPE +diff --git a/gst-libs/gst/sdp/Makefile.am b/gst-libs/gst/sdp/Makefile.am +index 6e05cc7..c7cf514 100644 +--- a/gst-libs/gst/sdp/Makefile.am ++++ b/gst-libs/gst/sdp/Makefile.am +@@ -31,7 +31,7 @@ GstSdp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstsdp-@GST_API_VERSIO --warn-all \ --c-include "gst/sdp/sdp.h" \ -I$(top_srcdir)/gst-libs \ @@ -232,7 +211,7 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/sdp/Makefile.am --library=libgstsdp-@GST_API_VERSION@.la \ --include=Gst-@GST_API_VERSION@ \ --libtool="$(LIBTOOL)" \ -@@ -54,7 +54,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= +@@ -55,7 +55,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) $(INTROSPECTION_COMPILER) \ --includedir=$(srcdir) \ --includedir=$(builddir) \ @@ -241,11 +220,11 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/sdp/Makefile.am $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA) -Index: gst-plugins-base-1.12.3/gst-libs/gst/tag/Makefile.am -=================================================================== ---- gst-plugins-base-1.12.3.orig/gst-libs/gst/tag/Makefile.am -+++ gst-plugins-base-1.12.3/gst-libs/gst/tag/Makefile.am -@@ -59,8 +59,8 @@ GstTag-@GST_API_VERSION@.gir: $(INTROSPE +diff --git a/gst-libs/gst/tag/Makefile.am b/gst-libs/gst/tag/Makefile.am +index c86515b..363e6d2 100644 +--- a/gst-libs/gst/tag/Makefile.am ++++ b/gst-libs/gst/tag/Makefile.am +@@ -61,8 +61,8 @@ GstTag-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgsttag-@GST_API_VERSIO --c-include "gst/tag/tag.h" \ -I$(top_srcdir)/gst-libs \ -I$(top_builddir)/gst-libs \ @@ -256,7 +235,7 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/tag/Makefile.am --library=libgsttag-@GST_API_VERSION@.la \ --include=Gst-@GST_API_VERSION@ \ --include=GstBase-@GST_API_VERSION@ \ -@@ -87,8 +87,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= +@@ -89,8 +89,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) $(INTROSPECTION_COMPILER) \ --includedir=$(srcdir) \ --includedir=$(builddir) \ @@ -267,11 +246,11 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/tag/Makefile.am $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) -Index: gst-plugins-base-1.12.3/gst-libs/gst/video/Makefile.am -=================================================================== ---- gst-plugins-base-1.12.3.orig/gst-libs/gst/video/Makefile.am -+++ gst-plugins-base-1.12.3/gst-libs/gst/video/Makefile.am -@@ -116,8 +116,8 @@ GstVideo-@GST_API_VERSION@.gir: $(INTROS +diff --git a/gst-libs/gst/video/Makefile.am b/gst-libs/gst/video/Makefile.am +index 0f8455f..8c9955c 100644 +--- a/gst-libs/gst/video/Makefile.am ++++ b/gst-libs/gst/video/Makefile.am +@@ -119,8 +119,8 @@ GstVideo-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstvideo-@GST_API_VE --c-include "gst/video/video.h" \ -I$(top_srcdir)/gst-libs \ -I$(top_builddir)/gst-libs \ @@ -282,7 +261,7 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/video/Makefile.am --library=libgstvideo-@GST_API_VERSION@.la \ --include=Gst-@GST_API_VERSION@ \ --include=GstBase-@GST_API_VERSION@ \ -@@ -144,8 +144,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= +@@ -147,8 +147,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) $(INTROSPECTION_COMPILER) \ --includedir=$(srcdir) \ --includedir=$(builddir) \ diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-riff-add-missing-include-directories-when-calling-in.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-riff-add-missing-include-directories-when-calling-in.patch index 9b66f7f49d..98ffdb1c10 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-riff-add-missing-include-directories-when-calling-in.patch +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-riff-add-missing-include-directories-when-calling-in.patch @@ -1,20 +1,21 @@ -From 3c2c2d5dd08aa30ed0e8acd8566ec99412bb8209 Mon Sep 17 00:00:00 2001 +From b9765efb1696e3e2e79f2955f759be199fe34882 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Mon, 26 Oct 2015 17:29:37 +0200 -Subject: [PATCH 3/4] riff: add missing include directories when calling +Subject: [PATCH] riff: add missing include directories when calling introspection scanner Upstream-Status: Pending [review on oe-core maillist] Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> + --- gst-libs/gst/riff/Makefile.am | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gst-libs/gst/riff/Makefile.am b/gst-libs/gst/riff/Makefile.am -index 0a115cc..5057a58 100644 +index c8c588a..c096453 100644 --- a/gst-libs/gst/riff/Makefile.am +++ b/gst-libs/gst/riff/Makefile.am -@@ -39,6 +39,8 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) +@@ -41,6 +41,8 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) # --strip-prefix=Gst \ # --warn-all \ # --c-include "gst/riff/riff.h" \ @@ -23,6 +24,3 @@ index 0a115cc..5057a58 100644 # --add-include-path=$(builddir)/../tag \ # --add-include-path=$(builddir)/../audio \ # --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ --- -2.6.2 - diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-ssaparse-enhance-SSA-text-lines-parsing.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-ssaparse-enhance-SSA-text-lines-parsing.patch index 9fbebd5700..9e95524057 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-ssaparse-enhance-SSA-text-lines-parsing.patch +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-ssaparse-enhance-SSA-text-lines-parsing.patch @@ -1,7 +1,7 @@ -From be6163cfa3a255493f9d75bad9541cbfe1723fee Mon Sep 17 00:00:00 2001 +From 918c96b24d10f61b7455b4cef3bab490849d0d77 Mon Sep 17 00:00:00 2001 From: Mingke Wang <mingke.wang@freescale.com> Date: Thu, 19 Mar 2015 14:17:10 +0800 -Subject: [PATCH 3/4] ssaparse: enhance SSA text lines parsing. +Subject: [PATCH] ssaparse: enhance SSA text lines parsing. some parser will pass in the original ssa text line which starts with "Dialog:" and there's are maybe multiple Dialog lines in one input buffer. @@ -10,13 +10,18 @@ Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=747496] Signed-off-by: Mingke Wang <mingke.wang@freescale.com> +--- + gst/subparse/gstssaparse.c | 150 ++++++++++++++++++++++++++++++++++++++++----- + 1 file changed, 134 insertions(+), 16 deletions(-) + mode change 100644 => 100755 gst/subparse/gstssaparse.c + diff --git a/gst/subparse/gstssaparse.c b/gst/subparse/gstssaparse.c old mode 100644 new mode 100755 -index 06ecef9..0ab5dce +index c849c08..4b9636c --- a/gst/subparse/gstssaparse.c +++ b/gst/subparse/gstssaparse.c -@@ -260,6 +260,7 @@ gst_ssa_parse_remove_override_codes (GstSsaParse * parse, gchar * txt) +@@ -262,6 +262,7 @@ gst_ssa_parse_remove_override_codes (GstSsaParse * parse, gchar * txt) * gst_ssa_parse_push_line: * @parse: caller element * @txt: text to push @@ -24,7 +29,7 @@ index 06ecef9..0ab5dce * @start: timestamp for the buffer * @duration: duration for the buffer * -@@ -269,27 +270,133 @@ gst_ssa_parse_remove_override_codes (GstSsaParse * parse, gchar * txt) +@@ -271,27 +272,133 @@ gst_ssa_parse_remove_override_codes (GstSsaParse * parse, gchar * txt) * Returns: result of the push of the created buffer */ static GstFlowReturn @@ -169,7 +174,7 @@ index 06ecef9..0ab5dce GST_LOG_OBJECT (parse, "Text : %s", t); if (gst_ssa_parse_remove_override_codes (parse, t)) { -@@ -307,13 +414,22 @@ gst_ssa_parse_push_line (GstSsaParse * parse, gchar * txt, +@@ -309,13 +416,22 @@ gst_ssa_parse_push_line (GstSsaParse * parse, gchar * txt, gst_buffer_fill (buf, 0, escaped, len + 1); gst_buffer_set_size (buf, len); g_free (escaped); @@ -196,7 +201,7 @@ index 06ecef9..0ab5dce ret = gst_pad_push (parse->srcpad, buf); -@@ -333,6 +449,7 @@ gst_ssa_parse_chain (GstPad * sinkpad, GstObject * parent, GstBuffer * buf) +@@ -335,6 +451,7 @@ gst_ssa_parse_chain (GstPad * sinkpad, GstObject * parent, GstBuffer * buf) GstClockTime ts; gchar *txt; GstMapInfo map; @@ -204,7 +209,7 @@ index 06ecef9..0ab5dce if (G_UNLIKELY (!parse->framed)) goto not_framed; -@@ -350,13 +467,14 @@ gst_ssa_parse_chain (GstPad * sinkpad, GstObject * parent, GstBuffer * buf) +@@ -352,13 +469,14 @@ gst_ssa_parse_chain (GstPad * sinkpad, GstObject * parent, GstBuffer * buf) /* make double-sure it's 0-terminated and all */ gst_buffer_map (buf, &map, GST_MAP_READ); txt = g_strndup ((gchar *) map.data, map.size); @@ -220,6 +225,3 @@ index 06ecef9..0ab5dce if (ret != GST_FLOW_OK && GST_CLOCK_TIME_IS_VALID (ts)) { GstSegment segment; --- -1.7.9.5 - diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0004-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0004-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch index 4adf605460..aaeb611fec 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0004-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0004-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch @@ -1,20 +1,21 @@ -From 4330915d88dc4dd46eb4c28d756482b767c2747f Mon Sep 17 00:00:00 2001 +From 53b5868491cf99ee797192395dbfeb69df23edd2 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Mon, 26 Oct 2015 17:30:14 +0200 -Subject: [PATCH 4/4] rtsp: drop incorrect reference to gstreamer-sdp in +Subject: [PATCH] rtsp: drop incorrect reference to gstreamer-sdp in Makefile.am Upstream-Status: Pending [review on oe-core maillist] Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> + --- gst-libs/gst/rtsp/Makefile.am | 1 - 1 file changed, 1 deletion(-) diff --git a/gst-libs/gst/rtsp/Makefile.am b/gst-libs/gst/rtsp/Makefile.am -index 4f6d9f8..0afa370 100644 +index 79027cb..2987e23 100644 --- a/gst-libs/gst/rtsp/Makefile.am +++ b/gst-libs/gst/rtsp/Makefile.am -@@ -75,7 +75,6 @@ GstRtsp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERS +@@ -79,7 +79,6 @@ GstRtsp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERS --libtool="$(LIBTOOL)" \ --pkg gio-2.0 \ --pkg gstreamer-@GST_API_VERSION@ \ @@ -22,6 +23,3 @@ index 4f6d9f8..0afa370 100644 --pkg-export gstreamer-rtsp-@GST_API_VERSION@ \ --add-init-section="$(INTROSPECTION_INIT)" \ --output $@ \ --- -2.6.2 - diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0004-subparse-set-need_segment-after-sink-pad-received-GS.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0004-subparse-set-need_segment-after-sink-pad-received-GS.patch deleted file mode 100644 index b924e38824..0000000000 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0004-subparse-set-need_segment-after-sink-pad-received-GS.patch +++ /dev/null @@ -1,69 +0,0 @@ -From ed09c8fd2c9c2b5384b72cc70af3728be6694e64 Mon Sep 17 00:00:00 2001 -From: Mingke Wang <mingke.wang@freescale.com> -Date: Thu, 19 Mar 2015 14:20:26 +0800 -Subject: [PATCH 4/4] subparse: set need_segment after sink pad received - GST_EVENT_SEGMENT - -subparse works in push mode, chain funciton will be called once -up stream element finished the seeking and flushing. -if set need_segment flag in src pad event handler, the segment -event will be pushed earlier, result in the subtitle text will -be send out to down stream from the beginning. - -Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=747498] - -Signed-off-by: Mingke Wang <mingke.wang@freescale.com> - -diff --git a/gst/subparse/gstsubparse.c b/gst/subparse/gstsubparse.c -old mode 100644 -new mode 100755 -index b565e93..7741ccc ---- a/gst/subparse/gstsubparse.c -+++ b/gst/subparse/gstsubparse.c -@@ -266,22 +266,20 @@ gst_sub_parse_src_event (GstPad * pad, GstObject * parent, GstEvent * event) - goto beach; - } - -+ /* Apply the seek to our segment */ -+ gst_segment_do_seek (&self->segment, rate, format, flags, -+ start_type, start, stop_type, stop, &update); -+ -+ GST_DEBUG_OBJECT (self, "segment after seek: %" GST_SEGMENT_FORMAT, -+ &self->segment); -+ - /* Convert that seek to a seeking in bytes at position 0, - FIXME: could use an index */ - ret = gst_pad_push_event (self->sinkpad, - gst_event_new_seek (rate, GST_FORMAT_BYTES, flags, - GST_SEEK_TYPE_SET, 0, GST_SEEK_TYPE_NONE, 0)); - -- if (ret) { -- /* Apply the seek to our segment */ -- gst_segment_do_seek (&self->segment, rate, format, flags, -- start_type, start, stop_type, stop, &update); -- -- GST_DEBUG_OBJECT (self, "segment after seek: %" GST_SEGMENT_FORMAT, -- &self->segment); -- -- self->need_segment = TRUE; -- } else { -+ if (!ret) { - GST_WARNING_OBJECT (self, "seek to 0 bytes failed"); - } - -@@ -1641,8 +1639,10 @@ gst_sub_parse_sink_event (GstPad * pad, GstObject * parent, GstEvent * event) - gst_event_parse_segment (event, &s); - if (s->format == GST_FORMAT_TIME) - gst_event_copy_segment (event, &self->segment); -- GST_DEBUG_OBJECT (self, "newsegment (%s)", -- gst_format_get_name (self->segment.format)); -+ GST_DEBUG_OBJECT (self, "newsegment (%s) %" GST_SEGMENT_FORMAT, -+ gst_format_get_name (self->segment.format), &self->segment); -+ -+ self->need_segment = TRUE; - - /* if not time format, we'll either start with a 0 timestamp anyway or - * it's following a seek in which case we'll have saved the requested --- -1.7.9.5 - diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0009-glimagesink-Downrank-to-marginal.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0009-glimagesink-Downrank-to-marginal.patch new file mode 100644 index 0000000000..c81fb0f6aa --- /dev/null +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0009-glimagesink-Downrank-to-marginal.patch @@ -0,0 +1,32 @@ +From c6b37a80806f9128de47f1ccc3f2354f8d436bb6 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Thu, 24 Sep 2015 19:47:32 +0300 +Subject: [PATCH] glimagesink: Downrank to marginal + +On desktop, where there is good OpenGL, xvimagesink will come up first, +on other platforms, OpenGL can't be trusted because it's either software (like +in a VM) or broken (like on embedded)., so let ximagesink come above. + +Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=751684] + +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + ext/gl/gstopengl.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ext/gl/gstopengl.c b/ext/gl/gstopengl.c +index a4b2540..0ccaacd 100644 +--- a/ext/gl/gstopengl.c ++++ b/ext/gl/gstopengl.c +@@ -118,7 +118,7 @@ plugin_init (GstPlugin * plugin) + #endif + + if (!gst_element_register (plugin, "glimagesink", +- GST_RANK_SECONDARY, gst_gl_image_sink_bin_get_type ())) { ++ GST_RANK_MARGINAL, gst_gl_image_sink_bin_get_type ())) { + return FALSE; + } + +-- +2.1.4 + diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/get-caps-from-src-pad-when-query-caps.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/get-caps-from-src-pad-when-query-caps.patch index c8e6287a55..a4727e23ea 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/get-caps-from-src-pad-when-query-caps.patch +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/get-caps-from-src-pad-when-query-caps.patch @@ -1,4 +1,4 @@ -From af0dac26f62aaceb4bf266720911953793e0fc5d Mon Sep 17 00:00:00 2001 +From 41de2ec64ab06bb58c82c1659adaa3811bc5bcf8 Mon Sep 17 00:00:00 2001 From: zhouming <b42586@freescale.com> Date: Wed, 14 May 2014 10:16:20 +0800 Subject: [PATCH] ENGR00312515: get caps from src pad when query caps @@ -8,18 +8,19 @@ https://bugzilla.gnome.org/show_bug.cgi?id=728312 Upstream-Status: Pending Signed-off-by: zhouming <b42586@freescale.com> + --- - gst-libs/gst/tag/gsttagdemux.c | 13 +++++++++++++ + gst-libs/gst/tag/gsttagdemux.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) mode change 100644 => 100755 gst-libs/gst/tag/gsttagdemux.c diff --git a/gst-libs/gst/tag/gsttagdemux.c b/gst-libs/gst/tag/gsttagdemux.c old mode 100644 new mode 100755 -index 9b6c478..ae2294a +index 8a127c8..71c5d78 --- a/gst-libs/gst/tag/gsttagdemux.c +++ b/gst-libs/gst/tag/gsttagdemux.c -@@ -1769,6 +1769,19 @@ gst_tag_demux_pad_query (GstPad * pad, GstObject * parent, GstQuery * query) +@@ -1759,6 +1759,19 @@ gst_tag_demux_pad_query (GstPad * pad, GstObject * parent, GstQuery * query) } break; } @@ -39,6 +40,3 @@ index 9b6c478..ae2294a default: res = gst_pad_query_default (pad, parent, query); break; --- -1.7.9.5 - diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/link-with-libvchostif.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/link-with-libvchostif.patch new file mode 100644 index 0000000000..d5a7f6bdc2 --- /dev/null +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/link-with-libvchostif.patch @@ -0,0 +1,45 @@ +From 9866f51e5e0913f1e453eb574618bf7432f38cb6 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 11 Apr 2018 10:46:33 +0800 +Subject: [PATCH] Add -lvchostif to link when using -lEGL on rpi + +This is required because libEGL from userland uses sybols +from this library. + +lib/libEGL.so.1.0.0 121: 00000000 0 FUNC GLOBAL DEFAULT UND vc_dispmanx_element_add + 1552: 00000000 0 FUNC GLOBAL DEFAULT UND vc_dispmanx_element_add + +These symbols are provided by libvchostif as seen below + +lib/libvchostif.so + 252: 0000b161 192 FUNC GLOBAL DEFAULT 9 vc_dispmanx_element_add + 809: 0000b161 192 FUNC GLOBAL DEFAULT 9 vc_dispmanx_element_add + +With this explicit link, plugins fail during runtime + +(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 +(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 + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> +--- + m4/gst-gl.m4 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/m4/gst-gl.m4 b/m4/gst-gl.m4 +index 1e97240..ab7774c 100644 +--- a/m4/gst-gl.m4 ++++ b/m4/gst-gl.m4 +@@ -231,7 +231,7 @@ case $host in + HAVE_EGL=yes + HAVE_GLES2=yes + HAVE_EGL_RPI=yes +- EGL_LIBS="-lbcm_host -lvcos -lvchiq_arm" ++ EGL_LIBS="-lbcm_host -lvchostif -lvcos -lvchiq_arm" + EGL_CFLAGS="" + AC_DEFINE(USE_EGL_RPI, [1], [Use RPi platform]) + ]) +-- +2.7.4 + diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/make-gio_unix_2_0-dependency-configurable.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/make-gio_unix_2_0-dependency-configurable.patch index 413eff0695..23950b67f2 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/make-gio_unix_2_0-dependency-configurable.patch +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/make-gio_unix_2_0-dependency-configurable.patch @@ -1,4 +1,4 @@ -From 10d2a977ee1d469f0bf9059bb2d0b55fd2eecbac Mon Sep 17 00:00:00 2001 +From 7ffa6e3d00e1d8a060f3f4c2bb9a72691af05d79 Mon Sep 17 00:00:00 2001 From: Andre McCurdy <armccurdy@gmail.com> Date: Wed, 20 Jan 2016 13:00:00 -0800 Subject: [PATCH] make gio_unix_2_0 dependency configurable @@ -17,16 +17,17 @@ instead of AG_GST_CHECK_FEATURE. Upstream-Status: Pending Signed-off-by: Andre McCurdy <armccurdy@gmail.com> + --- configure.ac | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/configure.ac b/configure.ac -index 9c52aeb..26cacd6 100644 +index 12807bc..35a0bf3 100644 --- a/configure.ac +++ b/configure.ac -@@ -752,9 +752,16 @@ AC_SUBST(FT2_CFLAGS) - fi dnl of EXT plugins +@@ -806,9 +806,16 @@ AM_CONDITIONAL(HAVE_PNG, test "x$HAVE_PNG" = "xyes") + AM_CONDITIONAL(HAVE_JPEG, test "x$HAVE_JPEG" = "xyes") dnl *** gio-unix-2.0 for tests/check/pipelines/tcp.c *** +AC_ARG_ENABLE([gio_unix_2_0], @@ -42,6 +43,3 @@ index 9c52aeb..26cacd6 100644 AM_CONDITIONAL(USE_GIO_UNIX_2_0, test "x$HAVE_GIO_UNIX_2_0" = "xyes") dnl *** finalize CFLAGS, LDFLAGS, LIBS --- -1.9.1 - diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.12.4.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.12.4.bb deleted file mode 100644 index dd895bbcb1..0000000000 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.12.4.bb +++ /dev/null @@ -1,18 +0,0 @@ -require gstreamer1.0-plugins-base.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=c54ce9345727175ff66d17b67ff51f58 \ - file://COPYING.LIB;md5=6762ed442b3822387a51c92d928ead0d \ - file://common/coverage/coverage-report.pl;beginline=2;endline=17;md5=a4e1830fce078028c8f0974161272607" - -SRC_URI = " \ - http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-${PV}.tar.xz \ - file://get-caps-from-src-pad-when-query-caps.patch \ - file://0003-ssaparse-enhance-SSA-text-lines-parsing.patch \ - file://0004-subparse-set-need_segment-after-sink-pad-received-GS.patch \ - file://make-gio_unix_2_0-dependency-configurable.patch \ - file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \ -" -SRC_URI[md5sum] = "b35b04071f69b8ab69a7f3a497ff0131" -SRC_URI[sha256sum] = "4c306b03df0212f1b8903784e29bb3493319ba19ebebf13b0c56a17870292282" - -S = "${WORKDIR}/gst-plugins-base-${PV}" 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.0.bb new file mode 100644 index 0000000000..370cd0368c --- /dev/null +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.14.0.bb @@ -0,0 +1,70 @@ +require gstreamer1.0-plugins.inc + +LICENSE = "GPLv2+ & LGPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=c54ce9345727175ff66d17b67ff51f58 \ + file://COPYING.LIB;md5=6762ed442b3822387a51c92d928ead0d \ + file://common/coverage/coverage-report.pl;beginline=2;endline=17;md5=a4e1830fce078028c8f0974161272607" + +SRC_URI = " \ + http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-${PV}.tar.xz \ + file://get-caps-from-src-pad-when-query-caps.patch \ + file://0003-ssaparse-enhance-SSA-text-lines-parsing.patch \ + file://make-gio_unix_2_0-dependency-configurable.patch \ + file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \ + file://0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch \ + file://0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch \ + file://0003-riff-add-missing-include-directories-when-calling-in.patch \ + file://0004-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch \ + file://0009-glimagesink-Downrank-to-marginal.patch \ + file://0001-gstreamer-gl.pc.in-don-t-append-GL_CFLAGS-to-CFLAGS.patch \ + file://link-with-libvchostif.patch \ + " +SRC_URI[md5sum] = "370271327dd23110421a9c2927ac989a" +SRC_URI[sha256sum] = "7e904660ff56e02b036cf7fdfb77a50a540828ca9d2614d69ba931772e5b6940" + +S = "${WORKDIR}/gst-plugins-base-${PV}" + +DEPENDS += "iso-codes util-linux" + +inherit gettext + +PACKAGES_DYNAMIC =+ "^libgst.*" + +PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gles2 egl', '', d)}" +PACKAGECONFIG ??= " \ + ${GSTREAMER_ORC} \ + ${@bb.utils.filter('DISTRO_FEATURES', 'alsa x11', d)} \ + gio-unix-2.0 ogg pango theora vorbis zlib jpeg \ + ${PACKAGECONFIG_GL} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland egl', '', d)} \ +" + +X11DEPENDS = "virtual/libx11 libsm libxrender libxv" +X11ENABLEOPTS = "--enable-x --enable-xvideo --enable-xshm" +X11DISABLEOPTS = "--disable-x --disable-xvideo --disable-xshm" + +PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib" +PACKAGECONFIG[cdparanoia] = "--enable-cdparanoia,--disable-cdparanoia,cdparanoia" +PACKAGECONFIG[gio-unix-2.0] = "--enable-gio_unix_2_0,--disable-gio_unix_2_0,glib-2.0" +PACKAGECONFIG[ivorbis] = "--enable-ivorbis,--disable-ivorbis,tremor" +PACKAGECONFIG[ogg] = "--enable-ogg,--disable-ogg,libogg" +PACKAGECONFIG[opus] = "--enable-opus,--disable-opus,libopus" +PACKAGECONFIG[pango] = "--enable-pango,--disable-pango,pango" +PACKAGECONFIG[theora] = "--enable-theora,--disable-theora,libtheora" +PACKAGECONFIG[visual] = "--enable-libvisual,--disable-libvisual,libvisual" +PACKAGECONFIG[vorbis] = "--enable-vorbis,--disable-vorbis,libvorbis" +PACKAGECONFIG[x11] = "${X11ENABLEOPTS},${X11DISABLEOPTS},${X11DEPENDS}" +PACKAGECONFIG[zlib] = "--enable-zlib,--disable-zlib,zlib" +PACKAGECONFIG[opengl] = "--enable-opengl,--disable-opengl,virtual/libgl libglu" +PACKAGECONFIG[gles2] = "--enable-gles2,--disable-gles2,virtual/libgles2" +PACKAGECONFIG[egl] = "--enable-egl,--disable-egl,virtual/egl" +PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,wayland-native wayland wayland-protocols libdrm" +PACKAGECONFIG[jpeg] = ",,jpeg" + +FILES_${MLPREFIX}libgsttag-1.0 += "${datadir}/gst-plugins-base/1.0/license-translations.dict" + +do_compile_prepend() { + export GIR_EXTRA_LIBS_PATH="${B}/gst-libs/gst/tag/.libs:${B}/gst-libs/gst/video/.libs:${B}/gst-libs/gst/audio/.libs:${B}/gst-libs/gst/rtp/.libs" +} + +FILES_${PN}-dev += "${libdir}/gstreamer-${LIBV}/include/gst/gl/gstglconfig.h" -- 2.14.1 ^ permalink raw reply related [flat|nested] 25+ messages in thread
* Re: [PATCH 02/12] gst-plugins-base: upgrade 1.12.4 -> 1.14.0 2018-05-03 8:17 ` [PATCH 02/12] gst-plugins-base: " Anuj Mittal @ 2018-05-04 11:52 ` Burton, Ross 2018-05-04 13:07 ` Anuj Mittal 2018-05-04 13:28 ` [PATCH v2] " Anuj Mittal 1 sibling, 1 reply; 25+ messages in thread From: Burton, Ross @ 2018-05-04 11:52 UTC (permalink / raw) To: Anuj Mittal; +Cc: OE-core [-- Attachment #1: Type: text/plain, Size: 64825 bytes --] Couldn't find include 'GstVideo-1.0.gir' (search path: '['/data/poky-tmp/master/work/corei7-64-poky-linux/gstreamer1.0-plugins-base/1.14.0-r0/recipe-sysroot/usr/share/gir-1.0', '/usr/share/gir-1.0', '/usr/share/gir-1.0', '/usr/share/gir-1.0', '/data/poky-tmp/master/work/corei7-64-poky-linux/gstreamer1.0-plugins-base/1.14.0-r0/recipe-sysroot/usr/share/gir-1.0', '/data/poky-tmp/master/work/corei7-64-poky-linux/gstreamer1.0-plugins-base/1.14.0-r0/recipe-sysroot-native/usr/share/gir-1.0', '/usr/share/gir-1.0', '/data/poky-tmp/master/work/corei7-64-poky-linux/gstreamer1.0-plugins-base/1.14.0-r0/recipe-sysroot-native/usr/share/gir-1.0']') | Makefile:1506: recipe for target 'GstGL-1.0.gir' failed Turn on gobject-introspection DISTRO_FEATURE if you haven't already. That file is at ./gst-libs/gst/video/GstVideo-1.0.gir in the build tree, so that search path is wrong... Ross On 3 May 2018 at 09:17, Anuj Mittal <anuj.mittal@intel.com> wrote: > * For changes, please see: https://gstreamer.freedesktop. > org/releases/1.14/ > * OpenGL integration library has moved to -plugins-base, add PACKAGECONFIG. > * Remove one patch as that has been fixed in a different way upstream. > * Merge inc/bb and refresh patches to get rid of fuzz warnings. > * Remove x86 specific cached variables as they're not needed anymore. > * Add jpeg to PACKAGECONFIG and enable it by default. > * Port gstreamer-gl specific patches from -plugins-bad. > > Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> > --- > ...on.m4-prefix-pkgconfig-paths-with-PKG_CON.patch | 12 +- > .../gstreamer/gstreamer1.0-plugins-base.inc | 50 ------- > ...-don-t-hardcode-libtool-name-when-running.patch | 71 +++++----- > ...gl.pc.in-don-t-append-GL_CFLAGS-to-CFLAGS.patch | 29 ++++ > ...-prefix-calls-to-pkg-config-with-PKG_CONF.patch | 151 > +++++++++------------ > ...ssing-include-directories-when-calling-in.patch | 12 +- > ...3-ssaparse-enhance-SSA-text-lines-parsing.patch | 24 ++-- > ...ncorrect-reference-to-gstreamer-sdp-in-Ma.patch | 12 +- > ...t-need_segment-after-sink-pad-received-GS.patch | 69 ---------- > .../0009-glimagesink-Downrank-to-marginal.patch | 32 +++++ > .../get-caps-from-src-pad-when-query-caps.patch | 12 +- > .../link-with-libvchostif.patch | 45 ++++++ > ...make-gio_unix_2_0-dependency-configurable.patch | 12 +- > .../gstreamer/gstreamer1.0-plugins-base_1.12.4.bb | 18 --- > .../gstreamer/gstreamer1.0-plugins-base_1.14.0.bb | 70 ++++++++++ > 15 files changed, 314 insertions(+), 305 deletions(-) > delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0- > plugins-base.inc > create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0- > plugins-base/0001-gstreamer-gl.pc.in-don-t-append-GL_ > CFLAGS-to-CFLAGS.patch > delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0- > plugins-base/0004-subparse-set-need_segment-after-sink- > pad-received-GS.patch > create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0- > plugins-base/0009-glimagesink-Downrank-to-marginal.patch > create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0- > plugins-base/link-with-libvchostif.patch > delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0- > plugins-base_1.12.4.bb > create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0- > plugins-base_1.14.0.bb > > diff --git a/meta/recipes-multimedia/gstreamer/files/0001- > introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch > b/meta/recipes-multimedia/gstreamer/files/0001-introspection.m4-prefix- > pkgconfig-paths-with-PKG_CON.patch > index 2cab87f9ec..1b7f115083 100644 > --- a/meta/recipes-multimedia/gstreamer/files/0001- > introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch > +++ b/meta/recipes-multimedia/gstreamer/files/0001- > introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch > @@ -1,4 +1,4 @@ > -From 90916f96262fa7b27a0a99788c69f9fd6df11000 Mon Sep 17 00:00:00 2001 > +From 2b0436f9a07773fae8c74df902d7024e8bfc3512 Mon Sep 17 00:00:00 2001 > From: Alexander Kanavin <alex.kanavin@gmail.com> > Date: Tue, 24 Nov 2015 16:46:27 +0200 > Subject: [PATCH] introspection.m4: prefix pkgconfig paths with > @@ -10,12 +10,13 @@ is later supplied to g-ir-scanner. > > Upstream-Status: Pending [review on oe-core list] > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> > + > --- > - common/m4/introspection.m4 | 12 ++++++------ > - 1 file changed, 6 insertions(+), 6 deletions(-) > + common/m4/introspection.m4 | 8 ++++---- > + 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/common/m4/introspection.m4 b/common/m4/introspection.m4 > -index 162be57..217a6ae 100644 > +index 162be57..933f979 100644 > --- a/common/m4/introspection.m4 > +++ b/common/m4/introspection.m4 > @@ -54,14 +54,14 @@ m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL], > @@ -37,6 +38,3 @@ index 162be57..217a6ae 100644 > INTROSPECTION_INIT="extern void gst_init(gint*,gchar**); > gst_init(NULL,NULL);" > fi > AC_SUBST(INTROSPECTION_SCANNER) > --- > -2.6.2 > - > diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc > b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc > deleted file mode 100644 > index 08130c1da4..0000000000 > --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc > +++ /dev/null > @@ -1,50 +0,0 @@ > -require gstreamer1.0-plugins.inc > - > -SRC_URI_append = "\ > - file://0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch > \ > - file://0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch > \ > - file://0003-riff-add-missing-include-directories-when-calling-in.patch > \ > - file://0004-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch > \ > -" > - > -LICENSE = "GPLv2+ & LGPLv2+" > - > -DEPENDS += "iso-codes util-linux zlib" > - > -inherit gettext > - > -PACKAGES_DYNAMIC =+ "^libgst.*" > - > -PACKAGECONFIG ??= " \ > - ${GSTREAMER_ORC} \ > - ${@bb.utils.filter('DISTRO_FEATURES', 'alsa x11', d)} \ > - gio-unix-2.0 ogg pango theora vorbis \ > -" > - > -X11DEPENDS = "virtual/libx11 libsm libxrender libxv" > -X11ENABLEOPTS = "--enable-x --enable-xvideo --enable-xshm" > -X11DISABLEOPTS = "--disable-x --disable-xvideo --disable-xshm" > - > -PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib" > -PACKAGECONFIG[cdparanoia] = "--enable-cdparanoia,-- > disable-cdparanoia,cdparanoia" > -PACKAGECONFIG[gio-unix-2.0] = "--enable-gio_unix_2_0,-- > disable-gio_unix_2_0,glib-2.0" > -PACKAGECONFIG[ivorbis] = "--enable-ivorbis,--disable-ivorbis,tremor" > -PACKAGECONFIG[ogg] = "--enable-ogg,--disable-ogg,libogg" > -PACKAGECONFIG[opus] = "--enable-opus,--disable-opus,libopus" > -PACKAGECONFIG[pango] = "--enable-pango,--disable-pango,pango" > -PACKAGECONFIG[theora] = "--enable-theora,--disable- > theora,libtheora" > -PACKAGECONFIG[visual] = "--enable-libvisual,--disable- > libvisual,libvisual" > -PACKAGECONFIG[vorbis] = "--enable-vorbis,--disable- > vorbis,libvorbis" > -PACKAGECONFIG[x11] = "${X11ENABLEOPTS},${ > X11DISABLEOPTS},${X11DEPENDS}" > - > -EXTRA_OECONF += " \ > - --enable-zlib \ > -" > - > -CACHED_CONFIGUREVARS_append_x86 = " ac_cv_header_emmintrin_h=no > ac_cv_header_xmmintrin_h=no" > - > -FILES_${MLPREFIX}libgsttag-1.0 += "${datadir}/gst-plugins-base/ > 1.0/license-translations.dict" > - > -do_compile_prepend() { > - export GIR_EXTRA_LIBS_PATH="${B}/gst-libs/gst/tag/.libs:${B}/gst- > libs/gst/video/.libs:${B}/gst-libs/gst/audio/.libs:${B}/gst- > libs/gst/rtp/.libs" > -} > diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0- > plugins-base/0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch > b/meta/recipes-multimedia/gstreamer/gstreamer1.0- > plugins-base/0001-Makefile.am-don-t-hardcode-libtool-name- > when-running.patch > index 094bdac846..128c7f8cb6 100644 > --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0- > plugins-base/0001-Makefile.am-don-t-hardcode-libtool-name- > when-running.patch > +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0- > plugins-base/0001-Makefile.am-don-t-hardcode-libtool-name- > when-running.patch > @@ -1,16 +1,18 @@ > -From f1d9652351e7754c63003104eceb526af424c7e0 Mon Sep 17 00:00:00 2001 > +From 4d6ea58f96b9744af8d899ddca22c2695ac74b5b Mon Sep 17 00:00:00 2001 > From: Alexander Kanavin <alex.kanavin@gmail.com> > -Date: Fri, 20 Nov 2015 16:53:04 +0200 > -Subject: [PATCH 1/4] Makefile.am: don't hardcode libtool name when running > +Date: Thu, 5 Apr 2018 10:15:08 +0800 > +Subject: [PATCH] Makefile.am: don't hardcode libtool name when running > introspection tools > > Upstream-Status: Pending [review on oe-core maillist] > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> > +Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> > + > --- > gst-libs/gst/allocators/Makefile.am | 2 +- > gst-libs/gst/app/Makefile.am | 2 +- > gst-libs/gst/audio/Makefile.am | 2 +- > - gst-libs/gst/fft/Makefile.am | 2 +- > + gst-libs/gst/gl/Makefile.am | 2 +- > gst-libs/gst/pbutils/Makefile.am | 2 +- > gst-libs/gst/riff/Makefile.am | 2 +- > gst-libs/gst/rtp/Makefile.am | 2 +- > @@ -21,10 +23,10 @@ Signed-off-by: Alexander Kanavin < > alex.kanavin@gmail.com> > 11 files changed, 11 insertions(+), 11 deletions(-) > > diff --git a/gst-libs/gst/allocators/Makefile.am > b/gst-libs/gst/allocators/Makefile.am > -index 9361bf9..bc7f53a 100644 > +index 1957d28..1ecc950 100644 > --- a/gst-libs/gst/allocators/Makefile.am > +++ b/gst-libs/gst/allocators/Makefile.am > -@@ -38,7 +38,7 @@ GstAllocators-@GST_API_VERSION@.gir: > $(INTROSPECTION_SCANNER) libgstallocators-@ > +@@ -42,7 +42,7 @@ GstAllocators-@GST_API_VERSION@.gir: > $(INTROSPECTION_SCANNER) libgstallocators-@ > --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" > $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ > --library=libgstallocators-@GST_API_VERSION@.la \ > --include=Gst-@GST_API_VERSION@ \ > @@ -34,10 +36,10 @@ index 9361bf9..bc7f53a 100644 > --pkg-export gstreamer-allocators-@GST_API_VERSION@ \ > --output $@ \ > diff --git a/gst-libs/gst/app/Makefile.am b/gst-libs/gst/app/Makefile.am > -index 6d6de8d..dcc2fe0 100644 > +index 52f6ad3..5bfd606 100644 > --- a/gst-libs/gst/app/Makefile.am > +++ b/gst-libs/gst/app/Makefile.am > -@@ -53,7 +53,7 @@ GstApp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) > libgstapp-@GST_API_VERSIO > +@@ -56,7 +56,7 @@ GstApp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) > libgstapp-@GST_API_VERSIO > --library=libgstapp-@GST_API_VERSION@.la \ > --include=Gst-@GST_API_VERSION@ \ > --include=GstBase-@GST_API_VERSION@ \ > @@ -47,10 +49,10 @@ index 6d6de8d..dcc2fe0 100644 > --pkg gstreamer-base-@GST_API_VERSION@ \ > --pkg-export gstreamer-app-@GST_API_VERSION@ \ > diff --git a/gst-libs/gst/audio/Makefile.am > b/gst-libs/gst/audio/Makefile.am > -index 275d222..2374196 100644 > +index 2922245..7fb65f2 100644 > --- a/gst-libs/gst/audio/Makefile.am > +++ b/gst-libs/gst/audio/Makefile.am > -@@ -116,7 +116,7 @@ GstAudio-@GST_API_VERSION@.gir: > $(INTROSPECTION_SCANNER) libgstaudio-@GST_API_VE > +@@ -184,7 +184,7 @@ GstAudio-@GST_API_VERSION@.gir: > $(INTROSPECTION_SCANNER) libgstaudio-@GST_API_VE > --include=Gst-@GST_API_VERSION@ \ > --include=GstBase-@GST_API_VERSION@ \ > --include=GstTag-@GST_API_VERSION@ \ > @@ -59,24 +61,24 @@ index 275d222..2374196 100644 > --pkg gstreamer-@GST_API_VERSION@ \ > --pkg gstreamer-base-@GST_API_VERSION@ \ > --pkg-export gstreamer-audio-@GST_API_VERSION@ \ > -diff --git a/gst-libs/gst/fft/Makefile.am b/gst-libs/gst/fft/Makefile.am > -index 09b3d68..f545354 100644 > ---- a/gst-libs/gst/fft/Makefile.am > -+++ b/gst-libs/gst/fft/Makefile.am > -@@ -65,7 +65,7 @@ GstFft-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) > libgstfft-@GST_API_VERSIO > - --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" > $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ > - --library=libgstfft-@GST_API_VERSION@.la \ > +diff --git a/gst-libs/gst/gl/Makefile.am b/gst-libs/gst/gl/Makefile.am > +index a3bbc94..16f829f 100644 > +--- a/gst-libs/gst/gl/Makefile.am > ++++ b/gst-libs/gst/gl/Makefile.am > +@@ -192,7 +192,7 @@ GstGL-@GST_API_VERSION@.gir: > $(INTROSPECTION_SCANNER) libgstgl-@GST_API_VERSION@ > --include=Gst-@GST_API_VERSION@ \ > + --include=GstBase-@GST_API_VERSION@ \ > + --include=GstVideo-@GST_API_VERSION@ \ > - --libtool="$(top_builddir)/libtool" \ > + --libtool="$(LIBTOOL)" \ > --pkg gstreamer-@GST_API_VERSION@ \ > - --pkg-export gstreamer-fft-@GST_API_VERSION@ \ > - --output $@ \ > + --pkg gstreamer-base-@GST_API_VERSION@ \ > + --pkg gstreamer-video-@GST_API_VERSION@ \ > diff --git a/gst-libs/gst/pbutils/Makefile.am b/gst-libs/gst/pbutils/ > Makefile.am > -index 64d5eb0..91dc214 100644 > +index ae51993..35a6e44 100644 > --- a/gst-libs/gst/pbutils/Makefile.am > +++ b/gst-libs/gst/pbutils/Makefile.am > -@@ -99,7 +99,7 @@ GstPbutils-@GST_API_VERSION@.gir: > $(INTROSPECTION_SCANNER) libgstpbutils-@GST_AP > +@@ -103,7 +103,7 @@ GstPbutils-@GST_API_VERSION@.gir: > $(INTROSPECTION_SCANNER) libgstpbutils-@GST_AP > --include=GstTag-@GST_API_VERSION@ \ > --include=GstVideo-@GST_API_VERSION@ \ > --include=GstAudio-@GST_API_VERSION@ \ > @@ -86,10 +88,10 @@ index 64d5eb0..91dc214 100644 > --pkg gstreamer-tag-@GST_API_VERSION@ \ > --pkg gstreamer-video-@GST_API_VERSION@ \ > diff --git a/gst-libs/gst/riff/Makefile.am b/gst-libs/gst/riff/Makefile. > am > -index 83d83cb..3bd8fc0 100644 > +index fb53f06..e66ef4f 100644 > --- a/gst-libs/gst/riff/Makefile.am > +++ b/gst-libs/gst/riff/Makefile.am > -@@ -47,7 +47,7 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS = > $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) > +@@ -49,7 +49,7 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS = > $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) > # --include=GstAudio-@GST_API_VERSION@ \ > # --include=GstTag-@GST_API_VERSION@ \ > # --include=Gst-@GST_API_VERSION@ \ > @@ -99,10 +101,10 @@ index 83d83cb..3bd8fc0 100644 > # --pkg gstreamer-tag-@GST_API_VERSION@ \ > # --pkg gstreamer-audio-@GST_API_VERSION@ \ > diff --git a/gst-libs/gst/rtp/Makefile.am b/gst-libs/gst/rtp/Makefile.am > -index fdd01c1..f5445c1 100644 > +index a6f971d..77ebeeb 100644 > --- a/gst-libs/gst/rtp/Makefile.am > +++ b/gst-libs/gst/rtp/Makefile.am > -@@ -65,7 +65,7 @@ GstRtp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) > libgstrtp-@GST_API_VERSIO > +@@ -69,7 +69,7 @@ GstRtp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) > libgstrtp-@GST_API_VERSIO > --library=libgstrtp-@GST_API_VERSION@.la \ > --include=Gst-@GST_API_VERSION@ \ > --include=GstBase-@GST_API_VERSION@ \ > @@ -112,10 +114,10 @@ index fdd01c1..f5445c1 100644 > --pkg gstreamer-base-@GST_API_VERSION@ \ > --pkg-export gstreamer-rtp-@GST_API_VERSION@ \ > diff --git a/gst-libs/gst/rtsp/Makefile.am b/gst-libs/gst/rtsp/Makefile. > am > -index ede5706..9b0b258 100644 > +index ceb07f4..db9d0fd 100644 > --- a/gst-libs/gst/rtsp/Makefile.am > +++ b/gst-libs/gst/rtsp/Makefile.am > -@@ -72,7 +72,7 @@ GstRtsp-@GST_API_VERSION@.gir: > $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERS > +@@ -76,7 +76,7 @@ GstRtsp-@GST_API_VERSION@.gir: > $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERS > --include=Gio-2.0 \ > --include=Gst-@GST_API_VERSION@ \ > --include=GstSdp-@GST_API_VERSION@ \ > @@ -125,10 +127,10 @@ index ede5706..9b0b258 100644 > --pkg gstreamer-@GST_API_VERSION@ \ > --pkg gstreamer-sdp-@GST_API_VERSION@ \ > diff --git a/gst-libs/gst/sdp/Makefile.am b/gst-libs/gst/sdp/Makefile.am > -index a90f30b..0e149b8 100644 > +index e197e9b..6e05cc7 100644 > --- a/gst-libs/gst/sdp/Makefile.am > +++ b/gst-libs/gst/sdp/Makefile.am > -@@ -32,7 +32,7 @@ GstSdp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) > libgstsdp-@GST_API_VERSIO > +@@ -34,7 +34,7 @@ GstSdp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) > libgstsdp-@GST_API_VERSIO > --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" > $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ > --library=libgstsdp-@GST_API_VERSION@.la \ > --include=Gst-@GST_API_VERSION@ \ > @@ -138,10 +140,10 @@ index a90f30b..0e149b8 100644 > --pkg-export gstreamer-sdp-@GST_API_VERSION@ \ > --output $@ \ > diff --git a/gst-libs/gst/tag/Makefile.am b/gst-libs/gst/tag/Makefile.am > -index c534a4d..cafafd3 100644 > +index 0247c33..c86515b 100644 > --- a/gst-libs/gst/tag/Makefile.am > +++ b/gst-libs/gst/tag/Makefile.am > -@@ -45,7 +45,7 @@ GstTag-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) > libgsttag-@GST_API_VERSIO > +@@ -66,7 +66,7 @@ GstTag-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) > libgsttag-@GST_API_VERSIO > --library=libgsttag-@GST_API_VERSION@.la \ > --include=Gst-@GST_API_VERSION@ \ > --include=GstBase-@GST_API_VERSION@ \ > @@ -151,10 +153,10 @@ index c534a4d..cafafd3 100644 > --pkg gstreamer-base-@GST_API_VERSION@ \ > --pkg-export gstreamer-tag-@GST_API_VERSION@ \ > diff --git a/gst-libs/gst/video/Makefile.am > b/gst-libs/gst/video/Makefile.am > -index 5d31fa1..ac64eb3 100644 > +index 9fc1ccf..0f8455f 100644 > --- a/gst-libs/gst/video/Makefile.am > +++ b/gst-libs/gst/video/Makefile.am > -@@ -116,7 +116,7 @@ GstVideo-@GST_API_VERSION@.gir: > $(INTROSPECTION_SCANNER) libgstvideo-@GST_API_VE > +@@ -124,7 +124,7 @@ GstVideo-@GST_API_VERSION@.gir: > $(INTROSPECTION_SCANNER) libgstvideo-@GST_API_VE > --library=libgstvideo-@GST_API_VERSION@.la \ > --include=Gst-@GST_API_VERSION@ \ > --include=GstBase-@GST_API_VERSION@ \ > @@ -163,6 +165,3 @@ index 5d31fa1..ac64eb3 100644 > --pkg gstreamer-@GST_API_VERSION@ \ > --pkg gstreamer-base-@GST_API_VERSION@ \ > --pkg-export gstreamer-video-@GST_API_VERSION@ \ > --- > -2.6.2 > - > diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0- > plugins-base/0001-gstreamer-gl.pc.in-don-t-append-GL_CFLAGS-to-CFLAGS.patch > b/meta/recipes-multimedia/gstreamer/gstreamer1.0- > plugins-base/0001-gstreamer-gl.pc.in-don-t-append-GL_ > CFLAGS-to-CFLAGS.patch > new file mode 100644 > index 0000000000..251dc172cb > --- /dev/null > +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0- > plugins-base/0001-gstreamer-gl.pc.in-don-t-append-GL_ > CFLAGS-to-CFLAGS.patch > @@ -0,0 +1,29 @@ > +From 61a672e79c8cb1aeeeda4c968997c577ac73a8f3 Mon Sep 17 00:00:00 2001 > +From: Alexander Kanavin <alex.kanavin@gmail.com> > +Date: Fri, 12 May 2017 16:47:12 +0300 > +Subject: [PATCH] gstreamer-gl.pc.in: don't append GL_CFLAGS to CFLAGS > + > +Dependencies' include directories should not be added in this way; > +it causes problems when cross-compiling in sysroot environments. > + > +Upstream-Status: Pending > + > +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> > +Signed-off-by: Maxin B. John <maxin.john@intel.com> > +--- > + pkgconfig/gstreamer-gl.pc.in | 2 +- > + 1 file changed, 1 insertion(+), 1 deletion(-) > + > +diff --git a/pkgconfig/gstreamer-gl.pc.in b/pkgconfig/gstreamer-gl.pc.in > +index dc672a9..8c290ba 100644 > +--- a/pkgconfig/gstreamer-gl.pc.in > ++++ b/pkgconfig/gstreamer-gl.pc.in > +@@ -13,4 +13,4 @@ Version: @VERSION@ > + Requires: gstreamer-video-@GST_API_VERSION@ gstreamer-base-@GST_API_ > VERSION@ gstreamer-@GST_API_VERSION@ > + > + Libs: -L${libdir} -lgstgl-@GST_API_VERSION@ > +-Cflags: -I${includedir} -I${libdir}/gstreamer-@GST_API_VERSION@/include > @GL_CFLAGS@ > ++Cflags: -I${includedir} -I${libdir}/gstreamer-@GST_API_VERSION@/include > +-- > +2.7.4 > + > 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 6616e2cf0d..dc15d93eb0 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,16 +1,17 @@ > -From 990b653c7b6de1937ec759019982d6c5f15770f7 Mon Sep 17 00:00:00 2001 > +From f523721e453febfb3f62f3ba1e9fefb31dcec471 Mon Sep 17 00:00:00 2001 > From: Alexander Kanavin <alex.kanavin@gmail.com> > -Date: Mon, 26 Oct 2015 16:38:18 +0200 > -Subject: [PATCH 2/4] Makefile.am: prefix calls to pkg-config with > +Date: Thu, 5 Apr 2018 10:26:25 +0800 > +Subject: [PATCH] Makefile.am: prefix calls to pkg-config with > PKG_CONFIG_SYSROOT_DIR > > Upstream-Status: Pending [review on oe-core maillist] > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> > +Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> > + > --- > gst-libs/gst/allocators/Makefile.am | 4 ++-- > gst-libs/gst/app/Makefile.am | 4 ++-- > gst-libs/gst/audio/Makefile.am | 12 ++++++------ > - gst-libs/gst/fft/Makefile.am | 4 ++-- > gst-libs/gst/pbutils/Makefile.am | 12 ++++++------ > gst-libs/gst/riff/Makefile.am | 8 ++++---- > gst-libs/gst/rtp/Makefile.am | 8 ++++---- > @@ -18,13 +19,13 @@ Signed-off-by: Alexander Kanavin < > alex.kanavin@gmail.com> > gst-libs/gst/sdp/Makefile.am | 4 ++-- > gst-libs/gst/tag/Makefile.am | 8 ++++---- > gst-libs/gst/video/Makefile.am | 8 ++++---- > - 11 files changed, 38 insertions(+), 38 deletions(-) > + 10 files changed, 36 insertions(+), 36 deletions(-) > > -Index: gst-plugins-base-1.12.3/gst-libs/gst/allocators/Makefile.am > -=================================================================== > ---- gst-plugins-base-1.12.3.orig/gst-libs/gst/allocators/Makefile.am > -+++ gst-plugins-base-1.12.3/gst-libs/gst/allocators/Makefile.am > -@@ -36,7 +36,7 @@ GstAllocators-@GST_API_VERSION@.gir: $(I > +diff --git a/gst-libs/gst/allocators/Makefile.am > b/gst-libs/gst/allocators/Makefile.am > +index 1ecc950..d6417ac 100644 > +--- a/gst-libs/gst/allocators/Makefile.am > ++++ b/gst-libs/gst/allocators/Makefile.am > +@@ -39,7 +39,7 @@ GstAllocators-@GST_API_VERSION@.gir: > $(INTROSPECTION_SCANNER) libgstallocators-@ > --c-include "gst/allocators/allocators.h" \ > -I$(top_srcdir)/gst-libs \ > -I$(top_builddir)/gst-libs \ > @@ -33,7 +34,7 @@ Index: gst-plugins-base-1.12.3/gst- > libs/gst/allocators/Makefile.am > --library=libgstallocators-@GST_API_VERSION@.la \ > --include=Gst-@GST_API_VERSION@ \ > --libtool="$(LIBTOOL)" \ > -@@ -60,7 +60,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= > +@@ -63,7 +63,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) > $(INTROSPECTION_COMPILER) \ > --includedir=$(srcdir) \ > --includedir=$(builddir) \ > @@ -42,11 +43,11 @@ Index: gst-plugins-base-1.12.3/gst- > libs/gst/allocators/Makefile.am > $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) > > CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA) > -Index: gst-plugins-base-1.12.3/gst-libs/gst/app/Makefile.am > -=================================================================== > ---- gst-plugins-base-1.12.3.orig/gst-libs/gst/app/Makefile.am > -+++ gst-plugins-base-1.12.3/gst-libs/gst/app/Makefile.am > -@@ -48,8 +48,8 @@ GstApp-@GST_API_VERSION@.gir: $(INTROSPE > +diff --git a/gst-libs/gst/app/Makefile.am b/gst-libs/gst/app/Makefile.am > +index 5bfd606..6441674 100644 > +--- a/gst-libs/gst/app/Makefile.am > ++++ b/gst-libs/gst/app/Makefile.am > +@@ -51,8 +51,8 @@ GstApp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) > libgstapp-@GST_API_VERSIO > --c-include "gst/app/app.h" \ > -I$(top_srcdir)/gst-libs \ > -I$(top_builddir)/gst-libs \ > @@ -57,11 +58,11 @@ Index: gst-plugins-base-1.12.3/gst- > libs/gst/app/Makefile.am > --library=libgstapp-@GST_API_VERSION@.la \ > --include=Gst-@GST_API_VERSION@ \ > --include=GstBase-@GST_API_VERSION@ \ > -Index: gst-plugins-base-1.12.3/gst-libs/gst/audio/Makefile.am > -=================================================================== > ---- gst-plugins-base-1.12.3.orig/gst-libs/gst/audio/Makefile.am > -+++ gst-plugins-base-1.12.3/gst-libs/gst/audio/Makefile.am > -@@ -167,12 +167,12 @@ GstAudio-@GST_API_VERSION@.gir: $(INTROS > +diff --git a/gst-libs/gst/audio/Makefile.am > b/gst-libs/gst/audio/Makefile.am > +index 7fb65f2..5379f79 100644 > +--- a/gst-libs/gst/audio/Makefile.am > ++++ b/gst-libs/gst/audio/Makefile.am > +@@ -174,12 +174,12 @@ GstAudio-@GST_API_VERSION@.gir: > $(INTROSPECTION_SCANNER) libgstaudio-@GST_API_VE > -I$(top_srcdir)/gst-libs \ > -I$(top_builddir)/gst-libs \ > --c-include "gst/audio/audio.h" \ > @@ -78,7 +79,7 @@ Index: gst-plugins-base-1.12.3/gst- > libs/gst/audio/Makefile.am > --library-path="$(top_builddir)/gst-libs/gst/tag/" \ > --include=Gst-@GST_API_VERSION@ \ > --include=GstBase-@GST_API_VERSION@ \ > -@@ -201,8 +201,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= > +@@ -208,8 +208,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) > --includedir=$(srcdir) \ > --includedir=$(builddir) \ > --includedir="$(top_builddir)/gst-libs/gst/tag/" \ > @@ -89,33 +90,11 @@ Index: gst-plugins-base-1.12.3/gst- > libs/gst/audio/Makefile.am > $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) > > CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) > -Index: gst-plugins-base-1.12.3/gst-libs/gst/fft/Makefile.am > -=================================================================== > ---- gst-plugins-base-1.12.3.orig/gst-libs/gst/fft/Makefile.am > -+++ gst-plugins-base-1.12.3/gst-libs/gst/fft/Makefile.am > -@@ -63,7 +63,7 @@ GstFft-@GST_API_VERSION@.gir: $(INTROSPE > - --c-include "gst/fft/fft.h" \ > - -I$(top_srcdir)/gst-libs \ > - -I$(top_builddir)/gst-libs \ > -- --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" > $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ > -+ --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_ > CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir > gstreamer-@GST_API_VERSION@` \ > - --library=libgstfft-@GST_API_VERSION@.la \ > - --include=Gst-@GST_API_VERSION@ \ > - --libtool="$(LIBTOOL)" \ > -@@ -87,7 +87,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= > - $(INTROSPECTION_COMPILER) \ > - --includedir=$(srcdir) \ > - --includedir=$(builddir) \ > -- --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" > $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ > -+ --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" > $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ > - $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) > - > - CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA) > -Index: gst-plugins-base-1.12.3/gst-libs/gst/pbutils/Makefile.am > -=================================================================== > ---- gst-plugins-base-1.12.3.orig/gst-libs/gst/pbutils/Makefile.am > -+++ gst-plugins-base-1.12.3/gst-libs/gst/pbutils/Makefile.am > -@@ -85,14 +85,14 @@ GstPbutils-@GST_API_VERSION@.gir: $(INTR > +diff --git a/gst-libs/gst/pbutils/Makefile.am b/gst-libs/gst/pbutils/ > Makefile.am > +index 35a6e44..49d6894 100644 > +--- a/gst-libs/gst/pbutils/Makefile.am > ++++ b/gst-libs/gst/pbutils/Makefile.am > +@@ -88,14 +88,14 @@ GstPbutils-@GST_API_VERSION@.gir: > $(INTROSPECTION_SCANNER) libgstpbutils-@GST_AP > --c-include "gst/pbutils/pbutils.h" \ > -I$(top_srcdir)/gst-libs \ > -I$(top_builddir)/gst-libs \ > @@ -134,7 +113,7 @@ Index: gst-plugins-base-1.12.3/gst- > libs/gst/pbutils/Makefile.am > --library-path="$(top_builddir)/gst-libs/gst/tag/" \ > --library-path="$(top_builddir)/gst-libs/gst/video/" \ > --library-path="$(top_builddir)/gst-libs/gst/audio/" \ > -@@ -125,8 +125,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= > +@@ -128,8 +128,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) > $(INTROSPECTION_COMPILER) \ > --includedir=$(srcdir) \ > --includedir=$(builddir) \ > @@ -145,11 +124,11 @@ Index: gst-plugins-base-1.12.3/gst- > libs/gst/pbutils/Makefile.am > --includedir="$(top_builddir)/gst-libs/gst/tag/" \ > --includedir="$(top_builddir)/gst-libs/gst/video/" \ > --includedir="$(top_builddir)/gst-libs/gst/audio/" \ > -Index: gst-plugins-base-1.12.3/gst-libs/gst/riff/Makefile.am > -=================================================================== > ---- gst-plugins-base-1.12.3.orig/gst-libs/gst/riff/Makefile.am > -+++ gst-plugins-base-1.12.3/gst-libs/gst/riff/Makefile.am > -@@ -42,8 +42,8 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS > +diff --git a/gst-libs/gst/riff/Makefile.am b/gst-libs/gst/riff/Makefile. > am > +index e66ef4f..c8c588a 100644 > +--- a/gst-libs/gst/riff/Makefile.am > ++++ b/gst-libs/gst/riff/Makefile.am > +@@ -43,8 +43,8 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS = > $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) > # --c-include "gst/riff/riff.h" \ > # --add-include-path=$(builddir)/../tag \ > # --add-include-path=$(builddir)/../audio \ > @@ -160,7 +139,7 @@ Index: gst-plugins-base-1.12.3/gst- > libs/gst/riff/Makefile.am > # --library=libgstriff-@GST_API_VERSION@.la \ > # --include=GstAudio-@GST_API_VERSION@ \ > # --include=GstTag-@GST_API_VERSION@ \ > -@@ -74,8 +74,8 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS > +@@ -75,8 +75,8 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS = > $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) > # --includedir=$(builddir) \ > # --includedir=$(builddir)/../tag \ > # --includedir=$(builddir)/../audio \ > @@ -171,11 +150,11 @@ Index: gst-plugins-base-1.12.3/gst- > libs/gst/riff/Makefile.am > # $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) > # > #CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA) > -Index: gst-plugins-base-1.12.3/gst-libs/gst/rtp/Makefile.am > -=================================================================== > ---- gst-plugins-base-1.12.3.orig/gst-libs/gst/rtp/Makefile.am > -+++ gst-plugins-base-1.12.3/gst-libs/gst/rtp/Makefile.am > -@@ -61,8 +61,8 @@ GstRtp-@GST_API_VERSION@.gir: $(INTROSPE > +diff --git a/gst-libs/gst/rtp/Makefile.am b/gst-libs/gst/rtp/Makefile.am > +index 77ebeeb..9aee788 100644 > +--- a/gst-libs/gst/rtp/Makefile.am > ++++ b/gst-libs/gst/rtp/Makefile.am > +@@ -64,8 +64,8 @@ GstRtp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) > libgstrtp-@GST_API_VERSIO > --c-include "gst/rtp/rtp.h" \ > -I$(top_builddir)/gst-libs \ > -I$(top_srcdir)/gst-libs \ > @@ -186,7 +165,7 @@ Index: gst-plugins-base-1.12.3/gst- > libs/gst/rtp/Makefile.am > --library=libgstrtp-@GST_API_VERSION@.la \ > --include=Gst-@GST_API_VERSION@ \ > --include=GstBase-@GST_API_VERSION@ \ > -@@ -89,8 +89,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= > +@@ -92,8 +92,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) > $(INTROSPECTION_COMPILER) \ > --includedir=$(srcdir) \ > --includedir=$(builddir) \ > @@ -197,11 +176,11 @@ Index: gst-plugins-base-1.12.3/gst- > libs/gst/rtp/Makefile.am > $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) > > CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) > -Index: gst-plugins-base-1.12.3/gst-libs/gst/rtsp/Makefile.am > -=================================================================== > ---- gst-plugins-base-1.12.3.orig/gst-libs/gst/rtsp/Makefile.am > -+++ gst-plugins-base-1.12.3/gst-libs/gst/rtsp/Makefile.am > -@@ -68,7 +68,7 @@ GstRtsp-@GST_API_VERSION@.gir: $(INTROSP > +diff --git a/gst-libs/gst/rtsp/Makefile.am b/gst-libs/gst/rtsp/Makefile. > am > +index db9d0fd..79027cb 100644 > +--- a/gst-libs/gst/rtsp/Makefile.am > ++++ b/gst-libs/gst/rtsp/Makefile.am > +@@ -71,7 +71,7 @@ GstRtsp-@GST_API_VERSION@.gir: > $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERS > -I$(top_builddir)/gst-libs \ > -I$(top_srcdir)/gst-libs \ > --add-include-path=$(builddir)/../sdp \ > @@ -210,7 +189,7 @@ Index: gst-plugins-base-1.12.3/gst- > libs/gst/rtsp/Makefile.am > --library=libgstrtsp-@GST_API_VERSION@.la \ > --include=Gio-2.0 \ > --include=Gst-@GST_API_VERSION@ \ > -@@ -98,7 +98,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= > +@@ -101,7 +101,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) > --includedir=$(srcdir) \ > --includedir=$(builddir) \ > --includedir=$(builddir)/../sdp \ > @@ -219,11 +198,11 @@ Index: gst-plugins-base-1.12.3/gst- > libs/gst/rtsp/Makefile.am > $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) > > CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) > -Index: gst-plugins-base-1.12.3/gst-libs/gst/sdp/Makefile.am > -=================================================================== > ---- gst-plugins-base-1.12.3.orig/gst-libs/gst/sdp/Makefile.am > -+++ gst-plugins-base-1.12.3/gst-libs/gst/sdp/Makefile.am > -@@ -30,7 +30,7 @@ GstSdp-@GST_API_VERSION@.gir: $(INTROSPE > +diff --git a/gst-libs/gst/sdp/Makefile.am b/gst-libs/gst/sdp/Makefile.am > +index 6e05cc7..c7cf514 100644 > +--- a/gst-libs/gst/sdp/Makefile.am > ++++ b/gst-libs/gst/sdp/Makefile.am > +@@ -31,7 +31,7 @@ GstSdp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) > libgstsdp-@GST_API_VERSIO > --warn-all \ > --c-include "gst/sdp/sdp.h" \ > -I$(top_srcdir)/gst-libs \ > @@ -232,7 +211,7 @@ Index: gst-plugins-base-1.12.3/gst- > libs/gst/sdp/Makefile.am > --library=libgstsdp-@GST_API_VERSION@.la \ > --include=Gst-@GST_API_VERSION@ \ > --libtool="$(LIBTOOL)" \ > -@@ -54,7 +54,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= > +@@ -55,7 +55,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) > $(INTROSPECTION_COMPILER) \ > --includedir=$(srcdir) \ > --includedir=$(builddir) \ > @@ -241,11 +220,11 @@ Index: gst-plugins-base-1.12.3/gst- > libs/gst/sdp/Makefile.am > $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) > > CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA) > -Index: gst-plugins-base-1.12.3/gst-libs/gst/tag/Makefile.am > -=================================================================== > ---- gst-plugins-base-1.12.3.orig/gst-libs/gst/tag/Makefile.am > -+++ gst-plugins-base-1.12.3/gst-libs/gst/tag/Makefile.am > -@@ -59,8 +59,8 @@ GstTag-@GST_API_VERSION@.gir: $(INTROSPE > +diff --git a/gst-libs/gst/tag/Makefile.am b/gst-libs/gst/tag/Makefile.am > +index c86515b..363e6d2 100644 > +--- a/gst-libs/gst/tag/Makefile.am > ++++ b/gst-libs/gst/tag/Makefile.am > +@@ -61,8 +61,8 @@ GstTag-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) > libgsttag-@GST_API_VERSIO > --c-include "gst/tag/tag.h" \ > -I$(top_srcdir)/gst-libs \ > -I$(top_builddir)/gst-libs \ > @@ -256,7 +235,7 @@ Index: gst-plugins-base-1.12.3/gst- > libs/gst/tag/Makefile.am > --library=libgsttag-@GST_API_VERSION@.la \ > --include=Gst-@GST_API_VERSION@ \ > --include=GstBase-@GST_API_VERSION@ \ > -@@ -87,8 +87,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= > +@@ -89,8 +89,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) > $(INTROSPECTION_COMPILER) \ > --includedir=$(srcdir) \ > --includedir=$(builddir) \ > @@ -267,11 +246,11 @@ Index: gst-plugins-base-1.12.3/gst- > libs/gst/tag/Makefile.am > $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) > > CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) > -Index: gst-plugins-base-1.12.3/gst-libs/gst/video/Makefile.am > -=================================================================== > ---- gst-plugins-base-1.12.3.orig/gst-libs/gst/video/Makefile.am > -+++ gst-plugins-base-1.12.3/gst-libs/gst/video/Makefile.am > -@@ -116,8 +116,8 @@ GstVideo-@GST_API_VERSION@.gir: $(INTROS > +diff --git a/gst-libs/gst/video/Makefile.am > b/gst-libs/gst/video/Makefile.am > +index 0f8455f..8c9955c 100644 > +--- a/gst-libs/gst/video/Makefile.am > ++++ b/gst-libs/gst/video/Makefile.am > +@@ -119,8 +119,8 @@ GstVideo-@GST_API_VERSION@.gir: > $(INTROSPECTION_SCANNER) libgstvideo-@GST_API_VE > --c-include "gst/video/video.h" \ > -I$(top_srcdir)/gst-libs \ > -I$(top_builddir)/gst-libs \ > @@ -282,7 +261,7 @@ Index: gst-plugins-base-1.12.3/gst- > libs/gst/video/Makefile.am > --library=libgstvideo-@GST_API_VERSION@.la \ > --include=Gst-@GST_API_VERSION@ \ > --include=GstBase-@GST_API_VERSION@ \ > -@@ -144,8 +144,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= > +@@ -147,8 +147,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) > $(INTROSPECTION_COMPILER) \ > --includedir=$(srcdir) \ > --includedir=$(builddir) \ > diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0- > plugins-base/0003-riff-add-missing-include-directories-when-calling-in.patch > b/meta/recipes-multimedia/gstreamer/gstreamer1.0- > plugins-base/0003-riff-add-missing-include-directories- > when-calling-in.patch > index 9b66f7f49d..98ffdb1c10 100644 > --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0- > plugins-base/0003-riff-add-missing-include-directories- > when-calling-in.patch > +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0- > plugins-base/0003-riff-add-missing-include-directories- > when-calling-in.patch > @@ -1,20 +1,21 @@ > -From 3c2c2d5dd08aa30ed0e8acd8566ec99412bb8209 Mon Sep 17 00:00:00 2001 > +From b9765efb1696e3e2e79f2955f759be199fe34882 Mon Sep 17 00:00:00 2001 > From: Alexander Kanavin <alex.kanavin@gmail.com> > Date: Mon, 26 Oct 2015 17:29:37 +0200 > -Subject: [PATCH 3/4] riff: add missing include directories when calling > +Subject: [PATCH] riff: add missing include directories when calling > introspection scanner > > Upstream-Status: Pending [review on oe-core maillist] > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> > + > --- > gst-libs/gst/riff/Makefile.am | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/gst-libs/gst/riff/Makefile.am b/gst-libs/gst/riff/Makefile. > am > -index 0a115cc..5057a58 100644 > +index c8c588a..c096453 100644 > --- a/gst-libs/gst/riff/Makefile.am > +++ b/gst-libs/gst/riff/Makefile.am > -@@ -39,6 +39,8 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS = > $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) > +@@ -41,6 +41,8 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS = > $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) > # --strip-prefix=Gst \ > # --warn-all \ > # --c-include "gst/riff/riff.h" \ > @@ -23,6 +24,3 @@ index 0a115cc..5057a58 100644 > # --add-include-path=$(builddir)/../tag \ > # --add-include-path=$(builddir)/../audio \ > # --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_ > CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir > gstreamer-@GST_API_VERSION@` \ > --- > -2.6.2 > - > diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0- > plugins-base/0003-ssaparse-enhance-SSA-text-lines-parsing.patch > b/meta/recipes-multimedia/gstreamer/gstreamer1.0- > plugins-base/0003-ssaparse-enhance-SSA-text-lines-parsing.patch > index 9fbebd5700..9e95524057 100644 > --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0- > plugins-base/0003-ssaparse-enhance-SSA-text-lines-parsing.patch > +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0- > plugins-base/0003-ssaparse-enhance-SSA-text-lines-parsing.patch > @@ -1,7 +1,7 @@ > -From be6163cfa3a255493f9d75bad9541cbfe1723fee Mon Sep 17 00:00:00 2001 > +From 918c96b24d10f61b7455b4cef3bab490849d0d77 Mon Sep 17 00:00:00 2001 > From: Mingke Wang <mingke.wang@freescale.com> > Date: Thu, 19 Mar 2015 14:17:10 +0800 > -Subject: [PATCH 3/4] ssaparse: enhance SSA text lines parsing. > +Subject: [PATCH] ssaparse: enhance SSA text lines parsing. > > some parser will pass in the original ssa text line which starts with > "Dialog:" > and there's are maybe multiple Dialog lines in one input buffer. > @@ -10,13 +10,18 @@ Upstream-Status: Submitted [ > https://bugzilla.gnome.org/show_bug.cgi?id=747496] > > Signed-off-by: Mingke Wang <mingke.wang@freescale.com> > > +--- > + gst/subparse/gstssaparse.c | 150 ++++++++++++++++++++++++++++++ > ++++++++++----- > + 1 file changed, 134 insertions(+), 16 deletions(-) > + mode change 100644 => 100755 gst/subparse/gstssaparse.c > + > diff --git a/gst/subparse/gstssaparse.c b/gst/subparse/gstssaparse.c > old mode 100644 > new mode 100755 > -index 06ecef9..0ab5dce > +index c849c08..4b9636c > --- a/gst/subparse/gstssaparse.c > +++ b/gst/subparse/gstssaparse.c > -@@ -260,6 +260,7 @@ gst_ssa_parse_remove_override_codes (GstSsaParse * > parse, gchar * txt) > +@@ -262,6 +262,7 @@ gst_ssa_parse_remove_override_codes (GstSsaParse * > parse, gchar * txt) > * gst_ssa_parse_push_line: > * @parse: caller element > * @txt: text to push > @@ -24,7 +29,7 @@ index 06ecef9..0ab5dce > * @start: timestamp for the buffer > * @duration: duration for the buffer > * > -@@ -269,27 +270,133 @@ gst_ssa_parse_remove_override_codes (GstSsaParse > * parse, gchar * txt) > +@@ -271,27 +272,133 @@ gst_ssa_parse_remove_override_codes (GstSsaParse > * parse, gchar * txt) > * Returns: result of the push of the created buffer > */ > static GstFlowReturn > @@ -169,7 +174,7 @@ index 06ecef9..0ab5dce > GST_LOG_OBJECT (parse, "Text : %s", t); > > if (gst_ssa_parse_remove_override_codes (parse, t)) { > -@@ -307,13 +414,22 @@ gst_ssa_parse_push_line (GstSsaParse * parse, gchar > * txt, > +@@ -309,13 +416,22 @@ gst_ssa_parse_push_line (GstSsaParse * parse, gchar > * txt, > gst_buffer_fill (buf, 0, escaped, len + 1); > gst_buffer_set_size (buf, len); > g_free (escaped); > @@ -196,7 +201,7 @@ index 06ecef9..0ab5dce > > ret = gst_pad_push (parse->srcpad, buf); > > -@@ -333,6 +449,7 @@ gst_ssa_parse_chain (GstPad * sinkpad, GstObject * > parent, GstBuffer * buf) > +@@ -335,6 +451,7 @@ gst_ssa_parse_chain (GstPad * sinkpad, GstObject * > parent, GstBuffer * buf) > GstClockTime ts; > gchar *txt; > GstMapInfo map; > @@ -204,7 +209,7 @@ index 06ecef9..0ab5dce > > if (G_UNLIKELY (!parse->framed)) > goto not_framed; > -@@ -350,13 +467,14 @@ gst_ssa_parse_chain (GstPad * sinkpad, GstObject * > parent, GstBuffer * buf) > +@@ -352,13 +469,14 @@ gst_ssa_parse_chain (GstPad * sinkpad, GstObject * > parent, GstBuffer * buf) > /* make double-sure it's 0-terminated and all */ > gst_buffer_map (buf, &map, GST_MAP_READ); > txt = g_strndup ((gchar *) map.data, map.size); > @@ -220,6 +225,3 @@ index 06ecef9..0ab5dce > > if (ret != GST_FLOW_OK && GST_CLOCK_TIME_IS_VALID (ts)) { > GstSegment segment; > --- > -1.7.9.5 > - > diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0- > plugins-base/0004-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch > b/meta/recipes-multimedia/gstreamer/gstreamer1.0- > plugins-base/0004-rtsp-drop-incorrect-reference-to- > gstreamer-sdp-in-Ma.patch > index 4adf605460..aaeb611fec 100644 > --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0- > plugins-base/0004-rtsp-drop-incorrect-reference-to- > gstreamer-sdp-in-Ma.patch > +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0- > plugins-base/0004-rtsp-drop-incorrect-reference-to- > gstreamer-sdp-in-Ma.patch > @@ -1,20 +1,21 @@ > -From 4330915d88dc4dd46eb4c28d756482b767c2747f Mon Sep 17 00:00:00 2001 > +From 53b5868491cf99ee797192395dbfeb69df23edd2 Mon Sep 17 00:00:00 2001 > From: Alexander Kanavin <alex.kanavin@gmail.com> > Date: Mon, 26 Oct 2015 17:30:14 +0200 > -Subject: [PATCH 4/4] rtsp: drop incorrect reference to gstreamer-sdp in > +Subject: [PATCH] rtsp: drop incorrect reference to gstreamer-sdp in > Makefile.am > > Upstream-Status: Pending [review on oe-core maillist] > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> > + > --- > gst-libs/gst/rtsp/Makefile.am | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/gst-libs/gst/rtsp/Makefile.am b/gst-libs/gst/rtsp/Makefile. > am > -index 4f6d9f8..0afa370 100644 > +index 79027cb..2987e23 100644 > --- a/gst-libs/gst/rtsp/Makefile.am > +++ b/gst-libs/gst/rtsp/Makefile.am > -@@ -75,7 +75,6 @@ GstRtsp-@GST_API_VERSION@.gir: > $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERS > +@@ -79,7 +79,6 @@ GstRtsp-@GST_API_VERSION@.gir: > $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERS > --libtool="$(LIBTOOL)" \ > --pkg gio-2.0 \ > --pkg gstreamer-@GST_API_VERSION@ \ > @@ -22,6 +23,3 @@ index 4f6d9f8..0afa370 100644 > --pkg-export gstreamer-rtsp-@GST_API_VERSION@ \ > --add-init-section="$(INTROSPECTION_INIT)" \ > --output $@ \ > --- > -2.6.2 > - > diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0- > plugins-base/0004-subparse-set-need_segment-after-sink-pad-received-GS.patch > b/meta/recipes-multimedia/gstreamer/gstreamer1.0- > plugins-base/0004-subparse-set-need_segment-after-sink- > pad-received-GS.patch > deleted file mode 100644 > index b924e38824..0000000000 > --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0- > plugins-base/0004-subparse-set-need_segment-after-sink- > pad-received-GS.patch > +++ /dev/null > @@ -1,69 +0,0 @@ > -From ed09c8fd2c9c2b5384b72cc70af3728be6694e64 Mon Sep 17 00:00:00 2001 > -From: Mingke Wang <mingke.wang@freescale.com> > -Date: Thu, 19 Mar 2015 14:20:26 +0800 > -Subject: [PATCH 4/4] subparse: set need_segment after sink pad received > - GST_EVENT_SEGMENT > - > -subparse works in push mode, chain funciton will be called once > -up stream element finished the seeking and flushing. > -if set need_segment flag in src pad event handler, the segment > -event will be pushed earlier, result in the subtitle text will > -be send out to down stream from the beginning. > - > -Upstream-Status: Submitted [https://bugzilla.gnome.org/ > show_bug.cgi?id=747498] > - > -Signed-off-by: Mingke Wang <mingke.wang@freescale.com> > - > -diff --git a/gst/subparse/gstsubparse.c b/gst/subparse/gstsubparse.c > -old mode 100644 > -new mode 100755 > -index b565e93..7741ccc > ---- a/gst/subparse/gstsubparse.c > -+++ b/gst/subparse/gstsubparse.c > -@@ -266,22 +266,20 @@ gst_sub_parse_src_event (GstPad * pad, GstObject * > parent, GstEvent * event) > - goto beach; > - } > - > -+ /* Apply the seek to our segment */ > -+ gst_segment_do_seek (&self->segment, rate, format, flags, > -+ start_type, start, stop_type, stop, &update); > -+ > -+ GST_DEBUG_OBJECT (self, "segment after seek: %" GST_SEGMENT_FORMAT, > -+ &self->segment); > -+ > - /* Convert that seek to a seeking in bytes at position 0, > - FIXME: could use an index */ > - ret = gst_pad_push_event (self->sinkpad, > - gst_event_new_seek (rate, GST_FORMAT_BYTES, flags, > - GST_SEEK_TYPE_SET, 0, GST_SEEK_TYPE_NONE, 0)); > - > -- if (ret) { > -- /* Apply the seek to our segment */ > -- gst_segment_do_seek (&self->segment, rate, format, flags, > -- start_type, start, stop_type, stop, &update); > -- > -- GST_DEBUG_OBJECT (self, "segment after seek: %" > GST_SEGMENT_FORMAT, > -- &self->segment); > -- > -- self->need_segment = TRUE; > -- } else { > -+ if (!ret) { > - GST_WARNING_OBJECT (self, "seek to 0 bytes failed"); > - } > - > -@@ -1641,8 +1639,10 @@ gst_sub_parse_sink_event (GstPad * pad, GstObject > * parent, GstEvent * event) > - gst_event_parse_segment (event, &s); > - if (s->format == GST_FORMAT_TIME) > - gst_event_copy_segment (event, &self->segment); > -- GST_DEBUG_OBJECT (self, "newsegment (%s)", > -- gst_format_get_name (self->segment.format)); > -+ GST_DEBUG_OBJECT (self, "newsegment (%s) %" GST_SEGMENT_FORMAT, > -+ gst_format_get_name (self->segment.format), &self->segment); > -+ > -+ self->need_segment = TRUE; > - > - /* if not time format, we'll either start with a 0 timestamp > anyway or > - * it's following a seek in which case we'll have saved the > requested > --- > -1.7.9.5 > - > diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0- > plugins-base/0009-glimagesink-Downrank-to-marginal.patch > b/meta/recipes-multimedia/gstreamer/gstreamer1.0- > plugins-base/0009-glimagesink-Downrank-to-marginal.patch > new file mode 100644 > index 0000000000..c81fb0f6aa > --- /dev/null > +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0- > plugins-base/0009-glimagesink-Downrank-to-marginal.patch > @@ -0,0 +1,32 @@ > +From c6b37a80806f9128de47f1ccc3f2354f8d436bb6 Mon Sep 17 00:00:00 2001 > +From: Alexander Kanavin <alex.kanavin@gmail.com> > +Date: Thu, 24 Sep 2015 19:47:32 +0300 > +Subject: [PATCH] glimagesink: Downrank to marginal > + > +On desktop, where there is good OpenGL, xvimagesink will come up first, > +on other platforms, OpenGL can't be trusted because it's either software > (like > +in a VM) or broken (like on embedded)., so let ximagesink come above. > + > +Upstream-Status: Submitted [https://bugzilla.gnome.org/ > show_bug.cgi?id=751684] > + > +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> > +--- > + ext/gl/gstopengl.c | 2 +- > + 1 file changed, 1 insertion(+), 1 deletion(-) > + > +diff --git a/ext/gl/gstopengl.c b/ext/gl/gstopengl.c > +index a4b2540..0ccaacd 100644 > +--- a/ext/gl/gstopengl.c > ++++ b/ext/gl/gstopengl.c > +@@ -118,7 +118,7 @@ plugin_init (GstPlugin * plugin) > + #endif > + > + if (!gst_element_register (plugin, "glimagesink", > +- GST_RANK_SECONDARY, gst_gl_image_sink_bin_get_type ())) { > ++ GST_RANK_MARGINAL, gst_gl_image_sink_bin_get_type ())) { > + return FALSE; > + } > + > +-- > +2.1.4 > + > diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0- > plugins-base/get-caps-from-src-pad-when-query-caps.patch > b/meta/recipes-multimedia/gstreamer/gstreamer1.0- > plugins-base/get-caps-from-src-pad-when-query-caps.patch > index c8e6287a55..a4727e23ea 100644 > --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0- > plugins-base/get-caps-from-src-pad-when-query-caps.patch > +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0- > plugins-base/get-caps-from-src-pad-when-query-caps.patch > @@ -1,4 +1,4 @@ > -From af0dac26f62aaceb4bf266720911953793e0fc5d Mon Sep 17 00:00:00 2001 > +From 41de2ec64ab06bb58c82c1659adaa3811bc5bcf8 Mon Sep 17 00:00:00 2001 > From: zhouming <b42586@freescale.com> > Date: Wed, 14 May 2014 10:16:20 +0800 > Subject: [PATCH] ENGR00312515: get caps from src pad when query caps > @@ -8,18 +8,19 @@ https://bugzilla.gnome.org/show_bug.cgi?id=728312 > Upstream-Status: Pending > > Signed-off-by: zhouming <b42586@freescale.com> > + > --- > - gst-libs/gst/tag/gsttagdemux.c | 13 +++++++++++++ > + gst-libs/gst/tag/gsttagdemux.c | 13 +++++++++++++ > 1 file changed, 13 insertions(+) > mode change 100644 => 100755 gst-libs/gst/tag/gsttagdemux.c > > diff --git a/gst-libs/gst/tag/gsttagdemux.c b/gst-libs/gst/tag/ > gsttagdemux.c > old mode 100644 > new mode 100755 > -index 9b6c478..ae2294a > +index 8a127c8..71c5d78 > --- a/gst-libs/gst/tag/gsttagdemux.c > +++ b/gst-libs/gst/tag/gsttagdemux.c > -@@ -1769,6 +1769,19 @@ gst_tag_demux_pad_query (GstPad * pad, GstObject * > parent, GstQuery * query) > +@@ -1759,6 +1759,19 @@ gst_tag_demux_pad_query (GstPad * pad, GstObject * > parent, GstQuery * query) > } > break; > } > @@ -39,6 +40,3 @@ index 9b6c478..ae2294a > default: > res = gst_pad_query_default (pad, parent, query); > break; > --- > -1.7.9.5 > - > diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0- > plugins-base/link-with-libvchostif.patch b/meta/recipes-multimedia/ > gstreamer/gstreamer1.0-plugins-base/link-with-libvchostif.patch > new file mode 100644 > index 0000000000..d5a7f6bdc2 > --- /dev/null > +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0- > plugins-base/link-with-libvchostif.patch > @@ -0,0 +1,45 @@ > +From 9866f51e5e0913f1e453eb574618bf7432f38cb6 Mon Sep 17 00:00:00 2001 > +From: Khem Raj <raj.khem@gmail.com> > +Date: Wed, 11 Apr 2018 10:46:33 +0800 > +Subject: [PATCH] Add -lvchostif to link when using -lEGL on rpi > + > +This is required because libEGL from userland uses sybols > +from this library. > + > +lib/libEGL.so.1.0.0 > > > 121: 00000000 0 FUNC GLOBAL DEFAULT UND > vc_dispmanx_element_add > + 1552: 00000000 0 FUNC GLOBAL DEFAULT UND vc_dispmanx_element_add > + > +These symbols are provided by libvchostif as seen below > + > +lib/libvchostif.so > + 252: 0000b161 192 FUNC GLOBAL DEFAULT 9 vc_dispmanx_element_add > + 809: 0000b161 192 FUNC GLOBAL DEFAULT 9 vc_dispmanx_element_add > + > +With this explicit link, plugins fail during runtime > + > +(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 > +(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 > + > +Upstream-Status: Pending > +Signed-off-by: Khem Raj <raj.khem@gmail.com> > +Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> > +--- > + m4/gst-gl.m4 | 2 +- > + 1 file changed, 1 insertion(+), 1 deletion(-) > + > +diff --git a/m4/gst-gl.m4 b/m4/gst-gl.m4 > +index 1e97240..ab7774c 100644 > +--- a/m4/gst-gl.m4 > ++++ b/m4/gst-gl.m4 > +@@ -231,7 +231,7 @@ case $host in > + HAVE_EGL=yes > + HAVE_GLES2=yes > + HAVE_EGL_RPI=yes > +- EGL_LIBS="-lbcm_host -lvcos -lvchiq_arm" > ++ EGL_LIBS="-lbcm_host -lvchostif -lvcos > -lvchiq_arm" > + EGL_CFLAGS="" > + AC_DEFINE(USE_EGL_RPI, [1], [Use RPi > platform]) > + ]) > +-- > +2.7.4 > + > diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0- > plugins-base/make-gio_unix_2_0-dependency-configurable.patch > b/meta/recipes-multimedia/gstreamer/gstreamer1.0- > plugins-base/make-gio_unix_2_0-dependency-configurable.patch > index 413eff0695..23950b67f2 100644 > --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0- > plugins-base/make-gio_unix_2_0-dependency-configurable.patch > +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0- > plugins-base/make-gio_unix_2_0-dependency-configurable.patch > @@ -1,4 +1,4 @@ > -From 10d2a977ee1d469f0bf9059bb2d0b55fd2eecbac Mon Sep 17 00:00:00 2001 > +From 7ffa6e3d00e1d8a060f3f4c2bb9a72691af05d79 Mon Sep 17 00:00:00 2001 > From: Andre McCurdy <armccurdy@gmail.com> > Date: Wed, 20 Jan 2016 13:00:00 -0800 > Subject: [PATCH] make gio_unix_2_0 dependency configurable > @@ -17,16 +17,17 @@ instead of AG_GST_CHECK_FEATURE. > Upstream-Status: Pending > > Signed-off-by: Andre McCurdy <armccurdy@gmail.com> > + > --- > configure.ac | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/configure.ac b/configure.ac > -index 9c52aeb..26cacd6 100644 > +index 12807bc..35a0bf3 100644 > --- a/configure.ac > +++ b/configure.ac > -@@ -752,9 +752,16 @@ AC_SUBST(FT2_CFLAGS) > - fi dnl of EXT plugins > +@@ -806,9 +806,16 @@ AM_CONDITIONAL(HAVE_PNG, test "x$HAVE_PNG" = "xyes") > + AM_CONDITIONAL(HAVE_JPEG, test "x$HAVE_JPEG" = "xyes") > > dnl *** gio-unix-2.0 for tests/check/pipelines/tcp.c *** > +AC_ARG_ENABLE([gio_unix_2_0], > @@ -42,6 +43,3 @@ index 9c52aeb..26cacd6 100644 > AM_CONDITIONAL(USE_GIO_UNIX_2_0, test "x$HAVE_GIO_UNIX_2_0" = "xyes") > > dnl *** finalize CFLAGS, LDFLAGS, LIBS > --- > -1.9.1 > - > diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0- > plugins-base_1.12.4.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0- > plugins-base_1.12.4.bb > deleted file mode 100644 > index dd895bbcb1..0000000000 > --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0- > plugins-base_1.12.4.bb > +++ /dev/null > @@ -1,18 +0,0 @@ > -require gstreamer1.0-plugins-base.inc > - > -LIC_FILES_CHKSUM = "file://COPYING;md5=c54ce9345727175ff66d17b67ff51f58 \ > - file://COPYING.LIB;md5=6762ed442b3822387a51c92d928ead0d > \ > - file://common/coverage/coverage-report.pl > ;beginline=2;endline=17;md5=a4e1830fce078028c8f0974161272607" > - > -SRC_URI = " \ > - http://gstreamer.freedesktop.org/src/gst-plugins-base/gst- > plugins-base-${PV}.tar.xz \ > - file://get-caps-from-src-pad-when-query-caps.patch \ > - file://0003-ssaparse-enhance-SSA-text-lines-parsing.patch \ > - file://0004-subparse-set-need_segment-after-sink-pad-received-GS.patch > \ > - file://make-gio_unix_2_0-dependency-configurable.patch \ > - file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch > \ > -" > -SRC_URI[md5sum] = "b35b04071f69b8ab69a7f3a497ff0131" > -SRC_URI[sha256sum] = "4c306b03df0212f1b8903784e29bb3 > 493319ba19ebebf13b0c56a17870292282" > - > -S = "${WORKDIR}/gst-plugins-base-${PV}" > 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.0.bb > new file mode 100644 > index 0000000000..370cd0368c > --- /dev/null > +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0- > plugins-base_1.14.0.bb > @@ -0,0 +1,70 @@ > +require gstreamer1.0-plugins.inc > + > +LICENSE = "GPLv2+ & LGPLv2+" > +LIC_FILES_CHKSUM = "file://COPYING;md5=c54ce9345727175ff66d17b67ff51f58 \ > + file://COPYING.LIB;md5=6762ed442b3822387a51c92d928ead0d > \ > + file://common/coverage/coverage-report.pl > ;beginline=2;endline=17;md5=a4e1830fce078028c8f0974161272607" > + > +SRC_URI = " \ > + http://gstreamer.freedesktop.org/src/gst-plugins-base/gst- > plugins-base-${PV}.tar.xz \ > + file://get-caps-from-src-pad-when-query-caps.patch \ > + file://0003-ssaparse-enhance-SSA-text-lines-parsing.patch \ > + file://make-gio_unix_2_0-dependency-configurable.patch \ > + file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch > \ > + file://0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch > \ > + file://0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch > \ > + file://0003-riff-add-missing-include-directories-when-calling-in.patch > \ > + file://0004-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch > \ > + file://0009-glimagesink-Downrank-to-marginal.patch \ > + file://0001-gstreamer-gl.pc.in-don-t-append-GL_CFLAGS-to-CFLAGS.patch > \ > + file://link-with-libvchostif.patch \ > + " > +SRC_URI[md5sum] = "370271327dd23110421a9c2927ac989a" > +SRC_URI[sha256sum] = "7e904660ff56e02b036cf7fdfb77a5 > 0a540828ca9d2614d69ba931772e5b6940" > + > +S = "${WORKDIR}/gst-plugins-base-${PV}" > + > +DEPENDS += "iso-codes util-linux" > + > +inherit gettext > + > +PACKAGES_DYNAMIC =+ "^libgst.*" > + > +PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', > 'gles2 egl', '', d)}" > +PACKAGECONFIG ??= " \ > + ${GSTREAMER_ORC} \ > + ${@bb.utils.filter('DISTRO_FEATURES', 'alsa x11', d)} \ > + gio-unix-2.0 ogg pango theora vorbis zlib jpeg \ > + ${PACKAGECONFIG_GL} \ > + ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland egl', > '', d)} \ > +" > + > +X11DEPENDS = "virtual/libx11 libsm libxrender libxv" > +X11ENABLEOPTS = "--enable-x --enable-xvideo --enable-xshm" > +X11DISABLEOPTS = "--disable-x --disable-xvideo --disable-xshm" > + > +PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib" > +PACKAGECONFIG[cdparanoia] = "--enable-cdparanoia,-- > disable-cdparanoia,cdparanoia" > +PACKAGECONFIG[gio-unix-2.0] = "--enable-gio_unix_2_0,-- > disable-gio_unix_2_0,glib-2.0" > +PACKAGECONFIG[ivorbis] = "--enable-ivorbis,--disable-ivorbis,tremor" > +PACKAGECONFIG[ogg] = "--enable-ogg,--disable-ogg,libogg" > +PACKAGECONFIG[opus] = "--enable-opus,--disable-opus,libopus" > +PACKAGECONFIG[pango] = "--enable-pango,--disable-pango,pango" > +PACKAGECONFIG[theora] = "--enable-theora,--disable- > theora,libtheora" > +PACKAGECONFIG[visual] = "--enable-libvisual,--disable- > libvisual,libvisual" > +PACKAGECONFIG[vorbis] = "--enable-vorbis,--disable- > vorbis,libvorbis" > +PACKAGECONFIG[x11] = "${X11ENABLEOPTS},${ > X11DISABLEOPTS},${X11DEPENDS}" > +PACKAGECONFIG[zlib] = "--enable-zlib,--disable-zlib,zlib" > +PACKAGECONFIG[opengl] = "--enable-opengl,--disable-opengl,virtual/libgl > libglu" > +PACKAGECONFIG[gles2] = "--enable-gles2,--disable- > gles2,virtual/libgles2" > +PACKAGECONFIG[egl] = "--enable-egl,--disable-egl,virtual/egl" > +PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,wayland-native > wayland wayland-protocols libdrm" > +PACKAGECONFIG[jpeg] = ",,jpeg" > + > +FILES_${MLPREFIX}libgsttag-1.0 += "${datadir}/gst-plugins-base/ > 1.0/license-translations.dict" > + > +do_compile_prepend() { > + export GIR_EXTRA_LIBS_PATH="${B}/gst-libs/gst/tag/.libs:${B}/gst- > libs/gst/video/.libs:${B}/gst-libs/gst/audio/.libs:${B}/gst- > libs/gst/rtp/.libs" > +} > + > +FILES_${PN}-dev += "${libdir}/gstreamer-${LIBV}/ > include/gst/gl/gstglconfig.h" > -- > 2.14.1 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core > [-- Attachment #2: Type: text/html, Size: 78525 bytes --] ^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PATCH 02/12] gst-plugins-base: upgrade 1.12.4 -> 1.14.0 2018-05-04 11:52 ` Burton, Ross @ 2018-05-04 13:07 ` Anuj Mittal 2018-05-04 13:09 ` Burton, Ross 0 siblings, 1 reply; 25+ messages in thread From: Anuj Mittal @ 2018-05-04 13:07 UTC (permalink / raw) To: Burton, Ross; +Cc: OE-core For some reason, I can't reproduce this, I have g-i enabled. But, it looks like we need this: https://cgit.freedesktop.org/gstreamer/gst-plugins-base/commit/?h=1.14&id=9261296858cb149767ceac44fd6bd13cc0de0d21 On 05/04/2018 07:52 PM, Burton, Ross wrote: > Couldn't find include 'GstVideo-1.0.gir' (search path: > '['/data/poky-tmp/master/work/corei7-64-poky-linux/gstreamer1.0-plugins-base/1.14.0-r0/recipe-sysroot/usr/share/gir-1.0', > '/usr/share/gir-1.0', '/usr/share/gir-1.0', '/usr/share/gir-1.0', > '/data/poky-tmp/master/work/corei7-64-poky-linux/gstreamer1.0-plugins-base/1.14.0-r0/recipe-sysroot/usr/share/gir-1.0', > '/data/poky-tmp/master/work/corei7-64-poky-linux/gstreamer1.0-plugins-base/1.14.0-r0/recipe-sysroot-native/usr/share/gir-1.0', > '/usr/share/gir-1.0', > '/data/poky-tmp/master/work/corei7-64-poky-linux/gstreamer1.0-plugins-base/1.14.0-r0/recipe-sysroot-native/usr/share/gir-1.0']') > | Makefile:1506: recipe for target 'GstGL-1.0.gir' failed > > Turn on gobject-introspection DISTRO_FEATURE if you haven't already. > > That file is at ./gst-libs/gst/video/GstVideo-1.0.gir in the build tree, > so that search path is wrong... > > Ross > > On 3 May 2018 at 09:17, Anuj Mittal <anuj.mittal@intel.com > <mailto:anuj.mittal@intel.com>> wrote: > > * For changes, please see: > https://gstreamer.freedesktop.org/releases/1.14/ > <https://gstreamer.freedesktop.org/releases/1.14/> > * OpenGL integration library has moved to -plugins-base, add > PACKAGECONFIG. > * Remove one patch as that has been fixed in a different way upstream. > * Merge inc/bb and refresh patches to get rid of fuzz warnings. > * Remove x86 specific cached variables as they're not needed anymore. > * Add jpeg to PACKAGECONFIG and enable it by default. > * Port gstreamer-gl specific patches from -plugins-bad. > > Signed-off-by: Anuj Mittal <anuj.mittal@intel.com > <mailto:anuj.mittal@intel.com>> > --- > ...on.m4-prefix-pkgconfig-paths-with-PKG_CON.patch | 12 +- > .../gstreamer/gstreamer1.0-plugins-base.inc | 50 ------- > ...-don-t-hardcode-libtool-name-when-running.patch | 71 +++++----- > ...gl.pc.in-don-t-append-GL_CFLAGS-to-CFLAGS.patch | 29 ++++ > ...-prefix-calls-to-pkg-config-with-PKG_CONF.patch | 151 > +++++++++------------ > ...ssing-include-directories-when-calling-in.patch | 12 +- > ...3-ssaparse-enhance-SSA-text-lines-parsing.patch | 24 ++-- > ...ncorrect-reference-to-gstreamer-sdp-in-Ma.patch | 12 +- > ...t-need_segment-after-sink-pad-received-GS.patch | 69 ---------- > .../0009-glimagesink-Downrank-to-marginal.patch | 32 +++++ > .../get-caps-from-src-pad-when-query-caps.patch | 12 +- > .../link-with-libvchostif.patch | 45 ++++++ > ...make-gio_unix_2_0-dependency-configurable.patch | 12 +- > .../gstreamer/gstreamer1.0-plugins-base_1.12.4.bb > <http://gstreamer1.0-plugins-base_1.12.4.bb> | 18 --- > .../gstreamer/gstreamer1.0-plugins-base_1.14.0.bb > <http://gstreamer1.0-plugins-base_1.14.0.bb> | 70 ++++++++++ > 15 files changed, 314 insertions(+), 305 deletions(-) > delete mode 100644 > meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc > create mode 100644 > meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-gstreamer-gl.pc.in-don-t-append-GL_CFLAGS-to-CFLAGS.patch > delete mode 100644 > meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0004-subparse-set-need_segment-after-sink-pad-received-GS.patch > create mode 100644 > meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0009-glimagesink-Downrank-to-marginal.patch > create mode 100644 > meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/link-with-libvchostif.patch > delete mode 100644 > meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.12.4.bb <http://gstreamer1.0-plugins-base_1.12.4.bb> > create mode 100644 > meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.14.0.bb <http://gstreamer1.0-plugins-base_1.14.0.bb> > > diff --git > a/meta/recipes-multimedia/gstreamer/files/0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch > b/meta/recipes-multimedia/gstreamer/files/0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch > index 2cab87f9ec..1b7f115083 100644 > --- > a/meta/recipes-multimedia/gstreamer/files/0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch > +++ > b/meta/recipes-multimedia/gstreamer/files/0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch > @@ -1,4 +1,4 @@ > -From 90916f96262fa7b27a0a99788c69f9fd6df11000 Mon Sep 17 00:00:00 2001 > +From 2b0436f9a07773fae8c74df902d7024e8bfc3512 Mon Sep 17 00:00:00 2001 > From: Alexander Kanavin <alex.kanavin@gmail.com > <mailto:alex.kanavin@gmail.com>> > Date: Tue, 24 Nov 2015 16:46:27 +0200 > Subject: [PATCH] introspection.m4: prefix pkgconfig paths with > @@ -10,12 +10,13 @@ is later supplied to g-ir-scanner. > > Upstream-Status: Pending [review on oe-core list] > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com > <mailto:alex.kanavin@gmail.com>> > + > --- > - common/m4/introspection.m4 | 12 ++++++------ > - 1 file changed, 6 insertions(+), 6 deletions(-) > + common/m4/introspection.m4 | 8 ++++---- > + 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/common/m4/introspection.m4 b/common/m4/introspection.m4 > -index 162be57..217a6ae 100644 > +index 162be57..933f979 100644 > --- a/common/m4/introspection.m4 > +++ b/common/m4/introspection.m4 > @@ -54,14 +54,14 @@ m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL], > @@ -37,6 +38,3 @@ index 162be57..217a6ae 100644 > INTROSPECTION_INIT="extern void gst_init(gint*,gchar**); > gst_init(NULL,NULL);" > fi > AC_SUBST(INTROSPECTION_SCANNER) > --- > -2.6.2 > - > diff --git > a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc > b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc > deleted file mode 100644 > index 08130c1da4..0000000000 > --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc > +++ /dev/null > @@ -1,50 +0,0 @@ > -require gstreamer1.0-plugins.inc > - > -SRC_URI_append = "\ > - > file://0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch \ > - > file://0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch \ > - > file://0003-riff-add-missing-include-directories-when-calling-in.patch \ > - > file://0004-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch \ > -" > - > -LICENSE = "GPLv2+ & LGPLv2+" > - > -DEPENDS += "iso-codes util-linux zlib" > - > -inherit gettext > - > -PACKAGES_DYNAMIC =+ "^libgst.*" > - > -PACKAGECONFIG ??= " \ > - ${GSTREAMER_ORC} \ > - ${@bb.utils.filter('DISTRO_FEATURES', 'alsa x11', d)} \ > - gio-unix-2.0 ogg pango theora vorbis \ > -" > - > -X11DEPENDS = "virtual/libx11 libsm libxrender libxv" > -X11ENABLEOPTS = "--enable-x --enable-xvideo --enable-xshm" > -X11DISABLEOPTS = "--disable-x --disable-xvideo --disable-xshm" > - > -PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib" > -PACKAGECONFIG[cdparanoia] = > "--enable-cdparanoia,--disable-cdparanoia,cdparanoia" > -PACKAGECONFIG[gio-unix-2.0] = > "--enable-gio_unix_2_0,--disable-gio_unix_2_0,glib-2.0" > -PACKAGECONFIG[ivorbis] = > "--enable-ivorbis,--disable-ivorbis,tremor" > -PACKAGECONFIG[ogg] = "--enable-ogg,--disable-ogg,libogg" > -PACKAGECONFIG[opus] = "--enable-opus,--disable-opus,libopus" > -PACKAGECONFIG[pango] = "--enable-pango,--disable-pango,pango" > -PACKAGECONFIG[theora] = > "--enable-theora,--disable-theora,libtheora" > -PACKAGECONFIG[visual] = > "--enable-libvisual,--disable-libvisual,libvisual" > -PACKAGECONFIG[vorbis] = > "--enable-vorbis,--disable-vorbis,libvorbis" > -PACKAGECONFIG[x11] = > "${X11ENABLEOPTS},${X11DISABLEOPTS},${X11DEPENDS}" > - > -EXTRA_OECONF += " \ > - --enable-zlib \ > -" > - > -CACHED_CONFIGUREVARS_append_x86 = " ac_cv_header_emmintrin_h=no > ac_cv_header_xmmintrin_h=no" > - > -FILES_${MLPREFIX}libgsttag-1.0 += > "${datadir}/gst-plugins-base/1.0/license-translations.dict" > - > -do_compile_prepend() { > - export > GIR_EXTRA_LIBS_PATH="${B}/gst-libs/gst/tag/.libs:${B}/gst-libs/gst/video/.libs:${B}/gst-libs/gst/audio/.libs:${B}/gst-libs/gst/rtp/.libs" > -} > diff --git > a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch > b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch > index 094bdac846..128c7f8cb6 100644 > --- > a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch > +++ > b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch > @@ -1,16 +1,18 @@ > -From f1d9652351e7754c63003104eceb526af424c7e0 Mon Sep 17 00:00:00 2001 > +From 4d6ea58f96b9744af8d899ddca22c2695ac74b5b Mon Sep 17 00:00:00 2001 > From: Alexander Kanavin <alex.kanavin@gmail.com > <mailto:alex.kanavin@gmail.com>> > -Date: Fri, 20 Nov 2015 16:53:04 +0200 > -Subject: [PATCH 1/4] Makefile.am: don't hardcode libtool name when > running > +Date: Thu, 5 Apr 2018 10:15:08 +0800 > +Subject: [PATCH] Makefile.am: don't hardcode libtool name when running > introspection tools > > Upstream-Status: Pending [review on oe-core maillist] > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com > <mailto:alex.kanavin@gmail.com>> > +Signed-off-by: Anuj Mittal <anuj.mittal@intel.com > <mailto:anuj.mittal@intel.com>> > + > --- > gst-libs/gst/allocators/Makefile.am | 2 +- > gst-libs/gst/app/Makefile.am | 2 +- > gst-libs/gst/audio/Makefile.am | 2 +- > - gst-libs/gst/fft/Makefile.am | 2 +- > + gst-libs/gst/gl/Makefile.am | 2 +- > gst-libs/gst/pbutils/Makefile.am | 2 +- > gst-libs/gst/riff/Makefile.am | 2 +- > gst-libs/gst/rtp/Makefile.am | 2 +- > @@ -21,10 +23,10 @@ Signed-off-by: Alexander Kanavin > <alex.kanavin@gmail.com <mailto:alex.kanavin@gmail.com>> > 11 files changed, 11 insertions(+), 11 deletions(-) > > diff --git a/gst-libs/gst/allocators/Makefile.am > b/gst-libs/gst/allocators/Makefile.am > -index 9361bf9..bc7f53a 100644 > +index 1957d28..1ecc950 100644 > --- a/gst-libs/gst/allocators/Makefile.am > +++ b/gst-libs/gst/allocators/Makefile.am > -@@ -38,7 +38,7 @@ GstAllocators-@GST_API_VERSION@.gir: > $(INTROSPECTION_SCANNER) libgstallocators-@ > +@@ -42,7 +42,7 @@ GstAllocators-@GST_API_VERSION@.gir: > $(INTROSPECTION_SCANNER) libgstallocators-@ > > --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" > $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ > --library=libgstallocators-@GST_API_VERSION@.la \ > --include=Gst-@GST_API_VERSION@ \ > @@ -34,10 +36,10 @@ index 9361bf9..bc7f53a 100644 > --pkg-export gstreamer-allocators-@GST_API_VERSION@ \ > --output $@ \ > diff --git a/gst-libs/gst/app/Makefile.am > b/gst-libs/gst/app/Makefile.am > -index 6d6de8d..dcc2fe0 100644 > +index 52f6ad3..5bfd606 100644 > --- a/gst-libs/gst/app/Makefile.am > +++ b/gst-libs/gst/app/Makefile.am > -@@ -53,7 +53,7 @@ GstApp-@GST_API_VERSION@.gir: > $(INTROSPECTION_SCANNER) libgstapp-@GST_API_VERSIO > +@@ -56,7 +56,7 @@ GstApp-@GST_API_VERSION@.gir: > $(INTROSPECTION_SCANNER) libgstapp-@GST_API_VERSIO > --library=libgstapp-@GST_API_VERSION@.la \ > --include=Gst-@GST_API_VERSION@ \ > --include=GstBase-@GST_API_VERSION@ \ > @@ -47,10 +49,10 @@ index 6d6de8d..dcc2fe0 100644 > --pkg gstreamer-base-@GST_API_VERSION@ \ > --pkg-export gstreamer-app-@GST_API_VERSION@ \ > diff --git a/gst-libs/gst/audio/Makefile.am > b/gst-libs/gst/audio/Makefile.am > -index 275d222..2374196 100644 > +index 2922245..7fb65f2 100644 > --- a/gst-libs/gst/audio/Makefile.am > +++ b/gst-libs/gst/audio/Makefile.am > -@@ -116,7 +116,7 @@ GstAudio-@GST_API_VERSION@.gir: > $(INTROSPECTION_SCANNER) libgstaudio-@GST_API_VE > +@@ -184,7 +184,7 @@ GstAudio-@GST_API_VERSION@.gir: > $(INTROSPECTION_SCANNER) libgstaudio-@GST_API_VE > --include=Gst-@GST_API_VERSION@ \ > --include=GstBase-@GST_API_VERSION@ \ > --include=GstTag-@GST_API_VERSION@ \ > @@ -59,24 +61,24 @@ index 275d222..2374196 100644 > --pkg gstreamer-@GST_API_VERSION@ \ > --pkg gstreamer-base-@GST_API_VERSION@ \ > --pkg-export gstreamer-audio-@GST_API_VERSION@ \ > -diff --git a/gst-libs/gst/fft/Makefile.am > b/gst-libs/gst/fft/Makefile.am > -index 09b3d68..f545354 100644 > ---- a/gst-libs/gst/fft/Makefile.am > -+++ b/gst-libs/gst/fft/Makefile.am > -@@ -65,7 +65,7 @@ GstFft-@GST_API_VERSION@.gir: > $(INTROSPECTION_SCANNER) libgstfft-@GST_API_VERSIO > - > --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" > $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ > - --library=libgstfft-@GST_API_VERSION@.la \ > +diff --git a/gst-libs/gst/gl/Makefile.am b/gst-libs/gst/gl/Makefile.am > +index a3bbc94..16f829f 100644 > +--- a/gst-libs/gst/gl/Makefile.am > ++++ b/gst-libs/gst/gl/Makefile.am > +@@ -192,7 +192,7 @@ GstGL-@GST_API_VERSION@.gir: > $(INTROSPECTION_SCANNER) libgstgl-@GST_API_VERSION@ > --include=Gst-@GST_API_VERSION@ \ > + --include=GstBase-@GST_API_VERSION@ \ > + --include=GstVideo-@GST_API_VERSION@ \ > - --libtool="$(top_builddir)/libtool" \ > + --libtool="$(LIBTOOL)" \ > --pkg gstreamer-@GST_API_VERSION@ \ > - --pkg-export gstreamer-fft-@GST_API_VERSION@ \ > - --output $@ \ > + --pkg gstreamer-base-@GST_API_VERSION@ \ > + --pkg gstreamer-video-@GST_API_VERSION@ \ > diff --git a/gst-libs/gst/pbutils/Makefile.am > b/gst-libs/gst/pbutils/Makefile.am > -index 64d5eb0..91dc214 100644 > +index ae51993..35a6e44 100644 > --- a/gst-libs/gst/pbutils/Makefile.am > +++ b/gst-libs/gst/pbutils/Makefile.am > -@@ -99,7 +99,7 @@ GstPbutils-@GST_API_VERSION@.gir: > $(INTROSPECTION_SCANNER) libgstpbutils-@GST_AP > +@@ -103,7 +103,7 @@ GstPbutils-@GST_API_VERSION@.gir: > $(INTROSPECTION_SCANNER) libgstpbutils-@GST_AP > --include=GstTag-@GST_API_VERSION@ \ > --include=GstVideo-@GST_API_VERSION@ \ > --include=GstAudio-@GST_API_VERSION@ \ > @@ -86,10 +88,10 @@ index 64d5eb0..91dc214 100644 > --pkg gstreamer-tag-@GST_API_VERSION@ \ > --pkg gstreamer-video-@GST_API_VERSION@ \ > diff --git a/gst-libs/gst/riff/Makefile.am > b/gst-libs/gst/riff/Makefile.am > -index 83d83cb..3bd8fc0 100644 > +index fb53f06..e66ef4f 100644 > --- a/gst-libs/gst/riff/Makefile.am > +++ b/gst-libs/gst/riff/Makefile.am > -@@ -47,7 +47,7 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS = > $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) > +@@ -49,7 +49,7 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS = > $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) > # --include=GstAudio-@GST_API_VERSION@ \ > # --include=GstTag-@GST_API_VERSION@ \ > # --include=Gst-@GST_API_VERSION@ \ > @@ -99,10 +101,10 @@ index 83d83cb..3bd8fc0 100644 > # --pkg gstreamer-tag-@GST_API_VERSION@ \ > # --pkg gstreamer-audio-@GST_API_VERSION@ \ > diff --git a/gst-libs/gst/rtp/Makefile.am > b/gst-libs/gst/rtp/Makefile.am > -index fdd01c1..f5445c1 100644 > +index a6f971d..77ebeeb 100644 > --- a/gst-libs/gst/rtp/Makefile.am > +++ b/gst-libs/gst/rtp/Makefile.am > -@@ -65,7 +65,7 @@ GstRtp-@GST_API_VERSION@.gir: > $(INTROSPECTION_SCANNER) libgstrtp-@GST_API_VERSIO > +@@ -69,7 +69,7 @@ GstRtp-@GST_API_VERSION@.gir: > $(INTROSPECTION_SCANNER) libgstrtp-@GST_API_VERSIO > --library=libgstrtp-@GST_API_VERSION@.la \ > --include=Gst-@GST_API_VERSION@ \ > --include=GstBase-@GST_API_VERSION@ \ > @@ -112,10 +114,10 @@ index fdd01c1..f5445c1 100644 > --pkg gstreamer-base-@GST_API_VERSION@ \ > --pkg-export gstreamer-rtp-@GST_API_VERSION@ \ > diff --git a/gst-libs/gst/rtsp/Makefile.am > b/gst-libs/gst/rtsp/Makefile.am > -index ede5706..9b0b258 100644 > +index ceb07f4..db9d0fd 100644 > --- a/gst-libs/gst/rtsp/Makefile.am > +++ b/gst-libs/gst/rtsp/Makefile.am > -@@ -72,7 +72,7 @@ GstRtsp-@GST_API_VERSION@.gir: > $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERS > +@@ -76,7 +76,7 @@ GstRtsp-@GST_API_VERSION@.gir: > $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERS > --include=Gio-2.0 \ > --include=Gst-@GST_API_VERSION@ \ > --include=GstSdp-@GST_API_VERSION@ \ > @@ -125,10 +127,10 @@ index ede5706..9b0b258 100644 > --pkg gstreamer-@GST_API_VERSION@ \ > --pkg gstreamer-sdp-@GST_API_VERSION@ \ > diff --git a/gst-libs/gst/sdp/Makefile.am > b/gst-libs/gst/sdp/Makefile.am > -index a90f30b..0e149b8 100644 > +index e197e9b..6e05cc7 100644 > --- a/gst-libs/gst/sdp/Makefile.am > +++ b/gst-libs/gst/sdp/Makefile.am > -@@ -32,7 +32,7 @@ GstSdp-@GST_API_VERSION@.gir: > $(INTROSPECTION_SCANNER) libgstsdp-@GST_API_VERSIO > +@@ -34,7 +34,7 @@ GstSdp-@GST_API_VERSION@.gir: > $(INTROSPECTION_SCANNER) libgstsdp-@GST_API_VERSIO > > --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" > $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ > --library=libgstsdp-@GST_API_VERSION@.la \ > --include=Gst-@GST_API_VERSION@ \ > @@ -138,10 +140,10 @@ index a90f30b..0e149b8 100644 > --pkg-export gstreamer-sdp-@GST_API_VERSION@ \ > --output $@ \ > diff --git a/gst-libs/gst/tag/Makefile.am > b/gst-libs/gst/tag/Makefile.am > -index c534a4d..cafafd3 100644 > +index 0247c33..c86515b 100644 > --- a/gst-libs/gst/tag/Makefile.am > +++ b/gst-libs/gst/tag/Makefile.am > -@@ -45,7 +45,7 @@ GstTag-@GST_API_VERSION@.gir: > $(INTROSPECTION_SCANNER) libgsttag-@GST_API_VERSIO > +@@ -66,7 +66,7 @@ GstTag-@GST_API_VERSION@.gir: > $(INTROSPECTION_SCANNER) libgsttag-@GST_API_VERSIO > --library=libgsttag-@GST_API_VERSION@.la \ > --include=Gst-@GST_API_VERSION@ \ > --include=GstBase-@GST_API_VERSION@ \ > @@ -151,10 +153,10 @@ index c534a4d..cafafd3 100644 > --pkg gstreamer-base-@GST_API_VERSION@ \ > --pkg-export gstreamer-tag-@GST_API_VERSION@ \ > diff --git a/gst-libs/gst/video/Makefile.am > b/gst-libs/gst/video/Makefile.am > -index 5d31fa1..ac64eb3 100644 > +index 9fc1ccf..0f8455f 100644 > --- a/gst-libs/gst/video/Makefile.am > +++ b/gst-libs/gst/video/Makefile.am > -@@ -116,7 +116,7 @@ GstVideo-@GST_API_VERSION@.gir: > $(INTROSPECTION_SCANNER) libgstvideo-@GST_API_VE > +@@ -124,7 +124,7 @@ GstVideo-@GST_API_VERSION@.gir: > $(INTROSPECTION_SCANNER) libgstvideo-@GST_API_VE > --library=libgstvideo-@GST_API_VERSION@.la \ > --include=Gst-@GST_API_VERSION@ \ > --include=GstBase-@GST_API_VERSION@ \ > @@ -163,6 +165,3 @@ index 5d31fa1..ac64eb3 100644 > --pkg gstreamer-@GST_API_VERSION@ \ > --pkg gstreamer-base-@GST_API_VERSION@ \ > --pkg-export gstreamer-video-@GST_API_VERSION@ \ > --- > -2.6.2 > - > diff --git > a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-gstreamer-gl.pc.in-don-t-append-GL_CFLAGS-to-CFLAGS.patch > b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-gstreamer-gl.pc.in-don-t-append-GL_CFLAGS-to-CFLAGS.patch > new file mode 100644 > index 0000000000..251dc172cb > --- /dev/null > +++ > b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-gstreamer-gl.pc.in-don-t-append-GL_CFLAGS-to-CFLAGS.patch > @@ -0,0 +1,29 @@ > +From 61a672e79c8cb1aeeeda4c968997c577ac73a8f3 Mon Sep 17 00:00:00 2001 > +From: Alexander Kanavin <alex.kanavin@gmail.com > <mailto:alex.kanavin@gmail.com>> > +Date: Fri, 12 May 2017 16:47:12 +0300 > +Subject: [PATCH] gstreamer-gl.pc.in <http://gstreamer-gl.pc.in>: > don't append GL_CFLAGS to CFLAGS > + > +Dependencies' include directories should not be added in this way; > +it causes problems when cross-compiling in sysroot environments. > + > +Upstream-Status: Pending > + > +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com > <mailto:alex.kanavin@gmail.com>> > +Signed-off-by: Maxin B. John <maxin.john@intel.com > <mailto:maxin.john@intel.com>> > +--- > + pkgconfig/gstreamer-gl.pc.in <http://gstreamer-gl.pc.in> | 2 +- > + 1 file changed, 1 insertion(+), 1 deletion(-) > + > +diff --git a/pkgconfig/gstreamer-gl.pc.in > <http://gstreamer-gl.pc.in> b/pkgconfig/gstreamer-gl.pc.in > <http://gstreamer-gl.pc.in> > +index dc672a9..8c290ba 100644 > +--- a/pkgconfig/gstreamer-gl.pc.in <http://gstreamer-gl.pc.in> > ++++ b/pkgconfig/gstreamer-gl.pc.in <http://gstreamer-gl.pc.in> > +@@ -13,4 +13,4 @@ Version: @VERSION@ > + Requires: gstreamer-video-@GST_API_VERSION@ > gstreamer-base-@GST_API_VERSION@ gstreamer-@GST_API_VERSION@ > + > + Libs: -L${libdir} -lgstgl-@GST_API_VERSION@ > +-Cflags: -I${includedir} > -I${libdir}/gstreamer-@GST_API_VERSION@/include @GL_CFLAGS@ > ++Cflags: -I${includedir} > -I${libdir}/gstreamer-@GST_API_VERSION@/include > +-- > +2.7.4 > + > 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 6616e2cf0d..dc15d93eb0 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,16 +1,17 @@ > -From 990b653c7b6de1937ec759019982d6c5f15770f7 Mon Sep 17 00:00:00 2001 > +From f523721e453febfb3f62f3ba1e9fefb31dcec471 Mon Sep 17 00:00:00 2001 > From: Alexander Kanavin <alex.kanavin@gmail.com > <mailto:alex.kanavin@gmail.com>> > -Date: Mon, 26 Oct 2015 16:38:18 +0200 > -Subject: [PATCH 2/4] Makefile.am: prefix calls to pkg-config with > +Date: Thu, 5 Apr 2018 10:26:25 +0800 > +Subject: [PATCH] Makefile.am: prefix calls to pkg-config with > PKG_CONFIG_SYSROOT_DIR > > Upstream-Status: Pending [review on oe-core maillist] > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com > <mailto:alex.kanavin@gmail.com>> > +Signed-off-by: Anuj Mittal <anuj.mittal@intel.com > <mailto:anuj.mittal@intel.com>> > + > --- > gst-libs/gst/allocators/Makefile.am | 4 ++-- > gst-libs/gst/app/Makefile.am | 4 ++-- > gst-libs/gst/audio/Makefile.am | 12 ++++++------ > - gst-libs/gst/fft/Makefile.am | 4 ++-- > gst-libs/gst/pbutils/Makefile.am | 12 ++++++------ > gst-libs/gst/riff/Makefile.am | 8 ++++---- > gst-libs/gst/rtp/Makefile.am | 8 ++++---- > @@ -18,13 +19,13 @@ Signed-off-by: Alexander Kanavin > <alex.kanavin@gmail.com <mailto:alex.kanavin@gmail.com>> > gst-libs/gst/sdp/Makefile.am | 4 ++-- > gst-libs/gst/tag/Makefile.am | 8 ++++---- > gst-libs/gst/video/Makefile.am | 8 ++++---- > - 11 files changed, 38 insertions(+), 38 deletions(-) > + 10 files changed, 36 insertions(+), 36 deletions(-) > > -Index: gst-plugins-base-1.12.3/gst-libs/gst/allocators/Makefile.am > -=================================================================== > ---- gst-plugins-base-1.12.3.orig/gst-libs/gst/allocators/Makefile.am > -+++ gst-plugins-base-1.12.3/gst-libs/gst/allocators/Makefile.am > -@@ -36,7 +36,7 @@ GstAllocators-@GST_API_VERSION@.gir: $(I > +diff --git a/gst-libs/gst/allocators/Makefile.am > b/gst-libs/gst/allocators/Makefile.am > +index 1ecc950..d6417ac 100644 > +--- a/gst-libs/gst/allocators/Makefile.am > ++++ b/gst-libs/gst/allocators/Makefile.am > +@@ -39,7 +39,7 @@ GstAllocators-@GST_API_VERSION@.gir: > $(INTROSPECTION_SCANNER) libgstallocators-@ > --c-include "gst/allocators/allocators.h" \ > -I$(top_srcdir)/gst-libs \ > -I$(top_builddir)/gst-libs \ > @@ -33,7 +34,7 @@ Index: > gst-plugins-base-1.12.3/gst-libs/gst/allocators/Makefile.am > --library=libgstallocators-@GST_API_VERSION@.la \ > --include=Gst-@GST_API_VERSION@ \ > --libtool="$(LIBTOOL)" \ > -@@ -60,7 +60,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= > +@@ -63,7 +63,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) > $(INTROSPECTION_COMPILER) \ > --includedir=$(srcdir) \ > --includedir=$(builddir) \ > @@ -42,11 +43,11 @@ Index: > gst-plugins-base-1.12.3/gst-libs/gst/allocators/Makefile.am > $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) > > CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA) > -Index: gst-plugins-base-1.12.3/gst-libs/gst/app/Makefile.am > -=================================================================== > ---- gst-plugins-base-1.12.3.orig/gst-libs/gst/app/Makefile.am > -+++ gst-plugins-base-1.12.3/gst-libs/gst/app/Makefile.am > -@@ -48,8 +48,8 @@ GstApp-@GST_API_VERSION@.gir: $(INTROSPE > +diff --git a/gst-libs/gst/app/Makefile.am > b/gst-libs/gst/app/Makefile.am > +index 5bfd606..6441674 100644 > +--- a/gst-libs/gst/app/Makefile.am > ++++ b/gst-libs/gst/app/Makefile.am > +@@ -51,8 +51,8 @@ GstApp-@GST_API_VERSION@.gir: > $(INTROSPECTION_SCANNER) libgstapp-@GST_API_VERSIO > --c-include "gst/app/app.h" \ > -I$(top_srcdir)/gst-libs \ > -I$(top_builddir)/gst-libs \ > @@ -57,11 +58,11 @@ Index: > gst-plugins-base-1.12.3/gst-libs/gst/app/Makefile.am > --library=libgstapp-@GST_API_VERSION@.la \ > --include=Gst-@GST_API_VERSION@ \ > --include=GstBase-@GST_API_VERSION@ \ > -Index: gst-plugins-base-1.12.3/gst-libs/gst/audio/Makefile.am > -=================================================================== > ---- gst-plugins-base-1.12.3.orig/gst-libs/gst/audio/Makefile.am > -+++ gst-plugins-base-1.12.3/gst-libs/gst/audio/Makefile.am > -@@ -167,12 +167,12 @@ GstAudio-@GST_API_VERSION@.gir: $(INTROS > +diff --git a/gst-libs/gst/audio/Makefile.am > b/gst-libs/gst/audio/Makefile.am > +index 7fb65f2..5379f79 100644 > +--- a/gst-libs/gst/audio/Makefile.am > ++++ b/gst-libs/gst/audio/Makefile.am > +@@ -174,12 +174,12 @@ GstAudio-@GST_API_VERSION@.gir: > $(INTROSPECTION_SCANNER) libgstaudio-@GST_API_VE > -I$(top_srcdir)/gst-libs \ > -I$(top_builddir)/gst-libs \ > --c-include "gst/audio/audio.h" \ > @@ -78,7 +79,7 @@ Index: > gst-plugins-base-1.12.3/gst-libs/gst/audio/Makefile.am > --library-path="$(top_builddir)/gst-libs/gst/tag/" \ > --include=Gst-@GST_API_VERSION@ \ > --include=GstBase-@GST_API_VERSION@ \ > -@@ -201,8 +201,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= > +@@ -208,8 +208,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) > --includedir=$(srcdir) \ > --includedir=$(builddir) \ > --includedir="$(top_builddir)/gst-libs/gst/tag/" \ > @@ -89,33 +90,11 @@ Index: > gst-plugins-base-1.12.3/gst-libs/gst/audio/Makefile.am > $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) > > CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) > -Index: gst-plugins-base-1.12.3/gst-libs/gst/fft/Makefile.am > -=================================================================== > ---- gst-plugins-base-1.12.3.orig/gst-libs/gst/fft/Makefile.am > -+++ gst-plugins-base-1.12.3/gst-libs/gst/fft/Makefile.am > -@@ -63,7 +63,7 @@ GstFft-@GST_API_VERSION@.gir: $(INTROSPE > - --c-include "gst/fft/fft.h" \ > - -I$(top_srcdir)/gst-libs \ > - -I$(top_builddir)/gst-libs \ > -- > --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" > $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ > -+ > --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" > $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ > - --library=libgstfft-@GST_API_VERSION@.la \ > - --include=Gst-@GST_API_VERSION@ \ > - --libtool="$(LIBTOOL)" \ > -@@ -87,7 +87,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= > - $(INTROSPECTION_COMPILER) \ > - --includedir=$(srcdir) \ > - --includedir=$(builddir) \ > -- > --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) > --variable=girdir gstreamer-@GST_API_VERSION@` \ > -+ > --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" > $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ > - $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) > - > - CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA) > -Index: gst-plugins-base-1.12.3/gst-libs/gst/pbutils/Makefile.am > -=================================================================== > ---- gst-plugins-base-1.12.3.orig/gst-libs/gst/pbutils/Makefile.am > -+++ gst-plugins-base-1.12.3/gst-libs/gst/pbutils/Makefile.am > -@@ -85,14 +85,14 @@ GstPbutils-@GST_API_VERSION@.gir: $(INTR > +diff --git a/gst-libs/gst/pbutils/Makefile.am > b/gst-libs/gst/pbutils/Makefile.am > +index 35a6e44..49d6894 100644 > +--- a/gst-libs/gst/pbutils/Makefile.am > ++++ b/gst-libs/gst/pbutils/Makefile.am > +@@ -88,14 +88,14 @@ GstPbutils-@GST_API_VERSION@.gir: > $(INTROSPECTION_SCANNER) libgstpbutils-@GST_AP > --c-include "gst/pbutils/pbutils.h" \ > -I$(top_srcdir)/gst-libs \ > -I$(top_builddir)/gst-libs \ > @@ -134,7 +113,7 @@ Index: > gst-plugins-base-1.12.3/gst-libs/gst/pbutils/Makefile.am > --library-path="$(top_builddir)/gst-libs/gst/tag/" \ > --library-path="$(top_builddir)/gst-libs/gst/video/" \ > --library-path="$(top_builddir)/gst-libs/gst/audio/" \ > -@@ -125,8 +125,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= > +@@ -128,8 +128,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) > $(INTROSPECTION_COMPILER) \ > --includedir=$(srcdir) \ > --includedir=$(builddir) \ > @@ -145,11 +124,11 @@ Index: > gst-plugins-base-1.12.3/gst-libs/gst/pbutils/Makefile.am > --includedir="$(top_builddir)/gst-libs/gst/tag/" \ > --includedir="$(top_builddir)/gst-libs/gst/video/" \ > --includedir="$(top_builddir)/gst-libs/gst/audio/" \ > -Index: gst-plugins-base-1.12.3/gst-libs/gst/riff/Makefile.am > -=================================================================== > ---- gst-plugins-base-1.12.3.orig/gst-libs/gst/riff/Makefile.am > -+++ gst-plugins-base-1.12.3/gst-libs/gst/riff/Makefile.am > -@@ -42,8 +42,8 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS > +diff --git a/gst-libs/gst/riff/Makefile.am > b/gst-libs/gst/riff/Makefile.am > +index e66ef4f..c8c588a 100644 > +--- a/gst-libs/gst/riff/Makefile.am > ++++ b/gst-libs/gst/riff/Makefile.am > +@@ -43,8 +43,8 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS = > $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) > # --c-include "gst/riff/riff.h" \ > # --add-include-path=$(builddir)/../tag \ > # --add-include-path=$(builddir)/../audio \ > @@ -160,7 +139,7 @@ Index: > gst-plugins-base-1.12.3/gst-libs/gst/riff/Makefile.am > # --library=libgstriff-@GST_API_VERSION@.la \ > # --include=GstAudio-@GST_API_VERSION@ \ > # --include=GstTag-@GST_API_VERSION@ \ > -@@ -74,8 +74,8 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS > +@@ -75,8 +75,8 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS = > $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) > # --includedir=$(builddir) \ > # --includedir=$(builddir)/../tag \ > # --includedir=$(builddir)/../audio \ > @@ -171,11 +150,11 @@ Index: > gst-plugins-base-1.12.3/gst-libs/gst/riff/Makefile.am > # $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) > # > #CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA) > -Index: gst-plugins-base-1.12.3/gst-libs/gst/rtp/Makefile.am > -=================================================================== > ---- gst-plugins-base-1.12.3.orig/gst-libs/gst/rtp/Makefile.am > -+++ gst-plugins-base-1.12.3/gst-libs/gst/rtp/Makefile.am > -@@ -61,8 +61,8 @@ GstRtp-@GST_API_VERSION@.gir: $(INTROSPE > +diff --git a/gst-libs/gst/rtp/Makefile.am > b/gst-libs/gst/rtp/Makefile.am > +index 77ebeeb..9aee788 100644 > +--- a/gst-libs/gst/rtp/Makefile.am > ++++ b/gst-libs/gst/rtp/Makefile.am > +@@ -64,8 +64,8 @@ GstRtp-@GST_API_VERSION@.gir: > $(INTROSPECTION_SCANNER) libgstrtp-@GST_API_VERSIO > --c-include "gst/rtp/rtp.h" \ > -I$(top_builddir)/gst-libs \ > -I$(top_srcdir)/gst-libs \ > @@ -186,7 +165,7 @@ Index: > gst-plugins-base-1.12.3/gst-libs/gst/rtp/Makefile.am > --library=libgstrtp-@GST_API_VERSION@.la \ > --include=Gst-@GST_API_VERSION@ \ > --include=GstBase-@GST_API_VERSION@ \ > -@@ -89,8 +89,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= > +@@ -92,8 +92,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) > $(INTROSPECTION_COMPILER) \ > --includedir=$(srcdir) \ > --includedir=$(builddir) \ > @@ -197,11 +176,11 @@ Index: > gst-plugins-base-1.12.3/gst-libs/gst/rtp/Makefile.am > $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) > > CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) > -Index: gst-plugins-base-1.12.3/gst-libs/gst/rtsp/Makefile.am > -=================================================================== > ---- gst-plugins-base-1.12.3.orig/gst-libs/gst/rtsp/Makefile.am > -+++ gst-plugins-base-1.12.3/gst-libs/gst/rtsp/Makefile.am > -@@ -68,7 +68,7 @@ GstRtsp-@GST_API_VERSION@.gir: $(INTROSP > +diff --git a/gst-libs/gst/rtsp/Makefile.am > b/gst-libs/gst/rtsp/Makefile.am > +index db9d0fd..79027cb 100644 > +--- a/gst-libs/gst/rtsp/Makefile.am > ++++ b/gst-libs/gst/rtsp/Makefile.am > +@@ -71,7 +71,7 @@ GstRtsp-@GST_API_VERSION@.gir: > $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERS > -I$(top_builddir)/gst-libs \ > -I$(top_srcdir)/gst-libs \ > --add-include-path=$(builddir)/../sdp \ > @@ -210,7 +189,7 @@ Index: > gst-plugins-base-1.12.3/gst-libs/gst/rtsp/Makefile.am > --library=libgstrtsp-@GST_API_VERSION@.la \ > --include=Gio-2.0 \ > --include=Gst-@GST_API_VERSION@ \ > -@@ -98,7 +98,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= > +@@ -101,7 +101,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) > --includedir=$(srcdir) \ > --includedir=$(builddir) \ > --includedir=$(builddir)/../sdp \ > @@ -219,11 +198,11 @@ Index: > gst-plugins-base-1.12.3/gst-libs/gst/rtsp/Makefile.am > $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) > > CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) > -Index: gst-plugins-base-1.12.3/gst-libs/gst/sdp/Makefile.am > -=================================================================== > ---- gst-plugins-base-1.12.3.orig/gst-libs/gst/sdp/Makefile.am > -+++ gst-plugins-base-1.12.3/gst-libs/gst/sdp/Makefile.am > -@@ -30,7 +30,7 @@ GstSdp-@GST_API_VERSION@.gir: $(INTROSPE > +diff --git a/gst-libs/gst/sdp/Makefile.am > b/gst-libs/gst/sdp/Makefile.am > +index 6e05cc7..c7cf514 100644 > +--- a/gst-libs/gst/sdp/Makefile.am > ++++ b/gst-libs/gst/sdp/Makefile.am > +@@ -31,7 +31,7 @@ GstSdp-@GST_API_VERSION@.gir: > $(INTROSPECTION_SCANNER) libgstsdp-@GST_API_VERSIO > --warn-all \ > --c-include "gst/sdp/sdp.h" \ > -I$(top_srcdir)/gst-libs \ > @@ -232,7 +211,7 @@ Index: > gst-plugins-base-1.12.3/gst-libs/gst/sdp/Makefile.am > --library=libgstsdp-@GST_API_VERSION@.la \ > --include=Gst-@GST_API_VERSION@ \ > --libtool="$(LIBTOOL)" \ > -@@ -54,7 +54,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= > +@@ -55,7 +55,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) > $(INTROSPECTION_COMPILER) \ > --includedir=$(srcdir) \ > --includedir=$(builddir) \ > @@ -241,11 +220,11 @@ Index: > gst-plugins-base-1.12.3/gst-libs/gst/sdp/Makefile.am > $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) > > CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA) > -Index: gst-plugins-base-1.12.3/gst-libs/gst/tag/Makefile.am > -=================================================================== > ---- gst-plugins-base-1.12.3.orig/gst-libs/gst/tag/Makefile.am > -+++ gst-plugins-base-1.12.3/gst-libs/gst/tag/Makefile.am > -@@ -59,8 +59,8 @@ GstTag-@GST_API_VERSION@.gir: $(INTROSPE > +diff --git a/gst-libs/gst/tag/Makefile.am > b/gst-libs/gst/tag/Makefile.am > +index c86515b..363e6d2 100644 > +--- a/gst-libs/gst/tag/Makefile.am > ++++ b/gst-libs/gst/tag/Makefile.am > +@@ -61,8 +61,8 @@ GstTag-@GST_API_VERSION@.gir: > $(INTROSPECTION_SCANNER) libgsttag-@GST_API_VERSIO > --c-include "gst/tag/tag.h" \ > -I$(top_srcdir)/gst-libs \ > -I$(top_builddir)/gst-libs \ > @@ -256,7 +235,7 @@ Index: > gst-plugins-base-1.12.3/gst-libs/gst/tag/Makefile.am > --library=libgsttag-@GST_API_VERSION@.la \ > --include=Gst-@GST_API_VERSION@ \ > --include=GstBase-@GST_API_VERSION@ \ > -@@ -87,8 +87,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= > +@@ -89,8 +89,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) > $(INTROSPECTION_COMPILER) \ > --includedir=$(srcdir) \ > --includedir=$(builddir) \ > @@ -267,11 +246,11 @@ Index: > gst-plugins-base-1.12.3/gst-libs/gst/tag/Makefile.am > $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) > > CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) > -Index: gst-plugins-base-1.12.3/gst-libs/gst/video/Makefile.am > -=================================================================== > ---- gst-plugins-base-1.12.3.orig/gst-libs/gst/video/Makefile.am > -+++ gst-plugins-base-1.12.3/gst-libs/gst/video/Makefile.am > -@@ -116,8 +116,8 @@ GstVideo-@GST_API_VERSION@.gir: $(INTROS > +diff --git a/gst-libs/gst/video/Makefile.am > b/gst-libs/gst/video/Makefile.am > +index 0f8455f..8c9955c 100644 > +--- a/gst-libs/gst/video/Makefile.am > ++++ b/gst-libs/gst/video/Makefile.am > +@@ -119,8 +119,8 @@ GstVideo-@GST_API_VERSION@.gir: > $(INTROSPECTION_SCANNER) libgstvideo-@GST_API_VE > --c-include "gst/video/video.h" \ > -I$(top_srcdir)/gst-libs \ > -I$(top_builddir)/gst-libs \ > @@ -282,7 +261,7 @@ Index: > gst-plugins-base-1.12.3/gst-libs/gst/video/Makefile.am > --library=libgstvideo-@GST_API_VERSION@.la \ > --include=Gst-@GST_API_VERSION@ \ > --include=GstBase-@GST_API_VERSION@ \ > -@@ -144,8 +144,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= > +@@ -147,8 +147,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) > $(INTROSPECTION_COMPILER) \ > --includedir=$(srcdir) \ > --includedir=$(builddir) \ > diff --git > a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-riff-add-missing-include-directories-when-calling-in.patch > b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-riff-add-missing-include-directories-when-calling-in.patch > index 9b66f7f49d..98ffdb1c10 100644 > --- > a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-riff-add-missing-include-directories-when-calling-in.patch > +++ > b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-riff-add-missing-include-directories-when-calling-in.patch > @@ -1,20 +1,21 @@ > -From 3c2c2d5dd08aa30ed0e8acd8566ec99412bb8209 Mon Sep 17 00:00:00 2001 > +From b9765efb1696e3e2e79f2955f759be199fe34882 Mon Sep 17 00:00:00 2001 > From: Alexander Kanavin <alex.kanavin@gmail.com > <mailto:alex.kanavin@gmail.com>> > Date: Mon, 26 Oct 2015 17:29:37 +0200 > -Subject: [PATCH 3/4] riff: add missing include directories when calling > +Subject: [PATCH] riff: add missing include directories when calling > introspection scanner > > Upstream-Status: Pending [review on oe-core maillist] > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com > <mailto:alex.kanavin@gmail.com>> > + > --- > gst-libs/gst/riff/Makefile.am | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/gst-libs/gst/riff/Makefile.am > b/gst-libs/gst/riff/Makefile.am > -index 0a115cc..5057a58 100644 > +index c8c588a..c096453 100644 > --- a/gst-libs/gst/riff/Makefile.am > +++ b/gst-libs/gst/riff/Makefile.am > -@@ -39,6 +39,8 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS = > $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) > +@@ -41,6 +41,8 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS = > $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) > # --strip-prefix=Gst \ > # --warn-all \ > # --c-include "gst/riff/riff.h" \ > @@ -23,6 +24,3 @@ index 0a115cc..5057a58 100644 > # --add-include-path=$(builddir)/../tag \ > # --add-include-path=$(builddir)/../audio \ > # > --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" > $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ > --- > -2.6.2 > - > diff --git > a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-ssaparse-enhance-SSA-text-lines-parsing.patch > b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-ssaparse-enhance-SSA-text-lines-parsing.patch > index 9fbebd5700..9e95524057 100644 > --- > a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-ssaparse-enhance-SSA-text-lines-parsing.patch > +++ > b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-ssaparse-enhance-SSA-text-lines-parsing.patch > @@ -1,7 +1,7 @@ > -From be6163cfa3a255493f9d75bad9541cbfe1723fee Mon Sep 17 00:00:00 2001 > +From 918c96b24d10f61b7455b4cef3bab490849d0d77 Mon Sep 17 00:00:00 2001 > From: Mingke Wang <mingke.wang@freescale.com > <mailto:mingke.wang@freescale.com>> > Date: Thu, 19 Mar 2015 14:17:10 +0800 > -Subject: [PATCH 3/4] ssaparse: enhance SSA text lines parsing. > +Subject: [PATCH] ssaparse: enhance SSA text lines parsing. > > some parser will pass in the original ssa text line which starts > with "Dialog:" > and there's are maybe multiple Dialog lines in one input buffer. > @@ -10,13 +10,18 @@ Upstream-Status: Submitted > [https://bugzilla.gnome.org/show_bug.cgi?id=747496 > <https://bugzilla.gnome.org/show_bug.cgi?id=747496>] > > Signed-off-by: Mingke Wang <mingke.wang@freescale.com > <mailto:mingke.wang@freescale.com>> > > +--- > + gst/subparse/gstssaparse.c | 150 > ++++++++++++++++++++++++++++++++++++++++----- > + 1 file changed, 134 insertions(+), 16 deletions(-) > + mode change 100644 => 100755 gst/subparse/gstssaparse.c > + > diff --git a/gst/subparse/gstssaparse.c b/gst/subparse/gstssaparse.c > old mode 100644 > new mode 100755 > -index 06ecef9..0ab5dce > +index c849c08..4b9636c > --- a/gst/subparse/gstssaparse.c > +++ b/gst/subparse/gstssaparse.c > -@@ -260,6 +260,7 @@ gst_ssa_parse_remove_override_codes > (GstSsaParse * parse, gchar * txt) > +@@ -262,6 +262,7 @@ gst_ssa_parse_remove_override_codes > (GstSsaParse * parse, gchar * txt) > * gst_ssa_parse_push_line: > * @parse: caller element > * @txt: text to push > @@ -24,7 +29,7 @@ index 06ecef9..0ab5dce > * @start: timestamp for the buffer > * @duration: duration for the buffer > * > -@@ -269,27 +270,133 @@ gst_ssa_parse_remove_override_codes > (GstSsaParse * parse, gchar * txt) > +@@ -271,27 +272,133 @@ gst_ssa_parse_remove_override_codes > (GstSsaParse * parse, gchar * txt) > * Returns: result of the push of the created buffer > */ > static GstFlowReturn > @@ -169,7 +174,7 @@ index 06ecef9..0ab5dce > GST_LOG_OBJECT (parse, "Text : %s", t); > > if (gst_ssa_parse_remove_override_codes (parse, t)) { > -@@ -307,13 +414,22 @@ gst_ssa_parse_push_line (GstSsaParse * parse, > gchar * txt, > +@@ -309,13 +416,22 @@ gst_ssa_parse_push_line (GstSsaParse * parse, > gchar * txt, > gst_buffer_fill (buf, 0, escaped, len + 1); > gst_buffer_set_size (buf, len); > g_free (escaped); > @@ -196,7 +201,7 @@ index 06ecef9..0ab5dce > > ret = gst_pad_push (parse->srcpad, buf); > > -@@ -333,6 +449,7 @@ gst_ssa_parse_chain (GstPad * sinkpad, > GstObject * parent, GstBuffer * buf) > +@@ -335,6 +451,7 @@ gst_ssa_parse_chain (GstPad * sinkpad, > GstObject * parent, GstBuffer * buf) > GstClockTime ts; > gchar *txt; > GstMapInfo map; > @@ -204,7 +209,7 @@ index 06ecef9..0ab5dce > > if (G_UNLIKELY (!parse->framed)) > goto not_framed; > -@@ -350,13 +467,14 @@ gst_ssa_parse_chain (GstPad * sinkpad, > GstObject * parent, GstBuffer * buf) > +@@ -352,13 +469,14 @@ gst_ssa_parse_chain (GstPad * sinkpad, > GstObject * parent, GstBuffer * buf) > /* make double-sure it's 0-terminated and all */ > gst_buffer_map (buf, &map, GST_MAP_READ); > txt = g_strndup ((gchar *) map.data, map.size); > @@ -220,6 +225,3 @@ index 06ecef9..0ab5dce > > if (ret != GST_FLOW_OK && GST_CLOCK_TIME_IS_VALID (ts)) { > GstSegment segment; > --- > -1.7.9.5 > - > diff --git > a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0004-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch > b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0004-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch > index 4adf605460..aaeb611fec 100644 > --- > a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0004-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch > +++ > b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0004-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch > @@ -1,20 +1,21 @@ > -From 4330915d88dc4dd46eb4c28d756482b767c2747f Mon Sep 17 00:00:00 2001 > +From 53b5868491cf99ee797192395dbfeb69df23edd2 Mon Sep 17 00:00:00 2001 > From: Alexander Kanavin <alex.kanavin@gmail.com > <mailto:alex.kanavin@gmail.com>> > Date: Mon, 26 Oct 2015 17:30:14 +0200 > -Subject: [PATCH 4/4] rtsp: drop incorrect reference to gstreamer-sdp in > +Subject: [PATCH] rtsp: drop incorrect reference to gstreamer-sdp in > Makefile.am > > Upstream-Status: Pending [review on oe-core maillist] > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com > <mailto:alex.kanavin@gmail.com>> > + > --- > gst-libs/gst/rtsp/Makefile.am | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/gst-libs/gst/rtsp/Makefile.am > b/gst-libs/gst/rtsp/Makefile.am > -index 4f6d9f8..0afa370 100644 > +index 79027cb..2987e23 100644 > --- a/gst-libs/gst/rtsp/Makefile.am > +++ b/gst-libs/gst/rtsp/Makefile.am > -@@ -75,7 +75,6 @@ GstRtsp-@GST_API_VERSION@.gir: > $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERS > +@@ -79,7 +79,6 @@ GstRtsp-@GST_API_VERSION@.gir: > $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERS > --libtool="$(LIBTOOL)" \ > --pkg gio-2.0 \ > --pkg gstreamer-@GST_API_VERSION@ \ > @@ -22,6 +23,3 @@ index 4f6d9f8..0afa370 100644 > --pkg-export gstreamer-rtsp-@GST_API_VERSION@ \ > --add-init-section="$(INTROSPECTION_INIT)" \ > --output $@ \ > --- > -2.6.2 > - > diff --git > a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0004-subparse-set-need_segment-after-sink-pad-received-GS.patch > b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0004-subparse-set-need_segment-after-sink-pad-received-GS.patch > deleted file mode 100644 > index b924e38824..0000000000 > --- > a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0004-subparse-set-need_segment-after-sink-pad-received-GS.patch > +++ /dev/null > @@ -1,69 +0,0 @@ > -From ed09c8fd2c9c2b5384b72cc70af3728be6694e64 Mon Sep 17 00:00:00 2001 > -From: Mingke Wang <mingke.wang@freescale.com > <mailto:mingke.wang@freescale.com>> > -Date: Thu, 19 Mar 2015 14:20:26 +0800 > -Subject: [PATCH 4/4] subparse: set need_segment after sink pad received > - GST_EVENT_SEGMENT > - > -subparse works in push mode, chain funciton will be called once > -up stream element finished the seeking and flushing. > -if set need_segment flag in src pad event handler, the segment > -event will be pushed earlier, result in the subtitle text will > -be send out to down stream from the beginning. > - > -Upstream-Status: Submitted > [https://bugzilla.gnome.org/show_bug.cgi?id=747498 > <https://bugzilla.gnome.org/show_bug.cgi?id=747498>] > - > -Signed-off-by: Mingke Wang <mingke.wang@freescale.com > <mailto:mingke.wang@freescale.com>> > - > -diff --git a/gst/subparse/gstsubparse.c b/gst/subparse/gstsubparse.c > -old mode 100644 > -new mode 100755 > -index b565e93..7741ccc > ---- a/gst/subparse/gstsubparse.c > -+++ b/gst/subparse/gstsubparse.c > -@@ -266,22 +266,20 @@ gst_sub_parse_src_event (GstPad * pad, > GstObject * parent, GstEvent * event) > - goto beach; > - } > - > -+ /* Apply the seek to our segment */ > -+ gst_segment_do_seek (&self->segment, rate, format, flags, > -+ start_type, start, stop_type, stop, &update); > -+ > -+ GST_DEBUG_OBJECT (self, "segment after seek: %" > GST_SEGMENT_FORMAT, > -+ &self->segment); > -+ > - /* Convert that seek to a seeking in bytes at position 0, > - FIXME: could use an index */ > - ret = gst_pad_push_event (self->sinkpad, > - gst_event_new_seek (rate, GST_FORMAT_BYTES, flags, > - GST_SEEK_TYPE_SET, 0, GST_SEEK_TYPE_NONE, 0)); > - > -- if (ret) { > -- /* Apply the seek to our segment */ > -- gst_segment_do_seek (&self->segment, rate, format, flags, > -- start_type, start, stop_type, stop, &update); > -- > -- GST_DEBUG_OBJECT (self, "segment after seek: %" > GST_SEGMENT_FORMAT, > -- &self->segment); > -- > -- self->need_segment = TRUE; > -- } else { > -+ if (!ret) { > - GST_WARNING_OBJECT (self, "seek to 0 bytes failed"); > - } > - > -@@ -1641,8 +1639,10 @@ gst_sub_parse_sink_event (GstPad * pad, > GstObject * parent, GstEvent * event) > - gst_event_parse_segment (event, &s); > - if (s->format == GST_FORMAT_TIME) > - gst_event_copy_segment (event, &self->segment); > -- GST_DEBUG_OBJECT (self, "newsegment (%s)", > -- gst_format_get_name (self->segment.format)); > -+ GST_DEBUG_OBJECT (self, "newsegment (%s) %" GST_SEGMENT_FORMAT, > -+ gst_format_get_name (self->segment.format), &self->segment); > -+ > -+ self->need_segment = TRUE; > - > - /* if not time format, we'll either start with a 0 timestamp > anyway or > - * it's following a seek in which case we'll have saved the > requested > --- > -1.7.9.5 > - > diff --git > a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0009-glimagesink-Downrank-to-marginal.patch > b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0009-glimagesink-Downrank-to-marginal.patch > new file mode 100644 > index 0000000000..c81fb0f6aa > --- /dev/null > +++ > b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0009-glimagesink-Downrank-to-marginal.patch > @@ -0,0 +1,32 @@ > +From c6b37a80806f9128de47f1ccc3f2354f8d436bb6 Mon Sep 17 00:00:00 2001 > +From: Alexander Kanavin <alex.kanavin@gmail.com > <mailto:alex.kanavin@gmail.com>> > +Date: Thu, 24 Sep 2015 19:47:32 +0300 > +Subject: [PATCH] glimagesink: Downrank to marginal > + > +On desktop, where there is good OpenGL, xvimagesink will come up first, > +on other platforms, OpenGL can't be trusted because it's either > software (like > +in a VM) or broken (like on embedded)., so let ximagesink come above. > + > +Upstream-Status: Submitted > [https://bugzilla.gnome.org/show_bug.cgi?id=751684 > <https://bugzilla.gnome.org/show_bug.cgi?id=751684>] > + > +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com > <mailto:alex.kanavin@gmail.com>> > +--- > + ext/gl/gstopengl.c | 2 +- > + 1 file changed, 1 insertion(+), 1 deletion(-) > + > +diff --git a/ext/gl/gstopengl.c b/ext/gl/gstopengl.c > +index a4b2540..0ccaacd 100644 > +--- a/ext/gl/gstopengl.c > ++++ b/ext/gl/gstopengl.c > +@@ -118,7 +118,7 @@ plugin_init (GstPlugin * plugin) > + #endif > + > + if (!gst_element_register (plugin, "glimagesink", > +- GST_RANK_SECONDARY, gst_gl_image_sink_bin_get_type ())) { > ++ GST_RANK_MARGINAL, gst_gl_image_sink_bin_get_type ())) { > + return FALSE; > + } > + > +-- > +2.1.4 > + > diff --git > a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/get-caps-from-src-pad-when-query-caps.patch > b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/get-caps-from-src-pad-when-query-caps.patch > index c8e6287a55..a4727e23ea 100644 > --- > a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/get-caps-from-src-pad-when-query-caps.patch > +++ > b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/get-caps-from-src-pad-when-query-caps.patch > @@ -1,4 +1,4 @@ > -From af0dac26f62aaceb4bf266720911953793e0fc5d Mon Sep 17 00:00:00 2001 > +From 41de2ec64ab06bb58c82c1659adaa3811bc5bcf8 Mon Sep 17 00:00:00 2001 > From: zhouming <b42586@freescale.com <mailto:b42586@freescale.com>> > Date: Wed, 14 May 2014 10:16:20 +0800 > Subject: [PATCH] ENGR00312515: get caps from src pad when query caps > @@ -8,18 +8,19 @@ https://bugzilla.gnome.org/show_bug.cgi?id=728312 > <https://bugzilla.gnome.org/show_bug.cgi?id=728312> > Upstream-Status: Pending > > Signed-off-by: zhouming <b42586@freescale.com > <mailto:b42586@freescale.com>> > + > --- > - gst-libs/gst/tag/gsttagdemux.c | 13 +++++++++++++ > + gst-libs/gst/tag/gsttagdemux.c | 13 +++++++++++++ > 1 file changed, 13 insertions(+) > mode change 100644 => 100755 gst-libs/gst/tag/gsttagdemux.c > > diff --git a/gst-libs/gst/tag/gsttagdemux.c > b/gst-libs/gst/tag/gsttagdemux.c > old mode 100644 > new mode 100755 > -index 9b6c478..ae2294a > +index 8a127c8..71c5d78 > --- a/gst-libs/gst/tag/gsttagdemux.c > +++ b/gst-libs/gst/tag/gsttagdemux.c > -@@ -1769,6 +1769,19 @@ gst_tag_demux_pad_query (GstPad * pad, > GstObject * parent, GstQuery * query) > +@@ -1759,6 +1759,19 @@ gst_tag_demux_pad_query (GstPad * pad, > GstObject * parent, GstQuery * query) > } > break; > } > @@ -39,6 +40,3 @@ index 9b6c478..ae2294a > default: > res = gst_pad_query_default (pad, parent, query); > break; > --- > -1.7.9.5 > - > diff --git > a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/link-with-libvchostif.patch > b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/link-with-libvchostif.patch > new file mode 100644 > index 0000000000..d5a7f6bdc2 > --- /dev/null > +++ > b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/link-with-libvchostif.patch > @@ -0,0 +1,45 @@ > +From 9866f51e5e0913f1e453eb574618bf7432f38cb6 Mon Sep 17 00:00:00 2001 > +From: Khem Raj <raj.khem@gmail.com <mailto:raj.khem@gmail.com>> > +Date: Wed, 11 Apr 2018 10:46:33 +0800 > +Subject: [PATCH] Add -lvchostif to link when using -lEGL on rpi > + > +This is required because libEGL from userland uses sybols > +from this library. > + > +lib/libEGL.so.1.0.0 > > > 121: 00000000 0 FUNC > GLOBAL DEFAULT UND vc_dispmanx_element_add > + 1552: 00000000 0 FUNC GLOBAL DEFAULT UND > vc_dispmanx_element_add > + > +These symbols are provided by libvchostif as seen below > + > +lib/libvchostif.so > + 252: 0000b161 192 FUNC GLOBAL DEFAULT 9 > vc_dispmanx_element_add > + 809: 0000b161 192 FUNC GLOBAL DEFAULT 9 > vc_dispmanx_element_add > + > +With this explicit link, plugins fail during runtime > + > +(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 > +(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 > + > +Upstream-Status: Pending > +Signed-off-by: Khem Raj <raj.khem@gmail.com > <mailto:raj.khem@gmail.com>> > +Signed-off-by: Anuj Mittal <anuj.mittal@intel.com > <mailto:anuj.mittal@intel.com>> > +--- > + m4/gst-gl.m4 | 2 +- > + 1 file changed, 1 insertion(+), 1 deletion(-) > + > +diff --git a/m4/gst-gl.m4 b/m4/gst-gl.m4 > +index 1e97240..ab7774c 100644 > +--- a/m4/gst-gl.m4 > ++++ b/m4/gst-gl.m4 > +@@ -231,7 +231,7 @@ case $host in > + HAVE_EGL=yes > + HAVE_GLES2=yes > + HAVE_EGL_RPI=yes > +- EGL_LIBS="-lbcm_host -lvcos -lvchiq_arm" > ++ EGL_LIBS="-lbcm_host -lvchostif -lvcos > -lvchiq_arm" > + EGL_CFLAGS="" > + AC_DEFINE(USE_EGL_RPI, [1], [Use RPi > platform]) > + ]) > +-- > +2.7.4 > + > diff --git > a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/make-gio_unix_2_0-dependency-configurable.patch > b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/make-gio_unix_2_0-dependency-configurable.patch > index 413eff0695..23950b67f2 100644 > --- > a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/make-gio_unix_2_0-dependency-configurable.patch > +++ > b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/make-gio_unix_2_0-dependency-configurable.patch > @@ -1,4 +1,4 @@ > -From 10d2a977ee1d469f0bf9059bb2d0b55fd2eecbac Mon Sep 17 00:00:00 2001 > +From 7ffa6e3d00e1d8a060f3f4c2bb9a72691af05d79 Mon Sep 17 00:00:00 2001 > From: Andre McCurdy <armccurdy@gmail.com <mailto:armccurdy@gmail.com>> > Date: Wed, 20 Jan 2016 13:00:00 -0800 > Subject: [PATCH] make gio_unix_2_0 dependency configurable > @@ -17,16 +17,17 @@ instead of AG_GST_CHECK_FEATURE. > Upstream-Status: Pending > > Signed-off-by: Andre McCurdy <armccurdy@gmail.com > <mailto:armccurdy@gmail.com>> > + > --- > configure.ac <http://configure.ac> | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/configure.ac <http://configure.ac> b/configure.ac > <http://configure.ac> > -index 9c52aeb..26cacd6 100644 > +index 12807bc..35a0bf3 100644 > --- a/configure.ac <http://configure.ac> > +++ b/configure.ac <http://configure.ac> > -@@ -752,9 +752,16 @@ AC_SUBST(FT2_CFLAGS) > - fi dnl of EXT plugins > +@@ -806,9 +806,16 @@ AM_CONDITIONAL(HAVE_PNG, test "x$HAVE_PNG" = > "xyes") > + AM_CONDITIONAL(HAVE_JPEG, test "x$HAVE_JPEG" = "xyes") > > dnl *** gio-unix-2.0 for tests/check/pipelines/tcp.c *** > +AC_ARG_ENABLE([gio_unix_2_0], > @@ -42,6 +43,3 @@ index 9c52aeb..26cacd6 100644 > AM_CONDITIONAL(USE_GIO_UNIX_2_0, test "x$HAVE_GIO_UNIX_2_0" = "xyes") > > dnl *** finalize CFLAGS, LDFLAGS, LIBS > --- > -1.9.1 > - > diff --git > a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.12.4.bb > <http://gstreamer1.0-plugins-base_1.12.4.bb> > b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.12.4.bb > <http://gstreamer1.0-plugins-base_1.12.4.bb> > deleted file mode 100644 > index dd895bbcb1..0000000000 > --- > a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.12.4.bb > <http://gstreamer1.0-plugins-base_1.12.4.bb> > +++ /dev/null > @@ -1,18 +0,0 @@ > -require gstreamer1.0-plugins-base.inc > - > -LIC_FILES_CHKSUM = > "file://COPYING;md5=c54ce9345727175ff66d17b67ff51f58 \ > - > file://COPYING.LIB;md5=6762ed442b3822387a51c92d928ead0d \ > - file://common/coverage/coverage-report.pl > <http://coverage-report.pl>;beginline=2;endline=17;md5=a4e1830fce078028c8f0974161272607" > - > -SRC_URI = " \ > - > http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-${PV}.tar.xz > <http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-${PV}.tar.xz> > \ > - file://get-caps-from-src-pad-when-query-caps.patch \ > - file://0003-ssaparse-enhance-SSA-text-lines-parsing.patch \ > - > file://0004-subparse-set-need_segment-after-sink-pad-received-GS.patch \ > - file://make-gio_unix_2_0-dependency-configurable.patch \ > - > file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \ > -" > -SRC_URI[md5sum] = "b35b04071f69b8ab69a7f3a497ff0131" > -SRC_URI[sha256sum] = > "4c306b03df0212f1b8903784e29bb3493319ba19ebebf13b0c56a17870292282" > - > -S = "${WORKDIR}/gst-plugins-base-${PV}" > diff --git > a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.14.0.bb > <http://gstreamer1.0-plugins-base_1.14.0.bb> > b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.14.0.bb > <http://gstreamer1.0-plugins-base_1.14.0.bb> > new file mode 100644 > index 0000000000..370cd0368c > --- /dev/null > +++ > b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.14.0.bb > <http://gstreamer1.0-plugins-base_1.14.0.bb> > @@ -0,0 +1,70 @@ > +require gstreamer1.0-plugins.inc > + > +LICENSE = "GPLv2+ & LGPLv2+" > +LIC_FILES_CHKSUM = > "file://COPYING;md5=c54ce9345727175ff66d17b67ff51f58 \ > + > file://COPYING.LIB;md5=6762ed442b3822387a51c92d928ead0d \ > + file://common/coverage/coverage-report.pl > <http://coverage-report.pl>;beginline=2;endline=17;md5=a4e1830fce078028c8f0974161272607" > + > +SRC_URI = " \ > + > http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-${PV}.tar.xz > <http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-${PV}.tar.xz> > \ > + file://get-caps-from-src-pad-when-query-caps.patch \ > + file://0003-ssaparse-enhance-SSA-text-lines-parsing.patch \ > + file://make-gio_unix_2_0-dependency-configurable.patch \ > + > file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \ > + > file://0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch \ > + > file://0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch \ > + > file://0003-riff-add-missing-include-directories-when-calling-in.patch \ > + > file://0004-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch \ > + file://0009-glimagesink-Downrank-to-marginal.patch \ > + > file://0001-gstreamer-gl.pc.in-don-t-append-GL_CFLAGS-to-CFLAGS.patch \ > + file://link-with-libvchostif.patch \ > + " > +SRC_URI[md5sum] = "370271327dd23110421a9c2927ac989a" > +SRC_URI[sha256sum] = > "7e904660ff56e02b036cf7fdfb77a50a540828ca9d2614d69ba931772e5b6940" > + > +S = "${WORKDIR}/gst-plugins-base-${PV}" > + > +DEPENDS += "iso-codes util-linux" > + > +inherit gettext > + > +PACKAGES_DYNAMIC =+ "^libgst.*" > + > +PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', > 'opengl', 'gles2 egl', '', d)}" > +PACKAGECONFIG ??= " \ > + ${GSTREAMER_ORC} \ > + ${@bb.utils.filter('DISTRO_FEATURES', 'alsa x11', d)} \ > + gio-unix-2.0 ogg pango theora vorbis zlib jpeg \ > + ${PACKAGECONFIG_GL} \ > + ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland > egl', '', d)} \ > +" > + > +X11DEPENDS = "virtual/libx11 libsm libxrender libxv" > +X11ENABLEOPTS = "--enable-x --enable-xvideo --enable-xshm" > +X11DISABLEOPTS = "--disable-x --disable-xvideo --disable-xshm" > + > +PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib" > +PACKAGECONFIG[cdparanoia] = > "--enable-cdparanoia,--disable-cdparanoia,cdparanoia" > +PACKAGECONFIG[gio-unix-2.0] = > "--enable-gio_unix_2_0,--disable-gio_unix_2_0,glib-2.0" > +PACKAGECONFIG[ivorbis] = > "--enable-ivorbis,--disable-ivorbis,tremor" > +PACKAGECONFIG[ogg] = "--enable-ogg,--disable-ogg,libogg" > +PACKAGECONFIG[opus] = "--enable-opus,--disable-opus,libopus" > +PACKAGECONFIG[pango] = "--enable-pango,--disable-pango,pango" > +PACKAGECONFIG[theora] = > "--enable-theora,--disable-theora,libtheora" > +PACKAGECONFIG[visual] = > "--enable-libvisual,--disable-libvisual,libvisual" > +PACKAGECONFIG[vorbis] = > "--enable-vorbis,--disable-vorbis,libvorbis" > +PACKAGECONFIG[x11] = > "${X11ENABLEOPTS},${X11DISABLEOPTS},${X11DEPENDS}" > +PACKAGECONFIG[zlib] = "--enable-zlib,--disable-zlib,zlib" > +PACKAGECONFIG[opengl] = > "--enable-opengl,--disable-opengl,virtual/libgl libglu" > +PACKAGECONFIG[gles2] = > "--enable-gles2,--disable-gles2,virtual/libgles2" > +PACKAGECONFIG[egl] = "--enable-egl,--disable-egl,virtual/egl" > +PACKAGECONFIG[wayland] = > "--enable-wayland,--disable-wayland,wayland-native wayland > wayland-protocols libdrm" > +PACKAGECONFIG[jpeg] = ",,jpeg" > + > +FILES_${MLPREFIX}libgsttag-1.0 += > "${datadir}/gst-plugins-base/1.0/license-translations.dict" > + > +do_compile_prepend() { > + export > GIR_EXTRA_LIBS_PATH="${B}/gst-libs/gst/tag/.libs:${B}/gst-libs/gst/video/.libs:${B}/gst-libs/gst/audio/.libs:${B}/gst-libs/gst/rtp/.libs" > +} > + > +FILES_${PN}-dev += > "${libdir}/gstreamer-${LIBV}/include/gst/gl/gstglconfig.h" > -- > 2.14.1 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > <mailto:Openembedded-core@lists.openembedded.org> > http://lists.openembedded.org/mailman/listinfo/openembedded-core > <http://lists.openembedded.org/mailman/listinfo/openembedded-core> > > ^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PATCH 02/12] gst-plugins-base: upgrade 1.12.4 -> 1.14.0 2018-05-04 13:07 ` Anuj Mittal @ 2018-05-04 13:09 ` Burton, Ross 2018-05-07 10:14 ` Alexander Kanavin 0 siblings, 1 reply; 25+ messages in thread From: Burton, Ross @ 2018-05-04 13:09 UTC (permalink / raw) To: Anuj Mittal; +Cc: OE-core [-- Attachment #1: Type: text/plain, Size: 76639 bytes --] Aha great. I suspect that you have GStreamer headers on your host already and it's picking those up? Ross On 4 May 2018 at 14:07, Anuj Mittal <anuj.mittal@intel.com> wrote: > For some reason, I can't reproduce this, I have g-i enabled. But, it > looks like we need this: > > https://cgit.freedesktop.org/gstreamer/gst-plugins-base/commit/?h=1.14&id= > 9261296858cb149767ceac44fd6bd13cc0de0d21 > > On 05/04/2018 07:52 PM, Burton, Ross wrote: > > Couldn't find include 'GstVideo-1.0.gir' (search path: > > '['/data/poky-tmp/master/work/corei7-64-poky-linux/ > gstreamer1.0-plugins-base/1.14.0-r0/recipe-sysroot/usr/share/gir-1.0', > > '/usr/share/gir-1.0', '/usr/share/gir-1.0', '/usr/share/gir-1.0', > > '/data/poky-tmp/master/work/corei7-64-poky-linux/ > gstreamer1.0-plugins-base/1.14.0-r0/recipe-sysroot/usr/share/gir-1.0', > > '/data/poky-tmp/master/work/corei7-64-poky-linux/ > gstreamer1.0-plugins-base/1.14.0-r0/recipe-sysroot-native/ > usr/share/gir-1.0', > > '/usr/share/gir-1.0', > > '/data/poky-tmp/master/work/corei7-64-poky-linux/ > gstreamer1.0-plugins-base/1.14.0-r0/recipe-sysroot-native/ > usr/share/gir-1.0']') > > | Makefile:1506: recipe for target 'GstGL-1.0.gir' failed > > > > Turn on gobject-introspection DISTRO_FEATURE if you haven't already. > > > > That file is at ./gst-libs/gst/video/GstVideo-1.0.gir in the build tree, > > so that search path is wrong... > > > > Ross > > > > On 3 May 2018 at 09:17, Anuj Mittal <anuj.mittal@intel.com > > <mailto:anuj.mittal@intel.com>> wrote: > > > > * For changes, please see: > > https://gstreamer.freedesktop.org/releases/1.14/ > > <https://gstreamer.freedesktop.org/releases/1.14/> > > * OpenGL integration library has moved to -plugins-base, add > > PACKAGECONFIG. > > * Remove one patch as that has been fixed in a different way > upstream. > > * Merge inc/bb and refresh patches to get rid of fuzz warnings. > > * Remove x86 specific cached variables as they're not needed anymore. > > * Add jpeg to PACKAGECONFIG and enable it by default. > > * Port gstreamer-gl specific patches from -plugins-bad. > > > > Signed-off-by: Anuj Mittal <anuj.mittal@intel.com > > <mailto:anuj.mittal@intel.com>> > > --- > > ...on.m4-prefix-pkgconfig-paths-with-PKG_CON.patch | 12 +- > > .../gstreamer/gstreamer1.0-plugins-base.inc | 50 ------- > > ...-don-t-hardcode-libtool-name-when-running.patch | 71 +++++----- > > ...gl.pc.in-don-t-append-GL_CFLAGS-to-CFLAGS.patch | 29 ++++ > > ...-prefix-calls-to-pkg-config-with-PKG_CONF.patch | 151 > > +++++++++------------ > > ...ssing-include-directories-when-calling-in.patch | 12 +- > > ...3-ssaparse-enhance-SSA-text-lines-parsing.patch | 24 ++-- > > ...ncorrect-reference-to-gstreamer-sdp-in-Ma.patch | 12 +- > > ...t-need_segment-after-sink-pad-received-GS.patch | 69 ---------- > > .../0009-glimagesink-Downrank-to-marginal.patch | 32 +++++ > > .../get-caps-from-src-pad-when-query-caps.patch | 12 +- > > .../link-with-libvchostif.patch | 45 ++++++ > > ...make-gio_unix_2_0-dependency-configurable.patch | 12 +- > > .../gstreamer/gstreamer1.0-plugins-base_1.12.4.bb > > <http://gstreamer1.0-plugins-base_1.12.4.bb> | 18 --- > > .../gstreamer/gstreamer1.0-plugins-base_1.14.0.bb > > <http://gstreamer1.0-plugins-base_1.14.0.bb> | 70 ++++++++++ > > 15 files changed, 314 insertions(+), 305 deletions(-) > > delete mode 100644 > > meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc > > create mode 100644 > > meta/recipes-multimedia/gstreamer/gstreamer1.0- > plugins-base/0001-gstreamer-gl.pc.in-don-t-append-GL_ > CFLAGS-to-CFLAGS.patch > > delete mode 100644 > > meta/recipes-multimedia/gstreamer/gstreamer1.0- > plugins-base/0004-subparse-set-need_segment-after-sink- > pad-received-GS.patch > > create mode 100644 > > meta/recipes-multimedia/gstreamer/gstreamer1.0- > plugins-base/0009-glimagesink-Downrank-to-marginal.patch > > create mode 100644 > > meta/recipes-multimedia/gstreamer/gstreamer1.0- > plugins-base/link-with-libvchostif.patch > > delete mode 100644 > > meta/recipes-multimedia/gstreamer/gstreamer1.0- > plugins-base_1.12.4.bb <http://gstreamer1.0-plugins-base_1.12.4.bb> > > create mode 100644 > > meta/recipes-multimedia/gstreamer/gstreamer1.0- > plugins-base_1.14.0.bb <http://gstreamer1.0-plugins-base_1.14.0.bb> > > > > diff --git > > a/meta/recipes-multimedia/gstreamer/files/0001- > introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch > > b/meta/recipes-multimedia/gstreamer/files/0001- > introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch > > index 2cab87f9ec..1b7f115083 100644 > > --- > > a/meta/recipes-multimedia/gstreamer/files/0001- > introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch > > +++ > > b/meta/recipes-multimedia/gstreamer/files/0001- > introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch > > @@ -1,4 +1,4 @@ > > -From 90916f96262fa7b27a0a99788c69f9fd6df11000 Mon Sep 17 00:00:00 > 2001 > > +From 2b0436f9a07773fae8c74df902d7024e8bfc3512 Mon Sep 17 00:00:00 > 2001 > > From: Alexander Kanavin <alex.kanavin@gmail.com > > <mailto:alex.kanavin@gmail.com>> > > Date: Tue, 24 Nov 2015 16:46:27 +0200 > > Subject: [PATCH] introspection.m4: prefix pkgconfig paths with > > @@ -10,12 +10,13 @@ is later supplied to g-ir-scanner. > > > > Upstream-Status: Pending [review on oe-core list] > > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com > > <mailto:alex.kanavin@gmail.com>> > > + > > --- > > - common/m4/introspection.m4 | 12 ++++++------ > > - 1 file changed, 6 insertions(+), 6 deletions(-) > > + common/m4/introspection.m4 | 8 ++++---- > > + 1 file changed, 4 insertions(+), 4 deletions(-) > > > > diff --git a/common/m4/introspection.m4 b/common/m4/introspection.m4 > > -index 162be57..217a6ae 100644 > > +index 162be57..933f979 100644 > > --- a/common/m4/introspection.m4 > > +++ b/common/m4/introspection.m4 > > @@ -54,14 +54,14 @@ m4_define([_GOBJECT_ > INTROSPECTION_CHECK_INTERNAL], > > @@ -37,6 +38,3 @@ index 162be57..217a6ae 100644 > > INTROSPECTION_INIT="extern void gst_init(gint*,gchar**); > > gst_init(NULL,NULL);" > > fi > > AC_SUBST(INTROSPECTION_SCANNER) > > --- > > -2.6.2 > > - > > diff --git > > a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc > > b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc > > deleted file mode 100644 > > index 08130c1da4..0000000000 > > --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0- > plugins-base.inc > > +++ /dev/null > > @@ -1,50 +0,0 @@ > > -require gstreamer1.0-plugins.inc > > - > > -SRC_URI_append = "\ > > - > > file://0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch > \ > > - > > file://0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch > \ > > - > > file://0003-riff-add-missing-include-directories-when-calling-in.patch > \ > > - > > file://0004-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch > \ > > -" > > - > > -LICENSE = "GPLv2+ & LGPLv2+" > > - > > -DEPENDS += "iso-codes util-linux zlib" > > - > > -inherit gettext > > - > > -PACKAGES_DYNAMIC =+ "^libgst.*" > > - > > -PACKAGECONFIG ??= " \ > > - ${GSTREAMER_ORC} \ > > - ${@bb.utils.filter('DISTRO_FEATURES', 'alsa x11', d)} \ > > - gio-unix-2.0 ogg pango theora vorbis \ > > -" > > - > > -X11DEPENDS = "virtual/libx11 libsm libxrender libxv" > > -X11ENABLEOPTS = "--enable-x --enable-xvideo --enable-xshm" > > -X11DISABLEOPTS = "--disable-x --disable-xvideo --disable-xshm" > > - > > -PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa, > alsa-lib" > > -PACKAGECONFIG[cdparanoia] = > > "--enable-cdparanoia,--disable-cdparanoia,cdparanoia" > > -PACKAGECONFIG[gio-unix-2.0] = > > "--enable-gio_unix_2_0,--disable-gio_unix_2_0,glib-2.0" > > -PACKAGECONFIG[ivorbis] = > > "--enable-ivorbis,--disable-ivorbis,tremor" > > -PACKAGECONFIG[ogg] = "--enable-ogg,--disable-ogg,libogg" > > -PACKAGECONFIG[opus] = "--enable-opus,--disable-opus, > libopus" > > -PACKAGECONFIG[pango] = "--enable-pango,--disable- > pango,pango" > > -PACKAGECONFIG[theora] = > > "--enable-theora,--disable-theora,libtheora" > > -PACKAGECONFIG[visual] = > > "--enable-libvisual,--disable-libvisual,libvisual" > > -PACKAGECONFIG[vorbis] = > > "--enable-vorbis,--disable-vorbis,libvorbis" > > -PACKAGECONFIG[x11] = > > "${X11ENABLEOPTS},${X11DISABLEOPTS},${X11DEPENDS}" > > - > > -EXTRA_OECONF += " \ > > - --enable-zlib \ > > -" > > - > > -CACHED_CONFIGUREVARS_append_x86 = " ac_cv_header_emmintrin_h=no > > ac_cv_header_xmmintrin_h=no" > > - > > -FILES_${MLPREFIX}libgsttag-1.0 += > > "${datadir}/gst-plugins-base/1.0/license-translations.dict" > > - > > -do_compile_prepend() { > > - export > > GIR_EXTRA_LIBS_PATH="${B}/gst-libs/gst/tag/.libs:${B}/gst- > libs/gst/video/.libs:${B}/gst-libs/gst/audio/.libs:${B}/gst- > libs/gst/rtp/.libs" > > -} > > diff --git > > a/meta/recipes-multimedia/gstreamer/gstreamer1.0- > plugins-base/0001-Makefile.am-don-t-hardcode-libtool-name- > when-running.patch > > b/meta/recipes-multimedia/gstreamer/gstreamer1.0- > plugins-base/0001-Makefile.am-don-t-hardcode-libtool-name- > when-running.patch > > index 094bdac846..128c7f8cb6 100644 > > --- > > a/meta/recipes-multimedia/gstreamer/gstreamer1.0- > plugins-base/0001-Makefile.am-don-t-hardcode-libtool-name- > when-running.patch > > +++ > > b/meta/recipes-multimedia/gstreamer/gstreamer1.0- > plugins-base/0001-Makefile.am-don-t-hardcode-libtool-name- > when-running.patch > > @@ -1,16 +1,18 @@ > > -From f1d9652351e7754c63003104eceb526af424c7e0 Mon Sep 17 00:00:00 > 2001 > > +From 4d6ea58f96b9744af8d899ddca22c2695ac74b5b Mon Sep 17 00:00:00 > 2001 > > From: Alexander Kanavin <alex.kanavin@gmail.com > > <mailto:alex.kanavin@gmail.com>> > > -Date: Fri, 20 Nov 2015 16:53:04 +0200 > > -Subject: [PATCH 1/4] Makefile.am: don't hardcode libtool name when > > running > > +Date: Thu, 5 Apr 2018 10:15:08 +0800 > > +Subject: [PATCH] Makefile.am: don't hardcode libtool name when > running > > introspection tools > > > > Upstream-Status: Pending [review on oe-core maillist] > > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com > > <mailto:alex.kanavin@gmail.com>> > > +Signed-off-by: Anuj Mittal <anuj.mittal@intel.com > > <mailto:anuj.mittal@intel.com>> > > + > > --- > > gst-libs/gst/allocators/Makefile.am | 2 +- > > gst-libs/gst/app/Makefile.am | 2 +- > > gst-libs/gst/audio/Makefile.am | 2 +- > > - gst-libs/gst/fft/Makefile.am | 2 +- > > + gst-libs/gst/gl/Makefile.am | 2 +- > > gst-libs/gst/pbutils/Makefile.am | 2 +- > > gst-libs/gst/riff/Makefile.am | 2 +- > > gst-libs/gst/rtp/Makefile.am | 2 +- > > @@ -21,10 +23,10 @@ Signed-off-by: Alexander Kanavin > > <alex.kanavin@gmail.com <mailto:alex.kanavin@gmail.com>> > > 11 files changed, 11 insertions(+), 11 deletions(-) > > > > diff --git a/gst-libs/gst/allocators/Makefile.am > > b/gst-libs/gst/allocators/Makefile.am > > -index 9361bf9..bc7f53a 100644 > > +index 1957d28..1ecc950 100644 > > --- a/gst-libs/gst/allocators/Makefile.am > > +++ b/gst-libs/gst/allocators/Makefile.am > > -@@ -38,7 +38,7 @@ GstAllocators-@GST_API_VERSION@.gir: > > $(INTROSPECTION_SCANNER) libgstallocators-@ > > +@@ -42,7 +42,7 @@ GstAllocators-@GST_API_VERSION@.gir: > > $(INTROSPECTION_SCANNER) libgstallocators-@ > > > > --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" > > $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ > > --library=libgstallocators-@GST_API_VERSION@.la \ > > --include=Gst-@GST_API_VERSION@ \ > > @@ -34,10 +36,10 @@ index 9361bf9..bc7f53a 100644 > > --pkg-export gstreamer-allocators-@GST_API_VERSION@ > \ > > --output $@ \ > > diff --git a/gst-libs/gst/app/Makefile.am > > b/gst-libs/gst/app/Makefile.am > > -index 6d6de8d..dcc2fe0 100644 > > +index 52f6ad3..5bfd606 100644 > > --- a/gst-libs/gst/app/Makefile.am > > +++ b/gst-libs/gst/app/Makefile.am > > -@@ -53,7 +53,7 @@ GstApp-@GST_API_VERSION@.gir: > > $(INTROSPECTION_SCANNER) libgstapp-@GST_API_VERSIO > > +@@ -56,7 +56,7 @@ GstApp-@GST_API_VERSION@.gir: > > $(INTROSPECTION_SCANNER) libgstapp-@GST_API_VERSIO > > --library=libgstapp-@GST_API_VERSION@.la \ > > --include=Gst-@GST_API_VERSION@ \ > > --include=GstBase-@GST_API_VERSION@ \ > > @@ -47,10 +49,10 @@ index 6d6de8d..dcc2fe0 100644 > > --pkg gstreamer-base-@GST_API_VERSION@ \ > > --pkg-export gstreamer-app-@GST_API_VERSION@ \ > > diff --git a/gst-libs/gst/audio/Makefile.am > > b/gst-libs/gst/audio/Makefile.am > > -index 275d222..2374196 100644 > > +index 2922245..7fb65f2 100644 > > --- a/gst-libs/gst/audio/Makefile.am > > +++ b/gst-libs/gst/audio/Makefile.am > > -@@ -116,7 +116,7 @@ GstAudio-@GST_API_VERSION@.gir: > > $(INTROSPECTION_SCANNER) libgstaudio-@GST_API_VE > > +@@ -184,7 +184,7 @@ GstAudio-@GST_API_VERSION@.gir: > > $(INTROSPECTION_SCANNER) libgstaudio-@GST_API_VE > > --include=Gst-@GST_API_VERSION@ \ > > --include=GstBase-@GST_API_VERSION@ \ > > --include=GstTag-@GST_API_VERSION@ \ > > @@ -59,24 +61,24 @@ index 275d222..2374196 100644 > > --pkg gstreamer-@GST_API_VERSION@ \ > > --pkg gstreamer-base-@GST_API_VERSION@ \ > > --pkg-export gstreamer-audio-@GST_API_VERSION@ \ > > -diff --git a/gst-libs/gst/fft/Makefile.am > > b/gst-libs/gst/fft/Makefile.am > > -index 09b3d68..f545354 100644 > > ---- a/gst-libs/gst/fft/Makefile.am > > -+++ b/gst-libs/gst/fft/Makefile.am > > -@@ -65,7 +65,7 @@ GstFft-@GST_API_VERSION@.gir: > > $(INTROSPECTION_SCANNER) libgstfft-@GST_API_VERSIO > > - > > --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" > > $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ > > - --library=libgstfft-@GST_API_VERSION@.la \ > > +diff --git a/gst-libs/gst/gl/Makefile.am > b/gst-libs/gst/gl/Makefile.am > > +index a3bbc94..16f829f 100644 > > +--- a/gst-libs/gst/gl/Makefile.am > > ++++ b/gst-libs/gst/gl/Makefile.am > > +@@ -192,7 +192,7 @@ GstGL-@GST_API_VERSION@.gir: > > $(INTROSPECTION_SCANNER) libgstgl-@GST_API_VERSION@ > > --include=Gst-@GST_API_VERSION@ \ > > + --include=GstBase-@GST_API_VERSION@ \ > > + --include=GstVideo-@GST_API_VERSION@ \ > > - --libtool="$(top_builddir)/libtool" \ > > + --libtool="$(LIBTOOL)" \ > > --pkg gstreamer-@GST_API_VERSION@ \ > > - --pkg-export gstreamer-fft-@GST_API_VERSION@ \ > > - --output $@ \ > > + --pkg gstreamer-base-@GST_API_VERSION@ \ > > + --pkg gstreamer-video-@GST_API_VERSION@ \ > > diff --git a/gst-libs/gst/pbutils/Makefile.am > > b/gst-libs/gst/pbutils/Makefile.am > > -index 64d5eb0..91dc214 100644 > > +index ae51993..35a6e44 100644 > > --- a/gst-libs/gst/pbutils/Makefile.am > > +++ b/gst-libs/gst/pbutils/Makefile.am > > -@@ -99,7 +99,7 @@ GstPbutils-@GST_API_VERSION@.gir: > > $(INTROSPECTION_SCANNER) libgstpbutils-@GST_AP > > +@@ -103,7 +103,7 @@ GstPbutils-@GST_API_VERSION@.gir: > > $(INTROSPECTION_SCANNER) libgstpbutils-@GST_AP > > --include=GstTag-@GST_API_VERSION@ \ > > --include=GstVideo-@GST_API_VERSION@ \ > > --include=GstAudio-@GST_API_VERSION@ \ > > @@ -86,10 +88,10 @@ index 64d5eb0..91dc214 100644 > > --pkg gstreamer-tag-@GST_API_VERSION@ \ > > --pkg gstreamer-video-@GST_API_VERSION@ \ > > diff --git a/gst-libs/gst/riff/Makefile.am > > b/gst-libs/gst/riff/Makefile.am > > -index 83d83cb..3bd8fc0 100644 > > +index fb53f06..e66ef4f 100644 > > --- a/gst-libs/gst/riff/Makefile.am > > +++ b/gst-libs/gst/riff/Makefile.am > > -@@ -47,7 +47,7 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS = > > $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) > > +@@ -49,7 +49,7 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS = > > $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) > > # --include=GstAudio-@GST_API_VERSION@ \ > > # --include=GstTag-@GST_API_VERSION@ \ > > # --include=Gst-@GST_API_VERSION@ \ > > @@ -99,10 +101,10 @@ index 83d83cb..3bd8fc0 100644 > > # --pkg gstreamer-tag-@GST_API_VERSION@ \ > > # --pkg gstreamer-audio-@GST_API_VERSION@ \ > > diff --git a/gst-libs/gst/rtp/Makefile.am > > b/gst-libs/gst/rtp/Makefile.am > > -index fdd01c1..f5445c1 100644 > > +index a6f971d..77ebeeb 100644 > > --- a/gst-libs/gst/rtp/Makefile.am > > +++ b/gst-libs/gst/rtp/Makefile.am > > -@@ -65,7 +65,7 @@ GstRtp-@GST_API_VERSION@.gir: > > $(INTROSPECTION_SCANNER) libgstrtp-@GST_API_VERSIO > > +@@ -69,7 +69,7 @@ GstRtp-@GST_API_VERSION@.gir: > > $(INTROSPECTION_SCANNER) libgstrtp-@GST_API_VERSIO > > --library=libgstrtp-@GST_API_VERSION@.la \ > > --include=Gst-@GST_API_VERSION@ \ > > --include=GstBase-@GST_API_VERSION@ \ > > @@ -112,10 +114,10 @@ index fdd01c1..f5445c1 100644 > > --pkg gstreamer-base-@GST_API_VERSION@ \ > > --pkg-export gstreamer-rtp-@GST_API_VERSION@ \ > > diff --git a/gst-libs/gst/rtsp/Makefile.am > > b/gst-libs/gst/rtsp/Makefile.am > > -index ede5706..9b0b258 100644 > > +index ceb07f4..db9d0fd 100644 > > --- a/gst-libs/gst/rtsp/Makefile.am > > +++ b/gst-libs/gst/rtsp/Makefile.am > > -@@ -72,7 +72,7 @@ GstRtsp-@GST_API_VERSION@.gir: > > $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERS > > +@@ -76,7 +76,7 @@ GstRtsp-@GST_API_VERSION@.gir: > > $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERS > > --include=Gio-2.0 \ > > --include=Gst-@GST_API_VERSION@ \ > > --include=GstSdp-@GST_API_VERSION@ \ > > @@ -125,10 +127,10 @@ index ede5706..9b0b258 100644 > > --pkg gstreamer-@GST_API_VERSION@ \ > > --pkg gstreamer-sdp-@GST_API_VERSION@ \ > > diff --git a/gst-libs/gst/sdp/Makefile.am > > b/gst-libs/gst/sdp/Makefile.am > > -index a90f30b..0e149b8 100644 > > +index e197e9b..6e05cc7 100644 > > --- a/gst-libs/gst/sdp/Makefile.am > > +++ b/gst-libs/gst/sdp/Makefile.am > > -@@ -32,7 +32,7 @@ GstSdp-@GST_API_VERSION@.gir: > > $(INTROSPECTION_SCANNER) libgstsdp-@GST_API_VERSIO > > +@@ -34,7 +34,7 @@ GstSdp-@GST_API_VERSION@.gir: > > $(INTROSPECTION_SCANNER) libgstsdp-@GST_API_VERSIO > > > > --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" > > $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ > > --library=libgstsdp-@GST_API_VERSION@.la \ > > --include=Gst-@GST_API_VERSION@ \ > > @@ -138,10 +140,10 @@ index a90f30b..0e149b8 100644 > > --pkg-export gstreamer-sdp-@GST_API_VERSION@ \ > > --output $@ \ > > diff --git a/gst-libs/gst/tag/Makefile.am > > b/gst-libs/gst/tag/Makefile.am > > -index c534a4d..cafafd3 100644 > > +index 0247c33..c86515b 100644 > > --- a/gst-libs/gst/tag/Makefile.am > > +++ b/gst-libs/gst/tag/Makefile.am > > -@@ -45,7 +45,7 @@ GstTag-@GST_API_VERSION@.gir: > > $(INTROSPECTION_SCANNER) libgsttag-@GST_API_VERSIO > > +@@ -66,7 +66,7 @@ GstTag-@GST_API_VERSION@.gir: > > $(INTROSPECTION_SCANNER) libgsttag-@GST_API_VERSIO > > --library=libgsttag-@GST_API_VERSION@.la \ > > --include=Gst-@GST_API_VERSION@ \ > > --include=GstBase-@GST_API_VERSION@ \ > > @@ -151,10 +153,10 @@ index c534a4d..cafafd3 100644 > > --pkg gstreamer-base-@GST_API_VERSION@ \ > > --pkg-export gstreamer-tag-@GST_API_VERSION@ \ > > diff --git a/gst-libs/gst/video/Makefile.am > > b/gst-libs/gst/video/Makefile.am > > -index 5d31fa1..ac64eb3 100644 > > +index 9fc1ccf..0f8455f 100644 > > --- a/gst-libs/gst/video/Makefile.am > > +++ b/gst-libs/gst/video/Makefile.am > > -@@ -116,7 +116,7 @@ GstVideo-@GST_API_VERSION@.gir: > > $(INTROSPECTION_SCANNER) libgstvideo-@GST_API_VE > > +@@ -124,7 +124,7 @@ GstVideo-@GST_API_VERSION@.gir: > > $(INTROSPECTION_SCANNER) libgstvideo-@GST_API_VE > > --library=libgstvideo-@GST_API_VERSION@.la \ > > --include=Gst-@GST_API_VERSION@ \ > > --include=GstBase-@GST_API_VERSION@ \ > > @@ -163,6 +165,3 @@ index 5d31fa1..ac64eb3 100644 > > --pkg gstreamer-@GST_API_VERSION@ \ > > --pkg gstreamer-base-@GST_API_VERSION@ \ > > --pkg-export gstreamer-video-@GST_API_VERSION@ \ > > --- > > -2.6.2 > > - > > diff --git > > a/meta/recipes-multimedia/gstreamer/gstreamer1.0- > plugins-base/0001-gstreamer-gl.pc.in-don-t-append-GL_ > CFLAGS-to-CFLAGS.patch > > b/meta/recipes-multimedia/gstreamer/gstreamer1.0- > plugins-base/0001-gstreamer-gl.pc.in-don-t-append-GL_ > CFLAGS-to-CFLAGS.patch > > new file mode 100644 > > index 0000000000..251dc172cb > > --- /dev/null > > +++ > > b/meta/recipes-multimedia/gstreamer/gstreamer1.0- > plugins-base/0001-gstreamer-gl.pc.in-don-t-append-GL_ > CFLAGS-to-CFLAGS.patch > > @@ -0,0 +1,29 @@ > > +From 61a672e79c8cb1aeeeda4c968997c577ac73a8f3 Mon Sep 17 00:00:00 > 2001 > > +From: Alexander Kanavin <alex.kanavin@gmail.com > > <mailto:alex.kanavin@gmail.com>> > > +Date: Fri, 12 May 2017 16:47:12 +0300 > > +Subject: [PATCH] gstreamer-gl.pc.in <http://gstreamer-gl.pc.in>: > > don't append GL_CFLAGS to CFLAGS > > + > > +Dependencies' include directories should not be added in this way; > > +it causes problems when cross-compiling in sysroot environments. > > + > > +Upstream-Status: Pending > > + > > +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com > > <mailto:alex.kanavin@gmail.com>> > > +Signed-off-by: Maxin B. John <maxin.john@intel.com > > <mailto:maxin.john@intel.com>> > > +--- > > + pkgconfig/gstreamer-gl.pc.in <http://gstreamer-gl.pc.in> | 2 +- > > + 1 file changed, 1 insertion(+), 1 deletion(-) > > + > > +diff --git a/pkgconfig/gstreamer-gl.pc.in > > <http://gstreamer-gl.pc.in> b/pkgconfig/gstreamer-gl.pc.in > > <http://gstreamer-gl.pc.in> > > +index dc672a9..8c290ba 100644 > > +--- a/pkgconfig/gstreamer-gl.pc.in <http://gstreamer-gl.pc.in> > > ++++ b/pkgconfig/gstreamer-gl.pc.in <http://gstreamer-gl.pc.in> > > +@@ -13,4 +13,4 @@ Version: @VERSION@ > > + Requires: gstreamer-video-@GST_API_VERSION@ > > gstreamer-base-@GST_API_VERSION@ gstreamer-@GST_API_VERSION@ > > + > > + Libs: -L${libdir} -lgstgl-@GST_API_VERSION@ > > +-Cflags: -I${includedir} > > -I${libdir}/gstreamer-@GST_API_VERSION@/include @GL_CFLAGS@ > > ++Cflags: -I${includedir} > > -I${libdir}/gstreamer-@GST_API_VERSION@/include > > +-- > > +2.7.4 > > + > > 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 6616e2cf0d..dc15d93eb0 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,16 +1,17 @@ > > -From 990b653c7b6de1937ec759019982d6c5f15770f7 Mon Sep 17 00:00:00 > 2001 > > +From f523721e453febfb3f62f3ba1e9fefb31dcec471 Mon Sep 17 00:00:00 > 2001 > > From: Alexander Kanavin <alex.kanavin@gmail.com > > <mailto:alex.kanavin@gmail.com>> > > -Date: Mon, 26 Oct 2015 16:38:18 +0200 > > -Subject: [PATCH 2/4] Makefile.am: prefix calls to pkg-config with > > +Date: Thu, 5 Apr 2018 10:26:25 +0800 > > +Subject: [PATCH] Makefile.am: prefix calls to pkg-config with > > PKG_CONFIG_SYSROOT_DIR > > > > Upstream-Status: Pending [review on oe-core maillist] > > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com > > <mailto:alex.kanavin@gmail.com>> > > +Signed-off-by: Anuj Mittal <anuj.mittal@intel.com > > <mailto:anuj.mittal@intel.com>> > > + > > --- > > gst-libs/gst/allocators/Makefile.am | 4 ++-- > > gst-libs/gst/app/Makefile.am | 4 ++-- > > gst-libs/gst/audio/Makefile.am | 12 ++++++------ > > - gst-libs/gst/fft/Makefile.am | 4 ++-- > > gst-libs/gst/pbutils/Makefile.am | 12 ++++++------ > > gst-libs/gst/riff/Makefile.am | 8 ++++---- > > gst-libs/gst/rtp/Makefile.am | 8 ++++---- > > @@ -18,13 +19,13 @@ Signed-off-by: Alexander Kanavin > > <alex.kanavin@gmail.com <mailto:alex.kanavin@gmail.com>> > > gst-libs/gst/sdp/Makefile.am | 4 ++-- > > gst-libs/gst/tag/Makefile.am | 8 ++++---- > > gst-libs/gst/video/Makefile.am | 8 ++++---- > > - 11 files changed, 38 insertions(+), 38 deletions(-) > > + 10 files changed, 36 insertions(+), 36 deletions(-) > > > > -Index: gst-plugins-base-1.12.3/gst-libs/gst/allocators/Makefile.am > > -=================================================================== > > ---- gst-plugins-base-1.12.3.orig/gst-libs/gst/allocators/ > Makefile.am > > -+++ gst-plugins-base-1.12.3/gst-libs/gst/allocators/Makefile.am > > -@@ -36,7 +36,7 @@ GstAllocators-@GST_API_VERSION@.gir: $(I > > +diff --git a/gst-libs/gst/allocators/Makefile.am > > b/gst-libs/gst/allocators/Makefile.am > > +index 1ecc950..d6417ac 100644 > > +--- a/gst-libs/gst/allocators/Makefile.am > > ++++ b/gst-libs/gst/allocators/Makefile.am > > +@@ -39,7 +39,7 @@ GstAllocators-@GST_API_VERSION@.gir: > > $(INTROSPECTION_SCANNER) libgstallocators-@ > > --c-include "gst/allocators/allocators.h" \ > > -I$(top_srcdir)/gst-libs \ > > -I$(top_builddir)/gst-libs \ > > @@ -33,7 +34,7 @@ Index: > > gst-plugins-base-1.12.3/gst-libs/gst/allocators/Makefile.am > > --library=libgstallocators-@GST_API_VERSION@.la \ > > --include=Gst-@GST_API_VERSION@ \ > > --libtool="$(LIBTOOL)" \ > > -@@ -60,7 +60,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= > > +@@ -63,7 +63,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) > > $(INTROSPECTION_COMPILER) \ > > --includedir=$(srcdir) \ > > --includedir=$(builddir) \ > > @@ -42,11 +43,11 @@ Index: > > gst-plugins-base-1.12.3/gst-libs/gst/allocators/Makefile.am > > $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) > > > > CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA) > > -Index: gst-plugins-base-1.12.3/gst-libs/gst/app/Makefile.am > > -=================================================================== > > ---- gst-plugins-base-1.12.3.orig/gst-libs/gst/app/Makefile.am > > -+++ gst-plugins-base-1.12.3/gst-libs/gst/app/Makefile.am > > -@@ -48,8 +48,8 @@ GstApp-@GST_API_VERSION@.gir: $(INTROSPE > > +diff --git a/gst-libs/gst/app/Makefile.am > > b/gst-libs/gst/app/Makefile.am > > +index 5bfd606..6441674 100644 > > +--- a/gst-libs/gst/app/Makefile.am > > ++++ b/gst-libs/gst/app/Makefile.am > > +@@ -51,8 +51,8 @@ GstApp-@GST_API_VERSION@.gir: > > $(INTROSPECTION_SCANNER) libgstapp-@GST_API_VERSIO > > --c-include "gst/app/app.h" \ > > -I$(top_srcdir)/gst-libs \ > > -I$(top_builddir)/gst-libs \ > > @@ -57,11 +58,11 @@ Index: > > gst-plugins-base-1.12.3/gst-libs/gst/app/Makefile.am > > --library=libgstapp-@GST_API_VERSION@.la \ > > --include=Gst-@GST_API_VERSION@ \ > > --include=GstBase-@GST_API_VERSION@ \ > > -Index: gst-plugins-base-1.12.3/gst-libs/gst/audio/Makefile.am > > -=================================================================== > > ---- gst-plugins-base-1.12.3.orig/gst-libs/gst/audio/Makefile.am > > -+++ gst-plugins-base-1.12.3/gst-libs/gst/audio/Makefile.am > > -@@ -167,12 +167,12 @@ GstAudio-@GST_API_VERSION@.gir: $(INTROS > > +diff --git a/gst-libs/gst/audio/Makefile.am > > b/gst-libs/gst/audio/Makefile.am > > +index 7fb65f2..5379f79 100644 > > +--- a/gst-libs/gst/audio/Makefile.am > > ++++ b/gst-libs/gst/audio/Makefile.am > > +@@ -174,12 +174,12 @@ GstAudio-@GST_API_VERSION@.gir: > > $(INTROSPECTION_SCANNER) libgstaudio-@GST_API_VE > > -I$(top_srcdir)/gst-libs \ > > -I$(top_builddir)/gst-libs \ > > --c-include "gst/audio/audio.h" \ > > @@ -78,7 +79,7 @@ Index: > > gst-plugins-base-1.12.3/gst-libs/gst/audio/Makefile.am > > --library-path="$(top_builddir)/gst-libs/gst/tag/" \ > > --include=Gst-@GST_API_VERSION@ \ > > --include=GstBase-@GST_API_VERSION@ \ > > -@@ -201,8 +201,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= > > +@@ -208,8 +208,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=. > typelib) > > --includedir=$(srcdir) \ > > --includedir=$(builddir) \ > > --includedir="$(top_builddir)/gst-libs/gst/tag/" \ > > @@ -89,33 +90,11 @@ Index: > > gst-plugins-base-1.12.3/gst-libs/gst/audio/Makefile.am > > $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) > > > > CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) > > -Index: gst-plugins-base-1.12.3/gst-libs/gst/fft/Makefile.am > > -=================================================================== > > ---- gst-plugins-base-1.12.3.orig/gst-libs/gst/fft/Makefile.am > > -+++ gst-plugins-base-1.12.3/gst-libs/gst/fft/Makefile.am > > -@@ -63,7 +63,7 @@ GstFft-@GST_API_VERSION@.gir: $(INTROSPE > > - --c-include "gst/fft/fft.h" \ > > - -I$(top_srcdir)/gst-libs \ > > - -I$(top_builddir)/gst-libs \ > > -- > > --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" > > $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ > > -+ > > --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_ > CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" > > $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ > > - --library=libgstfft-@GST_API_VERSION@.la \ > > - --include=Gst-@GST_API_VERSION@ \ > > - --libtool="$(LIBTOOL)" \ > > -@@ -87,7 +87,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= > > - $(INTROSPECTION_COMPILER) \ > > - --includedir=$(srcdir) \ > > - --includedir=$(builddir) \ > > -- > > --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) > > --variable=girdir gstreamer-@GST_API_VERSION@` \ > > -+ > > --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH=" > $(GST_PKG_CONFIG_PATH)" > > $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ > > - $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) > > - > > - CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA) > > -Index: gst-plugins-base-1.12.3/gst-libs/gst/pbutils/Makefile.am > > -=================================================================== > > ---- gst-plugins-base-1.12.3.orig/gst-libs/gst/pbutils/Makefile.am > > -+++ gst-plugins-base-1.12.3/gst-libs/gst/pbutils/Makefile.am > > -@@ -85,14 +85,14 @@ GstPbutils-@GST_API_VERSION@.gir: $(INTR > > +diff --git a/gst-libs/gst/pbutils/Makefile.am > > b/gst-libs/gst/pbutils/Makefile.am > > +index 35a6e44..49d6894 100644 > > +--- a/gst-libs/gst/pbutils/Makefile.am > > ++++ b/gst-libs/gst/pbutils/Makefile.am > > +@@ -88,14 +88,14 @@ GstPbutils-@GST_API_VERSION@.gir: > > $(INTROSPECTION_SCANNER) libgstpbutils-@GST_AP > > --c-include "gst/pbutils/pbutils.h" \ > > -I$(top_srcdir)/gst-libs \ > > -I$(top_builddir)/gst-libs \ > > @@ -134,7 +113,7 @@ Index: > > gst-plugins-base-1.12.3/gst-libs/gst/pbutils/Makefile.am > > --library-path="$(top_builddir)/gst-libs/gst/tag/" \ > > --library-path="$(top_builddir)/gst-libs/gst/video/" > \ > > --library-path="$(top_builddir)/gst-libs/gst/audio/" > \ > > -@@ -125,8 +125,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= > > +@@ -128,8 +128,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=. > typelib) > > $(INTROSPECTION_COMPILER) \ > > --includedir=$(srcdir) \ > > --includedir=$(builddir) \ > > @@ -145,11 +124,11 @@ Index: > > gst-plugins-base-1.12.3/gst-libs/gst/pbutils/Makefile.am > > --includedir="$(top_builddir)/gst-libs/gst/tag/" \ > > --includedir="$(top_builddir)/gst-libs/gst/video/" \ > > --includedir="$(top_builddir)/gst-libs/gst/audio/" \ > > -Index: gst-plugins-base-1.12.3/gst-libs/gst/riff/Makefile.am > > -=================================================================== > > ---- gst-plugins-base-1.12.3.orig/gst-libs/gst/riff/Makefile.am > > -+++ gst-plugins-base-1.12.3/gst-libs/gst/riff/Makefile.am > > -@@ -42,8 +42,8 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS > > +diff --git a/gst-libs/gst/riff/Makefile.am > > b/gst-libs/gst/riff/Makefile.am > > +index e66ef4f..c8c588a 100644 > > +--- a/gst-libs/gst/riff/Makefile.am > > ++++ b/gst-libs/gst/riff/Makefile.am > > +@@ -43,8 +43,8 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS = > > $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) > > # --c-include "gst/riff/riff.h" \ > > # --add-include-path=$(builddir)/../tag \ > > # --add-include-path=$(builddir)/../audio \ > > @@ -160,7 +139,7 @@ Index: > > gst-plugins-base-1.12.3/gst-libs/gst/riff/Makefile.am > > # --library=libgstriff-@GST_API_VERSION@.la \ > > # --include=GstAudio-@GST_API_VERSION@ \ > > # --include=GstTag-@GST_API_VERSION@ \ > > -@@ -74,8 +74,8 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS > > +@@ -75,8 +75,8 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS = > > $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) > > # --includedir=$(builddir) \ > > # --includedir=$(builddir)/../tag \ > > # --includedir=$(builddir)/../audio \ > > @@ -171,11 +150,11 @@ Index: > > gst-plugins-base-1.12.3/gst-libs/gst/riff/Makefile.am > > # $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) > > # > > #CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA) > > -Index: gst-plugins-base-1.12.3/gst-libs/gst/rtp/Makefile.am > > -=================================================================== > > ---- gst-plugins-base-1.12.3.orig/gst-libs/gst/rtp/Makefile.am > > -+++ gst-plugins-base-1.12.3/gst-libs/gst/rtp/Makefile.am > > -@@ -61,8 +61,8 @@ GstRtp-@GST_API_VERSION@.gir: $(INTROSPE > > +diff --git a/gst-libs/gst/rtp/Makefile.am > > b/gst-libs/gst/rtp/Makefile.am > > +index 77ebeeb..9aee788 100644 > > +--- a/gst-libs/gst/rtp/Makefile.am > > ++++ b/gst-libs/gst/rtp/Makefile.am > > +@@ -64,8 +64,8 @@ GstRtp-@GST_API_VERSION@.gir: > > $(INTROSPECTION_SCANNER) libgstrtp-@GST_API_VERSIO > > --c-include "gst/rtp/rtp.h" \ > > -I$(top_builddir)/gst-libs \ > > -I$(top_srcdir)/gst-libs \ > > @@ -186,7 +165,7 @@ Index: > > gst-plugins-base-1.12.3/gst-libs/gst/rtp/Makefile.am > > --library=libgstrtp-@GST_API_VERSION@.la \ > > --include=Gst-@GST_API_VERSION@ \ > > --include=GstBase-@GST_API_VERSION@ \ > > -@@ -89,8 +89,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= > > +@@ -92,8 +92,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) > > $(INTROSPECTION_COMPILER) \ > > --includedir=$(srcdir) \ > > --includedir=$(builddir) \ > > @@ -197,11 +176,11 @@ Index: > > gst-plugins-base-1.12.3/gst-libs/gst/rtp/Makefile.am > > $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) > > > > CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) > > -Index: gst-plugins-base-1.12.3/gst-libs/gst/rtsp/Makefile.am > > -=================================================================== > > ---- gst-plugins-base-1.12.3.orig/gst-libs/gst/rtsp/Makefile.am > > -+++ gst-plugins-base-1.12.3/gst-libs/gst/rtsp/Makefile.am > > -@@ -68,7 +68,7 @@ GstRtsp-@GST_API_VERSION@.gir: $(INTROSP > > +diff --git a/gst-libs/gst/rtsp/Makefile.am > > b/gst-libs/gst/rtsp/Makefile.am > > +index db9d0fd..79027cb 100644 > > +--- a/gst-libs/gst/rtsp/Makefile.am > > ++++ b/gst-libs/gst/rtsp/Makefile.am > > +@@ -71,7 +71,7 @@ GstRtsp-@GST_API_VERSION@.gir: > > $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERS > > -I$(top_builddir)/gst-libs \ > > -I$(top_srcdir)/gst-libs \ > > --add-include-path=$(builddir)/../sdp \ > > @@ -210,7 +189,7 @@ Index: > > gst-plugins-base-1.12.3/gst-libs/gst/rtsp/Makefile.am > > --library=libgstrtsp-@GST_API_VERSION@.la \ > > --include=Gio-2.0 \ > > --include=Gst-@GST_API_VERSION@ \ > > -@@ -98,7 +98,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= > > +@@ -101,7 +101,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=. > typelib) > > --includedir=$(srcdir) \ > > --includedir=$(builddir) \ > > --includedir=$(builddir)/../sdp \ > > @@ -219,11 +198,11 @@ Index: > > gst-plugins-base-1.12.3/gst-libs/gst/rtsp/Makefile.am > > $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) > > > > CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) > > -Index: gst-plugins-base-1.12.3/gst-libs/gst/sdp/Makefile.am > > -=================================================================== > > ---- gst-plugins-base-1.12.3.orig/gst-libs/gst/sdp/Makefile.am > > -+++ gst-plugins-base-1.12.3/gst-libs/gst/sdp/Makefile.am > > -@@ -30,7 +30,7 @@ GstSdp-@GST_API_VERSION@.gir: $(INTROSPE > > +diff --git a/gst-libs/gst/sdp/Makefile.am > > b/gst-libs/gst/sdp/Makefile.am > > +index 6e05cc7..c7cf514 100644 > > +--- a/gst-libs/gst/sdp/Makefile.am > > ++++ b/gst-libs/gst/sdp/Makefile.am > > +@@ -31,7 +31,7 @@ GstSdp-@GST_API_VERSION@.gir: > > $(INTROSPECTION_SCANNER) libgstsdp-@GST_API_VERSIO > > --warn-all \ > > --c-include "gst/sdp/sdp.h" \ > > -I$(top_srcdir)/gst-libs \ > > @@ -232,7 +211,7 @@ Index: > > gst-plugins-base-1.12.3/gst-libs/gst/sdp/Makefile.am > > --library=libgstsdp-@GST_API_VERSION@.la \ > > --include=Gst-@GST_API_VERSION@ \ > > --libtool="$(LIBTOOL)" \ > > -@@ -54,7 +54,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= > > +@@ -55,7 +55,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) > > $(INTROSPECTION_COMPILER) \ > > --includedir=$(srcdir) \ > > --includedir=$(builddir) \ > > @@ -241,11 +220,11 @@ Index: > > gst-plugins-base-1.12.3/gst-libs/gst/sdp/Makefile.am > > $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) > > > > CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA) > > -Index: gst-plugins-base-1.12.3/gst-libs/gst/tag/Makefile.am > > -=================================================================== > > ---- gst-plugins-base-1.12.3.orig/gst-libs/gst/tag/Makefile.am > > -+++ gst-plugins-base-1.12.3/gst-libs/gst/tag/Makefile.am > > -@@ -59,8 +59,8 @@ GstTag-@GST_API_VERSION@.gir: $(INTROSPE > > +diff --git a/gst-libs/gst/tag/Makefile.am > > b/gst-libs/gst/tag/Makefile.am > > +index c86515b..363e6d2 100644 > > +--- a/gst-libs/gst/tag/Makefile.am > > ++++ b/gst-libs/gst/tag/Makefile.am > > +@@ -61,8 +61,8 @@ GstTag-@GST_API_VERSION@.gir: > > $(INTROSPECTION_SCANNER) libgsttag-@GST_API_VERSIO > > --c-include "gst/tag/tag.h" \ > > -I$(top_srcdir)/gst-libs \ > > -I$(top_builddir)/gst-libs \ > > @@ -256,7 +235,7 @@ Index: > > gst-plugins-base-1.12.3/gst-libs/gst/tag/Makefile.am > > --library=libgsttag-@GST_API_VERSION@.la \ > > --include=Gst-@GST_API_VERSION@ \ > > --include=GstBase-@GST_API_VERSION@ \ > > -@@ -87,8 +87,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= > > +@@ -89,8 +89,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) > > $(INTROSPECTION_COMPILER) \ > > --includedir=$(srcdir) \ > > --includedir=$(builddir) \ > > @@ -267,11 +246,11 @@ Index: > > gst-plugins-base-1.12.3/gst-libs/gst/tag/Makefile.am > > $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) > > > > CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) > > -Index: gst-plugins-base-1.12.3/gst-libs/gst/video/Makefile.am > > -=================================================================== > > ---- gst-plugins-base-1.12.3.orig/gst-libs/gst/video/Makefile.am > > -+++ gst-plugins-base-1.12.3/gst-libs/gst/video/Makefile.am > > -@@ -116,8 +116,8 @@ GstVideo-@GST_API_VERSION@.gir: $(INTROS > > +diff --git a/gst-libs/gst/video/Makefile.am > > b/gst-libs/gst/video/Makefile.am > > +index 0f8455f..8c9955c 100644 > > +--- a/gst-libs/gst/video/Makefile.am > > ++++ b/gst-libs/gst/video/Makefile.am > > +@@ -119,8 +119,8 @@ GstVideo-@GST_API_VERSION@.gir: > > $(INTROSPECTION_SCANNER) libgstvideo-@GST_API_VE > > --c-include "gst/video/video.h" \ > > -I$(top_srcdir)/gst-libs \ > > -I$(top_builddir)/gst-libs \ > > @@ -282,7 +261,7 @@ Index: > > gst-plugins-base-1.12.3/gst-libs/gst/video/Makefile.am > > --library=libgstvideo-@GST_API_VERSION@.la \ > > --include=Gst-@GST_API_VERSION@ \ > > --include=GstBase-@GST_API_VERSION@ \ > > -@@ -144,8 +144,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= > > +@@ -147,8 +147,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=. > typelib) > > $(INTROSPECTION_COMPILER) \ > > --includedir=$(srcdir) \ > > --includedir=$(builddir) \ > > diff --git > > a/meta/recipes-multimedia/gstreamer/gstreamer1.0- > plugins-base/0003-riff-add-missing-include-directories- > when-calling-in.patch > > b/meta/recipes-multimedia/gstreamer/gstreamer1.0- > plugins-base/0003-riff-add-missing-include-directories- > when-calling-in.patch > > index 9b66f7f49d..98ffdb1c10 100644 > > --- > > a/meta/recipes-multimedia/gstreamer/gstreamer1.0- > plugins-base/0003-riff-add-missing-include-directories- > when-calling-in.patch > > +++ > > b/meta/recipes-multimedia/gstreamer/gstreamer1.0- > plugins-base/0003-riff-add-missing-include-directories- > when-calling-in.patch > > @@ -1,20 +1,21 @@ > > -From 3c2c2d5dd08aa30ed0e8acd8566ec99412bb8209 Mon Sep 17 00:00:00 > 2001 > > +From b9765efb1696e3e2e79f2955f759be199fe34882 Mon Sep 17 00:00:00 > 2001 > > From: Alexander Kanavin <alex.kanavin@gmail.com > > <mailto:alex.kanavin@gmail.com>> > > Date: Mon, 26 Oct 2015 17:29:37 +0200 > > -Subject: [PATCH 3/4] riff: add missing include directories when > calling > > +Subject: [PATCH] riff: add missing include directories when calling > > introspection scanner > > > > Upstream-Status: Pending [review on oe-core maillist] > > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com > > <mailto:alex.kanavin@gmail.com>> > > + > > --- > > gst-libs/gst/riff/Makefile.am | 2 ++ > > 1 file changed, 2 insertions(+) > > > > diff --git a/gst-libs/gst/riff/Makefile.am > > b/gst-libs/gst/riff/Makefile.am > > -index 0a115cc..5057a58 100644 > > +index c8c588a..c096453 100644 > > --- a/gst-libs/gst/riff/Makefile.am > > +++ b/gst-libs/gst/riff/Makefile.am > > -@@ -39,6 +39,8 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS = > > $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) > > +@@ -41,6 +41,8 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS = > > $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) > > # --strip-prefix=Gst \ > > # --warn-all \ > > # --c-include "gst/riff/riff.h" \ > > @@ -23,6 +24,3 @@ index 0a115cc..5057a58 100644 > > # --add-include-path=$(builddir)/../tag \ > > # --add-include-path=$(builddir)/../audio \ > > # > > --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_ > CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" > > $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ > > --- > > -2.6.2 > > - > > diff --git > > a/meta/recipes-multimedia/gstreamer/gstreamer1.0- > plugins-base/0003-ssaparse-enhance-SSA-text-lines-parsing.patch > > b/meta/recipes-multimedia/gstreamer/gstreamer1.0- > plugins-base/0003-ssaparse-enhance-SSA-text-lines-parsing.patch > > index 9fbebd5700..9e95524057 100644 > > --- > > a/meta/recipes-multimedia/gstreamer/gstreamer1.0- > plugins-base/0003-ssaparse-enhance-SSA-text-lines-parsing.patch > > +++ > > b/meta/recipes-multimedia/gstreamer/gstreamer1.0- > plugins-base/0003-ssaparse-enhance-SSA-text-lines-parsing.patch > > @@ -1,7 +1,7 @@ > > -From be6163cfa3a255493f9d75bad9541cbfe1723fee Mon Sep 17 00:00:00 > 2001 > > +From 918c96b24d10f61b7455b4cef3bab490849d0d77 Mon Sep 17 00:00:00 > 2001 > > From: Mingke Wang <mingke.wang@freescale.com > > <mailto:mingke.wang@freescale.com>> > > Date: Thu, 19 Mar 2015 14:17:10 +0800 > > -Subject: [PATCH 3/4] ssaparse: enhance SSA text lines parsing. > > +Subject: [PATCH] ssaparse: enhance SSA text lines parsing. > > > > some parser will pass in the original ssa text line which starts > > with "Dialog:" > > and there's are maybe multiple Dialog lines in one input buffer. > > @@ -10,13 +10,18 @@ Upstream-Status: Submitted > > [https://bugzilla.gnome.org/show_bug.cgi?id=747496 > > <https://bugzilla.gnome.org/show_bug.cgi?id=747496>] > > > > Signed-off-by: Mingke Wang <mingke.wang@freescale.com > > <mailto:mingke.wang@freescale.com>> > > > > +--- > > + gst/subparse/gstssaparse.c | 150 > > ++++++++++++++++++++++++++++++++++++++++----- > > + 1 file changed, 134 insertions(+), 16 deletions(-) > > + mode change 100644 => 100755 gst/subparse/gstssaparse.c > > + > > diff --git a/gst/subparse/gstssaparse.c b/gst/subparse/gstssaparse.c > > old mode 100644 > > new mode 100755 > > -index 06ecef9..0ab5dce > > +index c849c08..4b9636c > > --- a/gst/subparse/gstssaparse.c > > +++ b/gst/subparse/gstssaparse.c > > -@@ -260,6 +260,7 @@ gst_ssa_parse_remove_override_codes > > (GstSsaParse * parse, gchar * txt) > > +@@ -262,6 +262,7 @@ gst_ssa_parse_remove_override_codes > > (GstSsaParse * parse, gchar * txt) > > * gst_ssa_parse_push_line: > > * @parse: caller element > > * @txt: text to push > > @@ -24,7 +29,7 @@ index 06ecef9..0ab5dce > > * @start: timestamp for the buffer > > * @duration: duration for the buffer > > * > > -@@ -269,27 +270,133 @@ gst_ssa_parse_remove_override_codes > > (GstSsaParse * parse, gchar * txt) > > +@@ -271,27 +272,133 @@ gst_ssa_parse_remove_override_codes > > (GstSsaParse * parse, gchar * txt) > > * Returns: result of the push of the created buffer > > */ > > static GstFlowReturn > > @@ -169,7 +174,7 @@ index 06ecef9..0ab5dce > > GST_LOG_OBJECT (parse, "Text : %s", t); > > > > if (gst_ssa_parse_remove_override_codes (parse, t)) { > > -@@ -307,13 +414,22 @@ gst_ssa_parse_push_line (GstSsaParse * parse, > > gchar * txt, > > +@@ -309,13 +416,22 @@ gst_ssa_parse_push_line (GstSsaParse * parse, > > gchar * txt, > > gst_buffer_fill (buf, 0, escaped, len + 1); > > gst_buffer_set_size (buf, len); > > g_free (escaped); > > @@ -196,7 +201,7 @@ index 06ecef9..0ab5dce > > > > ret = gst_pad_push (parse->srcpad, buf); > > > > -@@ -333,6 +449,7 @@ gst_ssa_parse_chain (GstPad * sinkpad, > > GstObject * parent, GstBuffer * buf) > > +@@ -335,6 +451,7 @@ gst_ssa_parse_chain (GstPad * sinkpad, > > GstObject * parent, GstBuffer * buf) > > GstClockTime ts; > > gchar *txt; > > GstMapInfo map; > > @@ -204,7 +209,7 @@ index 06ecef9..0ab5dce > > > > if (G_UNLIKELY (!parse->framed)) > > goto not_framed; > > -@@ -350,13 +467,14 @@ gst_ssa_parse_chain (GstPad * sinkpad, > > GstObject * parent, GstBuffer * buf) > > +@@ -352,13 +469,14 @@ gst_ssa_parse_chain (GstPad * sinkpad, > > GstObject * parent, GstBuffer * buf) > > /* make double-sure it's 0-terminated and all */ > > gst_buffer_map (buf, &map, GST_MAP_READ); > > txt = g_strndup ((gchar *) map.data, map.size); > > @@ -220,6 +225,3 @@ index 06ecef9..0ab5dce > > > > if (ret != GST_FLOW_OK && GST_CLOCK_TIME_IS_VALID (ts)) { > > GstSegment segment; > > --- > > -1.7.9.5 > > - > > diff --git > > a/meta/recipes-multimedia/gstreamer/gstreamer1.0- > plugins-base/0004-rtsp-drop-incorrect-reference-to- > gstreamer-sdp-in-Ma.patch > > b/meta/recipes-multimedia/gstreamer/gstreamer1.0- > plugins-base/0004-rtsp-drop-incorrect-reference-to- > gstreamer-sdp-in-Ma.patch > > index 4adf605460..aaeb611fec 100644 > > --- > > a/meta/recipes-multimedia/gstreamer/gstreamer1.0- > plugins-base/0004-rtsp-drop-incorrect-reference-to- > gstreamer-sdp-in-Ma.patch > > +++ > > b/meta/recipes-multimedia/gstreamer/gstreamer1.0- > plugins-base/0004-rtsp-drop-incorrect-reference-to- > gstreamer-sdp-in-Ma.patch > > @@ -1,20 +1,21 @@ > > -From 4330915d88dc4dd46eb4c28d756482b767c2747f Mon Sep 17 00:00:00 > 2001 > > +From 53b5868491cf99ee797192395dbfeb69df23edd2 Mon Sep 17 00:00:00 > 2001 > > From: Alexander Kanavin <alex.kanavin@gmail.com > > <mailto:alex.kanavin@gmail.com>> > > Date: Mon, 26 Oct 2015 17:30:14 +0200 > > -Subject: [PATCH 4/4] rtsp: drop incorrect reference to > gstreamer-sdp in > > +Subject: [PATCH] rtsp: drop incorrect reference to gstreamer-sdp in > > Makefile.am > > > > Upstream-Status: Pending [review on oe-core maillist] > > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com > > <mailto:alex.kanavin@gmail.com>> > > + > > --- > > gst-libs/gst/rtsp/Makefile.am | 1 - > > 1 file changed, 1 deletion(-) > > > > diff --git a/gst-libs/gst/rtsp/Makefile.am > > b/gst-libs/gst/rtsp/Makefile.am > > -index 4f6d9f8..0afa370 100644 > > +index 79027cb..2987e23 100644 > > --- a/gst-libs/gst/rtsp/Makefile.am > > +++ b/gst-libs/gst/rtsp/Makefile.am > > -@@ -75,7 +75,6 @@ GstRtsp-@GST_API_VERSION@.gir: > > $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERS > > +@@ -79,7 +79,6 @@ GstRtsp-@GST_API_VERSION@.gir: > > $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERS > > --libtool="$(LIBTOOL)" \ > > --pkg gio-2.0 \ > > --pkg gstreamer-@GST_API_VERSION@ \ > > @@ -22,6 +23,3 @@ index 4f6d9f8..0afa370 100644 > > --pkg-export gstreamer-rtsp-@GST_API_VERSION@ \ > > --add-init-section="$(INTROSPECTION_INIT)" \ > > --output $@ \ > > --- > > -2.6.2 > > - > > diff --git > > a/meta/recipes-multimedia/gstreamer/gstreamer1.0- > plugins-base/0004-subparse-set-need_segment-after-sink- > pad-received-GS.patch > > b/meta/recipes-multimedia/gstreamer/gstreamer1.0- > plugins-base/0004-subparse-set-need_segment-after-sink- > pad-received-GS.patch > > deleted file mode 100644 > > index b924e38824..0000000000 > > --- > > a/meta/recipes-multimedia/gstreamer/gstreamer1.0- > plugins-base/0004-subparse-set-need_segment-after-sink- > pad-received-GS.patch > > +++ /dev/null > > @@ -1,69 +0,0 @@ > > -From ed09c8fd2c9c2b5384b72cc70af3728be6694e64 Mon Sep 17 00:00:00 > 2001 > > -From: Mingke Wang <mingke.wang@freescale.com > > <mailto:mingke.wang@freescale.com>> > > -Date: Thu, 19 Mar 2015 14:20:26 +0800 > > -Subject: [PATCH 4/4] subparse: set need_segment after sink pad > received > > - GST_EVENT_SEGMENT > > - > > -subparse works in push mode, chain funciton will be called once > > -up stream element finished the seeking and flushing. > > -if set need_segment flag in src pad event handler, the segment > > -event will be pushed earlier, result in the subtitle text will > > -be send out to down stream from the beginning. > > - > > -Upstream-Status: Submitted > > [https://bugzilla.gnome.org/show_bug.cgi?id=747498 > > <https://bugzilla.gnome.org/show_bug.cgi?id=747498>] > > - > > -Signed-off-by: Mingke Wang <mingke.wang@freescale.com > > <mailto:mingke.wang@freescale.com>> > > - > > -diff --git a/gst/subparse/gstsubparse.c b/gst/subparse/gstsubparse.c > > -old mode 100644 > > -new mode 100755 > > -index b565e93..7741ccc > > ---- a/gst/subparse/gstsubparse.c > > -+++ b/gst/subparse/gstsubparse.c > > -@@ -266,22 +266,20 @@ gst_sub_parse_src_event (GstPad * pad, > > GstObject * parent, GstEvent * event) > > - goto beach; > > - } > > - > > -+ /* Apply the seek to our segment */ > > -+ gst_segment_do_seek (&self->segment, rate, format, flags, > > -+ start_type, start, stop_type, stop, &update); > > -+ > > -+ GST_DEBUG_OBJECT (self, "segment after seek: %" > > GST_SEGMENT_FORMAT, > > -+ &self->segment); > > -+ > > - /* Convert that seek to a seeking in bytes at position 0, > > - FIXME: could use an index */ > > - ret = gst_pad_push_event (self->sinkpad, > > - gst_event_new_seek (rate, GST_FORMAT_BYTES, flags, > > - GST_SEEK_TYPE_SET, 0, GST_SEEK_TYPE_NONE, 0)); > > - > > -- if (ret) { > > -- /* Apply the seek to our segment */ > > -- gst_segment_do_seek (&self->segment, rate, format, flags, > > -- start_type, start, stop_type, stop, &update); > > -- > > -- GST_DEBUG_OBJECT (self, "segment after seek: %" > > GST_SEGMENT_FORMAT, > > -- &self->segment); > > -- > > -- self->need_segment = TRUE; > > -- } else { > > -+ if (!ret) { > > - GST_WARNING_OBJECT (self, "seek to 0 bytes failed"); > > - } > > - > > -@@ -1641,8 +1639,10 @@ gst_sub_parse_sink_event (GstPad * pad, > > GstObject * parent, GstEvent * event) > > - gst_event_parse_segment (event, &s); > > - if (s->format == GST_FORMAT_TIME) > > - gst_event_copy_segment (event, &self->segment); > > -- GST_DEBUG_OBJECT (self, "newsegment (%s)", > > -- gst_format_get_name (self->segment.format)); > > -+ GST_DEBUG_OBJECT (self, "newsegment (%s) %" > GST_SEGMENT_FORMAT, > > -+ gst_format_get_name (self->segment.format), > &self->segment); > > -+ > > -+ self->need_segment = TRUE; > > - > > - /* if not time format, we'll either start with a 0 timestamp > > anyway or > > - * it's following a seek in which case we'll have saved the > > requested > > --- > > -1.7.9.5 > > - > > diff --git > > a/meta/recipes-multimedia/gstreamer/gstreamer1.0- > plugins-base/0009-glimagesink-Downrank-to-marginal.patch > > b/meta/recipes-multimedia/gstreamer/gstreamer1.0- > plugins-base/0009-glimagesink-Downrank-to-marginal.patch > > new file mode 100644 > > index 0000000000..c81fb0f6aa > > --- /dev/null > > +++ > > b/meta/recipes-multimedia/gstreamer/gstreamer1.0- > plugins-base/0009-glimagesink-Downrank-to-marginal.patch > > @@ -0,0 +1,32 @@ > > +From c6b37a80806f9128de47f1ccc3f2354f8d436bb6 Mon Sep 17 00:00:00 > 2001 > > +From: Alexander Kanavin <alex.kanavin@gmail.com > > <mailto:alex.kanavin@gmail.com>> > > +Date: Thu, 24 Sep 2015 19:47:32 +0300 > > +Subject: [PATCH] glimagesink: Downrank to marginal > > + > > +On desktop, where there is good OpenGL, xvimagesink will come up > first, > > +on other platforms, OpenGL can't be trusted because it's either > > software (like > > +in a VM) or broken (like on embedded)., so let ximagesink come > above. > > + > > +Upstream-Status: Submitted > > [https://bugzilla.gnome.org/show_bug.cgi?id=751684 > > <https://bugzilla.gnome.org/show_bug.cgi?id=751684>] > > + > > +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com > > <mailto:alex.kanavin@gmail.com>> > > +--- > > + ext/gl/gstopengl.c | 2 +- > > + 1 file changed, 1 insertion(+), 1 deletion(-) > > + > > +diff --git a/ext/gl/gstopengl.c b/ext/gl/gstopengl.c > > +index a4b2540..0ccaacd 100644 > > +--- a/ext/gl/gstopengl.c > > ++++ b/ext/gl/gstopengl.c > > +@@ -118,7 +118,7 @@ plugin_init (GstPlugin * plugin) > > + #endif > > + > > + if (!gst_element_register (plugin, "glimagesink", > > +- GST_RANK_SECONDARY, gst_gl_image_sink_bin_get_type ())) { > > ++ GST_RANK_MARGINAL, gst_gl_image_sink_bin_get_type ())) { > > + return FALSE; > > + } > > + > > +-- > > +2.1.4 > > + > > diff --git > > a/meta/recipes-multimedia/gstreamer/gstreamer1.0- > plugins-base/get-caps-from-src-pad-when-query-caps.patch > > b/meta/recipes-multimedia/gstreamer/gstreamer1.0- > plugins-base/get-caps-from-src-pad-when-query-caps.patch > > index c8e6287a55..a4727e23ea 100644 > > --- > > a/meta/recipes-multimedia/gstreamer/gstreamer1.0- > plugins-base/get-caps-from-src-pad-when-query-caps.patch > > +++ > > b/meta/recipes-multimedia/gstreamer/gstreamer1.0- > plugins-base/get-caps-from-src-pad-when-query-caps.patch > > @@ -1,4 +1,4 @@ > > -From af0dac26f62aaceb4bf266720911953793e0fc5d Mon Sep 17 00:00:00 > 2001 > > +From 41de2ec64ab06bb58c82c1659adaa3811bc5bcf8 Mon Sep 17 00:00:00 > 2001 > > From: zhouming <b42586@freescale.com <mailto:b42586@freescale.com>> > > Date: Wed, 14 May 2014 10:16:20 +0800 > > Subject: [PATCH] ENGR00312515: get caps from src pad when query caps > > @@ -8,18 +8,19 @@ https://bugzilla.gnome.org/show_bug.cgi?id=728312 > > <https://bugzilla.gnome.org/show_bug.cgi?id=728312> > > Upstream-Status: Pending > > > > Signed-off-by: zhouming <b42586@freescale.com > > <mailto:b42586@freescale.com>> > > + > > --- > > - gst-libs/gst/tag/gsttagdemux.c | 13 +++++++++++++ > > + gst-libs/gst/tag/gsttagdemux.c | 13 +++++++++++++ > > 1 file changed, 13 insertions(+) > > mode change 100644 => 100755 gst-libs/gst/tag/gsttagdemux.c > > > > diff --git a/gst-libs/gst/tag/gsttagdemux.c > > b/gst-libs/gst/tag/gsttagdemux.c > > old mode 100644 > > new mode 100755 > > -index 9b6c478..ae2294a > > +index 8a127c8..71c5d78 > > --- a/gst-libs/gst/tag/gsttagdemux.c > > +++ b/gst-libs/gst/tag/gsttagdemux.c > > -@@ -1769,6 +1769,19 @@ gst_tag_demux_pad_query (GstPad * pad, > > GstObject * parent, GstQuery * query) > > +@@ -1759,6 +1759,19 @@ gst_tag_demux_pad_query (GstPad * pad, > > GstObject * parent, GstQuery * query) > > } > > break; > > } > > @@ -39,6 +40,3 @@ index 9b6c478..ae2294a > > default: > > res = gst_pad_query_default (pad, parent, query); > > break; > > --- > > -1.7.9.5 > > - > > diff --git > > a/meta/recipes-multimedia/gstreamer/gstreamer1.0- > plugins-base/link-with-libvchostif.patch > > b/meta/recipes-multimedia/gstreamer/gstreamer1.0- > plugins-base/link-with-libvchostif.patch > > new file mode 100644 > > index 0000000000..d5a7f6bdc2 > > --- /dev/null > > +++ > > b/meta/recipes-multimedia/gstreamer/gstreamer1.0- > plugins-base/link-with-libvchostif.patch > > @@ -0,0 +1,45 @@ > > +From 9866f51e5e0913f1e453eb574618bf7432f38cb6 Mon Sep 17 00:00:00 > 2001 > > +From: Khem Raj <raj.khem@gmail.com <mailto:raj.khem@gmail.com>> > > +Date: Wed, 11 Apr 2018 10:46:33 +0800 > > +Subject: [PATCH] Add -lvchostif to link when using -lEGL on rpi > > + > > +This is required because libEGL from userland uses sybols > > +from this library. > > + > > +lib/libEGL.so.1.0.0 > > > > > > 121: 00000000 0 FUNC > > GLOBAL DEFAULT UND vc_dispmanx_element_add > > + 1552: 00000000 0 FUNC GLOBAL DEFAULT UND > > vc_dispmanx_element_add > > + > > +These symbols are provided by libvchostif as seen below > > + > > +lib/libvchostif.so > > + 252: 0000b161 192 FUNC GLOBAL DEFAULT 9 > > vc_dispmanx_element_add > > + 809: 0000b161 192 FUNC GLOBAL DEFAULT 9 > > vc_dispmanx_element_add > > + > > +With this explicit link, plugins fail during runtime > > + > > +(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 > > +(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 > > + > > +Upstream-Status: Pending > > +Signed-off-by: Khem Raj <raj.khem@gmail.com > > <mailto:raj.khem@gmail.com>> > > +Signed-off-by: Anuj Mittal <anuj.mittal@intel.com > > <mailto:anuj.mittal@intel.com>> > > +--- > > + m4/gst-gl.m4 | 2 +- > > + 1 file changed, 1 insertion(+), 1 deletion(-) > > + > > +diff --git a/m4/gst-gl.m4 b/m4/gst-gl.m4 > > +index 1e97240..ab7774c 100644 > > +--- a/m4/gst-gl.m4 > > ++++ b/m4/gst-gl.m4 > > +@@ -231,7 +231,7 @@ case $host in > > + HAVE_EGL=yes > > + HAVE_GLES2=yes > > + HAVE_EGL_RPI=yes > > +- EGL_LIBS="-lbcm_host -lvcos > -lvchiq_arm" > > ++ EGL_LIBS="-lbcm_host -lvchostif -lvcos > > -lvchiq_arm" > > + EGL_CFLAGS="" > > + AC_DEFINE(USE_EGL_RPI, [1], [Use RPi > > platform]) > > + ]) > > +-- > > +2.7.4 > > + > > diff --git > > a/meta/recipes-multimedia/gstreamer/gstreamer1.0- > plugins-base/make-gio_unix_2_0-dependency-configurable.patch > > b/meta/recipes-multimedia/gstreamer/gstreamer1.0- > plugins-base/make-gio_unix_2_0-dependency-configurable.patch > > index 413eff0695..23950b67f2 100644 > > --- > > a/meta/recipes-multimedia/gstreamer/gstreamer1.0- > plugins-base/make-gio_unix_2_0-dependency-configurable.patch > > +++ > > b/meta/recipes-multimedia/gstreamer/gstreamer1.0- > plugins-base/make-gio_unix_2_0-dependency-configurable.patch > > @@ -1,4 +1,4 @@ > > -From 10d2a977ee1d469f0bf9059bb2d0b55fd2eecbac Mon Sep 17 00:00:00 > 2001 > > +From 7ffa6e3d00e1d8a060f3f4c2bb9a72691af05d79 Mon Sep 17 00:00:00 > 2001 > > From: Andre McCurdy <armccurdy@gmail.com <mailto: > armccurdy@gmail.com>> > > Date: Wed, 20 Jan 2016 13:00:00 -0800 > > Subject: [PATCH] make gio_unix_2_0 dependency configurable > > @@ -17,16 +17,17 @@ instead of AG_GST_CHECK_FEATURE. > > Upstream-Status: Pending > > > > Signed-off-by: Andre McCurdy <armccurdy@gmail.com > > <mailto:armccurdy@gmail.com>> > > + > > --- > > configure.ac <http://configure.ac> | 7 +++++++ > > 1 file changed, 7 insertions(+) > > > > diff --git a/configure.ac <http://configure.ac> b/configure.ac > > <http://configure.ac> > > -index 9c52aeb..26cacd6 100644 > > +index 12807bc..35a0bf3 100644 > > --- a/configure.ac <http://configure.ac> > > +++ b/configure.ac <http://configure.ac> > > -@@ -752,9 +752,16 @@ AC_SUBST(FT2_CFLAGS) > > - fi dnl of EXT plugins > > +@@ -806,9 +806,16 @@ AM_CONDITIONAL(HAVE_PNG, test "x$HAVE_PNG" = > > "xyes") > > + AM_CONDITIONAL(HAVE_JPEG, test "x$HAVE_JPEG" = "xyes") > > > > dnl *** gio-unix-2.0 for tests/check/pipelines/tcp.c *** > > +AC_ARG_ENABLE([gio_unix_2_0], > > @@ -42,6 +43,3 @@ index 9c52aeb..26cacd6 100644 > > AM_CONDITIONAL(USE_GIO_UNIX_2_0, test "x$HAVE_GIO_UNIX_2_0" = > "xyes") > > > > dnl *** finalize CFLAGS, LDFLAGS, LIBS > > --- > > -1.9.1 > > - > > diff --git > > a/meta/recipes-multimedia/gstreamer/gstreamer1.0- > plugins-base_1.12.4.bb > > <http://gstreamer1.0-plugins-base_1.12.4.bb> > > b/meta/recipes-multimedia/gstreamer/gstreamer1.0- > plugins-base_1.12.4.bb > > <http://gstreamer1.0-plugins-base_1.12.4.bb> > > deleted file mode 100644 > > index dd895bbcb1..0000000000 > > --- > > a/meta/recipes-multimedia/gstreamer/gstreamer1.0- > plugins-base_1.12.4.bb > > <http://gstreamer1.0-plugins-base_1.12.4.bb> > > +++ /dev/null > > @@ -1,18 +0,0 @@ > > -require gstreamer1.0-plugins-base.inc > > - > > -LIC_FILES_CHKSUM = > > "file://COPYING;md5=c54ce9345727175ff66d17b67ff51f58 \ > > - > > file://COPYING.LIB;md5=6762ed442b3822387a51c92d928ead0d \ > > - file://common/coverage/coverage-report.pl > > <http://coverage-report.pl>;beginline=2;endline=17;md5= > a4e1830fce078028c8f0974161272607" > > - > > -SRC_URI = " \ > > - > > http://gstreamer.freedesktop.org/src/gst-plugins-base/gst- > plugins-base-${PV}.tar.xz > > <http://gstreamer.freedesktop.org/src/gst-plugins-base/gst- > plugins-base-${PV}.tar.xz> > > \ > > - file://get-caps-from-src-pad-when-query-caps.patch \ > > - file://0003-ssaparse-enhance-SSA-text-lines-parsing.patch \ > > - > > file://0004-subparse-set-need_segment-after-sink-pad-received-GS.patch > \ > > - file://make-gio_unix_2_0-dependency-configurable.patch \ > > - > > file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch > \ > > -" > > -SRC_URI[md5sum] = "b35b04071f69b8ab69a7f3a497ff0131" > > -SRC_URI[sha256sum] = > > "4c306b03df0212f1b8903784e29bb3493319ba19ebebf13b0c56a17870292282" > > - > > -S = "${WORKDIR}/gst-plugins-base-${PV}" > > diff --git > > a/meta/recipes-multimedia/gstreamer/gstreamer1.0- > plugins-base_1.14.0.bb > > <http://gstreamer1.0-plugins-base_1.14.0.bb> > > b/meta/recipes-multimedia/gstreamer/gstreamer1.0- > plugins-base_1.14.0.bb > > <http://gstreamer1.0-plugins-base_1.14.0.bb> > > new file mode 100644 > > index 0000000000..370cd0368c > > --- /dev/null > > +++ > > b/meta/recipes-multimedia/gstreamer/gstreamer1.0- > plugins-base_1.14.0.bb > > <http://gstreamer1.0-plugins-base_1.14.0.bb> > > @@ -0,0 +1,70 @@ > > +require gstreamer1.0-plugins.inc > > + > > +LICENSE = "GPLv2+ & LGPLv2+" > > +LIC_FILES_CHKSUM = > > "file://COPYING;md5=c54ce9345727175ff66d17b67ff51f58 \ > > + > > file://COPYING.LIB;md5=6762ed442b3822387a51c92d928ead0d \ > > + file://common/coverage/coverage-report.pl > > <http://coverage-report.pl>;beginline=2;endline=17;md5= > a4e1830fce078028c8f0974161272607" > > + > > +SRC_URI = " \ > > + > > http://gstreamer.freedesktop.org/src/gst-plugins-base/gst- > plugins-base-${PV}.tar.xz > > <http://gstreamer.freedesktop.org/src/gst-plugins-base/gst- > plugins-base-${PV}.tar.xz> > > \ > > + file://get-caps-from-src-pad-when-query-caps.patch \ > > + file://0003-ssaparse-enhance-SSA-text-lines-parsing.patch > \ > > + file://make-gio_unix_2_0-dependency-configurable.patch > \ > > + > > file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch > \ > > + > > file://0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch > \ > > + > > file://0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch > \ > > + > > file://0003-riff-add-missing-include-directories-when-calling-in.patch > \ > > + > > file://0004-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch > \ > > + file://0009-glimagesink-Downrank-to-marginal.patch \ > > + > > file://0001-gstreamer-gl.pc.in-don-t-append-GL_CFLAGS-to-CFLAGS.patch > \ > > + file://link-with-libvchostif.patch \ > > + " > > +SRC_URI[md5sum] = "370271327dd23110421a9c2927ac989a" > > +SRC_URI[sha256sum] = > > "7e904660ff56e02b036cf7fdfb77a50a540828ca9d2614d69ba931772e5b6940" > > + > > +S = "${WORKDIR}/gst-plugins-base-${PV}" > > + > > +DEPENDS += "iso-codes util-linux" > > + > > +inherit gettext > > + > > +PACKAGES_DYNAMIC =+ "^libgst.*" > > + > > +PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', > > 'opengl', 'gles2 egl', '', d)}" > > +PACKAGECONFIG ??= " \ > > + ${GSTREAMER_ORC} \ > > + ${@bb.utils.filter('DISTRO_FEATURES', 'alsa x11', d)} \ > > + gio-unix-2.0 ogg pango theora vorbis zlib jpeg \ > > + ${PACKAGECONFIG_GL} \ > > + ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland > > egl', '', d)} \ > > +" > > + > > +X11DEPENDS = "virtual/libx11 libsm libxrender libxv" > > +X11ENABLEOPTS = "--enable-x --enable-xvideo --enable-xshm" > > +X11DISABLEOPTS = "--disable-x --disable-xvideo --disable-xshm" > > + > > +PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa, > alsa-lib" > > +PACKAGECONFIG[cdparanoia] = > > "--enable-cdparanoia,--disable-cdparanoia,cdparanoia" > > +PACKAGECONFIG[gio-unix-2.0] = > > "--enable-gio_unix_2_0,--disable-gio_unix_2_0,glib-2.0" > > +PACKAGECONFIG[ivorbis] = > > "--enable-ivorbis,--disable-ivorbis,tremor" > > +PACKAGECONFIG[ogg] = "--enable-ogg,--disable-ogg,libogg" > > +PACKAGECONFIG[opus] = "--enable-opus,--disable-opus, > libopus" > > +PACKAGECONFIG[pango] = "--enable-pango,--disable- > pango,pango" > > +PACKAGECONFIG[theora] = > > "--enable-theora,--disable-theora,libtheora" > > +PACKAGECONFIG[visual] = > > "--enable-libvisual,--disable-libvisual,libvisual" > > +PACKAGECONFIG[vorbis] = > > "--enable-vorbis,--disable-vorbis,libvorbis" > > +PACKAGECONFIG[x11] = > > "${X11ENABLEOPTS},${X11DISABLEOPTS},${X11DEPENDS}" > > +PACKAGECONFIG[zlib] = "--enable-zlib,--disable-zlib,zlib" > > +PACKAGECONFIG[opengl] = > > "--enable-opengl,--disable-opengl,virtual/libgl libglu" > > +PACKAGECONFIG[gles2] = > > "--enable-gles2,--disable-gles2,virtual/libgles2" > > +PACKAGECONFIG[egl] = "--enable-egl,--disable-egl, > virtual/egl" > > +PACKAGECONFIG[wayland] = > > "--enable-wayland,--disable-wayland,wayland-native wayland > > wayland-protocols libdrm" > > +PACKAGECONFIG[jpeg] = ",,jpeg" > > + > > +FILES_${MLPREFIX}libgsttag-1.0 += > > "${datadir}/gst-plugins-base/1.0/license-translations.dict" > > + > > +do_compile_prepend() { > > + export > > GIR_EXTRA_LIBS_PATH="${B}/gst-libs/gst/tag/.libs:${B}/gst- > libs/gst/video/.libs:${B}/gst-libs/gst/audio/.libs:${B}/gst- > libs/gst/rtp/.libs" > > +} > > + > > +FILES_${PN}-dev += > > "${libdir}/gstreamer-${LIBV}/include/gst/gl/gstglconfig.h" > > -- > > 2.14.1 > > > > -- > > _______________________________________________ > > Openembedded-core mailing list > > Openembedded-core@lists.openembedded.org > > <mailto:Openembedded-core@lists.openembedded.org> > > http://lists.openembedded.org/mailman/listinfo/openembedded-core > > <http://lists.openembedded.org/mailman/listinfo/openembedded-core> > > > > > > [-- Attachment #2: Type: text/html, Size: 106232 bytes --] ^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PATCH 02/12] gst-plugins-base: upgrade 1.12.4 -> 1.14.0 2018-05-04 13:09 ` Burton, Ross @ 2018-05-07 10:14 ` Alexander Kanavin 0 siblings, 0 replies; 25+ messages in thread From: Alexander Kanavin @ 2018-05-07 10:14 UTC (permalink / raw) To: Burton, Ross, Anuj Mittal; +Cc: OE-core On 05/04/2018 04:09 PM, Burton, Ross wrote: > Aha great. I suspect that you have GStreamer headers on your host > already and it's picking those up? Seems like there is a host contamination issue here, which should be fixed as well. Alex ^ permalink raw reply [flat|nested] 25+ messages in thread
* [PATCH v2] gst-plugins-base: upgrade 1.12.4 -> 1.14.0 2018-05-03 8:17 ` [PATCH 02/12] gst-plugins-base: " Anuj Mittal 2018-05-04 11:52 ` Burton, Ross @ 2018-05-04 13:28 ` Anuj Mittal 2018-05-07 10:42 ` Alexander Kanavin 2018-05-08 9:18 ` [PATCH v3] " Anuj Mittal 1 sibling, 2 replies; 25+ messages in thread From: Anuj Mittal @ 2018-05-04 13:28 UTC (permalink / raw) To: openembedded-core * For changes, please see: https://gstreamer.freedesktop.org/releases/1.14/ * OpenGL integration library has moved to -plugins-base, add PACKAGECONFIG. * Remove one patch as that has been fixed in a different way upstream. * Merge inc/bb and refresh patches to get rid of fuzz warnings. * Remove x86 specific cached variables as they're not needed anymore. * Add jpeg to PACKAGECONFIG and enable it by default. * Port gstreamer-gl specific patches from -plugins-bad. * Backport a patch to fix g-i compile issue. Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> --- ...on.m4-prefix-pkgconfig-paths-with-PKG_CON.patch | 12 +- .../gstreamer/gstreamer1.0-plugins-base.inc | 50 ------- ...-don-t-hardcode-libtool-name-when-running.patch | 71 +++++----- ...-up-GstVideo-1.0.gir-from-local-build-dir.patch | 44 ++++++ ...gl.pc.in-don-t-append-GL_CFLAGS-to-CFLAGS.patch | 29 ++++ ...-prefix-calls-to-pkg-config-with-PKG_CONF.patch | 151 +++++++++------------ ...ssing-include-directories-when-calling-in.patch | 12 +- ...3-ssaparse-enhance-SSA-text-lines-parsing.patch | 24 ++-- ...ncorrect-reference-to-gstreamer-sdp-in-Ma.patch | 12 +- ...t-need_segment-after-sink-pad-received-GS.patch | 69 ---------- .../0009-glimagesink-Downrank-to-marginal.patch | 32 +++++ .../get-caps-from-src-pad-when-query-caps.patch | 12 +- .../link-with-libvchostif.patch | 45 ++++++ ...make-gio_unix_2_0-dependency-configurable.patch | 12 +- .../gstreamer/gstreamer1.0-plugins-base_1.12.4.bb | 18 --- .../gstreamer/gstreamer1.0-plugins-base_1.14.0.bb | 71 ++++++++++ 16 files changed, 359 insertions(+), 305 deletions(-) delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-gl-pick-up-GstVideo-1.0.gir-from-local-build-dir.patch create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-gstreamer-gl.pc.in-don-t-append-GL_CFLAGS-to-CFLAGS.patch delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0004-subparse-set-need_segment-after-sink-pad-received-GS.patch create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0009-glimagesink-Downrank-to-marginal.patch create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/link-with-libvchostif.patch delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.12.4.bb create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.14.0.bb diff --git a/meta/recipes-multimedia/gstreamer/files/0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch b/meta/recipes-multimedia/gstreamer/files/0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch index 2cab87f9ec..1b7f115083 100644 --- a/meta/recipes-multimedia/gstreamer/files/0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch +++ b/meta/recipes-multimedia/gstreamer/files/0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch @@ -1,4 +1,4 @@ -From 90916f96262fa7b27a0a99788c69f9fd6df11000 Mon Sep 17 00:00:00 2001 +From 2b0436f9a07773fae8c74df902d7024e8bfc3512 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Tue, 24 Nov 2015 16:46:27 +0200 Subject: [PATCH] introspection.m4: prefix pkgconfig paths with @@ -10,12 +10,13 @@ is later supplied to g-ir-scanner. Upstream-Status: Pending [review on oe-core list] Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> + --- - common/m4/introspection.m4 | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) + common/m4/introspection.m4 | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/common/m4/introspection.m4 b/common/m4/introspection.m4 -index 162be57..217a6ae 100644 +index 162be57..933f979 100644 --- a/common/m4/introspection.m4 +++ b/common/m4/introspection.m4 @@ -54,14 +54,14 @@ m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL], @@ -37,6 +38,3 @@ index 162be57..217a6ae 100644 INTROSPECTION_INIT="extern void gst_init(gint*,gchar**); gst_init(NULL,NULL);" fi AC_SUBST(INTROSPECTION_SCANNER) --- -2.6.2 - diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc deleted file mode 100644 index 08130c1da4..0000000000 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc +++ /dev/null @@ -1,50 +0,0 @@ -require gstreamer1.0-plugins.inc - -SRC_URI_append = "\ - file://0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch \ - file://0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch \ - file://0003-riff-add-missing-include-directories-when-calling-in.patch \ - file://0004-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch \ -" - -LICENSE = "GPLv2+ & LGPLv2+" - -DEPENDS += "iso-codes util-linux zlib" - -inherit gettext - -PACKAGES_DYNAMIC =+ "^libgst.*" - -PACKAGECONFIG ??= " \ - ${GSTREAMER_ORC} \ - ${@bb.utils.filter('DISTRO_FEATURES', 'alsa x11', d)} \ - gio-unix-2.0 ogg pango theora vorbis \ -" - -X11DEPENDS = "virtual/libx11 libsm libxrender libxv" -X11ENABLEOPTS = "--enable-x --enable-xvideo --enable-xshm" -X11DISABLEOPTS = "--disable-x --disable-xvideo --disable-xshm" - -PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib" -PACKAGECONFIG[cdparanoia] = "--enable-cdparanoia,--disable-cdparanoia,cdparanoia" -PACKAGECONFIG[gio-unix-2.0] = "--enable-gio_unix_2_0,--disable-gio_unix_2_0,glib-2.0" -PACKAGECONFIG[ivorbis] = "--enable-ivorbis,--disable-ivorbis,tremor" -PACKAGECONFIG[ogg] = "--enable-ogg,--disable-ogg,libogg" -PACKAGECONFIG[opus] = "--enable-opus,--disable-opus,libopus" -PACKAGECONFIG[pango] = "--enable-pango,--disable-pango,pango" -PACKAGECONFIG[theora] = "--enable-theora,--disable-theora,libtheora" -PACKAGECONFIG[visual] = "--enable-libvisual,--disable-libvisual,libvisual" -PACKAGECONFIG[vorbis] = "--enable-vorbis,--disable-vorbis,libvorbis" -PACKAGECONFIG[x11] = "${X11ENABLEOPTS},${X11DISABLEOPTS},${X11DEPENDS}" - -EXTRA_OECONF += " \ - --enable-zlib \ -" - -CACHED_CONFIGUREVARS_append_x86 = " ac_cv_header_emmintrin_h=no ac_cv_header_xmmintrin_h=no" - -FILES_${MLPREFIX}libgsttag-1.0 += "${datadir}/gst-plugins-base/1.0/license-translations.dict" - -do_compile_prepend() { - export GIR_EXTRA_LIBS_PATH="${B}/gst-libs/gst/tag/.libs:${B}/gst-libs/gst/video/.libs:${B}/gst-libs/gst/audio/.libs:${B}/gst-libs/gst/rtp/.libs" -} diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch index 094bdac846..128c7f8cb6 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch @@ -1,16 +1,18 @@ -From f1d9652351e7754c63003104eceb526af424c7e0 Mon Sep 17 00:00:00 2001 +From 4d6ea58f96b9744af8d899ddca22c2695ac74b5b Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Fri, 20 Nov 2015 16:53:04 +0200 -Subject: [PATCH 1/4] Makefile.am: don't hardcode libtool name when running +Date: Thu, 5 Apr 2018 10:15:08 +0800 +Subject: [PATCH] Makefile.am: don't hardcode libtool name when running introspection tools Upstream-Status: Pending [review on oe-core maillist] Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> + --- gst-libs/gst/allocators/Makefile.am | 2 +- gst-libs/gst/app/Makefile.am | 2 +- gst-libs/gst/audio/Makefile.am | 2 +- - gst-libs/gst/fft/Makefile.am | 2 +- + gst-libs/gst/gl/Makefile.am | 2 +- gst-libs/gst/pbutils/Makefile.am | 2 +- gst-libs/gst/riff/Makefile.am | 2 +- gst-libs/gst/rtp/Makefile.am | 2 +- @@ -21,10 +23,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/gst-libs/gst/allocators/Makefile.am b/gst-libs/gst/allocators/Makefile.am -index 9361bf9..bc7f53a 100644 +index 1957d28..1ecc950 100644 --- a/gst-libs/gst/allocators/Makefile.am +++ b/gst-libs/gst/allocators/Makefile.am -@@ -38,7 +38,7 @@ GstAllocators-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstallocators-@ +@@ -42,7 +42,7 @@ GstAllocators-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstallocators-@ --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ --library=libgstallocators-@GST_API_VERSION@.la \ --include=Gst-@GST_API_VERSION@ \ @@ -34,10 +36,10 @@ index 9361bf9..bc7f53a 100644 --pkg-export gstreamer-allocators-@GST_API_VERSION@ \ --output $@ \ diff --git a/gst-libs/gst/app/Makefile.am b/gst-libs/gst/app/Makefile.am -index 6d6de8d..dcc2fe0 100644 +index 52f6ad3..5bfd606 100644 --- a/gst-libs/gst/app/Makefile.am +++ b/gst-libs/gst/app/Makefile.am -@@ -53,7 +53,7 @@ GstApp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstapp-@GST_API_VERSIO +@@ -56,7 +56,7 @@ GstApp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstapp-@GST_API_VERSIO --library=libgstapp-@GST_API_VERSION@.la \ --include=Gst-@GST_API_VERSION@ \ --include=GstBase-@GST_API_VERSION@ \ @@ -47,10 +49,10 @@ index 6d6de8d..dcc2fe0 100644 --pkg gstreamer-base-@GST_API_VERSION@ \ --pkg-export gstreamer-app-@GST_API_VERSION@ \ diff --git a/gst-libs/gst/audio/Makefile.am b/gst-libs/gst/audio/Makefile.am -index 275d222..2374196 100644 +index 2922245..7fb65f2 100644 --- a/gst-libs/gst/audio/Makefile.am +++ b/gst-libs/gst/audio/Makefile.am -@@ -116,7 +116,7 @@ GstAudio-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstaudio-@GST_API_VE +@@ -184,7 +184,7 @@ GstAudio-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstaudio-@GST_API_VE --include=Gst-@GST_API_VERSION@ \ --include=GstBase-@GST_API_VERSION@ \ --include=GstTag-@GST_API_VERSION@ \ @@ -59,24 +61,24 @@ index 275d222..2374196 100644 --pkg gstreamer-@GST_API_VERSION@ \ --pkg gstreamer-base-@GST_API_VERSION@ \ --pkg-export gstreamer-audio-@GST_API_VERSION@ \ -diff --git a/gst-libs/gst/fft/Makefile.am b/gst-libs/gst/fft/Makefile.am -index 09b3d68..f545354 100644 ---- a/gst-libs/gst/fft/Makefile.am -+++ b/gst-libs/gst/fft/Makefile.am -@@ -65,7 +65,7 @@ GstFft-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstfft-@GST_API_VERSIO - --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ - --library=libgstfft-@GST_API_VERSION@.la \ +diff --git a/gst-libs/gst/gl/Makefile.am b/gst-libs/gst/gl/Makefile.am +index a3bbc94..16f829f 100644 +--- a/gst-libs/gst/gl/Makefile.am ++++ b/gst-libs/gst/gl/Makefile.am +@@ -192,7 +192,7 @@ GstGL-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstgl-@GST_API_VERSION@ --include=Gst-@GST_API_VERSION@ \ + --include=GstBase-@GST_API_VERSION@ \ + --include=GstVideo-@GST_API_VERSION@ \ - --libtool="$(top_builddir)/libtool" \ + --libtool="$(LIBTOOL)" \ --pkg gstreamer-@GST_API_VERSION@ \ - --pkg-export gstreamer-fft-@GST_API_VERSION@ \ - --output $@ \ + --pkg gstreamer-base-@GST_API_VERSION@ \ + --pkg gstreamer-video-@GST_API_VERSION@ \ diff --git a/gst-libs/gst/pbutils/Makefile.am b/gst-libs/gst/pbutils/Makefile.am -index 64d5eb0..91dc214 100644 +index ae51993..35a6e44 100644 --- a/gst-libs/gst/pbutils/Makefile.am +++ b/gst-libs/gst/pbutils/Makefile.am -@@ -99,7 +99,7 @@ GstPbutils-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstpbutils-@GST_AP +@@ -103,7 +103,7 @@ GstPbutils-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstpbutils-@GST_AP --include=GstTag-@GST_API_VERSION@ \ --include=GstVideo-@GST_API_VERSION@ \ --include=GstAudio-@GST_API_VERSION@ \ @@ -86,10 +88,10 @@ index 64d5eb0..91dc214 100644 --pkg gstreamer-tag-@GST_API_VERSION@ \ --pkg gstreamer-video-@GST_API_VERSION@ \ diff --git a/gst-libs/gst/riff/Makefile.am b/gst-libs/gst/riff/Makefile.am -index 83d83cb..3bd8fc0 100644 +index fb53f06..e66ef4f 100644 --- a/gst-libs/gst/riff/Makefile.am +++ b/gst-libs/gst/riff/Makefile.am -@@ -47,7 +47,7 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) +@@ -49,7 +49,7 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) # --include=GstAudio-@GST_API_VERSION@ \ # --include=GstTag-@GST_API_VERSION@ \ # --include=Gst-@GST_API_VERSION@ \ @@ -99,10 +101,10 @@ index 83d83cb..3bd8fc0 100644 # --pkg gstreamer-tag-@GST_API_VERSION@ \ # --pkg gstreamer-audio-@GST_API_VERSION@ \ diff --git a/gst-libs/gst/rtp/Makefile.am b/gst-libs/gst/rtp/Makefile.am -index fdd01c1..f5445c1 100644 +index a6f971d..77ebeeb 100644 --- a/gst-libs/gst/rtp/Makefile.am +++ b/gst-libs/gst/rtp/Makefile.am -@@ -65,7 +65,7 @@ GstRtp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtp-@GST_API_VERSIO +@@ -69,7 +69,7 @@ GstRtp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtp-@GST_API_VERSIO --library=libgstrtp-@GST_API_VERSION@.la \ --include=Gst-@GST_API_VERSION@ \ --include=GstBase-@GST_API_VERSION@ \ @@ -112,10 +114,10 @@ index fdd01c1..f5445c1 100644 --pkg gstreamer-base-@GST_API_VERSION@ \ --pkg-export gstreamer-rtp-@GST_API_VERSION@ \ diff --git a/gst-libs/gst/rtsp/Makefile.am b/gst-libs/gst/rtsp/Makefile.am -index ede5706..9b0b258 100644 +index ceb07f4..db9d0fd 100644 --- a/gst-libs/gst/rtsp/Makefile.am +++ b/gst-libs/gst/rtsp/Makefile.am -@@ -72,7 +72,7 @@ GstRtsp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERS +@@ -76,7 +76,7 @@ GstRtsp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERS --include=Gio-2.0 \ --include=Gst-@GST_API_VERSION@ \ --include=GstSdp-@GST_API_VERSION@ \ @@ -125,10 +127,10 @@ index ede5706..9b0b258 100644 --pkg gstreamer-@GST_API_VERSION@ \ --pkg gstreamer-sdp-@GST_API_VERSION@ \ diff --git a/gst-libs/gst/sdp/Makefile.am b/gst-libs/gst/sdp/Makefile.am -index a90f30b..0e149b8 100644 +index e197e9b..6e05cc7 100644 --- a/gst-libs/gst/sdp/Makefile.am +++ b/gst-libs/gst/sdp/Makefile.am -@@ -32,7 +32,7 @@ GstSdp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstsdp-@GST_API_VERSIO +@@ -34,7 +34,7 @@ GstSdp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstsdp-@GST_API_VERSIO --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ --library=libgstsdp-@GST_API_VERSION@.la \ --include=Gst-@GST_API_VERSION@ \ @@ -138,10 +140,10 @@ index a90f30b..0e149b8 100644 --pkg-export gstreamer-sdp-@GST_API_VERSION@ \ --output $@ \ diff --git a/gst-libs/gst/tag/Makefile.am b/gst-libs/gst/tag/Makefile.am -index c534a4d..cafafd3 100644 +index 0247c33..c86515b 100644 --- a/gst-libs/gst/tag/Makefile.am +++ b/gst-libs/gst/tag/Makefile.am -@@ -45,7 +45,7 @@ GstTag-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgsttag-@GST_API_VERSIO +@@ -66,7 +66,7 @@ GstTag-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgsttag-@GST_API_VERSIO --library=libgsttag-@GST_API_VERSION@.la \ --include=Gst-@GST_API_VERSION@ \ --include=GstBase-@GST_API_VERSION@ \ @@ -151,10 +153,10 @@ index c534a4d..cafafd3 100644 --pkg gstreamer-base-@GST_API_VERSION@ \ --pkg-export gstreamer-tag-@GST_API_VERSION@ \ diff --git a/gst-libs/gst/video/Makefile.am b/gst-libs/gst/video/Makefile.am -index 5d31fa1..ac64eb3 100644 +index 9fc1ccf..0f8455f 100644 --- a/gst-libs/gst/video/Makefile.am +++ b/gst-libs/gst/video/Makefile.am -@@ -116,7 +116,7 @@ GstVideo-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstvideo-@GST_API_VE +@@ -124,7 +124,7 @@ GstVideo-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstvideo-@GST_API_VE --library=libgstvideo-@GST_API_VERSION@.la \ --include=Gst-@GST_API_VERSION@ \ --include=GstBase-@GST_API_VERSION@ \ @@ -163,6 +165,3 @@ index 5d31fa1..ac64eb3 100644 --pkg gstreamer-@GST_API_VERSION@ \ --pkg gstreamer-base-@GST_API_VERSION@ \ --pkg-export gstreamer-video-@GST_API_VERSION@ \ --- -2.6.2 - 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 new file mode 100644 index 0000000000..51942a9ee4 --- /dev/null +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-gl-pick-up-GstVideo-1.0.gir-from-local-build-dir.patch @@ -0,0 +1,44 @@ +From 9261296858cb149767ceac44fd6bd13cc0de0d21 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.com> +Date: Tue, 27 Mar 2018 10:43:16 +0100 +Subject: [PATCH] gl: pick up GstVideo-1.0.gir from local build dir + +https://bugzilla.gnome.org/show_bug.cgi?id=794708 + +Upstream-Status: Backport [https://cgit.freedesktop.org/gstreamer/gst-plugins-base/commit/?h=1.14&id=9261296858cb149767ceac44fd6bd13cc0de0d21] + +Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> +--- + gst-libs/gst/gl/Makefile.am | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/gst-libs/gst/gl/Makefile.am b/gst-libs/gst/gl/Makefile.am +index a3bbc94b0..2df038545 100644 +--- a/gst-libs/gst/gl/Makefile.am ++++ b/gst-libs/gst/gl/Makefile.am +@@ -185,9 +185,10 @@ GstGL-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstgl-@GST_API_VERSION@ + -I$(top_builddir)/gst-libs \ + $(GST_PLUGINS_BASE_CFLAGS) \ + $(GL_CFLAGS) \ ++ --add-include-path="$(top_builddir)/gst-libs/gst/video/" \ + --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ + --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ +- --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-video-@GST_API_VERSION@` \ ++ --library-path="$(top_builddir)/gst-libs/gst/video/" \ + --library=libgstgl-@GST_API_VERSION@.la \ + --include=Gst-@GST_API_VERSION@ \ + --include=GstBase-@GST_API_VERSION@ \ +@@ -216,9 +217,9 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) + $(INTROSPECTION_COMPILER) \ + --includedir=$(srcdir) \ + --includedir=$(builddir) \ ++ --includedir="$(top_builddir)/gst-libs/gst/video/" \ + --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ + --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ +- --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-video-@GST_API_VERSION@` \ + $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) + + CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA) +-- +2.14.1 + diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-gstreamer-gl.pc.in-don-t-append-GL_CFLAGS-to-CFLAGS.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-gstreamer-gl.pc.in-don-t-append-GL_CFLAGS-to-CFLAGS.patch new file mode 100644 index 0000000000..251dc172cb --- /dev/null +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-gstreamer-gl.pc.in-don-t-append-GL_CFLAGS-to-CFLAGS.patch @@ -0,0 +1,29 @@ +From 61a672e79c8cb1aeeeda4c968997c577ac73a8f3 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Fri, 12 May 2017 16:47:12 +0300 +Subject: [PATCH] gstreamer-gl.pc.in: don't append GL_CFLAGS to CFLAGS + +Dependencies' include directories should not be added in this way; +it causes problems when cross-compiling in sysroot environments. + +Upstream-Status: Pending + +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +Signed-off-by: Maxin B. John <maxin.john@intel.com> +--- + pkgconfig/gstreamer-gl.pc.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pkgconfig/gstreamer-gl.pc.in b/pkgconfig/gstreamer-gl.pc.in +index dc672a9..8c290ba 100644 +--- a/pkgconfig/gstreamer-gl.pc.in ++++ b/pkgconfig/gstreamer-gl.pc.in +@@ -13,4 +13,4 @@ Version: @VERSION@ + Requires: gstreamer-video-@GST_API_VERSION@ gstreamer-base-@GST_API_VERSION@ gstreamer-@GST_API_VERSION@ + + Libs: -L${libdir} -lgstgl-@GST_API_VERSION@ +-Cflags: -I${includedir} -I${libdir}/gstreamer-@GST_API_VERSION@/include @GL_CFLAGS@ ++Cflags: -I${includedir} -I${libdir}/gstreamer-@GST_API_VERSION@/include +-- +2.7.4 + 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 6616e2cf0d..dc15d93eb0 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,16 +1,17 @@ -From 990b653c7b6de1937ec759019982d6c5f15770f7 Mon Sep 17 00:00:00 2001 +From f523721e453febfb3f62f3ba1e9fefb31dcec471 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Mon, 26 Oct 2015 16:38:18 +0200 -Subject: [PATCH 2/4] Makefile.am: prefix calls to pkg-config with +Date: Thu, 5 Apr 2018 10:26:25 +0800 +Subject: [PATCH] Makefile.am: prefix calls to pkg-config with PKG_CONFIG_SYSROOT_DIR Upstream-Status: Pending [review on oe-core maillist] Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> + --- gst-libs/gst/allocators/Makefile.am | 4 ++-- gst-libs/gst/app/Makefile.am | 4 ++-- gst-libs/gst/audio/Makefile.am | 12 ++++++------ - gst-libs/gst/fft/Makefile.am | 4 ++-- gst-libs/gst/pbutils/Makefile.am | 12 ++++++------ gst-libs/gst/riff/Makefile.am | 8 ++++---- gst-libs/gst/rtp/Makefile.am | 8 ++++---- @@ -18,13 +19,13 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> gst-libs/gst/sdp/Makefile.am | 4 ++-- gst-libs/gst/tag/Makefile.am | 8 ++++---- gst-libs/gst/video/Makefile.am | 8 ++++---- - 11 files changed, 38 insertions(+), 38 deletions(-) + 10 files changed, 36 insertions(+), 36 deletions(-) -Index: gst-plugins-base-1.12.3/gst-libs/gst/allocators/Makefile.am -=================================================================== ---- gst-plugins-base-1.12.3.orig/gst-libs/gst/allocators/Makefile.am -+++ gst-plugins-base-1.12.3/gst-libs/gst/allocators/Makefile.am -@@ -36,7 +36,7 @@ GstAllocators-@GST_API_VERSION@.gir: $(I +diff --git a/gst-libs/gst/allocators/Makefile.am b/gst-libs/gst/allocators/Makefile.am +index 1ecc950..d6417ac 100644 +--- a/gst-libs/gst/allocators/Makefile.am ++++ b/gst-libs/gst/allocators/Makefile.am +@@ -39,7 +39,7 @@ GstAllocators-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstallocators-@ --c-include "gst/allocators/allocators.h" \ -I$(top_srcdir)/gst-libs \ -I$(top_builddir)/gst-libs \ @@ -33,7 +34,7 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/allocators/Makefile.am --library=libgstallocators-@GST_API_VERSION@.la \ --include=Gst-@GST_API_VERSION@ \ --libtool="$(LIBTOOL)" \ -@@ -60,7 +60,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= +@@ -63,7 +63,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) $(INTROSPECTION_COMPILER) \ --includedir=$(srcdir) \ --includedir=$(builddir) \ @@ -42,11 +43,11 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/allocators/Makefile.am $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA) -Index: gst-plugins-base-1.12.3/gst-libs/gst/app/Makefile.am -=================================================================== ---- gst-plugins-base-1.12.3.orig/gst-libs/gst/app/Makefile.am -+++ gst-plugins-base-1.12.3/gst-libs/gst/app/Makefile.am -@@ -48,8 +48,8 @@ GstApp-@GST_API_VERSION@.gir: $(INTROSPE +diff --git a/gst-libs/gst/app/Makefile.am b/gst-libs/gst/app/Makefile.am +index 5bfd606..6441674 100644 +--- a/gst-libs/gst/app/Makefile.am ++++ b/gst-libs/gst/app/Makefile.am +@@ -51,8 +51,8 @@ GstApp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstapp-@GST_API_VERSIO --c-include "gst/app/app.h" \ -I$(top_srcdir)/gst-libs \ -I$(top_builddir)/gst-libs \ @@ -57,11 +58,11 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/app/Makefile.am --library=libgstapp-@GST_API_VERSION@.la \ --include=Gst-@GST_API_VERSION@ \ --include=GstBase-@GST_API_VERSION@ \ -Index: gst-plugins-base-1.12.3/gst-libs/gst/audio/Makefile.am -=================================================================== ---- gst-plugins-base-1.12.3.orig/gst-libs/gst/audio/Makefile.am -+++ gst-plugins-base-1.12.3/gst-libs/gst/audio/Makefile.am -@@ -167,12 +167,12 @@ GstAudio-@GST_API_VERSION@.gir: $(INTROS +diff --git a/gst-libs/gst/audio/Makefile.am b/gst-libs/gst/audio/Makefile.am +index 7fb65f2..5379f79 100644 +--- a/gst-libs/gst/audio/Makefile.am ++++ b/gst-libs/gst/audio/Makefile.am +@@ -174,12 +174,12 @@ GstAudio-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstaudio-@GST_API_VE -I$(top_srcdir)/gst-libs \ -I$(top_builddir)/gst-libs \ --c-include "gst/audio/audio.h" \ @@ -78,7 +79,7 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/audio/Makefile.am --library-path="$(top_builddir)/gst-libs/gst/tag/" \ --include=Gst-@GST_API_VERSION@ \ --include=GstBase-@GST_API_VERSION@ \ -@@ -201,8 +201,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= +@@ -208,8 +208,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) --includedir=$(srcdir) \ --includedir=$(builddir) \ --includedir="$(top_builddir)/gst-libs/gst/tag/" \ @@ -89,33 +90,11 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/audio/Makefile.am $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) -Index: gst-plugins-base-1.12.3/gst-libs/gst/fft/Makefile.am -=================================================================== ---- gst-plugins-base-1.12.3.orig/gst-libs/gst/fft/Makefile.am -+++ gst-plugins-base-1.12.3/gst-libs/gst/fft/Makefile.am -@@ -63,7 +63,7 @@ GstFft-@GST_API_VERSION@.gir: $(INTROSPE - --c-include "gst/fft/fft.h" \ - -I$(top_srcdir)/gst-libs \ - -I$(top_builddir)/gst-libs \ -- --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ -+ --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ - --library=libgstfft-@GST_API_VERSION@.la \ - --include=Gst-@GST_API_VERSION@ \ - --libtool="$(LIBTOOL)" \ -@@ -87,7 +87,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= - $(INTROSPECTION_COMPILER) \ - --includedir=$(srcdir) \ - --includedir=$(builddir) \ -- --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ -+ --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ - $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) - - CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA) -Index: gst-plugins-base-1.12.3/gst-libs/gst/pbutils/Makefile.am -=================================================================== ---- gst-plugins-base-1.12.3.orig/gst-libs/gst/pbutils/Makefile.am -+++ gst-plugins-base-1.12.3/gst-libs/gst/pbutils/Makefile.am -@@ -85,14 +85,14 @@ GstPbutils-@GST_API_VERSION@.gir: $(INTR +diff --git a/gst-libs/gst/pbutils/Makefile.am b/gst-libs/gst/pbutils/Makefile.am +index 35a6e44..49d6894 100644 +--- a/gst-libs/gst/pbutils/Makefile.am ++++ b/gst-libs/gst/pbutils/Makefile.am +@@ -88,14 +88,14 @@ GstPbutils-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstpbutils-@GST_AP --c-include "gst/pbutils/pbutils.h" \ -I$(top_srcdir)/gst-libs \ -I$(top_builddir)/gst-libs \ @@ -134,7 +113,7 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/pbutils/Makefile.am --library-path="$(top_builddir)/gst-libs/gst/tag/" \ --library-path="$(top_builddir)/gst-libs/gst/video/" \ --library-path="$(top_builddir)/gst-libs/gst/audio/" \ -@@ -125,8 +125,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= +@@ -128,8 +128,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) $(INTROSPECTION_COMPILER) \ --includedir=$(srcdir) \ --includedir=$(builddir) \ @@ -145,11 +124,11 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/pbutils/Makefile.am --includedir="$(top_builddir)/gst-libs/gst/tag/" \ --includedir="$(top_builddir)/gst-libs/gst/video/" \ --includedir="$(top_builddir)/gst-libs/gst/audio/" \ -Index: gst-plugins-base-1.12.3/gst-libs/gst/riff/Makefile.am -=================================================================== ---- gst-plugins-base-1.12.3.orig/gst-libs/gst/riff/Makefile.am -+++ gst-plugins-base-1.12.3/gst-libs/gst/riff/Makefile.am -@@ -42,8 +42,8 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS +diff --git a/gst-libs/gst/riff/Makefile.am b/gst-libs/gst/riff/Makefile.am +index e66ef4f..c8c588a 100644 +--- a/gst-libs/gst/riff/Makefile.am ++++ b/gst-libs/gst/riff/Makefile.am +@@ -43,8 +43,8 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) # --c-include "gst/riff/riff.h" \ # --add-include-path=$(builddir)/../tag \ # --add-include-path=$(builddir)/../audio \ @@ -160,7 +139,7 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/riff/Makefile.am # --library=libgstriff-@GST_API_VERSION@.la \ # --include=GstAudio-@GST_API_VERSION@ \ # --include=GstTag-@GST_API_VERSION@ \ -@@ -74,8 +74,8 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS +@@ -75,8 +75,8 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) # --includedir=$(builddir) \ # --includedir=$(builddir)/../tag \ # --includedir=$(builddir)/../audio \ @@ -171,11 +150,11 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/riff/Makefile.am # $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) # #CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA) -Index: gst-plugins-base-1.12.3/gst-libs/gst/rtp/Makefile.am -=================================================================== ---- gst-plugins-base-1.12.3.orig/gst-libs/gst/rtp/Makefile.am -+++ gst-plugins-base-1.12.3/gst-libs/gst/rtp/Makefile.am -@@ -61,8 +61,8 @@ GstRtp-@GST_API_VERSION@.gir: $(INTROSPE +diff --git a/gst-libs/gst/rtp/Makefile.am b/gst-libs/gst/rtp/Makefile.am +index 77ebeeb..9aee788 100644 +--- a/gst-libs/gst/rtp/Makefile.am ++++ b/gst-libs/gst/rtp/Makefile.am +@@ -64,8 +64,8 @@ GstRtp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtp-@GST_API_VERSIO --c-include "gst/rtp/rtp.h" \ -I$(top_builddir)/gst-libs \ -I$(top_srcdir)/gst-libs \ @@ -186,7 +165,7 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/rtp/Makefile.am --library=libgstrtp-@GST_API_VERSION@.la \ --include=Gst-@GST_API_VERSION@ \ --include=GstBase-@GST_API_VERSION@ \ -@@ -89,8 +89,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= +@@ -92,8 +92,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) $(INTROSPECTION_COMPILER) \ --includedir=$(srcdir) \ --includedir=$(builddir) \ @@ -197,11 +176,11 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/rtp/Makefile.am $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) -Index: gst-plugins-base-1.12.3/gst-libs/gst/rtsp/Makefile.am -=================================================================== ---- gst-plugins-base-1.12.3.orig/gst-libs/gst/rtsp/Makefile.am -+++ gst-plugins-base-1.12.3/gst-libs/gst/rtsp/Makefile.am -@@ -68,7 +68,7 @@ GstRtsp-@GST_API_VERSION@.gir: $(INTROSP +diff --git a/gst-libs/gst/rtsp/Makefile.am b/gst-libs/gst/rtsp/Makefile.am +index db9d0fd..79027cb 100644 +--- a/gst-libs/gst/rtsp/Makefile.am ++++ b/gst-libs/gst/rtsp/Makefile.am +@@ -71,7 +71,7 @@ GstRtsp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERS -I$(top_builddir)/gst-libs \ -I$(top_srcdir)/gst-libs \ --add-include-path=$(builddir)/../sdp \ @@ -210,7 +189,7 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/rtsp/Makefile.am --library=libgstrtsp-@GST_API_VERSION@.la \ --include=Gio-2.0 \ --include=Gst-@GST_API_VERSION@ \ -@@ -98,7 +98,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= +@@ -101,7 +101,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) --includedir=$(srcdir) \ --includedir=$(builddir) \ --includedir=$(builddir)/../sdp \ @@ -219,11 +198,11 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/rtsp/Makefile.am $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) -Index: gst-plugins-base-1.12.3/gst-libs/gst/sdp/Makefile.am -=================================================================== ---- gst-plugins-base-1.12.3.orig/gst-libs/gst/sdp/Makefile.am -+++ gst-plugins-base-1.12.3/gst-libs/gst/sdp/Makefile.am -@@ -30,7 +30,7 @@ GstSdp-@GST_API_VERSION@.gir: $(INTROSPE +diff --git a/gst-libs/gst/sdp/Makefile.am b/gst-libs/gst/sdp/Makefile.am +index 6e05cc7..c7cf514 100644 +--- a/gst-libs/gst/sdp/Makefile.am ++++ b/gst-libs/gst/sdp/Makefile.am +@@ -31,7 +31,7 @@ GstSdp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstsdp-@GST_API_VERSIO --warn-all \ --c-include "gst/sdp/sdp.h" \ -I$(top_srcdir)/gst-libs \ @@ -232,7 +211,7 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/sdp/Makefile.am --library=libgstsdp-@GST_API_VERSION@.la \ --include=Gst-@GST_API_VERSION@ \ --libtool="$(LIBTOOL)" \ -@@ -54,7 +54,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= +@@ -55,7 +55,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) $(INTROSPECTION_COMPILER) \ --includedir=$(srcdir) \ --includedir=$(builddir) \ @@ -241,11 +220,11 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/sdp/Makefile.am $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA) -Index: gst-plugins-base-1.12.3/gst-libs/gst/tag/Makefile.am -=================================================================== ---- gst-plugins-base-1.12.3.orig/gst-libs/gst/tag/Makefile.am -+++ gst-plugins-base-1.12.3/gst-libs/gst/tag/Makefile.am -@@ -59,8 +59,8 @@ GstTag-@GST_API_VERSION@.gir: $(INTROSPE +diff --git a/gst-libs/gst/tag/Makefile.am b/gst-libs/gst/tag/Makefile.am +index c86515b..363e6d2 100644 +--- a/gst-libs/gst/tag/Makefile.am ++++ b/gst-libs/gst/tag/Makefile.am +@@ -61,8 +61,8 @@ GstTag-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgsttag-@GST_API_VERSIO --c-include "gst/tag/tag.h" \ -I$(top_srcdir)/gst-libs \ -I$(top_builddir)/gst-libs \ @@ -256,7 +235,7 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/tag/Makefile.am --library=libgsttag-@GST_API_VERSION@.la \ --include=Gst-@GST_API_VERSION@ \ --include=GstBase-@GST_API_VERSION@ \ -@@ -87,8 +87,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= +@@ -89,8 +89,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) $(INTROSPECTION_COMPILER) \ --includedir=$(srcdir) \ --includedir=$(builddir) \ @@ -267,11 +246,11 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/tag/Makefile.am $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) -Index: gst-plugins-base-1.12.3/gst-libs/gst/video/Makefile.am -=================================================================== ---- gst-plugins-base-1.12.3.orig/gst-libs/gst/video/Makefile.am -+++ gst-plugins-base-1.12.3/gst-libs/gst/video/Makefile.am -@@ -116,8 +116,8 @@ GstVideo-@GST_API_VERSION@.gir: $(INTROS +diff --git a/gst-libs/gst/video/Makefile.am b/gst-libs/gst/video/Makefile.am +index 0f8455f..8c9955c 100644 +--- a/gst-libs/gst/video/Makefile.am ++++ b/gst-libs/gst/video/Makefile.am +@@ -119,8 +119,8 @@ GstVideo-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstvideo-@GST_API_VE --c-include "gst/video/video.h" \ -I$(top_srcdir)/gst-libs \ -I$(top_builddir)/gst-libs \ @@ -282,7 +261,7 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/video/Makefile.am --library=libgstvideo-@GST_API_VERSION@.la \ --include=Gst-@GST_API_VERSION@ \ --include=GstBase-@GST_API_VERSION@ \ -@@ -144,8 +144,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= +@@ -147,8 +147,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) $(INTROSPECTION_COMPILER) \ --includedir=$(srcdir) \ --includedir=$(builddir) \ diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-riff-add-missing-include-directories-when-calling-in.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-riff-add-missing-include-directories-when-calling-in.patch index 9b66f7f49d..98ffdb1c10 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-riff-add-missing-include-directories-when-calling-in.patch +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-riff-add-missing-include-directories-when-calling-in.patch @@ -1,20 +1,21 @@ -From 3c2c2d5dd08aa30ed0e8acd8566ec99412bb8209 Mon Sep 17 00:00:00 2001 +From b9765efb1696e3e2e79f2955f759be199fe34882 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Mon, 26 Oct 2015 17:29:37 +0200 -Subject: [PATCH 3/4] riff: add missing include directories when calling +Subject: [PATCH] riff: add missing include directories when calling introspection scanner Upstream-Status: Pending [review on oe-core maillist] Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> + --- gst-libs/gst/riff/Makefile.am | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gst-libs/gst/riff/Makefile.am b/gst-libs/gst/riff/Makefile.am -index 0a115cc..5057a58 100644 +index c8c588a..c096453 100644 --- a/gst-libs/gst/riff/Makefile.am +++ b/gst-libs/gst/riff/Makefile.am -@@ -39,6 +39,8 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) +@@ -41,6 +41,8 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) # --strip-prefix=Gst \ # --warn-all \ # --c-include "gst/riff/riff.h" \ @@ -23,6 +24,3 @@ index 0a115cc..5057a58 100644 # --add-include-path=$(builddir)/../tag \ # --add-include-path=$(builddir)/../audio \ # --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ --- -2.6.2 - diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-ssaparse-enhance-SSA-text-lines-parsing.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-ssaparse-enhance-SSA-text-lines-parsing.patch index 9fbebd5700..9e95524057 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-ssaparse-enhance-SSA-text-lines-parsing.patch +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-ssaparse-enhance-SSA-text-lines-parsing.patch @@ -1,7 +1,7 @@ -From be6163cfa3a255493f9d75bad9541cbfe1723fee Mon Sep 17 00:00:00 2001 +From 918c96b24d10f61b7455b4cef3bab490849d0d77 Mon Sep 17 00:00:00 2001 From: Mingke Wang <mingke.wang@freescale.com> Date: Thu, 19 Mar 2015 14:17:10 +0800 -Subject: [PATCH 3/4] ssaparse: enhance SSA text lines parsing. +Subject: [PATCH] ssaparse: enhance SSA text lines parsing. some parser will pass in the original ssa text line which starts with "Dialog:" and there's are maybe multiple Dialog lines in one input buffer. @@ -10,13 +10,18 @@ Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=747496] Signed-off-by: Mingke Wang <mingke.wang@freescale.com> +--- + gst/subparse/gstssaparse.c | 150 ++++++++++++++++++++++++++++++++++++++++----- + 1 file changed, 134 insertions(+), 16 deletions(-) + mode change 100644 => 100755 gst/subparse/gstssaparse.c + diff --git a/gst/subparse/gstssaparse.c b/gst/subparse/gstssaparse.c old mode 100644 new mode 100755 -index 06ecef9..0ab5dce +index c849c08..4b9636c --- a/gst/subparse/gstssaparse.c +++ b/gst/subparse/gstssaparse.c -@@ -260,6 +260,7 @@ gst_ssa_parse_remove_override_codes (GstSsaParse * parse, gchar * txt) +@@ -262,6 +262,7 @@ gst_ssa_parse_remove_override_codes (GstSsaParse * parse, gchar * txt) * gst_ssa_parse_push_line: * @parse: caller element * @txt: text to push @@ -24,7 +29,7 @@ index 06ecef9..0ab5dce * @start: timestamp for the buffer * @duration: duration for the buffer * -@@ -269,27 +270,133 @@ gst_ssa_parse_remove_override_codes (GstSsaParse * parse, gchar * txt) +@@ -271,27 +272,133 @@ gst_ssa_parse_remove_override_codes (GstSsaParse * parse, gchar * txt) * Returns: result of the push of the created buffer */ static GstFlowReturn @@ -169,7 +174,7 @@ index 06ecef9..0ab5dce GST_LOG_OBJECT (parse, "Text : %s", t); if (gst_ssa_parse_remove_override_codes (parse, t)) { -@@ -307,13 +414,22 @@ gst_ssa_parse_push_line (GstSsaParse * parse, gchar * txt, +@@ -309,13 +416,22 @@ gst_ssa_parse_push_line (GstSsaParse * parse, gchar * txt, gst_buffer_fill (buf, 0, escaped, len + 1); gst_buffer_set_size (buf, len); g_free (escaped); @@ -196,7 +201,7 @@ index 06ecef9..0ab5dce ret = gst_pad_push (parse->srcpad, buf); -@@ -333,6 +449,7 @@ gst_ssa_parse_chain (GstPad * sinkpad, GstObject * parent, GstBuffer * buf) +@@ -335,6 +451,7 @@ gst_ssa_parse_chain (GstPad * sinkpad, GstObject * parent, GstBuffer * buf) GstClockTime ts; gchar *txt; GstMapInfo map; @@ -204,7 +209,7 @@ index 06ecef9..0ab5dce if (G_UNLIKELY (!parse->framed)) goto not_framed; -@@ -350,13 +467,14 @@ gst_ssa_parse_chain (GstPad * sinkpad, GstObject * parent, GstBuffer * buf) +@@ -352,13 +469,14 @@ gst_ssa_parse_chain (GstPad * sinkpad, GstObject * parent, GstBuffer * buf) /* make double-sure it's 0-terminated and all */ gst_buffer_map (buf, &map, GST_MAP_READ); txt = g_strndup ((gchar *) map.data, map.size); @@ -220,6 +225,3 @@ index 06ecef9..0ab5dce if (ret != GST_FLOW_OK && GST_CLOCK_TIME_IS_VALID (ts)) { GstSegment segment; --- -1.7.9.5 - diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0004-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0004-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch index 4adf605460..aaeb611fec 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0004-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0004-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch @@ -1,20 +1,21 @@ -From 4330915d88dc4dd46eb4c28d756482b767c2747f Mon Sep 17 00:00:00 2001 +From 53b5868491cf99ee797192395dbfeb69df23edd2 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Mon, 26 Oct 2015 17:30:14 +0200 -Subject: [PATCH 4/4] rtsp: drop incorrect reference to gstreamer-sdp in +Subject: [PATCH] rtsp: drop incorrect reference to gstreamer-sdp in Makefile.am Upstream-Status: Pending [review on oe-core maillist] Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> + --- gst-libs/gst/rtsp/Makefile.am | 1 - 1 file changed, 1 deletion(-) diff --git a/gst-libs/gst/rtsp/Makefile.am b/gst-libs/gst/rtsp/Makefile.am -index 4f6d9f8..0afa370 100644 +index 79027cb..2987e23 100644 --- a/gst-libs/gst/rtsp/Makefile.am +++ b/gst-libs/gst/rtsp/Makefile.am -@@ -75,7 +75,6 @@ GstRtsp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERS +@@ -79,7 +79,6 @@ GstRtsp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERS --libtool="$(LIBTOOL)" \ --pkg gio-2.0 \ --pkg gstreamer-@GST_API_VERSION@ \ @@ -22,6 +23,3 @@ index 4f6d9f8..0afa370 100644 --pkg-export gstreamer-rtsp-@GST_API_VERSION@ \ --add-init-section="$(INTROSPECTION_INIT)" \ --output $@ \ --- -2.6.2 - diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0004-subparse-set-need_segment-after-sink-pad-received-GS.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0004-subparse-set-need_segment-after-sink-pad-received-GS.patch deleted file mode 100644 index b924e38824..0000000000 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0004-subparse-set-need_segment-after-sink-pad-received-GS.patch +++ /dev/null @@ -1,69 +0,0 @@ -From ed09c8fd2c9c2b5384b72cc70af3728be6694e64 Mon Sep 17 00:00:00 2001 -From: Mingke Wang <mingke.wang@freescale.com> -Date: Thu, 19 Mar 2015 14:20:26 +0800 -Subject: [PATCH 4/4] subparse: set need_segment after sink pad received - GST_EVENT_SEGMENT - -subparse works in push mode, chain funciton will be called once -up stream element finished the seeking and flushing. -if set need_segment flag in src pad event handler, the segment -event will be pushed earlier, result in the subtitle text will -be send out to down stream from the beginning. - -Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=747498] - -Signed-off-by: Mingke Wang <mingke.wang@freescale.com> - -diff --git a/gst/subparse/gstsubparse.c b/gst/subparse/gstsubparse.c -old mode 100644 -new mode 100755 -index b565e93..7741ccc ---- a/gst/subparse/gstsubparse.c -+++ b/gst/subparse/gstsubparse.c -@@ -266,22 +266,20 @@ gst_sub_parse_src_event (GstPad * pad, GstObject * parent, GstEvent * event) - goto beach; - } - -+ /* Apply the seek to our segment */ -+ gst_segment_do_seek (&self->segment, rate, format, flags, -+ start_type, start, stop_type, stop, &update); -+ -+ GST_DEBUG_OBJECT (self, "segment after seek: %" GST_SEGMENT_FORMAT, -+ &self->segment); -+ - /* Convert that seek to a seeking in bytes at position 0, - FIXME: could use an index */ - ret = gst_pad_push_event (self->sinkpad, - gst_event_new_seek (rate, GST_FORMAT_BYTES, flags, - GST_SEEK_TYPE_SET, 0, GST_SEEK_TYPE_NONE, 0)); - -- if (ret) { -- /* Apply the seek to our segment */ -- gst_segment_do_seek (&self->segment, rate, format, flags, -- start_type, start, stop_type, stop, &update); -- -- GST_DEBUG_OBJECT (self, "segment after seek: %" GST_SEGMENT_FORMAT, -- &self->segment); -- -- self->need_segment = TRUE; -- } else { -+ if (!ret) { - GST_WARNING_OBJECT (self, "seek to 0 bytes failed"); - } - -@@ -1641,8 +1639,10 @@ gst_sub_parse_sink_event (GstPad * pad, GstObject * parent, GstEvent * event) - gst_event_parse_segment (event, &s); - if (s->format == GST_FORMAT_TIME) - gst_event_copy_segment (event, &self->segment); -- GST_DEBUG_OBJECT (self, "newsegment (%s)", -- gst_format_get_name (self->segment.format)); -+ GST_DEBUG_OBJECT (self, "newsegment (%s) %" GST_SEGMENT_FORMAT, -+ gst_format_get_name (self->segment.format), &self->segment); -+ -+ self->need_segment = TRUE; - - /* if not time format, we'll either start with a 0 timestamp anyway or - * it's following a seek in which case we'll have saved the requested --- -1.7.9.5 - diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0009-glimagesink-Downrank-to-marginal.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0009-glimagesink-Downrank-to-marginal.patch new file mode 100644 index 0000000000..c81fb0f6aa --- /dev/null +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0009-glimagesink-Downrank-to-marginal.patch @@ -0,0 +1,32 @@ +From c6b37a80806f9128de47f1ccc3f2354f8d436bb6 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Thu, 24 Sep 2015 19:47:32 +0300 +Subject: [PATCH] glimagesink: Downrank to marginal + +On desktop, where there is good OpenGL, xvimagesink will come up first, +on other platforms, OpenGL can't be trusted because it's either software (like +in a VM) or broken (like on embedded)., so let ximagesink come above. + +Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=751684] + +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + ext/gl/gstopengl.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ext/gl/gstopengl.c b/ext/gl/gstopengl.c +index a4b2540..0ccaacd 100644 +--- a/ext/gl/gstopengl.c ++++ b/ext/gl/gstopengl.c +@@ -118,7 +118,7 @@ plugin_init (GstPlugin * plugin) + #endif + + if (!gst_element_register (plugin, "glimagesink", +- GST_RANK_SECONDARY, gst_gl_image_sink_bin_get_type ())) { ++ GST_RANK_MARGINAL, gst_gl_image_sink_bin_get_type ())) { + return FALSE; + } + +-- +2.1.4 + diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/get-caps-from-src-pad-when-query-caps.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/get-caps-from-src-pad-when-query-caps.patch index c8e6287a55..a4727e23ea 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/get-caps-from-src-pad-when-query-caps.patch +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/get-caps-from-src-pad-when-query-caps.patch @@ -1,4 +1,4 @@ -From af0dac26f62aaceb4bf266720911953793e0fc5d Mon Sep 17 00:00:00 2001 +From 41de2ec64ab06bb58c82c1659adaa3811bc5bcf8 Mon Sep 17 00:00:00 2001 From: zhouming <b42586@freescale.com> Date: Wed, 14 May 2014 10:16:20 +0800 Subject: [PATCH] ENGR00312515: get caps from src pad when query caps @@ -8,18 +8,19 @@ https://bugzilla.gnome.org/show_bug.cgi?id=728312 Upstream-Status: Pending Signed-off-by: zhouming <b42586@freescale.com> + --- - gst-libs/gst/tag/gsttagdemux.c | 13 +++++++++++++ + gst-libs/gst/tag/gsttagdemux.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) mode change 100644 => 100755 gst-libs/gst/tag/gsttagdemux.c diff --git a/gst-libs/gst/tag/gsttagdemux.c b/gst-libs/gst/tag/gsttagdemux.c old mode 100644 new mode 100755 -index 9b6c478..ae2294a +index 8a127c8..71c5d78 --- a/gst-libs/gst/tag/gsttagdemux.c +++ b/gst-libs/gst/tag/gsttagdemux.c -@@ -1769,6 +1769,19 @@ gst_tag_demux_pad_query (GstPad * pad, GstObject * parent, GstQuery * query) +@@ -1759,6 +1759,19 @@ gst_tag_demux_pad_query (GstPad * pad, GstObject * parent, GstQuery * query) } break; } @@ -39,6 +40,3 @@ index 9b6c478..ae2294a default: res = gst_pad_query_default (pad, parent, query); break; --- -1.7.9.5 - diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/link-with-libvchostif.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/link-with-libvchostif.patch new file mode 100644 index 0000000000..d5a7f6bdc2 --- /dev/null +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/link-with-libvchostif.patch @@ -0,0 +1,45 @@ +From 9866f51e5e0913f1e453eb574618bf7432f38cb6 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 11 Apr 2018 10:46:33 +0800 +Subject: [PATCH] Add -lvchostif to link when using -lEGL on rpi + +This is required because libEGL from userland uses sybols +from this library. + +lib/libEGL.so.1.0.0 121: 00000000 0 FUNC GLOBAL DEFAULT UND vc_dispmanx_element_add + 1552: 00000000 0 FUNC GLOBAL DEFAULT UND vc_dispmanx_element_add + +These symbols are provided by libvchostif as seen below + +lib/libvchostif.so + 252: 0000b161 192 FUNC GLOBAL DEFAULT 9 vc_dispmanx_element_add + 809: 0000b161 192 FUNC GLOBAL DEFAULT 9 vc_dispmanx_element_add + +With this explicit link, plugins fail during runtime + +(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 +(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 + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> +--- + m4/gst-gl.m4 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/m4/gst-gl.m4 b/m4/gst-gl.m4 +index 1e97240..ab7774c 100644 +--- a/m4/gst-gl.m4 ++++ b/m4/gst-gl.m4 +@@ -231,7 +231,7 @@ case $host in + HAVE_EGL=yes + HAVE_GLES2=yes + HAVE_EGL_RPI=yes +- EGL_LIBS="-lbcm_host -lvcos -lvchiq_arm" ++ EGL_LIBS="-lbcm_host -lvchostif -lvcos -lvchiq_arm" + EGL_CFLAGS="" + AC_DEFINE(USE_EGL_RPI, [1], [Use RPi platform]) + ]) +-- +2.7.4 + diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/make-gio_unix_2_0-dependency-configurable.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/make-gio_unix_2_0-dependency-configurable.patch index 413eff0695..23950b67f2 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/make-gio_unix_2_0-dependency-configurable.patch +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/make-gio_unix_2_0-dependency-configurable.patch @@ -1,4 +1,4 @@ -From 10d2a977ee1d469f0bf9059bb2d0b55fd2eecbac Mon Sep 17 00:00:00 2001 +From 7ffa6e3d00e1d8a060f3f4c2bb9a72691af05d79 Mon Sep 17 00:00:00 2001 From: Andre McCurdy <armccurdy@gmail.com> Date: Wed, 20 Jan 2016 13:00:00 -0800 Subject: [PATCH] make gio_unix_2_0 dependency configurable @@ -17,16 +17,17 @@ instead of AG_GST_CHECK_FEATURE. Upstream-Status: Pending Signed-off-by: Andre McCurdy <armccurdy@gmail.com> + --- configure.ac | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/configure.ac b/configure.ac -index 9c52aeb..26cacd6 100644 +index 12807bc..35a0bf3 100644 --- a/configure.ac +++ b/configure.ac -@@ -752,9 +752,16 @@ AC_SUBST(FT2_CFLAGS) - fi dnl of EXT plugins +@@ -806,9 +806,16 @@ AM_CONDITIONAL(HAVE_PNG, test "x$HAVE_PNG" = "xyes") + AM_CONDITIONAL(HAVE_JPEG, test "x$HAVE_JPEG" = "xyes") dnl *** gio-unix-2.0 for tests/check/pipelines/tcp.c *** +AC_ARG_ENABLE([gio_unix_2_0], @@ -42,6 +43,3 @@ index 9c52aeb..26cacd6 100644 AM_CONDITIONAL(USE_GIO_UNIX_2_0, test "x$HAVE_GIO_UNIX_2_0" = "xyes") dnl *** finalize CFLAGS, LDFLAGS, LIBS --- -1.9.1 - diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.12.4.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.12.4.bb deleted file mode 100644 index dd895bbcb1..0000000000 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.12.4.bb +++ /dev/null @@ -1,18 +0,0 @@ -require gstreamer1.0-plugins-base.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=c54ce9345727175ff66d17b67ff51f58 \ - file://COPYING.LIB;md5=6762ed442b3822387a51c92d928ead0d \ - file://common/coverage/coverage-report.pl;beginline=2;endline=17;md5=a4e1830fce078028c8f0974161272607" - -SRC_URI = " \ - http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-${PV}.tar.xz \ - file://get-caps-from-src-pad-when-query-caps.patch \ - file://0003-ssaparse-enhance-SSA-text-lines-parsing.patch \ - file://0004-subparse-set-need_segment-after-sink-pad-received-GS.patch \ - file://make-gio_unix_2_0-dependency-configurable.patch \ - file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \ -" -SRC_URI[md5sum] = "b35b04071f69b8ab69a7f3a497ff0131" -SRC_URI[sha256sum] = "4c306b03df0212f1b8903784e29bb3493319ba19ebebf13b0c56a17870292282" - -S = "${WORKDIR}/gst-plugins-base-${PV}" 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.0.bb new file mode 100644 index 0000000000..224faa2cf8 --- /dev/null +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.14.0.bb @@ -0,0 +1,71 @@ +require gstreamer1.0-plugins.inc + +LICENSE = "GPLv2+ & LGPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=c54ce9345727175ff66d17b67ff51f58 \ + file://COPYING.LIB;md5=6762ed442b3822387a51c92d928ead0d \ + file://common/coverage/coverage-report.pl;beginline=2;endline=17;md5=a4e1830fce078028c8f0974161272607" + +SRC_URI = " \ + http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-${PV}.tar.xz \ + file://get-caps-from-src-pad-when-query-caps.patch \ + file://0003-ssaparse-enhance-SSA-text-lines-parsing.patch \ + file://make-gio_unix_2_0-dependency-configurable.patch \ + file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \ + file://0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch \ + file://0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch \ + file://0003-riff-add-missing-include-directories-when-calling-in.patch \ + file://0004-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch \ + file://0009-glimagesink-Downrank-to-marginal.patch \ + file://0001-gstreamer-gl.pc.in-don-t-append-GL_CFLAGS-to-CFLAGS.patch \ + file://link-with-libvchostif.patch \ + file://0001-gl-pick-up-GstVideo-1.0.gir-from-local-build-dir.patch \ + " +SRC_URI[md5sum] = "370271327dd23110421a9c2927ac989a" +SRC_URI[sha256sum] = "7e904660ff56e02b036cf7fdfb77a50a540828ca9d2614d69ba931772e5b6940" + +S = "${WORKDIR}/gst-plugins-base-${PV}" + +DEPENDS += "iso-codes util-linux" + +inherit gettext + +PACKAGES_DYNAMIC =+ "^libgst.*" + +PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gles2 egl', '', d)}" +PACKAGECONFIG ??= " \ + ${GSTREAMER_ORC} \ + ${@bb.utils.filter('DISTRO_FEATURES', 'alsa x11', d)} \ + gio-unix-2.0 ogg pango theora vorbis zlib jpeg \ + ${PACKAGECONFIG_GL} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland egl', '', d)} \ +" + +X11DEPENDS = "virtual/libx11 libsm libxrender libxv" +X11ENABLEOPTS = "--enable-x --enable-xvideo --enable-xshm" +X11DISABLEOPTS = "--disable-x --disable-xvideo --disable-xshm" + +PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib" +PACKAGECONFIG[cdparanoia] = "--enable-cdparanoia,--disable-cdparanoia,cdparanoia" +PACKAGECONFIG[gio-unix-2.0] = "--enable-gio_unix_2_0,--disable-gio_unix_2_0,glib-2.0" +PACKAGECONFIG[ivorbis] = "--enable-ivorbis,--disable-ivorbis,tremor" +PACKAGECONFIG[ogg] = "--enable-ogg,--disable-ogg,libogg" +PACKAGECONFIG[opus] = "--enable-opus,--disable-opus,libopus" +PACKAGECONFIG[pango] = "--enable-pango,--disable-pango,pango" +PACKAGECONFIG[theora] = "--enable-theora,--disable-theora,libtheora" +PACKAGECONFIG[visual] = "--enable-libvisual,--disable-libvisual,libvisual" +PACKAGECONFIG[vorbis] = "--enable-vorbis,--disable-vorbis,libvorbis" +PACKAGECONFIG[x11] = "${X11ENABLEOPTS},${X11DISABLEOPTS},${X11DEPENDS}" +PACKAGECONFIG[zlib] = "--enable-zlib,--disable-zlib,zlib" +PACKAGECONFIG[opengl] = "--enable-opengl,--disable-opengl,virtual/libgl libglu" +PACKAGECONFIG[gles2] = "--enable-gles2,--disable-gles2,virtual/libgles2" +PACKAGECONFIG[egl] = "--enable-egl,--disable-egl,virtual/egl" +PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,wayland-native wayland wayland-protocols libdrm" +PACKAGECONFIG[jpeg] = ",,jpeg" + +FILES_${MLPREFIX}libgsttag-1.0 += "${datadir}/gst-plugins-base/1.0/license-translations.dict" + +do_compile_prepend() { + export GIR_EXTRA_LIBS_PATH="${B}/gst-libs/gst/tag/.libs:${B}/gst-libs/gst/video/.libs:${B}/gst-libs/gst/audio/.libs:${B}/gst-libs/gst/rtp/.libs" +} + +FILES_${PN}-dev += "${libdir}/gstreamer-${LIBV}/include/gst/gl/gstglconfig.h" -- 2.14.1 ^ permalink raw reply related [flat|nested] 25+ messages in thread
* Re: [PATCH v2] gst-plugins-base: upgrade 1.12.4 -> 1.14.0 2018-05-04 13:28 ` [PATCH v2] " Anuj Mittal @ 2018-05-07 10:42 ` Alexander Kanavin 2018-05-08 9:18 ` Anuj Mittal 2018-05-08 9:18 ` [PATCH v3] " Anuj Mittal 1 sibling, 1 reply; 25+ messages in thread From: Alexander Kanavin @ 2018-05-07 10:42 UTC (permalink / raw) To: Anuj Mittal, openembedded-core On 05/04/2018 04:28 PM, Anuj Mittal wrote: > 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 6616e2cf0d..dc15d93eb0 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,16 +1,17 @@ > -From 990b653c7b6de1937ec759019982d6c5f15770f7 Mon Sep 17 00:00:00 2001 > +From f523721e453febfb3f62f3ba1e9fefb31dcec471 Mon Sep 17 00:00:00 2001 > From: Alexander Kanavin <alex.kanavin@gmail.com> > -Date: Mon, 26 Oct 2015 16:38:18 +0200 > -Subject: [PATCH 2/4] Makefile.am: prefix calls to pkg-config with > +Date: Thu, 5 Apr 2018 10:26:25 +0800 > +Subject: [PATCH] Makefile.am: prefix calls to pkg-config with > PKG_CONFIG_SYSROOT_DIR > > Upstream-Status: Pending [review on oe-core maillist] > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> > +Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> > + > --- > gst-libs/gst/allocators/Makefile.am | 4 ++-- > gst-libs/gst/app/Makefile.am | 4 ++-- > gst-libs/gst/audio/Makefile.am | 12 ++++++------ > - gst-libs/gst/fft/Makefile.am | 4 ++-- > gst-libs/gst/pbutils/Makefile.am | 12 ++++++------ > gst-libs/gst/riff/Makefile.am | 8 ++++---- > gst-libs/gst/rtp/Makefile.am | 8 ++++---- > @@ -18,13 +19,13 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> > gst-libs/gst/sdp/Makefile.am | 4 ++-- > gst-libs/gst/tag/Makefile.am | 8 ++++---- > gst-libs/gst/video/Makefile.am | 8 ++++---- This patch needs to be updated to also include gst-libs/gst/gl and fix it in a similar way to other dirs. Can you do that please? This will avoid the host contamination issue that you've seen on your machine (build succeeding because the host has the needed files). Alex ^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PATCH v2] gst-plugins-base: upgrade 1.12.4 -> 1.14.0 2018-05-07 10:42 ` Alexander Kanavin @ 2018-05-08 9:18 ` Anuj Mittal 0 siblings, 0 replies; 25+ messages in thread From: Anuj Mittal @ 2018-05-08 9:18 UTC (permalink / raw) To: Alexander Kanavin, openembedded-core On 05/07/2018 06:42 PM, Alexander Kanavin wrote: > On 05/04/2018 04:28 PM, Anuj Mittal wrote: >> 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 6616e2cf0d..dc15d93eb0 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,16 +1,17 @@ >> -From 990b653c7b6de1937ec759019982d6c5f15770f7 Mon Sep 17 00:00:00 2001 >> +From f523721e453febfb3f62f3ba1e9fefb31dcec471 Mon Sep 17 00:00:00 2001 >> From: Alexander Kanavin <alex.kanavin@gmail.com> >> -Date: Mon, 26 Oct 2015 16:38:18 +0200 >> -Subject: [PATCH 2/4] Makefile.am: prefix calls to pkg-config with >> +Date: Thu, 5 Apr 2018 10:26:25 +0800 >> +Subject: [PATCH] Makefile.am: prefix calls to pkg-config with >> PKG_CONFIG_SYSROOT_DIR >> >> Upstream-Status: Pending [review on oe-core maillist] >> Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> >> +Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> >> + >> --- >> gst-libs/gst/allocators/Makefile.am | 4 ++-- >> gst-libs/gst/app/Makefile.am | 4 ++-- >> gst-libs/gst/audio/Makefile.am | 12 ++++++------ >> - gst-libs/gst/fft/Makefile.am | 4 ++-- >> gst-libs/gst/pbutils/Makefile.am | 12 ++++++------ >> gst-libs/gst/riff/Makefile.am | 8 ++++---- >> gst-libs/gst/rtp/Makefile.am | 8 ++++---- >> @@ -18,13 +19,13 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> >> gst-libs/gst/sdp/Makefile.am | 4 ++-- >> gst-libs/gst/tag/Makefile.am | 8 ++++---- >> gst-libs/gst/video/Makefile.am | 8 ++++---- > > This patch needs to be updated to also include gst-libs/gst/gl and fix > it in a similar way to other dirs. Can you do that please? This will > avoid the host contamination issue that you've seen on your machine > (build succeeding because the host has the needed files). > Thanks Alex for taking a look at it. I will send the update. Thanks, Anuj ^ permalink raw reply [flat|nested] 25+ messages in thread
* [PATCH v3] gst-plugins-base: upgrade 1.12.4 -> 1.14.0 2018-05-04 13:28 ` [PATCH v2] " Anuj Mittal 2018-05-07 10:42 ` Alexander Kanavin @ 2018-05-08 9:18 ` Anuj Mittal 1 sibling, 0 replies; 25+ messages in thread From: Anuj Mittal @ 2018-05-08 9:18 UTC (permalink / raw) To: openembedded-core * For changes, please see: https://gstreamer.freedesktop.org/releases/1.14/ * OpenGL integration library has moved to -plugins-base, add PACKAGECONFIG. * Remove one patch as that has been fixed in a different way upstream. * Merge inc/bb and refresh patches to get rid of fuzz warnings. * Remove x86 specific cached variables as they're not needed anymore. * Add jpeg to PACKAGECONFIG and enable it by default. * Port gstreamer-gl specific patches from -plugins-bad. * Backport a patch to fix g-i compile issue. Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> --- ...on.m4-prefix-pkgconfig-paths-with-PKG_CON.patch | 12 +- .../gstreamer/gstreamer1.0-plugins-base.inc | 50 ------- ...-don-t-hardcode-libtool-name-when-running.patch | 71 +++++---- ...-up-GstVideo-1.0.gir-from-local-build-dir.patch | 42 ++++++ ...gl.pc.in-don-t-append-GL_CFLAGS-to-CFLAGS.patch | 29 ++++ ...-prefix-calls-to-pkg-config-with-PKG_CONF.patch | 158 +++++++++++---------- ...ssing-include-directories-when-calling-in.patch | 12 +- ...3-ssaparse-enhance-SSA-text-lines-parsing.patch | 24 ++-- ...ncorrect-reference-to-gstreamer-sdp-in-Ma.patch | 12 +- ...t-need_segment-after-sink-pad-received-GS.patch | 69 --------- .../0009-glimagesink-Downrank-to-marginal.patch | 32 +++++ .../get-caps-from-src-pad-when-query-caps.patch | 12 +- .../link-with-libvchostif.patch | 45 ++++++ ...make-gio_unix_2_0-dependency-configurable.patch | 12 +- .../gstreamer/gstreamer1.0-plugins-base_1.12.4.bb | 18 --- .../gstreamer/gstreamer1.0-plugins-base_1.14.0.bb | 71 +++++++++ 16 files changed, 376 insertions(+), 293 deletions(-) delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-gl-pick-up-GstVideo-1.0.gir-from-local-build-dir.patch create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-gstreamer-gl.pc.in-don-t-append-GL_CFLAGS-to-CFLAGS.patch delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0004-subparse-set-need_segment-after-sink-pad-received-GS.patch create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0009-glimagesink-Downrank-to-marginal.patch create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/link-with-libvchostif.patch delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.12.4.bb create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.14.0.bb diff --git a/meta/recipes-multimedia/gstreamer/files/0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch b/meta/recipes-multimedia/gstreamer/files/0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch index 2cab87f9ec..1b7f115083 100644 --- a/meta/recipes-multimedia/gstreamer/files/0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch +++ b/meta/recipes-multimedia/gstreamer/files/0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch @@ -1,4 +1,4 @@ -From 90916f96262fa7b27a0a99788c69f9fd6df11000 Mon Sep 17 00:00:00 2001 +From 2b0436f9a07773fae8c74df902d7024e8bfc3512 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Tue, 24 Nov 2015 16:46:27 +0200 Subject: [PATCH] introspection.m4: prefix pkgconfig paths with @@ -10,12 +10,13 @@ is later supplied to g-ir-scanner. Upstream-Status: Pending [review on oe-core list] Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> + --- - common/m4/introspection.m4 | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) + common/m4/introspection.m4 | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/common/m4/introspection.m4 b/common/m4/introspection.m4 -index 162be57..217a6ae 100644 +index 162be57..933f979 100644 --- a/common/m4/introspection.m4 +++ b/common/m4/introspection.m4 @@ -54,14 +54,14 @@ m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL], @@ -37,6 +38,3 @@ index 162be57..217a6ae 100644 INTROSPECTION_INIT="extern void gst_init(gint*,gchar**); gst_init(NULL,NULL);" fi AC_SUBST(INTROSPECTION_SCANNER) --- -2.6.2 - diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc deleted file mode 100644 index 08130c1da4..0000000000 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc +++ /dev/null @@ -1,50 +0,0 @@ -require gstreamer1.0-plugins.inc - -SRC_URI_append = "\ - file://0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch \ - file://0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch \ - file://0003-riff-add-missing-include-directories-when-calling-in.patch \ - file://0004-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch \ -" - -LICENSE = "GPLv2+ & LGPLv2+" - -DEPENDS += "iso-codes util-linux zlib" - -inherit gettext - -PACKAGES_DYNAMIC =+ "^libgst.*" - -PACKAGECONFIG ??= " \ - ${GSTREAMER_ORC} \ - ${@bb.utils.filter('DISTRO_FEATURES', 'alsa x11', d)} \ - gio-unix-2.0 ogg pango theora vorbis \ -" - -X11DEPENDS = "virtual/libx11 libsm libxrender libxv" -X11ENABLEOPTS = "--enable-x --enable-xvideo --enable-xshm" -X11DISABLEOPTS = "--disable-x --disable-xvideo --disable-xshm" - -PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib" -PACKAGECONFIG[cdparanoia] = "--enable-cdparanoia,--disable-cdparanoia,cdparanoia" -PACKAGECONFIG[gio-unix-2.0] = "--enable-gio_unix_2_0,--disable-gio_unix_2_0,glib-2.0" -PACKAGECONFIG[ivorbis] = "--enable-ivorbis,--disable-ivorbis,tremor" -PACKAGECONFIG[ogg] = "--enable-ogg,--disable-ogg,libogg" -PACKAGECONFIG[opus] = "--enable-opus,--disable-opus,libopus" -PACKAGECONFIG[pango] = "--enable-pango,--disable-pango,pango" -PACKAGECONFIG[theora] = "--enable-theora,--disable-theora,libtheora" -PACKAGECONFIG[visual] = "--enable-libvisual,--disable-libvisual,libvisual" -PACKAGECONFIG[vorbis] = "--enable-vorbis,--disable-vorbis,libvorbis" -PACKAGECONFIG[x11] = "${X11ENABLEOPTS},${X11DISABLEOPTS},${X11DEPENDS}" - -EXTRA_OECONF += " \ - --enable-zlib \ -" - -CACHED_CONFIGUREVARS_append_x86 = " ac_cv_header_emmintrin_h=no ac_cv_header_xmmintrin_h=no" - -FILES_${MLPREFIX}libgsttag-1.0 += "${datadir}/gst-plugins-base/1.0/license-translations.dict" - -do_compile_prepend() { - export GIR_EXTRA_LIBS_PATH="${B}/gst-libs/gst/tag/.libs:${B}/gst-libs/gst/video/.libs:${B}/gst-libs/gst/audio/.libs:${B}/gst-libs/gst/rtp/.libs" -} diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch index 094bdac846..128c7f8cb6 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch @@ -1,16 +1,18 @@ -From f1d9652351e7754c63003104eceb526af424c7e0 Mon Sep 17 00:00:00 2001 +From 4d6ea58f96b9744af8d899ddca22c2695ac74b5b Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Fri, 20 Nov 2015 16:53:04 +0200 -Subject: [PATCH 1/4] Makefile.am: don't hardcode libtool name when running +Date: Thu, 5 Apr 2018 10:15:08 +0800 +Subject: [PATCH] Makefile.am: don't hardcode libtool name when running introspection tools Upstream-Status: Pending [review on oe-core maillist] Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> + --- gst-libs/gst/allocators/Makefile.am | 2 +- gst-libs/gst/app/Makefile.am | 2 +- gst-libs/gst/audio/Makefile.am | 2 +- - gst-libs/gst/fft/Makefile.am | 2 +- + gst-libs/gst/gl/Makefile.am | 2 +- gst-libs/gst/pbutils/Makefile.am | 2 +- gst-libs/gst/riff/Makefile.am | 2 +- gst-libs/gst/rtp/Makefile.am | 2 +- @@ -21,10 +23,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/gst-libs/gst/allocators/Makefile.am b/gst-libs/gst/allocators/Makefile.am -index 9361bf9..bc7f53a 100644 +index 1957d28..1ecc950 100644 --- a/gst-libs/gst/allocators/Makefile.am +++ b/gst-libs/gst/allocators/Makefile.am -@@ -38,7 +38,7 @@ GstAllocators-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstallocators-@ +@@ -42,7 +42,7 @@ GstAllocators-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstallocators-@ --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ --library=libgstallocators-@GST_API_VERSION@.la \ --include=Gst-@GST_API_VERSION@ \ @@ -34,10 +36,10 @@ index 9361bf9..bc7f53a 100644 --pkg-export gstreamer-allocators-@GST_API_VERSION@ \ --output $@ \ diff --git a/gst-libs/gst/app/Makefile.am b/gst-libs/gst/app/Makefile.am -index 6d6de8d..dcc2fe0 100644 +index 52f6ad3..5bfd606 100644 --- a/gst-libs/gst/app/Makefile.am +++ b/gst-libs/gst/app/Makefile.am -@@ -53,7 +53,7 @@ GstApp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstapp-@GST_API_VERSIO +@@ -56,7 +56,7 @@ GstApp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstapp-@GST_API_VERSIO --library=libgstapp-@GST_API_VERSION@.la \ --include=Gst-@GST_API_VERSION@ \ --include=GstBase-@GST_API_VERSION@ \ @@ -47,10 +49,10 @@ index 6d6de8d..dcc2fe0 100644 --pkg gstreamer-base-@GST_API_VERSION@ \ --pkg-export gstreamer-app-@GST_API_VERSION@ \ diff --git a/gst-libs/gst/audio/Makefile.am b/gst-libs/gst/audio/Makefile.am -index 275d222..2374196 100644 +index 2922245..7fb65f2 100644 --- a/gst-libs/gst/audio/Makefile.am +++ b/gst-libs/gst/audio/Makefile.am -@@ -116,7 +116,7 @@ GstAudio-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstaudio-@GST_API_VE +@@ -184,7 +184,7 @@ GstAudio-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstaudio-@GST_API_VE --include=Gst-@GST_API_VERSION@ \ --include=GstBase-@GST_API_VERSION@ \ --include=GstTag-@GST_API_VERSION@ \ @@ -59,24 +61,24 @@ index 275d222..2374196 100644 --pkg gstreamer-@GST_API_VERSION@ \ --pkg gstreamer-base-@GST_API_VERSION@ \ --pkg-export gstreamer-audio-@GST_API_VERSION@ \ -diff --git a/gst-libs/gst/fft/Makefile.am b/gst-libs/gst/fft/Makefile.am -index 09b3d68..f545354 100644 ---- a/gst-libs/gst/fft/Makefile.am -+++ b/gst-libs/gst/fft/Makefile.am -@@ -65,7 +65,7 @@ GstFft-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstfft-@GST_API_VERSIO - --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ - --library=libgstfft-@GST_API_VERSION@.la \ +diff --git a/gst-libs/gst/gl/Makefile.am b/gst-libs/gst/gl/Makefile.am +index a3bbc94..16f829f 100644 +--- a/gst-libs/gst/gl/Makefile.am ++++ b/gst-libs/gst/gl/Makefile.am +@@ -192,7 +192,7 @@ GstGL-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstgl-@GST_API_VERSION@ --include=Gst-@GST_API_VERSION@ \ + --include=GstBase-@GST_API_VERSION@ \ + --include=GstVideo-@GST_API_VERSION@ \ - --libtool="$(top_builddir)/libtool" \ + --libtool="$(LIBTOOL)" \ --pkg gstreamer-@GST_API_VERSION@ \ - --pkg-export gstreamer-fft-@GST_API_VERSION@ \ - --output $@ \ + --pkg gstreamer-base-@GST_API_VERSION@ \ + --pkg gstreamer-video-@GST_API_VERSION@ \ diff --git a/gst-libs/gst/pbutils/Makefile.am b/gst-libs/gst/pbutils/Makefile.am -index 64d5eb0..91dc214 100644 +index ae51993..35a6e44 100644 --- a/gst-libs/gst/pbutils/Makefile.am +++ b/gst-libs/gst/pbutils/Makefile.am -@@ -99,7 +99,7 @@ GstPbutils-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstpbutils-@GST_AP +@@ -103,7 +103,7 @@ GstPbutils-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstpbutils-@GST_AP --include=GstTag-@GST_API_VERSION@ \ --include=GstVideo-@GST_API_VERSION@ \ --include=GstAudio-@GST_API_VERSION@ \ @@ -86,10 +88,10 @@ index 64d5eb0..91dc214 100644 --pkg gstreamer-tag-@GST_API_VERSION@ \ --pkg gstreamer-video-@GST_API_VERSION@ \ diff --git a/gst-libs/gst/riff/Makefile.am b/gst-libs/gst/riff/Makefile.am -index 83d83cb..3bd8fc0 100644 +index fb53f06..e66ef4f 100644 --- a/gst-libs/gst/riff/Makefile.am +++ b/gst-libs/gst/riff/Makefile.am -@@ -47,7 +47,7 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) +@@ -49,7 +49,7 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) # --include=GstAudio-@GST_API_VERSION@ \ # --include=GstTag-@GST_API_VERSION@ \ # --include=Gst-@GST_API_VERSION@ \ @@ -99,10 +101,10 @@ index 83d83cb..3bd8fc0 100644 # --pkg gstreamer-tag-@GST_API_VERSION@ \ # --pkg gstreamer-audio-@GST_API_VERSION@ \ diff --git a/gst-libs/gst/rtp/Makefile.am b/gst-libs/gst/rtp/Makefile.am -index fdd01c1..f5445c1 100644 +index a6f971d..77ebeeb 100644 --- a/gst-libs/gst/rtp/Makefile.am +++ b/gst-libs/gst/rtp/Makefile.am -@@ -65,7 +65,7 @@ GstRtp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtp-@GST_API_VERSIO +@@ -69,7 +69,7 @@ GstRtp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtp-@GST_API_VERSIO --library=libgstrtp-@GST_API_VERSION@.la \ --include=Gst-@GST_API_VERSION@ \ --include=GstBase-@GST_API_VERSION@ \ @@ -112,10 +114,10 @@ index fdd01c1..f5445c1 100644 --pkg gstreamer-base-@GST_API_VERSION@ \ --pkg-export gstreamer-rtp-@GST_API_VERSION@ \ diff --git a/gst-libs/gst/rtsp/Makefile.am b/gst-libs/gst/rtsp/Makefile.am -index ede5706..9b0b258 100644 +index ceb07f4..db9d0fd 100644 --- a/gst-libs/gst/rtsp/Makefile.am +++ b/gst-libs/gst/rtsp/Makefile.am -@@ -72,7 +72,7 @@ GstRtsp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERS +@@ -76,7 +76,7 @@ GstRtsp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERS --include=Gio-2.0 \ --include=Gst-@GST_API_VERSION@ \ --include=GstSdp-@GST_API_VERSION@ \ @@ -125,10 +127,10 @@ index ede5706..9b0b258 100644 --pkg gstreamer-@GST_API_VERSION@ \ --pkg gstreamer-sdp-@GST_API_VERSION@ \ diff --git a/gst-libs/gst/sdp/Makefile.am b/gst-libs/gst/sdp/Makefile.am -index a90f30b..0e149b8 100644 +index e197e9b..6e05cc7 100644 --- a/gst-libs/gst/sdp/Makefile.am +++ b/gst-libs/gst/sdp/Makefile.am -@@ -32,7 +32,7 @@ GstSdp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstsdp-@GST_API_VERSIO +@@ -34,7 +34,7 @@ GstSdp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstsdp-@GST_API_VERSIO --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ --library=libgstsdp-@GST_API_VERSION@.la \ --include=Gst-@GST_API_VERSION@ \ @@ -138,10 +140,10 @@ index a90f30b..0e149b8 100644 --pkg-export gstreamer-sdp-@GST_API_VERSION@ \ --output $@ \ diff --git a/gst-libs/gst/tag/Makefile.am b/gst-libs/gst/tag/Makefile.am -index c534a4d..cafafd3 100644 +index 0247c33..c86515b 100644 --- a/gst-libs/gst/tag/Makefile.am +++ b/gst-libs/gst/tag/Makefile.am -@@ -45,7 +45,7 @@ GstTag-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgsttag-@GST_API_VERSIO +@@ -66,7 +66,7 @@ GstTag-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgsttag-@GST_API_VERSIO --library=libgsttag-@GST_API_VERSION@.la \ --include=Gst-@GST_API_VERSION@ \ --include=GstBase-@GST_API_VERSION@ \ @@ -151,10 +153,10 @@ index c534a4d..cafafd3 100644 --pkg gstreamer-base-@GST_API_VERSION@ \ --pkg-export gstreamer-tag-@GST_API_VERSION@ \ diff --git a/gst-libs/gst/video/Makefile.am b/gst-libs/gst/video/Makefile.am -index 5d31fa1..ac64eb3 100644 +index 9fc1ccf..0f8455f 100644 --- a/gst-libs/gst/video/Makefile.am +++ b/gst-libs/gst/video/Makefile.am -@@ -116,7 +116,7 @@ GstVideo-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstvideo-@GST_API_VE +@@ -124,7 +124,7 @@ GstVideo-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstvideo-@GST_API_VE --library=libgstvideo-@GST_API_VERSION@.la \ --include=Gst-@GST_API_VERSION@ \ --include=GstBase-@GST_API_VERSION@ \ @@ -163,6 +165,3 @@ index 5d31fa1..ac64eb3 100644 --pkg gstreamer-@GST_API_VERSION@ \ --pkg gstreamer-base-@GST_API_VERSION@ \ --pkg-export gstreamer-video-@GST_API_VERSION@ \ --- -2.6.2 - 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 new file mode 100644 index 0000000000..eba72db96b --- /dev/null +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-gl-pick-up-GstVideo-1.0.gir-from-local-build-dir.patch @@ -0,0 +1,42 @@ +From 1a7c457cf209e853148865f196edc12ba8d5c10c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.com> +Date: Tue, 27 Mar 2018 10:43:16 +0100 +Subject: [PATCH] gl: pick up GstVideo-1.0.gir from local build dir + +https://bugzilla.gnome.org/show_bug.cgi?id=794708 + +Upstream-Status: Backport [https://cgit.freedesktop.org/gstreamer/gst-plugins-base/commit/?h=1.14&id=9261296858cb149767ceac44fd6bd13cc0de0d21] + +Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> + +--- + gst-libs/gst/gl/Makefile.am | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/gst-libs/gst/gl/Makefile.am b/gst-libs/gst/gl/Makefile.am +index fc15a6d..ab6cc55 100644 +--- a/gst-libs/gst/gl/Makefile.am ++++ b/gst-libs/gst/gl/Makefile.am +@@ -185,9 +185,10 @@ GstGL-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstgl-@GST_API_VERSION@ + -I$(top_builddir)/gst-libs \ + $(GST_PLUGINS_BASE_CFLAGS) \ + $(GL_CFLAGS) \ ++ --add-include-path="$(top_builddir)/gst-libs/gst/video/" \ + --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ + --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ +- --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-video-@GST_API_VERSION@` \ ++ --library-path="$(top_builddir)/gst-libs/gst/video/" \ + --library=libgstgl-@GST_API_VERSION@.la \ + --include=Gst-@GST_API_VERSION@ \ + --include=GstBase-@GST_API_VERSION@ \ +@@ -216,9 +217,9 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) + $(INTROSPECTION_COMPILER) \ + --includedir=$(srcdir) \ + --includedir=$(builddir) \ ++ --includedir="$(top_builddir)/gst-libs/gst/video/" \ + --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ + --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ +- --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-video-@GST_API_VERSION@` \ + $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) + + CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-gstreamer-gl.pc.in-don-t-append-GL_CFLAGS-to-CFLAGS.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-gstreamer-gl.pc.in-don-t-append-GL_CFLAGS-to-CFLAGS.patch new file mode 100644 index 0000000000..251dc172cb --- /dev/null +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-gstreamer-gl.pc.in-don-t-append-GL_CFLAGS-to-CFLAGS.patch @@ -0,0 +1,29 @@ +From 61a672e79c8cb1aeeeda4c968997c577ac73a8f3 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Fri, 12 May 2017 16:47:12 +0300 +Subject: [PATCH] gstreamer-gl.pc.in: don't append GL_CFLAGS to CFLAGS + +Dependencies' include directories should not be added in this way; +it causes problems when cross-compiling in sysroot environments. + +Upstream-Status: Pending + +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +Signed-off-by: Maxin B. John <maxin.john@intel.com> +--- + pkgconfig/gstreamer-gl.pc.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pkgconfig/gstreamer-gl.pc.in b/pkgconfig/gstreamer-gl.pc.in +index dc672a9..8c290ba 100644 +--- a/pkgconfig/gstreamer-gl.pc.in ++++ b/pkgconfig/gstreamer-gl.pc.in +@@ -13,4 +13,4 @@ Version: @VERSION@ + Requires: gstreamer-video-@GST_API_VERSION@ gstreamer-base-@GST_API_VERSION@ gstreamer-@GST_API_VERSION@ + + Libs: -L${libdir} -lgstgl-@GST_API_VERSION@ +-Cflags: -I${includedir} -I${libdir}/gstreamer-@GST_API_VERSION@/include @GL_CFLAGS@ ++Cflags: -I${includedir} -I${libdir}/gstreamer-@GST_API_VERSION@/include +-- +2.7.4 + 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 6616e2cf0d..377c89a11d 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,16 +1,18 @@ -From 990b653c7b6de1937ec759019982d6c5f15770f7 Mon Sep 17 00:00:00 2001 +From 77b88eae845060d38cf788651f66a7ae98f9b199 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Mon, 26 Oct 2015 16:38:18 +0200 -Subject: [PATCH 2/4] Makefile.am: prefix calls to pkg-config with +Date: Thu, 5 Apr 2018 10:26:25 +0800 +Subject: [PATCH] Makefile.am: prefix calls to pkg-config with PKG_CONFIG_SYSROOT_DIR Upstream-Status: Pending [review on oe-core maillist] Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> + --- gst-libs/gst/allocators/Makefile.am | 4 ++-- gst-libs/gst/app/Makefile.am | 4 ++-- gst-libs/gst/audio/Makefile.am | 12 ++++++------ - gst-libs/gst/fft/Makefile.am | 4 ++-- + gst-libs/gst/gl/Makefile.am | 12 ++++++------ gst-libs/gst/pbutils/Makefile.am | 12 ++++++------ gst-libs/gst/riff/Makefile.am | 8 ++++---- gst-libs/gst/rtp/Makefile.am | 8 ++++---- @@ -18,13 +20,13 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> gst-libs/gst/sdp/Makefile.am | 4 ++-- gst-libs/gst/tag/Makefile.am | 8 ++++---- gst-libs/gst/video/Makefile.am | 8 ++++---- - 11 files changed, 38 insertions(+), 38 deletions(-) + 11 files changed, 42 insertions(+), 42 deletions(-) -Index: gst-plugins-base-1.12.3/gst-libs/gst/allocators/Makefile.am -=================================================================== ---- gst-plugins-base-1.12.3.orig/gst-libs/gst/allocators/Makefile.am -+++ gst-plugins-base-1.12.3/gst-libs/gst/allocators/Makefile.am -@@ -36,7 +36,7 @@ GstAllocators-@GST_API_VERSION@.gir: $(I +diff --git a/gst-libs/gst/allocators/Makefile.am b/gst-libs/gst/allocators/Makefile.am +index 1ecc950..d6417ac 100644 +--- a/gst-libs/gst/allocators/Makefile.am ++++ b/gst-libs/gst/allocators/Makefile.am +@@ -39,7 +39,7 @@ GstAllocators-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstallocators-@ --c-include "gst/allocators/allocators.h" \ -I$(top_srcdir)/gst-libs \ -I$(top_builddir)/gst-libs \ @@ -33,7 +35,7 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/allocators/Makefile.am --library=libgstallocators-@GST_API_VERSION@.la \ --include=Gst-@GST_API_VERSION@ \ --libtool="$(LIBTOOL)" \ -@@ -60,7 +60,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= +@@ -63,7 +63,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) $(INTROSPECTION_COMPILER) \ --includedir=$(srcdir) \ --includedir=$(builddir) \ @@ -42,11 +44,11 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/allocators/Makefile.am $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA) -Index: gst-plugins-base-1.12.3/gst-libs/gst/app/Makefile.am -=================================================================== ---- gst-plugins-base-1.12.3.orig/gst-libs/gst/app/Makefile.am -+++ gst-plugins-base-1.12.3/gst-libs/gst/app/Makefile.am -@@ -48,8 +48,8 @@ GstApp-@GST_API_VERSION@.gir: $(INTROSPE +diff --git a/gst-libs/gst/app/Makefile.am b/gst-libs/gst/app/Makefile.am +index 5bfd606..6441674 100644 +--- a/gst-libs/gst/app/Makefile.am ++++ b/gst-libs/gst/app/Makefile.am +@@ -51,8 +51,8 @@ GstApp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstapp-@GST_API_VERSIO --c-include "gst/app/app.h" \ -I$(top_srcdir)/gst-libs \ -I$(top_builddir)/gst-libs \ @@ -57,11 +59,11 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/app/Makefile.am --library=libgstapp-@GST_API_VERSION@.la \ --include=Gst-@GST_API_VERSION@ \ --include=GstBase-@GST_API_VERSION@ \ -Index: gst-plugins-base-1.12.3/gst-libs/gst/audio/Makefile.am -=================================================================== ---- gst-plugins-base-1.12.3.orig/gst-libs/gst/audio/Makefile.am -+++ gst-plugins-base-1.12.3/gst-libs/gst/audio/Makefile.am -@@ -167,12 +167,12 @@ GstAudio-@GST_API_VERSION@.gir: $(INTROS +diff --git a/gst-libs/gst/audio/Makefile.am b/gst-libs/gst/audio/Makefile.am +index 7fb65f2..5379f79 100644 +--- a/gst-libs/gst/audio/Makefile.am ++++ b/gst-libs/gst/audio/Makefile.am +@@ -174,12 +174,12 @@ GstAudio-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstaudio-@GST_API_VE -I$(top_srcdir)/gst-libs \ -I$(top_builddir)/gst-libs \ --c-include "gst/audio/audio.h" \ @@ -78,7 +80,7 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/audio/Makefile.am --library-path="$(top_builddir)/gst-libs/gst/tag/" \ --include=Gst-@GST_API_VERSION@ \ --include=GstBase-@GST_API_VERSION@ \ -@@ -201,8 +201,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= +@@ -208,8 +208,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) --includedir=$(srcdir) \ --includedir=$(builddir) \ --includedir="$(top_builddir)/gst-libs/gst/tag/" \ @@ -89,33 +91,41 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/audio/Makefile.am $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) -Index: gst-plugins-base-1.12.3/gst-libs/gst/fft/Makefile.am -=================================================================== ---- gst-plugins-base-1.12.3.orig/gst-libs/gst/fft/Makefile.am -+++ gst-plugins-base-1.12.3/gst-libs/gst/fft/Makefile.am -@@ -63,7 +63,7 @@ GstFft-@GST_API_VERSION@.gir: $(INTROSPE - --c-include "gst/fft/fft.h" \ - -I$(top_srcdir)/gst-libs \ +diff --git a/gst-libs/gst/gl/Makefile.am b/gst-libs/gst/gl/Makefile.am +index 16f829f..fc15a6d 100644 +--- a/gst-libs/gst/gl/Makefile.am ++++ b/gst-libs/gst/gl/Makefile.am +@@ -185,9 +185,9 @@ GstGL-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstgl-@GST_API_VERSION@ -I$(top_builddir)/gst-libs \ + $(GST_PLUGINS_BASE_CFLAGS) \ + $(GL_CFLAGS) \ - --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ +- --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ +- --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-video-@GST_API_VERSION@` \ + --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ - --library=libgstfft-@GST_API_VERSION@.la \ ++ --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ ++ --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-video-@GST_API_VERSION@` \ + --library=libgstgl-@GST_API_VERSION@.la \ --include=Gst-@GST_API_VERSION@ \ - --libtool="$(LIBTOOL)" \ -@@ -87,7 +87,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= + --include=GstBase-@GST_API_VERSION@ \ +@@ -216,9 +216,9 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) $(INTROSPECTION_COMPILER) \ --includedir=$(srcdir) \ --includedir=$(builddir) \ - --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ +- --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ +- --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-video-@GST_API_VERSION@` \ + --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ ++ --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ ++ --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-video-@GST_API_VERSION@` \ $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA) -Index: gst-plugins-base-1.12.3/gst-libs/gst/pbutils/Makefile.am -=================================================================== ---- gst-plugins-base-1.12.3.orig/gst-libs/gst/pbutils/Makefile.am -+++ gst-plugins-base-1.12.3/gst-libs/gst/pbutils/Makefile.am -@@ -85,14 +85,14 @@ GstPbutils-@GST_API_VERSION@.gir: $(INTR +diff --git a/gst-libs/gst/pbutils/Makefile.am b/gst-libs/gst/pbutils/Makefile.am +index 35a6e44..49d6894 100644 +--- a/gst-libs/gst/pbutils/Makefile.am ++++ b/gst-libs/gst/pbutils/Makefile.am +@@ -88,14 +88,14 @@ GstPbutils-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstpbutils-@GST_AP --c-include "gst/pbutils/pbutils.h" \ -I$(top_srcdir)/gst-libs \ -I$(top_builddir)/gst-libs \ @@ -134,7 +144,7 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/pbutils/Makefile.am --library-path="$(top_builddir)/gst-libs/gst/tag/" \ --library-path="$(top_builddir)/gst-libs/gst/video/" \ --library-path="$(top_builddir)/gst-libs/gst/audio/" \ -@@ -125,8 +125,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= +@@ -128,8 +128,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) $(INTROSPECTION_COMPILER) \ --includedir=$(srcdir) \ --includedir=$(builddir) \ @@ -145,11 +155,11 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/pbutils/Makefile.am --includedir="$(top_builddir)/gst-libs/gst/tag/" \ --includedir="$(top_builddir)/gst-libs/gst/video/" \ --includedir="$(top_builddir)/gst-libs/gst/audio/" \ -Index: gst-plugins-base-1.12.3/gst-libs/gst/riff/Makefile.am -=================================================================== ---- gst-plugins-base-1.12.3.orig/gst-libs/gst/riff/Makefile.am -+++ gst-plugins-base-1.12.3/gst-libs/gst/riff/Makefile.am -@@ -42,8 +42,8 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS +diff --git a/gst-libs/gst/riff/Makefile.am b/gst-libs/gst/riff/Makefile.am +index e66ef4f..c8c588a 100644 +--- a/gst-libs/gst/riff/Makefile.am ++++ b/gst-libs/gst/riff/Makefile.am +@@ -43,8 +43,8 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) # --c-include "gst/riff/riff.h" \ # --add-include-path=$(builddir)/../tag \ # --add-include-path=$(builddir)/../audio \ @@ -160,7 +170,7 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/riff/Makefile.am # --library=libgstriff-@GST_API_VERSION@.la \ # --include=GstAudio-@GST_API_VERSION@ \ # --include=GstTag-@GST_API_VERSION@ \ -@@ -74,8 +74,8 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS +@@ -75,8 +75,8 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) # --includedir=$(builddir) \ # --includedir=$(builddir)/../tag \ # --includedir=$(builddir)/../audio \ @@ -171,11 +181,11 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/riff/Makefile.am # $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) # #CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA) -Index: gst-plugins-base-1.12.3/gst-libs/gst/rtp/Makefile.am -=================================================================== ---- gst-plugins-base-1.12.3.orig/gst-libs/gst/rtp/Makefile.am -+++ gst-plugins-base-1.12.3/gst-libs/gst/rtp/Makefile.am -@@ -61,8 +61,8 @@ GstRtp-@GST_API_VERSION@.gir: $(INTROSPE +diff --git a/gst-libs/gst/rtp/Makefile.am b/gst-libs/gst/rtp/Makefile.am +index 77ebeeb..9aee788 100644 +--- a/gst-libs/gst/rtp/Makefile.am ++++ b/gst-libs/gst/rtp/Makefile.am +@@ -64,8 +64,8 @@ GstRtp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtp-@GST_API_VERSIO --c-include "gst/rtp/rtp.h" \ -I$(top_builddir)/gst-libs \ -I$(top_srcdir)/gst-libs \ @@ -186,7 +196,7 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/rtp/Makefile.am --library=libgstrtp-@GST_API_VERSION@.la \ --include=Gst-@GST_API_VERSION@ \ --include=GstBase-@GST_API_VERSION@ \ -@@ -89,8 +89,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= +@@ -92,8 +92,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) $(INTROSPECTION_COMPILER) \ --includedir=$(srcdir) \ --includedir=$(builddir) \ @@ -197,11 +207,11 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/rtp/Makefile.am $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) -Index: gst-plugins-base-1.12.3/gst-libs/gst/rtsp/Makefile.am -=================================================================== ---- gst-plugins-base-1.12.3.orig/gst-libs/gst/rtsp/Makefile.am -+++ gst-plugins-base-1.12.3/gst-libs/gst/rtsp/Makefile.am -@@ -68,7 +68,7 @@ GstRtsp-@GST_API_VERSION@.gir: $(INTROSP +diff --git a/gst-libs/gst/rtsp/Makefile.am b/gst-libs/gst/rtsp/Makefile.am +index db9d0fd..79027cb 100644 +--- a/gst-libs/gst/rtsp/Makefile.am ++++ b/gst-libs/gst/rtsp/Makefile.am +@@ -71,7 +71,7 @@ GstRtsp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERS -I$(top_builddir)/gst-libs \ -I$(top_srcdir)/gst-libs \ --add-include-path=$(builddir)/../sdp \ @@ -210,7 +220,7 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/rtsp/Makefile.am --library=libgstrtsp-@GST_API_VERSION@.la \ --include=Gio-2.0 \ --include=Gst-@GST_API_VERSION@ \ -@@ -98,7 +98,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= +@@ -101,7 +101,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) --includedir=$(srcdir) \ --includedir=$(builddir) \ --includedir=$(builddir)/../sdp \ @@ -219,11 +229,11 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/rtsp/Makefile.am $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) -Index: gst-plugins-base-1.12.3/gst-libs/gst/sdp/Makefile.am -=================================================================== ---- gst-plugins-base-1.12.3.orig/gst-libs/gst/sdp/Makefile.am -+++ gst-plugins-base-1.12.3/gst-libs/gst/sdp/Makefile.am -@@ -30,7 +30,7 @@ GstSdp-@GST_API_VERSION@.gir: $(INTROSPE +diff --git a/gst-libs/gst/sdp/Makefile.am b/gst-libs/gst/sdp/Makefile.am +index 6e05cc7..c7cf514 100644 +--- a/gst-libs/gst/sdp/Makefile.am ++++ b/gst-libs/gst/sdp/Makefile.am +@@ -31,7 +31,7 @@ GstSdp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstsdp-@GST_API_VERSIO --warn-all \ --c-include "gst/sdp/sdp.h" \ -I$(top_srcdir)/gst-libs \ @@ -232,7 +242,7 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/sdp/Makefile.am --library=libgstsdp-@GST_API_VERSION@.la \ --include=Gst-@GST_API_VERSION@ \ --libtool="$(LIBTOOL)" \ -@@ -54,7 +54,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= +@@ -55,7 +55,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) $(INTROSPECTION_COMPILER) \ --includedir=$(srcdir) \ --includedir=$(builddir) \ @@ -241,11 +251,11 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/sdp/Makefile.am $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA) -Index: gst-plugins-base-1.12.3/gst-libs/gst/tag/Makefile.am -=================================================================== ---- gst-plugins-base-1.12.3.orig/gst-libs/gst/tag/Makefile.am -+++ gst-plugins-base-1.12.3/gst-libs/gst/tag/Makefile.am -@@ -59,8 +59,8 @@ GstTag-@GST_API_VERSION@.gir: $(INTROSPE +diff --git a/gst-libs/gst/tag/Makefile.am b/gst-libs/gst/tag/Makefile.am +index c86515b..363e6d2 100644 +--- a/gst-libs/gst/tag/Makefile.am ++++ b/gst-libs/gst/tag/Makefile.am +@@ -61,8 +61,8 @@ GstTag-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgsttag-@GST_API_VERSIO --c-include "gst/tag/tag.h" \ -I$(top_srcdir)/gst-libs \ -I$(top_builddir)/gst-libs \ @@ -256,7 +266,7 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/tag/Makefile.am --library=libgsttag-@GST_API_VERSION@.la \ --include=Gst-@GST_API_VERSION@ \ --include=GstBase-@GST_API_VERSION@ \ -@@ -87,8 +87,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= +@@ -89,8 +89,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) $(INTROSPECTION_COMPILER) \ --includedir=$(srcdir) \ --includedir=$(builddir) \ @@ -267,11 +277,11 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/tag/Makefile.am $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) -Index: gst-plugins-base-1.12.3/gst-libs/gst/video/Makefile.am -=================================================================== ---- gst-plugins-base-1.12.3.orig/gst-libs/gst/video/Makefile.am -+++ gst-plugins-base-1.12.3/gst-libs/gst/video/Makefile.am -@@ -116,8 +116,8 @@ GstVideo-@GST_API_VERSION@.gir: $(INTROS +diff --git a/gst-libs/gst/video/Makefile.am b/gst-libs/gst/video/Makefile.am +index 0f8455f..8c9955c 100644 +--- a/gst-libs/gst/video/Makefile.am ++++ b/gst-libs/gst/video/Makefile.am +@@ -119,8 +119,8 @@ GstVideo-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstvideo-@GST_API_VE --c-include "gst/video/video.h" \ -I$(top_srcdir)/gst-libs \ -I$(top_builddir)/gst-libs \ @@ -282,7 +292,7 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/video/Makefile.am --library=libgstvideo-@GST_API_VERSION@.la \ --include=Gst-@GST_API_VERSION@ \ --include=GstBase-@GST_API_VERSION@ \ -@@ -144,8 +144,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= +@@ -147,8 +147,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) $(INTROSPECTION_COMPILER) \ --includedir=$(srcdir) \ --includedir=$(builddir) \ diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-riff-add-missing-include-directories-when-calling-in.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-riff-add-missing-include-directories-when-calling-in.patch index 9b66f7f49d..98ffdb1c10 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-riff-add-missing-include-directories-when-calling-in.patch +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-riff-add-missing-include-directories-when-calling-in.patch @@ -1,20 +1,21 @@ -From 3c2c2d5dd08aa30ed0e8acd8566ec99412bb8209 Mon Sep 17 00:00:00 2001 +From b9765efb1696e3e2e79f2955f759be199fe34882 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Mon, 26 Oct 2015 17:29:37 +0200 -Subject: [PATCH 3/4] riff: add missing include directories when calling +Subject: [PATCH] riff: add missing include directories when calling introspection scanner Upstream-Status: Pending [review on oe-core maillist] Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> + --- gst-libs/gst/riff/Makefile.am | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gst-libs/gst/riff/Makefile.am b/gst-libs/gst/riff/Makefile.am -index 0a115cc..5057a58 100644 +index c8c588a..c096453 100644 --- a/gst-libs/gst/riff/Makefile.am +++ b/gst-libs/gst/riff/Makefile.am -@@ -39,6 +39,8 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) +@@ -41,6 +41,8 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) # --strip-prefix=Gst \ # --warn-all \ # --c-include "gst/riff/riff.h" \ @@ -23,6 +24,3 @@ index 0a115cc..5057a58 100644 # --add-include-path=$(builddir)/../tag \ # --add-include-path=$(builddir)/../audio \ # --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ --- -2.6.2 - diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-ssaparse-enhance-SSA-text-lines-parsing.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-ssaparse-enhance-SSA-text-lines-parsing.patch index 9fbebd5700..9e95524057 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-ssaparse-enhance-SSA-text-lines-parsing.patch +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-ssaparse-enhance-SSA-text-lines-parsing.patch @@ -1,7 +1,7 @@ -From be6163cfa3a255493f9d75bad9541cbfe1723fee Mon Sep 17 00:00:00 2001 +From 918c96b24d10f61b7455b4cef3bab490849d0d77 Mon Sep 17 00:00:00 2001 From: Mingke Wang <mingke.wang@freescale.com> Date: Thu, 19 Mar 2015 14:17:10 +0800 -Subject: [PATCH 3/4] ssaparse: enhance SSA text lines parsing. +Subject: [PATCH] ssaparse: enhance SSA text lines parsing. some parser will pass in the original ssa text line which starts with "Dialog:" and there's are maybe multiple Dialog lines in one input buffer. @@ -10,13 +10,18 @@ Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=747496] Signed-off-by: Mingke Wang <mingke.wang@freescale.com> +--- + gst/subparse/gstssaparse.c | 150 ++++++++++++++++++++++++++++++++++++++++----- + 1 file changed, 134 insertions(+), 16 deletions(-) + mode change 100644 => 100755 gst/subparse/gstssaparse.c + diff --git a/gst/subparse/gstssaparse.c b/gst/subparse/gstssaparse.c old mode 100644 new mode 100755 -index 06ecef9..0ab5dce +index c849c08..4b9636c --- a/gst/subparse/gstssaparse.c +++ b/gst/subparse/gstssaparse.c -@@ -260,6 +260,7 @@ gst_ssa_parse_remove_override_codes (GstSsaParse * parse, gchar * txt) +@@ -262,6 +262,7 @@ gst_ssa_parse_remove_override_codes (GstSsaParse * parse, gchar * txt) * gst_ssa_parse_push_line: * @parse: caller element * @txt: text to push @@ -24,7 +29,7 @@ index 06ecef9..0ab5dce * @start: timestamp for the buffer * @duration: duration for the buffer * -@@ -269,27 +270,133 @@ gst_ssa_parse_remove_override_codes (GstSsaParse * parse, gchar * txt) +@@ -271,27 +272,133 @@ gst_ssa_parse_remove_override_codes (GstSsaParse * parse, gchar * txt) * Returns: result of the push of the created buffer */ static GstFlowReturn @@ -169,7 +174,7 @@ index 06ecef9..0ab5dce GST_LOG_OBJECT (parse, "Text : %s", t); if (gst_ssa_parse_remove_override_codes (parse, t)) { -@@ -307,13 +414,22 @@ gst_ssa_parse_push_line (GstSsaParse * parse, gchar * txt, +@@ -309,13 +416,22 @@ gst_ssa_parse_push_line (GstSsaParse * parse, gchar * txt, gst_buffer_fill (buf, 0, escaped, len + 1); gst_buffer_set_size (buf, len); g_free (escaped); @@ -196,7 +201,7 @@ index 06ecef9..0ab5dce ret = gst_pad_push (parse->srcpad, buf); -@@ -333,6 +449,7 @@ gst_ssa_parse_chain (GstPad * sinkpad, GstObject * parent, GstBuffer * buf) +@@ -335,6 +451,7 @@ gst_ssa_parse_chain (GstPad * sinkpad, GstObject * parent, GstBuffer * buf) GstClockTime ts; gchar *txt; GstMapInfo map; @@ -204,7 +209,7 @@ index 06ecef9..0ab5dce if (G_UNLIKELY (!parse->framed)) goto not_framed; -@@ -350,13 +467,14 @@ gst_ssa_parse_chain (GstPad * sinkpad, GstObject * parent, GstBuffer * buf) +@@ -352,13 +469,14 @@ gst_ssa_parse_chain (GstPad * sinkpad, GstObject * parent, GstBuffer * buf) /* make double-sure it's 0-terminated and all */ gst_buffer_map (buf, &map, GST_MAP_READ); txt = g_strndup ((gchar *) map.data, map.size); @@ -220,6 +225,3 @@ index 06ecef9..0ab5dce if (ret != GST_FLOW_OK && GST_CLOCK_TIME_IS_VALID (ts)) { GstSegment segment; --- -1.7.9.5 - diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0004-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0004-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch index 4adf605460..aaeb611fec 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0004-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0004-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch @@ -1,20 +1,21 @@ -From 4330915d88dc4dd46eb4c28d756482b767c2747f Mon Sep 17 00:00:00 2001 +From 53b5868491cf99ee797192395dbfeb69df23edd2 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Mon, 26 Oct 2015 17:30:14 +0200 -Subject: [PATCH 4/4] rtsp: drop incorrect reference to gstreamer-sdp in +Subject: [PATCH] rtsp: drop incorrect reference to gstreamer-sdp in Makefile.am Upstream-Status: Pending [review on oe-core maillist] Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> + --- gst-libs/gst/rtsp/Makefile.am | 1 - 1 file changed, 1 deletion(-) diff --git a/gst-libs/gst/rtsp/Makefile.am b/gst-libs/gst/rtsp/Makefile.am -index 4f6d9f8..0afa370 100644 +index 79027cb..2987e23 100644 --- a/gst-libs/gst/rtsp/Makefile.am +++ b/gst-libs/gst/rtsp/Makefile.am -@@ -75,7 +75,6 @@ GstRtsp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERS +@@ -79,7 +79,6 @@ GstRtsp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERS --libtool="$(LIBTOOL)" \ --pkg gio-2.0 \ --pkg gstreamer-@GST_API_VERSION@ \ @@ -22,6 +23,3 @@ index 4f6d9f8..0afa370 100644 --pkg-export gstreamer-rtsp-@GST_API_VERSION@ \ --add-init-section="$(INTROSPECTION_INIT)" \ --output $@ \ --- -2.6.2 - diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0004-subparse-set-need_segment-after-sink-pad-received-GS.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0004-subparse-set-need_segment-after-sink-pad-received-GS.patch deleted file mode 100644 index b924e38824..0000000000 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0004-subparse-set-need_segment-after-sink-pad-received-GS.patch +++ /dev/null @@ -1,69 +0,0 @@ -From ed09c8fd2c9c2b5384b72cc70af3728be6694e64 Mon Sep 17 00:00:00 2001 -From: Mingke Wang <mingke.wang@freescale.com> -Date: Thu, 19 Mar 2015 14:20:26 +0800 -Subject: [PATCH 4/4] subparse: set need_segment after sink pad received - GST_EVENT_SEGMENT - -subparse works in push mode, chain funciton will be called once -up stream element finished the seeking and flushing. -if set need_segment flag in src pad event handler, the segment -event will be pushed earlier, result in the subtitle text will -be send out to down stream from the beginning. - -Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=747498] - -Signed-off-by: Mingke Wang <mingke.wang@freescale.com> - -diff --git a/gst/subparse/gstsubparse.c b/gst/subparse/gstsubparse.c -old mode 100644 -new mode 100755 -index b565e93..7741ccc ---- a/gst/subparse/gstsubparse.c -+++ b/gst/subparse/gstsubparse.c -@@ -266,22 +266,20 @@ gst_sub_parse_src_event (GstPad * pad, GstObject * parent, GstEvent * event) - goto beach; - } - -+ /* Apply the seek to our segment */ -+ gst_segment_do_seek (&self->segment, rate, format, flags, -+ start_type, start, stop_type, stop, &update); -+ -+ GST_DEBUG_OBJECT (self, "segment after seek: %" GST_SEGMENT_FORMAT, -+ &self->segment); -+ - /* Convert that seek to a seeking in bytes at position 0, - FIXME: could use an index */ - ret = gst_pad_push_event (self->sinkpad, - gst_event_new_seek (rate, GST_FORMAT_BYTES, flags, - GST_SEEK_TYPE_SET, 0, GST_SEEK_TYPE_NONE, 0)); - -- if (ret) { -- /* Apply the seek to our segment */ -- gst_segment_do_seek (&self->segment, rate, format, flags, -- start_type, start, stop_type, stop, &update); -- -- GST_DEBUG_OBJECT (self, "segment after seek: %" GST_SEGMENT_FORMAT, -- &self->segment); -- -- self->need_segment = TRUE; -- } else { -+ if (!ret) { - GST_WARNING_OBJECT (self, "seek to 0 bytes failed"); - } - -@@ -1641,8 +1639,10 @@ gst_sub_parse_sink_event (GstPad * pad, GstObject * parent, GstEvent * event) - gst_event_parse_segment (event, &s); - if (s->format == GST_FORMAT_TIME) - gst_event_copy_segment (event, &self->segment); -- GST_DEBUG_OBJECT (self, "newsegment (%s)", -- gst_format_get_name (self->segment.format)); -+ GST_DEBUG_OBJECT (self, "newsegment (%s) %" GST_SEGMENT_FORMAT, -+ gst_format_get_name (self->segment.format), &self->segment); -+ -+ self->need_segment = TRUE; - - /* if not time format, we'll either start with a 0 timestamp anyway or - * it's following a seek in which case we'll have saved the requested --- -1.7.9.5 - diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0009-glimagesink-Downrank-to-marginal.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0009-glimagesink-Downrank-to-marginal.patch new file mode 100644 index 0000000000..c81fb0f6aa --- /dev/null +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0009-glimagesink-Downrank-to-marginal.patch @@ -0,0 +1,32 @@ +From c6b37a80806f9128de47f1ccc3f2354f8d436bb6 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Thu, 24 Sep 2015 19:47:32 +0300 +Subject: [PATCH] glimagesink: Downrank to marginal + +On desktop, where there is good OpenGL, xvimagesink will come up first, +on other platforms, OpenGL can't be trusted because it's either software (like +in a VM) or broken (like on embedded)., so let ximagesink come above. + +Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=751684] + +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + ext/gl/gstopengl.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ext/gl/gstopengl.c b/ext/gl/gstopengl.c +index a4b2540..0ccaacd 100644 +--- a/ext/gl/gstopengl.c ++++ b/ext/gl/gstopengl.c +@@ -118,7 +118,7 @@ plugin_init (GstPlugin * plugin) + #endif + + if (!gst_element_register (plugin, "glimagesink", +- GST_RANK_SECONDARY, gst_gl_image_sink_bin_get_type ())) { ++ GST_RANK_MARGINAL, gst_gl_image_sink_bin_get_type ())) { + return FALSE; + } + +-- +2.1.4 + diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/get-caps-from-src-pad-when-query-caps.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/get-caps-from-src-pad-when-query-caps.patch index c8e6287a55..a4727e23ea 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/get-caps-from-src-pad-when-query-caps.patch +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/get-caps-from-src-pad-when-query-caps.patch @@ -1,4 +1,4 @@ -From af0dac26f62aaceb4bf266720911953793e0fc5d Mon Sep 17 00:00:00 2001 +From 41de2ec64ab06bb58c82c1659adaa3811bc5bcf8 Mon Sep 17 00:00:00 2001 From: zhouming <b42586@freescale.com> Date: Wed, 14 May 2014 10:16:20 +0800 Subject: [PATCH] ENGR00312515: get caps from src pad when query caps @@ -8,18 +8,19 @@ https://bugzilla.gnome.org/show_bug.cgi?id=728312 Upstream-Status: Pending Signed-off-by: zhouming <b42586@freescale.com> + --- - gst-libs/gst/tag/gsttagdemux.c | 13 +++++++++++++ + gst-libs/gst/tag/gsttagdemux.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) mode change 100644 => 100755 gst-libs/gst/tag/gsttagdemux.c diff --git a/gst-libs/gst/tag/gsttagdemux.c b/gst-libs/gst/tag/gsttagdemux.c old mode 100644 new mode 100755 -index 9b6c478..ae2294a +index 8a127c8..71c5d78 --- a/gst-libs/gst/tag/gsttagdemux.c +++ b/gst-libs/gst/tag/gsttagdemux.c -@@ -1769,6 +1769,19 @@ gst_tag_demux_pad_query (GstPad * pad, GstObject * parent, GstQuery * query) +@@ -1759,6 +1759,19 @@ gst_tag_demux_pad_query (GstPad * pad, GstObject * parent, GstQuery * query) } break; } @@ -39,6 +40,3 @@ index 9b6c478..ae2294a default: res = gst_pad_query_default (pad, parent, query); break; --- -1.7.9.5 - diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/link-with-libvchostif.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/link-with-libvchostif.patch new file mode 100644 index 0000000000..d5a7f6bdc2 --- /dev/null +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/link-with-libvchostif.patch @@ -0,0 +1,45 @@ +From 9866f51e5e0913f1e453eb574618bf7432f38cb6 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 11 Apr 2018 10:46:33 +0800 +Subject: [PATCH] Add -lvchostif to link when using -lEGL on rpi + +This is required because libEGL from userland uses sybols +from this library. + +lib/libEGL.so.1.0.0 121: 00000000 0 FUNC GLOBAL DEFAULT UND vc_dispmanx_element_add + 1552: 00000000 0 FUNC GLOBAL DEFAULT UND vc_dispmanx_element_add + +These symbols are provided by libvchostif as seen below + +lib/libvchostif.so + 252: 0000b161 192 FUNC GLOBAL DEFAULT 9 vc_dispmanx_element_add + 809: 0000b161 192 FUNC GLOBAL DEFAULT 9 vc_dispmanx_element_add + +With this explicit link, plugins fail during runtime + +(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 +(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 + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> +--- + m4/gst-gl.m4 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/m4/gst-gl.m4 b/m4/gst-gl.m4 +index 1e97240..ab7774c 100644 +--- a/m4/gst-gl.m4 ++++ b/m4/gst-gl.m4 +@@ -231,7 +231,7 @@ case $host in + HAVE_EGL=yes + HAVE_GLES2=yes + HAVE_EGL_RPI=yes +- EGL_LIBS="-lbcm_host -lvcos -lvchiq_arm" ++ EGL_LIBS="-lbcm_host -lvchostif -lvcos -lvchiq_arm" + EGL_CFLAGS="" + AC_DEFINE(USE_EGL_RPI, [1], [Use RPi platform]) + ]) +-- +2.7.4 + diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/make-gio_unix_2_0-dependency-configurable.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/make-gio_unix_2_0-dependency-configurable.patch index 413eff0695..23950b67f2 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/make-gio_unix_2_0-dependency-configurable.patch +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/make-gio_unix_2_0-dependency-configurable.patch @@ -1,4 +1,4 @@ -From 10d2a977ee1d469f0bf9059bb2d0b55fd2eecbac Mon Sep 17 00:00:00 2001 +From 7ffa6e3d00e1d8a060f3f4c2bb9a72691af05d79 Mon Sep 17 00:00:00 2001 From: Andre McCurdy <armccurdy@gmail.com> Date: Wed, 20 Jan 2016 13:00:00 -0800 Subject: [PATCH] make gio_unix_2_0 dependency configurable @@ -17,16 +17,17 @@ instead of AG_GST_CHECK_FEATURE. Upstream-Status: Pending Signed-off-by: Andre McCurdy <armccurdy@gmail.com> + --- configure.ac | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/configure.ac b/configure.ac -index 9c52aeb..26cacd6 100644 +index 12807bc..35a0bf3 100644 --- a/configure.ac +++ b/configure.ac -@@ -752,9 +752,16 @@ AC_SUBST(FT2_CFLAGS) - fi dnl of EXT plugins +@@ -806,9 +806,16 @@ AM_CONDITIONAL(HAVE_PNG, test "x$HAVE_PNG" = "xyes") + AM_CONDITIONAL(HAVE_JPEG, test "x$HAVE_JPEG" = "xyes") dnl *** gio-unix-2.0 for tests/check/pipelines/tcp.c *** +AC_ARG_ENABLE([gio_unix_2_0], @@ -42,6 +43,3 @@ index 9c52aeb..26cacd6 100644 AM_CONDITIONAL(USE_GIO_UNIX_2_0, test "x$HAVE_GIO_UNIX_2_0" = "xyes") dnl *** finalize CFLAGS, LDFLAGS, LIBS --- -1.9.1 - diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.12.4.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.12.4.bb deleted file mode 100644 index dd895bbcb1..0000000000 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.12.4.bb +++ /dev/null @@ -1,18 +0,0 @@ -require gstreamer1.0-plugins-base.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=c54ce9345727175ff66d17b67ff51f58 \ - file://COPYING.LIB;md5=6762ed442b3822387a51c92d928ead0d \ - file://common/coverage/coverage-report.pl;beginline=2;endline=17;md5=a4e1830fce078028c8f0974161272607" - -SRC_URI = " \ - http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-${PV}.tar.xz \ - file://get-caps-from-src-pad-when-query-caps.patch \ - file://0003-ssaparse-enhance-SSA-text-lines-parsing.patch \ - file://0004-subparse-set-need_segment-after-sink-pad-received-GS.patch \ - file://make-gio_unix_2_0-dependency-configurable.patch \ - file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \ -" -SRC_URI[md5sum] = "b35b04071f69b8ab69a7f3a497ff0131" -SRC_URI[sha256sum] = "4c306b03df0212f1b8903784e29bb3493319ba19ebebf13b0c56a17870292282" - -S = "${WORKDIR}/gst-plugins-base-${PV}" 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.0.bb new file mode 100644 index 0000000000..224faa2cf8 --- /dev/null +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.14.0.bb @@ -0,0 +1,71 @@ +require gstreamer1.0-plugins.inc + +LICENSE = "GPLv2+ & LGPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=c54ce9345727175ff66d17b67ff51f58 \ + file://COPYING.LIB;md5=6762ed442b3822387a51c92d928ead0d \ + file://common/coverage/coverage-report.pl;beginline=2;endline=17;md5=a4e1830fce078028c8f0974161272607" + +SRC_URI = " \ + http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-${PV}.tar.xz \ + file://get-caps-from-src-pad-when-query-caps.patch \ + file://0003-ssaparse-enhance-SSA-text-lines-parsing.patch \ + file://make-gio_unix_2_0-dependency-configurable.patch \ + file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \ + file://0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch \ + file://0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch \ + file://0003-riff-add-missing-include-directories-when-calling-in.patch \ + file://0004-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch \ + file://0009-glimagesink-Downrank-to-marginal.patch \ + file://0001-gstreamer-gl.pc.in-don-t-append-GL_CFLAGS-to-CFLAGS.patch \ + file://link-with-libvchostif.patch \ + file://0001-gl-pick-up-GstVideo-1.0.gir-from-local-build-dir.patch \ + " +SRC_URI[md5sum] = "370271327dd23110421a9c2927ac989a" +SRC_URI[sha256sum] = "7e904660ff56e02b036cf7fdfb77a50a540828ca9d2614d69ba931772e5b6940" + +S = "${WORKDIR}/gst-plugins-base-${PV}" + +DEPENDS += "iso-codes util-linux" + +inherit gettext + +PACKAGES_DYNAMIC =+ "^libgst.*" + +PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gles2 egl', '', d)}" +PACKAGECONFIG ??= " \ + ${GSTREAMER_ORC} \ + ${@bb.utils.filter('DISTRO_FEATURES', 'alsa x11', d)} \ + gio-unix-2.0 ogg pango theora vorbis zlib jpeg \ + ${PACKAGECONFIG_GL} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland egl', '', d)} \ +" + +X11DEPENDS = "virtual/libx11 libsm libxrender libxv" +X11ENABLEOPTS = "--enable-x --enable-xvideo --enable-xshm" +X11DISABLEOPTS = "--disable-x --disable-xvideo --disable-xshm" + +PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib" +PACKAGECONFIG[cdparanoia] = "--enable-cdparanoia,--disable-cdparanoia,cdparanoia" +PACKAGECONFIG[gio-unix-2.0] = "--enable-gio_unix_2_0,--disable-gio_unix_2_0,glib-2.0" +PACKAGECONFIG[ivorbis] = "--enable-ivorbis,--disable-ivorbis,tremor" +PACKAGECONFIG[ogg] = "--enable-ogg,--disable-ogg,libogg" +PACKAGECONFIG[opus] = "--enable-opus,--disable-opus,libopus" +PACKAGECONFIG[pango] = "--enable-pango,--disable-pango,pango" +PACKAGECONFIG[theora] = "--enable-theora,--disable-theora,libtheora" +PACKAGECONFIG[visual] = "--enable-libvisual,--disable-libvisual,libvisual" +PACKAGECONFIG[vorbis] = "--enable-vorbis,--disable-vorbis,libvorbis" +PACKAGECONFIG[x11] = "${X11ENABLEOPTS},${X11DISABLEOPTS},${X11DEPENDS}" +PACKAGECONFIG[zlib] = "--enable-zlib,--disable-zlib,zlib" +PACKAGECONFIG[opengl] = "--enable-opengl,--disable-opengl,virtual/libgl libglu" +PACKAGECONFIG[gles2] = "--enable-gles2,--disable-gles2,virtual/libgles2" +PACKAGECONFIG[egl] = "--enable-egl,--disable-egl,virtual/egl" +PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,wayland-native wayland wayland-protocols libdrm" +PACKAGECONFIG[jpeg] = ",,jpeg" + +FILES_${MLPREFIX}libgsttag-1.0 += "${datadir}/gst-plugins-base/1.0/license-translations.dict" + +do_compile_prepend() { + export GIR_EXTRA_LIBS_PATH="${B}/gst-libs/gst/tag/.libs:${B}/gst-libs/gst/video/.libs:${B}/gst-libs/gst/audio/.libs:${B}/gst-libs/gst/rtp/.libs" +} + +FILES_${PN}-dev += "${libdir}/gstreamer-${LIBV}/include/gst/gl/gstglconfig.h" -- 2.14.1 ^ permalink raw reply related [flat|nested] 25+ messages in thread
* [PATCH 03/12] gst-plugins-good: upgrade 1.12.4 -> 1.14.0 2018-05-03 8:17 [PATCH 01/12] gstreamer1.0: upgrade 1.12.4 -> 1.14.0 Anuj Mittal 2018-05-03 8:17 ` [PATCH 02/12] gst-plugins-base: " Anuj Mittal @ 2018-05-03 8:17 ` Anuj Mittal 2018-05-03 8:17 ` [PATCH 04/12] gst-plugins-bad: " Anuj Mittal ` (10 subsequent siblings) 12 siblings, 0 replies; 25+ messages in thread From: Anuj Mittal @ 2018-05-03 8:17 UTC (permalink / raw) To: openembedded-core * For changes, please see: https://gstreamer.freedesktop.org/releases/1.14/ * With the expiration of mp3 patents [1], mp3 decoders and encoders have been moved to -plugins-good from -plugins-ugly (also see the release notes). * Move bz2 and zlib to PACKAGECONFIG. * gtk+ plugin has moved to -good from -bad. Enable it by default. * qt plugin has also moved to -good from -bad but it's disabled by default. [1] https://www.iis.fraunhofer.de/en/ff/amm/prod/audiocodec/audiocodecs/mp3.html Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> --- .../gstreamer/gstreamer1.0-plugins-good_1.12.4.bb | 20 ------------ ...ood.inc => gstreamer1.0-plugins-good_1.14.0.bb} | 36 +++++++++++++++++++--- 2 files changed, 31 insertions(+), 25 deletions(-) delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.12.4.bb rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-good.inc => gstreamer1.0-plugins-good_1.14.0.bb} (52%) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.12.4.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.12.4.bb deleted file mode 100644 index a0609641d6..0000000000 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.12.4.bb +++ /dev/null @@ -1,20 +0,0 @@ -require gstreamer1.0-plugins-good.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ - file://common/coverage/coverage-report.pl;beginline=2;endline=17;md5=a4e1830fce078028c8f0974161272607 \ - file://gst/replaygain/rganalysis.c;beginline=1;endline=23;md5=b60ebefd5b2f5a8e0cab6bfee391a5fe" - -SRC_URI = " \ - http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-${PV}.tar.xz \ - file://0001-gstrtpmp4gpay-set-dafault-value-for-MPEG4-without-co.patch \ - file://avoid-including-sys-poll.h-directly.patch \ - file://ensure-valid-sentinel-for-gst_structure_get.patch \ - file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \ -" -SRC_URI[md5sum] = "bdf4791a2b788ec6a149b81ff4032038" -SRC_URI[sha256sum] = "649f49bec60892d47ee6731b92266974c723554da1c6649f21296097715eb957" - -S = "${WORKDIR}/gst-plugins-good-${PV}" - -RPROVIDES_${PN}-pulseaudio += "${PN}-pulse" -RPROVIDES_${PN}-soup += "${PN}-souphttpsrc" diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.14.0.bb similarity index 52% rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.14.0.bb index 14c3d61848..481ac51908 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.14.0.bb @@ -1,15 +1,33 @@ require gstreamer1.0-plugins.inc +SRC_URI = " \ + http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-${PV}.tar.xz \ + file://0001-gstrtpmp4gpay-set-dafault-value-for-MPEG4-without-co.patch \ + file://avoid-including-sys-poll.h-directly.patch \ + file://ensure-valid-sentinel-for-gst_structure_get.patch \ + file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \ + " + +SRC_URI[md5sum] = "48584b02e469a314b0e71f1553a2d2a7" +SRC_URI[sha256sum] = "6afa35747d528d3ab4ed8f5eac13f7235d7d28100d6a24dd78f81ec7c0d04688" + +S = "${WORKDIR}/gst-plugins-good-${PV}" + LICENSE = "GPLv2+ & LGPLv2.1+" +LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ + file://common/coverage/coverage-report.pl;beginline=2;endline=17;md5=a4e1830fce078028c8f0974161272607 \ + file://gst/replaygain/rganalysis.c;beginline=1;endline=23;md5=b60ebefd5b2f5a8e0cab6bfee391a5fe" -DEPENDS += "gstreamer1.0-plugins-base libcap zlib bzip2" +DEPENDS += "gstreamer1.0-plugins-base libcap" +RPROVIDES_${PN}-pulseaudio += "${PN}-pulse" +RPROVIDES_${PN}-soup += "${PN}-souphttpsrc" inherit gettext PACKAGECONFIG ??= " \ ${GSTREAMER_ORC} \ ${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio x11', d)} \ - cairo flac gdk-pixbuf gudev jpeg libpng soup speex taglib v4l2 \ + cairo flac gdk-pixbuf gudev jpeg libpng soup speex taglib v4l2 bz2 zlib gtk \ " X11DEPENDS = "virtual/libx11 libsm libxrender libxfixes libxdamage" @@ -31,11 +49,19 @@ PACKAGECONFIG[v4l2] = "--enable-gst_v4l2 --enable-v4l2-probe,--disable-gst PACKAGECONFIG[vpx] = "--enable-vpx,--disable-vpx,libvpx" PACKAGECONFIG[wavpack] = "--enable-wavpack,--disable-wavpack,wavpack" PACKAGECONFIG[x11] = "--enable-x,--disable-x,${X11DEPENDS}" +PACKAGECONFIG[bz2] = "--enable-bz2,--disable-bz2,bzip2" +PACKAGECONFIG[zlib] = "--enable-zlib,--disable-zlib,zlib" +PACKAGECONFIG[lame] = "--enable-lame,--disable-lame,lame" +PACKAGECONFIG[mpg123] = "--enable-mpg123,--disable-mpg123,mpg123" +PACKAGECONFIG[gtk] = "--enable-gtk3,--disable-gtk3,gtk+3" + +# qt5 support is disabled, because it is not present in OE core, and requires more work than +# just adding a packageconfig (it requires access to moc, uic, rcc, and qmake paths). +# This is better done in a separate qt5 layer (which then should add a "qt5" packageconfig +# in a gstreamer1.0-plugins-good bbappend). EXTRA_OECONF += " \ - --enable-bz2 \ --enable-oss \ - --enable-zlib \ --disable-aalib \ --disable-aalibtest \ --disable-directsound \ @@ -45,8 +71,8 @@ EXTRA_OECONF += " \ --disable-osx_audio \ --disable-osx_video \ --disable-shout2 \ - --disable-sunaudio \ --disable-waveform \ + --disable-qt \ " FILES_${PN}-equalizer += "${datadir}/gstreamer-1.0/presets/*.prs" -- 2.14.1 ^ permalink raw reply related [flat|nested] 25+ messages in thread
* [PATCH 04/12] gst-plugins-bad: upgrade 1.12.4 -> 1.14.0 2018-05-03 8:17 [PATCH 01/12] gstreamer1.0: upgrade 1.12.4 -> 1.14.0 Anuj Mittal 2018-05-03 8:17 ` [PATCH 02/12] gst-plugins-base: " Anuj Mittal 2018-05-03 8:17 ` [PATCH 03/12] gst-plugins-good: " Anuj Mittal @ 2018-05-03 8:17 ` Anuj Mittal 2018-05-03 8:17 ` [PATCH 05/12] gst-plugins-ugly: " Anuj Mittal ` (9 subsequent siblings) 12 siblings, 0 replies; 25+ messages in thread From: Anuj Mittal @ 2018-05-03 8:17 UTC (permalink / raw) To: openembedded-core * 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. Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> --- ...-don-t-hardcode-libtool-name-when-running.patch | 51 ++++------------- ...gl.pc.in-don-t-append-GL_CFLAGS-to-CFLAGS.patch | 29 ---------- ...y-Use-ifdef-for-platform-specific-defines.patch | 37 ------------- ...n-Use-the-generated-version-of-vkconfig.h.patch | 64 ---------------------- .../0009-glimagesink-Downrank-to-marginal.patch | 32 ----------- .../link-with-libvchostif.patch | 35 ------------ .../gstreamer/gstreamer1.0-plugins-bad_1.12.4.bb | 24 -------- ...-bad.inc => gstreamer1.0-plugins-bad_1.14.0.bb} | 43 ++++++--------- 8 files changed, 28 insertions(+), 287 deletions(-) delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-gstreamer-gl.pc.in-don-t-append-GL_CFLAGS-to-CFLAGS.patch delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-vkdisplay-Use-ifdef-for-platform-specific-defines.patch delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0002-vulkan-Use-the-generated-version-of-vkconfig.h.patch delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0009-glimagesink-Downrank-to-marginal.patch delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/link-with-libvchostif.patch delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.12.4.bb rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-bad.inc => gstreamer1.0-plugins-bad_1.14.0.bb} (81%) 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 @@ -From 7592e793b3906355d76ca9a59f8fea2749ea2a4e Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Tue, 27 Oct 2015 14:36:58 +0200 -Subject: [PATCH] Makefile.am: don't hardcode libtool name when running +From 7d8e8b8bcce34d01fc7ad7285b4eb17ad8949399 Mon Sep 17 00:00:00 2001 +From: Anuj Mittal <anuj.mittal@intel.com> +Date: Wed, 11 Apr 2018 11:06:39 +0800 +Subject: [PATCH] Makefile.am: don't hardcode libtool name when running introspection tools Upstream-Status: Pending [review on oe-core list] Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> - -%% original patch: 0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch - Signed-off-by: Maxin B. John <maxin.john@intel.com> --- - gst-libs/gst/allocators/Makefile.am | 2 +- - gst-libs/gst/gl/Makefile.am | 2 +- - gst-libs/gst/insertbin/Makefile.am | 2 +- - gst-libs/gst/mpegts/Makefile.am | 2 +- - 4 files changed, 4 insertions(+), 4 deletions(-) + gst-libs/gst/insertbin/Makefile.am | 2 +- + gst-libs/gst/mpegts/Makefile.am | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) -diff --git a/gst-libs/gst/allocators/Makefile.am b/gst-libs/gst/allocators/Makefile.am -index e50d077..623f092 100644 ---- a/gst-libs/gst/allocators/Makefile.am -+++ b/gst-libs/gst/allocators/Makefile.am -@@ -37,7 +37,7 @@ GstBadAllocators-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstbadalloca - --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ - --library=libgstbadallocators-@GST_API_VERSION@.la \ - --include=Gst-@GST_API_VERSION@ \ -- --libtool="$(top_builddir)/libtool" \ -+ --libtool="$(LIBTOOL)" \ - --pkg gstreamer-@GST_API_VERSION@ \ - --pkg-export gstreamer-badallocators-@GST_API_VERSION@ \ - --output $@ \ -diff --git a/gst-libs/gst/gl/Makefile.am b/gst-libs/gst/gl/Makefile.am -index 2ae4773..dfa7a7d 100644 ---- a/gst-libs/gst/gl/Makefile.am -+++ b/gst-libs/gst/gl/Makefile.am -@@ -178,7 +178,7 @@ GstGL-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstgl-@GST_API_VERSION@ - --include=Gst-@GST_API_VERSION@ \ - --include=GstBase-@GST_API_VERSION@ \ - --include=GstVideo-@GST_API_VERSION@ \ -- --libtool="$(top_builddir)/libtool" \ -+ --libtool="$(LIBTOOL)" \ - --pkg gstreamer-@GST_API_VERSION@ \ - --pkg gstreamer-base-@GST_API_VERSION@ \ - --pkg gstreamer-video-@GST_API_VERSION@ \ diff --git a/gst-libs/gst/insertbin/Makefile.am b/gst-libs/gst/insertbin/Makefile.am index 1f8ea30..4b98ef6 100644 --- a/gst-libs/gst/insertbin/Makefile.am @@ -57,10 +26,10 @@ index 1f8ea30..4b98ef6 100644 --pkg gstreamer-base-@GST_API_VERSION@ \ --pkg-export gstreamer-insertbin-@GST_API_VERSION@ \ diff --git a/gst-libs/gst/mpegts/Makefile.am b/gst-libs/gst/mpegts/Makefile.am -index aeea32e..929d9cc 100644 +index f264e33..9934a4d 100644 --- a/gst-libs/gst/mpegts/Makefile.am +++ b/gst-libs/gst/mpegts/Makefile.am -@@ -79,7 +79,7 @@ GstMpegts-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstmpegts-@GST_API_ +@@ -82,7 +82,7 @@ GstMpegts-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstmpegts-@GST_API_ --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-video-@GST_API_VERSION@` \ --library=libgstmpegts-@GST_API_VERSION@.la \ --include=Gst-@GST_API_VERSION@ \ @@ -70,5 +39,5 @@ index aeea32e..929d9cc 100644 --pkg gstreamer-video-@GST_API_VERSION@ \ --pkg-export gstreamer-mpegts-@GST_API_VERSION@ \ -- -2.4.0 +2.7.4 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 @@ -From 5622ca3b61603dc316a0f1fbede3f9aa353a5e48 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Fri, 12 May 2017 16:47:12 +0300 -Subject: [PATCH] gstreamer-gl.pc.in: don't append GL_CFLAGS to CFLAGS - -Dependencies' include directories should not be added in this way; -it causes problems when cross-compiling in sysroot environments. - -Upstream-Status: Pending - -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> -Signed-off-by: Maxin B. John <maxin.john@intel.com> ---- - pkgconfig/gstreamer-gl.pc.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/pkgconfig/gstreamer-gl.pc.in b/pkgconfig/gstreamer-gl.pc.in -index 8e7a303..d167be1 100644 ---- a/pkgconfig/gstreamer-gl.pc.in -+++ b/pkgconfig/gstreamer-gl.pc.in -@@ -13,4 +13,4 @@ Version: @VERSION@ - Requires: gstreamer-base-@GST_API_VERSION@ gstreamer-@GST_API_VERSION@ - - Libs: -L${libdir} -lgstgl-@GST_API_VERSION@ --Cflags: -I${includedir} -I${libdir}/gstreamer-@GST_API_VERSION@/include @GL_CFLAGS@ -+Cflags: -I${includedir} -I${libdir}/gstreamer-@GST_API_VERSION@/include --- -2.4.0 - 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 @@ -From 1523ab462c1bf19055960ced255f4872b6cf9f5c Mon Sep 17 00:00:00 2001 -From: Jussi Kukkonen <jussi.kukkonen@intel.com> -Date: Wed, 5 Jul 2017 11:00:42 +0300 -Subject: [PATCH 1/2] vkdisplay: Use ifdef for platform specific defines - -VK_KHR_*_SURFACE_EXTENSION_NAME are only available when corresponding -WSI is enabled. - -Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> -Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=784539] ---- - ext/vulkan/vkdisplay.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/ext/vulkan/vkdisplay.c b/ext/vulkan/vkdisplay.c -index 550134cd8..ade5d4583 100644 ---- a/ext/vulkan/vkdisplay.c -+++ b/ext/vulkan/vkdisplay.c -@@ -448,11 +448,15 @@ gst_vulkan_display_type_to_extension_string (GstVulkanDisplayType type) - if (type == GST_VULKAN_DISPLAY_TYPE_NONE) - return NULL; - -+#if GST_VULKAN_HAVE_WINDOW_XCB - if (type & GST_VULKAN_DISPLAY_TYPE_XCB) - return VK_KHR_XCB_SURFACE_EXTENSION_NAME; -+#endif - -+#if GST_VULKAN_HAVE_WINDOW_WAYLAND - if (type & GST_VULKAN_DISPLAY_TYPE_WAYLAND) - return VK_KHR_WAYLAND_SURFACE_EXTENSION_NAME; -+#endif - - return NULL; - } --- -2.13.2 - 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 @@ -From c23e1dc22deb495561cffb877edb2746b740a1fa Mon Sep 17 00:00:00 2001 -From: Jussi Kukkonen <jussi.kukkonen@intel.com> -Date: Wed, 5 Jul 2017 11:07:05 +0300 -Subject: [PATCH 2/2] vulkan: Use the generated version of vkconfig.h - -Build fails in ext/vulkan/xcb and ext/vulkan/wayland when: -* building from tarball -* building out-of-tree -* Only one WSI integration (xcb or wayland) is enabled by configure.ac -This is because vkconfig.h from source directory gets used instead -of the generated one. - -Add the correct build directory to "-I". Use angle bracket -include in vkapi.h so that it actually looks in the include search -path instead of defaulting to the same (source tree) directory. - -Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> -Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=784539] ---- - ext/vulkan/vkapi.h | 2 +- - ext/vulkan/wayland/Makefile.am | 1 + - ext/vulkan/xcb/Makefile.am | 1 + - 3 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/ext/vulkan/vkapi.h b/ext/vulkan/vkapi.h -index e9c23aa92..a37c29d0f 100644 ---- a/ext/vulkan/vkapi.h -+++ b/ext/vulkan/vkapi.h -@@ -23,7 +23,7 @@ - - #define VK_PROTOTYPES - --#include "vkconfig.h" -+#include <vkconfig.h> - #include "vk_fwd.h" - #include "vkmacros.h" - -diff --git a/ext/vulkan/wayland/Makefile.am b/ext/vulkan/wayland/Makefile.am -index f92d85e2c..10cfb70e6 100644 ---- a/ext/vulkan/wayland/Makefile.am -+++ b/ext/vulkan/wayland/Makefile.am -@@ -14,6 +14,7 @@ noinst_HEADERS = \ - - libgstvulkan_wayland_la_CFLAGS = \ - -I$(top_srcdir)/gst-libs \ -+ -I$(top_builddir)/ext/vulkan \ - -I$(top_srcdir)/ext/vulkan \ - -I$(top_builddir)/gst-libs \ - $(GST_PLUGINS_BASE_CFLAGS) \ -diff --git a/ext/vulkan/xcb/Makefile.am b/ext/vulkan/xcb/Makefile.am -index 7debcff9e..b5103551b 100644 ---- a/ext/vulkan/xcb/Makefile.am -+++ b/ext/vulkan/xcb/Makefile.am -@@ -14,6 +14,7 @@ noinst_HEADERS = \ - - libgstvulkan_xcb_la_CFLAGS = \ - -I$(top_srcdir)/gst-libs \ -+ -I$(top_builddir)/ext/vulkan \ - -I$(top_srcdir)/ext/vulkan \ - -I$(top_builddir)/gst-libs \ - $(GST_PLUGINS_BASE_CFLAGS) \ --- -2.13.2 - 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 @@ -From c6b37a80806f9128de47f1ccc3f2354f8d436bb6 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Thu, 24 Sep 2015 19:47:32 +0300 -Subject: [PATCH] glimagesink: Downrank to marginal - -On desktop, where there is good OpenGL, xvimagesink will come up first, -on other platforms, OpenGL can't be trusted because it's either software (like -in a VM) or broken (like on embedded)., so let ximagesink come above. - -Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=751684] - -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ---- - ext/gl/gstopengl.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ext/gl/gstopengl.c b/ext/gl/gstopengl.c -index a4b2540..0ccaacd 100644 ---- a/ext/gl/gstopengl.c -+++ b/ext/gl/gstopengl.c -@@ -118,7 +118,7 @@ plugin_init (GstPlugin * plugin) - #endif - - if (!gst_element_register (plugin, "glimagesink", -- GST_RANK_SECONDARY, gst_gl_image_sink_bin_get_type ())) { -+ GST_RANK_MARGINAL, gst_gl_image_sink_bin_get_type ())) { - return FALSE; - } - --- -2.1.4 - 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 @@ -Add -lvchostif to link when using -lEGL on rpi - -This is required because libEGL from userland uses sybols -from this library. - -lib/libEGL.so.1.0.0 121: 00000000 0 FUNC GLOBAL DEFAULT UND vc_dispmanx_element_add - 1552: 00000000 0 FUNC GLOBAL DEFAULT UND vc_dispmanx_element_add - -These symbols are provided by libvchostif as seen below - -lib/libvchostif.so - 252: 0000b161 192 FUNC GLOBAL DEFAULT 9 vc_dispmanx_element_add - 809: 0000b161 192 FUNC GLOBAL DEFAULT 9 vc_dispmanx_element_add - -With this explicit link, plugins fail during runtime - -(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 -(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 - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -Upstream-Status: Pending -Index: gst-plugins-bad-1.10.4/configure.ac -=================================================================== ---- gst-plugins-bad-1.10.4.orig/configure.ac -+++ gst-plugins-bad-1.10.4/configure.ac -@@ -785,7 +785,7 @@ case $host in - HAVE_EGL=yes - HAVE_GLES2=yes - HAVE_EGL_RPI=yes -- EGL_LIBS="-lbcm_host -lvcos -lvchiq_arm" -+ EGL_LIBS="-lbcm_host -lvchostif -lvcos -lvchiq_arm" - EGL_CFLAGS="" - AC_DEFINE(USE_EGL_RPI, [1], [Use RPi platform]) - ]) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.12.4.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.12.4.bb deleted file mode 100644 index 82c7ffcb1d..0000000000 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.12.4.bb +++ /dev/null @@ -1,24 +0,0 @@ -require gstreamer1.0-plugins-bad.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=73a5855a8119deb017f5f13cf327095d \ - file://COPYING.LIB;md5=21682e4e8fea52413fd26c60acb907e5 " - -SRC_URI = " \ - http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-${PV}.tar.xz \ - file://configure-allow-to-disable-libssh2.patch \ - file://fix-maybe-uninitialized-warnings-when-compiling-with-Os.patch \ - file://avoid-including-sys-poll.h-directly.patch \ - file://ensure-valid-sentinels-for-gst_structure_get-etc.patch \ - file://0001-gstreamer-gl.pc.in-don-t-append-GL_CFLAGS-to-CFLAGS.patch \ - file://0009-glimagesink-Downrank-to-marginal.patch \ - file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \ - file://link-with-libvchostif.patch \ - file://0001-vkdisplay-Use-ifdef-for-platform-specific-defines.patch \ - file://0002-vulkan-Use-the-generated-version-of-vkconfig.h.patch \ -" -SRC_URI[md5sum] = "64bf16cf15edaab1c0e02c8dee7170d0" -SRC_URI[sha256sum] = "0c7857be16686d5c1ba6e34bd338664d3d4599d32714a8eca5c8a41a101e2d08" - -S = "${WORKDIR}/gst-plugins-bad-${PV}" - - diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.14.0.bb similarity index 81% rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.14.0.bb index ca2ea9e963..ceaad7263f 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.14.0.bb @@ -1,27 +1,32 @@ require gstreamer1.0-plugins.inc -LICENSE = "GPLv2+ & LGPLv2+ & LGPLv2.1+" +SRC_URI = " \ + http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-${PV}.tar.xz \ + file://configure-allow-to-disable-libssh2.patch \ + file://fix-maybe-uninitialized-warnings-when-compiling-with-Os.patch \ + file://avoid-including-sys-poll.h-directly.patch \ + file://ensure-valid-sentinels-for-gst_structure_get-etc.patch \ + file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \ + file://0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch \ +" +SRC_URI[md5sum] = "555bbe7232fb4653c31b78e1f79068cf" +SRC_URI[sha256sum] = "ed5e2badb6f2858f60017b93334d91fe58a0e3f85ed2f37f2e931416fafb4f9f" -DEPENDS += "gstreamer1.0-plugins-base libpng jpeg" +S = "${WORKDIR}/gst-plugins-bad-${PV}" -inherit gettext bluetooth +LICENSE = "GPLv2+ & LGPLv2+ & LGPLv2.1+" +LIC_FILES_CHKSUM = "file://COPYING;md5=73a5855a8119deb017f5f13cf327095d \ + file://COPYING.LIB;md5=21682e4e8fea52413fd26c60acb907e5 " -SRC_URI_append = " \ - file://0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch \ -" +DEPENDS += "gstreamer1.0-plugins-base jpeg" -# opengl packageconfig factored out to make it easy for distros -# and BSP layers to pick either (desktop) opengl, gles2, or no GL -PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gles2 egl', '', d)}" +inherit gettext bluetooth -# gtk is not in the PACKAGECONFIG variable by default until -# the transition to gtk+3 is finished PACKAGECONFIG ??= " \ ${GSTREAMER_ORC} \ - ${PACKAGECONFIG_GL} \ ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \ ${@bb.utils.filter('DISTRO_FEATURES', 'directfb vulkan', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland egl', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)} \ bz2 curl dash dtls hls rsvg sbc smoothstreaming sndfile uvch264 webp \ " @@ -33,13 +38,10 @@ PACKAGECONFIG[dash] = "--enable-dash,--disable-dash,libxml2" PACKAGECONFIG[dc1394] = "--enable-dc1394,--disable-dc1394,libdc1394" PACKAGECONFIG[directfb] = "--enable-directfb,--disable-directfb,directfb" PACKAGECONFIG[dtls] = "--enable-dtls,--disable-dtls,openssl" -PACKAGECONFIG[egl] = "--enable-egl,--disable-egl,virtual/egl" PACKAGECONFIG[faac] = "--enable-faac,--disable-faac,faac" PACKAGECONFIG[faad] = "--enable-faad,--disable-faad,faad2" PACKAGECONFIG[flite] = "--enable-flite,--disable-flite,flite-alsa" PACKAGECONFIG[fluidsynth] = "--enable-fluidsynth,--disable-fluidsynth,fluidsynth" -PACKAGECONFIG[gles2] = "--enable-gles2,--disable-gles2,virtual/libgles2" -PACKAGECONFIG[gtk] = "--enable-gtk3,--disable-gtk3,gtk+3" PACKAGECONFIG[hls] = "--enable-hls --with-hls-crypto=nettle,--disable-hls,nettle" PACKAGECONFIG[kms] = "--enable-kms,--disable-kms,libdrm" PACKAGECONFIG[libmms] = "--enable-libmms,--disable-libmms,libmms" @@ -48,7 +50,6 @@ PACKAGECONFIG[modplug] = "--enable-modplug,--disable-modplug,libmodplug" PACKAGECONFIG[neon] = "--enable-neon,--disable-neon,neon" PACKAGECONFIG[openal] = "--enable-openal,--disable-openal,openal-soft" PACKAGECONFIG[opencv] = "--enable-opencv,--disable-opencv,opencv" -PACKAGECONFIG[opengl] = "--enable-opengl,--disable-opengl,virtual/libgl libglu" PACKAGECONFIG[openjpeg] = "--enable-openjpeg,--disable-openjpeg,openjpeg" # the opus encoder/decoder elements are now in the -base package, # but the opus parser remains in -bad @@ -57,7 +58,6 @@ PACKAGECONFIG[resindvd] = "--enable-resindvd,--disable-resindvd,libdvdrea PACKAGECONFIG[rsvg] = "--enable-rsvg,--disable-rsvg,librsvg" PACKAGECONFIG[rtmp] = "--enable-rtmp,--disable-rtmp,rtmpdump" PACKAGECONFIG[sbc] = "--enable-sbc,--disable-sbc,sbc" -PACKAGECONFIG[schroedinger] = "--enable-schro,--disable-schro,schroedinger" PACKAGECONFIG[smoothstreaming] = "--enable-smoothstreaming,--disable-smoothstreaming,libxml2" PACKAGECONFIG[sndfile] = "--enable-sndfile,--disable-sndfile,libsndfile1" PACKAGECONFIG[srtp] = "--enable-srtp,--disable-srtp,libsrtp" @@ -74,11 +74,6 @@ PACKAGECONFIG[webp] = "--enable-webp,--disable-webp,libwebp" # lv2 mpeg2enc mplex msdk musepack nvenc ofa openh264 opensles soundtouch spandsp # spc teletextdec tinyalsa vdpau wasapi x265 zbar webrtcdsp -# qt5 support is disabled, because it is not present in OE core, and requires more work than -# just adding a packageconfig (it requires access to moc, uic, rcc, and qmake paths). -# This is better done in a separate qt5 layer (which then should add a "qt5" packageconfig -# in a gstreamer1.0-plugins-bad bbappend). - EXTRA_OECONF += " \ --enable-decklink \ --enable-dvb \ @@ -92,7 +87,6 @@ EXTRA_OECONF += " \ --disable-avc \ --disable-bs2b \ --disable-chromaprint \ - --disable-cocoa \ --disable-daala \ --disable-direct3d \ --disable-directsound \ @@ -115,7 +109,6 @@ EXTRA_OECONF += " \ --disable-openh264 \ --disable-openni2 \ --disable-opensles \ - --disable-qt \ --disable-soundtouch \ --disable-spandsp \ --disable-spc \ -- 2.14.1 ^ permalink raw reply related [flat|nested] 25+ messages in thread
* [PATCH 05/12] gst-plugins-ugly: upgrade 1.12.4 -> 1.14.0 2018-05-03 8:17 [PATCH 01/12] gstreamer1.0: upgrade 1.12.4 -> 1.14.0 Anuj Mittal ` (2 preceding siblings ...) 2018-05-03 8:17 ` [PATCH 04/12] gst-plugins-bad: " Anuj Mittal @ 2018-05-03 8:17 ` Anuj Mittal 2018-05-03 8:17 ` [PATCH 06/12] gst-rtsp-server: " Anuj Mittal ` (8 subsequent siblings) 12 siblings, 0 replies; 25+ messages in thread From: Anuj Mittal @ 2018-05-03 8:17 UTC (permalink / raw) To: openembedded-core * For changes, please see: https://gstreamer.freedesktop.org/releases/1.14/ * Remove PACKAGECONFIG for lame, mpg123 since those have moved to -good. * Merge inc/bb since there's only one version now. Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> --- .../gstreamer/gstreamer1.0-plugins-ugly_1.12.4.bb | 13 ------------- ...ins-ugly.inc => gstreamer1.0-plugins-ugly_1.14.0.bb} | 17 +++++++++++++---- 2 files changed, 13 insertions(+), 17 deletions(-) delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.12.4.bb rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-ugly.inc => gstreamer1.0-plugins-ugly_1.14.0.bb} (59%) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.12.4.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.12.4.bb deleted file mode 100644 index f8333519e9..0000000000 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.12.4.bb +++ /dev/null @@ -1,13 +0,0 @@ -require gstreamer1.0-plugins-ugly.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ - file://tests/check/elements/xingmux.c;beginline=1;endline=21;md5=4c771b8af188724855cb99cadd390068" - -SRC_URI = " \ - http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-${PV}.tar.xz \ - file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \ -" -SRC_URI[md5sum] = "e2b836fb2747f6ae3a1a6f33a9d8c952" -SRC_URI[sha256sum] = "1c165b8d888ed350acd8e6ac9f6fe06508e6fcc0a3afc6ccc9fbeb30df9be522" - -S = "${WORKDIR}/gst-plugins-ugly-${PV}" diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.14.0.bb similarity index 59% rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly.inc rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.14.0.bb index 60aa968c95..c8f778bff3 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly.inc +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.14.0.bb @@ -1,15 +1,27 @@ require gstreamer1.0-plugins.inc +LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ + file://tests/check/elements/xingmux.c;beginline=1;endline=21;md5=4c771b8af188724855cb99cadd390068" + LICENSE = "GPLv2+ & LGPLv2.1+ & LGPLv2+" LICENSE_FLAGS = "commercial" +SRC_URI = " \ + http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-${PV}.tar.xz \ + file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \ + " +SRC_URI[md5sum] = "bcb1f8d9339176aee2b5da2a9cb2df88" +SRC_URI[sha256sum] = "3fb9ea5fc8a2de4b3eaec4128d71c6a2d81dd19befe1cd87cb833b98bcb542d1" + +S = "${WORKDIR}/gst-plugins-ugly-${PV}" + DEPENDS += "gstreamer1.0-plugins-base libid3tag" inherit gettext PACKAGECONFIG ??= " \ ${GSTREAMER_ORC} \ - a52dec lame mpg123 mpeg2dec \ + a52dec mpeg2dec \ " PACKAGECONFIG[a52dec] = "--enable-a52dec,--disable-a52dec,liba52" @@ -17,14 +29,11 @@ PACKAGECONFIG[amrnb] = "--enable-amrnb,--disable-amrnb,opencore-amr" PACKAGECONFIG[amrwb] = "--enable-amrwb,--disable-amrwb,opencore-amr" PACKAGECONFIG[cdio] = "--enable-cdio,--disable-cdio,libcdio" PACKAGECONFIG[dvdread] = "--enable-dvdread,--disable-dvdread,libdvdread" -PACKAGECONFIG[lame] = "--enable-lame,--disable-lame,lame" PACKAGECONFIG[mpeg2dec] = "--enable-mpeg2dec,--disable-mpeg2dec,mpeg2dec" -PACKAGECONFIG[mpg123] = "--enable-mpg123,--disable-mpg123,mpg123" PACKAGECONFIG[x264] = "--enable-x264,--disable-x264,x264" EXTRA_OECONF += " \ --disable-sidplay \ - --disable-twolame \ " FILES_${PN}-amrnb += "${datadir}/gstreamer-1.0/presets/GstAmrnbEnc.prs" -- 2.14.1 ^ permalink raw reply related [flat|nested] 25+ messages in thread
* [PATCH 06/12] gst-rtsp-server: upgrade 1.12.4 -> 1.14.0 2018-05-03 8:17 [PATCH 01/12] gstreamer1.0: upgrade 1.12.4 -> 1.14.0 Anuj Mittal ` (3 preceding siblings ...) 2018-05-03 8:17 ` [PATCH 05/12] gst-plugins-ugly: " Anuj Mittal @ 2018-05-03 8:17 ` Anuj Mittal 2018-05-03 8:17 ` [PATCH 07/12] gstreamer-vaapi: " Anuj Mittal ` (7 subsequent siblings) 12 siblings, 0 replies; 25+ messages in thread From: Anuj Mittal @ 2018-05-03 8:17 UTC (permalink / raw) To: openembedded-core * For changes, please see: https://gstreamer.freedesktop.org/releases/1.14/ * Merge inc/bb since there's only one version now. Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> --- .../gstreamer/gstreamer1.0-rtsp-server_1.12.4.bb | 6 ------ ...amer1.0-rtsp-server.inc => gstreamer1.0-rtsp-server_1.14.0.bb} | 8 ++++++-- 2 files changed, 6 insertions(+), 8 deletions(-) delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.12.4.bb rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-rtsp-server.inc => gstreamer1.0-rtsp-server_1.14.0.bb} (79%) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.12.4.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.12.4.bb deleted file mode 100644 index da68dcba20..0000000000 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.12.4.bb +++ /dev/null @@ -1,6 +0,0 @@ -require gstreamer1.0-rtsp-server.inc - -SRC_URI[md5sum] = "ad70a9735f58da21d0f5cedf48ccadd3" -SRC_URI[sha256sum] = "7660112ebd59838f1054796b38109dcbe32f0a040e3a252a68a81055aeaa56a9" - -LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d" diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.14.0.bb similarity index 79% rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server.inc rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.14.0.bb index 3776f92917..64906e1abb 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server.inc +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.14.0.bb @@ -2,6 +2,7 @@ SUMMARY = "A library on top of GStreamer for building an RTSP server" HOMEPAGE = "http://cgit.freedesktop.org/gstreamer/gst-rtsp-server/" SECTION = "multimedia" LICENSE = "LGPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d" DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base" @@ -10,7 +11,11 @@ PNREAL = "gst-rtsp-server" SRC_URI = "http://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${PV}.tar.xz \ file://0001-Don-t-hardcode-libtool-name-when-using-introspection.patch \ file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \ - file://gtk-doc-tweaks.patch" + file://gtk-doc-tweaks.patch \ + " + +SRC_URI[md5sum] = "8a505c88f7469c3a0d1e9f4e9a315e53" +SRC_URI[sha256sum] = "6b65a077bed815f6d3157ebea503cc9f3c32d289af2756b7ff7e3958744d9756" S = "${WORKDIR}/${PNREAL}-${PV}" @@ -28,4 +33,3 @@ delete_pkg_m4_file() { } do_configure[prefuncs] += " delete_pkg_m4_file" - -- 2.14.1 ^ permalink raw reply related [flat|nested] 25+ messages in thread
* [PATCH 07/12] gstreamer-vaapi: upgrade 1.12.4 -> 1.14.0 2018-05-03 8:17 [PATCH 01/12] gstreamer1.0: upgrade 1.12.4 -> 1.14.0 Anuj Mittal ` (4 preceding siblings ...) 2018-05-03 8:17 ` [PATCH 06/12] gst-rtsp-server: " Anuj Mittal @ 2018-05-03 8:17 ` Anuj Mittal 2018-05-03 8:17 ` [PATCH 08/12] gst-validate: " Anuj Mittal ` (6 subsequent siblings) 12 siblings, 0 replies; 25+ messages in thread From: Anuj Mittal @ 2018-05-03 8:17 UTC (permalink / raw) To: openembedded-core For changes, please see gstreamer-vaapi specific section at: https://gstreamer.freedesktop.org/releases/1.14/ Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> --- meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.12.4.bb | 5 ----- .../{gstreamer1.0-vaapi.inc => gstreamer1.0-vaapi_1.14.0.bb} | 6 ++++-- 2 files changed, 4 insertions(+), 7 deletions(-) delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.12.4.bb rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-vaapi.inc => gstreamer1.0-vaapi_1.14.0.bb} (89%) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.12.4.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.12.4.bb deleted file mode 100644 index 1df2301792..0000000000 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.12.4.bb +++ /dev/null @@ -1,5 +0,0 @@ -require gstreamer1.0-vaapi.inc -SRC_URI[md5sum] = "2149982cdb348139bca946bb63766f4c" -SRC_URI[sha256sum] = "1c2d77242e1f30c4d1394636cae9f6877228a017960fca96881e0080d8b6e9c9" - -DEPENDS += "gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad" diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.14.0.bb similarity index 89% rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi.inc rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.14.0.bb index abfcc65390..4f752a57b3 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi.inc +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.14.0.bb @@ -9,12 +9,14 @@ FILESPATH = "${@base_set_filespath(["${FILE_DIRNAME}/${REALPN}", "${FILE_DIRNAME LICENSE = "LGPLv2.1+" LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c" -DEPENDS = "libva" - SRC_URI = "https://gstreamer.freedesktop.org/src/${REALPN}/${REALPN}-${PV}.tar.xz \ " +SRC_URI[md5sum] = "248c3aafab59814e71eb4a6c334cb261" +SRC_URI[sha256sum] = "e4e31f085ef289bf1049398f641345979d20a1b11a80285744bba98504991df2" + S = "${WORKDIR}/${REALPN}-${PV}" +DEPENDS = "libva gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad" inherit autotools pkgconfig gtk-doc distro_features_check upstream-version-is-even -- 2.14.1 ^ permalink raw reply related [flat|nested] 25+ messages in thread
* [PATCH 08/12] gst-validate: upgrade 1.12.4 -> 1.14.0 2018-05-03 8:17 [PATCH 01/12] gstreamer1.0: upgrade 1.12.4 -> 1.14.0 Anuj Mittal ` (5 preceding siblings ...) 2018-05-03 8:17 ` [PATCH 07/12] gstreamer-vaapi: " Anuj Mittal @ 2018-05-03 8:17 ` Anuj Mittal 2018-05-03 8:17 ` [PATCH 09/12] gst-omx: " Anuj Mittal ` (5 subsequent siblings) 12 siblings, 0 replies; 25+ messages in thread From: Anuj Mittal @ 2018-05-03 8:17 UTC (permalink / raw) To: openembedded-core * For changes, please see: https://gstreamer.freedesktop.org/releases/1.14/. * Patch Makefile to fix compilation errors. Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> --- ...x-template-paths-when-buildir-is-differen.patch | 41 ++++++++++++++++++++++ ...t-validate_1.12.4.bb => gst-validate_1.14.0.bb} | 10 +++--- 2 files changed, 47 insertions(+), 4 deletions(-) create mode 100644 meta/recipes-multimedia/gstreamer/gst-validate/0001-validate-fix-template-paths-when-buildir-is-differen.patch rename meta/recipes-multimedia/gstreamer/{gst-validate_1.12.4.bb => gst-validate_1.14.0.bb} (71%) diff --git a/meta/recipes-multimedia/gstreamer/gst-validate/0001-validate-fix-template-paths-when-buildir-is-differen.patch b/meta/recipes-multimedia/gstreamer/gst-validate/0001-validate-fix-template-paths-when-buildir-is-differen.patch new file mode 100644 index 0000000000..400b8b0fea --- /dev/null +++ b/meta/recipes-multimedia/gstreamer/gst-validate/0001-validate-fix-template-paths-when-buildir-is-differen.patch @@ -0,0 +1,41 @@ +From ac9d7d230effdb97870c2f317b3b45449bde1769 Mon Sep 17 00:00:00 2001 +From: Anuj Mittal <am.devel@gmail.com> +Date: Wed, 11 Apr 2018 15:40:02 +0800 +Subject: [PATCH] validate: fix template paths when buildir is different + +Compilation just fails otherwise because it's not able to locate the files. + +Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=795149] +Signed-off-by: Anuj Mittal <am.devel@gmail.com> + +--- + gst/validate/Makefile.am | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/gst/validate/Makefile.am b/gst/validate/Makefile.am +index 342730a..3fcc3e5 100644 +--- a/gst/validate/Makefile.am ++++ b/gst/validate/Makefile.am +@@ -48,14 +48,17 @@ source_h = \ + nodist_libgstvalidate_@GST_API_VERSION@_la_SOURCES = $(built_source_make) + nodist_libgstvalidate_@GST_API_VERSION@include_HEADERS = $(built_header_make) + ++template_h = $(patsubst %,$(srcdir)/%, gst-validate-enum-types.h.template) ++template_c = $(patsubst %,$(srcdir)/%, gst-validate-enum-types.c.template) ++ + gst-validate-enum-types.h: $(source_h) + $(AM_V_GEN)$(GLIB_MKENUMS) \ +- --template gst-validate-enum-types.h.template \ ++ --template $(template_h) \ + $^ > gst-validate-enum-types.h + + gst-validate-enum-types.c: $(source_h) + $(AM_V_GEN)$(GLIB_MKENUMS) \ +- --template gst-validate-enum-types.c.template \ ++ --template $(template_c) \ + $^ > gst-validate-enum-types.c + + EXTRA_DIST= \ +-- +2.7.4 + diff --git a/meta/recipes-multimedia/gstreamer/gst-validate_1.12.4.bb b/meta/recipes-multimedia/gstreamer/gst-validate_1.14.0.bb similarity index 71% rename from meta/recipes-multimedia/gstreamer/gst-validate_1.12.4.bb rename to meta/recipes-multimedia/gstreamer/gst-validate_1.14.0.bb index 0f2585a459..d12b8f6a0f 100644 --- a/meta/recipes-multimedia/gstreamer/gst-validate_1.12.4.bb +++ b/meta/recipes-multimedia/gstreamer/gst-validate_1.14.0.bb @@ -6,11 +6,13 @@ SECTION = "multimedia" LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343" -SRC_URI = "https://gstreamer.freedesktop.org/src/${BPN}/${BP}.tar.xz" -SRC_URI[md5sum] = "bc074d49677081f9c27de11a09165746" -SRC_URI[sha256sum] = "f9da9dfe6e5d6f5ba3b38c5752b42d3f927715904942b405c2924d3cb77afba1" +SRC_URI = "https://gstreamer.freedesktop.org/src/${BPN}/${BP}.tar.xz \ + file://0001-validate-fix-template-paths-when-buildir-is-differen.patch \ + " +SRC_URI[md5sum] = "deb8654c912b189388fe585b0fc5bc8f" +SRC_URI[sha256sum] = "33df08bf77f2895d64b7e8a957de3b930b4da0a8edabfbefcff2eab027eeffdf" -DEPENDS = "json-glib glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base" +DEPENDS = "json-glib glib-2.0 glib-2.0-native gstreamer1.0 gstreamer1.0-plugins-base" RRECOMMENDS_${PN} = "git" FILES_${PN} += "${datadir}/gstreamer-1.0/* ${libdir}/gst-validate-launcher/* ${libdir}/gstreamer-1.0/*" -- 2.14.1 ^ permalink raw reply related [flat|nested] 25+ messages in thread
* [PATCH 09/12] gst-omx: upgrade 1.12.4 -> 1.14.0 2018-05-03 8:17 [PATCH 01/12] gstreamer1.0: upgrade 1.12.4 -> 1.14.0 Anuj Mittal ` (6 preceding siblings ...) 2018-05-03 8:17 ` [PATCH 08/12] gst-validate: " Anuj Mittal @ 2018-05-03 8:17 ` Anuj Mittal 2018-05-03 8:17 ` [PATCH 10/12] gst-python: " Anuj Mittal ` (4 subsequent siblings) 12 siblings, 0 replies; 25+ messages in thread From: Anuj Mittal @ 2018-05-03 8:17 UTC (permalink / raw) To: openembedded-core For changes, please see: https://cgit.freedesktop.org/gstreamer/gst-omx/tree/ChangeLog Merge inc/bb since we only have one version now. Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> --- meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.12.4.bb | 11 ----------- .../{gstreamer1.0-omx.inc => gstreamer1.0-omx_1.14.0.bb} | 10 +++++++++- 2 files changed, 9 insertions(+), 12 deletions(-) delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.12.4.bb rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-omx.inc => gstreamer1.0-omx_1.14.0.bb} (80%) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.12.4.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.12.4.bb deleted file mode 100644 index 7f7eae3708..0000000000 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.12.4.bb +++ /dev/null @@ -1,11 +0,0 @@ -include gstreamer1.0-omx.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ - file://omx/gstomx.h;beginline=1;endline=21;md5=5c8e1fca32704488e76d2ba9ddfa935f" - -SRC_URI = "http://gstreamer.freedesktop.org/src/gst-omx/gst-omx-${PV}.tar.xz" - -SRC_URI[md5sum] = "eb8d5ae3b69cfeed9dc77c592106247e" -SRC_URI[sha256sum] = "a025fa24242ec868fe0ff1e66d806a1070bcbc7c14a987a89cdc3395d0d56d5f" - -S = "${WORKDIR}/gst-omx-${PV}" diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.14.0.bb similarity index 80% rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-omx.inc rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.14.0.bb index 5d9235104e..792b1e182d 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx.inc +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.14.0.bb @@ -4,6 +4,15 @@ SECTION = "multimedia" LICENSE = "LGPLv2.1" LICENSE_FLAGS = "commercial" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ + file://omx/gstomx.h;beginline=1;endline=21;md5=5c8e1fca32704488e76d2ba9ddfa935f" + +SRC_URI = "http://gstreamer.freedesktop.org/src/gst-omx/gst-omx-${PV}.tar.xz" + +SRC_URI[md5sum] = "2bca3bd68540a97122450d78576ad2be" +SRC_URI[sha256sum] = "4d43c354087cb77924982943e34e0d47294b5570304db11fd8b268b53bcff693" + +S = "${WORKDIR}/gst-omx-${PV}" DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad" @@ -11,7 +20,6 @@ inherit autotools pkgconfig gettext gtk-doc upstream-version-is-even acpaths = "-I ${S}/common/m4 -I ${S}/m4" - GSTREAMER_1_0_OMX_TARGET ?= "bellagio" GSTREAMER_1_0_OMX_CORE_NAME ?= "${libdir}/libomxil-bellagio.so.0" -- 2.14.1 ^ permalink raw reply related [flat|nested] 25+ messages in thread
* [PATCH 10/12] gst-python: upgrade 1.12.4 -> 1.14.0 2018-05-03 8:17 [PATCH 01/12] gstreamer1.0: upgrade 1.12.4 -> 1.14.0 Anuj Mittal ` (7 preceding siblings ...) 2018-05-03 8:17 ` [PATCH 09/12] gst-omx: " Anuj Mittal @ 2018-05-03 8:17 ` Anuj Mittal 2018-05-03 8:17 ` [PATCH 11/12] gstreamer-libav: " Anuj Mittal ` (3 subsequent siblings) 12 siblings, 0 replies; 25+ messages in thread From: Anuj Mittal @ 2018-05-03 8:17 UTC (permalink / raw) To: openembedded-core For changes, please see: https://cgit.freedesktop.org/gstreamer/gst-python/tree/ChangeLog Also merge inc/bb since we have only one version now. Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> --- meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.12.4.bb | 7 ------- .../{gstreamer1.0-python.inc => gstreamer1.0-python_1.14.0.bb} | 6 ++++++ 2 files changed, 6 insertions(+), 7 deletions(-) delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.12.4.bb rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-python.inc => gstreamer1.0-python_1.14.0.bb} (80%) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.12.4.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.12.4.bb deleted file mode 100644 index faec3566c4..0000000000 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.12.4.bb +++ /dev/null @@ -1,7 +0,0 @@ -require gstreamer1.0-python.inc - -SRC_URI = "http://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${PV}.tar.xz" -SRC_URI[md5sum] = "f1fd046ea781736a794f9f552d77c50d" -SRC_URI[sha256sum] = "20ce6af6615c9a440c1928c31259a78226516d06bf1a65f888c6d109826fa3ea" - -LIC_FILES_CHKSUM = "file://COPYING;md5=c34deae4e395ca07e725ab0076a5f740" diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-python.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.14.0.bb similarity index 80% rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-python.inc rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.14.0.bb index 361f0bca41..1eb1a3f6f4 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-python.inc +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.14.0.bb @@ -1,7 +1,13 @@ SUMMARY = "Python bindings for GStreamer 1.0" HOMEPAGE = "http://cgit.freedesktop.org/gstreamer/gst-python/" SECTION = "multimedia" + LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=c34deae4e395ca07e725ab0076a5f740" + +SRC_URI = "http://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${PV}.tar.xz" +SRC_URI[md5sum] = "97782b2fde877f1d1d68c64f7db4f735" +SRC_URI[sha256sum] = "e0b98111150aa3fcdeb6e228cd770995fbdaa8586fc02ec9b3273d4ae83399e6" DEPENDS = "gstreamer1.0 python3-pygobject" RDEPENDS_${PN} += "gstreamer1.0 python3-pygobject" -- 2.14.1 ^ permalink raw reply related [flat|nested] 25+ messages in thread
* [PATCH 11/12] gstreamer-libav: upgrade 1.12.4 -> 1.14.0 2018-05-03 8:17 [PATCH 01/12] gstreamer1.0: upgrade 1.12.4 -> 1.14.0 Anuj Mittal ` (8 preceding siblings ...) 2018-05-03 8:17 ` [PATCH 10/12] gst-python: " Anuj Mittal @ 2018-05-03 8:17 ` Anuj Mittal 2018-05-03 8:17 ` [PATCH 12/12] gst-plugins-good: enable mpg123 and lame Anuj Mittal ` (2 subsequent siblings) 12 siblings, 0 replies; 25+ messages in thread From: Anuj Mittal @ 2018-05-03 8:17 UTC (permalink / raw) To: openembedded-core Drop one patch as the change is now present upstream. For changes, please see: https://gstreamer.freedesktop.org/releases/1.14/ Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> --- .../0001-fix-host-contamination.patch | 36 ++++++++++++++++++++++ ...a.c-Fix-build-by-Including-libavcodec-hev.patch | 33 -------------------- .../gstreamer/gstreamer1.0-libav_1.12.4.bb | 21 ------------- ...r1.0-libav.inc => gstreamer1.0-libav_1.14.0.bb} | 19 ++++++++++++ 4 files changed, 55 insertions(+), 54 deletions(-) create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/0001-fix-host-contamination.patch delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/0001-hevcpred_msa.c-Fix-build-by-Including-libavcodec-hev.patch delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.12.4.bb rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-libav.inc => gstreamer1.0-libav_1.14.0.bb} (60%) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/0001-fix-host-contamination.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/0001-fix-host-contamination.patch new file mode 100644 index 0000000000..120c0798ea --- /dev/null +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/0001-fix-host-contamination.patch @@ -0,0 +1,36 @@ +From c1700f867f876ee33c130a8e28b688e2b1d89663 Mon Sep 17 00:00:00 2001 +From: Anuj Mittal <anuj.mittal@intel.com> +Date: Wed, 11 Apr 2018 17:14:55 +0800 +Subject: [PATCH] Prevent host contamination + +Remove reference to host $(libdir) from .la files. + +Upstream-Status: Inappropriate [cross-compile specific] + +Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> +--- + gst-libs/ext/Makefile.am | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/gst-libs/ext/Makefile.am b/gst-libs/ext/Makefile.am +index 6cdc048..a19d255 100644 +--- a/gst-libs/ext/Makefile.am ++++ b/gst-libs/ext/Makefile.am +@@ -49,7 +49,7 @@ echo " GEN $1.la" && \ + echo "library_names=''" && \ + echo "old_library='$1.a'" && \ + echo "inherited_linker_flags=''" && \ +- echo "dependency_libs=' -L$(libdir) $(if $2,$(foreach dep,$2,$(abs_builddir)/$(dep).la)) $(call find_library_la,$3 $(LIBM),$(LDFLAGS)) '" && \ ++ echo "dependency_libs=' -L $(if $2,$(foreach dep,$2,$(abs_builddir)/$(dep).la)) $(call find_library_la,$3 $(LIBM),$(LDFLAGS)) '" && \ + echo "weak_library_names=''" && \ + echo "current=" && \ + echo "age=" && \ +@@ -58,7 +58,7 @@ echo " GEN $1.la" && \ + echo "shouldnotlink=no" && \ + echo "dlopen=''" && \ + echo "dlpreopen=''" && \ +- echo "libdir='$(libdir)'") > $1.la ++ echo "libdir=''") > $1.la + endef + + libavutil.la: diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/0001-hevcpred_msa.c-Fix-build-by-Including-libavcodec-hev.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/0001-hevcpred_msa.c-Fix-build-by-Including-libavcodec-hev.patch deleted file mode 100644 index afbfc84db5..0000000000 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/0001-hevcpred_msa.c-Fix-build-by-Including-libavcodec-hev.patch +++ /dev/null @@ -1,33 +0,0 @@ -From b5226c096a0b7049874858e94a59d43e10ba3fd2 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 21 Sep 2017 10:22:56 -0700 -Subject: [PATCH] hevcpred_msa.c: Fix build by Including libavcodec/hevcdec.h - -src/libavcodec/mips/hevcpred_msa.c:1913:32: error: unknown type name 'HEVCContext'; did you mean 'HEVCPredContext'? - void ff_intra_pred_8_16x16_msa(HEVCContext *s, int x0, int y0, int c_idx) - ^~~~~~~~~~~ - HEVCPredContext - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Pending - - gst-libs/ext/libav/libavcodec/mips/hevcpred_msa.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gst-libs/ext/libav/libavcodec/mips/hevcpred_msa.c b/gst-libs/ext/libav/libavcodec/mips/hevcpred_msa.c -index 6a3b281..963c64c 100644 ---- a/gst-libs/ext/libav/libavcodec/mips/hevcpred_msa.c -+++ b/gst-libs/ext/libav/libavcodec/mips/hevcpred_msa.c -@@ -18,7 +18,7 @@ - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - --#include "libavcodec/hevc.h" -+#include "libavcodec/hevcdec.h" - #include "libavutil/mips/generic_macros_msa.h" - #include "hevcpred_mips.h" - --- -2.14.1 - diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.12.4.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.12.4.bb deleted file mode 100644 index af547ba602..0000000000 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.12.4.bb +++ /dev/null @@ -1,21 +0,0 @@ -require gstreamer1.0-libav.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://COPYING.LIB;md5=6762ed442b3822387a51c92d928ead0d \ - file://ext/libav/gstav.h;beginline=1;endline=18;md5=a752c35267d8276fd9ca3db6994fca9c \ - file://gst-libs/ext/libav/COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://gst-libs/ext/libav/COPYING.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \ - file://gst-libs/ext/libav/COPYING.LGPLv2.1;md5=bd7a443320af8c812e4c18d1b79df004 \ - file://gst-libs/ext/libav/COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02" - -SRC_URI = "http://gstreamer.freedesktop.org/src/gst-libav/gst-libav-${PV}.tar.xz \ - file://0001-Disable-yasm-for-libav-when-disable-yasm.patch \ - file://workaround-to-build-gst-libav-for-i586-with-gcc.patch \ - file://mips64_cpu_detection.patch \ - file://0001-configure-check-for-armv7ve-variant.patch \ - file://0001-hevcpred_msa.c-Fix-build-by-Including-libavcodec-hev.patch \ - " -SRC_URI[md5sum] = "8a851bf2e475e90a3fdac9506e3e4dbd" -SRC_URI[sha256sum] = "2a56aa5d2d8cd912f2bce17f174713d2c417ca298f1f9c28ee66d4aa1e1d9e62" - -S = "${WORKDIR}/gst-libav-${PV}" diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.14.0.bb similarity index 60% rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-libav.inc rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.14.0.bb index c2283061cc..ee2a043f81 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav.inc +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.14.0.bb @@ -4,6 +4,25 @@ SECTION = "multimedia" LICENSE = "GPLv2+ & LGPLv2+ & ( (GPLv2+ & LGPLv2.1+) | (GPLv3+ & LGPLv3+) )" LICENSE_FLAGS = "commercial" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://COPYING.LIB;md5=6762ed442b3822387a51c92d928ead0d \ + file://ext/libav/gstav.h;beginline=1;endline=18;md5=a752c35267d8276fd9ca3db6994fca9c \ + file://gst-libs/ext/libav/COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://gst-libs/ext/libav/COPYING.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \ + file://gst-libs/ext/libav/COPYING.LGPLv2.1;md5=bd7a443320af8c812e4c18d1b79df004 \ + file://gst-libs/ext/libav/COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02" + +SRC_URI = "http://gstreamer.freedesktop.org/src/gst-libav/gst-libav-${PV}.tar.xz \ + file://0001-Disable-yasm-for-libav-when-disable-yasm.patch \ + file://workaround-to-build-gst-libav-for-i586-with-gcc.patch \ + file://mips64_cpu_detection.patch \ + file://0001-configure-check-for-armv7ve-variant.patch \ + file://0001-fix-host-contamination.patch \ + " +SRC_URI[md5sum] = "943045b9e937ffc5c6cfa0bd5c44230d" +SRC_URI[sha256sum] = "fb134b4d3e054746ef8b922ff157b0c7903d1fdd910708a45add66954da7ef89" + +S = "${WORKDIR}/gst-libav-${PV}" DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base zlib bzip2 xz" -- 2.14.1 ^ permalink raw reply related [flat|nested] 25+ messages in thread
* [PATCH 12/12] gst-plugins-good: enable mpg123 and lame 2018-05-03 8:17 [PATCH 01/12] gstreamer1.0: upgrade 1.12.4 -> 1.14.0 Anuj Mittal ` (9 preceding siblings ...) 2018-05-03 8:17 ` [PATCH 11/12] gstreamer-libav: " Anuj Mittal @ 2018-05-03 8:17 ` Anuj Mittal 2018-05-03 22:49 ` [PATCH 01/12] gstreamer1.0: upgrade 1.12.4 -> 1.14.0 Khem Raj 2018-05-07 12:39 ` Carlos Rafael Giani 12 siblings, 0 replies; 25+ messages in thread From: Anuj Mittal @ 2018-05-03 8:17 UTC (permalink / raw) To: openembedded-core Since the last remaining mp3 patents have expired [1] and corresponding commercial flags from recipes for these removed, enable these to be built by default. [1] https://www.iis.fraunhofer.de/en/ff/amm/prod/audiocodec/audiocodecs/mp3.html Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> --- meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.14.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.14.0.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.14.0.bb index 481ac51908..a420039fa8 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.14.0.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.14.0.bb @@ -27,7 +27,7 @@ inherit gettext PACKAGECONFIG ??= " \ ${GSTREAMER_ORC} \ ${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio x11', d)} \ - cairo flac gdk-pixbuf gudev jpeg libpng soup speex taglib v4l2 bz2 zlib gtk \ + cairo flac gdk-pixbuf gudev jpeg libpng soup speex taglib v4l2 bz2 zlib gtk mpg123 lame \ " X11DEPENDS = "virtual/libx11 libsm libxrender libxfixes libxdamage" -- 2.14.1 ^ permalink raw reply related [flat|nested] 25+ messages in thread
* Re: [PATCH 01/12] gstreamer1.0: upgrade 1.12.4 -> 1.14.0 2018-05-03 8:17 [PATCH 01/12] gstreamer1.0: upgrade 1.12.4 -> 1.14.0 Anuj Mittal ` (10 preceding siblings ...) 2018-05-03 8:17 ` [PATCH 12/12] gst-plugins-good: enable mpg123 and lame Anuj Mittal @ 2018-05-03 22:49 ` Khem Raj 2018-05-04 10:23 ` Burton, Ross 2018-05-07 12:39 ` Carlos Rafael Giani 12 siblings, 1 reply; 25+ messages in thread From: Khem Raj @ 2018-05-03 22:49 UTC (permalink / raw) To: Anuj Mittal; +Cc: openembedded-core [-- Attachment #1: Type: text/plain, Size: 3521 bytes --] On Thu, May 3, 2018 at 1:18 AM Anuj Mittal <anuj.mittal@intel.com> wrote: > * For changes, please see: > https://gstreamer.freedesktop.org/releases/1.14/ > * Merge inc and bb file since we only have one version now. Threre is meta gstreamer can you check if this is not going to affect that layer > > > Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> > --- > meta/recipes-multimedia/gstreamer/gstreamer1.0_1.12.4.bb | 14 > -------------- > .../gstreamer/{gstreamer1.0.inc => gstreamer1.0_1.14.0.bb} | 12 > +++++++++++- > 2 files changed, 11 insertions(+), 15 deletions(-) > delete mode 100644 meta/recipes-multimedia/gstreamer/ > gstreamer1.0_1.12.4.bb > rename meta/recipes-multimedia/gstreamer/{gstreamer1.0.inc => > gstreamer1.0_1.14.0.bb} (84%) > > diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.12.4.bb > b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.12.4.bb > deleted file mode 100644 > index 01b2396513..0000000000 > --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.12.4.bb > +++ /dev/null > @@ -1,14 +0,0 @@ > -require gstreamer1.0.inc > - > -LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d \ > - > file://gst/gst.h;beginline=1;endline=21;md5=e059138481205ee2c6fc1c079c016d0d" > - > -SRC_URI = " \ > - http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.xz > \ > -" > -SRC_URI[md5sum] = "9d268f2e891cce1ac0832f1cc467d4ea" > -SRC_URI[sha256sum] = > "5a8704aa4c2eeb04da192c4a9942f94f860ac1a585de90d9f914bac26a970674" > - > -S = "${WORKDIR}/gstreamer-${PV}" > - > -CVE_PRODUCT = "gstreamer" > diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0.inc > b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.14.0.bb > similarity index 84% > rename from meta/recipes-multimedia/gstreamer/gstreamer1.0.inc > rename to meta/recipes-multimedia/gstreamer/gstreamer1.0_1.14.0.bb > index c2df1f3258..b4398c8111 100644 > --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0.inc > +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.14.0.bb > @@ -14,11 +14,19 @@ inherit autotools pkgconfig gettext > upstream-version-is-even gobject-introspecti > # (it has a custom INTROSPECTION_INIT macro, and so must be used instead > of our common introspection.m4 file) > acpaths = "-I ${S}/common/m4 -I ${S}/m4" > > -SRC_URI_append = " \ > +LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d \ > + > file://gst/gst.h;beginline=1;endline=21;md5=e059138481205ee2c6fc1c079c016d0d" > + > +S = "${WORKDIR}/gstreamer-${PV}" > + > +SRC_URI = " \ > + http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.xz > \ > > file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \ > file://gtk-doc-tweaks.patch \ > > file://0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch \ > " > +SRC_URI[md5sum] = "63c7cbfb86aa28c4522e374dc5555b96" > +SRC_URI[sha256sum] = > "fc361367f0d4b780a868a8833f9f30b9c9f4ac9faea4e6b251db8b4b0398466e" > > PACKAGECONFIG ??= "" > > @@ -59,3 +67,5 @@ do_configure[prefuncs] += "delete_pkg_m4_file" > do_compile_prepend() { > export > GIR_EXTRA_LIBS_PATH="${B}/gst/.libs:${B}/libs/gst/base/.libs" > } > + > +CVE_PRODUCT = "gstreamer" > -- > 2.14.1 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core > [-- Attachment #2: Type: text/html, Size: 5633 bytes --] ^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PATCH 01/12] gstreamer1.0: upgrade 1.12.4 -> 1.14.0 2018-05-03 22:49 ` [PATCH 01/12] gstreamer1.0: upgrade 1.12.4 -> 1.14.0 Khem Raj @ 2018-05-04 10:23 ` Burton, Ross 2018-05-07 12:40 ` Carlos Rafael Giani 0 siblings, 1 reply; 25+ messages in thread From: Burton, Ross @ 2018-05-04 10:23 UTC (permalink / raw) To: Khem Raj; +Cc: OE-core [-- Attachment #1: Type: text/plain, Size: 4031 bytes --] meta-gstreamer ships its own inc files (as it should). Ross On 3 May 2018 at 23:49, Khem Raj <raj.khem@gmail.com> wrote: > > On Thu, May 3, 2018 at 1:18 AM Anuj Mittal <anuj.mittal@intel.com> wrote: > >> * For changes, please see: https://gstreamer.freedesktop. >> org/releases/1.14/ >> * Merge inc and bb file since we only have one version now. > > > Threre is meta gstreamer can you check if this is not going to affect that > layer > >> >> >> Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> >> --- >> meta/recipes-multimedia/gstreamer/gstreamer1.0_1.12.4.bb | 14 >> -------------- >> .../gstreamer/{gstreamer1.0.inc => gstreamer1.0_1.14.0.bb} | 12 >> +++++++++++- >> 2 files changed, 11 insertions(+), 15 deletions(-) >> delete mode 100644 meta/recipes-multimedia/gstreamer/ >> gstreamer1.0_1.12.4.bb >> rename meta/recipes-multimedia/gstreamer/{gstreamer1.0.inc => >> gstreamer1.0_1.14.0.bb} (84%) >> >> diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.12.4.bb >> b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.12.4.bb >> deleted file mode 100644 >> index 01b2396513..0000000000 >> --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.12.4.bb >> +++ /dev/null >> @@ -1,14 +0,0 @@ >> -require gstreamer1.0.inc >> - >> -LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d >> \ >> - file://gst/gst.h;beginline=1;endline=21;md5= >> e059138481205ee2c6fc1c079c016d0d" >> - >> -SRC_URI = " \ >> - http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${ >> PV}.tar.xz \ >> -" >> -SRC_URI[md5sum] = "9d268f2e891cce1ac0832f1cc467d4ea" >> -SRC_URI[sha256sum] = "5a8704aa4c2eeb04da192c4a9942f9 >> 4f860ac1a585de90d9f914bac26a970674" >> - >> -S = "${WORKDIR}/gstreamer-${PV}" >> - >> -CVE_PRODUCT = "gstreamer" >> diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0.inc >> b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.14.0.bb >> similarity index 84% >> rename from meta/recipes-multimedia/gstreamer/gstreamer1.0.inc >> rename to meta/recipes-multimedia/gstreamer/gstreamer1.0_1.14.0.bb >> index c2df1f3258..b4398c8111 100644 >> --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0.inc >> +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.14.0.bb >> @@ -14,11 +14,19 @@ inherit autotools pkgconfig gettext >> upstream-version-is-even gobject-introspecti >> # (it has a custom INTROSPECTION_INIT macro, and so must be used instead >> of our common introspection.m4 file) >> acpaths = "-I ${S}/common/m4 -I ${S}/m4" >> >> -SRC_URI_append = " \ >> +LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d >> \ >> + file://gst/gst.h;beginline=1;endline=21;md5= >> e059138481205ee2c6fc1c079c016d0d" >> + >> +S = "${WORKDIR}/gstreamer-${PV}" >> + >> +SRC_URI = " \ >> + http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${ >> PV}.tar.xz \ >> file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch >> \ >> file://gtk-doc-tweaks.patch \ >> file://0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch >> \ >> " >> +SRC_URI[md5sum] = "63c7cbfb86aa28c4522e374dc5555b96" >> +SRC_URI[sha256sum] = "fc361367f0d4b780a868a8833f9f30 >> b9c9f4ac9faea4e6b251db8b4b0398466e" >> >> PACKAGECONFIG ??= "" >> >> @@ -59,3 +67,5 @@ do_configure[prefuncs] += "delete_pkg_m4_file" >> do_compile_prepend() { >> export GIR_EXTRA_LIBS_PATH="${B}/gst/.libs:${B}/libs/gst/base/. >> libs" >> } >> + >> +CVE_PRODUCT = "gstreamer" >> -- >> 2.14.1 >> >> -- >> _______________________________________________ >> Openembedded-core mailing list >> Openembedded-core@lists.openembedded.org >> http://lists.openembedded.org/mailman/listinfo/openembedded-core >> > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core > > [-- Attachment #2: Type: text/html, Size: 6841 bytes --] ^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PATCH 01/12] gstreamer1.0: upgrade 1.12.4 -> 1.14.0 2018-05-04 10:23 ` Burton, Ross @ 2018-05-07 12:40 ` Carlos Rafael Giani 2018-05-07 16:03 ` Khem Raj 0 siblings, 1 reply; 25+ messages in thread From: Carlos Rafael Giani @ 2018-05-07 12:40 UTC (permalink / raw) To: openembedded-core [-- Attachment #1: Type: text/plain, Size: 6005 bytes --] True. But it should stay as close to oe-core as possible. I already committed updates to meta-gstreamer1.0, so I am not sure what to think of this. On 2018-05-04 12:23, Burton, Ross wrote: > meta-gstreamer ships its own inc files (as it should). > > Ross > > On 3 May 2018 at 23:49, Khem Raj <raj.khem@gmail.com > <mailto:raj.khem@gmail.com>> wrote: > > > On Thu, May 3, 2018 at 1:18 AM Anuj Mittal <anuj.mittal@intel.com > <mailto:anuj.mittal@intel.com>> wrote: > > * For changes, please see: > https://gstreamer.freedesktop.org/releases/1.14/ > <https://gstreamer.freedesktop.org/releases/1.14/> > * Merge inc and bb file since we only have one version now. > > > Threre is meta gstreamer can you check if this is not going to > affect that layer > > > > Signed-off-by: Anuj Mittal <anuj.mittal@intel.com > <mailto:anuj.mittal@intel.com>> > --- > meta/recipes-multimedia/gstreamer/gstreamer1.0_1.12.4.bb > <http://gstreamer1.0_1.12.4.bb> | 14 -------------- > .../gstreamer/{gstreamer1.0.inc => gstreamer1.0_1.14.0.bb > <http://gstreamer1.0_1.14.0.bb>} | 12 +++++++++++- > 2 files changed, 11 insertions(+), 15 deletions(-) > delete mode 100644 > meta/recipes-multimedia/gstreamer/gstreamer1.0_1.12.4.bb > <http://gstreamer1.0_1.12.4.bb> > rename meta/recipes-multimedia/gstreamer/{gstreamer1.0.inc => > gstreamer1.0_1.14.0.bb <http://gstreamer1.0_1.14.0.bb>} (84%) > > diff --git > a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.12.4.bb > <http://gstreamer1.0_1.12.4.bb> > b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.12.4.bb > <http://gstreamer1.0_1.12.4.bb> > deleted file mode 100644 > index 01b2396513..0000000000 > --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.12.4.bb > <http://gstreamer1.0_1.12.4.bb> > +++ /dev/null > @@ -1,14 +0,0 @@ > -require gstreamer1.0.inc > - > -LIC_FILES_CHKSUM = > "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d \ > - > file://gst/gst.h;beginline=1;endline=21;md5=e059138481205ee2c6fc1c079c016d0d" > - > -SRC_URI = " \ > - > http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.xz > <http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-$%7BPV%7D.tar.xz> > \ > -" > -SRC_URI[md5sum] = "9d268f2e891cce1ac0832f1cc467d4ea" > -SRC_URI[sha256sum] = > "5a8704aa4c2eeb04da192c4a9942f94f860ac1a585de90d9f914bac26a970674" > - > -S = "${WORKDIR}/gstreamer-${PV}" > - > -CVE_PRODUCT = "gstreamer" > diff --git > a/meta/recipes-multimedia/gstreamer/gstreamer1.0.inc > b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.14.0.bb > <http://gstreamer1.0_1.14.0.bb> > similarity index 84% > rename from meta/recipes-multimedia/gstreamer/gstreamer1.0.inc > rename to > meta/recipes-multimedia/gstreamer/gstreamer1.0_1.14.0.bb > <http://gstreamer1.0_1.14.0.bb> > index c2df1f3258..b4398c8111 100644 > --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0.inc > +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.14.0.bb > <http://gstreamer1.0_1.14.0.bb> > @@ -14,11 +14,19 @@ inherit autotools pkgconfig gettext > upstream-version-is-even gobject-introspecti > # (it has a custom INTROSPECTION_INIT macro, and so must be > used instead of our common introspection.m4 file) > acpaths = "-I ${S}/common/m4 -I ${S}/m4" > > -SRC_URI_append = " \ > +LIC_FILES_CHKSUM = > "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d \ > + > file://gst/gst.h;beginline=1;endline=21;md5=e059138481205ee2c6fc1c079c016d0d" > + > +S = "${WORKDIR}/gstreamer-${PV}" > + > +SRC_URI = " \ > + > http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.xz > <http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-$%7BPV%7D.tar.xz> > \ > > file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch > \ > file://gtk-doc-tweaks.patch \ > > file://0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch > \ > " > +SRC_URI[md5sum] = "63c7cbfb86aa28c4522e374dc5555b96" > +SRC_URI[sha256sum] = > "fc361367f0d4b780a868a8833f9f30b9c9f4ac9faea4e6b251db8b4b0398466e" > > PACKAGECONFIG ??= "" > > @@ -59,3 +67,5 @@ do_configure[prefuncs] += "delete_pkg_m4_file" > do_compile_prepend() { > export > GIR_EXTRA_LIBS_PATH="${B}/gst/.libs:${B}/libs/gst/base/.libs" > } > + > +CVE_PRODUCT = "gstreamer" > -- > 2.14.1 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > <mailto:Openembedded-core@lists.openembedded.org> > http://lists.openembedded.org/mailman/listinfo/openembedded-core > <http://lists.openembedded.org/mailman/listinfo/openembedded-core> > > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > <mailto:Openembedded-core@lists.openembedded.org> > http://lists.openembedded.org/mailman/listinfo/openembedded-core > <http://lists.openembedded.org/mailman/listinfo/openembedded-core> > > > > [-- Attachment #2: Type: text/html, Size: 12149 bytes --] ^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PATCH 01/12] gstreamer1.0: upgrade 1.12.4 -> 1.14.0 2018-05-07 12:40 ` Carlos Rafael Giani @ 2018-05-07 16:03 ` Khem Raj 0 siblings, 0 replies; 25+ messages in thread From: Khem Raj @ 2018-05-07 16:03 UTC (permalink / raw) To: Carlos Rafael Giani; +Cc: Patches and discussions about the oe-core layer On Mon, May 7, 2018 at 5:40 AM, Carlos Rafael Giani <dv@pseudoterminal.org> wrote: > True. But it should stay as close to oe-core as possible. I already > committed updates to meta-gstreamer1.0, so I am not sure what to think of > this. > I would suggest you review the changes and see it does not regress meta-gstremer and does not cause extra work for you. > > On 2018-05-04 12:23, Burton, Ross wrote: > > meta-gstreamer ships its own inc files (as it should). > > Ross > > On 3 May 2018 at 23:49, Khem Raj <raj.khem@gmail.com> wrote: >> >> >> On Thu, May 3, 2018 at 1:18 AM Anuj Mittal <anuj.mittal@intel.com> wrote: >>> >>> * For changes, please see: >>> https://gstreamer.freedesktop.org/releases/1.14/ >>> * Merge inc and bb file since we only have one version now. >> >> >> Threre is meta gstreamer can you check if this is not going to affect that >> layer >>> >>> >>> >>> Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> >>> --- >>> meta/recipes-multimedia/gstreamer/gstreamer1.0_1.12.4.bb | 14 >>> -------------- >>> .../gstreamer/{gstreamer1.0.inc => gstreamer1.0_1.14.0.bb} | 12 >>> +++++++++++- >>> 2 files changed, 11 insertions(+), 15 deletions(-) >>> delete mode 100644 >>> meta/recipes-multimedia/gstreamer/gstreamer1.0_1.12.4.bb >>> rename meta/recipes-multimedia/gstreamer/{gstreamer1.0.inc => >>> gstreamer1.0_1.14.0.bb} (84%) >>> >>> diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.12.4.bb >>> b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.12.4.bb >>> deleted file mode 100644 >>> index 01b2396513..0000000000 >>> --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.12.4.bb >>> +++ /dev/null >>> @@ -1,14 +0,0 @@ >>> -require gstreamer1.0.inc >>> - >>> -LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d >>> \ >>> - >>> file://gst/gst.h;beginline=1;endline=21;md5=e059138481205ee2c6fc1c079c016d0d" >>> - >>> -SRC_URI = " \ >>> - >>> http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.xz \ >>> -" >>> -SRC_URI[md5sum] = "9d268f2e891cce1ac0832f1cc467d4ea" >>> -SRC_URI[sha256sum] = >>> "5a8704aa4c2eeb04da192c4a9942f94f860ac1a585de90d9f914bac26a970674" >>> - >>> -S = "${WORKDIR}/gstreamer-${PV}" >>> - >>> -CVE_PRODUCT = "gstreamer" >>> diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0.inc >>> b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.14.0.bb >>> similarity index 84% >>> rename from meta/recipes-multimedia/gstreamer/gstreamer1.0.inc >>> rename to meta/recipes-multimedia/gstreamer/gstreamer1.0_1.14.0.bb >>> index c2df1f3258..b4398c8111 100644 >>> --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0.inc >>> +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.14.0.bb >>> @@ -14,11 +14,19 @@ inherit autotools pkgconfig gettext >>> upstream-version-is-even gobject-introspecti >>> # (it has a custom INTROSPECTION_INIT macro, and so must be used instead >>> of our common introspection.m4 file) >>> acpaths = "-I ${S}/common/m4 -I ${S}/m4" >>> >>> -SRC_URI_append = " \ >>> +LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d >>> \ >>> + >>> file://gst/gst.h;beginline=1;endline=21;md5=e059138481205ee2c6fc1c079c016d0d" >>> + >>> +S = "${WORKDIR}/gstreamer-${PV}" >>> + >>> +SRC_URI = " \ >>> + >>> http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.xz \ >>> >>> file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \ >>> file://gtk-doc-tweaks.patch \ >>> >>> file://0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch \ >>> " >>> +SRC_URI[md5sum] = "63c7cbfb86aa28c4522e374dc5555b96" >>> +SRC_URI[sha256sum] = >>> "fc361367f0d4b780a868a8833f9f30b9c9f4ac9faea4e6b251db8b4b0398466e" >>> >>> PACKAGECONFIG ??= "" >>> >>> @@ -59,3 +67,5 @@ do_configure[prefuncs] += "delete_pkg_m4_file" >>> do_compile_prepend() { >>> export >>> GIR_EXTRA_LIBS_PATH="${B}/gst/.libs:${B}/libs/gst/base/.libs" >>> } >>> + >>> +CVE_PRODUCT = "gstreamer" >>> -- >>> 2.14.1 >>> >>> -- >>> _______________________________________________ >>> Openembedded-core mailing list >>> Openembedded-core@lists.openembedded.org >>> http://lists.openembedded.org/mailman/listinfo/openembedded-core >> >> >> -- >> _______________________________________________ >> Openembedded-core mailing list >> Openembedded-core@lists.openembedded.org >> http://lists.openembedded.org/mailman/listinfo/openembedded-core >> > > > > > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core > ^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PATCH 01/12] gstreamer1.0: upgrade 1.12.4 -> 1.14.0 2018-05-03 8:17 [PATCH 01/12] gstreamer1.0: upgrade 1.12.4 -> 1.14.0 Anuj Mittal ` (11 preceding siblings ...) 2018-05-03 22:49 ` [PATCH 01/12] gstreamer1.0: upgrade 1.12.4 -> 1.14.0 Khem Raj @ 2018-05-07 12:39 ` Carlos Rafael Giani 12 siblings, 0 replies; 25+ messages in thread From: Carlos Rafael Giani @ 2018-05-07 12:39 UTC (permalink / raw) To: openembedded-core Is this based on my updates in meta-gstreamer1.0 ? I did not yet have the time to push them to the mailing list, but it would be good to try and not have duplicate work. On 2018-05-03 10:17, Anuj Mittal wrote: > * For changes, please see: https://gstreamer.freedesktop.org/releases/1.14/ > * Merge inc and bb file since we only have one version now. > > Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> > --- > meta/recipes-multimedia/gstreamer/gstreamer1.0_1.12.4.bb | 14 -------------- > .../gstreamer/{gstreamer1.0.inc => gstreamer1.0_1.14.0.bb} | 12 +++++++++++- > 2 files changed, 11 insertions(+), 15 deletions(-) > delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0_1.12.4.bb > rename meta/recipes-multimedia/gstreamer/{gstreamer1.0.inc => gstreamer1.0_1.14.0.bb} (84%) > > diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.12.4.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.12.4.bb > deleted file mode 100644 > index 01b2396513..0000000000 > --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.12.4.bb > +++ /dev/null > @@ -1,14 +0,0 @@ > -require gstreamer1.0.inc > - > -LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d \ > - file://gst/gst.h;beginline=1;endline=21;md5=e059138481205ee2c6fc1c079c016d0d" > - > -SRC_URI = " \ > - http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.xz \ > -" > -SRC_URI[md5sum] = "9d268f2e891cce1ac0832f1cc467d4ea" > -SRC_URI[sha256sum] = "5a8704aa4c2eeb04da192c4a9942f94f860ac1a585de90d9f914bac26a970674" > - > -S = "${WORKDIR}/gstreamer-${PV}" > - > -CVE_PRODUCT = "gstreamer" > diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.14.0.bb > similarity index 84% > rename from meta/recipes-multimedia/gstreamer/gstreamer1.0.inc > rename to meta/recipes-multimedia/gstreamer/gstreamer1.0_1.14.0.bb > index c2df1f3258..b4398c8111 100644 > --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0.inc > +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.14.0.bb > @@ -14,11 +14,19 @@ inherit autotools pkgconfig gettext upstream-version-is-even gobject-introspecti > # (it has a custom INTROSPECTION_INIT macro, and so must be used instead of our common introspection.m4 file) > acpaths = "-I ${S}/common/m4 -I ${S}/m4" > > -SRC_URI_append = " \ > +LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d \ > + file://gst/gst.h;beginline=1;endline=21;md5=e059138481205ee2c6fc1c079c016d0d" > + > +S = "${WORKDIR}/gstreamer-${PV}" > + > +SRC_URI = " \ > + http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.xz \ > file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \ > file://gtk-doc-tweaks.patch \ > file://0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch \ > " > +SRC_URI[md5sum] = "63c7cbfb86aa28c4522e374dc5555b96" > +SRC_URI[sha256sum] = "fc361367f0d4b780a868a8833f9f30b9c9f4ac9faea4e6b251db8b4b0398466e" > > PACKAGECONFIG ??= "" > > @@ -59,3 +67,5 @@ do_configure[prefuncs] += "delete_pkg_m4_file" > do_compile_prepend() { > export GIR_EXTRA_LIBS_PATH="${B}/gst/.libs:${B}/libs/gst/base/.libs" > } > + > +CVE_PRODUCT = "gstreamer" ^ permalink raw reply [flat|nested] 25+ messages in thread
end of thread, other threads:[~2018-05-08 9:18 UTC | newest] Thread overview: 25+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2018-05-03 8:17 [PATCH 01/12] gstreamer1.0: upgrade 1.12.4 -> 1.14.0 Anuj Mittal 2018-05-03 8:17 ` [PATCH 02/12] gst-plugins-base: " Anuj Mittal 2018-05-04 11:52 ` Burton, Ross 2018-05-04 13:07 ` Anuj Mittal 2018-05-04 13:09 ` Burton, Ross 2018-05-07 10:14 ` Alexander Kanavin 2018-05-04 13:28 ` [PATCH v2] " Anuj Mittal 2018-05-07 10:42 ` Alexander Kanavin 2018-05-08 9:18 ` Anuj Mittal 2018-05-08 9:18 ` [PATCH v3] " Anuj Mittal 2018-05-03 8:17 ` [PATCH 03/12] gst-plugins-good: " Anuj Mittal 2018-05-03 8:17 ` [PATCH 04/12] gst-plugins-bad: " Anuj Mittal 2018-05-03 8:17 ` [PATCH 05/12] gst-plugins-ugly: " Anuj Mittal 2018-05-03 8:17 ` [PATCH 06/12] gst-rtsp-server: " Anuj Mittal 2018-05-03 8:17 ` [PATCH 07/12] gstreamer-vaapi: " Anuj Mittal 2018-05-03 8:17 ` [PATCH 08/12] gst-validate: " Anuj Mittal 2018-05-03 8:17 ` [PATCH 09/12] gst-omx: " Anuj Mittal 2018-05-03 8:17 ` [PATCH 10/12] gst-python: " Anuj Mittal 2018-05-03 8:17 ` [PATCH 11/12] gstreamer-libav: " Anuj Mittal 2018-05-03 8:17 ` [PATCH 12/12] gst-plugins-good: enable mpg123 and lame Anuj Mittal 2018-05-03 22:49 ` [PATCH 01/12] gstreamer1.0: upgrade 1.12.4 -> 1.14.0 Khem Raj 2018-05-04 10:23 ` Burton, Ross 2018-05-07 12:40 ` Carlos Rafael Giani 2018-05-07 16:03 ` Khem Raj 2018-05-07 12:39 ` Carlos Rafael Giani
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.