mirror of
https://git.yoctoproject.org/poky
synced 2026-09-15 15:49:32 +02:00
libsdl2: update to 2.0.5
* 0001-src-video-make-it-compatible-with-wayland-1.10.patch is removed because the problem has been resolved upstream * Add 0001-prepend-our-sysroot-path-so-that-make-finds-our-wayl.patch so that WAYLAND_PROTOCOLS_SYSROOT_DIR is substituted in a way similar to gtk3 (From OE-Core rev: 97fff54efe6b03798ad1c5e39155eaeab0a33300) Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Andreas Müller
committed by
Richard Purdie
Richard Purdie
parent
003b053498
commit
470e6225e3
@@ -0,0 +1,32 @@
|
|||||||
|
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 | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
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_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_PROTOCOLS_DIR=${WAYLAND_PROTOCOLS_SYSROOT_DIR}`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`
|
||||||
|
video_wayland=yes
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
--
|
||||||
|
2.5.5
|
||||||
|
|
||||||
@@ -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
|
|
||||||
|
|
||||||
@@ -14,15 +14,16 @@ PROVIDES = "virtual/libsdl2"
|
|||||||
|
|
||||||
DEPENDS_class-nativesdk = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/nativesdk-libx11 nativesdk-libxrandr nativesdk-libxrender nativesdk-libxext', '', d)}"
|
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 \
|
SRC_URI = " \
|
||||||
file://linkage.patch \
|
http://www.libsdl.org/release/SDL2-${PV}.tar.gz \
|
||||||
file://0001-src-video-make-it-compatible-with-wayland-1.10.patch \
|
file://linkage.patch \
|
||||||
|
file://0001-prepend-our-sysroot-path-so-that-make-finds-our-wayl.patch \
|
||||||
"
|
"
|
||||||
|
|
||||||
S = "${WORKDIR}/SDL2-${PV}"
|
S = "${WORKDIR}/SDL2-${PV}"
|
||||||
|
|
||||||
SRC_URI[md5sum] = "44fc4a023349933e7f5d7a582f7b886e"
|
SRC_URI[md5sum] = "d4055424d556b4a908aa76fad63abd3c"
|
||||||
SRC_URI[sha256sum] = "da55e540bf6331824153805d58b590a29c39d2d506c6d02fa409aedeab21174b"
|
SRC_URI[sha256sum] = "442038cf55965969f2ff06d976031813de643af9c9edc9e331bd761c242e8785"
|
||||||
|
|
||||||
inherit autotools lib_package binconfig pkgconfig
|
inherit autotools lib_package binconfig pkgconfig
|
||||||
|
|
||||||
@@ -31,7 +32,8 @@ EXTRA_OECONF = "--disable-oss --disable-esd --disable-arts \
|
|||||||
--disable-video-dummy \
|
--disable-video-dummy \
|
||||||
--enable-pthreads \
|
--enable-pthreads \
|
||||||
--enable-sdl-dlopen \
|
--enable-sdl-dlopen \
|
||||||
--disable-rpath"
|
--disable-rpath \
|
||||||
|
WAYLAND_PROTOCOLS_SYSROOT_DIR=${STAGING_DIR}/${MACHINE}"
|
||||||
|
|
||||||
# opengl packageconfig factored out to make it easy for distros
|
# opengl packageconfig factored out to make it easy for distros
|
||||||
# and BSP layers to pick either (desktop) opengl, gles2, or no GL
|
# and BSP layers to pick either (desktop) opengl, gles2, or no GL
|
||||||
Reference in New Issue
Block a user