CVS commit: pkgsrc/devel/SDL2

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Mon Feb 24 11:55:36 UTC 2020

Modified Files:
        pkgsrc/devel/SDL2: Makefile distinfo
        pkgsrc/devel/SDL2/patches: patch-src_video_wayland_SDL__waylandevents.c
Added Files:
        pkgsrc/devel/SDL2/patches: patch-src_video_wayland_SDL__waylanddyn.h
            patch-src_video_wayland_SDL__waylandsym.h
            patch-src_video_wayland_SDL__waylandvideo.c

Log Message:
SDL2: Apply upstream patch for wayland protocol error


To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 pkgsrc/devel/SDL2/Makefile
cvs rdiff -u -r1.36 -r1.37 pkgsrc/devel/SDL2/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/SDL2/patches/patch-src_video_wayland_SDL__waylanddyn.h \
    pkgsrc/devel/SDL2/patches/patch-src_video_wayland_SDL__waylandsym.h \
    pkgsrc/devel/SDL2/patches/patch-src_video_wayland_SDL__waylandvideo.c
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/devel/SDL2/patches/patch-src_video_wayland_SDL__waylandevents.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/SDL2/Makefile
diff -u pkgsrc/devel/SDL2/Makefile:1.43 pkgsrc/devel/SDL2/Makefile:1.44
--- pkgsrc/devel/SDL2/Makefile:1.43     Sun Jan 26 17:30:55 2020
+++ pkgsrc/devel/SDL2/Makefile  Mon Feb 24 11:55:36 2020
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.43 2020/01/26 17:30:55 rillig Exp $
+# $NetBSD: Makefile,v 1.44 2020/02/24 11:55:36 nia Exp $
 
 DISTNAME=      SDL2-2.0.10
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    devel
 MASTER_SITES=  http://www.libsdl.org/release/
 

Index: pkgsrc/devel/SDL2/distinfo
diff -u pkgsrc/devel/SDL2/distinfo:1.36 pkgsrc/devel/SDL2/distinfo:1.37
--- pkgsrc/devel/SDL2/distinfo:1.36     Tue Oct 29 22:46:39 2019
+++ pkgsrc/devel/SDL2/distinfo  Mon Feb 24 11:55:36 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.36 2019/10/29 22:46:39 nia Exp $
+$NetBSD: distinfo,v 1.37 2020/02/24 11:55:36 nia Exp $
 
 SHA1 (SDL2-2.0.10.tar.gz) = fb31312ea1d4b45db839796ae2336dfe3d5884e5
 RMD160 (SDL2-2.0.10.tar.gz) = b35818cbf8eaf0c9c4d3b6d7a293c05a368366b2
@@ -7,5 +7,8 @@ Size (SDL2-2.0.10.tar.gz) = 5550762 byte
 SHA1 (patch-configure) = 1631314dab18886ea553ee53fac89e16718cacab
 SHA1 (patch-src_joystick_bsd_SDL__sysjoystick.c) = 1c5756e47ad906235369b46b36d7b0b1ee776156
 SHA1 (patch-src_video_cocoa_SDL__cocoawindow.m) = 1d5ac9c17ceadf668925734b5cad311e26f2fc58
-SHA1 (patch-src_video_wayland_SDL__waylandevents.c) = 70eaf9a63555c067b040fd21a93c98718dd59a4d
+SHA1 (patch-src_video_wayland_SDL__waylanddyn.h) = 0387bedd962154c4de0d6dda78b4e40f992215ac
+SHA1 (patch-src_video_wayland_SDL__waylandevents.c) = 6d6ca278ac26cb85b310f6edfe17107403440c84
+SHA1 (patch-src_video_wayland_SDL__waylandsym.h) = 58bc720c947ca3031e31b66c967872db65a7b767
+SHA1 (patch-src_video_wayland_SDL__waylandvideo.c) = 27281242898fa622b0a30a6126fe542bc0ed7ac1
 SHA1 (patch-src_video_x11_SDL__x11opengl.c) = 70b63021c12c52760c0811c673b259844bdfcdc0

Index: pkgsrc/devel/SDL2/patches/patch-src_video_wayland_SDL__waylandevents.c
diff -u pkgsrc/devel/SDL2/patches/patch-src_video_wayland_SDL__waylandevents.c:1.2 pkgsrc/devel/SDL2/patches/patch-src_video_wayland_SDL__waylandevents.c:1.3
--- pkgsrc/devel/SDL2/patches/patch-src_video_wayland_SDL__waylandevents.c:1.2  Tue Oct 29 22:46:39 2019
+++ pkgsrc/devel/SDL2/patches/patch-src_video_wayland_SDL__waylandevents.c      Mon Feb 24 11:55:36 2020
@@ -1,7 +1,9 @@
-$NetBSD: patch-src_video_wayland_SDL__waylandevents.c,v 1.2 2019/10/29 22:46:39 nia Exp $
+$NetBSD: patch-src_video_wayland_SDL__waylandevents.c,v 1.3 2020/02/24 11:55:36 nia Exp $
 
 Allow building with Wayland on operating systems without evdev.
 
+https://bugzilla.libsdl.org/show_bug.cgi?id=4924
+
 --- src/video/wayland/SDL_waylandevents.c.orig 2019-07-25 04:32:36.000000000 +0000
 +++ src/video/wayland/SDL_waylandevents.c
 @@ -43,7 +43,15 @@
@@ -20,3 +22,16 @@ Allow building with Wayland on operating
  #include <sys/select.h>
  #include <sys/mman.h>
  #include <poll.h>
