CVS commit: pkgsrc

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Tue Oct 29 22:46:39 UTC 2019

Modified Files:
        pkgsrc/devel/SDL2: distinfo
        pkgsrc/devel/SDL2/patches: patch-src_video_wayland_SDL__waylandevents.c
        pkgsrc/multimedia/mpv: distinfo
        pkgsrc/multimedia/mpv/patches: patch-video_out_wayland__common.c
        pkgsrc/x11/gtk3: distinfo
        pkgsrc/x11/gtk3/patches: patch-gdk_wayland_gdkdevice-wayland.c
        pkgsrc/x11/modular-xorg-server: distinfo
        pkgsrc/x11/modular-xorg-server/patches:
            patch-hw_xwayland_xwayland-input.c

Log Message:
*: fix manual definition of evdev mouse button ids


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 pkgsrc/devel/SDL2/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/devel/SDL2/patches/patch-src_video_wayland_SDL__waylandevents.c
cvs rdiff -u -r1.55 -r1.56 pkgsrc/multimedia/mpv/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/multimedia/mpv/patches/patch-video_out_wayland__common.c
cvs rdiff -u -r1.69 -r1.70 pkgsrc/x11/gtk3/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/x11/gtk3/patches/patch-gdk_wayland_gdkdevice-wayland.c
cvs rdiff -u -r1.95 -r1.96 pkgsrc/x11/modular-xorg-server/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/x11/modular-xorg-server/patches/patch-hw_xwayland_xwayland-input.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/distinfo
diff -u pkgsrc/devel/SDL2/distinfo:1.35 pkgsrc/devel/SDL2/distinfo:1.36
--- pkgsrc/devel/SDL2/distinfo:1.35     Sun Aug 18 16:16:24 2019
+++ pkgsrc/devel/SDL2/distinfo  Tue Oct 29 22:46:39 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.35 2019/08/18 16:16:24 nia Exp $
+$NetBSD: distinfo,v 1.36 2019/10/29 22:46:39 nia Exp $
 
 SHA1 (SDL2-2.0.10.tar.gz) = fb31312ea1d4b45db839796ae2336dfe3d5884e5
 RMD160 (SDL2-2.0.10.tar.gz) = b35818cbf8eaf0c9c4d3b6d7a293c05a368366b2
@@ -7,5 +7,5 @@ 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) = 3a59fde90766bf1219ac204a2ce3596280a6dd2a
+SHA1 (patch-src_video_wayland_SDL__waylandevents.c) = 70eaf9a63555c067b040fd21a93c98718dd59a4d
 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.1 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.1  Sun Aug 18 16:16:25 2019
+++ pkgsrc/devel/SDL2/patches/patch-src_video_wayland_SDL__waylandevents.c      Tue Oct 29 22:46:39 2019
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_video_wayland_SDL__waylandevents.c,v 1.1 2019/08/18 16:16:25 nia Exp $
+$NetBSD: patch-src_video_wayland_SDL__waylandevents.c,v 1.2 2019/10/29 22:46:39 nia Exp $
 
 Allow building with Wayland on operating systems without evdev.
 
@@ -8,14 +8,14 @@ Allow building with Wayland on operating
  #include "xdg-shell-client-protocol.h"
  #include "xdg-shell-unstable-v6-client-protocol.h"
  
-+#ifdef __linux
++#if defined(__linux__) || defined(__FreeBSD__)
  #include <linux/input.h>
 +#else
-+#define BTN_LEFT    (0)
-+#define BTN_MIDDLE  (1)
-+#define BTN_RIGHT   (2)
-+#define BTN_SIDE    (3)
-+#define BTN_EXTRA   (4)
++#define BTN_LEFT    (0x110)
++#define BTN_RIGHT   (0x111)
++#define BTN_MIDDLE  (0x112)
++#define BTN_SIDE    (0x113)
++#define BTN_EXTRA   (0x114)
 +#endif
  #include <sys/select.h>
  #include <sys/mman.h>

Index: pkgsrc/multimedia/mpv/distinfo
diff -u pkgsrc/multimedia/mpv/distinfo:1.55 pkgsrc/multimedia/mpv/distinfo:1.56
--- pkgsrc/multimedia/mpv/distinfo:1.55 Fri Oct 25 14:35:56 2019
+++ pkgsrc/multimedia/mpv/distinfo      Tue Oct 29 22:46:39 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.55 2019/10/25 14:35:56 leot Exp $
+$NetBSD: distinfo,v 1.56 2019/10/29 22:46:39 nia Exp $
 
 SHA1 (mpv-0.30.0.tar.gz) = 94da9cc423339a8d4f583542a4e7c5f794b82e7b
 RMD160 (mpv-0.30.0.tar.gz) = e0272a0ef7dfd58ba6b05a84bd2c0217f36dff3f
