summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-graphics/libsdl2/libsdl2/0001-prepend-our-sysroot-path-so-that-make-finds-our-wayl.patch32
-rw-r--r--meta/recipes-graphics/libsdl2/libsdl2/0001-src-video-make-it-compatible-with-wayland-1.10.patch57
-rw-r--r--meta/recipes-graphics/libsdl2/libsdl2_2.0.5.bb (renamed from meta/recipes-graphics/libsdl2/libsdl2_2.0.4.bb)14
3 files changed, 40 insertions, 63 deletions
diff --git a/meta/recipes-graphics/libsdl2/libsdl2/0001-prepend-our-sysroot-path-so-that-make-finds-our-wayl.patch b/meta/recipes-graphics/libsdl2/libsdl2/0001-prepend-our-sysroot-path-so-that-make-finds-our-wayl.patch
new file mode 100644
index 0000000000..d042430b56
--- /dev/null
+++ b/meta/recipes-graphics/libsdl2/libsdl2/0001-prepend-our-sysroot-path-so-that-make-finds-our-wayl.patch
@@ -0,0 +1,32 @@
1From b44808e43130dcd13b43e5b978b9b24aeb4c134c Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
3Date: Thu, 20 Oct 2016 14:57:51 +0200
4Subject: [PATCH] prepend our sysroot path so that make finds our
5 wayland-protocol files
6MIME-Version: 1.0
7Content-Type: text/plain; charset=UTF-8
8Content-Transfer-Encoding: 8bit
9
10Upstream-Status: Inappropriate [embedded specific]
11
12Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
13---
14 configure.in | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17diff --git a/configure.in b/configure.in
18index 726ded3..3376600 100644
19--- a/configure.in
20+++ b/configure.in
21@@ -1206,7 +1206,7 @@ AC_HELP_STRING([--enable-video-wayland-qt-touch], [QtWayland server support for
22 WAYLAND_LIBS=`$PKG_CONFIG --libs wayland-client wayland-egl wayland-cursor xkbcommon`
23 WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`
24 WAYLAND_CORE_PROTOCOL_DIR=`$PKG_CONFIG --variable=pkgdatadir wayland-client`
25- WAYLAND_PROTOCOLS_DIR=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`
26+ WAYLAND_PROTOCOLS_DIR=${WAYLAND_PROTOCOLS_SYSROOT_DIR}`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`
27 video_wayland=yes
28 fi
29 fi
30--
312.5.5
32
diff --git a/meta/recipes-graphics/libsdl2/libsdl2/0001-src-video-make-it-compatible-with-wayland-1.10.patch b/meta/recipes-graphics/libsdl2/libsdl2/0001-src-video-make-it-compatible-with-wayland-1.10.patch
deleted file mode 100644
index 44e6d4df91..0000000000
--- a/meta/recipes-graphics/libsdl2/libsdl2/0001-src-video-make-it-compatible-with-wayland-1.10.patch
+++ /dev/null
@@ -1,57 +0,0 @@
1From b1ed3533433501ec52c8289a5b3a294e57e7f798 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <martin.jansa@gmail.com>
3Date: Thu, 26 May 2016 11:31:52 +0000
4Subject: [PATCH] src/video: make it compatible with wayland 1.10
5
6| build/.libs/SDL_waylandevents.o: In function `wl_registry_bind':
7| /usr/include/wayland-client-protocol.h:305: undefined reference to `wl_proxy_marshal_constructor_versioned'
8| /usr/include/wayland-client-protocol.h:305: undefined reference to `wl_proxy_marshal_constructor_versioned'
9| build/.libs/SDL_waylandkeyboard.o: In function `wl_registry_bind':
10| /usr/include/wayland-client-protocol.h:305: undefined reference to `wl_proxy_marshal_constructor_versioned'
11| /usr/include/wayland-client-protocol.h:305: undefined reference to `wl_proxy_marshal_constructor_versioned'
12| build/.libs/SDL_waylandvideo.o: In function `wl_registry_bind':
13| /usr/include/wayland-client-protocol.h:305: undefined reference to `wl_proxy_marshal_constructor_versioned'
14| collect2: error: ld returned 1 exit status
15| make: *** [build/libSDL2.la] Error 1
16| ERROR: oe_runmake failed
17
18Upstream-Status: Pending
19Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
20
21---
22 src/video/wayland/SDL_waylanddyn.h | 1 +
23 src/video/wayland/SDL_waylandsym.h | 4 ++++
24 src/video/webos/SDL_waylanddyn.h | 1 +
25 src/video/webos/SDL_waylandsym.h | 4 ++++
26 4 files changed, 10 insertions(+)
27
28diff --git a/src/video/wayland/SDL_waylanddyn.h b/src/video/wayland/SDL_waylanddyn.h
29index 8d9313a..c7b0157 100644
30--- a/src/video/wayland/SDL_waylanddyn.h
31+++ b/src/video/wayland/SDL_waylanddyn.h
32@@ -79,6 +79,7 @@ void SDL_WAYLAND_UnloadSymbols(void);
33 #define wl_proxy_get_user_data (*WAYLAND_wl_proxy_get_user_data)
34 #define wl_proxy_add_listener (*WAYLAND_wl_proxy_add_listener)
35 #define wl_proxy_marshal_constructor (*WAYLAND_wl_proxy_marshal_constructor)
36+#define wl_proxy_marshal_constructor_versioned (*WAYLAND_wl_proxy_marshal_constructor_versioned)
37
38 #define wl_seat_interface (*WAYLAND_wl_seat_interface)
39 #define wl_surface_interface (*WAYLAND_wl_surface_interface)
40diff --git a/src/video/wayland/SDL_waylandsym.h b/src/video/wayland/SDL_waylandsym.h
41index c3b4fa5..b9a0d97 100644
42--- a/src/video/wayland/SDL_waylandsym.h
43+++ b/src/video/wayland/SDL_waylandsym.h
44@@ -55,6 +55,10 @@ SDL_WAYLAND_SYM(void, wl_list_insert_list, (struct wl_list *, struct wl_list *))
45 SDL_WAYLAND_MODULE(WAYLAND_CLIENT_1_4)
46 SDL_WAYLAND_SYM(struct wl_proxy *, wl_proxy_marshal_constructor, (struct wl_proxy *, uint32_t opcode, const struct wl_interface *interface, ...))
47
48+/* These functions are available in Wayland >= 1.10 */
49+SDL_WAYLAND_MODULE(WAYLAND_CLIENT_1_10)
50+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, ...))
51+
52 SDL_WAYLAND_INTERFACE(wl_seat_interface)
53 SDL_WAYLAND_INTERFACE(wl_surface_interface)
54 SDL_WAYLAND_INTERFACE(wl_shm_pool_interface)
55--
561.9.1
57
diff --git a/meta/recipes-graphics/libsdl2/libsdl2_2.0.4.bb b/meta/recipes-graphics/libsdl2/libsdl2_2.0.5.bb
index 844ff333cb..ac7312b92d 100644
--- a/meta/recipes-graphics/libsdl2/libsdl2_2.0.4.bb
+++ b/meta/recipes-graphics/libsdl2/libsdl2_2.0.5.bb
@@ -14,15 +14,16 @@ PROVIDES = "virtual/libsdl2"
14 14
15DEPENDS_class-nativesdk = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/nativesdk-libx11 nativesdk-libxrandr nativesdk-libxrender nativesdk-libxext', '', d)}" 15DEPENDS_class-nativesdk = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/nativesdk-libx11 nativesdk-libxrandr nativesdk-libxrender nativesdk-libxext', '', d)}"
16 16
17SRC_URI = "http://www.libsdl.org/release/SDL2-${PV}.tar.gz \ 17SRC_URI = " \
18 file://linkage.patch \ 18 http://www.libsdl.org/release/SDL2-${PV}.tar.gz \
19 file://0001-src-video-make-it-compatible-with-wayland-1.10.patch \ 19 file://linkage.patch \
20 file://0001-prepend-our-sysroot-path-so-that-make-finds-our-wayl.patch \
20" 21"
21 22
22S = "${WORKDIR}/SDL2-${PV}" 23S = "${WORKDIR}/SDL2-${PV}"
23 24
24SRC_URI[md5sum] = "44fc4a023349933e7f5d7a582f7b886e" 25SRC_URI[md5sum] = "d4055424d556b4a908aa76fad63abd3c"
25SRC_URI[sha256sum] = "da55e540bf6331824153805d58b590a29c39d2d506c6d02fa409aedeab21174b" 26SRC_URI[sha256sum] = "442038cf55965969f2ff06d976031813de643af9c9edc9e331bd761c242e8785"
26 27
27inherit autotools lib_package binconfig pkgconfig 28inherit autotools lib_package binconfig pkgconfig
28 29
@@ -31,7 +32,8 @@ EXTRA_OECONF = "--disable-oss --disable-esd --disable-arts \
31 --disable-video-dummy \ 32 --disable-video-dummy \
32 --enable-pthreads \ 33 --enable-pthreads \
33 --enable-sdl-dlopen \ 34 --enable-sdl-dlopen \
34 --disable-rpath" 35 --disable-rpath \
36 WAYLAND_PROTOCOLS_SYSROOT_DIR=${STAGING_DIR}/${MACHINE}"
35 37
36# opengl packageconfig factored out to make it easy for distros 38# opengl packageconfig factored out to make it easy for distros
37# 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
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-18 09:27:30 +0000