Mon Sep 28 01:08:15 2020 UTC ()
modular-xorg-xephyr: fix Xephyr visual with -parent option

This patch was imported from
https://gitlab.freedesktop.org/xorg/xserver/-/issues/128.

It notably fixes embedding Xephyr into Gtk+ 3 applications, such as
simulator(1) from devel/deforaos-coder.

Tested on netbsd-9/amd64.


(khorben)
diff -r1.103 -r1.104 pkgsrc/x11/modular-xorg-server/distinfo
diff -r0 -r1.1 pkgsrc/x11/modular-xorg-server/patches/patch-hw_kdrive_ephyr_hostx.c
diff -r1.21 -r1.22 pkgsrc/x11/modular-xorg-xephyr/Makefile
cvs diff -r1.103 -r1.104 pkgsrc/x11/modular-xorg-server/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/modular-xorg-server/distinfo 2020/08/26 10:28:39 1.103
+++ pkgsrc/x11/modular-xorg-server/distinfo 2020/09/28 01:08:15 1.104
@@ -1,20 +1,21 @@ @@ -1,20 +1,21 @@
1$NetBSD: distinfo,v 1.103 2020/08/26 10:28:39 wiz Exp $ 1$NetBSD: distinfo,v 1.104 2020/09/28 01:08:15 khorben Exp $
2 2
3SHA1 (xorg-server-1.20.9.tar.bz2) = 4b70ac63fa864f0569712d634a61496d015c3b86 3SHA1 (xorg-server-1.20.9.tar.bz2) = 4b70ac63fa864f0569712d634a61496d015c3b86
4RMD160 (xorg-server-1.20.9.tar.bz2) = 33a2370d1d9ce68774d0ac6fa803f2a4ce19b698 4RMD160 (xorg-server-1.20.9.tar.bz2) = 33a2370d1d9ce68774d0ac6fa803f2a4ce19b698
5SHA512 (xorg-server-1.20.9.tar.bz2) = d9b5f93e1b9763a89187d8b272aa7d4ce9709641b8539f4536708af153310e5a4931bffd4229c51a3b0e3b12da7838750aa71b635751fb4c0bb27438cce4e5e6 5SHA512 (xorg-server-1.20.9.tar.bz2) = d9b5f93e1b9763a89187d8b272aa7d4ce9709641b8539f4536708af153310e5a4931bffd4229c51a3b0e3b12da7838750aa71b635751fb4c0bb27438cce4e5e6
6Size (xorg-server-1.20.9.tar.bz2) = 6302902 bytes 6Size (xorg-server-1.20.9.tar.bz2) = 6302902 bytes
7SHA1 (patch-configure) = ce2c732c3d8493445744a927a25b9cd3b45880f8 7SHA1 (patch-configure) = ce2c732c3d8493445744a927a25b9cd3b45880f8
 8SHA1 (patch-hw_kdrive_ephyr_hostx.c) = b681ee28bc7af06774f10bc882d355d42ac965d3
