summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAnuj Mittal <anuj.mittal@intel.com>2018-05-09 12:01:39 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-05-11 07:49:37 +0100
commite7d761c8852d0cba6c177dca55ebe83d59d71db1 (patch)
treedb85458ee312c0b5f9b41bf0c0cdebd1d2104c32 /meta
parent37e1470a9a40e3558c9df8012fd26dc4fe205920 (diff)
downloadpoky-e7d761c8852d0cba6c177dca55ebe83d59d71db1.tar.gz
gst-plugins-base: upgrade 1.12.4 -> 1.14.0
* 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. (From OE-Core rev: 5e95178996185976adf2f2d91550fa7ff0e82f54) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-multimedia/gstreamer/files/0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch12
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc50
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch71
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-gl-pick-up-GstVideo-1.0.gir-from-local-build-dir.patch42
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-gstreamer-gl.pc.in-don-t-append-GL_CFLAGS-to-CFLAGS.patch29
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch158
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-riff-add-missing-include-directories-when-calling-in.patch12
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-ssaparse-enhance-SSA-text-lines-parsing.patch24
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0004-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch12
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0004-subparse-set-need_segment-after-sink-pad-received-GS.patch69
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0009-glimagesink-Downrank-to-marginal.patch32
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/get-caps-from-src-pad-when-query-caps.patch12
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/link-with-libvchostif.patch45
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/make-gio_unix_2_0-dependency-configurable.patch12
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.12.4.bb18
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.14.0.bb71
16 files changed, 376 insertions, 293 deletions
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 @@
1From 90916f96262fa7b27a0a99788c69f9fd6df11000 Mon Sep 17 00:00:00 2001 1From 2b0436f9a07773fae8c74df902d7024e8bfc3512 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Tue, 24 Nov 2015 16:46:27 +0200 3Date: Tue, 24 Nov 2015 16:46:27 +0200
4Subject: [PATCH] introspection.m4: prefix pkgconfig paths with 4Subject: [PATCH] introspection.m4: prefix pkgconfig paths with
@@ -10,12 +10,13 @@ is later supplied to g-ir-scanner.
10 10
11Upstream-Status: Pending [review on oe-core list] 11Upstream-Status: Pending [review on oe-core list]
12Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 12Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
13
13--- 14---
14 common/m4/introspection.m4 | 12 ++++++------ 15 common/m4/introspection.m4 | 8 ++++----
15 1 file changed, 6 insertions(+), 6 deletions(-) 16 1 file changed, 4 insertions(+), 4 deletions(-)
16 17
17diff --git a/common/m4/introspection.m4 b/common/m4/introspection.m4 18diff --git a/common/m4/introspection.m4 b/common/m4/introspection.m4
18index 162be57..217a6ae 100644 19index 162be57..933f979 100644
19--- a/common/m4/introspection.m4 20--- a/common/m4/introspection.m4
20+++ b/common/m4/introspection.m4 21+++ b/common/m4/introspection.m4
21@@ -54,14 +54,14 @@ m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL], 22@@ -54,14 +54,14 @@ m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL],
@@ -37,6 +38,3 @@ index 162be57..217a6ae 100644
37 INTROSPECTION_INIT="extern void gst_init(gint*,gchar**); gst_init(NULL,NULL);" 38 INTROSPECTION_INIT="extern void gst_init(gint*,gchar**); gst_init(NULL,NULL);"
38 fi 39 fi
39 AC_SUBST(INTROSPECTION_SCANNER) 40 AC_SUBST(INTROSPECTION_SCANNER)
40--
412.6.2
42
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 @@
1require gstreamer1.0-plugins.inc
2
3SRC_URI_append = "\
4 file://0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch \
5 file://0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch \
6 file://0003-riff-add-missing-include-directories-when-calling-in.patch \
7 file://0004-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch \
8"
9
10LICENSE = "GPLv2+ & LGPLv2+"
11
12DEPENDS += "iso-codes util-linux zlib"
13
14inherit gettext
15
16PACKAGES_DYNAMIC =+ "^libgst.*"
17
18PACKAGECONFIG ??= " \
19 ${GSTREAMER_ORC} \
20 ${@bb.utils.filter('DISTRO_FEATURES', 'alsa x11', d)} \
21 gio-unix-2.0 ogg pango theora vorbis \
22"
23
24X11DEPENDS = "virtual/libx11 libsm libxrender libxv"
25X11ENABLEOPTS = "--enable-x --enable-xvideo --enable-xshm"
26X11DISABLEOPTS = "--disable-x --disable-xvideo --disable-xshm"
27
28PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib"
29PACKAGECONFIG[cdparanoia] = "--enable-cdparanoia,--disable-cdparanoia,cdparanoia"
30PACKAGECONFIG[gio-unix-2.0] = "--enable-gio_unix_2_0,--disable-gio_unix_2_0,glib-2.0"
31PACKAGECONFIG[ivorbis] = "--enable-ivorbis,--disable-ivorbis,tremor"
32PACKAGECONFIG[ogg] = "--enable-ogg,--disable-ogg,libogg"
33PACKAGECONFIG[opus] = "--enable-opus,--disable-opus,libopus"
34PACKAGECONFIG[pango] = "--enable-pango,--disable-pango,pango"
35PACKAGECONFIG[theora] = "--enable-theora,--disable-theora,libtheora"
36PACKAGECONFIG[visual] = "--enable-libvisual,--disable-libvisual,libvisual"
37PACKAGECONFIG[vorbis] = "--enable-vorbis,--disable-vorbis,libvorbis"
38PACKAGECONFIG[x11] = "${X11ENABLEOPTS},${X11DISABLEOPTS},${X11DEPENDS}"
39
40EXTRA_OECONF += " \
41 --enable-zlib \
42"
43
44CACHED_CONFIGUREVARS_append_x86 = " ac_cv_header_emmintrin_h=no ac_cv_header_xmmintrin_h=no"
45
46FILES_${MLPREFIX}libgsttag-1.0 += "${datadir}/gst-plugins-base/1.0/license-translations.dict"
47
48do_compile_prepend() {
49 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"
50}
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 @@
1From f1d9652351e7754c63003104eceb526af424c7e0 Mon Sep 17 00:00:00 2001 1From 4d6ea58f96b9744af8d899ddca22c2695ac74b5b Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Fri, 20 Nov 2015 16:53:04 +0200 3Date: Thu, 5 Apr 2018 10:15:08 +0800
4Subject: [PATCH 1/4] Makefile.am: don't hardcode libtool name when running 4Subject: [PATCH] Makefile.am: don't hardcode libtool name when running
5 introspection tools 5 introspection tools
6 6
7Upstream-Status: Pending [review on oe-core maillist] 7Upstream-Status: Pending [review on oe-core maillist]
8Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 8Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
9Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
10
9--- 11---
10 gst-libs/gst/allocators/Makefile.am | 2 +- 12 gst-libs/gst/allocators/Makefile.am | 2 +-
11 gst-libs/gst/app/Makefile.am | 2 +- 13 gst-libs/gst/app/Makefile.am | 2 +-
12 gst-libs/gst/audio/Makefile.am | 2 +- 14 gst-libs/gst/audio/Makefile.am | 2 +-
13 gst-libs/gst/fft/Makefile.am | 2 +- 15 gst-libs/gst/gl/Makefile.am | 2 +-
14 gst-libs/gst/pbutils/Makefile.am | 2 +- 16 gst-libs/gst/pbutils/Makefile.am | 2 +-
15 gst-libs/gst/riff/Makefile.am | 2 +- 17 gst-libs/gst/riff/Makefile.am | 2 +-
16 gst-libs/gst/rtp/Makefile.am | 2 +- 18 gst-libs/gst/rtp/Makefile.am | 2 +-
@@ -21,10 +23,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
21 11 files changed, 11 insertions(+), 11 deletions(-) 23 11 files changed, 11 insertions(+), 11 deletions(-)
22 24
23diff --git a/gst-libs/gst/allocators/Makefile.am b/gst-libs/gst/allocators/Makefile.am 25diff --git a/gst-libs/gst/allocators/Makefile.am b/gst-libs/gst/allocators/Makefile.am
24index 9361bf9..bc7f53a 100644 26index 1957d28..1ecc950 100644
25--- a/gst-libs/gst/allocators/Makefile.am 27--- a/gst-libs/gst/allocators/Makefile.am
26+++ b/gst-libs/gst/allocators/Makefile.am 28+++ b/gst-libs/gst/allocators/Makefile.am
27@@ -38,7 +38,7 @@ GstAllocators-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstallocators-@ 29@@ -42,7 +42,7 @@ GstAllocators-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstallocators-@
28 --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ 30 --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
29 --library=libgstallocators-@GST_API_VERSION@.la \ 31 --library=libgstallocators-@GST_API_VERSION@.la \
30 --include=Gst-@GST_API_VERSION@ \ 32 --include=Gst-@GST_API_VERSION@ \
@@ -34,10 +36,10 @@ index 9361bf9..bc7f53a 100644
34 --pkg-export gstreamer-allocators-@GST_API_VERSION@ \ 36 --pkg-export gstreamer-allocators-@GST_API_VERSION@ \
35 --output $@ \ 37 --output $@ \
36diff --git a/gst-libs/gst/app/Makefile.am b/gst-libs/gst/app/Makefile.am 38diff --git a/gst-libs/gst/app/Makefile.am b/gst-libs/gst/app/Makefile.am
37index 6d6de8d..dcc2fe0 100644 39index 52f6ad3..5bfd606 100644
38--- a/gst-libs/gst/app/Makefile.am 40--- a/gst-libs/gst/app/Makefile.am
39+++ b/gst-libs/gst/app/Makefile.am 41+++ b/gst-libs/gst/app/Makefile.am
40@@ -53,7 +53,7 @@ GstApp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstapp-@GST_API_VERSIO 42@@ -56,7 +56,7 @@ GstApp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstapp-@GST_API_VERSIO
41 --library=libgstapp-@GST_API_VERSION@.la \ 43 --library=libgstapp-@GST_API_VERSION@.la \
42 --include=Gst-@GST_API_VERSION@ \ 44 --include=Gst-@GST_API_VERSION@ \
43 --include=GstBase-@GST_API_VERSION@ \ 45 --include=GstBase-@GST_API_VERSION@ \
@@ -47,10 +49,10 @@ index 6d6de8d..dcc2fe0 100644
47 --pkg gstreamer-base-@GST_API_VERSION@ \ 49 --pkg gstreamer-base-@GST_API_VERSION@ \
48 --pkg-export gstreamer-app-@GST_API_VERSION@ \ 50 --pkg-export gstreamer-app-@GST_API_VERSION@ \
49diff --git a/gst-libs/gst/audio/Makefile.am b/gst-libs/gst/audio/Makefile.am 51diff --git a/gst-libs/gst/audio/Makefile.am b/gst-libs/gst/audio/Makefile.am
50index 275d222..2374196 100644 52index 2922245..7fb65f2 100644
51--- a/gst-libs/gst/audio/Makefile.am 53--- a/gst-libs/gst/audio/Makefile.am
52+++ b/gst-libs/gst/audio/Makefile.am 54+++ b/gst-libs/gst/audio/Makefile.am
53@@ -116,7 +116,7 @@ GstAudio-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstaudio-@GST_API_VE 55@@ -184,7 +184,7 @@ GstAudio-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstaudio-@GST_API_VE
54 --include=Gst-@GST_API_VERSION@ \ 56 --include=Gst-@GST_API_VERSION@ \
55 --include=GstBase-@GST_API_VERSION@ \ 57 --include=GstBase-@GST_API_VERSION@ \
56 --include=GstTag-@GST_API_VERSION@ \ 58 --include=GstTag-@GST_API_VERSION@ \
@@ -59,24 +61,24 @@ index 275d222..2374196 100644
59 --pkg gstreamer-@GST_API_VERSION@ \ 61 --pkg gstreamer-@GST_API_VERSION@ \
60 --pkg gstreamer-base-@GST_API_VERSION@ \ 62 --pkg gstreamer-base-@GST_API_VERSION@ \
61 --pkg-export gstreamer-audio-@GST_API_VERSION@ \ 63 --pkg-export gstreamer-audio-@GST_API_VERSION@ \
62diff --git a/gst-libs/gst/fft/Makefile.am b/gst-libs/gst/fft/Makefile.am 64diff --git a/gst-libs/gst/gl/Makefile.am b/gst-libs/gst/gl/Makefile.am
63index 09b3d68..f545354 100644 65index a3bbc94..16f829f 100644
64--- a/gst-libs/gst/fft/Makefile.am 66--- a/gst-libs/gst/gl/Makefile.am
65+++ b/gst-libs/gst/fft/Makefile.am 67+++ b/gst-libs/gst/gl/Makefile.am
66@@ -65,7 +65,7 @@ GstFft-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstfft-@GST_API_VERSIO 68@@ -192,7 +192,7 @@ GstGL-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstgl-@GST_API_VERSION@
67 --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
68 --library=libgstfft-@GST_API_VERSION@.la \
69 --include=Gst-@GST_API_VERSION@ \ 69 --include=Gst-@GST_API_VERSION@ \
70 --include=GstBase-@GST_API_VERSION@ \
71 --include=GstVideo-@GST_API_VERSION@ \
70- --libtool="$(top_builddir)/libtool" \ 72- --libtool="$(top_builddir)/libtool" \
71+ --libtool="$(LIBTOOL)" \ 73+ --libtool="$(LIBTOOL)" \
72 --pkg gstreamer-@GST_API_VERSION@ \ 74 --pkg gstreamer-@GST_API_VERSION@ \
73 --pkg-export gstreamer-fft-@GST_API_VERSION@ \ 75 --pkg gstreamer-base-@GST_API_VERSION@ \
74 --output $@ \ 76 --pkg gstreamer-video-@GST_API_VERSION@ \
75diff --git a/gst-libs/gst/pbutils/Makefile.am b/gst-libs/gst/pbutils/Makefile.am 77diff --git a/gst-libs/gst/pbutils/Makefile.am b/gst-libs/gst/pbutils/Makefile.am
76index 64d5eb0..91dc214 100644 78index ae51993..35a6e44 100644
77--- a/gst-libs/gst/pbutils/Makefile.am 79--- a/gst-libs/gst/pbutils/Makefile.am
78+++ b/gst-libs/gst/pbutils/Makefile.am 80+++ b/gst-libs/gst/pbutils/Makefile.am
79@@ -99,7 +99,7 @@ GstPbutils-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstpbutils-@GST_AP 81@@ -103,7 +103,7 @@ GstPbutils-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstpbutils-@GST_AP
80 --include=GstTag-@GST_API_VERSION@ \ 82 --include=GstTag-@GST_API_VERSION@ \
81 --include=GstVideo-@GST_API_VERSION@ \ 83 --include=GstVideo-@GST_API_VERSION@ \
82 --include=GstAudio-@GST_API_VERSION@ \ 84 --include=GstAudio-@GST_API_VERSION@ \
@@ -86,10 +88,10 @@ index 64d5eb0..91dc214 100644
86 --pkg gstreamer-tag-@GST_API_VERSION@ \ 88 --pkg gstreamer-tag-@GST_API_VERSION@ \
87 --pkg gstreamer-video-@GST_API_VERSION@ \ 89 --pkg gstreamer-video-@GST_API_VERSION@ \
88diff --git a/gst-libs/gst/riff/Makefile.am b/gst-libs/gst/riff/Makefile.am 90diff --git a/gst-libs/gst/riff/Makefile.am b/gst-libs/gst/riff/Makefile.am
89index 83d83cb..3bd8fc0 100644 91index fb53f06..e66ef4f 100644
90--- a/gst-libs/gst/riff/Makefile.am 92--- a/gst-libs/gst/riff/Makefile.am
91+++ b/gst-libs/gst/riff/Makefile.am 93+++ b/gst-libs/gst/riff/Makefile.am
92@@ -47,7 +47,7 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) 94@@ -49,7 +49,7 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS)
93 # --include=GstAudio-@GST_API_VERSION@ \ 95 # --include=GstAudio-@GST_API_VERSION@ \
94 # --include=GstTag-@GST_API_VERSION@ \ 96 # --include=GstTag-@GST_API_VERSION@ \
95 # --include=Gst-@GST_API_VERSION@ \ 97 # --include=Gst-@GST_API_VERSION@ \
@@ -99,10 +101,10 @@ index 83d83cb..3bd8fc0 100644
99 # --pkg gstreamer-tag-@GST_API_VERSION@ \ 101 # --pkg gstreamer-tag-@GST_API_VERSION@ \
100 # --pkg gstreamer-audio-@GST_API_VERSION@ \ 102 # --pkg gstreamer-audio-@GST_API_VERSION@ \
101diff --git a/gst-libs/gst/rtp/Makefile.am b/gst-libs/gst/rtp/Makefile.am 103diff --git a/gst-libs/gst/rtp/Makefile.am b/gst-libs/gst/rtp/Makefile.am
102index fdd01c1..f5445c1 100644 104index a6f971d..77ebeeb 100644
103--- a/gst-libs/gst/rtp/Makefile.am 105--- a/gst-libs/gst/rtp/Makefile.am
104+++ b/gst-libs/gst/rtp/Makefile.am 106+++ b/gst-libs/gst/rtp/Makefile.am
105@@ -65,7 +65,7 @@ GstRtp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtp-@GST_API_VERSIO 107@@ -69,7 +69,7 @@ GstRtp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtp-@GST_API_VERSIO
106 --library=libgstrtp-@GST_API_VERSION@.la \ 108 --library=libgstrtp-@GST_API_VERSION@.la \
107 --include=Gst-@GST_API_VERSION@ \ 109 --include=Gst-@GST_API_VERSION@ \
108 --include=GstBase-@GST_API_VERSION@ \ 110 --include=GstBase-@GST_API_VERSION@ \
@@ -112,10 +114,10 @@ index fdd01c1..f5445c1 100644
112 --pkg gstreamer-base-@GST_API_VERSION@ \ 114 --pkg gstreamer-base-@GST_API_VERSION@ \
113 --pkg-export gstreamer-rtp-@GST_API_VERSION@ \ 115 --pkg-export gstreamer-rtp-@GST_API_VERSION@ \
114diff --git a/gst-libs/gst/rtsp/Makefile.am b/gst-libs/gst/rtsp/Makefile.am 116diff --git a/gst-libs/gst/rtsp/Makefile.am b/gst-libs/gst/rtsp/Makefile.am
115index ede5706..9b0b258 100644 117index ceb07f4..db9d0fd 100644
116--- a/gst-libs/gst/rtsp/Makefile.am 118--- a/gst-libs/gst/rtsp/Makefile.am
117+++ b/gst-libs/gst/rtsp/Makefile.am 119+++ b/gst-libs/gst/rtsp/Makefile.am
118@@ -72,7 +72,7 @@ GstRtsp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERS 120@@ -76,7 +76,7 @@ GstRtsp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERS
119 --include=Gio-2.0 \ 121 --include=Gio-2.0 \
120 --include=Gst-@GST_API_VERSION@ \ 122 --include=Gst-@GST_API_VERSION@ \
121 --include=GstSdp-@GST_API_VERSION@ \ 123 --include=GstSdp-@GST_API_VERSION@ \
@@ -125,10 +127,10 @@ index ede5706..9b0b258 100644
125 --pkg gstreamer-@GST_API_VERSION@ \ 127 --pkg gstreamer-@GST_API_VERSION@ \
126 --pkg gstreamer-sdp-@GST_API_VERSION@ \ 128 --pkg gstreamer-sdp-@GST_API_VERSION@ \
127diff --git a/gst-libs/gst/sdp/Makefile.am b/gst-libs/gst/sdp/Makefile.am 129diff --git a/gst-libs/gst/sdp/Makefile.am b/gst-libs/gst/sdp/Makefile.am
128index a90f30b..0e149b8 100644 130index e197e9b..6e05cc7 100644
129--- a/gst-libs/gst/sdp/Makefile.am 131--- a/gst-libs/gst/sdp/Makefile.am
130+++ b/gst-libs/gst/sdp/Makefile.am 132+++ b/gst-libs/gst/sdp/Makefile.am
131@@ -32,7 +32,7 @@ GstSdp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstsdp-@GST_API_VERSIO 133@@ -34,7 +34,7 @@ GstSdp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstsdp-@GST_API_VERSIO
132 --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ 134 --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
133 --library=libgstsdp-@GST_API_VERSION@.la \ 135 --library=libgstsdp-@GST_API_VERSION@.la \
134 --include=Gst-@GST_API_VERSION@ \ 136 --include=Gst-@GST_API_VERSION@ \
@@ -138,10 +140,10 @@ index a90f30b..0e149b8 100644
138 --pkg-export gstreamer-sdp-@GST_API_VERSION@ \ 140 --pkg-export gstreamer-sdp-@GST_API_VERSION@ \
139 --output $@ \ 141 --output $@ \
140diff --git a/gst-libs/gst/tag/Makefile.am b/gst-libs/gst/tag/Makefile.am 142diff --git a/gst-libs/gst/tag/Makefile.am b/gst-libs/gst/tag/Makefile.am
141index c534a4d..cafafd3 100644 143index 0247c33..c86515b 100644
142--- a/gst-libs/gst/tag/Makefile.am 144--- a/gst-libs/gst/tag/Makefile.am
143+++ b/gst-libs/gst/tag/Makefile.am 145+++ b/gst-libs/gst/tag/Makefile.am
144@@ -45,7 +45,7 @@ GstTag-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgsttag-@GST_API_VERSIO 146@@ -66,7 +66,7 @@ GstTag-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgsttag-@GST_API_VERSIO
145 --library=libgsttag-@GST_API_VERSION@.la \ 147 --library=libgsttag-@GST_API_VERSION@.la \
146 --include=Gst-@GST_API_VERSION@ \ 148 --include=Gst-@GST_API_VERSION@ \
147 --include=GstBase-@GST_API_VERSION@ \ 149 --include=GstBase-@GST_API_VERSION@ \
@@ -151,10 +153,10 @@ index c534a4d..cafafd3 100644
151 --pkg gstreamer-base-@GST_API_VERSION@ \ 153 --pkg gstreamer-base-@GST_API_VERSION@ \
152 --pkg-export gstreamer-tag-@GST_API_VERSION@ \ 154 --pkg-export gstreamer-tag-@GST_API_VERSION@ \
153diff --git a/gst-libs/gst/video/Makefile.am b/gst-libs/gst/video/Makefile.am 155diff --git a/gst-libs/gst/video/Makefile.am b/gst-libs/gst/video/Makefile.am
154index 5d31fa1..ac64eb3 100644 156index 9fc1ccf..0f8455f 100644
155--- a/gst-libs/gst/video/Makefile.am 157--- a/gst-libs/gst/video/Makefile.am
156+++ b/gst-libs/gst/video/Makefile.am 158+++ b/gst-libs/gst/video/Makefile.am
157@@ -116,7 +116,7 @@ GstVideo-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstvideo-@GST_API_VE 159@@ -124,7 +124,7 @@ GstVideo-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstvideo-@GST_API_VE
158 --library=libgstvideo-@GST_API_VERSION@.la \ 160 --library=libgstvideo-@GST_API_VERSION@.la \
159 --include=Gst-@GST_API_VERSION@ \ 161 --include=Gst-@GST_API_VERSION@ \
160 --include=GstBase-@GST_API_VERSION@ \ 162 --include=GstBase-@GST_API_VERSION@ \
@@ -163,6 +165,3 @@ index 5d31fa1..ac64eb3 100644
163 --pkg gstreamer-@GST_API_VERSION@ \ 165 --pkg gstreamer-@GST_API_VERSION@ \
164 --pkg gstreamer-base-@GST_API_VERSION@ \ 166 --pkg gstreamer-base-@GST_API_VERSION@ \
165 --pkg-export gstreamer-video-@GST_API_VERSION@ \ 167 --pkg-export gstreamer-video-@GST_API_VERSION@ \
166--
1672.6.2
168
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 @@
1From 1a7c457cf209e853148865f196edc12ba8d5c10c Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.com>
3Date: Tue, 27 Mar 2018 10:43:16 +0100
4Subject: [PATCH] gl: pick up GstVideo-1.0.gir from local build dir
5
6https://bugzilla.gnome.org/show_bug.cgi?id=794708
7
8Upstream-Status: Backport [https://cgit.freedesktop.org/gstreamer/gst-plugins-base/commit/?h=1.14&id=9261296858cb149767ceac44fd6bd13cc0de0d21]
9
10Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
11
12---
13 gst-libs/gst/gl/Makefile.am | 5 +++--
14 1 file changed, 3 insertions(+), 2 deletions(-)
15
16diff --git a/gst-libs/gst/gl/Makefile.am b/gst-libs/gst/gl/Makefile.am
17index fc15a6d..ab6cc55 100644
18--- a/gst-libs/gst/gl/Makefile.am
19+++ b/gst-libs/gst/gl/Makefile.am
20@@ -185,9 +185,10 @@ GstGL-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstgl-@GST_API_VERSION@
21 -I$(top_builddir)/gst-libs \
22 $(GST_PLUGINS_BASE_CFLAGS) \
23 $(GL_CFLAGS) \
24+ --add-include-path="$(top_builddir)/gst-libs/gst/video/" \
25 --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
26 --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
27- --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-video-@GST_API_VERSION@` \
28+ --library-path="$(top_builddir)/gst-libs/gst/video/" \
29 --library=libgstgl-@GST_API_VERSION@.la \
30 --include=Gst-@GST_API_VERSION@ \
31 --include=GstBase-@GST_API_VERSION@ \
32@@ -216,9 +217,9 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
33 $(INTROSPECTION_COMPILER) \
34 --includedir=$(srcdir) \
35 --includedir=$(builddir) \
36+ --includedir="$(top_builddir)/gst-libs/gst/video/" \
37 --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
38 --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
39- --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-video-@GST_API_VERSION@` \
40 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
41
42 CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA)
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/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 @@
1From 61a672e79c8cb1aeeeda4c968997c577ac73a8f3 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Fri, 12 May 2017 16:47:12 +0300
4Subject: [PATCH] gstreamer-gl.pc.in: don't append GL_CFLAGS to CFLAGS
5
6Dependencies' include directories should not be added in this way;
7it causes problems when cross-compiling in sysroot environments.
8
9Upstream-Status: Pending
10
11Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
12Signed-off-by: Maxin B. John <maxin.john@intel.com>
13---
14 pkgconfig/gstreamer-gl.pc.in | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17diff --git a/pkgconfig/gstreamer-gl.pc.in b/pkgconfig/gstreamer-gl.pc.in
18index dc672a9..8c290ba 100644
19--- a/pkgconfig/gstreamer-gl.pc.in
20+++ b/pkgconfig/gstreamer-gl.pc.in
21@@ -13,4 +13,4 @@ Version: @VERSION@
22 Requires: gstreamer-video-@GST_API_VERSION@ gstreamer-base-@GST_API_VERSION@ gstreamer-@GST_API_VERSION@
23
24 Libs: -L${libdir} -lgstgl-@GST_API_VERSION@
25-Cflags: -I${includedir} -I${libdir}/gstreamer-@GST_API_VERSION@/include @GL_CFLAGS@
26+Cflags: -I${includedir} -I${libdir}/gstreamer-@GST_API_VERSION@/include
27--
282.7.4
29
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 @@
1From 990b653c7b6de1937ec759019982d6c5f15770f7 Mon Sep 17 00:00:00 2001 1From 77b88eae845060d38cf788651f66a7ae98f9b199 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Mon, 26 Oct 2015 16:38:18 +0200 3Date: Thu, 5 Apr 2018 10:26:25 +0800
4Subject: [PATCH 2/4] Makefile.am: prefix calls to pkg-config with 4Subject: [PATCH] Makefile.am: prefix calls to pkg-config with
5 PKG_CONFIG_SYSROOT_DIR 5 PKG_CONFIG_SYSROOT_DIR
6 6
7Upstream-Status: Pending [review on oe-core maillist] 7Upstream-Status: Pending [review on oe-core maillist]
8Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 8Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
9Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
10
9--- 11---
10 gst-libs/gst/allocators/Makefile.am | 4 ++-- 12 gst-libs/gst/allocators/Makefile.am | 4 ++--
11 gst-libs/gst/app/Makefile.am | 4 ++-- 13 gst-libs/gst/app/Makefile.am | 4 ++--
12 gst-libs/gst/audio/Makefile.am | 12 ++++++------ 14 gst-libs/gst/audio/Makefile.am | 12 ++++++------
13 gst-libs/gst/fft/Makefile.am | 4 ++-- 15 gst-libs/gst/gl/Makefile.am | 12 ++++++------
14 gst-libs/gst/pbutils/Makefile.am | 12 ++++++------ 16 gst-libs/gst/pbutils/Makefile.am | 12 ++++++------
15 gst-libs/gst/riff/Makefile.am | 8 ++++---- 17 gst-libs/gst/riff/Makefile.am | 8 ++++----
16 gst-libs/gst/rtp/Makefile.am | 8 ++++---- 18 gst-libs/gst/rtp/Makefile.am | 8 ++++----
@@ -18,13 +20,13 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
18 gst-libs/gst/sdp/Makefile.am | 4 ++-- 20 gst-libs/gst/sdp/Makefile.am | 4 ++--
19 gst-libs/gst/tag/Makefile.am | 8 ++++---- 21 gst-libs/gst/tag/Makefile.am | 8 ++++----
20 gst-libs/gst/video/Makefile.am | 8 ++++---- 22 gst-libs/gst/video/Makefile.am | 8 ++++----
21 11 files changed, 38 insertions(+), 38 deletions(-) 23 11 files changed, 42 insertions(+), 42 deletions(-)
22 24
23Index: gst-plugins-base-1.12.3/gst-libs/gst/allocators/Makefile.am 25diff --git a/gst-libs/gst/allocators/Makefile.am b/gst-libs/gst/allocators/Makefile.am
24=================================================================== 26index 1ecc950..d6417ac 100644
25--- gst-plugins-base-1.12.3.orig/gst-libs/gst/allocators/Makefile.am 27--- a/gst-libs/gst/allocators/Makefile.am
26+++ gst-plugins-base-1.12.3/gst-libs/gst/allocators/Makefile.am 28+++ b/gst-libs/gst/allocators/Makefile.am
27@@ -36,7 +36,7 @@ GstAllocators-@GST_API_VERSION@.gir: $(I 29@@ -39,7 +39,7 @@ GstAllocators-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstallocators-@
28 --c-include "gst/allocators/allocators.h" \ 30 --c-include "gst/allocators/allocators.h" \
29 -I$(top_srcdir)/gst-libs \ 31 -I$(top_srcdir)/gst-libs \
30 -I$(top_builddir)/gst-libs \ 32 -I$(top_builddir)/gst-libs \
@@ -33,7 +35,7 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/allocators/Makefile.am
33 --library=libgstallocators-@GST_API_VERSION@.la \ 35 --library=libgstallocators-@GST_API_VERSION@.la \
34 --include=Gst-@GST_API_VERSION@ \ 36 --include=Gst-@GST_API_VERSION@ \
35 --libtool="$(LIBTOOL)" \ 37 --libtool="$(LIBTOOL)" \
36@@ -60,7 +60,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= 38@@ -63,7 +63,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
37 $(INTROSPECTION_COMPILER) \ 39 $(INTROSPECTION_COMPILER) \
38 --includedir=$(srcdir) \ 40 --includedir=$(srcdir) \
39 --includedir=$(builddir) \ 41 --includedir=$(builddir) \
@@ -42,11 +44,11 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/allocators/Makefile.am
42 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) 44 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
43 45
44 CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA) 46 CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA)
45Index: gst-plugins-base-1.12.3/gst-libs/gst/app/Makefile.am 47diff --git a/gst-libs/gst/app/Makefile.am b/gst-libs/gst/app/Makefile.am
46=================================================================== 48index 5bfd606..6441674 100644
47--- gst-plugins-base-1.12.3.orig/gst-libs/gst/app/Makefile.am 49--- a/gst-libs/gst/app/Makefile.am
48+++ gst-plugins-base-1.12.3/gst-libs/gst/app/Makefile.am 50+++ b/gst-libs/gst/app/Makefile.am
49@@ -48,8 +48,8 @@ GstApp-@GST_API_VERSION@.gir: $(INTROSPE 51@@ -51,8 +51,8 @@ GstApp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstapp-@GST_API_VERSIO
50 --c-include "gst/app/app.h" \ 52 --c-include "gst/app/app.h" \
51 -I$(top_srcdir)/gst-libs \ 53 -I$(top_srcdir)/gst-libs \
52 -I$(top_builddir)/gst-libs \ 54 -I$(top_builddir)/gst-libs \
@@ -57,11 +59,11 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/app/Makefile.am
57 --library=libgstapp-@GST_API_VERSION@.la \ 59 --library=libgstapp-@GST_API_VERSION@.la \
58 --include=Gst-@GST_API_VERSION@ \ 60 --include=Gst-@GST_API_VERSION@ \
59 --include=GstBase-@GST_API_VERSION@ \ 61 --include=GstBase-@GST_API_VERSION@ \
60Index: gst-plugins-base-1.12.3/gst-libs/gst/audio/Makefile.am 62diff --git a/gst-libs/gst/audio/Makefile.am b/gst-libs/gst/audio/Makefile.am
61=================================================================== 63index 7fb65f2..5379f79 100644
62--- gst-plugins-base-1.12.3.orig/gst-libs/gst/audio/Makefile.am 64--- a/gst-libs/gst/audio/Makefile.am
63+++ gst-plugins-base-1.12.3/gst-libs/gst/audio/Makefile.am 65+++ b/gst-libs/gst/audio/Makefile.am
64@@ -167,12 +167,12 @@ GstAudio-@GST_API_VERSION@.gir: $(INTROS 66@@ -174,12 +174,12 @@ GstAudio-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstaudio-@GST_API_VE
65 -I$(top_srcdir)/gst-libs \ 67 -I$(top_srcdir)/gst-libs \
66 -I$(top_builddir)/gst-libs \ 68 -I$(top_builddir)/gst-libs \
67 --c-include "gst/audio/audio.h" \ 69 --c-include "gst/audio/audio.h" \
@@ -78,7 +80,7 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/audio/Makefile.am
78 --library-path="$(top_builddir)/gst-libs/gst/tag/" \ 80 --library-path="$(top_builddir)/gst-libs/gst/tag/" \
79 --include=Gst-@GST_API_VERSION@ \ 81 --include=Gst-@GST_API_VERSION@ \
80 --include=GstBase-@GST_API_VERSION@ \ 82 --include=GstBase-@GST_API_VERSION@ \
81@@ -201,8 +201,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= 83@@ -208,8 +208,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
82 --includedir=$(srcdir) \ 84 --includedir=$(srcdir) \
83 --includedir=$(builddir) \ 85 --includedir=$(builddir) \
84 --includedir="$(top_builddir)/gst-libs/gst/tag/" \ 86 --includedir="$(top_builddir)/gst-libs/gst/tag/" \
@@ -89,33 +91,41 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/audio/Makefile.am
89 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) 91 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
90 92
91 CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) 93 CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
92Index: gst-plugins-base-1.12.3/gst-libs/gst/fft/Makefile.am 94diff --git a/gst-libs/gst/gl/Makefile.am b/gst-libs/gst/gl/Makefile.am
93=================================================================== 95index 16f829f..fc15a6d 100644
94--- gst-plugins-base-1.12.3.orig/gst-libs/gst/fft/Makefile.am 96--- a/gst-libs/gst/gl/Makefile.am
95+++ gst-plugins-base-1.12.3/gst-libs/gst/fft/Makefile.am 97+++ b/gst-libs/gst/gl/Makefile.am
96@@ -63,7 +63,7 @@ GstFft-@GST_API_VERSION@.gir: $(INTROSPE 98@@ -185,9 +185,9 @@ GstGL-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstgl-@GST_API_VERSION@
97 --c-include "gst/fft/fft.h" \
98 -I$(top_srcdir)/gst-libs \
99 -I$(top_builddir)/gst-libs \ 99 -I$(top_builddir)/gst-libs \
100 $(GST_PLUGINS_BASE_CFLAGS) \
101 $(GL_CFLAGS) \
100- --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ 102- --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
103- --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
104- --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-video-@GST_API_VERSION@` \
101+ --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ 105+ --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
102 --library=libgstfft-@GST_API_VERSION@.la \ 106+ --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
107+ --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-video-@GST_API_VERSION@` \
108 --library=libgstgl-@GST_API_VERSION@.la \
103 --include=Gst-@GST_API_VERSION@ \ 109 --include=Gst-@GST_API_VERSION@ \
104 --libtool="$(LIBTOOL)" \ 110 --include=GstBase-@GST_API_VERSION@ \
105@@ -87,7 +87,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= 111@@ -216,9 +216,9 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
106 $(INTROSPECTION_COMPILER) \ 112 $(INTROSPECTION_COMPILER) \
107 --includedir=$(srcdir) \ 113 --includedir=$(srcdir) \
108 --includedir=$(builddir) \ 114 --includedir=$(builddir) \
109- --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ 115- --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
116- --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
117- --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-video-@GST_API_VERSION@` \
110+ --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ 118+ --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
119+ --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
120+ --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-video-@GST_API_VERSION@` \
111 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) 121 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
112 122
113 CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA) 123 CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA)
114Index: gst-plugins-base-1.12.3/gst-libs/gst/pbutils/Makefile.am 124diff --git a/gst-libs/gst/pbutils/Makefile.am b/gst-libs/gst/pbutils/Makefile.am
115=================================================================== 125index 35a6e44..49d6894 100644
116--- gst-plugins-base-1.12.3.orig/gst-libs/gst/pbutils/Makefile.am 126--- a/gst-libs/gst/pbutils/Makefile.am
117+++ gst-plugins-base-1.12.3/gst-libs/gst/pbutils/Makefile.am 127+++ b/gst-libs/gst/pbutils/Makefile.am
118@@ -85,14 +85,14 @@ GstPbutils-@GST_API_VERSION@.gir: $(INTR 128@@ -88,14 +88,14 @@ GstPbutils-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstpbutils-@GST_AP
119 --c-include "gst/pbutils/pbutils.h" \ 129 --c-include "gst/pbutils/pbutils.h" \
120 -I$(top_srcdir)/gst-libs \ 130 -I$(top_srcdir)/gst-libs \
121 -I$(top_builddir)/gst-libs \ 131 -I$(top_builddir)/gst-libs \
@@ -134,7 +144,7 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/pbutils/Makefile.am
134 --library-path="$(top_builddir)/gst-libs/gst/tag/" \ 144 --library-path="$(top_builddir)/gst-libs/gst/tag/" \
135 --library-path="$(top_builddir)/gst-libs/gst/video/" \ 145 --library-path="$(top_builddir)/gst-libs/gst/video/" \
136 --library-path="$(top_builddir)/gst-libs/gst/audio/" \ 146 --library-path="$(top_builddir)/gst-libs/gst/audio/" \
137@@ -125,8 +125,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= 147@@ -128,8 +128,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
138 $(INTROSPECTION_COMPILER) \ 148 $(INTROSPECTION_COMPILER) \
139 --includedir=$(srcdir) \ 149 --includedir=$(srcdir) \
140 --includedir=$(builddir) \ 150 --includedir=$(builddir) \
@@ -145,11 +155,11 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/pbutils/Makefile.am
145 --includedir="$(top_builddir)/gst-libs/gst/tag/" \ 155 --includedir="$(top_builddir)/gst-libs/gst/tag/" \
146 --includedir="$(top_builddir)/gst-libs/gst/video/" \ 156 --includedir="$(top_builddir)/gst-libs/gst/video/" \
147 --includedir="$(top_builddir)/gst-libs/gst/audio/" \ 157 --includedir="$(top_builddir)/gst-libs/gst/audio/" \
148Index: gst-plugins-base-1.12.3/gst-libs/gst/riff/Makefile.am 158diff --git a/gst-libs/gst/riff/Makefile.am b/gst-libs/gst/riff/Makefile.am
149=================================================================== 159index e66ef4f..c8c588a 100644
150--- gst-plugins-base-1.12.3.orig/gst-libs/gst/riff/Makefile.am 160--- a/gst-libs/gst/riff/Makefile.am
151+++ gst-plugins-base-1.12.3/gst-libs/gst/riff/Makefile.am 161+++ b/gst-libs/gst/riff/Makefile.am
152@@ -42,8 +42,8 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS 162@@ -43,8 +43,8 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS)
153 # --c-include "gst/riff/riff.h" \ 163 # --c-include "gst/riff/riff.h" \
154 # --add-include-path=$(builddir)/../tag \ 164 # --add-include-path=$(builddir)/../tag \
155 # --add-include-path=$(builddir)/../audio \ 165 # --add-include-path=$(builddir)/../audio \
@@ -160,7 +170,7 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/riff/Makefile.am
160 # --library=libgstriff-@GST_API_VERSION@.la \ 170 # --library=libgstriff-@GST_API_VERSION@.la \
161 # --include=GstAudio-@GST_API_VERSION@ \ 171 # --include=GstAudio-@GST_API_VERSION@ \
162 # --include=GstTag-@GST_API_VERSION@ \ 172 # --include=GstTag-@GST_API_VERSION@ \
163@@ -74,8 +74,8 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS 173@@ -75,8 +75,8 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS)
164 # --includedir=$(builddir) \ 174 # --includedir=$(builddir) \
165 # --includedir=$(builddir)/../tag \ 175 # --includedir=$(builddir)/../tag \
166 # --includedir=$(builddir)/../audio \ 176 # --includedir=$(builddir)/../audio \
@@ -171,11 +181,11 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/riff/Makefile.am
171 # $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) 181 # $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
172 # 182 #
173 #CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA) 183 #CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA)
174Index: gst-plugins-base-1.12.3/gst-libs/gst/rtp/Makefile.am 184diff --git a/gst-libs/gst/rtp/Makefile.am b/gst-libs/gst/rtp/Makefile.am
175=================================================================== 185index 77ebeeb..9aee788 100644
176--- gst-plugins-base-1.12.3.orig/gst-libs/gst/rtp/Makefile.am 186--- a/gst-libs/gst/rtp/Makefile.am
177+++ gst-plugins-base-1.12.3/gst-libs/gst/rtp/Makefile.am 187+++ b/gst-libs/gst/rtp/Makefile.am
178@@ -61,8 +61,8 @@ GstRtp-@GST_API_VERSION@.gir: $(INTROSPE 188@@ -64,8 +64,8 @@ GstRtp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtp-@GST_API_VERSIO
179 --c-include "gst/rtp/rtp.h" \ 189 --c-include "gst/rtp/rtp.h" \
180 -I$(top_builddir)/gst-libs \ 190 -I$(top_builddir)/gst-libs \
181 -I$(top_srcdir)/gst-libs \ 191 -I$(top_srcdir)/gst-libs \
@@ -186,7 +196,7 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/rtp/Makefile.am
186 --library=libgstrtp-@GST_API_VERSION@.la \ 196 --library=libgstrtp-@GST_API_VERSION@.la \
187 --include=Gst-@GST_API_VERSION@ \ 197 --include=Gst-@GST_API_VERSION@ \
188 --include=GstBase-@GST_API_VERSION@ \ 198 --include=GstBase-@GST_API_VERSION@ \
189@@ -89,8 +89,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= 199@@ -92,8 +92,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
190 $(INTROSPECTION_COMPILER) \ 200 $(INTROSPECTION_COMPILER) \
191 --includedir=$(srcdir) \ 201 --includedir=$(srcdir) \
192 --includedir=$(builddir) \ 202 --includedir=$(builddir) \
@@ -197,11 +207,11 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/rtp/Makefile.am
197 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) 207 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
198 208
199 CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) 209 CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
200Index: gst-plugins-base-1.12.3/gst-libs/gst/rtsp/Makefile.am 210diff --git a/gst-libs/gst/rtsp/Makefile.am b/gst-libs/gst/rtsp/Makefile.am
201=================================================================== 211index db9d0fd..79027cb 100644
202--- gst-plugins-base-1.12.3.orig/gst-libs/gst/rtsp/Makefile.am 212--- a/gst-libs/gst/rtsp/Makefile.am
203+++ gst-plugins-base-1.12.3/gst-libs/gst/rtsp/Makefile.am 213+++ b/gst-libs/gst/rtsp/Makefile.am
204@@ -68,7 +68,7 @@ GstRtsp-@GST_API_VERSION@.gir: $(INTROSP 214@@ -71,7 +71,7 @@ GstRtsp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERS
205 -I$(top_builddir)/gst-libs \ 215 -I$(top_builddir)/gst-libs \
206 -I$(top_srcdir)/gst-libs \ 216 -I$(top_srcdir)/gst-libs \
207 --add-include-path=$(builddir)/../sdp \ 217 --add-include-path=$(builddir)/../sdp \
@@ -210,7 +220,7 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/rtsp/Makefile.am
210 --library=libgstrtsp-@GST_API_VERSION@.la \ 220 --library=libgstrtsp-@GST_API_VERSION@.la \
211 --include=Gio-2.0 \ 221 --include=Gio-2.0 \
212 --include=Gst-@GST_API_VERSION@ \ 222 --include=Gst-@GST_API_VERSION@ \
213@@ -98,7 +98,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= 223@@ -101,7 +101,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
214 --includedir=$(srcdir) \ 224 --includedir=$(srcdir) \
215 --includedir=$(builddir) \ 225 --includedir=$(builddir) \
216 --includedir=$(builddir)/../sdp \ 226 --includedir=$(builddir)/../sdp \
@@ -219,11 +229,11 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/rtsp/Makefile.am
219 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) 229 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
220 230
221 CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) 231 CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
222Index: gst-plugins-base-1.12.3/gst-libs/gst/sdp/Makefile.am 232diff --git a/gst-libs/gst/sdp/Makefile.am b/gst-libs/gst/sdp/Makefile.am
223=================================================================== 233index 6e05cc7..c7cf514 100644
224--- gst-plugins-base-1.12.3.orig/gst-libs/gst/sdp/Makefile.am 234--- a/gst-libs/gst/sdp/Makefile.am
225+++ gst-plugins-base-1.12.3/gst-libs/gst/sdp/Makefile.am 235+++ b/gst-libs/gst/sdp/Makefile.am
226@@ -30,7 +30,7 @@ GstSdp-@GST_API_VERSION@.gir: $(INTROSPE 236@@ -31,7 +31,7 @@ GstSdp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstsdp-@GST_API_VERSIO
227 --warn-all \ 237 --warn-all \
228 --c-include "gst/sdp/sdp.h" \ 238 --c-include "gst/sdp/sdp.h" \
229 -I$(top_srcdir)/gst-libs \ 239 -I$(top_srcdir)/gst-libs \
@@ -232,7 +242,7 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/sdp/Makefile.am
232 --library=libgstsdp-@GST_API_VERSION@.la \ 242 --library=libgstsdp-@GST_API_VERSION@.la \
233 --include=Gst-@GST_API_VERSION@ \ 243 --include=Gst-@GST_API_VERSION@ \
234 --libtool="$(LIBTOOL)" \ 244 --libtool="$(LIBTOOL)" \
235@@ -54,7 +54,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= 245@@ -55,7 +55,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
236 $(INTROSPECTION_COMPILER) \ 246 $(INTROSPECTION_COMPILER) \
237 --includedir=$(srcdir) \ 247 --includedir=$(srcdir) \
238 --includedir=$(builddir) \ 248 --includedir=$(builddir) \
@@ -241,11 +251,11 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/sdp/Makefile.am
241 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) 251 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
242 252
243 CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA) 253 CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA)
244Index: gst-plugins-base-1.12.3/gst-libs/gst/tag/Makefile.am 254diff --git a/gst-libs/gst/tag/Makefile.am b/gst-libs/gst/tag/Makefile.am
245=================================================================== 255index c86515b..363e6d2 100644
246--- gst-plugins-base-1.12.3.orig/gst-libs/gst/tag/Makefile.am 256--- a/gst-libs/gst/tag/Makefile.am
247+++ gst-plugins-base-1.12.3/gst-libs/gst/tag/Makefile.am 257+++ b/gst-libs/gst/tag/Makefile.am
248@@ -59,8 +59,8 @@ GstTag-@GST_API_VERSION@.gir: $(INTROSPE 258@@ -61,8 +61,8 @@ GstTag-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgsttag-@GST_API_VERSIO
249 --c-include "gst/tag/tag.h" \ 259 --c-include "gst/tag/tag.h" \
250 -I$(top_srcdir)/gst-libs \ 260 -I$(top_srcdir)/gst-libs \
251 -I$(top_builddir)/gst-libs \ 261 -I$(top_builddir)/gst-libs \
@@ -256,7 +266,7 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/tag/Makefile.am
256 --library=libgsttag-@GST_API_VERSION@.la \ 266 --library=libgsttag-@GST_API_VERSION@.la \
257 --include=Gst-@GST_API_VERSION@ \ 267 --include=Gst-@GST_API_VERSION@ \
258 --include=GstBase-@GST_API_VERSION@ \ 268 --include=GstBase-@GST_API_VERSION@ \
259@@ -87,8 +87,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= 269@@ -89,8 +89,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
260 $(INTROSPECTION_COMPILER) \ 270 $(INTROSPECTION_COMPILER) \
261 --includedir=$(srcdir) \ 271 --includedir=$(srcdir) \
262 --includedir=$(builddir) \ 272 --includedir=$(builddir) \
@@ -267,11 +277,11 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/tag/Makefile.am
267 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) 277 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
268 278
269 CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) 279 CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
270Index: gst-plugins-base-1.12.3/gst-libs/gst/video/Makefile.am 280diff --git a/gst-libs/gst/video/Makefile.am b/gst-libs/gst/video/Makefile.am
271=================================================================== 281index 0f8455f..8c9955c 100644
272--- gst-plugins-base-1.12.3.orig/gst-libs/gst/video/Makefile.am 282--- a/gst-libs/gst/video/Makefile.am
273+++ gst-plugins-base-1.12.3/gst-libs/gst/video/Makefile.am 283+++ b/gst-libs/gst/video/Makefile.am
274@@ -116,8 +116,8 @@ GstVideo-@GST_API_VERSION@.gir: $(INTROS 284@@ -119,8 +119,8 @@ GstVideo-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstvideo-@GST_API_VE
275 --c-include "gst/video/video.h" \ 285 --c-include "gst/video/video.h" \
276 -I$(top_srcdir)/gst-libs \ 286 -I$(top_srcdir)/gst-libs \
277 -I$(top_builddir)/gst-libs \ 287 -I$(top_builddir)/gst-libs \
@@ -282,7 +292,7 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/video/Makefile.am
282 --library=libgstvideo-@GST_API_VERSION@.la \ 292 --library=libgstvideo-@GST_API_VERSION@.la \
283 --include=Gst-@GST_API_VERSION@ \ 293 --include=Gst-@GST_API_VERSION@ \
284 --include=GstBase-@GST_API_VERSION@ \ 294 --include=GstBase-@GST_API_VERSION@ \
285@@ -144,8 +144,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= 295@@ -147,8 +147,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
286 $(INTROSPECTION_COMPILER) \ 296 $(INTROSPECTION_COMPILER) \
287 --includedir=$(srcdir) \ 297 --includedir=$(srcdir) \
288 --includedir=$(builddir) \ 298 --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 @@
1From 3c2c2d5dd08aa30ed0e8acd8566ec99412bb8209 Mon Sep 17 00:00:00 2001 1From b9765efb1696e3e2e79f2955f759be199fe34882 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Mon, 26 Oct 2015 17:29:37 +0200 3Date: Mon, 26 Oct 2015 17:29:37 +0200
4Subject: [PATCH 3/4] riff: add missing include directories when calling 4Subject: [PATCH] riff: add missing include directories when calling
5 introspection scanner 5 introspection scanner
6 6
7Upstream-Status: Pending [review on oe-core maillist] 7Upstream-Status: Pending [review on oe-core maillist]
8Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 8Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
9
9--- 10---
10 gst-libs/gst/riff/Makefile.am | 2 ++ 11 gst-libs/gst/riff/Makefile.am | 2 ++
11 1 file changed, 2 insertions(+) 12 1 file changed, 2 insertions(+)
12 13
13diff --git a/gst-libs/gst/riff/Makefile.am b/gst-libs/gst/riff/Makefile.am 14diff --git a/gst-libs/gst/riff/Makefile.am b/gst-libs/gst/riff/Makefile.am
14index 0a115cc..5057a58 100644 15index c8c588a..c096453 100644
15--- a/gst-libs/gst/riff/Makefile.am 16--- a/gst-libs/gst/riff/Makefile.am
16+++ b/gst-libs/gst/riff/Makefile.am 17+++ b/gst-libs/gst/riff/Makefile.am
17@@ -39,6 +39,8 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) 18@@ -41,6 +41,8 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS)
18 # --strip-prefix=Gst \ 19 # --strip-prefix=Gst \
19 # --warn-all \ 20 # --warn-all \
20 # --c-include "gst/riff/riff.h" \ 21 # --c-include "gst/riff/riff.h" \
@@ -23,6 +24,3 @@ index 0a115cc..5057a58 100644
23 # --add-include-path=$(builddir)/../tag \ 24 # --add-include-path=$(builddir)/../tag \
24 # --add-include-path=$(builddir)/../audio \ 25 # --add-include-path=$(builddir)/../audio \
25 # --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ 26 # --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
26--
272.6.2
28
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 @@
1From be6163cfa3a255493f9d75bad9541cbfe1723fee Mon Sep 17 00:00:00 2001 1From 918c96b24d10f61b7455b4cef3bab490849d0d77 Mon Sep 17 00:00:00 2001
2From: Mingke Wang <mingke.wang@freescale.com> 2From: Mingke Wang <mingke.wang@freescale.com>
3Date: Thu, 19 Mar 2015 14:17:10 +0800 3Date: Thu, 19 Mar 2015 14:17:10 +0800
4Subject: [PATCH 3/4] ssaparse: enhance SSA text lines parsing. 4Subject: [PATCH] ssaparse: enhance SSA text lines parsing.
5 5
6some parser will pass in the original ssa text line which starts with "Dialog:" 6some parser will pass in the original ssa text line which starts with "Dialog:"
7and there's are maybe multiple Dialog lines in one input buffer. 7and 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]
10 10
11Signed-off-by: Mingke Wang <mingke.wang@freescale.com> 11Signed-off-by: Mingke Wang <mingke.wang@freescale.com>
12 12
13---
14 gst/subparse/gstssaparse.c | 150 ++++++++++++++++++++++++++++++++++++++++-----
15 1 file changed, 134 insertions(+), 16 deletions(-)
16 mode change 100644 => 100755 gst/subparse/gstssaparse.c
17
13diff --git a/gst/subparse/gstssaparse.c b/gst/subparse/gstssaparse.c 18diff --git a/gst/subparse/gstssaparse.c b/gst/subparse/gstssaparse.c
14old mode 100644 19old mode 100644
15new mode 100755 20new mode 100755
16index 06ecef9..0ab5dce 21index c849c08..4b9636c
17--- a/gst/subparse/gstssaparse.c 22--- a/gst/subparse/gstssaparse.c
18+++ b/gst/subparse/gstssaparse.c 23+++ b/gst/subparse/gstssaparse.c
19@@ -260,6 +260,7 @@ gst_ssa_parse_remove_override_codes (GstSsaParse * parse, gchar * txt) 24@@ -262,6 +262,7 @@ gst_ssa_parse_remove_override_codes (GstSsaParse * parse, gchar * txt)
20 * gst_ssa_parse_push_line: 25 * gst_ssa_parse_push_line:
21 * @parse: caller element 26 * @parse: caller element
22 * @txt: text to push 27 * @txt: text to push
@@ -24,7 +29,7 @@ index 06ecef9..0ab5dce
24 * @start: timestamp for the buffer 29 * @start: timestamp for the buffer
25 * @duration: duration for the buffer 30 * @duration: duration for the buffer
26 * 31 *
27@@ -269,27 +270,133 @@ gst_ssa_parse_remove_override_codes (GstSsaParse * parse, gchar * txt) 32@@ -271,27 +272,133 @@ gst_ssa_parse_remove_override_codes (GstSsaParse * parse, gchar * txt)
28 * Returns: result of the push of the created buffer 33 * Returns: result of the push of the created buffer
29 */ 34 */
30 static GstFlowReturn 35 static GstFlowReturn
@@ -169,7 +174,7 @@ index 06ecef9..0ab5dce
169 GST_LOG_OBJECT (parse, "Text : %s", t); 174 GST_LOG_OBJECT (parse, "Text : %s", t);
170 175
171 if (gst_ssa_parse_remove_override_codes (parse, t)) { 176 if (gst_ssa_parse_remove_override_codes (parse, t)) {
172@@ -307,13 +414,22 @@ gst_ssa_parse_push_line (GstSsaParse * parse, gchar * txt, 177@@ -309,13 +416,22 @@ gst_ssa_parse_push_line (GstSsaParse * parse, gchar * txt,
173 gst_buffer_fill (buf, 0, escaped, len + 1); 178 gst_buffer_fill (buf, 0, escaped, len + 1);
174 gst_buffer_set_size (buf, len); 179 gst_buffer_set_size (buf, len);
175 g_free (escaped); 180 g_free (escaped);
@@ -196,7 +201,7 @@ index 06ecef9..0ab5dce
196 201
197 ret = gst_pad_push (parse->srcpad, buf); 202 ret = gst_pad_push (parse->srcpad, buf);
198 203
199@@ -333,6 +449,7 @@ gst_ssa_parse_chain (GstPad * sinkpad, GstObject * parent, GstBuffer * buf) 204@@ -335,6 +451,7 @@ gst_ssa_parse_chain (GstPad * sinkpad, GstObject * parent, GstBuffer * buf)
200 GstClockTime ts; 205 GstClockTime ts;
201 gchar *txt; 206 gchar *txt;
202 GstMapInfo map; 207 GstMapInfo map;
@@ -204,7 +209,7 @@ index 06ecef9..0ab5dce
204 209
205 if (G_UNLIKELY (!parse->framed)) 210 if (G_UNLIKELY (!parse->framed))
206 goto not_framed; 211 goto not_framed;
207@@ -350,13 +467,14 @@ gst_ssa_parse_chain (GstPad * sinkpad, GstObject * parent, GstBuffer * buf) 212@@ -352,13 +469,14 @@ gst_ssa_parse_chain (GstPad * sinkpad, GstObject * parent, GstBuffer * buf)
208 /* make double-sure it's 0-terminated and all */ 213 /* make double-sure it's 0-terminated and all */
209 gst_buffer_map (buf, &map, GST_MAP_READ); 214 gst_buffer_map (buf, &map, GST_MAP_READ);
210 txt = g_strndup ((gchar *) map.data, map.size); 215 txt = g_strndup ((gchar *) map.data, map.size);
@@ -220,6 +225,3 @@ index 06ecef9..0ab5dce
220 225
221 if (ret != GST_FLOW_OK && GST_CLOCK_TIME_IS_VALID (ts)) { 226 if (ret != GST_FLOW_OK && GST_CLOCK_TIME_IS_VALID (ts)) {
222 GstSegment segment; 227 GstSegment segment;
223--
2241.7.9.5
225
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 @@
1From 4330915d88dc4dd46eb4c28d756482b767c2747f Mon Sep 17 00:00:00 2001 1From 53b5868491cf99ee797192395dbfeb69df23edd2 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Mon, 26 Oct 2015 17:30:14 +0200 3Date: Mon, 26 Oct 2015 17:30:14 +0200
4Subject: [PATCH 4/4] rtsp: drop incorrect reference to gstreamer-sdp in 4Subject: [PATCH] rtsp: drop incorrect reference to gstreamer-sdp in
5 Makefile.am 5 Makefile.am
6 6
7Upstream-Status: Pending [review on oe-core maillist] 7Upstream-Status: Pending [review on oe-core maillist]
8Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 8Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
9
9--- 10---
10 gst-libs/gst/rtsp/Makefile.am | 1 - 11 gst-libs/gst/rtsp/Makefile.am | 1 -
11 1 file changed, 1 deletion(-) 12 1 file changed, 1 deletion(-)
12 13
13diff --git a/gst-libs/gst/rtsp/Makefile.am b/gst-libs/gst/rtsp/Makefile.am 14diff --git a/gst-libs/gst/rtsp/Makefile.am b/gst-libs/gst/rtsp/Makefile.am
14index 4f6d9f8..0afa370 100644 15index 79027cb..2987e23 100644
15--- a/gst-libs/gst/rtsp/Makefile.am 16--- a/gst-libs/gst/rtsp/Makefile.am
16+++ b/gst-libs/gst/rtsp/Makefile.am 17+++ b/gst-libs/gst/rtsp/Makefile.am
17@@ -75,7 +75,6 @@ GstRtsp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERS 18@@ -79,7 +79,6 @@ GstRtsp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERS
18 --libtool="$(LIBTOOL)" \ 19 --libtool="$(LIBTOOL)" \
19 --pkg gio-2.0 \ 20 --pkg gio-2.0 \
20 --pkg gstreamer-@GST_API_VERSION@ \ 21 --pkg gstreamer-@GST_API_VERSION@ \
@@ -22,6 +23,3 @@ index 4f6d9f8..0afa370 100644
22 --pkg-export gstreamer-rtsp-@GST_API_VERSION@ \ 23 --pkg-export gstreamer-rtsp-@GST_API_VERSION@ \
23 --add-init-section="$(INTROSPECTION_INIT)" \ 24 --add-init-section="$(INTROSPECTION_INIT)" \
24 --output $@ \ 25 --output $@ \
25--
262.6.2
27
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 @@
1From ed09c8fd2c9c2b5384b72cc70af3728be6694e64 Mon Sep 17 00:00:00 2001
2From: Mingke Wang <mingke.wang@freescale.com>
3Date: Thu, 19 Mar 2015 14:20:26 +0800
4Subject: [PATCH 4/4] subparse: set need_segment after sink pad received
5 GST_EVENT_SEGMENT
6
7subparse works in push mode, chain funciton will be called once
8up stream element finished the seeking and flushing.
9if set need_segment flag in src pad event handler, the segment
10event will be pushed earlier, result in the subtitle text will
11be send out to down stream from the beginning.
12
13Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=747498]
14
15Signed-off-by: Mingke Wang <mingke.wang@freescale.com>
16
17diff --git a/gst/subparse/gstsubparse.c b/gst/subparse/gstsubparse.c
18old mode 100644
19new mode 100755
20index b565e93..7741ccc
21--- a/gst/subparse/gstsubparse.c
22+++ b/gst/subparse/gstsubparse.c
23@@ -266,22 +266,20 @@ gst_sub_parse_src_event (GstPad * pad, GstObject * parent, GstEvent * event)
24 goto beach;
25 }
26
27+ /* Apply the seek to our segment */
28+ gst_segment_do_seek (&self->segment, rate, format, flags,
29+ start_type, start, stop_type, stop, &update);
30+
31+ GST_DEBUG_OBJECT (self, "segment after seek: %" GST_SEGMENT_FORMAT,
32+ &self->segment);
33+
34 /* Convert that seek to a seeking in bytes at position 0,
35 FIXME: could use an index */
36 ret = gst_pad_push_event (self->sinkpad,
37 gst_event_new_seek (rate, GST_FORMAT_BYTES, flags,
38 GST_SEEK_TYPE_SET, 0, GST_SEEK_TYPE_NONE, 0));
39
40- if (ret) {
41- /* Apply the seek to our segment */
42- gst_segment_do_seek (&self->segment, rate, format, flags,
43- start_type, start, stop_type, stop, &update);
44-
45- GST_DEBUG_OBJECT (self, "segment after seek: %" GST_SEGMENT_FORMAT,
46- &self->segment);
47-
48- self->need_segment = TRUE;
49- } else {
50+ if (!ret) {
51 GST_WARNING_OBJECT (self, "seek to 0 bytes failed");
52 }
53
54@@ -1641,8 +1639,10 @@ gst_sub_parse_sink_event (GstPad * pad, GstObject * parent, GstEvent * event)
55 gst_event_parse_segment (event, &s);
56 if (s->format == GST_FORMAT_TIME)
57 gst_event_copy_segment (event, &self->segment);
58- GST_DEBUG_OBJECT (self, "newsegment (%s)",
59- gst_format_get_name (self->segment.format));
60+ GST_DEBUG_OBJECT (self, "newsegment (%s) %" GST_SEGMENT_FORMAT,
61+ gst_format_get_name (self->segment.format), &self->segment);
62+
63+ self->need_segment = TRUE;
64
65 /* if not time format, we'll either start with a 0 timestamp anyway or
66 * it's following a seek in which case we'll have saved the requested
67--
681.7.9.5
69
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 @@
1From c6b37a80806f9128de47f1ccc3f2354f8d436bb6 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Thu, 24 Sep 2015 19:47:32 +0300
4Subject: [PATCH] glimagesink: Downrank to marginal
5
6On desktop, where there is good OpenGL, xvimagesink will come up first,
7on other platforms, OpenGL can't be trusted because it's either software (like
8in a VM) or broken (like on embedded)., so let ximagesink come above.
9
10Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=751684]
11
12Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
13---
14 ext/gl/gstopengl.c | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17diff --git a/ext/gl/gstopengl.c b/ext/gl/gstopengl.c
18index a4b2540..0ccaacd 100644
19--- a/ext/gl/gstopengl.c
20+++ b/ext/gl/gstopengl.c
21@@ -118,7 +118,7 @@ plugin_init (GstPlugin * plugin)
22 #endif
23
24 if (!gst_element_register (plugin, "glimagesink",
25- GST_RANK_SECONDARY, gst_gl_image_sink_bin_get_type ())) {
26+ GST_RANK_MARGINAL, gst_gl_image_sink_bin_get_type ())) {
27 return FALSE;
28 }
29
30--
312.1.4
32
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-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 @@
1From af0dac26f62aaceb4bf266720911953793e0fc5d Mon Sep 17 00:00:00 2001 1From 41de2ec64ab06bb58c82c1659adaa3811bc5bcf8 Mon Sep 17 00:00:00 2001
2From: zhouming <b42586@freescale.com> 2From: zhouming <b42586@freescale.com>
3Date: Wed, 14 May 2014 10:16:20 +0800 3Date: Wed, 14 May 2014 10:16:20 +0800
4Subject: [PATCH] ENGR00312515: get caps from src pad when query caps 4Subject: [PATCH] ENGR00312515: get caps from src pad when query caps
@@ -8,18 +8,19 @@ https://bugzilla.gnome.org/show_bug.cgi?id=728312
8Upstream-Status: Pending 8Upstream-Status: Pending
9 9
10Signed-off-by: zhouming <b42586@freescale.com> 10Signed-off-by: zhouming <b42586@freescale.com>
11
11--- 12---
12 gst-libs/gst/tag/gsttagdemux.c | 13 +++++++++++++ 13 gst-libs/gst/tag/gsttagdemux.c | 13 +++++++++++++
13 1 file changed, 13 insertions(+) 14 1 file changed, 13 insertions(+)
14 mode change 100644 => 100755 gst-libs/gst/tag/gsttagdemux.c 15 mode change 100644 => 100755 gst-libs/gst/tag/gsttagdemux.c
15 16
16diff --git a/gst-libs/gst/tag/gsttagdemux.c b/gst-libs/gst/tag/gsttagdemux.c 17diff --git a/gst-libs/gst/tag/gsttagdemux.c b/gst-libs/gst/tag/gsttagdemux.c
17old mode 100644 18old mode 100644
18new mode 100755 19new mode 100755
19index 9b6c478..ae2294a 20index 8a127c8..71c5d78
20--- a/gst-libs/gst/tag/gsttagdemux.c 21--- a/gst-libs/gst/tag/gsttagdemux.c
21+++ b/gst-libs/gst/tag/gsttagdemux.c 22+++ b/gst-libs/gst/tag/gsttagdemux.c
22@@ -1769,6 +1769,19 @@ gst_tag_demux_pad_query (GstPad * pad, GstObject * parent, GstQuery * query) 23@@ -1759,6 +1759,19 @@ gst_tag_demux_pad_query (GstPad * pad, GstObject * parent, GstQuery * query)
23 } 24 }
24 break; 25 break;
25 } 26 }
@@ -39,6 +40,3 @@ index 9b6c478..ae2294a
39 default: 40 default:
40 res = gst_pad_query_default (pad, parent, query); 41 res = gst_pad_query_default (pad, parent, query);
41 break; 42 break;
42--
431.7.9.5
44
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 @@
1From 9866f51e5e0913f1e453eb574618bf7432f38cb6 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 11 Apr 2018 10:46:33 +0800
4Subject: [PATCH] Add -lvchostif to link when using -lEGL on rpi
5
6This is required because libEGL from userland uses sybols
7from this library.
8
9lib/libEGL.so.1.0.0 121: 00000000 0 FUNC GLOBAL DEFAULT UND vc_dispmanx_element_add
10 1552: 00000000 0 FUNC GLOBAL DEFAULT UND vc_dispmanx_element_add
11
12These symbols are provided by libvchostif as seen below
13
14lib/libvchostif.so
15 252: 0000b161 192 FUNC GLOBAL DEFAULT 9 vc_dispmanx_element_add
16 809: 0000b161 192 FUNC GLOBAL DEFAULT 9 vc_dispmanx_element_add
17
18With this explicit link, plugins fail during runtime
19
20(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
21(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
22
23Upstream-Status: Pending
24Signed-off-by: Khem Raj <raj.khem@gmail.com>
25Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
26---
27 m4/gst-gl.m4 | 2 +-
28 1 file changed, 1 insertion(+), 1 deletion(-)
29
30diff --git a/m4/gst-gl.m4 b/m4/gst-gl.m4
31index 1e97240..ab7774c 100644
32--- a/m4/gst-gl.m4
33+++ b/m4/gst-gl.m4
34@@ -231,7 +231,7 @@ case $host in
35 HAVE_EGL=yes
36 HAVE_GLES2=yes
37 HAVE_EGL_RPI=yes
38- EGL_LIBS="-lbcm_host -lvcos -lvchiq_arm"
39+ EGL_LIBS="-lbcm_host -lvchostif -lvcos -lvchiq_arm"
40 EGL_CFLAGS=""
41 AC_DEFINE(USE_EGL_RPI, [1], [Use RPi platform])
42 ])
43--
442.7.4
45
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 @@
1From 10d2a977ee1d469f0bf9059bb2d0b55fd2eecbac Mon Sep 17 00:00:00 2001 1From 7ffa6e3d00e1d8a060f3f4c2bb9a72691af05d79 Mon Sep 17 00:00:00 2001
2From: Andre McCurdy <armccurdy@gmail.com> 2From: Andre McCurdy <armccurdy@gmail.com>
3Date: Wed, 20 Jan 2016 13:00:00 -0800 3Date: Wed, 20 Jan 2016 13:00:00 -0800
4Subject: [PATCH] make gio_unix_2_0 dependency configurable 4Subject: [PATCH] make gio_unix_2_0 dependency configurable
@@ -17,16 +17,17 @@ instead of AG_GST_CHECK_FEATURE.
17Upstream-Status: Pending 17Upstream-Status: Pending
18 18
19Signed-off-by: Andre McCurdy <armccurdy@gmail.com> 19Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
20
20--- 21---
21 configure.ac | 7 +++++++ 22 configure.ac | 7 +++++++
22 1 file changed, 7 insertions(+) 23 1 file changed, 7 insertions(+)
23 24
24diff --git a/configure.ac b/configure.ac 25diff --git a/configure.ac b/configure.ac
25index 9c52aeb..26cacd6 100644 26index 12807bc..35a0bf3 100644
26--- a/configure.ac 27--- a/configure.ac
27+++ b/configure.ac 28+++ b/configure.ac
28@@ -752,9 +752,16 @@ AC_SUBST(FT2_CFLAGS) 29@@ -806,9 +806,16 @@ AM_CONDITIONAL(HAVE_PNG, test "x$HAVE_PNG" = "xyes")
29 fi dnl of EXT plugins 30 AM_CONDITIONAL(HAVE_JPEG, test "x$HAVE_JPEG" = "xyes")
30 31
31 dnl *** gio-unix-2.0 for tests/check/pipelines/tcp.c *** 32 dnl *** gio-unix-2.0 for tests/check/pipelines/tcp.c ***
32+AC_ARG_ENABLE([gio_unix_2_0], 33+AC_ARG_ENABLE([gio_unix_2_0],
@@ -42,6 +43,3 @@ index 9c52aeb..26cacd6 100644
42 AM_CONDITIONAL(USE_GIO_UNIX_2_0, test "x$HAVE_GIO_UNIX_2_0" = "xyes") 43 AM_CONDITIONAL(USE_GIO_UNIX_2_0, test "x$HAVE_GIO_UNIX_2_0" = "xyes")
43 44
44 dnl *** finalize CFLAGS, LDFLAGS, LIBS 45 dnl *** finalize CFLAGS, LDFLAGS, LIBS
45--
461.9.1
47
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 @@
1require gstreamer1.0-plugins-base.inc
2
3LIC_FILES_CHKSUM = "file://COPYING;md5=c54ce9345727175ff66d17b67ff51f58 \
4 file://COPYING.LIB;md5=6762ed442b3822387a51c92d928ead0d \
5 file://common/coverage/coverage-report.pl;beginline=2;endline=17;md5=a4e1830fce078028c8f0974161272607"
6
7SRC_URI = " \
8 http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-${PV}.tar.xz \
9 file://get-caps-from-src-pad-when-query-caps.patch \
10 file://0003-ssaparse-enhance-SSA-text-lines-parsing.patch \
11 file://0004-subparse-set-need_segment-after-sink-pad-received-GS.patch \
12 file://make-gio_unix_2_0-dependency-configurable.patch \
13 file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \
14"
15SRC_URI[md5sum] = "b35b04071f69b8ab69a7f3a497ff0131"
16SRC_URI[sha256sum] = "4c306b03df0212f1b8903784e29bb3493319ba19ebebf13b0c56a17870292282"
17
18S = "${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..08397a03a8
--- /dev/null
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.14.0.bb
@@ -0,0 +1,71 @@
1require gstreamer1.0-plugins.inc
2
3LICENSE = "GPLv2+ & LGPLv2+"
4LIC_FILES_CHKSUM = "file://COPYING;md5=c54ce9345727175ff66d17b67ff51f58 \
5 file://COPYING.LIB;md5=6762ed442b3822387a51c92d928ead0d \
6 file://common/coverage/coverage-report.pl;beginline=2;endline=17;md5=a4e1830fce078028c8f0974161272607"
7
8SRC_URI = " \
9 http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-${PV}.tar.xz \
10 file://get-caps-from-src-pad-when-query-caps.patch \
11 file://0003-ssaparse-enhance-SSA-text-lines-parsing.patch \
12 file://make-gio_unix_2_0-dependency-configurable.patch \
13 file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \
14 file://0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch \
15 file://0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch \
16 file://0003-riff-add-missing-include-directories-when-calling-in.patch \
17 file://0004-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch \
18 file://0009-glimagesink-Downrank-to-marginal.patch \
19 file://0001-gstreamer-gl.pc.in-don-t-append-GL_CFLAGS-to-CFLAGS.patch \
20 file://link-with-libvchostif.patch \
21 file://0001-gl-pick-up-GstVideo-1.0.gir-from-local-build-dir.patch \
22 "
23SRC_URI[md5sum] = "370271327dd23110421a9c2927ac989a"
24SRC_URI[sha256sum] = "7e904660ff56e02b036cf7fdfb77a50a540828ca9d2614d69ba931772e5b6940"
25
26S = "${WORKDIR}/gst-plugins-base-${PV}"
27
28DEPENDS += "iso-codes util-linux"
29
30inherit gettext
31
32PACKAGES_DYNAMIC =+ "^libgst.*"
33
34PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gles2 egl', '', d)}"
35PACKAGECONFIG ??= " \
36 ${GSTREAMER_ORC} \
37 ${@bb.utils.filter('DISTRO_FEATURES', 'alsa x11', d)} \
38 gio-unix-2.0 ogg pango theora vorbis zlib jpeg \
39 ${PACKAGECONFIG_GL} \
40 ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland egl', '', d)} \
41"
42
43X11DEPENDS = "virtual/libx11 libsm libxrender libxv"
44X11ENABLEOPTS = "--enable-x --enable-xvideo --enable-xshm"
45X11DISABLEOPTS = "--disable-x --disable-xvideo --disable-xshm"
46
47PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib"
48PACKAGECONFIG[cdparanoia] = "--enable-cdparanoia,--disable-cdparanoia,cdparanoia"
49PACKAGECONFIG[gio-unix-2.0] = "--enable-gio_unix_2_0,--disable-gio_unix_2_0,glib-2.0"
50PACKAGECONFIG[ivorbis] = "--enable-ivorbis,--disable-ivorbis,tremor"
51PACKAGECONFIG[ogg] = "--enable-ogg,--disable-ogg,libogg"
52PACKAGECONFIG[opus] = "--enable-opus,--disable-opus,libopus"
53PACKAGECONFIG[pango] = "--enable-pango,--disable-pango,pango"
54PACKAGECONFIG[theora] = "--enable-theora,--disable-theora,libtheora"
55PACKAGECONFIG[visual] = "--enable-libvisual,--disable-libvisual,libvisual"
56PACKAGECONFIG[vorbis] = "--enable-vorbis,--disable-vorbis,libvorbis"
57PACKAGECONFIG[x11] = "${X11ENABLEOPTS},${X11DISABLEOPTS},${X11DEPENDS}"
58PACKAGECONFIG[zlib] = "--enable-zlib,--disable-zlib,zlib"
59PACKAGECONFIG[opengl] = "--enable-opengl,--disable-opengl,virtual/libgl libglu"
60PACKAGECONFIG[gles2] = "--enable-gles2,--disable-gles2,virtual/libgles2"
61PACKAGECONFIG[egl] = "--enable-egl,--disable-egl,virtual/egl"
62PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,wayland-native wayland wayland-protocols libdrm"
63PACKAGECONFIG[jpeg] = ",,jpeg"
64
65FILES_${MLPREFIX}libgsttag-1.0 += "${datadir}/gst-plugins-base/1.0/license-translations.dict"
66
67do_compile_prepend() {
68 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:${B}/gst-libs/gst/allocators/.libs"
69}
70
71FILES_${PN}-dev += "${libdir}/gstreamer-${LIBV}/include/gst/gl/gstglconfig.h"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-05-04 18:11:46 +0000