CVS commit: pkgsrc/x11/modular-xorg-server

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Thu Aug 22 13:12:32 UTC 2019

Modified Files:
        pkgsrc/x11/modular-xorg-server: PLIST distinfo options.mk
Added Files:
        pkgsrc/x11/modular-xorg-server/patches:
            patch-hw_xwayland_xwayland-input.c

Log Message:
modular-xorg-server: Add Xwayland support to options.mk.

This no longer needs modular X to build with DRI, so make that
unconditional.


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 pkgsrc/x11/modular-xorg-server/PLIST
cvs rdiff -u -r1.94 -r1.95 pkgsrc/x11/modular-xorg-server/distinfo
cvs rdiff -u -r1.19 -r1.20 pkgsrc/x11/modular-xorg-server/options.mk
cvs rdiff -u -r0 -r1.1 \
    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/x11/modular-xorg-server/PLIST
diff -u pkgsrc/x11/modular-xorg-server/PLIST:1.28 pkgsrc/x11/modular-xorg-server/PLIST:1.29
--- pkgsrc/x11/modular-xorg-server/PLIST:1.28   Fri May 11 13:47:35 2018
+++ pkgsrc/x11/modular-xorg-server/PLIST        Thu Aug 22 13:12:31 2019
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.28 2018/05/11 13:47:35 wiz Exp $
+@comment $NetBSD: PLIST,v 1.29 2019/08/22 13:12:31 nia Exp $
 bin/X
 bin/Xnest
 bin/Xorg
 bin/Xvfb
+${PLIST.wayland}bin/Xwayland
 bin/cvt
 bin/gtf
 include/xorg/BT.h

Index: pkgsrc/x11/modular-xorg-server/distinfo
diff -u pkgsrc/x11/modular-xorg-server/distinfo:1.94 pkgsrc/x11/modular-xorg-server/distinfo:1.95
--- pkgsrc/x11/modular-xorg-server/distinfo:1.94        Thu Feb 28 12:32:39 2019
+++ pkgsrc/x11/modular-xorg-server/distinfo     Thu Aug 22 13:12:31 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.94 2019/02/28 12:32:39 tnn Exp $
+$NetBSD: distinfo,v 1.95 2019/08/22 13:12:31 nia Exp $
 
 SHA1 (xorg-server-1.20.4.tar.bz2) = 1a79da92122124cb782a4eebfd83fd33d5c0d7d4
 RMD160 (xorg-server-1.20.4.tar.bz2) = cad624e1d1ada0b46a76a1e5de6b12446f7c6dda
@@ -16,4 +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-test_xtest.c) = 77622ef481e91e64b3a6dd64b8579404f33ec88f

Index: pkgsrc/x11/modular-xorg-server/options.mk
diff -u pkgsrc/x11/modular-xorg-server/options.mk:1.19 pkgsrc/x11/modular-xorg-server/options.mk:1.20
--- pkgsrc/x11/modular-xorg-server/options.mk:1.19      Fri May 11 13:47:35 2018
+++ pkgsrc/x11/modular-xorg-server/options.mk   Thu Aug 22 13:12:31 2019
@@ -1,16 +1,12 @@
-# $NetBSD: options.mk,v 1.19 2018/05/11 13:47:35 wiz Exp $
+# $NetBSD: options.mk,v 1.20 2019/08/22 13:12:31 nia Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.modular-xorg-server
-PKG_SUPPORTED_OPTIONS= inet6 debug dtrace
-PKG_SUGGESTED_OPTIONS= inet6
-.if ${X11_TYPE} == "modular"
-PKG_SUPPORTED_OPTIONS+=        dri
-PKG_SUGGESTED_OPTIONS+=        dri
-.endif
+PKG_SUPPORTED_OPTIONS= inet6 dri debug dtrace wayland
+PKG_SUGGESTED_OPTIONS= inet6 dri
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=           dri dtrace
+PLIST_VARS+=           dri dtrace wayland
 
 .if !empty(PKG_OPTIONS:Mdri)
 .include "../../graphics/libepoxy/buildlink3.mk"
@@ -59,3 +55,13 @@ CONFIGURE_ARGS+=     --with-dtrace
 .else
 CONFIGURE_ARGS+=       --without-dtrace
 .endif
+
+.if !empty(PKG_OPTIONS:Mwayland)
+PLIST.wayland=         yes
+CONFIGURE_ARGS+=       --enable-xwayland
+CONFIGURE_ARGS+=       --disable-xwayland-eglstream
+.include "../../devel/wayland/buildlink3.mk"
+.include "../../devel/wayland-protocols/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --disable-xwayland
+.endif

Added files:

Index: pkgsrc/x11/modular-xorg-server/patches/patch-hw_xwayland_xwayland-input.c
diff -u /dev/null pkgsrc/x11/modular-xorg-server/patches/patch-hw_xwayland_xwayland-input.c:1.1
--- /dev/null   Thu Aug 22 13:12:32 2019
+++ pkgsrc/x11/modular-xorg-server/patches/patch-hw_xwayland_xwayland-input.c   Thu Aug 22 13:12:31 2019
@@ -0,0 +1,21 @@
+$NetBSD: patch-hw_xwayland_xwayland-input.c,v 1.1 2019/08/22 13:12:31 nia Exp $
+
+Support non-evdev platforms.
+
+--- hw/xwayland/xwayland-input.c.orig  2019-02-26 19:28:50.000000000 +0000
++++ hw/xwayland/xwayland-input.c
+@@ -26,7 +26,14 @@
+ 
+ #include "xwayland.h"
+ 
++#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)
++#endif
+ 
+ #include <sys/mman.h>
+ #include <xkbsrv.h>