From: Martin Jansa <martin.jansa@gmail.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH] libsdl2: Fix build with wayland 1.10
Date: Wed, 1 Jun 2016 14:49:36 +0200 [thread overview]
Message-ID: <20160601124936.19277-1-Martin.Jansa@gmail.com> (raw)
In-Reply-To: <20160526172357.GB2575@jama>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
...ideo-make-it-compatible-with-wayland-1.10.patch | 57 ++++++++++++++++++++++
meta/recipes-graphics/libsdl2/libsdl2_2.0.4.bb | 4 +-
2 files changed, 60 insertions(+), 1 deletion(-)
create mode 100644 meta/recipes-graphics/libsdl2/libsdl2/0001-src-video-make-it-compatible-with-wayland-1.10.patch
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
new file mode 100644
index 0000000..44e6d4d
--- /dev/null
+++ b/meta/recipes-graphics/libsdl2/libsdl2/0001-src-video-make-it-compatible-with-wayland-1.10.patch
@@ -0,0 +1,57 @@
+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/meta/recipes-graphics/libsdl2/libsdl2_2.0.4.bb b/meta/recipes-graphics/libsdl2/libsdl2_2.0.4.bb
index 4282307..8f079c8 100644
--- a/meta/recipes-graphics/libsdl2/libsdl2_2.0.4.bb
+++ b/meta/recipes-graphics/libsdl2/libsdl2_2.0.4.bb
@@ -15,7 +15,9 @@ 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://linkage.patch \
+ file://0001-src-video-make-it-compatible-with-wayland-1.10.patch \
+"
S = "${WORKDIR}/SDL2-${PV}"
--
2.8.3
next prev parent reply other threads:[~2016-06-01 12:49 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-12 7:20 [PATCH 00/13] Upgrades around graphics stack Jussi Kukkonen
2016-05-12 7:20 ` [PATCH 01/13] xserver-xorg: Upgrade 1.18.0 -> 1.18.3 Jussi Kukkonen
2016-05-12 7:20 ` [PATCH 02/13] xrandr: Upgrade to 1.5.0 Jussi Kukkonen
2016-05-12 7:20 ` [PATCH 03/13] xkeyboard-config: Upgrade to 2.17 Jussi Kukkonen
2016-05-12 7:20 ` [PATCH 04/13] libinput: Upgrade 1.1.4 -> 1.3.0 Jussi Kukkonen
2016-05-12 7:20 ` [PATCH 05/13] xf86-input-evdev: Upgrade 2.10.1 -> 2.10.2 Jussi Kukkonen
2016-05-12 7:20 ` [PATCH 06/13] videoproto: Upgrade 2.3.2 -> 2.3.3 Jussi Kukkonen
2016-05-12 7:20 ` [PATCH 07/13] libxkbcommon: Upgrade 0.5.0 -> 0.6.1 Jussi Kukkonen
2016-05-12 7:20 ` [PATCH 08/13] libdrm: Upgrade 2.4.67 -> 2.4.68 Jussi Kukkonen
2016-05-12 7:20 ` [PATCH 09/13] mesa: Upgrade 11.1.1 -> 11.2.2 Jussi Kukkonen
2016-05-12 7:20 ` [PATCH 10/13] pixman: Upgrade 0.32.8 -> 0.34.0 Jussi Kukkonen
2016-05-12 7:20 ` [PATCH 11/13] wayland: Upgrade 1.9.0 -> 1.10.0 Jussi Kukkonen
2016-05-12 7:20 ` [PATCH 12/13] wayland-protocols: Add recipe Jussi Kukkonen
2016-05-13 9:15 ` Burton, Ross
2016-05-13 11:04 ` Jussi Kukkonen
2016-05-12 7:20 ` [PATCH 13/13] weston: Upgrade 1.9.0 -> 1.10.0 Jussi Kukkonen
2016-05-13 20:15 ` Otavio Salvador
2016-05-16 8:18 ` Jussi Kukkonen
2016-05-16 10:43 ` Otavio Salvador
2016-05-16 15:50 ` Khem Raj
2016-05-16 16:22 ` Otavio Salvador
2016-05-17 7:31 ` Jussi Kukkonen
2016-05-17 8:38 ` Burton, Ross
2016-05-17 14:00 ` Otavio Salvador
2016-05-17 20:24 ` Richard Purdie
2016-05-18 7:17 ` Jussi Kukkonen
2016-07-13 6:49 ` Khem Raj
2016-07-13 7:31 ` Jussi Kukkonen
2016-05-26 17:23 ` Martin Jansa
2016-05-26 19:13 ` Burton, Ross
2016-05-26 19:14 ` Burton, Ross
2016-06-01 12:49 ` Martin Jansa [this message]
2016-05-12 7:57 ` [PATCH 00/13] Upgrades around graphics stack Jussi Kukkonen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160601124936.19277-1-Martin.Jansa@gmail.com \
--to=martin.jansa@gmail.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox