summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2016-03-09 17:02:02 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-03-12 22:11:45 +0000
commitac5cc0cee9edb9296c4bc066d6d91b8343d24a05 (patch)
tree5314492a1c0e3c809da1dddc24641df6d29212a6 /meta/recipes-multimedia
parent03cd714efc8aa949995ba6aea8e0d6d68d6c83b6 (diff)
downloadpoky-ac5cc0cee9edb9296c4bc066d6d91b8343d24a05.tar.gz
gstreamer: enable gobject introspection
(From OE-Core rev: e70ed487b0f489e4d62b69476d364d7de54b79e2) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia')
-rw-r--r--meta/recipes-multimedia/gstreamer/files/0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch42
-rw-r--r--meta/recipes-multimedia/gstreamer/gst-player_git.bb2
-rw-r--r--meta/recipes-multimedia/gstreamer/gst-plugins-package.inc1
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch57
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.6.3.bb1
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc4
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch168
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch298
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-riff-add-missing-include-directories-when-calling-in.patch28
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0004-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch27
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.6.3.bb4
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc11
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server.inc14
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server/0001-Don-t-hardcode-libtool-name-when-using-introspection.patch27
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0.inc13
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0_1.6.3.bb1
16 files changed, 693 insertions, 5 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
new file mode 100644
index 0000000000..2cab87f9ec
--- /dev/null
+++ b/meta/recipes-multimedia/gstreamer/files/0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch
@@ -0,0 +1,42 @@
1From 90916f96262fa7b27a0a99788c69f9fd6df11000 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Tue, 24 Nov 2015 16:46:27 +0200
4Subject: [PATCH] introspection.m4: prefix pkgconfig paths with
5 PKG_CONFIG_SYSROOT_DIR
6
7We can't use our tweaked introspection.m4 from gobject-introspection tarball
8because gstreamer also defines INTROSPECTION_INIT in its introspection.m4, which
9is later supplied to g-ir-scanner.
10
11Upstream-Status: Pending [review on oe-core list]
12Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
13---
14 common/m4/introspection.m4 | 12 ++++++------
15 1 file changed, 6 insertions(+), 6 deletions(-)
16
17diff --git a/common/m4/introspection.m4 b/common/m4/introspection.m4
18index 162be57..217a6ae 100644
19--- a/common/m4/introspection.m4
20+++ b/common/m4/introspection.m4
21@@ -54,14 +54,14 @@ m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL],
22 INTROSPECTION_GIRDIR=
23 INTROSPECTION_TYPELIBDIR=
24 if test "x$found_introspection" = "xyes"; then
25- INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
26- INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
27- INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
28+ INTROSPECTION_SCANNER=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
29+ INTROSPECTION_COMPILER=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
30+ INTROSPECTION_GENERATE=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
31 INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
32 INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
33 INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
34 INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
35- INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
36+ INTROSPECTION_MAKEFILE=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
37 INTROSPECTION_INIT="extern void gst_init(gint*,gchar**); gst_init(NULL,NULL);"
38 fi
39 AC_SUBST(INTROSPECTION_SCANNER)
40--
412.6.2
42
diff --git a/meta/recipes-multimedia/gstreamer/gst-player_git.bb b/meta/recipes-multimedia/gstreamer/gst-player_git.bb
index c6c8f360b8..8129169c53 100644
--- a/meta/recipes-multimedia/gstreamer/gst-player_git.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-player_git.bb
@@ -15,7 +15,7 @@ SRCREV = "5386c5b984d40ef5434673ed62204e69aaf52645"
15 15
16S = "${WORKDIR}/git" 16S = "${WORKDIR}/git"
17 17
18inherit autotools gtk-doc lib_package pkgconfig distro_features_check 18inherit autotools gtk-doc lib_package pkgconfig distro_features_check gobject-introspection
19 19
20ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}" 20ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}"
21 21
diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-package.inc b/meta/recipes-multimedia/gstreamer/gst-plugins-package.inc
index 9ffbe7c275..3cef1d3c8e 100644
--- a/meta/recipes-multimedia/gstreamer/gst-plugins-package.inc
+++ b/meta/recipes-multimedia/gstreamer/gst-plugins-package.inc
@@ -8,6 +8,7 @@ python split_gstreamer10_packages () {
8 8
9 do_split_packages(d, glibdir, '^lib(.*)\.so\.*', 'lib%s', 'gstreamer %s library', extra_depends='', allow_links=True) 9 do_split_packages(d, glibdir, '^lib(.*)\.so\.*', 'lib%s', 'gstreamer %s library', extra_depends='', allow_links=True)
10 do_split_packages(d, gst_libdir, 'libgst(.*)\.so$', d.expand('${PN}-%s'), 'GStreamer plugin for %s', postinst=postinst, extra_depends='') 10 do_split_packages(d, gst_libdir, 'libgst(.*)\.so$', d.expand('${PN}-%s'), 'GStreamer plugin for %s', postinst=postinst, extra_depends='')
11 do_split_packages(d, glibdir+'/girepository-1.0', 'Gst(.*)-1.0\.typelib$', d.expand('${PN}-%s-typelib'), 'GStreamer typelib file for %s', postinst=postinst, extra_depends='')
11 do_split_packages(d, gst_libdir, 'libgst(.*)\.la$', d.expand('${PN}-%s-dev'), 'GStreamer plugin for %s (development files)', extra_depends=d.expand('${PN}-dev')) 12 do_split_packages(d, gst_libdir, 'libgst(.*)\.la$', d.expand('${PN}-%s-dev'), 'GStreamer plugin for %s (development files)', extra_depends=d.expand('${PN}-dev'))
12 do_split_packages(d, gst_libdir, 'libgst(.*)\.a$', d.expand('${PN}-%s-staticdev'), 'GStreamer plugin for %s (static development files)', extra_depends=d.expand('${PN}-staticdev')) 13 do_split_packages(d, gst_libdir, 'libgst(.*)\.a$', d.expand('${PN}-%s-staticdev'), 'GStreamer plugin for %s (static development files)', extra_depends=d.expand('${PN}-staticdev'))
13} 14}
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch
new file mode 100644
index 0000000000..154d340e4e
--- /dev/null
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch
@@ -0,0 +1,57 @@
1From cff6fbf555a072408c21da1e818209c9d3814dd3 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Tue, 27 Oct 2015 14:36:58 +0200
4Subject: [PATCH] Makefile.am: don't hardcode libtool name when running
5 introspection tools
6
7Upstream-Status: Pending [review on oe-core list]
8Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
9
10---
11 gst-libs/gst/gl/Makefile.am | 2 +-
12 gst-libs/gst/insertbin/Makefile.am | 2 +-
13 gst-libs/gst/mpegts/Makefile.am | 2 +-
14 3 files changed, 3 insertions(+), 3 deletions(-)
15
16diff --git a/gst-libs/gst/gl/Makefile.am b/gst-libs/gst/gl/Makefile.am
17index f968357..7cc2c7a 100644
18--- a/gst-libs/gst/gl/Makefile.am
19+++ b/gst-libs/gst/gl/Makefile.am
20@@ -149,7 +149,7 @@ GstGL-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstgl-@GST_API_VERSION@
21 --library=libgstgl-@GST_API_VERSION@.la \
22 --include=Gst-@GST_API_VERSION@ \
23 --include=GstBase-@GST_API_VERSION@ \
24- --libtool="$(top_builddir)/libtool" \
25+ --libtool="$(LIBTOOL)" \
26 --pkg gstreamer-@GST_API_VERSION@ \
27 --pkg gstreamer-base-@GST_API_VERSION@ \
28 --pkg gstreamer-video-@GST_API_VERSION@ \
29diff --git a/gst-libs/gst/insertbin/Makefile.am b/gst-libs/gst/insertbin/Makefile.am
30index 09eb97c..b746885 100644
31--- a/gst-libs/gst/insertbin/Makefile.am
32+++ b/gst-libs/gst/insertbin/Makefile.am
33@@ -43,7 +43,7 @@ GstInsertBin-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstinsertbin-@GS
34 --library=libgstinsertbin-@GST_API_VERSION@.la \
35 --include=Gst-@GST_API_VERSION@ \
36 --include=GstBase-@GST_API_VERSION@ \
37- --libtool="$(top_builddir)/libtool" \
38+ --libtool="$(LIBTOOL)" \
39 --pkg gstreamer-@GST_API_VERSION@ \
40 --pkg gstreamer-base-@GST_API_VERSION@ \
41 --pkg-export gstreamer-insertbin-@GST_API_VERSION@ \
42diff --git a/gst-libs/gst/mpegts/Makefile.am b/gst-libs/gst/mpegts/Makefile.am
43index 2511d49..c1cbce6 100644
44--- a/gst-libs/gst/mpegts/Makefile.am
45+++ b/gst-libs/gst/mpegts/Makefile.am
46@@ -78,7 +78,7 @@ GstMpegts-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstmpegts-@GST_API_
47 --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-video-@GST_API_VERSION@` \
48 --library=libgstmpegts-@GST_API_VERSION@.la \
49 --include=Gst-@GST_API_VERSION@ \
50- --libtool="$(top_builddir)/libtool" \
51+ --libtool="$(LIBTOOL)" \
52 --pkg gstreamer-@GST_API_VERSION@ \
53 --pkg gstreamer-video-@GST_API_VERSION@ \
54 --pkg-export gstreamer-mpegts-@GST_API_VERSION@ \
55--
562.6.2
57
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.6.3.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.6.3.bb
index 8eb47c265f..323177b35a 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.6.3.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.6.3.bb
@@ -20,6 +20,7 @@ SRC_URI = " \
20 file://configure-allow-to-disable-libssh2.patch \ 20 file://configure-allow-to-disable-libssh2.patch \
21 file://0001-glimagesink-Downrank-to-marginal.patch \ 21 file://0001-glimagesink-Downrank-to-marginal.patch \
22 file://0002-glplugin-glwindow-fix-memory-leak-of-navigation-thre.patch \ 22 file://0002-glplugin-glwindow-fix-memory-leak-of-navigation-thre.patch \
23 file://0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch \
23" 24"
24 25
25SRC_URI[md5sum] = "4857adcafe41e4b9b8805cf88303bd55" 26SRC_URI[md5sum] = "4857adcafe41e4b9b8805cf88303bd55"
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc
index f75efeaa25..240ee5f6ab 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc
@@ -35,3 +35,7 @@ EXTRA_OECONF += " \
35CACHED_CONFIGUREVARS_append_x86 = " ac_cv_header_emmintrin_h=no ac_cv_header_xmmintrin_h=no" 35CACHED_CONFIGUREVARS_append_x86 = " ac_cv_header_emmintrin_h=no ac_cv_header_xmmintrin_h=no"
36 36
37FILES_${MLPREFIX}libgsttag-1.0 += "${datadir}/gst-plugins-base/1.0/license-translations.dict" 37FILES_${MLPREFIX}libgsttag-1.0 += "${datadir}/gst-plugins-base/1.0/license-translations.dict"
38
39do_compile_prepend() {
40 export GIR_EXTRA_LIBS_PATH="${B}/gst-libs/gst/tag/.libs:${B}/gst-libs/gst/video/.libs:${B}/gst-libs/gst/audio/.libs"
41}
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
new file mode 100644
index 0000000000..781e4d8012
--- /dev/null
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch
@@ -0,0 +1,168 @@
1From f1d9652351e7754c63003104eceb526af424c7e0 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Fri, 20 Nov 2015 16:53:04 +0200
4Subject: [PATCH 1/4] 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>
9---
10 gst-libs/gst/allocators/Makefile.am | 2 +-
11 gst-libs/gst/app/Makefile.am | 2 +-
12 gst-libs/gst/audio/Makefile.am | 2 +-
13 gst-libs/gst/fft/Makefile.am | 2 +-
14 gst-libs/gst/pbutils/Makefile.am | 2 +-
15 gst-libs/gst/riff/Makefile.am | 2 +-
16 gst-libs/gst/rtp/Makefile.am | 2 +-
17 gst-libs/gst/rtsp/Makefile.am | 2 +-
18 gst-libs/gst/sdp/Makefile.am | 2 +-
19 gst-libs/gst/tag/Makefile.am | 2 +-
20 gst-libs/gst/video/Makefile.am | 2 +-
21 11 files changed, 11 insertions(+), 11 deletions(-)
22
23diff --git a/gst-libs/gst/allocators/Makefile.am b/gst-libs/gst/allocators/Makefile.am
24index 9361bf9..bc7f53a 100644
25--- a/gst-libs/gst/allocators/Makefile.am
26+++ b/gst-libs/gst/allocators/Makefile.am
27@@ -37,7 +37,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@` \
29 --library=libgstallocators-@GST_API_VERSION@.la \
30 --include=Gst-@GST_API_VERSION@ \
31- --libtool="$(top_builddir)/libtool" \
32+ --libtool="$(LIBTOOL)" \
33 --pkg gstreamer-@GST_API_VERSION@ \
34 --pkg-export gstreamer-allocators-@GST_API_VERSION@ \
35 --output $@ \
36diff --git a/gst-libs/gst/app/Makefile.am b/gst-libs/gst/app/Makefile.am
37index 6d6de8d..dcc2fe0 100644
38--- a/gst-libs/gst/app/Makefile.am
39+++ b/gst-libs/gst/app/Makefile.am
40@@ -52,7 +52,7 @@ GstApp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstapp-@GST_API_VERSIO
41 --library=libgstapp-@GST_API_VERSION@.la \
42 --include=Gst-@GST_API_VERSION@ \
43 --include=GstBase-@GST_API_VERSION@ \
44- --libtool="$(top_builddir)/libtool" \
45+ --libtool="$(LIBTOOL)" \
46 --pkg gstreamer-@GST_API_VERSION@ \
47 --pkg gstreamer-base-@GST_API_VERSION@ \
48 --pkg-export gstreamer-app-@GST_API_VERSION@ \
49diff --git a/gst-libs/gst/audio/Makefile.am b/gst-libs/gst/audio/Makefile.am
50index 275d222..2374196 100644
51--- a/gst-libs/gst/audio/Makefile.am
52+++ b/gst-libs/gst/audio/Makefile.am
53@@ -106,7 +106,7 @@ GstAudio-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstaudio-@GST_API_VE
54 --include=Gst-@GST_API_VERSION@ \
55 --include=GstBase-@GST_API_VERSION@ \
56 --include=GstTag-@GST_API_VERSION@ \
57- --libtool="$(top_builddir)/libtool" \
58+ --libtool="$(LIBTOOL)" \
59 --pkg gstreamer-@GST_API_VERSION@ \
60 --pkg gstreamer-base-@GST_API_VERSION@ \
61 --pkg-export gstreamer-audio-@GST_API_VERSION@ \
62diff --git a/gst-libs/gst/fft/Makefile.am b/gst-libs/gst/fft/Makefile.am
63index 09b3d68..f545354 100644
64--- a/gst-libs/gst/fft/Makefile.am
65+++ b/gst-libs/gst/fft/Makefile.am
66@@ -64,7 +64,7 @@ GstFft-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstfft-@GST_API_VERSIO
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@ \
70- --libtool="$(top_builddir)/libtool" \
71+ --libtool="$(LIBTOOL)" \
72 --pkg gstreamer-@GST_API_VERSION@ \
73 --pkg-export gstreamer-fft-@GST_API_VERSION@ \
74 --output $@ \
75diff --git a/gst-libs/gst/pbutils/Makefile.am b/gst-libs/gst/pbutils/Makefile.am
76index 64d5eb0..91dc214 100644
77--- a/gst-libs/gst/pbutils/Makefile.am
78+++ b/gst-libs/gst/pbutils/Makefile.am
79@@ -94,7 +94,7 @@ GstPbutils-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstpbutils-@GST_AP
80 --include=GstTag-@GST_API_VERSION@ \
81 --include=GstVideo-@GST_API_VERSION@ \
82 --include=GstAudio-@GST_API_VERSION@ \
83- --libtool="$(top_builddir)/libtool" \
84+ --libtool="$(LIBTOOL)" \
85 --pkg gstreamer-@GST_API_VERSION@ \
86 --pkg gstreamer-tag-@GST_API_VERSION@ \
87 --pkg gstreamer-video-@GST_API_VERSION@ \
88diff --git a/gst-libs/gst/riff/Makefile.am b/gst-libs/gst/riff/Makefile.am
89index 83d83cb..3bd8fc0 100644
90--- a/gst-libs/gst/riff/Makefile.am
91+++ b/gst-libs/gst/riff/Makefile.am
92@@ -47,7 +47,7 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS)
93 # --include=GstAudio-@GST_API_VERSION@ \
94 # --include=GstTag-@GST_API_VERSION@ \
95 # --include=Gst-@GST_API_VERSION@ \
96-# --libtool="$(top_builddir)/libtool" \
97+# --libtool="$(LIBTOOL)" \
98 # --pkg gstreamer-@GST_API_VERSION@ \
99 # --pkg gstreamer-tag-@GST_API_VERSION@ \
100 # --pkg gstreamer-audio-@GST_API_VERSION@ \
101diff --git a/gst-libs/gst/rtp/Makefile.am b/gst-libs/gst/rtp/Makefile.am
102index fdd01c1..f5445c1 100644
103--- a/gst-libs/gst/rtp/Makefile.am
104+++ b/gst-libs/gst/rtp/Makefile.am
105@@ -64,7 +64,7 @@ GstRtp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtp-@GST_API_VERSIO
106 --library=libgstrtp-@GST_API_VERSION@.la \
107 --include=Gst-@GST_API_VERSION@ \
108 --include=GstBase-@GST_API_VERSION@ \
109- --libtool="$(top_builddir)/libtool" \
110+ --libtool="$(LIBTOOL)" \
111 --pkg gstreamer-@GST_API_VERSION@ \
112 --pkg gstreamer-base-@GST_API_VERSION@ \
113 --pkg-export gstreamer-rtp-@GST_API_VERSION@ \
114diff --git a/gst-libs/gst/rtsp/Makefile.am b/gst-libs/gst/rtsp/Makefile.am
115index ede5706..9b0b258 100644
116--- a/gst-libs/gst/rtsp/Makefile.am
117+++ b/gst-libs/gst/rtsp/Makefile.am
118@@ -71,7 +71,7 @@ GstRtsp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERS
119 --include=Gio-2.0 \
120 --include=Gst-@GST_API_VERSION@ \
121 --include=GstSdp-@GST_API_VERSION@ \
122- --libtool="$(top_builddir)/libtool" \
123+ --libtool="$(LIBTOOL)" \
124 --pkg gio-2.0 \
125 --pkg gstreamer-@GST_API_VERSION@ \
126 --pkg gstreamer-sdp-@GST_API_VERSION@ \
127diff --git a/gst-libs/gst/sdp/Makefile.am b/gst-libs/gst/sdp/Makefile.am
128index a90f30b..0e149b8 100644
129--- a/gst-libs/gst/sdp/Makefile.am
130+++ b/gst-libs/gst/sdp/Makefile.am
131@@ -31,7 +31,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@` \
133 --library=libgstsdp-@GST_API_VERSION@.la \
134 --include=Gst-@GST_API_VERSION@ \
135- --libtool="$(top_builddir)/libtool" \
136+ --libtool="$(LIBTOOL)" \
137 --pkg gstreamer-@GST_API_VERSION@ \
138 --pkg-export gstreamer-sdp-@GST_API_VERSION@ \
139 --output $@ \
140diff --git a/gst-libs/gst/tag/Makefile.am b/gst-libs/gst/tag/Makefile.am
141index c534a4d..cafafd3 100644
142--- a/gst-libs/gst/tag/Makefile.am
143+++ b/gst-libs/gst/tag/Makefile.am
144@@ -44,7 +44,7 @@ GstTag-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgsttag-@GST_API_VERSIO
145 --library=libgsttag-@GST_API_VERSION@.la \
146 --include=Gst-@GST_API_VERSION@ \
147 --include=GstBase-@GST_API_VERSION@ \
148- --libtool="$(top_builddir)/libtool" \
149+ --libtool="$(LIBTOOL)" \
150 --pkg gstreamer-@GST_API_VERSION@ \
151 --pkg gstreamer-base-@GST_API_VERSION@ \
152 --pkg-export gstreamer-tag-@GST_API_VERSION@ \
153diff --git a/gst-libs/gst/video/Makefile.am b/gst-libs/gst/video/Makefile.am
154index 5d31fa1..ac64eb3 100644
155--- a/gst-libs/gst/video/Makefile.am
156+++ b/gst-libs/gst/video/Makefile.am
157@@ -113,7 +113,7 @@ GstVideo-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstvideo-@GST_API_VE
158 --library=libgstvideo-@GST_API_VERSION@.la \
159 --include=Gst-@GST_API_VERSION@ \
160 --include=GstBase-@GST_API_VERSION@ \
161- --libtool="$(top_builddir)/libtool" \
162+ --libtool="$(LIBTOOL)" \
163 --pkg gstreamer-@GST_API_VERSION@ \
164 --pkg gstreamer-base-@GST_API_VERSION@ \
165 --pkg-export gstreamer-video-@GST_API_VERSION@ \
166--
1672.6.2
168
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
new file mode 100644
index 0000000000..85fcacb555
--- /dev/null
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch
@@ -0,0 +1,298 @@
1From 990b653c7b6de1937ec759019982d6c5f15770f7 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Mon, 26 Oct 2015 16:38:18 +0200
4Subject: [PATCH 2/4] 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>
9---
10 gst-libs/gst/allocators/Makefile.am | 4 ++--
11 gst-libs/gst/app/Makefile.am | 4 ++--
12 gst-libs/gst/audio/Makefile.am | 12 ++++++------
13 gst-libs/gst/fft/Makefile.am | 4 ++--
14 gst-libs/gst/pbutils/Makefile.am | 12 ++++++------
15 gst-libs/gst/riff/Makefile.am | 8 ++++----
16 gst-libs/gst/rtp/Makefile.am | 8 ++++----
17 gst-libs/gst/rtsp/Makefile.am | 4 ++--
18 gst-libs/gst/sdp/Makefile.am | 4 ++--
19 gst-libs/gst/tag/Makefile.am | 8 ++++----
20 gst-libs/gst/video/Makefile.am | 8 ++++----
21 11 files changed, 38 insertions(+), 38 deletions(-)
22
23diff --git a/gst-libs/gst/allocators/Makefile.am b/gst-libs/gst/allocators/Makefile.am
24index bc7f53a..0ef5f86 100644
25--- a/gst-libs/gst/allocators/Makefile.am
26+++ b/gst-libs/gst/allocators/Makefile.am
27@@ -34,7 +34,7 @@ GstAllocators-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstallocators-@
28 --c-include "gst/allocators/allocators.h" \
29 -I$(top_srcdir)/gst-libs \
30 -I$(top_builddir)/gst-libs \
31- --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
32+ --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
33 --library=libgstallocators-@GST_API_VERSION@.la \
34 --include=Gst-@GST_API_VERSION@ \
35 --libtool="$(LIBTOOL)" \
36@@ -58,7 +58,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
37 $(INTROSPECTION_COMPILER) \
38 --includedir=$(srcdir) \
39 --includedir=$(builddir) \
40- --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
41+ --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
42 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
43
44 CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA)
45diff --git a/gst-libs/gst/app/Makefile.am b/gst-libs/gst/app/Makefile.am
46index dcc2fe0..dc076cb 100644
47--- a/gst-libs/gst/app/Makefile.am
48+++ b/gst-libs/gst/app/Makefile.am
49@@ -47,8 +47,8 @@ GstApp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstapp-@GST_API_VERSIO
50 --c-include "gst/app/app.h" \
51 -I$(top_srcdir)/gst-libs \
52 -I$(top_builddir)/gst-libs \
53- --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
54- --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
55+ --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
56+ --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
57 --library=libgstapp-@GST_API_VERSION@.la \
58 --include=Gst-@GST_API_VERSION@ \
59 --include=GstBase-@GST_API_VERSION@ \
60diff --git a/gst-libs/gst/audio/Makefile.am b/gst-libs/gst/audio/Makefile.am
61index 2374196..295eb42 100644
62--- a/gst-libs/gst/audio/Makefile.am
63+++ b/gst-libs/gst/audio/Makefile.am
64@@ -96,12 +96,12 @@ GstAudio-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstaudio-@GST_API_VE
65 -I$(top_srcdir)/gst-libs \
66 -I$(top_builddir)/gst-libs \
67 --c-include "gst/audio/audio.h" \
68- --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
69- --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
70+ --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
71+ --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
72 --add-include-path="$(top_builddir)/gst-libs/gst/tag/" \
73 --library=libgstaudio-@GST_API_VERSION@.la \
74- --library-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=libdir gstreamer-@GST_API_VERSION@` \
75- --library-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=libdir gstreamer-base-@GST_API_VERSION@` \
76+ --library-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=libdir gstreamer-@GST_API_VERSION@` \
77+ --library-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=libdir gstreamer-base-@GST_API_VERSION@` \
78 --library-path="$(top_builddir)/gst-libs/gst/tag/" \
79 --include=Gst-@GST_API_VERSION@ \
80 --include=GstBase-@GST_API_VERSION@ \
81@@ -130,8 +130,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
82 --includedir=$(srcdir) \
83 --includedir=$(builddir) \
84 --includedir="$(top_builddir)/gst-libs/gst/tag/" \
85- --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
86- --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
87+ --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
88+ --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
89 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
90
91 CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
92diff --git a/gst-libs/gst/fft/Makefile.am b/gst-libs/gst/fft/Makefile.am
93index f545354..1bb6243 100644
94--- a/gst-libs/gst/fft/Makefile.am
95+++ b/gst-libs/gst/fft/Makefile.am
96@@ -61,7 +61,7 @@ GstFft-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstfft-@GST_API_VERSIO
97 --c-include "gst/fft/fft.h" \
98 -I$(top_srcdir)/gst-libs \
99 -I$(top_builddir)/gst-libs \
100- --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@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@` \
102 --library=libgstfft-@GST_API_VERSION@.la \
103 --include=Gst-@GST_API_VERSION@ \
104 --libtool="$(LIBTOOL)" \
105@@ -85,7 +85,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
106 $(INTROSPECTION_COMPILER) \
107 --includedir=$(srcdir) \
108 --includedir=$(builddir) \
109- --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
110+ --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
111 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
112
113 CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA)
114diff --git a/gst-libs/gst/pbutils/Makefile.am b/gst-libs/gst/pbutils/Makefile.am
115index 91dc214..dc8e1d3 100644
116--- a/gst-libs/gst/pbutils/Makefile.am
117+++ b/gst-libs/gst/pbutils/Makefile.am
118@@ -79,14 +79,14 @@ GstPbutils-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstpbutils-@GST_AP
119 --c-include "gst/pbutils/pbutils.h" \
120 -I$(top_srcdir)/gst-libs \
121 -I$(top_builddir)/gst-libs \
122- --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
123- --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
124+ --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
125+ --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
126 --add-include-path="$(top_builddir)/gst-libs/gst/tag/" \
127 --add-include-path="$(top_builddir)/gst-libs/gst/video/" \
128 --add-include-path="$(top_builddir)/gst-libs/gst/audio/" \
129 --library=libgstpbutils-@GST_API_VERSION@.la \
130- --library-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=libdir gstreamer-@GST_API_VERSION@` \
131- --library-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=libdir gstreamer-base-@GST_API_VERSION@` \
132+ --library-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=libdir gstreamer-@GST_API_VERSION@` \
133+ --library-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=libdir gstreamer-base-@GST_API_VERSION@` \
134 --library-path="$(top_builddir)/gst-libs/gst/tag/" \
135 --library-path="$(top_builddir)/gst-libs/gst/video/" \
136 --library-path="$(top_builddir)/gst-libs/gst/audio/" \
137@@ -119,8 +119,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
138 $(INTROSPECTION_COMPILER) \
139 --includedir=$(srcdir) \
140 --includedir=$(builddir) \
141- --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
142- --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
143+ --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
144+ --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
145 --includedir="$(top_builddir)/gst-libs/gst/tag/" \
146 --includedir="$(top_builddir)/gst-libs/gst/video/" \
147 --includedir="$(top_builddir)/gst-libs/gst/audio/" \
148diff --git a/gst-libs/gst/riff/Makefile.am b/gst-libs/gst/riff/Makefile.am
149index 3bd8fc0..0a115cc 100644
150--- a/gst-libs/gst/riff/Makefile.am
151+++ b/gst-libs/gst/riff/Makefile.am
152@@ -41,8 +41,8 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS)
153 # --c-include "gst/riff/riff.h" \
154 # --add-include-path=$(builddir)/../tag \
155 # --add-include-path=$(builddir)/../audio \
156-# --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
157-# --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
158+# --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
159+# --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
160 # --library=libgstriff-@GST_API_VERSION@.la \
161 # --include=GstAudio-@GST_API_VERSION@ \
162 # --include=GstTag-@GST_API_VERSION@ \
163@@ -73,8 +73,8 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS)
164 # --includedir=$(builddir) \
165 # --includedir=$(builddir)/../tag \
166 # --includedir=$(builddir)/../audio \
167-# --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
168-# --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
169+# --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
170+# --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
171 # $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
172 #
173 #CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA)
174diff --git a/gst-libs/gst/rtp/Makefile.am b/gst-libs/gst/rtp/Makefile.am
175index f5445c1..527c0b4 100644
176--- a/gst-libs/gst/rtp/Makefile.am
177+++ b/gst-libs/gst/rtp/Makefile.am
178@@ -59,8 +59,8 @@ GstRtp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtp-@GST_API_VERSIO
179 --c-include "gst/rtp/rtp.h" \
180 -I$(top_builddir)/gst-libs \
181 -I$(top_srcdir)/gst-libs \
182- --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
183- --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
184+ --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
185+ --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
186 --library=libgstrtp-@GST_API_VERSION@.la \
187 --include=Gst-@GST_API_VERSION@ \
188 --include=GstBase-@GST_API_VERSION@ \
189@@ -87,8 +87,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
190 $(INTROSPECTION_COMPILER) \
191 --includedir=$(srcdir) \
192 --includedir=$(builddir) \
193- --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
194- --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
195+ --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
196+ --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
197 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
198
199 CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
200diff --git a/gst-libs/gst/rtsp/Makefile.am b/gst-libs/gst/rtsp/Makefile.am
201index 9b0b258..4f6d9f8 100644
202--- a/gst-libs/gst/rtsp/Makefile.am
203+++ b/gst-libs/gst/rtsp/Makefile.am
204@@ -66,7 +66,7 @@ GstRtsp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERS
205 -I$(top_builddir)/gst-libs \
206 -I$(top_srcdir)/gst-libs \
207 --add-include-path=$(builddir)/../sdp \
208- --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
209+ --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
210 --library=libgstrtsp-@GST_API_VERSION@.la \
211 --include=Gio-2.0 \
212 --include=Gst-@GST_API_VERSION@ \
213@@ -96,7 +96,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
214 --includedir=$(srcdir) \
215 --includedir=$(builddir) \
216 --includedir=$(builddir)/../sdp \
217- --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
218+ --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
219 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
220
221 CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
222diff --git a/gst-libs/gst/sdp/Makefile.am b/gst-libs/gst/sdp/Makefile.am
223index 0e149b8..9aa0512 100644
224--- a/gst-libs/gst/sdp/Makefile.am
225+++ b/gst-libs/gst/sdp/Makefile.am
226@@ -28,7 +28,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@@ -52,7 +52,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 cafafd3..ba99279 100644
246--- a/gst-libs/gst/tag/Makefile.am
247+++ b/gst-libs/gst/tag/Makefile.am
248@@ -39,8 +39,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@@ -67,8 +67,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 ac64eb3..342c8c6 100644
272--- a/gst-libs/gst/video/Makefile.am
273+++ b/gst-libs/gst/video/Makefile.am
274@@ -108,8 +108,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@@ -136,8 +136,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)
296--
2972.6.2
298
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
new file mode 100644
index 0000000000..9b66f7f49d
--- /dev/null
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-riff-add-missing-include-directories-when-calling-in.patch
@@ -0,0 +1,28 @@
1From 3c2c2d5dd08aa30ed0e8acd8566ec99412bb8209 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 3/4] 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 gst-libs/gst/riff/Makefile.am | 2 ++
11 1 file changed, 2 insertions(+)
12
13diff --git a/gst-libs/gst/riff/Makefile.am b/gst-libs/gst/riff/Makefile.am
14index 0a115cc..5057a58 100644
15--- a/gst-libs/gst/riff/Makefile.am
16+++ 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 # --strip-prefix=Gst \
19 # --warn-all \
20 # --c-include "gst/riff/riff.h" \
21+# -I$(top_srcdir)/gst-libs \
22+# -I$(top_builddir)/gst-libs \
23 # --add-include-path=$(builddir)/../tag \
24 # --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--
272.6.2
28
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
new file mode 100644
index 0000000000..42d99c1db9
--- /dev/null
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0004-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch
@@ -0,0 +1,27 @@
1From 4330915d88dc4dd46eb4c28d756482b767c2747f 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 4/4] 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 gst-libs/gst/rtsp/Makefile.am | 1 -
11 1 file changed, 1 deletion(-)
12
13diff --git a/gst-libs/gst/rtsp/Makefile.am b/gst-libs/gst/rtsp/Makefile.am
14index 4f6d9f8..0afa370 100644
15--- a/gst-libs/gst/rtsp/Makefile.am
16+++ b/gst-libs/gst/rtsp/Makefile.am
17@@ -74,7 +74,6 @@ GstRtsp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERS
18 --libtool="$(LIBTOOL)" \
19 --pkg gio-2.0 \
20 --pkg gstreamer-@GST_API_VERSION@ \
21- --pkg gstreamer-sdp-@GST_API_VERSION@ \
22 --pkg-export gstreamer-rtsp-@GST_API_VERSION@ \
23 --add-init-section="$(INTROSPECTION_INIT)" \
24 --output $@ \
25--
262.6.2
27
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.6.3.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.6.3.bb
index 429dc9338f..287d287d70 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.6.3.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.6.3.bb
@@ -17,6 +17,10 @@ SRC_URI = " \
17 file://0004-subparse-set-need_segment-after-sink-pad-received-GS.patch \ 17 file://0004-subparse-set-need_segment-after-sink-pad-received-GS.patch \
18 file://encodebin-Need-more-buffers-in-output-queue-for-bett.patch \ 18 file://encodebin-Need-more-buffers-in-output-queue-for-bett.patch \
19 file://0005-convertframe-Support-video-crop-when-convert-frame.patch \ 19 file://0005-convertframe-Support-video-crop-when-convert-frame.patch \
20 file://0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch \
21 file://0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch \
22 file://0003-riff-add-missing-include-directories-when-calling-in.patch \
23 file://0004-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch \
20" 24"
21 25
22SRC_URI[md5sum] = "3ddde0ad598ef69f58d6a2e87f8b460f" 26SRC_URI[md5sum] = "3ddde0ad598ef69f58d6a2e87f8b460f"
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc
index 18ed6cf266..128a1fe819 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc
@@ -5,7 +5,7 @@ SECTION = "multimedia"
5 5
6DEPENDS = "gstreamer1.0 glib-2.0-native" 6DEPENDS = "gstreamer1.0 glib-2.0-native"
7 7
8inherit autotools pkgconfig gettext upstream-version-is-even 8inherit autotools pkgconfig gettext upstream-version-is-even gobject-introspection
9 9
10acpaths = "-I ${S}/common/m4 -I ${S}/m4" 10acpaths = "-I ${S}/common/m4 -I ${S}/m4"
11 11
@@ -28,4 +28,13 @@ EXTRA_OECONF = " \
28 --disable-examples \ 28 --disable-examples \
29" 29"
30 30
31SRC_URI_append = " file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch"
32
33delete_pkg_m4_file() {
34 # This m4 file is out of date and is missing PKG_CONFIG_SYSROOT_PATH tweaks which we need for introspection
35 rm "${S}/common/m4/pkg.m4" || true
36}
37
38do_configure[prefuncs] += " delete_pkg_m4_file"
39
31PACKAGES_DYNAMIC = "^${PN}-.*" 40PACKAGES_DYNAMIC = "^${PN}-.*"
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server.inc
index 608842adc6..ae6d36477b 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server.inc
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server.inc
@@ -7,8 +7,18 @@ DEPENDS = "gstreamer1.0 libcgroup gstreamer1.0-plugins-base"
7 7
8PNREAL = "gst-rtsp-server" 8PNREAL = "gst-rtsp-server"
9 9
10SRC_URI = "http://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${PV}.tar.xz" 10SRC_URI = "http://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${PV}.tar.xz \
11 file://0001-Don-t-hardcode-libtool-name-when-using-introspection.patch \
12 file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch"
11 13
12S = "${WORKDIR}/${PNREAL}-${PV}" 14S = "${WORKDIR}/${PNREAL}-${PV}"
13 15
14inherit autotools pkgconfig upstream-version-is-even 16inherit autotools pkgconfig upstream-version-is-even gobject-introspection
17
18delete_pkg_m4_file() {
19 # This m4 file is out of date and is missing PKG_CONFIG_SYSROOT_PATH tweaks which we need for introspection
20 rm "${S}/common/m4/pkg.m4" || true
21}
22
23do_configure[prefuncs] += " delete_pkg_m4_file"
24
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server/0001-Don-t-hardcode-libtool-name-when-using-introspection.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server/0001-Don-t-hardcode-libtool-name-when-using-introspection.patch
new file mode 100644
index 0000000000..89d6384adb
--- /dev/null
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server/0001-Don-t-hardcode-libtool-name-when-using-introspection.patch
@@ -0,0 +1,27 @@
1From 4a12569e5ae5be63cd92a9b178860026a99746b1 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Tue, 27 Oct 2015 16:55:45 +0200
4Subject: [PATCH] Don't hardcode libtool name when using introspection
5
6Upstream-Status: Pending [review on oe-core maillist]
7Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
8---
9 gst/rtsp-server/Makefile.am | 2 +-
10 1 file changed, 1 insertion(+), 1 deletion(-)
11
12diff --git a/gst/rtsp-server/Makefile.am b/gst/rtsp-server/Makefile.am
13index 4fcd366..c67f5ab 100644
14--- a/gst/rtsp-server/Makefile.am
15+++ b/gst/rtsp-server/Makefile.am
16@@ -87,7 +87,7 @@ GstRtspServer-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtspserver-@
17 --include=Gst-@GST_API_VERSION@ \
18 --include=GstRtsp-@GST_API_VERSION@ \
19 --include=GstNet-@GST_API_VERSION@ \
20- --libtool="$(top_builddir)/libtool" \
21+ --libtool="$(LIBTOOL)" \
22 --pkg gstreamer-@GST_API_VERSION@ \
23 --pkg gstreamer-rtsp-@GST_API_VERSION@ \
24 --pkg gstreamer-net-@GST_API_VERSION@ \
25--
262.1.4
27
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0.inc
index 5c212e6a56..e8f29ca549 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0.inc
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0.inc
@@ -8,7 +8,7 @@ LICENSE = "LGPLv2+"
8 8
9DEPENDS = "glib-2.0 glib-2.0-native libcap libxml2 bison-native flex-native" 9DEPENDS = "glib-2.0 glib-2.0-native libcap libxml2 bison-native flex-native"
10 10
11inherit autotools pkgconfig gettext upstream-version-is-even 11inherit autotools pkgconfig gettext upstream-version-is-even gobject-introspection
12 12
13PACKAGECONFIG ??= "" 13PACKAGECONFIG ??= ""
14 14
@@ -37,3 +37,14 @@ FILES_${PN}-bash-completion += "${datadir}/bash-completion/completions/ ${datadi
37 37
38RRECOMMENDS_${PN}_qemux86 += "kernel-module-snd-ens1370 kernel-module-snd-rawmidi" 38RRECOMMENDS_${PN}_qemux86 += "kernel-module-snd-ens1370 kernel-module-snd-rawmidi"
39RRECOMMENDS_${PN}_qemux86-64 += "kernel-module-snd-ens1370 kernel-module-snd-rawmidi" 39RRECOMMENDS_${PN}_qemux86-64 += "kernel-module-snd-ens1370 kernel-module-snd-rawmidi"
40
41delete_pkg_m4_file() {
42 # This m4 file is out of date and is missing PKG_CONFIG_SYSROOT_PATH tweaks which we need for introspection
43 rm "${S}/common/m4/pkg.m4" || true
44}
45
46do_configure[prefuncs] += " delete_pkg_m4_file"
47
48do_compile_prepend() {
49 export GIR_EXTRA_LIBS_PATH="${B}/gst/.libs:${B}/libs/gst/base/.libs"
50}
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.6.3.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.6.3.bb
index ba1b83b08c..a79f449d0b 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.6.3.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.6.3.bb
@@ -6,6 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d \
6SRC_URI = " \ 6SRC_URI = " \
7 http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.xz \ 7 http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.xz \
8 file://0001-Fix-crash-with-gst-inspect.patch \ 8 file://0001-Fix-crash-with-gst-inspect.patch \
9 file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \
9" 10"
10 11
11SRC_URI[md5sum] = "b4cdeb2b9cb20dd6ac022a4f417eae0d" 12SRC_URI[md5sum] = "b4cdeb2b9cb20dd6ac022a4f417eae0d"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-16 10:06:34 +0000