+@@ -788,8 +796,10 @@ data_device_handle_enter(void *data, str
+         if (has_mime == SDL_TRUE) {
+             dnd_action = WL_DATA_DEVICE_MANAGER_DND_ACTION_COPY;
+         }
+-        wl_data_offer_set_actions(data_device->drag_offer->offer,
+-                                  dnd_action, dnd_action);
++        if (wl_data_offer_get_version(data_device->drag_offer->offer) >= 3) {
++            wl_data_offer_set_actions(data_device->drag_offer->offer,
++                                      dnd_action, dnd_action);
++        }
+     }
+ }
+ 

Added files:

Index: pkgsrc/devel/SDL2/patches/patch-src_video_wayland_SDL__waylanddyn.h
diff -u /dev/null pkgsrc/devel/SDL2/patches/patch-src_video_wayland_SDL__waylanddyn.h:1.1
--- /dev/null   Mon Feb 24 11:55:36 2020
+++ pkgsrc/devel/SDL2/patches/patch-src_video_wayland_SDL__waylanddyn.h Mon Feb 24 11:55:36 2020
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_video_wayland_SDL__waylanddyn.h,v 1.1 2020/02/24 11:55:36 nia Exp $
+
+https://bugzilla.libsdl.org/show_bug.cgi?id=4924
+
+--- src/video/wayland/SDL_waylanddyn.h.orig    2019-07-25 04:32:37.000000000 +0000
++++ src/video/wayland/SDL_waylanddyn.h
+@@ -74,6 +74,7 @@ void SDL_WAYLAND_UnloadSymbols(void);
+ #define wl_proxy_marshal (*WAYLAND_wl_proxy_marshal)
+ #define wl_proxy_set_user_data (*WAYLAND_wl_proxy_set_user_data)
+ #define wl_proxy_get_user_data (*WAYLAND_wl_proxy_get_user_data)
++#define wl_proxy_get_version (*WAYLAND_wl_proxy_get_version)
+ #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)
Index: pkgsrc/devel/SDL2/patches/patch-src_video_wayland_SDL__waylandsym.h
diff -u /dev/null pkgsrc/devel/SDL2/patches/patch-src_video_wayland_SDL__waylandsym.h:1.1
--- /dev/null   Mon Feb 24 11:55:36 2020
+++ pkgsrc/devel/SDL2/patches/patch-src_video_wayland_SDL__waylandsym.h Mon Feb 24 11:55:36 2020
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_video_wayland_SDL__waylandsym.h,v 1.1 2020/02/24 11:55:36 nia Exp $
+
+https://bugzilla.libsdl.org/show_bug.cgi?id=4924
+
+--- src/video/wayland/SDL_waylandsym.h.orig    2019-07-25 04:32:36.000000000 +0000
++++ src/video/wayland/SDL_waylandsym.h
+@@ -40,6 +40,7 @@ SDL_WAYLAND_SYM(void, wl_proxy_destroy, 
+ SDL_WAYLAND_SYM(int, wl_proxy_add_listener, (struct wl_proxy *, void (**)(void), void *))
+ SDL_WAYLAND_SYM(void, wl_proxy_set_user_data, (struct wl_proxy *, void *))
+ SDL_WAYLAND_SYM(void *, wl_proxy_get_user_data, (struct wl_proxy *))
++SDL_WAYLAND_SYM(uint32_t, wl_proxy_get_version, (struct wl_proxy *))
+ SDL_WAYLAND_SYM(uint32_t, wl_proxy_get_id, (struct wl_proxy *))
+ SDL_WAYLAND_SYM(const char *, wl_proxy_get_class, (struct wl_proxy *))
+ SDL_WAYLAND_SYM(void, wl_proxy_set_queue, (struct wl_proxy *, struct wl_event_queue *))
Index: pkgsrc/devel/SDL2/patches/patch-src_video_wayland_SDL__waylandvideo.c
diff -u /dev/null pkgsrc/devel/SDL2/patches/patch-src_video_wayland_SDL__waylandvideo.c:1.1
--- /dev/null   Mon Feb 24 11:55:36 2020
+++ pkgsrc/devel/SDL2/patches/patch-src_video_wayland_SDL__waylandvideo.c       Mon Feb 24 11:55:36 2020
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_video_wayland_SDL__waylandvideo.c,v 1.1 2020/02/24 11:55:36 nia Exp $
+
+https://bugzilla.libsdl.org/show_bug.cgi?id=4924
+
+--- src/video/wayland/SDL_waylandvideo.c.orig  2019-07-25 04:32:36.000000000 +0000
++++ src/video/wayland/SDL_waylandvideo.c
+@@ -381,7 +381,7 @@ display_handle_global(void *data, struct
+     } else if (strcmp(interface, "zwp_pointer_constraints_v1") == 0) {
+         Wayland_display_add_pointer_constraints(d, id);
+     } else if (strcmp(interface, "wl_data_device_manager") == 0) {
+-        d->data_device_manager = wl_registry_bind(d->registry, id, &wl_data_device_manager_interface, 3);
++        d->data_device_manager = wl_registry_bind(d->registry, id, &wl_data_device_manager_interface, SDL_min(3, version));
+     } else if (strcmp(interface, "zxdg_decoration_manager_v1") == 0) {
+         d->decoration_manager = wl_registry_bind(d->registry, id, &zxdg_decoration_manager_v1_interface, 1);
+     } else if (strcmp(interface, "org_kde_kwin_server_decoration_manager") == 0) {