@@ -8,5 +8,5 @@ SHA1 (patch-audio_out_ao__alsa.c) = c466
 SHA1 (patch-options_options.c) = 125282ede99098224fc9c16952b44c12b8b3e06b
 SHA1 (patch-player_main.c) = 19b3553477ce7746f516b3db423f253385e918cf
 SHA1 (patch-video_out_drm__common.c) = a545a8aec29f1b3c44d26aacbc59b86d3333a0b9
-SHA1 (patch-video_out_wayland__common.c) = 2c450f47af5e6390d9ee66275f95ee5d62c67ce4
+SHA1 (patch-video_out_wayland__common.c) = 961bb4b87731a0f58fb274edbf49bc511ad2ce90
 SHA1 (patch-wscript) = 2f082a2d3797234bf56859d95c219f5355382224

Index: pkgsrc/multimedia/mpv/patches/patch-video_out_wayland__common.c
diff -u pkgsrc/multimedia/mpv/patches/patch-video_out_wayland__common.c:1.2 pkgsrc/multimedia/mpv/patches/patch-video_out_wayland__common.c:1.3
--- pkgsrc/multimedia/mpv/patches/patch-video_out_wayland__common.c:1.2 Fri Oct 25 14:35:56 2019
+++ pkgsrc/multimedia/mpv/patches/patch-video_out_wayland__common.c     Tue Oct 29 22:46:39 2019
@@ -1,4 +1,4 @@
-$NetBSD: patch-video_out_wayland__common.c,v 1.2 2019/10/25 14:35:56 leot Exp $
+$NetBSD: patch-video_out_wayland__common.c,v 1.3 2019/10/29 22:46:39 nia Exp $
 
 Allow building on systems without evdev.
 
@@ -8,12 +8,12 @@ Allow building on systems without evdev.
  #include <limits.h>
  #include <poll.h>
  #include <unistd.h>
-+#if defined(__linux) || defined(__FreeBSD__)
++#if defined(__linux__) || defined(__FreeBSD__)
  #include <linux/input.h>
 +#else
-+#define BTN_LEFT      (0)
-+#define BTN_MIDDLE    (1)
-+#define BTN_RIGHT     (2)
++#define BTN_LEFT      (0x110)
++#define BTN_RIGHT     (0x111)
++#define BTN_MIDDLE    (0x112)
 +#endif
  #include <time.h>
  #include "common/msg.h"

Index: pkgsrc/x11/gtk3/distinfo
diff -u pkgsrc/x11/gtk3/distinfo:1.69 pkgsrc/x11/gtk3/distinfo:1.70
--- pkgsrc/x11/gtk3/distinfo:1.69       Thu Oct 10 12:04:13 2019
+++ pkgsrc/x11/gtk3/distinfo    Tue Oct 29 22:46:39 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.69 2019/10/10 12:04:13 wiz Exp $
+$NetBSD: distinfo,v 1.70 2019/10/29 22:46:39 nia Exp $
 
 SHA1 (gtk+-3.24.11.tar.xz) = c566d04644ed6f4ea6a401ecb0a80a0851bbd3ad
 RMD160 (gtk+-3.24.11.tar.xz) = 697666cf981cde2d252b0bbb345923d697215766
@@ -8,7 +8,7 @@ SHA1 (patch-aj) = cbfab43f27352f7c6bc57a
 SHA1 (patch-config.h.in) = dc5f8741eed554f88c0b6834cadad95083e4dc8f
 SHA1 (patch-configure) = d531b33e52facf960058f1223b70db680da35300
 SHA1 (patch-configure.ac) = 68793f40752f25ccaecc958c72c23a504670bea5
-SHA1 (patch-gdk_wayland_gdkdevice-wayland.c) = 45dd3346f3adcb030b0d1ec60eeb43e0e6800ad4
+SHA1 (patch-gdk_wayland_gdkdevice-wayland.c) = e283bd6533ea1307b971c524bc05f0d3ee90453d
 SHA1 (patch-gdk_x11_gdkscreen-x11.h) = 455d6c3de8421984ba3c99baf51cd31982a3df78
 SHA1 (patch-gdk_x11_gdkwindow-x11.h) = c80f7c9d5a570817e54fd74fa903a53400dc6f64
 SHA1 (patch-gtk_a11y_gtkaccessibility.c) = 13232c85bd570f21ea03153dacde4ca98c7c76a8

