diff options
author | Ross Burton <ross.burton@intel.com> | 2017-12-05 14:04:41 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-12-18 18:03:56 +0000 |
commit | fe73bfc9ab1c13c972e75bbe467f27f193773ada (patch) | |
tree | a4c68054772b0c9b530e7220f61811b92a71bfb3 /meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad | |
parent | 77b66630fa162f4ba3b586c5bcce92e138c3075c (diff) | |
download | poky-fe73bfc9ab1c13c972e75bbe467f27f193773ada.tar.gz |
gstreamer1.0-plugins-bad: remove redundant Wayland patch
The installation path and wayland-scanner location problems in Wayland were
resolved in "wayland: Fix installation patch issue" (oe-core 14c0d99) which made
the WAYLAND_PROTOCOLS_SYSROOT_DIR workaround redundant.
(From OE-Core rev: e41c3cb0816a2f59d1c02d4b34285b29d67486ba)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad')
-rw-r--r-- | meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-Prepend-PKG_CONFIG_SYSROOT_DIR-to-pkg-config-output.patch | 38 |
1 files changed, 0 insertions, 38 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 @@ | |||
1 | From 7c8f68c5428380b930579dc9ef27c853264448fd Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Mon, 15 May 2017 15:06:11 +0300 | ||
4 | Subject: [PATCH] Prepend PKG_CONFIG_SYSROOT_DIR to pkg-config output | ||
5 | |||
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 | ||
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 | ||
10 | host then it wont find the files on build host | ||
11 | |||
12 | This should work ok with non sysrooted builds too since | ||
13 | in those cases PKG_CONFIG_SYSROOT_DIR will be empty | ||
14 | |||
15 | Upstream-Status: Pending | ||
16 | |||
17 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
18 | Signed-off-by: Maxin B. John <maxin.john@intel.com> | ||
19 | --- | ||
20 | configure.ac | 2 +- | ||
21 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
22 | |||
23 | diff --git a/configure.ac b/configure.ac | ||
24 | index 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 | -- | ||
37 | 2.4.0 | ||
38 | |||