CVS commit: pkgsrc/wm/swc

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Sun May 19 16:01:26 UTC 2024

Modified Files:
        pkgsrc/wm/swc: Makefile distinfo
Added Files:
        pkgsrc/wm/swc/patches: patch-libswc_seat-ws.c patch-libswc_swc.c

Log Message:
swc: Update to a snapshot from July 2023.

Main changes: Restored Xwayland support and support for newer protocols.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 pkgsrc/wm/swc/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/wm/swc/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/wm/swc/patches/patch-libswc_seat-ws.c
cvs rdiff -u -r0 -r1.4 pkgsrc/wm/swc/patches/patch-libswc_swc.c

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

Modified files:

Index: pkgsrc/wm/swc/Makefile
diff -u pkgsrc/wm/swc/Makefile:1.17 pkgsrc/wm/swc/Makefile:1.18
--- pkgsrc/wm/swc/Makefile:1.17 Sat Apr  6 08:06:51 2024
+++ pkgsrc/wm/swc/Makefile      Sun May 19 16:01:26 2024
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.17 2024/04/06 08:06:51 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2024/05/19 16:01:26 nia Exp $
 
-DISTNAME=      swc-0.0.0.20200228
-PKGREVISION=   6
+DISTNAME=      swc-0.0.0.20230701
 CATEGORIES=    wm
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=michaelforney/}
 GITHUB_PROJECT=        swc
-GITHUB_TAG=    86b45d5701e509660650facdad4f7bef8f4f5362
+GITHUB_TAG=    19893a5ca3239082b904a04fdb9ac7c3a1fb62e2
 
 MAINTAINER=    nia%NetBSD.org@localhost
 HOMEPAGE=      https://github.com/michaelforney/swc
@@ -26,6 +25,7 @@ BUILDLINK_API_DEPENDS.libdrm+=        libdrm>=2
 .include "../../devel/wayland/buildlink3.mk"
 .include "../../devel/wayland-protocols/buildlink3.mk"
 .include "../../graphics/wld/buildlink3.mk"
+.include "../../x11/xcb-util-wm/buildlink3.mk"
 .include "../../x11/libdrm/buildlink3.mk"
 .include "../../x11/libxkbcommon/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/wm/swc/distinfo
diff -u pkgsrc/wm/swc/distinfo:1.11 pkgsrc/wm/swc/distinfo:1.12
--- pkgsrc/wm/swc/distinfo:1.11 Tue Oct 26 11:25:18 2021
+++ pkgsrc/wm/swc/distinfo      Sun May 19 16:01:26 2024
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.11 2021/10/26 11:25:18 nia Exp $
+$NetBSD: distinfo,v 1.12 2024/05/19 16:01:26 nia Exp $
 
-BLAKE2s (swc-0.0.0.20200228-86b45d5701e509660650facdad4f7bef8f4f5362.tar.gz) = 7f2b932910f29a7ea4a938eebbbfc414c616be01fbcb9255a9555363357a846b
-SHA512 (swc-0.0.0.20200228-86b45d5701e509660650facdad4f7bef8f4f5362.tar.gz) = 
069f368415820f7cef93b4cb6482b073a24250777ec9c27182a339b63dd86081a55e42fbbf2a1152a64de524113657ab57b2c9ede373c48c95d00d3135f7733a
-Size (swc-0.0.0.20200228-86b45d5701e509660650facdad4f7bef8f4f5362.tar.gz) = 88361 bytes
-SHA1 (patch-libswc_surface.c) = 755f60197d5df6d8b7a5817ce6958e1e43abe9f2
-SHA1 (patch-libswc_swc.c) = 89b812a219bf59df08729baacb763e170f263625
+BLAKE2s (swc-0.0.0.20230701-19893a5ca3239082b904a04fdb9ac7c3a1fb62e2.tar.gz) = 8d5c343c5480ea909a991e64bc44494388aad30a1693bd86a90b19c3e92e39b0
+SHA512 (swc-0.0.0.20230701-19893a5ca3239082b904a04fdb9ac7c3a1fb62e2.tar.gz) = 
8ac232382dfb547abe62c1a6bd317eafcf79412484aea575669c84ac9c986a4891558402849b657340c56c58cf196e7b1a2da8e7d32348f69016fa4e5b9a5f8f
+Size (swc-0.0.0.20230701-19893a5ca3239082b904a04fdb9ac7c3a1fb62e2.tar.gz) = 95182 bytes
+SHA1 (patch-libswc_seat-ws.c) = 00d5595879acb9a5060cbd27e97e0c1e78e499b4
+SHA1 (patch-libswc_swc.c) = bd45e2a461bb368301a53537b04dce480671e55d

Added files:

Index: pkgsrc/wm/swc/patches/patch-libswc_seat-ws.c
diff -u /dev/null pkgsrc/wm/swc/patches/patch-libswc_seat-ws.c:1.1
--- /dev/null   Sun May 19 16:01:26 2024
+++ pkgsrc/wm/swc/patches/patch-libswc_seat-ws.c        Sun May 19 16:01:26 2024
@@ -0,0 +1,26 @@
+$NetBSD: patch-libswc_seat-ws.c,v 1.1 2024/05/19 16:01:26 nia Exp $
+
+Update for latest version of pointer API.
+
+https://github.com/michaelforney/swc/pull/76
+
+--- libswc/seat-ws.c.orig      2024-05-19 15:46:59.732010088 +0000
++++ libswc/seat-ws.c
+@@ -274,11 +274,15 @@ handle_ws_data(int fd, uint32_t mask, vo
+                       break;
+               case WSCONS_EVENT_MOUSE_DELTA_Z:
+                       pos = wl_fixed_from_int(ev.value * 10);
+-                      pointer_handle_axis(seat->base.pointer, time, 0, pos);
++                      pointer_handle_axis(seat->base.pointer, time,
++                              WL_POINTER_AXIS_VERTICAL_SCROLL,
++                              WL_POINTER_AXIS_SOURCE_WHEEL, pos, pos * 12);
+                       break;
+               case WSCONS_EVENT_MOUSE_DELTA_W:
+                       pos = wl_fixed_from_int(ev.value * 10);
+-                      pointer_handle_axis(seat->base.pointer, time, 1, pos);
++                      pointer_handle_axis(seat->base.pointer, time,
++                              WL_POINTER_AXIS_HORIZONTAL_SCROLL,
++                              WL_POINTER_AXIS_SOURCE_WHEEL, pos, pos * 12);
+                       break;
+               case WSCONS_EVENT_MOUSE_ABSOLUTE_X:
+                       pos = wl_fixed_from_int(ev.value);

Index: pkgsrc/wm/swc/patches/patch-libswc_swc.c
diff -u /dev/null pkgsrc/wm/swc/patches/patch-libswc_swc.c:1.4
--- /dev/null   Sun May 19 16:01:26 2024
+++ pkgsrc/wm/swc/patches/patch-libswc_swc.c    Sun May 19 16:01:26 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-libswc_swc.c,v 1.4 2024/05/19 16:01:26 nia Exp $
+
+Make starting xwayland non-fatal.
+
+--- libswc/swc.c.orig  2024-05-19 15:53:22.716215256 +0000
++++ libswc/swc.c
+@@ -199,7 +199,7 @@ swc_initialize(struct wl_display *displa
+ #ifdef ENABLE_XWAYLAND
+       if (!xserver_initialize()) {
+               ERROR("Could not initialize xwayland\n");
+-              goto error14;
++              /*goto error14;*/
+       }
+ #endif
+