summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia
diff options
context:
space:
mode:
authorCarlos Rafael Giani <crg7475@mailbox.org>2019-05-26 13:06:33 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-05-28 10:47:02 +0100
commitb2a8cc4b0583689a4c5d5374beb638f2a74e8bf0 (patch)
tree4b7722d4872b5c21ea7156f9fc9b7897236eda10 /meta/recipes-multimedia
parent30eead8a1da1999f95176cfff0b74a8f2702ff8a (diff)
downloadpoky-b2a8cc4b0583689a4c5d5374beb638f2a74e8bf0.tar.gz
gstreamer1.0-plugins-base: upgrade to version 1.16.0
* 0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch Removed since the https://bugzilla.gnome.org/show_bug.cgi?id=726571 fix is included in 1.16.0 * 0005-viv-fb-Make-sure-config.h-is-included.patch Added to prevent build errors due to missing config.h #include * 0010-gl-Add-switch-for-explicitely-enabling-disabling-GBM.patch * 0011-gl-Add-switches-for-explicitely-enabling-disabling-P.patch Removed since these are included in 1.16.0 (From OE-Core rev: 9dbd91c22cbd39245e72a128e07036c22edd9b4e) Signed-off-by: Philippe Normand <philn@igalia.com> Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia')
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch167
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch35
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0004-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch4
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0005-viv-fb-Make-sure-config.h-is-included.patch32
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0009-glimagesink-Downrank-to-marginal.patch2
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0010-gl-Add-switch-for-explicitely-enabling-disabling-GBM.patch70
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0011-gl-Add-switches-for-explicitely-enabling-disabling-P.patch109
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/link-with-libvchostif.patch2
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.16.0.bb (renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.14.4.bb)11
9 files changed, 54 insertions, 378 deletions
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
deleted file mode 100644
index bcada34c40..0000000000
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch
+++ /dev/null
@@ -1,167 +0,0 @@
1From 7022b87353a37b78bae7cf0106a4e47913bb5c97 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Thu, 5 Apr 2018 10:15:08 +0800
4Subject: [PATCH] Makefile.am: don't hardcode libtool name when running
5 introspection tools
6
7Upstream-Status: Pending [review on oe-core maillist]
8Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
9Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
10
11---
12 gst-libs/gst/allocators/Makefile.am | 2 +-
13 gst-libs/gst/app/Makefile.am | 2 +-
14 gst-libs/gst/audio/Makefile.am | 2 +-
15 gst-libs/gst/gl/Makefile.am | 2 +-
16 gst-libs/gst/pbutils/Makefile.am | 2 +-
17 gst-libs/gst/riff/Makefile.am | 2 +-
18 gst-libs/gst/rtp/Makefile.am | 2 +-
19 gst-libs/gst/rtsp/Makefile.am | 2 +-
20 gst-libs/gst/sdp/Makefile.am | 2 +-
21 gst-libs/gst/tag/Makefile.am | 2 +-
22 gst-libs/gst/video/Makefile.am | 2 +-
23 11 files changed, 11 insertions(+), 11 deletions(-)
24
25diff --git a/gst-libs/gst/allocators/Makefile.am b/gst-libs/gst/allocators/Makefile.am
26index 1957d28..1ecc950 100644
27--- a/gst-libs/gst/allocators/Makefile.am
28+++ b/gst-libs/gst/allocators/Makefile.am
29@@ -42,7 +42,7 @@ GstAllocators-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstallocators-@
30 --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
31 --library=libgstallocators-@GST_API_VERSION@.la \
32 --include=Gst-@GST_API_VERSION@ \
33- --libtool="$(top_builddir)/libtool" \
34+ --libtool="$(LIBTOOL)" \
35 --pkg gstreamer-@GST_API_VERSION@ \
36 --pkg-export gstreamer-allocators-@GST_API_VERSION@ \
37 --output $@ \
38diff --git a/gst-libs/gst/app/Makefile.am b/gst-libs/gst/app/Makefile.am
39index 52f6ad3..5bfd606 100644
40--- a/gst-libs/gst/app/Makefile.am
41+++ b/gst-libs/gst/app/Makefile.am
42@@ -56,7 +56,7 @@ GstApp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstapp-@GST_API_VERSIO
43 --library=libgstapp-@GST_API_VERSION@.la \
44 --include=Gst-@GST_API_VERSION@ \
45 --include=GstBase-@GST_API_VERSION@ \
46- --libtool="$(top_builddir)/libtool" \
47+ --libtool="$(LIBTOOL)" \
48 --pkg gstreamer-@GST_API_VERSION@ \
49 --pkg gstreamer-base-@GST_API_VERSION@ \
50 --pkg-export gstreamer-app-@GST_API_VERSION@ \
51diff --git a/gst-libs/gst/audio/Makefile.am b/gst-libs/gst/audio/Makefile.am
52index 2922245..7fb65f2 100644
53--- a/gst-libs/gst/audio/Makefile.am
54+++ b/gst-libs/gst/audio/Makefile.am
55@@ -184,7 +184,7 @@ GstAudio-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstaudio-@GST_API_VE
56 --include=Gst-@GST_API_VERSION@ \
57 --include=GstBase-@GST_API_VERSION@ \
58 --include=GstTag-@GST_API_VERSION@ \
59- --libtool="$(top_builddir)/libtool" \
60+ --libtool="$(LIBTOOL)" \
61 --pkg gstreamer-@GST_API_VERSION@ \
62 --pkg gstreamer-base-@GST_API_VERSION@ \
63 --pkg-export gstreamer-audio-@GST_API_VERSION@ \
64diff --git a/gst-libs/gst/gl/Makefile.am b/gst-libs/gst/gl/Makefile.am
65index 4e77e8c..3276d7f 100644
66--- a/gst-libs/gst/gl/Makefile.am
67+++ b/gst-libs/gst/gl/Makefile.am
68@@ -193,7 +193,7 @@ GstGL-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstgl-@GST_API_VERSION@
69 --include=Gst-@GST_API_VERSION@ \
70 --include=GstBase-@GST_API_VERSION@ \
71 --include=GstVideo-@GST_API_VERSION@ \
72- --libtool="${LIBTOOL}" \
73+ --libtool="$(LIBTOOL)" \
74 --pkg gstreamer-@GST_API_VERSION@ \
75 --pkg gstreamer-base-@GST_API_VERSION@ \
76 --pkg gstreamer-video-@GST_API_VERSION@ \
77diff --git a/gst-libs/gst/pbutils/Makefile.am b/gst-libs/gst/pbutils/Makefile.am
78index ae51993..35a6e44 100644
79--- a/gst-libs/gst/pbutils/Makefile.am
80+++ b/gst-libs/gst/pbutils/Makefile.am
81@@ -103,7 +103,7 @@ GstPbutils-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstpbutils-@GST_AP
82 --include=GstTag-@GST_API_VERSION@ \
83 --include=GstVideo-@GST_API_VERSION@ \
84 --include=GstAudio-@GST_API_VERSION@ \
85- --libtool="$(top_builddir)/libtool" \
86+ --libtool="$(LIBTOOL)" \
87 --pkg gstreamer-@GST_API_VERSION@ \
88 --pkg gstreamer-tag-@GST_API_VERSION@ \
89 --pkg gstreamer-video-@GST_API_VERSION@ \
90diff --git a/gst-libs/gst/riff/Makefile.am b/gst-libs/gst/riff/Makefile.am
91index fb53f06..e66ef4f 100644
92--- a/gst-libs/gst/riff/Makefile.am
93+++ b/gst-libs/gst/riff/Makefile.am
94@@ -49,7 +49,7 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS)
95 # --include=GstAudio-@GST_API_VERSION@ \
96 # --include=GstTag-@GST_API_VERSION@ \
97 # --include=Gst-@GST_API_VERSION@ \
98-# --libtool="$(top_builddir)/libtool" \
99+# --libtool="$(LIBTOOL)" \
100 # --pkg gstreamer-@GST_API_VERSION@ \
101 # --pkg gstreamer-tag-@GST_API_VERSION@ \
102 # --pkg gstreamer-audio-@GST_API_VERSION@ \
103diff --git a/gst-libs/gst/rtp/Makefile.am b/gst-libs/gst/rtp/Makefile.am
104index a6f971d..77ebeeb 100644
105--- a/gst-libs/gst/rtp/Makefile.am
106+++ b/gst-libs/gst/rtp/Makefile.am
107@@ -69,7 +69,7 @@ GstRtp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtp-@GST_API_VERSIO
108 --library=libgstrtp-@GST_API_VERSION@.la \
109 --include=Gst-@GST_API_VERSION@ \
110 --include=GstBase-@GST_API_VERSION@ \
111- --libtool="$(top_builddir)/libtool" \
112+ --libtool="$(LIBTOOL)" \
113 --pkg gstreamer-@GST_API_VERSION@ \
114 --pkg gstreamer-base-@GST_API_VERSION@ \
115 --pkg-export gstreamer-rtp-@GST_API_VERSION@ \
116diff --git a/gst-libs/gst/rtsp/Makefile.am b/gst-libs/gst/rtsp/Makefile.am
117index ceb07f4..db9d0fd 100644
118--- a/gst-libs/gst/rtsp/Makefile.am
119+++ b/gst-libs/gst/rtsp/Makefile.am
120@@ -76,7 +76,7 @@ GstRtsp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERS
121 --include=Gio-2.0 \
122 --include=Gst-@GST_API_VERSION@ \
123 --include=GstSdp-@GST_API_VERSION@ \
124- --libtool="$(top_builddir)/libtool" \
125+ --libtool="$(LIBTOOL)" \
126 --pkg gio-2.0 \
127 --pkg gstreamer-@GST_API_VERSION@ \
128 --pkg gstreamer-sdp-@GST_API_VERSION@ \
129diff --git a/gst-libs/gst/sdp/Makefile.am b/gst-libs/gst/sdp/Makefile.am
130index e197e9b..6e05cc7 100644
131--- a/gst-libs/gst/sdp/Makefile.am
132+++ b/gst-libs/gst/sdp/Makefile.am
133@@ -34,7 +34,7 @@ GstSdp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstsdp-@GST_API_VERSIO
134 --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
135 --library=libgstsdp-@GST_API_VERSION@.la \
136 --include=Gst-@GST_API_VERSION@ \
137- --libtool="$(top_builddir)/libtool" \
138+ --libtool="$(LIBTOOL)" \
139 --pkg gstreamer-@GST_API_VERSION@ \
140 --pkg-export gstreamer-sdp-@GST_API_VERSION@ \
141 --output $@ \
142diff --git a/gst-libs/gst/tag/Makefile.am b/gst-libs/gst/tag/Makefile.am
143index 0247c33..c86515b 100644
144--- a/gst-libs/gst/tag/Makefile.am
145+++ b/gst-libs/gst/tag/Makefile.am
146@@ -66,7 +66,7 @@ GstTag-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgsttag-@GST_API_VERSIO
147 --library=libgsttag-@GST_API_VERSION@.la \
148 --include=Gst-@GST_API_VERSION@ \
149 --include=GstBase-@GST_API_VERSION@ \
150- --libtool="$(top_builddir)/libtool" \
151+ --libtool="$(LIBTOOL)" \
152 --pkg gstreamer-@GST_API_VERSION@ \
153 --pkg gstreamer-base-@GST_API_VERSION@ \
154 --pkg-export gstreamer-tag-@GST_API_VERSION@ \
155diff --git a/gst-libs/gst/video/Makefile.am b/gst-libs/gst/video/Makefile.am
156index 9fc1ccf..0f8455f 100644
157--- a/gst-libs/gst/video/Makefile.am
158+++ b/gst-libs/gst/video/Makefile.am
159@@ -124,7 +124,7 @@ GstVideo-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstvideo-@GST_API_VE
160 --library=libgstvideo-@GST_API_VERSION@.la \
161 --include=Gst-@GST_API_VERSION@ \
162 --include=GstBase-@GST_API_VERSION@ \
163- --libtool="$(top_builddir)/libtool" \
164+ --libtool="$(LIBTOOL)" \
165 --pkg gstreamer-@GST_API_VERSION@ \
166 --pkg gstreamer-base-@GST_API_VERSION@ \
167 --pkg-export gstreamer-video-@GST_API_VERSION@ \
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 2e1190ba01..08cbfb7c2a 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
@@ -34,7 +34,7 @@ index 1ecc950..d6417ac 100644
34+ --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ 34+ --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
35 --library=libgstallocators-@GST_API_VERSION@.la \ 35 --library=libgstallocators-@GST_API_VERSION@.la \
36 --include=Gst-@GST_API_VERSION@ \ 36 --include=Gst-@GST_API_VERSION@ \
37 --libtool="$(LIBTOOL)" \ 37 --libtool="${LIBTOOL}" \
38@@ -63,7 +63,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) 38@@ -63,7 +63,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
39 $(INTROSPECTION_COMPILER) \ 39 $(INTROSPECTION_COMPILER) \
40 --includedir=$(srcdir) \ 40 --includedir=$(srcdir) \
@@ -63,7 +63,7 @@ diff --git a/gst-libs/gst/audio/Makefile.am b/gst-libs/gst/audio/Makefile.am
63index 7fb65f2..5379f79 100644 63index 7fb65f2..5379f79 100644
64--- a/gst-libs/gst/audio/Makefile.am 64--- a/gst-libs/gst/audio/Makefile.am
65+++ b/gst-libs/gst/audio/Makefile.am 65+++ b/gst-libs/gst/audio/Makefile.am
66@@ -174,12 +174,12 @@ GstAudio-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstaudio-@GST_API_VE 66@@ -176,12 +176,12 @@ GstAudio-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstaudio-@GST_API_VE
67 -I$(top_srcdir)/gst-libs \ 67 -I$(top_srcdir)/gst-libs \
68 -I$(top_builddir)/gst-libs \ 68 -I$(top_builddir)/gst-libs \
69 --c-include "gst/audio/audio.h" \ 69 --c-include "gst/audio/audio.h" \
@@ -80,7 +80,7 @@ index 7fb65f2..5379f79 100644
80 --library-path="$(top_builddir)/gst-libs/gst/tag/" \ 80 --library-path="$(top_builddir)/gst-libs/gst/tag/" \
81 --include=Gst-@GST_API_VERSION@ \ 81 --include=Gst-@GST_API_VERSION@ \
82 --include=GstBase-@GST_API_VERSION@ \ 82 --include=GstBase-@GST_API_VERSION@ \
83@@ -208,8 +208,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) 83@@ -210,8 +210,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
84 --includedir=$(srcdir) \ 84 --includedir=$(srcdir) \
85 --includedir=$(builddir) \ 85 --includedir=$(builddir) \
86 --includedir="$(top_builddir)/gst-libs/gst/tag/" \ 86 --includedir="$(top_builddir)/gst-libs/gst/tag/" \
@@ -95,7 +95,7 @@ diff --git a/gst-libs/gst/gl/Makefile.am b/gst-libs/gst/gl/Makefile.am
95index 3276d7f..0cdfe26 100644 95index 3276d7f..0cdfe26 100644
96--- a/gst-libs/gst/gl/Makefile.am 96--- a/gst-libs/gst/gl/Makefile.am
97+++ b/gst-libs/gst/gl/Makefile.am 97+++ b/gst-libs/gst/gl/Makefile.am
98@@ -186,9 +186,9 @@ GstGL-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstgl-@GST_API_VERSION@ 98@@ -209,9 +209,9 @@ GstGL-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstgl-@GST_API_VERSION@
99 $(GST_PLUGINS_BASE_CFLAGS) \ 99 $(GST_PLUGINS_BASE_CFLAGS) \
100 $(GL_CFLAGS) \ 100 $(GL_CFLAGS) \
101 --add-include-path="$(top_builddir)/gst-libs/gst/video/" \ 101 --add-include-path="$(top_builddir)/gst-libs/gst/video/" \
@@ -107,7 +107,7 @@ index 3276d7f..0cdfe26 100644
107 --library=libgstgl-@GST_API_VERSION@.la \ 107 --library=libgstgl-@GST_API_VERSION@.la \
108 --include=Gst-@GST_API_VERSION@ \ 108 --include=Gst-@GST_API_VERSION@ \
109 --include=GstBase-@GST_API_VERSION@ \ 109 --include=GstBase-@GST_API_VERSION@ \
110@@ -218,8 +218,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) 110@@ -241,8 +241,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
111 --includedir=$(srcdir) \ 111 --includedir=$(srcdir) \
112 --includedir=$(builddir) \ 112 --includedir=$(builddir) \
113 --includedir="$(top_builddir)/gst-libs/gst/video/" \ 113 --includedir="$(top_builddir)/gst-libs/gst/video/" \
@@ -117,7 +117,7 @@ index 3276d7f..0cdfe26 100644
117+ --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ 117+ --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
118 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) 118 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
119 119
120 CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA) 120 CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
121diff --git a/gst-libs/gst/pbutils/Makefile.am b/gst-libs/gst/pbutils/Makefile.am 121diff --git a/gst-libs/gst/pbutils/Makefile.am b/gst-libs/gst/pbutils/Makefile.am
122index 35a6e44..49d6894 100644 122index 35a6e44..49d6894 100644
123--- a/gst-libs/gst/pbutils/Makefile.am 123--- a/gst-libs/gst/pbutils/Makefile.am
@@ -182,7 +182,7 @@ diff --git a/gst-libs/gst/rtp/Makefile.am b/gst-libs/gst/rtp/Makefile.am
182index 77ebeeb..9aee788 100644 182index 77ebeeb..9aee788 100644
183--- a/gst-libs/gst/rtp/Makefile.am 183--- a/gst-libs/gst/rtp/Makefile.am
184+++ b/gst-libs/gst/rtp/Makefile.am 184+++ b/gst-libs/gst/rtp/Makefile.am
185@@ -64,8 +64,8 @@ GstRtp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtp-@GST_API_VERSIO 185@@ -66,8 +66,8 @@ GstRtp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtp-@GST_API_VERSIO
186 --c-include "gst/rtp/rtp.h" \ 186 --c-include "gst/rtp/rtp.h" \
187 -I$(top_builddir)/gst-libs \ 187 -I$(top_builddir)/gst-libs \
188 -I$(top_srcdir)/gst-libs \ 188 -I$(top_srcdir)/gst-libs \
@@ -193,7 +193,7 @@ index 77ebeeb..9aee788 100644
193 --library=libgstrtp-@GST_API_VERSION@.la \ 193 --library=libgstrtp-@GST_API_VERSION@.la \
194 --include=Gst-@GST_API_VERSION@ \ 194 --include=Gst-@GST_API_VERSION@ \
195 --include=GstBase-@GST_API_VERSION@ \ 195 --include=GstBase-@GST_API_VERSION@ \
196@@ -92,8 +92,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) 196@@ -94,8 +94,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
197 $(INTROSPECTION_COMPILER) \ 197 $(INTROSPECTION_COMPILER) \
198 --includedir=$(srcdir) \ 198 --includedir=$(srcdir) \
199 --includedir=$(builddir) \ 199 --includedir=$(builddir) \
@@ -208,24 +208,17 @@ diff --git a/gst-libs/gst/rtsp/Makefile.am b/gst-libs/gst/rtsp/Makefile.am
208index db9d0fd..79027cb 100644 208index db9d0fd..79027cb 100644
209--- a/gst-libs/gst/rtsp/Makefile.am 209--- a/gst-libs/gst/rtsp/Makefile.am
210+++ b/gst-libs/gst/rtsp/Makefile.am 210+++ b/gst-libs/gst/rtsp/Makefile.am
211@@ -71,7 +71,7 @@ GstRtsp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERS 211@@ -71,8 +71,8 @@ GstRtsp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERS
212 -I$(top_builddir)/gst-libs \ 212 -I$(top_builddir)/gst-libs \
213 -I$(top_srcdir)/gst-libs \ 213 -I$(top_srcdir)/gst-libs \
214 --add-include-path=$(builddir)/../sdp \ 214 --add-include-path=$(builddir)/../sdp \
215- --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ 215- --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
216- --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
216+ --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ 217+ --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
218+ --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
217 --library=libgstrtsp-@GST_API_VERSION@.la \ 219 --library=libgstrtsp-@GST_API_VERSION@.la \
218 --include=Gio-2.0 \ 220 --include=Gio-2.0 \
219 --include=Gst-@GST_API_VERSION@ \ 221 --include=Gst-@GST_API_VERSION@ \
220@@ -101,7 +101,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
221 --includedir=$(srcdir) \
222 --includedir=$(builddir) \
223 --includedir=$(builddir)/../sdp \
224- --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
225+ --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
226 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
227
228 CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
229diff --git a/gst-libs/gst/sdp/Makefile.am b/gst-libs/gst/sdp/Makefile.am 222diff --git a/gst-libs/gst/sdp/Makefile.am b/gst-libs/gst/sdp/Makefile.am
230index 6e05cc7..c7cf514 100644 223index 6e05cc7..c7cf514 100644
231--- a/gst-libs/gst/sdp/Makefile.am 224--- a/gst-libs/gst/sdp/Makefile.am
@@ -238,7 +231,7 @@ index 6e05cc7..c7cf514 100644
238+ --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ 231+ --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
239 --library=libgstsdp-@GST_API_VERSION@.la \ 232 --library=libgstsdp-@GST_API_VERSION@.la \
240 --include=Gst-@GST_API_VERSION@ \ 233 --include=Gst-@GST_API_VERSION@ \
241 --libtool="$(LIBTOOL)" \ 234 --libtool="${LIBTOOL}" \
242@@ -55,7 +55,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) 235@@ -55,7 +55,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
243 $(INTROSPECTION_COMPILER) \ 236 $(INTROSPECTION_COMPILER) \
244 --includedir=$(srcdir) \ 237 --includedir=$(srcdir) \
@@ -278,7 +271,7 @@ diff --git a/gst-libs/gst/video/Makefile.am b/gst-libs/gst/video/Makefile.am
278index 0f8455f..8c9955c 100644 271index 0f8455f..8c9955c 100644
279--- a/gst-libs/gst/video/Makefile.am 272--- a/gst-libs/gst/video/Makefile.am
280+++ b/gst-libs/gst/video/Makefile.am 273+++ b/gst-libs/gst/video/Makefile.am
281@@ -119,8 +119,8 @@ GstVideo-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstvideo-@GST_API_VE 274@@ -124,8 +124,8 @@ GstVideo-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstvideo-@GST_API_VE
282 --c-include "gst/video/video.h" \ 275 --c-include "gst/video/video.h" \
283 -I$(top_srcdir)/gst-libs \ 276 -I$(top_srcdir)/gst-libs \
284 -I$(top_builddir)/gst-libs \ 277 -I$(top_builddir)/gst-libs \
@@ -289,7 +282,7 @@ index 0f8455f..8c9955c 100644
289 --library=libgstvideo-@GST_API_VERSION@.la \ 282 --library=libgstvideo-@GST_API_VERSION@.la \
290 --include=Gst-@GST_API_VERSION@ \ 283 --include=Gst-@GST_API_VERSION@ \
291 --include=GstBase-@GST_API_VERSION@ \ 284 --include=GstBase-@GST_API_VERSION@ \
292@@ -147,8 +147,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) 285@@ -152,8 +152,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
293 $(INTROSPECTION_COMPILER) \ 286 $(INTROSPECTION_COMPILER) \
294 --includedir=$(srcdir) \ 287 --includedir=$(srcdir) \
295 --includedir=$(builddir) \ 288 --includedir=$(builddir) \
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 aaeb611fec..97a0d68cfb 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
@@ -15,10 +15,10 @@ diff --git a/gst-libs/gst/rtsp/Makefile.am b/gst-libs/gst/rtsp/Makefile.am
15index 79027cb..2987e23 100644 15index 79027cb..2987e23 100644
16--- a/gst-libs/gst/rtsp/Makefile.am 16--- a/gst-libs/gst/rtsp/Makefile.am
17+++ b/gst-libs/gst/rtsp/Makefile.am 17+++ b/gst-libs/gst/rtsp/Makefile.am
18@@ -79,7 +79,6 @@ GstRtsp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERS 18@@ -82,7 +82,6 @@ GstRtsp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERS
19 --libtool="$(LIBTOOL)" \
20 --pkg gio-2.0 \ 19 --pkg gio-2.0 \
21 --pkg gstreamer-@GST_API_VERSION@ \ 20 --pkg gstreamer-@GST_API_VERSION@ \
21 --pkg gstreamer-base-@GST_API_VERSION@ \
22- --pkg gstreamer-sdp-@GST_API_VERSION@ \ 22- --pkg gstreamer-sdp-@GST_API_VERSION@ \
23 --pkg-export gstreamer-rtsp-@GST_API_VERSION@ \ 23 --pkg-export gstreamer-rtsp-@GST_API_VERSION@ \
24 --add-init-section="$(INTROSPECTION_INIT)" \ 24 --add-init-section="$(INTROSPECTION_INIT)" \
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0005-viv-fb-Make-sure-config.h-is-included.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0005-viv-fb-Make-sure-config.h-is-included.patch
new file mode 100644
index 0000000000..6e53d2e8b5
--- /dev/null
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0005-viv-fb-Make-sure-config.h-is-included.patch
@@ -0,0 +1,32 @@
1From bec38a0c2e2958927c42b2f9ae939969b7c4a326 Mon Sep 17 00:00:00 2001
2From: Carlos Rafael Giani <crg7475@mailbox.org>
3Date: Tue, 21 May 2019 14:01:11 +0200
4Subject: [PATCH] viv-fb: Make sure config.h is included
5
6This prevents build errors due to missing GST_API_* symbols
7
8Upstream-Status: Pending
9
10Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org>
11---
12 gst-libs/gst/gl/gl-prelude.h | 4 ++++
13 1 file changed, 4 insertions(+)
14
15diff --git a/gst-libs/gst/gl/gl-prelude.h b/gst-libs/gst/gl/gl-prelude.h
16index 05e1f6229..96ce5e685 100644
17--- a/gst-libs/gst/gl/gl-prelude.h
18+++ b/gst-libs/gst/gl/gl-prelude.h
19@@ -22,6 +22,10 @@
20 #ifndef __GST_GL_PRELUDE_H__
21 #define __GST_GL_PRELUDE_H__
22
23+#ifdef HAVE_CONFIG_H
24+#include "config.h"
25+#endif
26+
27 #include <gst/gst.h>
28
29 #ifdef BUILDING_GST_GL
30--
312.17.1
32
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
index c81fb0f6aa..e8094f459e 100644
--- 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
@@ -18,7 +18,7 @@ diff --git a/ext/gl/gstopengl.c b/ext/gl/gstopengl.c
18index a4b2540..0ccaacd 100644 18index a4b2540..0ccaacd 100644
19--- a/ext/gl/gstopengl.c 19--- a/ext/gl/gstopengl.c
20+++ b/ext/gl/gstopengl.c 20+++ b/ext/gl/gstopengl.c
21@@ -118,7 +118,7 @@ plugin_init (GstPlugin * plugin) 21@@ -127,7 +127,7 @@ plugin_init (GstPlugin * plugin)
22 #endif 22 #endif
23 23
24 if (!gst_element_register (plugin, "glimagesink", 24 if (!gst_element_register (plugin, "glimagesink",
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0010-gl-Add-switch-for-explicitely-enabling-disabling-GBM.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0010-gl-Add-switch-for-explicitely-enabling-disabling-GBM.patch
deleted file mode 100644
index 45ba50750d..0000000000
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0010-gl-Add-switch-for-explicitely-enabling-disabling-GBM.patch
+++ /dev/null
@@ -1,70 +0,0 @@
1From a1b59ca6b1781442f37ffc1b697635db126b3a22 Mon Sep 17 00:00:00 2001
2From: Carlos Rafael Giani <dv@pseudoterminal.org>
3Date: Thu, 19 Jul 2018 10:30:54 +0200
4Subject: [PATCH] gl: Add switch for explicitely enabling/disabling GBM support
5
6Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=796833]
7
8Signed-off-by: Carlos Rafael Giani <dv@pseudoterminal.org>
9---
10 m4/gst-gl.m4 | 30 ++++++++++++++++++++++++++++--
11 1 file changed, 28 insertions(+), 2 deletions(-)
12
13diff --git a/m4/gst-gl.m4 b/m4/gst-gl.m4
14index 1e9724094..aca5295cc 100644
15--- a/m4/gst-gl.m4
16+++ b/m4/gst-gl.m4
17@@ -117,6 +117,15 @@ AC_ARG_ENABLE([dispmanx],
18 *) AC_MSG_ERROR([bad value ${enableval} for --enable-dispmanx]) ;;
19 esac],[NEED_DISPMANX=auto])
20
21+AC_ARG_ENABLE([gbm],
22+ [ --enable-gbm Enable Mesa3D GBM support (requires EGL) @<:@default=auto@:>@],
23+ [case "${enableval}" in
24+ yes) NEED_GBM=yes ;;
25+ no) NEED_GBM=no ;;
26+ auto) NEED_GBM=auto ;;
27+ *) AC_MSG_ERROR([bad value ${enableval} for --enable-gbm]) ;;
28+ esac],[NEED_GBM=auto])
29+
30 AG_GST_PKG_CHECK_MODULES(X11_XCB, x11-xcb)
31 save_CPPFLAGS="$CPPFLAGS"
32 save_LIBS="$LIBS"
33@@ -172,15 +181,32 @@ case $host in
34 AC_CHECK_LIB([EGL], [fbGetDisplay], [HAVE_VIV_FB_EGL=yes])
35 fi
36
37- if test "x$HAVE_EGL" = "xyes"; then
38+ if test "x$NEED_GBM" != "xno"; then
39+ if test "x$HAVE_EGL" = "xyes"; then
40 PKG_CHECK_MODULES(DRM, libdrm >= 2.4.55, HAVE_DRM=yes, HAVE_DRM=no)
41 AC_SUBST(DRM_CFLAGS)
42 AC_SUBST(DRM_LIBS)
43+ if test "x$NEED_GBM" = "xyes"; then
44+ if test "x$HAVE_DRM" = "xno"; then
45+ AC_MSG_ERROR([GBM support requested but libdrm is not available])
46+ fi
47+ if test "x$HAVE_GUDEV" = "xno"; then
48+ AC_MSG_ERROR([GBM support requested but gudev is not available])
49+ fi
50+ fi
51 if test "x$HAVE_DRM" = "xyes" -a "x$HAVE_GUDEV" = "xyes"; then
52 PKG_CHECK_MODULES(GBM, gbm, HAVE_GBM_EGL=yes, HAVE_GBM_EGL=no)
53+ if test "x$HAVE_GBM_EGL" = "xno" -a "x$NEED_GBM" = "xyes"; then
54+ AC_MSG_ERROR([GBM support requested but gbm library is not available])
55+ fi
56 AC_SUBST(GBM_CFLAGS)
57 AC_SUBST(GBM_LIBS)
58- fi
59+ fi
60+ elif test "x$NEED_GBM" = "xyes"; then
61+ AC_MSG_ERROR([GBM support requested but EGL is not available])
62+ else
63+ AC_MSG_NOTICE([GBM support requested but EGL is not available; not enabling GBM support])
64+ fi
65 fi
66
67 dnl FIXME: Mali EGL depends on GLESv1 or GLESv2
68--
692.17.1
70
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0011-gl-Add-switches-for-explicitely-enabling-disabling-P.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0011-gl-Add-switches-for-explicitely-enabling-disabling-P.patch
deleted file mode 100644
index 65d191a396..0000000000
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0011-gl-Add-switches-for-explicitely-enabling-disabling-P.patch
+++ /dev/null
@@ -1,109 +0,0 @@
1From 092aadfc1df69c46d920b0cd39f98d363d6988b3 Mon Sep 17 00:00:00 2001
2From: Carlos Rafael Giani <dv@pseudoterminal.org>
3Date: Thu, 19 Jul 2018 11:16:05 +0200
4Subject: [PATCH] gl: Add switches for explicitely enabling/disabling PNG and
5 JPEG support
6
7Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=796833]
8
9Signed-off-by: Carlos Rafael Giani <dv@pseudoterminal.org>
10---
11 m4/gst-gl.m4 | 66 ++++++++++++++++++++++++++++++++++++----------------
12 1 file changed, 46 insertions(+), 20 deletions(-)
13
14diff --git a/m4/gst-gl.m4 b/m4/gst-gl.m4
15index 20b2233de..f8809981c 100644
16--- a/m4/gst-gl.m4
17+++ b/m4/gst-gl.m4
18@@ -126,6 +126,24 @@ AC_ARG_ENABLE([gbm],
19 *) AC_MSG_ERROR([bad value ${enableval} for --enable-gbm]) ;;
20 esac],[NEED_GBM=auto])
21
22+AC_ARG_ENABLE([png],
23+ [ --enable-png Enable libpng support @<:@default=auto@:>@],
24+ [case "${enableval}" in
25+ yes) NEED_PNG=yes ;;
26+ no) NEED_PNG=no ;;
27+ auto) NEED_PNG=auto ;;
28+ *) AC_MSG_ERROR([bad value ${enableval} for --enable-png]) ;;
29+ esac],[NEED_PNG=auto])
30+
31+AC_ARG_ENABLE([jpeg],
32+ [ --enable-jpeg Enable libjpeg support @<:@default=auto@:>@],
33+ [case "${enableval}" in
34+ yes) NEED_JPEG=yes ;;
35+ no) NEED_JPEG=no ;;
36+ auto) NEED_JPEG=auto ;;
37+ *) AC_MSG_ERROR([bad value ${enableval} for --enable-jpeg]) ;;
38+ esac],[NEED_JPEG=auto])
39+
40 AG_GST_PKG_CHECK_MODULES(X11_XCB, x11-xcb)
41 save_CPPFLAGS="$CPPFLAGS"
42 save_LIBS="$LIBS"
43@@ -1043,9 +1061,13 @@ dnl Needed by plugins that use g_module_*() API
44 PKG_CHECK_MODULES(GMODULE_NO_EXPORT, gmodule-no-export-2.0)
45
46 dnl libpng is optional
47-PKG_CHECK_MODULES(LIBPNG, libpng >= 1.0, HAVE_PNG=yes, HAVE_PNG=no)
48-if test "x$HAVE_PNG" = "xyes"; then
49- AC_DEFINE(HAVE_PNG, [1] , [Use libpng])
50+if test "x$NEED_PNG" != "xno"; then
51+ PKG_CHECK_MODULES(LIBPNG, libpng >= 1.0, HAVE_PNG=yes, HAVE_PNG=no)
52+ if test "x$HAVE_PNG" = "xyes"; then
53+ AC_DEFINE(HAVE_PNG, [1] , [Use libpng])
54+ elif test "x$NEED_PNG" = "xyes"; then
55+ AC_MSG_ERROR([libpng support requested but libpng is not available])
56+ fi
57 fi
58 AC_SUBST(HAVE_PNG)
59 AC_SUBST(LIBPNG_LIBS)
60@@ -1053,25 +1075,29 @@ AC_SUBST(LIBPNG_CFLAGS)
61
62 dnl libjpeg is optional
63 AC_ARG_WITH(jpeg-mmx, [ --with-jpeg-mmx, path to MMX'ified JPEG library])
64-OLD_LIBS="$LIBS"
65-if test x$with_jpeg_mmx != x; then
66- LIBS="$LIBS -L$with_jpeg_mmx"
67-fi
68-AC_CHECK_LIB(jpeg-mmx, jpeg_set_defaults, HAVE_JPEG="yes", HAVE_JPEG="no")
69-JPEG_LIBS="$LIBS -ljpeg-mmx"
70-LIBS="$OLD_LIBS"
71-if test x$HAVE_JPEG != xyes; then
72- JPEG_LIBS="-ljpeg"
73- AC_CHECK_LIB(jpeg, jpeg_set_defaults, HAVE_JPEG="yes", HAVE_JPEG="no")
74-fi
75+if test "x$NEED_JPEG" != "xno"; then
76+ OLD_LIBS="$LIBS"
77+ if test x$with_jpeg_mmx != x; then
78+ LIBS="$LIBS -L$with_jpeg_mmx"
79+ fi
80+ AC_CHECK_LIB(jpeg-mmx, jpeg_set_defaults, HAVE_JPEG="yes", HAVE_JPEG="no")
81+ JPEG_LIBS="$LIBS -ljpeg-mmx"
82+ LIBS="$OLD_LIBS"
83+ if test x$HAVE_JPEG != xyes; then
84+ JPEG_LIBS="-ljpeg"
85+ AC_CHECK_LIB(jpeg, jpeg_set_defaults, HAVE_JPEG="yes", HAVE_JPEG="no")
86+ fi
87
88-if test x$HAVE_JPEG = xyes; then
89- AC_DEFINE(HAVE_JPEG, [1], [Use libjpeg])
90-else
91- JPEG_LIBS=
92+ if test x$HAVE_JPEG = xyes; then
93+ AC_DEFINE(HAVE_JPEG, [1], [Use libjpeg])
94+ elif test "x$NEED_JPEG" = "xyes"; then
95+ AC_MSG_ERROR([libjpeg support requested but libjpeg is not available])
96+ else
97+ JPEG_LIBS=
98+ fi
99+ AC_SUBST(JPEG_LIBS)
100+ AC_SUBST(HAVE_JPEG)
101 fi
102-AC_SUBST(JPEG_LIBS)
103-AC_SUBST(HAVE_JPEG)
104 ])
105
106 dnl --------------------------------------------------------------------------
107--
1082.17.1
109
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
index d5a7f6bdc2..34f7c2284f 100644
--- 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
@@ -31,7 +31,7 @@ diff --git a/m4/gst-gl.m4 b/m4/gst-gl.m4
31index 1e97240..ab7774c 100644 31index 1e97240..ab7774c 100644
32--- a/m4/gst-gl.m4 32--- a/m4/gst-gl.m4
33+++ b/m4/gst-gl.m4 33+++ b/m4/gst-gl.m4
34@@ -231,7 +231,7 @@ case $host in 34@@ -275,7 +275,7 @@ case $host in
35 HAVE_EGL=yes 35 HAVE_EGL=yes
36 HAVE_GLES2=yes 36 HAVE_GLES2=yes
37 HAVE_EGL_RPI=yes 37 HAVE_EGL_RPI=yes
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.14.4.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.16.0.bb
index f3e6daf564..1d6f15e9c1 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.14.4.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.16.0.bb
@@ -1,8 +1,7 @@
1require gstreamer1.0-plugins.inc 1require gstreamer1.0-plugins.inc
2 2
3LICENSE = "GPLv2+ & LGPLv2+" 3LICENSE = "GPLv2+ & LGPLv2+"
4LIC_FILES_CHKSUM = "file://COPYING;md5=c54ce9345727175ff66d17b67ff51f58 \ 4LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d \
5 file://COPYING.LIB;md5=6762ed442b3822387a51c92d928ead0d \
6 file://common/coverage/coverage-report.pl;beginline=2;endline=17;md5=a4e1830fce078028c8f0974161272607" 5 file://common/coverage/coverage-report.pl;beginline=2;endline=17;md5=a4e1830fce078028c8f0974161272607"
7 6
8SRC_URI = " \ 7SRC_URI = " \
@@ -11,18 +10,16 @@ SRC_URI = " \
11 file://0003-ssaparse-enhance-SSA-text-lines-parsing.patch \ 10 file://0003-ssaparse-enhance-SSA-text-lines-parsing.patch \
12 file://make-gio_unix_2_0-dependency-configurable.patch \ 11 file://make-gio_unix_2_0-dependency-configurable.patch \
13 file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \ 12 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 \ 13 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 \ 14 file://0003-riff-add-missing-include-directories-when-calling-in.patch \
17 file://0004-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch \ 15 file://0004-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch \
16 file://0005-viv-fb-Make-sure-config.h-is-included.patch \
18 file://0009-glimagesink-Downrank-to-marginal.patch \ 17 file://0009-glimagesink-Downrank-to-marginal.patch \
19 file://0001-gstreamer-gl.pc.in-don-t-append-GL_CFLAGS-to-CFLAGS.patch \ 18 file://0001-gstreamer-gl.pc.in-don-t-append-GL_CFLAGS-to-CFLAGS.patch \
20 file://0010-gl-Add-switch-for-explicitely-enabling-disabling-GBM.patch \
21 file://0011-gl-Add-switches-for-explicitely-enabling-disabling-P.patch \
22 file://link-with-libvchostif.patch \ 19 file://link-with-libvchostif.patch \
23 " 20 "
24SRC_URI[md5sum] = "4dbe20c1bf44191c2b8833234df5cb2a" 21SRC_URI[md5sum] = "41dde92930710c75cdb49169c5cc6dfc"
25SRC_URI[sha256sum] = "ca6139490e48863e7706d870ff4e8ac9f417b56f3b9e4b3ce490c13b09a77461" 22SRC_URI[sha256sum] = "4093aa7b51e28fb24dfd603893fead8d1b7782f088b05ed0f22a21ef176fb5ae"
26 23
27S = "${WORKDIR}/gst-plugins-base-${PV}" 24S = "${WORKDIR}/gst-plugins-base-${PV}"
28 25
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-14 00:45:29 +0000