Tue Jun 8 22:51:11 2021 UTC ()
modular-xorg-xephyr: fix build on Solaris 10

From pkg/56169; thanks for reporting!


(khorben)
diff -r1.39 -r1.40 pkgsrc/x11/modular-xorg-server/Makefile.common
diff -r1.107 -r1.108 pkgsrc/x11/modular-xorg-server/distinfo
diff -r1.1 -r1.2 pkgsrc/x11/modular-xorg-server/patches/patch-hw_kdrive_ephyr_hostx.c
diff -r1.2 -r1.3 pkgsrc/x11/modular-xorg-server/patches/patch-hw_xwayland_xwayland-input.c
diff -r0 -r1.1 pkgsrc/x11/modular-xorg-server/patches/patch-os_backtrace.c
diff -r0 -r1.1 pkgsrc/x11/modular-xorg-server/patches/patch-xkb_XKBAlloc.c
cvs diff -r1.39 -r1.40 pkgsrc/x11/modular-xorg-server/Makefile.common (expand / switch to unified diff)

--- pkgsrc/x11/modular-xorg-server/Makefile.common 2021/04/13 18:46:55 1.39
+++ pkgsrc/x11/modular-xorg-server/Makefile.common 2021/06/08 22:51:11 1.40
@@ -1,30 +1,31 @@ @@ -1,30 +1,31 @@
1# $NetBSD: Makefile.common,v 1.39 2021/04/13 18:46:55 wiz Exp $ 1# $NetBSD: Makefile.common,v 1.40 2021/06/08 22:51:11 khorben Exp $
2# used by x11/modular-xorg-server/Makefile 2# used by x11/modular-xorg-server/Makefile
3# used by x11/modular-xorg-xephyr/Makefile 3# used by x11/modular-xorg-xephyr/Makefile
4# used by x11/modular-xorg-xwayland/Makefile 4# used by x11/modular-xorg-xwayland/Makefile
5 5
6XORG_VERSION= 1.20.11 6XORG_VERSION= 1.20.11
7CATEGORIES= x11 7CATEGORIES= x11
8MASTER_SITES= ${MASTER_SITE_XORG:=xserver/} 8MASTER_SITES= ${MASTER_SITE_XORG:=xserver/}
9EXTRACT_SUFX= .tar.bz2 9EXTRACT_SUFX= .tar.bz2
10 10
11HOMEPAGE= https://xorg.freedesktop.org/ 11HOMEPAGE= https://xorg.freedesktop.org/
12LICENSE= mit AND modified-bsd AND x11 # with no-advertising clause 12LICENSE= mit AND modified-bsd AND x11 # with no-advertising clause
13 13
14GNU_CONFIGURE= yes 14GNU_CONFIGURE= yes
15USE_LIBTOOL= yes 15USE_LIBTOOL= yes
16USE_TOOLS+= gmake pkg-config 16USE_TOOLS+= gmake pkg-config
17USE_LANGUAGES+= c99 17USE_LANGUAGES+= c99
 18USE_FEATURES+= strnlen err
