summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-Prepend-PKG_CONFIG_SYSROOT_DIR-to-pkg-config-output.patch38
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.12.3.bb1
2 files changed, 0 insertions, 39 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-Prepend-PKG_CONFIG_SYSROOT_DIR-to-pkg-config-output.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-Prepend-PKG_CONFIG_SYSROOT_DIR-to-pkg-config-output.patch
deleted file mode 100644
index 48d93ab284..0000000000
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-Prepend-PKG_CONFIG_SYSROOT_DIR-to-pkg-config-output.patch
+++ /dev/null
@@ -1,38 +0,0 @@
1From 7c8f68c5428380b930579dc9ef27c853264448fd Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 15 May 2017 15:06:11 +0300
4Subject: [PATCH] Prepend PKG_CONFIG_SYSROOT_DIR to pkg-config output
5
6In cross environment we have to prepend the sysroot to the path found by
7pkgconfig since the path returned from pkgconfig does not have sysroot prefixed
8it ends up using the files from host system. If build host has wayland installed
9the build will succeed but if you dont have wayland-protocols installed on build
10host then it wont find the files on build host
11
12This should work ok with non sysrooted builds too since
13in those cases PKG_CONFIG_SYSROOT_DIR will be empty
14
15Upstream-Status: Pending
16
17Signed-off-by: Khem Raj <raj.khem@gmail.com>
18Signed-off-by: Maxin B. John <maxin.john@intel.com>
19---
20 configure.ac | 2 +-
21 1 file changed, 1 insertion(+), 1 deletion(-)
22
23diff --git a/configure.ac b/configure.ac
24index e307be6..83cdeb0 100644
25--- a/configure.ac
26+++ b/configure.ac
27@@ -2272,7 +2272,7 @@ AG_GST_CHECK_FEATURE(WAYLAND, [wayland sink], wayland , [
28 PKG_CHECK_MODULES(WAYLAND, wayland-client >= 1.4.0 libdrm >= 2.4.55 wayland-protocols >= 1.4, [
29 if test "x$wayland_scanner" != "x"; then
30 HAVE_WAYLAND="yes"
31- AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, `$PKG_CONFIG --variable=pkgdatadir wayland-protocols`)
32+ AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, ${WAYLAND_PROTOCOLS_SYSROOT_DIR}`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`)
33 else
34 AC_MSG_RESULT([wayland-scanner is required to build the wayland plugin])
35 HAVE_WAYLAND="no"
36--
372.4.0
38
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.12.3.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.12.3.bb
index cbba01cbfb..0380580335 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.12.3.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.12.3.bb
@@ -12,7 +12,6 @@ SRC_URI = " \
12 file://0001-gstreamer-gl.pc.in-don-t-append-GL_CFLAGS-to-CFLAGS.patch \ 12 file://0001-gstreamer-gl.pc.in-don-t-append-GL_CFLAGS-to-CFLAGS.patch \
13 file://0009-glimagesink-Downrank-to-marginal.patch \ 13 file://0009-glimagesink-Downrank-to-marginal.patch \
14 file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \ 14 file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \
15 file://0001-Prepend-PKG_CONFIG_SYSROOT_DIR-to-pkg-config-output.patch \
16 file://link-with-libvchostif.patch \ 15 file://link-with-libvchostif.patch \
17 file://0001-vkdisplay-Use-ifdef-for-platform-specific-defines.patch \ 16 file://0001-vkdisplay-Use-ifdef-for-platform-specific-defines.patch \
18 file://0002-vulkan-Use-the-generated-version-of-vkconfig.h.patch \ 17 file://0002-vulkan-Use-the-generated-version-of-vkconfig.h.patch \