summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia
diff options
context:
space:
mode:
authorCarlos Rafael Giani <crg7475@mailbox.org>2020-01-12 14:59:45 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-01-16 22:33:08 +0000
commite957fbc5d82368934f721e3773bf3942c5177ed7 (patch)
treea6dfbed85612a9aa387fd2011c710a922f7fc6de /meta/recipes-multimedia
parent3e71919b865433ca007bf23f9b4f9015e25ac04e (diff)
downloadpoky-e957fbc5d82368934f721e3773bf3942c5177ed7.tar.gz
gstreamer1.0-plugins-base: Transition to meson based builds
* OpenGL packageconfigs now work differently. There are separate ones for OpenGL API/platform/window system selection. The meson.build script expects the selected ones as comma separated lists. For example, like "-Dgl_api=opengl,gles2". The variables OPENGL_APIS / OPENGL_PLATFORMS / OPENGL_WINSYS are whitespace-separated lists (which is the OE norm) of the respective packageconfigs. .bbappend files can then extend these lists with additional possible configs. "Possible" means that the target can support those packageconfigs. This does not immediately add them to the PACKAGECONFIG variable - this still has to be done manually. The get_opengl_cmdline_list() goes through these lists, and for each entry, checks if it is contained in the PACKAGECONFIG variable. If so, they get added to the comma separated lists that are passed to meson. For example, a Raspberry Pi layer could add "dispmanx" to OPENGL_WINSYS. * The "ivorbis" packageconfig got renamed to "tremor", since that is the name of the OE recipe, and now also the name of the meson option. * 0001-meson-build-gir-even-when-cross-compiling-if-introsp.patch and 0002-meson-Add-variables-for-gir-files.patch are backported fixes for GIR support in the meson.build files. * make-gio_unix_2_0-dependency-configurable.patch removed because it is no longer useful to have. * link-with-libvchostif.patch removed because the flags it changed are no longer present in the meson.build scripts. If the related issue reappears, a similar patch can be applied again. * 0003-riff-add-missing-include-directories-when-calling-in.patch removed since the entire gst riff library has been excluded from GObject introspection due to naming convention issues. * Removed a number of autotool/M4 related patches and recipe lines. * gtk-doc support is handled here, not in gstreamer1.0-plugins-common.inc, since unlike with autotools, only some plugin set packages use gtk-doc. * zlib is no longer optional, and glib anyway depends on zlib, therefore it gets added to the DEPENDS list. * gettext handling now part of gstreamer1.0-plugins-common.inc. (From OE-Core rev: 20614408dc4e0593f2cce2e342d5b8a15f182c14) 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-gstreamer-gl.pc.in-don-t-append-GL_CFLAGS-to-CFLAGS.patch29
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-meson-build-gir-even-when-cross-compiling-if-introsp.patch36
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch295
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-meson-Add-variables-for-gir-files.patch235
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-riff-add-missing-include-directories-when-calling-in.patch26
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0004-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch25
-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.patch45
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.16.1.bb95
9 files changed, 329 insertions, 502 deletions
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
deleted file mode 100644
index 251dc172cb..0000000000
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-gstreamer-gl.pc.in-don-t-append-GL_CFLAGS-to-CFLAGS.patch
+++ /dev/null
@@ -1,29 +0,0 @@
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/0001-meson-build-gir-even-when-cross-compiling-if-introsp.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-meson-build-gir-even-when-cross-compiling-if-introsp.patch
new file mode 100644
index 0000000000..49ab471414
--- /dev/null
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-meson-build-gir-even-when-cross-compiling-if-introsp.patch
@@ -0,0 +1,36 @@
1From 30672ba7d134553e59935ddc875104adba26f25c Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.com>
3Date: Thu, 17 Oct 2019 20:06:24 +0100
4Subject: [PATCH] meson: build gir even when cross-compiling if introspection
5 was enabled explicitly
6
7This can be made to work in certain circumstances when
8cross-compiling, so default to not building g-i stuff
9when cross-compiling, but allow it if introspection was
10enabled explicitly via -Dintrospection=enabled.
11
12See gstreamer/gstreamer#454 and gstreamer/gstreamer#381.
13
14Upstream-Status: Backport [30672ba7d134553e59935ddc875104adba26f25c]
15
16Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org>
17---
18 meson.build | 2 +-
19 1 file changed, 1 insertion(+), 1 deletion(-)
20
21diff --git a/meson.build b/meson.build
22index 264d84c9e..c8147c224 100644
23--- a/meson.build
24+++ b/meson.build
25@@ -372,7 +372,7 @@ endif
26
27 gir = find_program('g-ir-scanner', required : get_option('introspection'))
28 gnome = import('gnome')
29-build_gir = gir.found() and not meson.is_cross_build()
30+build_gir = gir.found() and (not meson.is_cross_build() or get_option('introspection').enabled())
31 gir_init_section = [ '--add-init-section=extern void gst_init(gint*,gchar**);' + \
32 'g_setenv("GST_REGISTRY_DISABLE", "yes", TRUE);' + \
33 'g_setenv("GST_REGISTRY_1.0", "@0@", TRUE);'.format(meson.current_build_dir() + '/gir_empty_registry.reg') + \
34--
352.17.1
36
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
deleted file mode 100644
index 08cbfb7c2a..0000000000
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch
+++ /dev/null
@@ -1,295 +0,0 @@
1From 9601fc0cd6751a1affdc8717217b95931db31d7f Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Thu, 5 Apr 2018 10:26:25 +0800
4Subject: [PATCH] Makefile.am: prefix calls to pkg-config with
5 PKG_CONFIG_SYSROOT_DIR
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 | 4 ++--
13 gst-libs/gst/app/Makefile.am | 4 ++--
14 gst-libs/gst/audio/Makefile.am | 12 ++++++------
15 gst-libs/gst/gl/Makefile.am | 8 ++++----
16 gst-libs/gst/pbutils/Makefile.am | 12 ++++++------
17 gst-libs/gst/riff/Makefile.am | 8 ++++----
18 gst-libs/gst/rtp/Makefile.am | 8 ++++----
19 gst-libs/gst/rtsp/Makefile.am | 4 ++--
20 gst-libs/gst/sdp/Makefile.am | 4 ++--
21 gst-libs/gst/tag/Makefile.am | 8 ++++----
22 gst-libs/gst/video/Makefile.am | 8 ++++----
23 11 files changed, 40 insertions(+), 40 deletions(-)
24
25diff --git a/gst-libs/gst/allocators/Makefile.am b/gst-libs/gst/allocators/Makefile.am
26index 1ecc950..d6417ac 100644
27--- a/gst-libs/gst/allocators/Makefile.am
28+++ b/gst-libs/gst/allocators/Makefile.am
29@@ -39,7 +39,7 @@ GstAllocators-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstallocators-@
30 --c-include "gst/allocators/allocators.h" \
31 -I$(top_srcdir)/gst-libs \
32 -I$(top_builddir)/gst-libs \
33- --add-include-path=`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 \
36 --include=Gst-@GST_API_VERSION@ \
37 --libtool="${LIBTOOL}" \
38@@ -63,7 +63,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
39 $(INTROSPECTION_COMPILER) \
40 --includedir=$(srcdir) \
41 --includedir=$(builddir) \
42- --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
43+ --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
44 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
45
46 CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA)
47diff --git a/gst-libs/gst/app/Makefile.am b/gst-libs/gst/app/Makefile.am
48index 5bfd606..6441674 100644
49--- a/gst-libs/gst/app/Makefile.am
50+++ b/gst-libs/gst/app/Makefile.am
51@@ -51,8 +51,8 @@ GstApp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstapp-@GST_API_VERSIO
52 --c-include "gst/app/app.h" \
53 -I$(top_srcdir)/gst-libs \
54 -I$(top_builddir)/gst-libs \
55- --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
56- --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
57+ --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
58+ --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
59 --library=libgstapp-@GST_API_VERSION@.la \
60 --include=Gst-@GST_API_VERSION@ \
61 --include=GstBase-@GST_API_VERSION@ \
62diff --git a/gst-libs/gst/audio/Makefile.am b/gst-libs/gst/audio/Makefile.am
63index 7fb65f2..5379f79 100644
64--- a/gst-libs/gst/audio/Makefile.am
65+++ b/gst-libs/gst/audio/Makefile.am
66@@ -176,12 +176,12 @@ GstAudio-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstaudio-@GST_API_VE
67 -I$(top_srcdir)/gst-libs \
68 -I$(top_builddir)/gst-libs \
69 --c-include "gst/audio/audio.h" \
70- --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
71- --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
72+ --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
73+ --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
74 --add-include-path="$(top_builddir)/gst-libs/gst/tag/" \
75 --library=libgstaudio-@GST_API_VERSION@.la \
76- --library-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=libdir gstreamer-@GST_API_VERSION@` \
77- --library-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=libdir gstreamer-base-@GST_API_VERSION@` \
78+ --library-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=libdir gstreamer-@GST_API_VERSION@` \
79+ --library-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=libdir gstreamer-base-@GST_API_VERSION@` \
80 --library-path="$(top_builddir)/gst-libs/gst/tag/" \
81 --include=Gst-@GST_API_VERSION@ \
82 --include=GstBase-@GST_API_VERSION@ \
83@@ -210,8 +210,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
84 --includedir=$(srcdir) \
85 --includedir=$(builddir) \
86 --includedir="$(top_builddir)/gst-libs/gst/tag/" \
87- --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
88- --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
89+ --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
90+ --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
91 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
92
93 CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
94diff --git a/gst-libs/gst/gl/Makefile.am b/gst-libs/gst/gl/Makefile.am
95index 3276d7f..0cdfe26 100644
96--- a/gst-libs/gst/gl/Makefile.am
97+++ b/gst-libs/gst/gl/Makefile.am
98@@ -209,9 +209,9 @@ GstGL-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstgl-@GST_API_VERSION@
99 $(GST_PLUGINS_BASE_CFLAGS) \
100 $(GL_CFLAGS) \
101 --add-include-path="$(top_builddir)/gst-libs/gst/video/" \
102- --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
103- --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
104 --library-path="$(top_builddir)/gst-libs/gst/video/" \
105+ --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
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 --library=libgstgl-@GST_API_VERSION@.la \
108 --include=Gst-@GST_API_VERSION@ \
109 --include=GstBase-@GST_API_VERSION@ \
110@@ -241,8 +241,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
111 --includedir=$(srcdir) \
112 --includedir=$(builddir) \
113 --includedir="$(top_builddir)/gst-libs/gst/video/" \
114- --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-base-@GST_API_VERSION@` \
116+ --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@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)
119
120 CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
121diff --git a/gst-libs/gst/pbutils/Makefile.am b/gst-libs/gst/pbutils/Makefile.am
122index 35a6e44..49d6894 100644
123--- a/gst-libs/gst/pbutils/Makefile.am
124+++ b/gst-libs/gst/pbutils/Makefile.am
125@@ -88,14 +88,14 @@ GstPbutils-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstpbutils-@GST_AP
126 --c-include "gst/pbutils/pbutils.h" \
127 -I$(top_srcdir)/gst-libs \
128 -I$(top_builddir)/gst-libs \
129- --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
130- --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
131+ --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
132+ --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
133 --add-include-path="$(top_builddir)/gst-libs/gst/tag/" \
134 --add-include-path="$(top_builddir)/gst-libs/gst/video/" \
135 --add-include-path="$(top_builddir)/gst-libs/gst/audio/" \
136 --library=libgstpbutils-@GST_API_VERSION@.la \
137- --library-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=libdir gstreamer-@GST_API_VERSION@` \
138- --library-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=libdir gstreamer-base-@GST_API_VERSION@` \
139+ --library-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=libdir gstreamer-@GST_API_VERSION@` \
140+ --library-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=libdir gstreamer-base-@GST_API_VERSION@` \
141 --library-path="$(top_builddir)/gst-libs/gst/tag/" \
142 --library-path="$(top_builddir)/gst-libs/gst/video/" \
143 --library-path="$(top_builddir)/gst-libs/gst/audio/" \
144@@ -128,8 +128,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
145 $(INTROSPECTION_COMPILER) \
146 --includedir=$(srcdir) \
147 --includedir=$(builddir) \
148- --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
149- --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
150+ --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
151+ --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
152 --includedir="$(top_builddir)/gst-libs/gst/tag/" \
153 --includedir="$(top_builddir)/gst-libs/gst/video/" \
154 --includedir="$(top_builddir)/gst-libs/gst/audio/" \
155diff --git a/gst-libs/gst/riff/Makefile.am b/gst-libs/gst/riff/Makefile.am
156index e66ef4f..c8c588a 100644
157--- a/gst-libs/gst/riff/Makefile.am
158+++ b/gst-libs/gst/riff/Makefile.am
159@@ -43,8 +43,8 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS)
160 # --c-include "gst/riff/riff.h" \
161 # --add-include-path=$(builddir)/../tag \
162 # --add-include-path=$(builddir)/../audio \
163-# --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
164-# --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
165+# --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
166+# --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
167 # --library=libgstriff-@GST_API_VERSION@.la \
168 # --include=GstAudio-@GST_API_VERSION@ \
169 # --include=GstTag-@GST_API_VERSION@ \
170@@ -75,8 +75,8 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS)
171 # --includedir=$(builddir) \
172 # --includedir=$(builddir)/../tag \
173 # --includedir=$(builddir)/../audio \
174-# --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
175-# --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
176+# --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
177+# --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
178 # $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
179 #
180 #CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA)
181diff --git a/gst-libs/gst/rtp/Makefile.am b/gst-libs/gst/rtp/Makefile.am
182index 77ebeeb..9aee788 100644
183--- a/gst-libs/gst/rtp/Makefile.am
184+++ b/gst-libs/gst/rtp/Makefile.am
185@@ -66,8 +66,8 @@ GstRtp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtp-@GST_API_VERSIO
186 --c-include "gst/rtp/rtp.h" \
187 -I$(top_builddir)/gst-libs \
188 -I$(top_srcdir)/gst-libs \
189- --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
190- --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
191+ --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
192+ --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
193 --library=libgstrtp-@GST_API_VERSION@.la \
194 --include=Gst-@GST_API_VERSION@ \
195 --include=GstBase-@GST_API_VERSION@ \
196@@ -94,8 +94,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
197 $(INTROSPECTION_COMPILER) \
198 --includedir=$(srcdir) \
199 --includedir=$(builddir) \
200- --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
201- --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
202+ --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
203+ --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
204 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
205
206 CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
207diff --git a/gst-libs/gst/rtsp/Makefile.am b/gst-libs/gst/rtsp/Makefile.am
208index db9d0fd..79027cb 100644
209--- a/gst-libs/gst/rtsp/Makefile.am
210+++ b/gst-libs/gst/rtsp/Makefile.am
211@@ -71,8 +71,8 @@ GstRtsp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERS
212 -I$(top_builddir)/gst-libs \
213 -I$(top_srcdir)/gst-libs \
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@` \
216- --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@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@` \
219 --library=libgstrtsp-@GST_API_VERSION@.la \
220 --include=Gio-2.0 \
221 --include=Gst-@GST_API_VERSION@ \
222diff --git a/gst-libs/gst/sdp/Makefile.am b/gst-libs/gst/sdp/Makefile.am
223index 6e05cc7..c7cf514 100644
224--- a/gst-libs/gst/sdp/Makefile.am
225+++ b/gst-libs/gst/sdp/Makefile.am
226@@ -31,7 +31,7 @@ GstSdp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstsdp-@GST_API_VERSIO
227 --warn-all \
228 --c-include "gst/sdp/sdp.h" \
229 -I$(top_srcdir)/gst-libs \
230- --add-include-path=`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@` \
232 --library=libgstsdp-@GST_API_VERSION@.la \
233 --include=Gst-@GST_API_VERSION@ \
234 --libtool="${LIBTOOL}" \
235@@ -55,7 +55,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
236 $(INTROSPECTION_COMPILER) \
237 --includedir=$(srcdir) \
238 --includedir=$(builddir) \
239- --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
240+ --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
241 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
242
243 CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA)
244diff --git a/gst-libs/gst/tag/Makefile.am b/gst-libs/gst/tag/Makefile.am
245index c86515b..363e6d2 100644
246--- a/gst-libs/gst/tag/Makefile.am
247+++ b/gst-libs/gst/tag/Makefile.am
248@@ -61,8 +61,8 @@ GstTag-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgsttag-@GST_API_VERSIO
249 --c-include "gst/tag/tag.h" \
250 -I$(top_srcdir)/gst-libs \
251 -I$(top_builddir)/gst-libs \
252- --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
253- --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
254+ --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
255+ --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
256 --library=libgsttag-@GST_API_VERSION@.la \
257 --include=Gst-@GST_API_VERSION@ \
258 --include=GstBase-@GST_API_VERSION@ \
259@@ -89,8 +89,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
260 $(INTROSPECTION_COMPILER) \
261 --includedir=$(srcdir) \
262 --includedir=$(builddir) \
263- --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
264- --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
265+ --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
266+ --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
267 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
268
269 CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
270diff --git a/gst-libs/gst/video/Makefile.am b/gst-libs/gst/video/Makefile.am
271index 0f8455f..8c9955c 100644
272--- a/gst-libs/gst/video/Makefile.am
273+++ b/gst-libs/gst/video/Makefile.am
274@@ -124,8 +124,8 @@ GstVideo-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstvideo-@GST_API_VE
275 --c-include "gst/video/video.h" \
276 -I$(top_srcdir)/gst-libs \
277 -I$(top_builddir)/gst-libs \
278- --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
279- --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
280+ --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
281+ --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
282 --library=libgstvideo-@GST_API_VERSION@.la \
283 --include=Gst-@GST_API_VERSION@ \
284 --include=GstBase-@GST_API_VERSION@ \
285@@ -152,8 +152,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
286 $(INTROSPECTION_COMPILER) \
287 --includedir=$(srcdir) \
288 --includedir=$(builddir) \
289- --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
290- --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
291+ --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
292+ --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
293 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
294
295 CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-meson-Add-variables-for-gir-files.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-meson-Add-variables-for-gir-files.patch
new file mode 100644
index 0000000000..ca85744c19
--- /dev/null
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-meson-Add-variables-for-gir-files.patch
@@ -0,0 +1,235 @@
1From 685731e989dc074a4b0d48b6c8062e2738f09719 Mon Sep 17 00:00:00 2001
2From: Thibault Saunier <tsaunier@igalia.com>
3Date: Mon, 22 Oct 2018 11:44:37 +0200
4Subject: [PATCH] meson: Add variables for gir files
5
6And flatten list of sources for dependencies
7
8Upstream-Status: Backport [685731e989dc074a4b0d48b6c8062e2738f09719]
9
10Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org>
11---
12 gst-libs/gst/allocators/meson.build | 5 +++--
13 gst-libs/gst/app/meson.build | 6 ++++--
14 gst-libs/gst/audio/meson.build | 5 +++--
15 gst-libs/gst/pbutils/meson.build | 5 +++--
16 gst-libs/gst/rtp/meson.build | 6 ++++--
17 gst-libs/gst/rtsp/meson.build | 5 +++--
18 gst-libs/gst/sdp/meson.build | 6 ++++--
19 gst-libs/gst/tag/meson.build | 5 +++--
20 gst-libs/gst/video/meson.build | 5 +++--
21 9 files changed, 30 insertions(+), 18 deletions(-)
22
23diff --git a/gst-libs/gst/allocators/meson.build b/gst-libs/gst/allocators/meson.build
24index 364baeebf..56f156dc3 100644
25--- a/gst-libs/gst/allocators/meson.build
26+++ b/gst-libs/gst/allocators/meson.build
27@@ -22,7 +22,7 @@ gstallocators = library('gstallocators-@0@'.format(api_version),
28 allocators_gen_sources = []
29 if build_gir
30 gst_gir_extra_args = gir_init_section + [ '--c-include=gst/allocators/allocators.h' ]
31- allocators_gen_sources += [gnome.generate_gir(gstallocators,
32+ allocators_gir = gnome.generate_gir(gstallocators,
33 sources : gst_allocators_sources + gst_allocators_headers,
34 namespace : 'GstAllocators',
35 nsversion : api_version,
36@@ -33,7 +33,8 @@ if build_gir
37 install : true,
38 extra_args : gst_gir_extra_args,
39 dependencies : [gst_dep]
40- )]
41+ )
42+ allocators_gen_sources += allocators_gir
43 endif
44
45 allocators_dep = declare_dependency(link_with: gstallocators,
46diff --git a/gst-libs/gst/app/meson.build b/gst-libs/gst/app/meson.build
47index 81dd0f42c..7a90f5e10 100644
48--- a/gst-libs/gst/app/meson.build
49+++ b/gst-libs/gst/app/meson.build
50@@ -32,7 +32,7 @@ gstapp = library('gstapp-@0@'.format(api_version),
51
52 if build_gir
53 gst_gir_extra_args = gir_init_section + [ '--c-include=gst/app/app.h' ]
54- app_gen_sources += [gnome.generate_gir(gstapp,
55+ app_gir = gnome.generate_gir(gstapp,
56 sources : app_sources + app_headers + [gstapp_c] + [gstapp_h],
57 namespace : 'GstApp',
58 nsversion : api_version,
59@@ -43,7 +43,9 @@ if build_gir
60 install : true,
61 extra_args : gst_gir_extra_args,
62 dependencies : [gst_dep, gst_base_dep]
63- )]
64+ )
65+
66+ app_gen_sources += app_gir
67 endif
68
69 app_dep = declare_dependency(link_with: gstapp,
70diff --git a/gst-libs/gst/audio/meson.build b/gst-libs/gst/audio/meson.build
71index 0e4efab2e..2a449d4bf 100644
72--- a/gst-libs/gst/audio/meson.build
73+++ b/gst-libs/gst/audio/meson.build
74@@ -153,7 +153,7 @@ gstaudio = library('gstaudio-@0@'.format(api_version),
75
76 if build_gir
77 gst_gir_extra_args = gir_init_section + [ '--c-include=gst/audio/audio.h' ]
78- audio_gen_sources += [gnome.generate_gir(gstaudio,
79+ audio_gir = gnome.generate_gir(gstaudio,
80 sources : audio_src + audio_headers + [gstaudio_c] + [gstaudio_h],
81 namespace : 'GstAudio',
82 nsversion : api_version,
83@@ -164,7 +164,8 @@ if build_gir
84 install : true,
85 extra_args : gst_gir_extra_args,
86 dependencies : gstaudio_deps
87- )]
88+ )
89+ audio_gen_sources += [audio_gir]
90 endif
91
92 audio_dep = declare_dependency(link_with : gstaudio,
93diff --git a/gst-libs/gst/pbutils/meson.build b/gst-libs/gst/pbutils/meson.build
94index 2faf62622..0e96722fd 100644
95--- a/gst-libs/gst/pbutils/meson.build
96+++ b/gst-libs/gst/pbutils/meson.build
97@@ -63,7 +63,7 @@ pbutils = library('gstpbutils-@0@'.format(api_version),
98 pbutils_gen_sources = [gstpbutils_h, gst_pbutils_version_h]
99 if build_gir
100 gst_gir_extra_args = gir_init_section + [ '--c-include=gst/pbutils/pbutils.h' ]
101- pbutils_gen_sources += [gnome.generate_gir(pbutils,
102+ pbutils_gir = gnome.generate_gir(pbutils,
103 sources : pbutils_sources + pbutils_headers + [gstpbutils_h, gst_pbutils_version_h],
104 namespace : 'GstPbutils',
105 nsversion : api_version,
106@@ -74,7 +74,8 @@ if build_gir
107 install : true,
108 extra_args : gst_gir_extra_args,
109 dependencies : gstpbutils_deps
110- )]
111+ )
112+ pbutils_gen_sources += [pbutils_gir]
113 endif
114
115 pbutils_dep = declare_dependency(link_with : pbutils,
116diff --git a/gst-libs/gst/rtp/meson.build b/gst-libs/gst/rtp/meson.build
117index f47ec6592..7ea6658d5 100644
118--- a/gst-libs/gst/rtp/meson.build
119+++ b/gst-libs/gst/rtp/meson.build
120@@ -49,7 +49,7 @@ gst_rtp = library('gstrtp-@0@'.format(api_version),
121 rtp_gen_sources = [gstrtp_enum_h]
122 if build_gir
123 gst_gir_extra_args = gir_init_section + [ '--c-include=gst/rtp/rtp.h' ]
124- rtp_gen_sources += [gnome.generate_gir(gst_rtp,
125+ rtp_gir = gnome.generate_gir(gst_rtp,
126 sources : rtp_sources + rtp_headers + [gstrtp_enum_c] + [gstrtp_enum_h],
127 namespace : 'GstRtp',
128 nsversion : api_version,
129@@ -60,7 +60,9 @@ if build_gir
130 install : true,
131 extra_args : gst_gir_extra_args,
132 dependencies : gstrtp_deps
133- )]
134+ )
135+
136+ rtp_gen_sources += [rtp_gir]
137 endif
138
139
140diff --git a/gst-libs/gst/rtsp/meson.build b/gst-libs/gst/rtsp/meson.build
141index 27e309d5a..3632adceb 100644
142--- a/gst-libs/gst/rtsp/meson.build
143+++ b/gst-libs/gst/rtsp/meson.build
144@@ -54,7 +54,7 @@ gst_rtsp = library('gstrtsp-@0@'.format(api_version),
145 rtsp_gen_sources = [gstrtsp_h]
146 if build_gir
147 gst_gir_extra_args = gir_init_section + [ '--c-include=gst/rtsp/rtsp.h' ]
148- rtsp_gen_sources += [gnome.generate_gir(gst_rtsp,
149+ rtsp_gir = gnome.generate_gir(gst_rtsp,
150 sources : rtsp_sources + rtsp_headers + [gstrtsp_c] + [gstrtsp_h],
151 namespace : 'GstRtsp',
152 nsversion : api_version,
153@@ -65,7 +65,8 @@ if build_gir
154 install : true,
155 extra_args : gst_gir_extra_args,
156 dependencies : gstrtsp_deps + [sdp_dep]
157- )]
158+ )
159+ rtsp_gen_sources += [rtsp_gir]
160 endif
161
162 rtsp_dep = declare_dependency(link_with : gst_rtsp,
163diff --git a/gst-libs/gst/sdp/meson.build b/gst-libs/gst/sdp/meson.build
164index 62c18b732..24cdb5293 100644
165--- a/gst-libs/gst/sdp/meson.build
166+++ b/gst-libs/gst/sdp/meson.build
167@@ -23,7 +23,7 @@ gstsdp = library('gstsdp-@0@'.format(api_version),
168 sdp_gen_sources = []
169 if build_gir
170 gst_gir_extra_args = gir_init_section + [ '--c-include=gst/sdp/sdp.h' ]
171- sdp_gen_sources += [gnome.generate_gir(gstsdp,
172+ sdp_gir = gnome.generate_gir(gstsdp,
173 sources : gst_sdp_sources + gst_sdp_headers,
174 namespace : 'GstSdp',
175 nsversion : api_version,
176@@ -34,7 +34,9 @@ if build_gir
177 install : true,
178 extra_args : gst_gir_extra_args,
179 dependencies : rtsp_deps
180- )]
181+ )
182+
183+ sdp_gen_sources += [sdp_gir]
184 endif
185
186 sdp_dep = declare_dependency(link_with: gstsdp,
187diff --git a/gst-libs/gst/tag/meson.build b/gst-libs/gst/tag/meson.build
188index 27e66fd63..5ec37392a 100644
189--- a/gst-libs/gst/tag/meson.build
190+++ b/gst-libs/gst/tag/meson.build
191@@ -93,7 +93,7 @@ gsttag = library('gsttag-@0@'.format(api_version),
192
193 if build_gir
194 gst_gir_extra_args = gir_init_section + [ '--c-include=gst/tag/tag.h' ]
195- tag_gen_sources += [gnome.generate_gir(gsttag,
196+ tag_gir = gnome.generate_gir(gsttag,
197 sources : tag_sources + tag_headers + [gsttag_h] + [gsttag_c],
198 namespace : 'GstTag',
199 nsversion : api_version,
200@@ -104,7 +104,8 @@ if build_gir
201 install : true,
202 extra_args : gst_gir_extra_args,
203 dependencies : tag_deps
204- )]
205+ )
206+ tag_gen_sources += [tag_gir]
207 endif
208
209 tag_dep = declare_dependency(link_with: gsttag,
210diff --git a/gst-libs/gst/video/meson.build b/gst-libs/gst/video/meson.build
211index 5b35e1943..bf77aa157 100644
212--- a/gst-libs/gst/video/meson.build
213+++ b/gst-libs/gst/video/meson.build
214@@ -138,7 +138,7 @@ gstvideo = library('gstvideo-@0@'.format(api_version),
215
216 if build_gir
217 gst_gir_extra_args = gir_init_section + [ '--c-include=gst/video/video.h' ]
218- video_gen_sources += [gnome.generate_gir(gstvideo,
219+ video_gir = gnome.generate_gir(gstvideo,
220 sources : video_sources + video_headers + [gstvideo_c] + [gstvideo_h],
221 namespace : 'GstVideo',
222 nsversion : api_version,
223@@ -149,7 +149,8 @@ if build_gir
224 install : true,
225 extra_args : gst_gir_extra_args,
226 dependencies : gstvideo_deps
227- )]
228+ )
229+ video_gen_sources += [video_gir]
230 endif
231
232 video_dep = declare_dependency(link_with : gstvideo,
233--
2342.17.1
235
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
deleted file mode 100644
index 98ffdb1c10..0000000000
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-riff-add-missing-include-directories-when-calling-in.patch
+++ /dev/null
@@ -1,26 +0,0 @@
1From b9765efb1696e3e2e79f2955f759be199fe34882 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Mon, 26 Oct 2015 17:29:37 +0200
4Subject: [PATCH] riff: add missing include directories when calling
5 introspection scanner
6
7Upstream-Status: Pending [review on oe-core maillist]
8Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
9
10---
11 gst-libs/gst/riff/Makefile.am | 2 ++
12 1 file changed, 2 insertions(+)
13
14diff --git a/gst-libs/gst/riff/Makefile.am b/gst-libs/gst/riff/Makefile.am
15index c8c588a..c096453 100644
16--- a/gst-libs/gst/riff/Makefile.am
17+++ b/gst-libs/gst/riff/Makefile.am
18@@ -41,6 +41,8 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS)
19 # --strip-prefix=Gst \
20 # --warn-all \
21 # --c-include "gst/riff/riff.h" \
22+# -I$(top_srcdir)/gst-libs \
23+# -I$(top_builddir)/gst-libs \
24 # --add-include-path=$(builddir)/../tag \
25 # --add-include-path=$(builddir)/../audio \
26 # --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
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
deleted file mode 100644
index 97a0d68cfb..0000000000
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0004-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch
+++ /dev/null
@@ -1,25 +0,0 @@
1From 53b5868491cf99ee797192395dbfeb69df23edd2 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Mon, 26 Oct 2015 17:30:14 +0200
4Subject: [PATCH] rtsp: drop incorrect reference to gstreamer-sdp in
5 Makefile.am
6
7Upstream-Status: Pending [review on oe-core maillist]
8Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
9
10---
11 gst-libs/gst/rtsp/Makefile.am | 1 -
12 1 file changed, 1 deletion(-)
13
14diff --git a/gst-libs/gst/rtsp/Makefile.am b/gst-libs/gst/rtsp/Makefile.am
15index 79027cb..2987e23 100644
16--- a/gst-libs/gst/rtsp/Makefile.am
17+++ b/gst-libs/gst/rtsp/Makefile.am
18@@ -82,7 +82,6 @@ GstRtsp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERS
19 --pkg gio-2.0 \
20 --pkg gstreamer-@GST_API_VERSION@ \
21 --pkg gstreamer-base-@GST_API_VERSION@ \
22- --pkg gstreamer-sdp-@GST_API_VERSION@ \
23 --pkg-export gstreamer-rtsp-@GST_API_VERSION@ \
24 --add-init-section="$(INTROSPECTION_INIT)" \
25 --output $@ \
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
deleted file mode 100644
index 34f7c2284f..0000000000
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/link-with-libvchostif.patch
+++ /dev/null
@@ -1,45 +0,0 @@
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@@ -275,7 +275,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
deleted file mode 100644
index 23950b67f2..0000000000
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/make-gio_unix_2_0-dependency-configurable.patch
+++ /dev/null
@@ -1,45 +0,0 @@
1From 7ffa6e3d00e1d8a060f3f4c2bb9a72691af05d79 Mon Sep 17 00:00:00 2001
2From: Andre McCurdy <armccurdy@gmail.com>
3Date: Wed, 20 Jan 2016 13:00:00 -0800
4Subject: [PATCH] make gio_unix_2_0 dependency configurable
5
6Prior to 1.7.1, gst-plugins-base accepted a configure option to
7disable gio_unix_2_0, however it was implemented incorrectly using
8AG_GST_CHECK_FEATURE. That was fixed in 1.7.1 by making the
9dependency unconditional.
10
11 http://cgit.freedesktop.org/gstreamer/gst-plugins-base/commit/?id=aadefefba88afe4acbe64454650f24e7ce7c8d70
12
13To make builds deterministic, re-instate support for
14--disable-gio_unix_2_0, but implement it using the AC_ARG_ENABLE
15instead of AG_GST_CHECK_FEATURE.
16
17Upstream-Status: Pending
18
19Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
20
21---
22 configure.ac | 7 +++++++
23 1 file changed, 7 insertions(+)
24
25diff --git a/configure.ac b/configure.ac
26index 12807bc..35a0bf3 100644
27--- a/configure.ac
28+++ b/configure.ac
29@@ -806,9 +806,16 @@ AM_CONDITIONAL(HAVE_PNG, test "x$HAVE_PNG" = "xyes")
30 AM_CONDITIONAL(HAVE_JPEG, test "x$HAVE_JPEG" = "xyes")
31
32 dnl *** gio-unix-2.0 for tests/check/pipelines/tcp.c ***
33+AC_ARG_ENABLE([gio_unix_2_0],
34+ [AS_HELP_STRING([--disable-gio_unix_2_0],[disable use of gio_unix_2_0])],
35+ [],
36+ [enable_gio_unix_2_0=yes])
37+
38+if test "x${enable_gio_unix_2_0}" != "xno"; then
39 PKG_CHECK_MODULES(GIO_UNIX_2_0, gio-unix-2.0 >= 2.24,
40 HAVE_GIO_UNIX_2_0="yes",
41 HAVE_GIO_UNIX_2_0="no")
42+fi
43 AM_CONDITIONAL(USE_GIO_UNIX_2_0, test "x$HAVE_GIO_UNIX_2_0" = "xyes")
44
45 dnl *** finalize CFLAGS, LDFLAGS, LIBS
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.16.1.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.16.1.bb
index cb99fba5ff..7ce9238c4a 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.16.1.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.16.1.bb
@@ -1,4 +1,4 @@
1require gstreamer1.0-plugins.inc 1require gstreamer1.0-plugins-common.inc
2 2
3LICENSE = "GPLv2+ & LGPLv2+" 3LICENSE = "GPLv2+ & LGPLv2+"
4LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d \ 4LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d \
@@ -7,67 +7,88 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d \
7SRC_URI = " \ 7SRC_URI = " \
8 https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-${PV}.tar.xz \ 8 https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-${PV}.tar.xz \
9 file://get-caps-from-src-pad-when-query-caps.patch \ 9 file://get-caps-from-src-pad-when-query-caps.patch \
10 file://0001-meson-build-gir-even-when-cross-compiling-if-introsp.patch \
11 file://0002-meson-Add-variables-for-gir-files.patch \
10 file://0003-ssaparse-enhance-SSA-text-lines-parsing.patch \ 12 file://0003-ssaparse-enhance-SSA-text-lines-parsing.patch \
11 file://make-gio_unix_2_0-dependency-configurable.patch \
12 file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \
13 file://0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch \
14 file://0003-riff-add-missing-include-directories-when-calling-in.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 \ 13 file://0005-viv-fb-Make-sure-config.h-is-included.patch \
17 file://0009-glimagesink-Downrank-to-marginal.patch \ 14 file://0009-glimagesink-Downrank-to-marginal.patch \
18 file://0001-gstreamer-gl.pc.in-don-t-append-GL_CFLAGS-to-CFLAGS.patch \
19 file://link-with-libvchostif.patch \
20 " 15 "
21SRC_URI[md5sum] = "b5eb0651bab70bf1714f103bdd66ce47" 16SRC_URI[md5sum] = "b5eb0651bab70bf1714f103bdd66ce47"
22SRC_URI[sha256sum] = "5c3cc489933d0597087c9bc6ba251c93693d64554bcc563539a084fa2d5fcb2b" 17SRC_URI[sha256sum] = "5c3cc489933d0597087c9bc6ba251c93693d64554bcc563539a084fa2d5fcb2b"
23 18
24S = "${WORKDIR}/gst-plugins-base-${PV}" 19S = "${WORKDIR}/gst-plugins-base-${PV}"
25 20
26DEPENDS += "iso-codes util-linux" 21DEPENDS += "iso-codes util-linux zlib"
27 22
28inherit gettext gobject-introspection 23inherit gobject-introspection gtk-doc
29 24
30PACKAGES_DYNAMIC =+ "^libgst.*" 25PACKAGES_DYNAMIC =+ "^libgst.*"
31 26
32# opengl packageconfig factored out to make it easy for distros 27# opengl packageconfig factored out to make it easy for distros
33# and BSP layers to pick either (desktop) opengl, gles2, or no GL 28# and BSP layers to choose OpenGL APIs/platforms/window systems
34PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gles2 egl', '', d)}" 29PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gles2 egl', '', d)}"
35 30
36PACKAGECONFIG ??= " \ 31PACKAGECONFIG ??= " \
37 ${GSTREAMER_ORC} \ 32 ${GSTREAMER_ORC} \
38 ${PACKAGECONFIG_GL} \ 33 ${PACKAGECONFIG_GL} \
39 ${@bb.utils.filter('DISTRO_FEATURES', 'alsa x11', d)} \ 34 ${@bb.utils.filter('DISTRO_FEATURES', 'alsa x11', d)} \
40 gio-unix-2.0 jpeg ogg pango png theora vorbis zlib \ 35 jpeg ogg pango png theora vorbis \
41 ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland egl', '', d)} \ 36 ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland egl', '', d)} \
42" 37"
43 38
39OPENGL_APIS = 'opengl gles2'
40OPENGL_PLATFORMS = 'egl'
41OPENGL_WINSYS = 'x11 wayland gbm'
42
44X11DEPENDS = "virtual/libx11 libsm libxrender libxv" 43X11DEPENDS = "virtual/libx11 libsm libxrender libxv"
45X11ENABLEOPTS = "--enable-x --enable-xvideo --enable-xshm" 44X11ENABLEOPTS = "-Dx11=enabled -Dxvideo=enabled -Dxshm=enabled"
46X11DISABLEOPTS = "--disable-x --disable-xvideo --disable-xshm" 45X11DISABLEOPTS = "-Dx11=disabled -Dxvideo=disabled -Dxshm=disabled"
47 46
48PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib" 47PACKAGECONFIG[alsa] = "-Dalsa=enabled,-Dalsa=disabled,alsa-lib"
49PACKAGECONFIG[cdparanoia] = "--enable-cdparanoia,--disable-cdparanoia,cdparanoia" 48PACKAGECONFIG[cdparanoia] = "-Dcdparanoia=enabled,-Dcdparanoia=disabled,cdparanoia"
50PACKAGECONFIG[egl] = "--enable-egl,--disable-egl,virtual/egl" 49PACKAGECONFIG[jpeg] = "-Dgl-jpeg=enabled,-Dgl-jpeg=disabled,jpeg"
51PACKAGECONFIG[gbm] = "--enable-gbm,--disable-gbm,virtual/libgbm libgudev libdrm" 50PACKAGECONFIG[ogg] = "-Dogg=enabled,-Dogg=disabled,libogg"
52PACKAGECONFIG[gio-unix-2.0] = "--enable-gio_unix_2_0,--disable-gio_unix_2_0,glib-2.0" 51PACKAGECONFIG[opus] = "-Dopus=enabled,-Dopus=disabled,libopus"
53PACKAGECONFIG[gles2] = "--enable-gles2,--disable-gles2,virtual/libgles2" 52PACKAGECONFIG[pango] = "-Dpango=enabled,-Dpango=disabled,pango"
54PACKAGECONFIG[ivorbis] = "--enable-ivorbis,--disable-ivorbis,tremor" 53PACKAGECONFIG[png] = "-Dgl-png=enabled,-Dgl-png=disabled,libpng"
55PACKAGECONFIG[jpeg] = "--enable-jpeg,--disable-jpeg,jpeg" 54PACKAGECONFIG[theora] = "-Dtheora=enabled,-Dtheora=disabled,libtheora"
56PACKAGECONFIG[ogg] = "--enable-ogg,--disable-ogg,libogg" 55PACKAGECONFIG[tremor] = "-Dtremor=enabled,-Dtremor=disabled,tremor"
57PACKAGECONFIG[opengl] = "--enable-opengl,--disable-opengl,virtual/libgl libglu" 56PACKAGECONFIG[visual] = "-Dlibvisual=enabled,-Dlibvisual=disabled,libvisual"
58PACKAGECONFIG[opus] = "--enable-opus,--disable-opus,libopus" 57PACKAGECONFIG[vorbis] = "-Dvorbis=enabled,-Dvorbis=disabled,libvorbis"
59PACKAGECONFIG[pango] = "--enable-pango,--disable-pango,pango"
60PACKAGECONFIG[png] = "--enable-png,--disable-png,libpng"
61PACKAGECONFIG[theora] = "--enable-theora,--disable-theora,libtheora"
62PACKAGECONFIG[visual] = "--enable-libvisual,--disable-libvisual,libvisual"
63PACKAGECONFIG[vorbis] = "--enable-vorbis,--disable-vorbis,libvorbis"
64PACKAGECONFIG[x11] = "${X11ENABLEOPTS},${X11DISABLEOPTS},${X11DEPENDS}" 58PACKAGECONFIG[x11] = "${X11ENABLEOPTS},${X11DISABLEOPTS},${X11DEPENDS}"
65PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,wayland-native wayland wayland-protocols libdrm"
66PACKAGECONFIG[zlib] = "--enable-zlib,--disable-zlib,zlib"
67 59
68FILES_${PN}-dev += "${libdir}/gstreamer-${LIBV}/include/gst/gl/gstglconfig.h" 60# OpenGL API packageconfigs
61PACKAGECONFIG[opengl] = ",,virtual/libgl libglu"
62PACKAGECONFIG[gles2] = ",,virtual/libgles2"
63
64# OpenGL platform packageconfigs
65PACKAGECONFIG[egl] = ",,virtual/egl"
66
67# OpenGL window systems (except for X11)
68PACKAGECONFIG[gbm] = ",,virtual/libgbm libgudev libdrm"
69PACKAGECONFIG[wayland] = ",,wayland-native wayland wayland-protocols libdrm"
70
71EXTRA_OEMESON += " \
72 -Dgl-graphene=disabled \
73 ${@get_opengl_cmdline_list('gl_api', d.getVar('OPENGL_APIS'), d)} \
74 ${@get_opengl_cmdline_list('gl_platform', d.getVar('OPENGL_PLATFORMS'), d)} \
75 ${@get_opengl_cmdline_list('gl_winsys', d.getVar('OPENGL_WINSYS'), d)} \
76"
77
78GTKDOC_MESON_OPTION = "gtk_doc"
79GTKDOC_MESON_ENABLE_FLAG = "enabled"
80GTKDOC_MESON_DISABLE_FLAG = "disabled"
81
82FILES_${PN}-dev += "${libdir}/gstreamer-1.0/include/gst/gl/gstglconfig.h"
69FILES_${MLPREFIX}libgsttag-1.0 += "${datadir}/gst-plugins-base/1.0/license-translations.dict" 83FILES_${MLPREFIX}libgsttag-1.0 += "${datadir}/gst-plugins-base/1.0/license-translations.dict"
70 84
71do_compile_prepend() { 85def get_opengl_cmdline_list(switch_name, options, d):
72 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" 86 selected_options = []
73} 87 if bb.utils.contains('DISTRO_FEATURES', 'opengl', True, False, d):
88 for option in options.split():
89 if bb.utils.contains('PACKAGECONFIG', option, True, False, d):
90 selected_options += [option]
91 if selected_options:
92 return '-D' + switch_name + '=' + ','.join(selected_options)
93 else:
94 return ''
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-05-12 17:13:22 +0000