18 19
19CHECK_PORTABILITY_SKIP+= hw/xquartz/bundle/mk_bundke.sh 20CHECK_PORTABILITY_SKIP+= hw/xquartz/bundle/mk_bundke.sh
20 21
21PKGCONFIG_OVERRIDE+= xorg-server.pc.in 22PKGCONFIG_OVERRIDE+= xorg-server.pc.in
22SHLIBTOOL_OVERRIDE= # empty 23SHLIBTOOL_OVERRIDE= # empty
23 24
24BUILD_DEFS+= VARBASE 25BUILD_DEFS+= VARBASE
25BUILD_DEFS_EFFECTS+= XKB_OUTPUT_DIR 26BUILD_DEFS_EFFECTS+= XKB_OUTPUT_DIR
26 27
27OWN_DIRS+= ${VARBASE}/log 28OWN_DIRS+= ${VARBASE}/log
28OWN_DIRS+= ${XKB_OUTPUT_DIR} 29OWN_DIRS+= ${XKB_OUTPUT_DIR}
29XKB_OUTPUT_DIR?= ${VARBASE}/db/xkb # XXX sync with xkeyboard-config 30XKB_OUTPUT_DIR?= ${VARBASE}/db/xkb # XXX sync with xkeyboard-config
30 31
cvs diff -r1.107 -r1.108 pkgsrc/x11/modular-xorg-server/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/modular-xorg-server/distinfo 2021/04/25 07:51:27 1.107
+++ pkgsrc/x11/modular-xorg-server/distinfo 2021/06/08 22:51:11 1.108
@@ -1,21 +1,23 @@ @@ -1,21 +1,23 @@
1$NetBSD: distinfo,v 1.107 2021/04/25 07:51:27 mrg Exp $ 1$NetBSD: distinfo,v 1.108 2021/06/08 22:51:11 khorben Exp $
2 2
3SHA1 (xorg-server-1.20.11.tar.bz2) = 86ae4add5719e6026a569f5559d51e8707171d5d 3SHA1 (xorg-server-1.20.11.tar.bz2) = 86ae4add5719e6026a569f5559d51e8707171d5d
4RMD160 (xorg-server-1.20.11.tar.bz2) = 9b451d5523e9384df37e0e91f52d843090590d23 4RMD160 (xorg-server-1.20.11.tar.bz2) = 9b451d5523e9384df37e0e91f52d843090590d23
5SHA512 (xorg-server-1.20.11.tar.bz2) = 1017015b9fd5d53788abe3641d877e6df8609841fa5c1847c0a5e133ddcc1b758a5d695304ebd36828099ec201a85b6b70b46f5ea4f81c5bd3a16fa6e175e3c2 5SHA512 (xorg-server-1.20.11.tar.bz2) = 1017015b9fd5d53788abe3641d877e6df8609841fa5c1847c0a5e133ddcc1b758a5d695304ebd36828099ec201a85b6b70b46f5ea4f81c5bd3a16fa6e175e3c2
6Size (xorg-server-1.20.11.tar.bz2) = 6476116 bytes 6Size (xorg-server-1.20.11.tar.bz2) = 6476116 bytes
7SHA1 (patch-configure) = 4c2d439e622ec14ec2f8a3a2f556c67e60259f82 7SHA1 (patch-configure) = 4c2d439e622ec14ec2f8a3a2f556c67e60259f82
8SHA1 (patch-hw_kdrive_ephyr_hostx.c) = b681ee28bc7af06774f10bc882d355d42ac965d3 8SHA1 (patch-hw_kdrive_ephyr_hostx.c) = ec8b6128a26d605e50e8d1be3477558eda17a096
9SHA1 (patch-hw_xfree86_common_xf86AutoConfig.c) = 70adf85be9fc6222a335686e7e9e9f385aca02f9 9SHA1 (patch-hw_xfree86_common_xf86AutoConfig.c) = 70adf85be9fc6222a335686e7e9e9f385aca02f9
10SHA1 (patch-hw_xfree86_common_xf86sbusBus.h) = f56f87336b2f669413ebb1005a2b64568a111f92 10SHA1 (patch-hw_xfree86_common_xf86sbusBus.h) = f56f87336b2f669413ebb1005a2b64568a111f92
11SHA1 (patch-hw_xfree86_dri2_dri2.c) = 0bf58305059321e10f6f58186301dbb7cb858c2a 11SHA1 (patch-hw_xfree86_dri2_dri2.c) = 0bf58305059321e10f6f58186301dbb7cb858c2a
12SHA1 (patch-hw_xfree86_os-support_bsd_arm__video.c) = 9c03b24f44eafc5fabe27e9d6cc6c54b607e47c3 12SHA1 (patch-hw_xfree86_os-support_bsd_arm__video.c) = 9c03b24f44eafc5fabe27e9d6cc6c54b607e47c3
13SHA1 (patch-hw_xfree86_os-support_bsd_bsd__VTsw.c) = 90343f694c27a6fdd5070e1167687943bd056a99 13SHA1 (patch-hw_xfree86_os-support_bsd_bsd__VTsw.c) = 90343f694c27a6fdd5070e1167687943bd056a99
14SHA1 (patch-hw_xfree86_os-support_bsd_bsd__init.c) = b58ce2005251c1b3f723ee87c759f75bcb27e230 14SHA1 (patch-hw_xfree86_os-support_bsd_bsd__init.c) = b58ce2005251c1b3f723ee87c759f75bcb27e230
15SHA1 (patch-hw_xfree86_os-support_bsd_i386__video.c) = f2c72562a40c0e3109991453aff9c2c082526b1b 15SHA1 (patch-hw_xfree86_os-support_bsd_i386__video.c) = f2c72562a40c0e3109991453aff9c2c082526b1b
16SHA1 (patch-hw_xfree86_os-support_bus_Sbus.c) = 0035b970bdae1bab51b8ca6bfeed060ec4df3a60 16SHA1 (patch-hw_xfree86_os-support_bus_Sbus.c) = 0035b970bdae1bab51b8ca6bfeed060ec4df3a60
17SHA1 (patch-hw_xfree86_os-support_solaris_solaris-amd64.S) = 088a3118deb7567194e08dd46e34cb6edba38400 17SHA1 (patch-hw_xfree86_os-support_solaris_solaris-amd64.S) = 088a3118deb7567194e08dd46e34cb6edba38400
18SHA1 (patch-hw_xfree86_os-support_xf86_OSproc.h) = e1c049857893d2f050d5fb297a3e8ef86f0b1d7e 18SHA1 (patch-hw_xfree86_os-support_xf86_OSproc.h) = e1c049857893d2f050d5fb297a3e8ef86f0b1d7e
19SHA1 (patch-hw_xfree86_os_support_bus_xf86Sbus.h) = 0e0a243b737f8f762c9f8f24a2265d1b6aefb544 19SHA1 (patch-hw_xfree86_os_support_bus_xf86Sbus.h) = 0e0a243b737f8f762c9f8f24a2265d1b6aefb544
20SHA1 (patch-hw_xwayland_xwayland-input.c) = b876642a56f4930dfaa88cff77d4518cfe9d73e0 20SHA1 (patch-hw_xwayland_xwayland-input.c) = 4e34681371f7fc66f462ff00f4775aa6411d0282
 21SHA1 (patch-os_backtrace.c) = 090ceba8a7f0fa61a1953d0f79603af6254b6fed