Index: pkgsrc/x11/gtk3/patches/patch-gdk_wayland_gdkdevice-wayland.c
diff -u pkgsrc/x11/gtk3/patches/patch-gdk_wayland_gdkdevice-wayland.c:1.1 pkgsrc/x11/gtk3/patches/patch-gdk_wayland_gdkdevice-wayland.c:1.2
--- pkgsrc/x11/gtk3/patches/patch-gdk_wayland_gdkdevice-wayland.c:1.1   Sun Aug 18 16:47:38 2019
+++ pkgsrc/x11/gtk3/patches/patch-gdk_wayland_gdkdevice-wayland.c       Tue Oct 29 22:46:39 2019
@@ -1,4 +1,4 @@
-$NetBSD: patch-gdk_wayland_gdkdevice-wayland.c,v 1.1 2019/08/18 16:47:38 nia Exp $
+$NetBSD: patch-gdk_wayland_gdkdevice-wayland.c,v 1.2 2019/10/29 22:46:39 nia Exp $
 
 Allow building on systems without evdev.
 
@@ -10,11 +10,11 @@ Allow building on systems without evdev.
  #include <linux/input.h>
 +#else
 +#ifndef BTN_LEFT
-+#define BTN_LEFT      (0)
-+#define BTN_MIDDLE    (1)
-+#define BTN_RIGHT     (2)
-+#define BTN_STYLUS    (98)
-+#define BTN_STYLUS2   (99)
++#define BTN_LEFT      (0x110)
++#define BTN_RIGHT     (0x111)
++#define BTN_MIDDLE    (0x112)
++#define BTN_STYLUS    (0x14b)
++#define BTN_STYLUS2   (0x14c)
 +#endif
  #endif
  

Index: pkgsrc/x11/modular-xorg-server/distinfo
diff -u pkgsrc/x11/modular-xorg-server/distinfo:1.95 pkgsrc/x11/modular-xorg-server/distinfo:1.96
--- pkgsrc/x11/modular-xorg-server/distinfo:1.95        Thu Aug 22 13:12:31 2019
+++ pkgsrc/x11/modular-xorg-server/distinfo     Tue Oct 29 22:46:39 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.95 2019/08/22 13:12:31 nia Exp $
+$NetBSD: distinfo,v 1.96 2019/10/29 22:46:39 nia Exp $
 
 SHA1 (xorg-server-1.20.4.tar.bz2) = 1a79da92122124cb782a4eebfd83fd33d5c0d7d4
 RMD160 (xorg-server-1.20.4.tar.bz2) = cad624e1d1ada0b46a76a1e5de6b12446f7c6dda
@@ -16,5 +16,5 @@ SHA1 (patch-hw_xfree86_os-support_bus_Sb
 SHA1 (patch-hw_xfree86_os-support_solaris_solaris-amd64.S) = 088a3118deb7567194e08dd46e34cb6edba38400
 SHA1 (patch-hw_xfree86_os-support_xf86_OSproc.h) = e1c049857893d2f050d5fb297a3e8ef86f0b1d7e
 SHA1 (patch-hw_xfree86_os_support_bus_xf86Sbus.h) = 0e0a243b737f8f762c9f8f24a2265d1b6aefb544
-SHA1 (patch-hw_xwayland_xwayland-input.c) = 281a28bfb2ddfd92376f61e450f322626dbb43cb
+SHA1 (patch-hw_xwayland_xwayland-input.c) = b876642a56f4930dfaa88cff77d4518cfe9d73e0
 SHA1 (patch-test_xtest.c) = 77622ef481e91e64b3a6dd64b8579404f33ec88f

Index: pkgsrc/x11/modular-xorg-server/patches/patch-hw_xwayland_xwayland-input.c
diff -u pkgsrc/x11/modular-xorg-server/patches/patch-hw_xwayland_xwayland-input.c:1.1 pkgsrc/x11/modular-xorg-server/patches/patch-hw_xwayland_xwayland-input.c:1.2
--- pkgsrc/x11/modular-xorg-server/patches/patch-hw_xwayland_xwayland-input.c:1.1       Thu Aug 22 13:12:31 2019
+++ pkgsrc/x11/modular-xorg-server/patches/patch-hw_xwayland_xwayland-input.c   Tue Oct 29 22:46:39 2019
@@ -1,4 +1,4 @@
-$NetBSD: patch-hw_xwayland_xwayland-input.c,v 1.1 2019/08/22 13:12:31 nia Exp $
+$NetBSD: patch-hw_xwayland_xwayland-input.c,v 1.2 2019/10/29 22:46:39 nia Exp $
 
 Support non-evdev platforms.
 
@@ -8,13 +8,13 @@ Support non-evdev platforms.
  
  #include "xwayland.h"
  
-+#if defined(__linux) || defined(__FreeBSD__)
++#if defined(__linux__) || defined(__FreeBSD__)
  #include <linux/input.h>
 +#else
-+#define BTN_LEFT      (0)
-+#define BTN_MIDDLE    (1)
-+#define BTN_RIGHT     (2)
-+#define BTN_SIDE      (3)
++#define BTN_LEFT      (0x110)
++#define BTN_RIGHT     (0x111)
++#define BTN_MIDDLE    (0x112)
++#define BTN_SIDE      (0x113)
 +#endif
  
  #include <sys/mman.h>