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:00:21 +0000 |
| commit | e41c3cb0816a2f59d1c02d4b34285b29d67486ba (patch) | |
| tree | 707cd6fb6dd2077813b2eb36df8abf7def83ce14 /meta | |
| parent | 2dffd043c7f9bb71356a0d0b86b5b0a19fdf7343 (diff) | |
| download | openembedded-core-contrib-e41c3cb0816a2f59d1c02d4b34285b29d67486ba.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.
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta')
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 @@ -From 7c8f68c5428380b930579dc9ef27c853264448fd Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 15 May 2017 15:06:11 +0300 -Subject: [PATCH] Prepend PKG_CONFIG_SYSROOT_DIR to pkg-config output - -In cross environment we have to prepend the sysroot to the path found by -pkgconfig since the path returned from pkgconfig does not have sysroot prefixed -it ends up using the files from host system. If build host has wayland installed -the build will succeed but if you dont have wayland-protocols installed on build -host then it wont find the files on build host - -This should work ok with non sysrooted builds too since -in those cases PKG_CONFIG_SYSROOT_DIR will be empty - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Signed-off-by: Maxin B. John <maxin.john@intel.com> ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index e307be6..83cdeb0 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2272,7 +2272,7 @@ AG_GST_CHECK_FEATURE(WAYLAND, [wayland sink], wayland , [ - PKG_CHECK_MODULES(WAYLAND, wayland-client >= 1.4.0 libdrm >= 2.4.55 wayland-protocols >= 1.4, [ - if test "x$wayland_scanner" != "x"; then - HAVE_WAYLAND="yes" -- AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, `$PKG_CONFIG --variable=pkgdatadir wayland-protocols`) -+ AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, ${WAYLAND_PROTOCOLS_SYSROOT_DIR}`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`) - else - AC_MSG_RESULT([wayland-scanner is required to build the wayland plugin]) - HAVE_WAYLAND="no" --- -2.4.0 - 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 = " \ file://0001-gstreamer-gl.pc.in-don-t-append-GL_CFLAGS-to-CFLAGS.patch \ file://0009-glimagesink-Downrank-to-marginal.patch \ file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \ - file://0001-Prepend-PKG_CONFIG_SYSROOT_DIR-to-pkg-config-output.patch \ file://link-with-libvchostif.patch \ file://0001-vkdisplay-Use-ifdef-for-platform-specific-defines.patch \ file://0002-vulkan-Use-the-generated-version-of-vkconfig.h.patch \ |