21SHA1 (patch-test_xtest.c) = 77622ef481e91e64b3a6dd64b8579404f33ec88f 22SHA1 (patch-test_xtest.c) = 77622ef481e91e64b3a6dd64b8579404f33ec88f
 23SHA1 (patch-xkb_XKBAlloc.c) = 099c2617b759d3ef115174610fe80a17d021c784
cvs diff -r1.1 -r1.2 pkgsrc/x11/modular-xorg-server/patches/patch-hw_kdrive_ephyr_hostx.c (expand / switch to unified diff)

--- pkgsrc/x11/modular-xorg-server/patches/patch-hw_kdrive_ephyr_hostx.c 2020/09/28 01:08:15 1.1
+++ pkgsrc/x11/modular-xorg-server/patches/patch-hw_kdrive_ephyr_hostx.c 2021/06/08 22:51:11 1.2
@@ -1,15 +1,29 @@ @@ -1,15 +1,29 @@
1$NetBSD: patch-hw_kdrive_ephyr_hostx.c,v 1.1 2020/09/28 01:08:15 khorben Exp $ 1$NetBSD: patch-hw_kdrive_ephyr_hostx.c,v 1.2 2021/06/08 22:51:11 khorben Exp $
2 2
3Fix Xephyr visual with -parent option 3Fix Xephyr visual with -parent option
4 4
5--- hw/kdrive/ephyr/hostx.c.orig 2020-03-29 20:21:15.000000000 +0000 5--- hw/kdrive/ephyr/hostx.c.orig 2021-04-13 14:11:40.000000000 +0000
6+++ hw/kdrive/ephyr/hostx.c 6+++ hw/kdrive/ephyr/hostx.c
7@@ -622,7 +622,7 @@ hostx_init(void) 7@@ -36,7 +36,13 @@
 8 #include <string.h> /* for memset */
 9 #include <errno.h>
 10 #include <time.h>
 11+#if defined(HAVE_NBCOMPAT_H)
 12+#include <nbcompat/config.h>
 13+#include <nbcompat/cdefs.h>
 14+#include <nbcompat/err.h>
 15+#else
 16 #include <err.h>
 17+#endif
 18
 19 #include <sys/ipc.h>
 20 #include <sys/shm.h>
 21@@ -622,7 +628,7 @@ hostx_init(void)
