diff options
Diffstat (limited to 'import-layers/yocto-poky/meta/recipes-graphics/libsdl2')
| -rw-r--r-- | import-layers/yocto-poky/meta/recipes-graphics/libsdl2/libsdl2/0001-prepend-our-sysroot-path-so-that-make-finds-our-wayl.patch | 34 | ||||
| -rw-r--r-- | import-layers/yocto-poky/meta/recipes-graphics/libsdl2/libsdl2/0001-src-video-make-it-compatible-with-wayland-1.10.patch | 57 | ||||
| -rw-r--r-- | import-layers/yocto-poky/meta/recipes-graphics/libsdl2/libsdl2/0002-Avoid-finding-build-host-s-wayland-scanner.patch | 31 | ||||
| -rw-r--r-- | import-layers/yocto-poky/meta/recipes-graphics/libsdl2/libsdl2/fix-build-failure-on-ppc.patch | 50 | ||||
| -rw-r--r-- | import-layers/yocto-poky/meta/recipes-graphics/libsdl2/libsdl2_2.0.5.bb (renamed from import-layers/yocto-poky/meta/recipes-graphics/libsdl2/libsdl2_2.0.4.bb) | 25 |
5 files changed, 128 insertions, 69 deletions
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/libsdl2/libsdl2/0001-prepend-our-sysroot-path-so-that-make-finds-our-wayl.patch b/import-layers/yocto-poky/meta/recipes-graphics/libsdl2/libsdl2/0001-prepend-our-sysroot-path-so-that-make-finds-our-wayl.patch new file mode 100644 index 000000000..efc84188f --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-graphics/libsdl2/libsdl2/0001-prepend-our-sysroot-path-so-that-make-finds-our-wayl.patch @@ -0,0 +1,34 @@ +From b44808e43130dcd13b43e5b978b9b24aeb4c134c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> +Date: Thu, 20 Oct 2016 14:57:51 +0200 +Subject: [PATCH] prepend our sysroot path so that make finds our + wayland-protocol files +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> +--- + configure.in | 4 +- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.in b/configure.in +index 726ded3..3376600 100644 +--- a/configure.in ++++ b/configure.in +@@ -1206,7 +1206,7 @@ AC_HELP_STRING([--enable-video-wayland-qt-touch], [QtWayland server support for + WAYLAND_CFLAGS=`$PKG_CONFIG --cflags wayland-client wayland-egl wayland-cursor xkbcommon` + WAYLAND_LIBS=`$PKG_CONFIG --libs wayland-client wayland-egl wayland-cursor xkbcommon` + WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner` +- WAYLAND_CORE_PROTOCOL_DIR=`$PKG_CONFIG --variable=pkgdatadir wayland-client` +- WAYLAND_PROTOCOLS_DIR=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols` ++ WAYLAND_CORE_PROTOCOL_DIR=${WAYLAND_PROTOCOLS_SYSROOT_DIR}`$PKG_CONFIG --variable=pkgdatadir wayland-client` ++ WAYLAND_PROTOCOLS_DIR=${WAYLAND_PROTOCOLS_SYSROOT_DIR}`$PKG_CONFIG --variable=pkgdatadir wayland-protocols` + video_wayland=yes + fi + fi +-- +2.5.5 + diff --git a/import-layers/yocto-poky/meta/recipes-graphics/libsdl2/libsdl2/0001-src-video-make-it-compatible-with-wayland-1.10.patch b/import-layers/yocto-poky/meta/recipes-graphics/libsdl2/libsdl2/0001-src-video-make-it-compatible-with-wayland-1.10.patch deleted file mode 100644 index 44e6d4df9..000000000 --- a/import-layers/yocto-poky/meta/recipes-graphics/libsdl2/libsdl2/0001-src-video-make-it-compatible-with-wayland-1.10.patch +++ /dev/null @@ -1,57 +0,0 @@ -From b1ed3533433501ec52c8289a5b3a294e57e7f798 Mon Sep 17 00:00:00 2001 -From: Martin Jansa <martin.jansa@gmail.com> -Date: Thu, 26 May 2016 11:31:52 +0000 -Subject: [PATCH] src/video: make it compatible with wayland 1.10 - -| build/.libs/SDL_waylandevents.o: In function `wl_registry_bind': -| /usr/include/wayland-client-protocol.h:305: undefined reference to `wl_proxy_marshal_constructor_versioned' -| /usr/include/wayland-client-protocol.h:305: undefined reference to `wl_proxy_marshal_constructor_versioned' -| build/.libs/SDL_waylandkeyboard.o: In function `wl_registry_bind': -| /usr/include/wayland-client-protocol.h:305: undefined reference to `wl_proxy_marshal_constructor_versioned' -| /usr/include/wayland-client-protocol.h:305: undefined reference to `wl_proxy_marshal_constructor_versioned' -| build/.libs/SDL_waylandvideo.o: In function `wl_registry_bind': -| /usr/include/wayland-client-protocol.h:305: undefined reference to `wl_proxy_marshal_constructor_versioned' -| collect2: error: ld returned 1 exit status -| make: *** [build/libSDL2.la] Error 1 -| ERROR: oe_runmake failed - -Upstream-Status: Pending -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> - ---- - src/video/wayland/SDL_waylanddyn.h | 1 + - src/video/wayland/SDL_waylandsym.h | 4 ++++ - src/video/webos/SDL_waylanddyn.h | 1 + - src/video/webos/SDL_waylandsym.h | 4 ++++ - 4 files changed, 10 insertions(+) - -diff --git a/src/video/wayland/SDL_waylanddyn.h b/src/video/wayland/SDL_waylanddyn.h -index 8d9313a..c7b0157 100644 ---- a/src/video/wayland/SDL_waylanddyn.h -+++ b/src/video/wayland/SDL_waylanddyn.h -@@ -79,6 +79,7 @@ void SDL_WAYLAND_UnloadSymbols(void); - #define wl_proxy_get_user_data (*WAYLAND_wl_proxy_get_user_data) - #define wl_proxy_add_listener (*WAYLAND_wl_proxy_add_listener) - #define wl_proxy_marshal_constructor (*WAYLAND_wl_proxy_marshal_constructor) -+#define wl_proxy_marshal_constructor_versioned (*WAYLAND_wl_proxy_marshal_constructor_versioned) - - #define wl_seat_interface (*WAYLAND_wl_seat_interface) - #define wl_surface_interface (*WAYLAND_wl_surface_interface) -diff --git a/src/video/wayland/SDL_waylandsym.h b/src/video/wayland/SDL_waylandsym.h -index c3b4fa5..b9a0d97 100644 ---- a/src/video/wayland/SDL_waylandsym.h -+++ b/src/video/wayland/SDL_waylandsym.h -@@ -55,6 +55,10 @@ SDL_WAYLAND_SYM(void, wl_list_insert_list, (struct wl_list *, struct wl_list *)) - SDL_WAYLAND_MODULE(WAYLAND_CLIENT_1_4) - SDL_WAYLAND_SYM(struct wl_proxy *, wl_proxy_marshal_constructor, (struct wl_proxy *, uint32_t opcode, const struct wl_interface *interface, ...)) - -+/* These functions are available in Wayland >= 1.10 */ -+SDL_WAYLAND_MODULE(WAYLAND_CLIENT_1_10) -+SDL_WAYLAND_SYM(struct wl_proxy *, wl_proxy_marshal_constructor_versioned, (struct wl_proxy *proxy, uint32_t opcode, const struct wl_interface *interface, uint32_t version, ...)) -+ - SDL_WAYLAND_INTERFACE(wl_seat_interface) - SDL_WAYLAND_INTERFACE(wl_surface_interface) - SDL_WAYLAND_INTERFACE(wl_shm_pool_interface) --- -1.9.1 - diff --git a/import-layers/yocto-poky/meta/recipes-graphics/libsdl2/libsdl2/0002-Avoid-finding-build-host-s-wayland-scanner.patch b/import-layers/yocto-poky/meta/recipes-graphics/libsdl2/libsdl2/0002-Avoid-finding-build-host-s-wayland-scanner.patch new file mode 100644 index 000000000..7837315f1 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-graphics/libsdl2/libsdl2/0002-Avoid-finding-build-host-s-wayland-scanner.patch @@ -0,0 +1,31 @@ +From ae879091cf65cb70293b375ec7e61ed12a96d8a7 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> +Date: Fri, 2 Dec 2016 09:39:25 +0100 +Subject: [PATCH] Avoid finding build host's wayland-scanner +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> +--- + configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.in b/configure.in +index 3376600..2aa6ed4 100644 +--- a/configure.in ++++ b/configure.in +@@ -1204,7 +1204,7 @@ AC_HELP_STRING([--enable-video-wayland-qt-touch], [QtWayland server support for + if $PKG_CONFIG --exists wayland-client wayland-scanner wayland-protocols wayland-egl wayland-cursor egl xkbcommon ; then + WAYLAND_CFLAGS=`$PKG_CONFIG --cflags wayland-client wayland-egl wayland-cursor xkbcommon` + WAYLAND_LIBS=`$PKG_CONFIG --libs wayland-client wayland-egl wayland-cursor xkbcommon` +- WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner` ++ AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner]) + WAYLAND_CORE_PROTOCOL_DIR=${WAYLAND_PROTOCOLS_SYSROOT_DIR}`$PKG_CONFIG --variable=pkgdatadir wayland-client` + WAYLAND_PROTOCOLS_DIR=${WAYLAND_PROTOCOLS_SYSROOT_DIR}`$PKG_CONFIG --variable=pkgdatadir wayland-protocols` + video_wayland=yes +-- +2.7.4 + diff --git a/import-layers/yocto-poky/meta/recipes-graphics/libsdl2/libsdl2/fix-build-failure-on-ppc.patch b/import-layers/yocto-poky/meta/recipes-graphics/libsdl2/libsdl2/fix-build-failure-on-ppc.patch new file mode 100644 index 000000000..1520bcfb6 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-graphics/libsdl2/libsdl2/fix-build-failure-on-ppc.patch @@ -0,0 +1,50 @@ +Upstream-Status: Backport [https://hg.libsdl.org/SDL/rev/5184186d4366] + +Backport patch from upstream to fix build failures on ppc and ppc64. + +Signed-off-by: Kai Kang <kai.kang@windriver.com> +--- +# HG changeset patch +# User Sam Lantinga <slouken@libsdl.org> +# Date 1477159315 25200 +# Node ID 5184186d4366169617b434f5b71c618a7035cde4 +# Parent 71d4148e32de5088c4bc2f04c1e5ded647a2bf82 +Fixed bug 3466 - Can't build 2.0.5 on ppc64 + +/home/fedora/SDL2-2.0.5/src/video/SDL_blit_N.c: In function 'calc_swizzle32': +/home/fedora/SDL2-2.0.5/src/video/SDL_blit_N.c:127:5: error: ISO C90 forbids mixed declarations and code [-Werror=declaration-after-statement] + const vector unsigned char plus = VECUINT8_LITERAL(0x00, 0x00, 0x00, 0x00, + ^ + +diff -r 71d4148e32de -r 5184186d4366 src/video/SDL_blit_N.c +--- a/src/video/SDL_blit_N.c Wed Oct 19 21:22:42 2016 -0700 ++++ b/src/video/SDL_blit_N.c Sat Oct 22 11:01:55 2016 -0700 +@@ -118,12 +118,6 @@ + 16, 8, 0, 24, + 0, NULL + }; +- if (!srcfmt) { +- srcfmt = &default_pixel_format; +- } +- if (!dstfmt) { +- dstfmt = &default_pixel_format; +- } + const vector unsigned char plus = VECUINT8_LITERAL(0x00, 0x00, 0x00, 0x00, + 0x04, 0x04, 0x04, 0x04, + 0x08, 0x08, 0x08, 0x08, +@@ -136,6 +130,14 @@ + Uint32 gmask = RESHIFT(srcfmt->Gshift) << (dstfmt->Gshift); + Uint32 bmask = RESHIFT(srcfmt->Bshift) << (dstfmt->Bshift); + Uint32 amask; ++ ++ if (!srcfmt) { ++ srcfmt = &default_pixel_format; ++ } ++ if (!dstfmt) { ++ dstfmt = &default_pixel_format; ++ } ++ + /* Use zero for alpha if either surface doesn't have alpha */ + if (dstfmt->Amask) { + amask = + diff --git a/import-layers/yocto-poky/meta/recipes-graphics/libsdl2/libsdl2_2.0.4.bb b/import-layers/yocto-poky/meta/recipes-graphics/libsdl2/libsdl2_2.0.5.bb index 844ff333c..12d3aaf6f 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/libsdl2/libsdl2_2.0.4.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/libsdl2/libsdl2_2.0.5.bb @@ -14,15 +14,18 @@ PROVIDES = "virtual/libsdl2" DEPENDS_class-nativesdk = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/nativesdk-libx11 nativesdk-libxrandr nativesdk-libxrender nativesdk-libxext', '', d)}" -SRC_URI = "http://www.libsdl.org/release/SDL2-${PV}.tar.gz \ - file://linkage.patch \ - file://0001-src-video-make-it-compatible-with-wayland-1.10.patch \ +SRC_URI = " \ + http://www.libsdl.org/release/SDL2-${PV}.tar.gz \ + file://linkage.patch \ + file://0001-prepend-our-sysroot-path-so-that-make-finds-our-wayl.patch \ + file://0002-Avoid-finding-build-host-s-wayland-scanner.patch \ + file://fix-build-failure-on-ppc.patch \ " S = "${WORKDIR}/SDL2-${PV}" -SRC_URI[md5sum] = "44fc4a023349933e7f5d7a582f7b886e" -SRC_URI[sha256sum] = "da55e540bf6331824153805d58b590a29c39d2d506c6d02fa409aedeab21174b" +SRC_URI[md5sum] = "d4055424d556b4a908aa76fad63abd3c" +SRC_URI[sha256sum] = "442038cf55965969f2ff06d976031813de643af9c9edc9e331bd761c242e8785" inherit autotools lib_package binconfig pkgconfig @@ -31,19 +34,17 @@ EXTRA_OECONF = "--disable-oss --disable-esd --disable-arts \ --disable-video-dummy \ --enable-pthreads \ --enable-sdl-dlopen \ - --disable-rpath" + --disable-rpath \ + WAYLAND_PROTOCOLS_SYSROOT_DIR=${RECIPE_SYSROOT}" # opengl packageconfig factored out to make it easy for distros # and BSP layers to pick either (desktop) opengl, gles2, or no GL -PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'opengl', '', d)}" +PACKAGECONFIG_GL ?= "${@bb.utils.filter('DISTRO_FEATURES', 'opengl', d)}" PACKAGECONFIG ??= " \ ${PACKAGECONFIG_GL} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \ + ${@bb.utils.filter('DISTRO_FEATURES', 'alsa directfb pulseaudio x11', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland gles2', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ " PACKAGECONFIG[alsa] = "--enable-alsa --disable-alsatest,--disable-alsa,alsa-lib," PACKAGECONFIG[directfb] = "--enable-video-directfb,--disable-video-directfb,directfb" @@ -51,7 +52,7 @@ PACKAGECONFIG[gles2] = "--enable-video-opengles,--disable-video-opengles,vi PACKAGECONFIG[opengl] = "--enable-video-opengl,--disable-video-opengl,virtual/libgl" PACKAGECONFIG[pulseaudio] = "--enable-pulseaudio,--disable-pulseaudio,pulseaudio" PACKAGECONFIG[tslib] = "--enable-input-tslib,--disable-input-tslib,tslib" -PACKAGECONFIG[wayland] = "--enable-video-wayland,--disable-video-wayland,wayland libxkbcommon" +PACKAGECONFIG[wayland] = "--enable-video-wayland,--disable-video-wayland,wayland-native wayland wayland-protocols libxkbcommon" PACKAGECONFIG[x11] = "--enable-video-x11,--disable-video-x11,virtual/libx11 libxext libxrandr libxrender" EXTRA_AUTORECONF += "--include=acinclude --exclude=autoheader" |