8SHA1 (patch-hw_xfree86_common_xf86AutoConfig.c) = 70adf85be9fc6222a335686e7e9e9f385aca02f9 9SHA1 (patch-hw_xfree86_common_xf86AutoConfig.c) = 70adf85be9fc6222a335686e7e9e9f385aca02f9
9SHA1 (patch-hw_xfree86_common_xf86sbusBus.h) = f56f87336b2f669413ebb1005a2b64568a111f92 10SHA1 (patch-hw_xfree86_common_xf86sbusBus.h) = f56f87336b2f669413ebb1005a2b64568a111f92
10SHA1 (patch-hw_xfree86_dri2_dri2.c) = 0bf58305059321e10f6f58186301dbb7cb858c2a 11SHA1 (patch-hw_xfree86_dri2_dri2.c) = 0bf58305059321e10f6f58186301dbb7cb858c2a
11SHA1 (patch-hw_xfree86_os-support_bsd_arm__video.c) = 9c03b24f44eafc5fabe27e9d6cc6c54b607e47c3 12SHA1 (patch-hw_xfree86_os-support_bsd_arm__video.c) = 9c03b24f44eafc5fabe27e9d6cc6c54b607e47c3
12SHA1 (patch-hw_xfree86_os-support_bsd_bsd__VTsw.c) = 90343f694c27a6fdd5070e1167687943bd056a99 13SHA1 (patch-hw_xfree86_os-support_bsd_bsd__VTsw.c) = 90343f694c27a6fdd5070e1167687943bd056a99
13SHA1 (patch-hw_xfree86_os-support_bsd_bsd__init.c) = b58ce2005251c1b3f723ee87c759f75bcb27e230 14SHA1 (patch-hw_xfree86_os-support_bsd_bsd__init.c) = b58ce2005251c1b3f723ee87c759f75bcb27e230
14SHA1 (patch-hw_xfree86_os-support_bsd_i386__video.c) = f2c72562a40c0e3109991453aff9c2c082526b1b 15SHA1 (patch-hw_xfree86_os-support_bsd_i386__video.c) = f2c72562a40c0e3109991453aff9c2c082526b1b
15SHA1 (patch-hw_xfree86_os-support_bus_Sbus.c) = 0035b970bdae1bab51b8ca6bfeed060ec4df3a60 16SHA1 (patch-hw_xfree86_os-support_bus_Sbus.c) = 0035b970bdae1bab51b8ca6bfeed060ec4df3a60
16SHA1 (patch-hw_xfree86_os-support_solaris_solaris-amd64.S) = 088a3118deb7567194e08dd46e34cb6edba38400 17SHA1 (patch-hw_xfree86_os-support_solaris_solaris-amd64.S) = 088a3118deb7567194e08dd46e34cb6edba38400
17SHA1 (patch-hw_xfree86_os-support_xf86_OSproc.h) = e1c049857893d2f050d5fb297a3e8ef86f0b1d7e 18SHA1 (patch-hw_xfree86_os-support_xf86_OSproc.h) = e1c049857893d2f050d5fb297a3e8ef86f0b1d7e
18SHA1 (patch-hw_xfree86_os_support_bus_xf86Sbus.h) = 0e0a243b737f8f762c9f8f24a2265d1b6aefb544 19SHA1 (patch-hw_xfree86_os_support_bus_xf86Sbus.h) = 0e0a243b737f8f762c9f8f24a2265d1b6aefb544
19SHA1 (patch-hw_xwayland_xwayland-input.c) = b876642a56f4930dfaa88cff77d4518cfe9d73e0 20SHA1 (patch-hw_xwayland_xwayland-input.c) = b876642a56f4930dfaa88cff77d4518cfe9d73e0
20SHA1 (patch-test_xtest.c) = 77622ef481e91e64b3a6dd64b8579404f33ec88f 21SHA1 (patch-test_xtest.c) = 77622ef481e91e64b3a6dd64b8579404f33ec88f
File Added: pkgsrc/x11/modular-xorg-server/patches/patch-hw_kdrive_ephyr_hostx.c
$NetBSD: patch-hw_kdrive_ephyr_hostx.c,v 1.1 2020/09/28 01:08:15 khorben Exp $

Fix Xephyr visual with -parent option

--- hw/kdrive/ephyr/hostx.c.orig	2020-03-29 20:21:15.000000000 +0000
+++ hw/kdrive/ephyr/hostx.c
@@ -622,7 +622,7 @@ hostx_init(void)
                               scrpriv->win_height,
                               0,
                               XCB_WINDOW_CLASS_COPY_FROM_PARENT,
-                              HostX.visual->visual_id,
+                              XCB_COPY_FROM_PARENT,
                               attr_mask,
                               attrs);
         }
cvs diff -r1.21 -r1.22 pkgsrc/x11/modular-xorg-xephyr/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/modular-xorg-xephyr/Makefile 2020/08/26 10:29:06 1.21
+++ pkgsrc/x11/modular-xorg-xephyr/Makefile 2020/09/28 01:08:15 1.22
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.21 2020/08/26 10:29:06 wiz Exp $ 1# $NetBSD: Makefile,v 1.22 2020/09/28 01:08:15 khorben Exp $
2 2
3DISTNAME= xorg-server-${XORG_VERSION} 3DISTNAME= xorg-server-${XORG_VERSION}
4PKGNAME= modular-xorg-xephyr-${XORG_VERSION} 4PKGNAME= modular-xorg-xephyr-${XORG_VERSION}
 5PKGREVISION= 1
5 6
6DISTINFO_FILE= ${.CURDIR}/../../x11/modular-xorg-server/distinfo 7DISTINFO_FILE= ${.CURDIR}/../../x11/modular-xorg-server/distinfo
7PATCHDIR= ${.CURDIR}/../../x11/modular-xorg-server/patches 8PATCHDIR= ${.CURDIR}/../../x11/modular-xorg-server/patches
8 9
9MAINTAINER= khorben@defora.org 10MAINTAINER= khorben@defora.org
10COMMENT= Xephyr server based on kdrive from modular X.org 11COMMENT= Xephyr server based on kdrive from modular X.org
11 12
12BROKEN_ON_PLATFORM+= Darwin-*-* 13BROKEN_ON_PLATFORM+= Darwin-*-*
13 14
14.include "../../x11/modular-xorg-server/Makefile.common" 15.include "../../x11/modular-xorg-server/Makefile.common"
15 16
16CONFIGURE_ARGS+= --disable-xorg 17CONFIGURE_ARGS+= --disable-xorg
17CONFIGURE_ARGS+= --disable-xnest 18CONFIGURE_ARGS+= --disable-xnest