8 scrpriv->win_height, 22 scrpriv->win_height,
9 0, 23 0,
10 XCB_WINDOW_CLASS_COPY_FROM_PARENT, 24 XCB_WINDOW_CLASS_COPY_FROM_PARENT,
11- HostX.visual->visual_id, 25- HostX.visual->visual_id,
12+ XCB_COPY_FROM_PARENT, 26+ XCB_COPY_FROM_PARENT,
13 attr_mask, 27 attr_mask,
14 attrs); 28 attrs);
15 } 29 }
cvs diff -r1.2 -r1.3 pkgsrc/x11/modular-xorg-server/patches/Attic/patch-hw_xwayland_xwayland-input.c (expand / switch to unified diff)

--- pkgsrc/x11/modular-xorg-server/patches/Attic/patch-hw_xwayland_xwayland-input.c 2019/10/29 22:46:39 1.2
+++ pkgsrc/x11/modular-xorg-server/patches/Attic/patch-hw_xwayland_xwayland-input.c 2021/06/08 22:51:11 1.3
@@ -1,21 +1,30 @@ @@ -1,21 +1,30 @@
1$NetBSD: patch-hw_xwayland_xwayland-input.c,v 1.2 2019/10/29 22:46:39 nia Exp $ 1$NetBSD: patch-hw_xwayland_xwayland-input.c,v 1.3 2021/06/08 22:51:11 khorben Exp $
2 2
 3Fix build on Solaris 10/amd64 (from pkg/56169)
3Support non-evdev platforms. 4Support non-evdev platforms.
4 5
5--- hw/xwayland/xwayland-input.c.orig 2019-02-26 19:28:50.000000000 +0000 6--- hw/xwayland/xwayland-input.c.orig 2021-04-13 14:11:40.000000000 +0000
6+++ hw/xwayland/xwayland-input.c 7+++ hw/xwayland/xwayland-input.c
7@@ -26,7 +26,14 @@ 8@@ -26,7 +26,22 @@
8  9
9 #include "xwayland.h" 10 #include "xwayland.h"
10  11
 12+#if defined(HAVE_NBCOMPAT_H)
 13+#include <nbcompat/config.h>
 14+#include <nbcompat/cdefs.h>
 15+#include <nbcompat/string.h>
 16+#else
 17+#include <string.h>
 18+#endif
 19+
11+#if defined(__linux__) || defined(__FreeBSD__) 20+#if defined(__linux__) || defined(__FreeBSD__)
12 #include <linux/input.h> 21 #include <linux/input.h>
13+#else 22+#else
14+#define BTN_LEFT (0x110) 23+#define BTN_LEFT (0x110)
15+#define BTN_RIGHT (0x111) 24+#define BTN_RIGHT (0x111)
16+#define BTN_MIDDLE (0x112) 25+#define BTN_MIDDLE (0x112)
17+#define BTN_SIDE (0x113) 26+#define BTN_SIDE (0x113)
18+#endif 27+#endif
19  28
20 #include <sys/mman.h> 29 #include <sys/mman.h>
21 #include <xkbsrv.h> 30 #include <xkbsrv.h>
File Added: pkgsrc/x11/modular-xorg-server/patches/patch-os_backtrace.c
$NetBSD: patch-os_backtrace.c,v 1.1 2021/06/08 22:51:11 khorben Exp $

Fix build on Solaris 10/amd64 (from pkg/56169)

--- os/backtrace.c.orig	2021-04-13 14:11:40.000000000 +0000
+++ os/backtrace.c
@@ -29,6 +29,7 @@
 #include "misc.h"
 #include <errno.h>
 #include <string.h>
+#include <unistd.h>
 
 #ifdef HAVE_LIBUNWIND
File Added: pkgsrc/x11/modular-xorg-server/patches/Attic/patch-xkb_XKBAlloc.c
$NetBSD: patch-xkb_XKBAlloc.c,v 1.1 2021/06/08 22:51:11 khorben Exp $

Fix build on Solaris 10/amd64 (from pkg/56169)

--- xkb/XKBAlloc.c.orig	2021-04-13 14:11:40.000000000 +0000
+++ xkb/XKBAlloc.c
@@ -36,7 +36,13 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <xkbsrv.h>
 #include "xkbgeom.h"
 #include <os.h>
+#if defined(HAVE_NBCOMPAT_H)
+#include <nbcompat/config.h>
+#include <nbcompat/cdefs.h>
+#include <nbcompat/string.h>
+#else
 #include <string.h>
+#endif
 
 /***===================================================================***/