diff options
Diffstat (limited to 'meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-Prepend-PKG_CONFIG_SYSROOT_DIR-to-pkg-config-output.patch')
-rw-r--r-- | meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-Prepend-PKG_CONFIG_SYSROOT_DIR-to-pkg-config-output.patch | 42 |
1 files changed, 23 insertions, 19 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 index 86a4495a85..48d93ab284 100644 --- 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 | |||
@@ -1,34 +1,38 @@ | |||
1 | From c271503d7e233428ac0323c51d6517113e26bef7 Mon Sep 17 00:00:00 2001 | 1 | From 7c8f68c5428380b930579dc9ef27c853264448fd Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Thu, 1 Dec 2016 00:27:13 -0800 | 3 | Date: Mon, 15 May 2017 15:06:11 +0300 |
4 | Subject: [PATCH] Prepend PKG_CONFIG_SYSROOT_DIR to pkg-config output | 4 | Subject: [PATCH] Prepend PKG_CONFIG_SYSROOT_DIR to pkg-config output |
5 | 5 | ||
6 | In cross environment we have to prepend the sysroot to the path found by | 6 | In cross environment we have to prepend the sysroot to the path found by |
7 | pkgconfig since the path returned from pkgconfig does not have sysroot prefixed | 7 | pkgconfig since the path returned from pkgconfig does not have sysroot prefixed |
8 | it ends up using the files from host system. If build host has wayland installed | 8 | it ends up using the files from host system. If build host has wayland installed |
9 | the build will succeed but if you dont have wayland-protocols installed on build host then | 9 | the build will succeed but if you dont have wayland-protocols installed on build |
10 | it wont find the files on build host | 10 | host then it wont find the files on build host |
11 | 11 | ||
12 | This should work ok with non sysrooted builds too since in those cases PKG_CONFIG_SYSROOT_DIR | 12 | This should work ok with non sysrooted builds too since |
13 | will be empty | 13 | in those cases PKG_CONFIG_SYSROOT_DIR will be empty |
14 | 14 | ||
15 | Upstream-Status: Pending | 15 | Upstream-Status: Pending |
16 | 16 | ||
17 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 17 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
18 | Signed-off-by: Maxin B. John <maxin.john@intel.com> | ||
18 | --- | 19 | --- |
19 | configure.ac | 2 +- | 20 | configure.ac | 2 +- |
20 | 1 file changed, 1 insertion(+), 1 deletion(-) | 21 | 1 file changed, 1 insertion(+), 1 deletion(-) |
21 | 22 | ||
22 | Index: gst-plugins-bad-1.10.1/configure.ac | 23 | diff --git a/configure.ac b/configure.ac |
23 | =================================================================== | 24 | index e307be6..83cdeb0 100644 |
24 | --- gst-plugins-bad-1.10.1.orig/configure.ac | 25 | --- a/configure.ac |
25 | +++ gst-plugins-bad-1.10.1/configure.ac | 26 | +++ b/configure.ac |
26 | @@ -2233,7 +2233,7 @@ AG_GST_CHECK_FEATURE(WAYLAND, [wayland s | 27 | @@ -2272,7 +2272,7 @@ AG_GST_CHECK_FEATURE(WAYLAND, [wayland sink], wayland , [ |
27 | PKG_CHECK_MODULES(WAYLAND_PROTOCOLS, wayland-protocols >= 1.4, [ | 28 | PKG_CHECK_MODULES(WAYLAND, wayland-client >= 1.4.0 libdrm >= 2.4.55 wayland-protocols >= 1.4, [ |
28 | if test "x$wayland_scanner" != "x"; then | 29 | if test "x$wayland_scanner" != "x"; then |
29 | HAVE_WAYLAND="yes" | 30 | HAVE_WAYLAND="yes" |
30 | - AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, `$PKG_CONFIG --variable=pkgdatadir wayland-protocols`) | 31 | - AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, `$PKG_CONFIG --variable=pkgdatadir wayland-protocols`) |
31 | + AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, ${WAYLAND_PROTOCOLS_SYSROOT_DIR}`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`) | 32 | + AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, ${WAYLAND_PROTOCOLS_SYSROOT_DIR}`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`) |
32 | else | 33 | else |
33 | AC_MSG_RESULT([wayland-scanner is required to build the wayland plugin]) | 34 | AC_MSG_RESULT([wayland-scanner is required to build the wayland plugin]) |
34 | HAVE_WAYLAND="no" | 35 | HAVE_WAYLAND="no" |
36 | -- | ||
37 | 2.4.0 | ||
38 | |||