summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/libsdl2/libsdl2_2.0.5.bb
diff options
context:
space:
mode:
authorFabien Lahoudere <fabien.lahoudere@collabora.co.uk>2017-11-02 00:22:54 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-11-07 13:25:31 +0000
commit32fd3af26860a86668ac88c30be5f682620ca93b (patch)
treec2918eeebb997800b1bb948170503aacd33890c3 /meta/recipes-graphics/libsdl2/libsdl2_2.0.5.bb
parent8fa2a2f46d13f20860f5fe290403a387cb3a34fe (diff)
downloadpoky-32fd3af26860a86668ac88c30be5f682620ca93b.tar.gz
wayland: Fix installation patch issue
This patch modify the way we manage wayland path issues. Instead of patching each recipe to make it work with wayland and its protocols, it is better to patch wayland to fix its path issues. So wayland-scanner.pc, wayland-client.pc and wayland-protocols.pc are patched to change paths. Then we can drop the following workaround: WAYLAND_PROTOCOLS_SYSROOT_DIR=${RECIPE_SYSROOT} in: - gtk+3 - libsdl2 - xserver-xorg - gstreamer1.0-plugins-bad - weston-2.0.0 We also dropped libsdl2 patches which fix wayland paths. (From OE-Core rev: 14c0d992152ce27ee616558cafb408ed008d936e) Signed-off-by: Fabien Lahoudere <fabien.lahoudere@collabora.co.uk> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/libsdl2/libsdl2_2.0.5.bb')
-rw-r--r--meta/recipes-graphics/libsdl2/libsdl2_2.0.5.bb4
1 files changed, 1 insertions, 3 deletions
diff --git a/meta/recipes-graphics/libsdl2/libsdl2_2.0.5.bb b/meta/recipes-graphics/libsdl2/libsdl2_2.0.5.bb
index 12d3aaf6f0..032f45bb20 100644
--- a/meta/recipes-graphics/libsdl2/libsdl2_2.0.5.bb
+++ b/meta/recipes-graphics/libsdl2/libsdl2_2.0.5.bb
@@ -17,8 +17,6 @@ DEPENDS_class-nativesdk = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtu
17SRC_URI = " \ 17SRC_URI = " \
18 http://www.libsdl.org/release/SDL2-${PV}.tar.gz \ 18 http://www.libsdl.org/release/SDL2-${PV}.tar.gz \
19 file://linkage.patch \ 19 file://linkage.patch \
20 file://0001-prepend-our-sysroot-path-so-that-make-finds-our-wayl.patch \
21 file://0002-Avoid-finding-build-host-s-wayland-scanner.patch \
22 file://fix-build-failure-on-ppc.patch \ 20 file://fix-build-failure-on-ppc.patch \
23" 21"
24 22
@@ -35,7 +33,7 @@ EXTRA_OECONF = "--disable-oss --disable-esd --disable-arts \
35 --enable-pthreads \ 33 --enable-pthreads \
36 --enable-sdl-dlopen \ 34 --enable-sdl-dlopen \
37 --disable-rpath \ 35 --disable-rpath \
38 WAYLAND_PROTOCOLS_SYSROOT_DIR=${RECIPE_SYSROOT}" 36 "
39 37
40# opengl packageconfig factored out to make it easy for distros 38# opengl packageconfig factored out to make it easy for distros
41# and BSP layers to pick either (desktop) opengl, gles2, or no GL 39# and BSP layers to pick either (desktop) opengl, gles2, or no GL