modular-xorg-server*: update to 21.1.4
modular-xorg-xwayland: mark as BROKEN for now, it has a separate distfile
in the 21.x series.
This release fixes 2 recently reported security vulnerabilities in xkb, several
regressions since 1.20.x and a number of miscellaneous bugs.
Błażej Szczygieł (1):
present: Check for NULL to prevent crash
Jeremy Huddleston Sequoia (23):
rootless: Dead code removal (ROOTLESS_REDISPLAY_DELAY is already defined)
X11Application: Ensure TIS operations are done on the main thread
os/connection: Improve abstraction for launchd secure sockets
xquartz: Create a separate category for organizing user preferences
xquartz pbproxy: Adopt NSUserDefaults+XQuartzDefaults for preferences
xquartz: Fold spaces related preferences into NSUserDefaults+XQuartzDefaults
XQuartz: Ensure scroll events are delivered to a single window (not both X11 and AppKit)
meson: Bump requirement to meson-0.50.0
xquartz: Update Sparkle configuration to use SUPublicEDKey
xquartz: Update copyright for 2022
meson: Provide options to set CFBundleVersion and CFBundleVersionString in XQuartz
Revert "meson: Bump requirement to meson-0.50.0"
xquartz: Update autotools-based builds of XQuartz to account for recent changes
print_edid: Fix a format string error
xf86-input-inputtest: Fix build on systems without SOCK_NONBLOCK
tests: Fix build failure from missing micmap.c
meson: Support building Xnest and Xorg on darwin
XQuartz: Build the bundle trampoline when using meson
XQuartz: Add TCC reason keys to Info.plist
xquartz: Use correct defines when building to support Sparkle updates
xquartz: Fix a possible crash when editing the Application menu due to mutaing immutable arrays
XQuartz: Improve type safety for X11Controller's application menu editor
xquartz: Add missing files to distribution tarball
Olivier Fourdan (1):
render: Fix build with gcc 12
Peter Hutterer (3):
xkb: switch to array index loops to moving pointers
xkb: swap XkbSetDeviceInfo and XkbSetDeviceInfoCheck
xkb: add request length validation for XkbSetGeometry
Povilas Kanapickas (5):
Revert "os: Try to discover the current seat with the XDG_SEAT var first"
dix: Correctly save replayed event into GrabInfoRec
dix: Don't send touch end to clients that do async grab without touches
xfree86: Fix event data alignment in inputtest driver
xserver 21.1.4
Samuel Thibault (1):
xkb: fix XkbSetMap when changing a keysym without changing a keytype
This commit is contained in:
wiz
parent
429fe24a65
commit
6b5f7de105
9 changed files with 36 additions and 80 deletions
|
|
@ -1,9 +1,9 @@
|
|||
# $NetBSD: Makefile.common,v 1.48 2022/05/05 08:24:05 nia Exp $
|
||||
# $NetBSD: Makefile.common,v 1.49 2022/07/15 20:39:49 wiz Exp $
|
||||
# used by x11/modular-xorg-server/Makefile
|
||||
# used by x11/modular-xorg-xephyr/Makefile
|
||||
# used by x11/modular-xorg-xwayland/Makefile
|
||||
|
||||
XORG_VERSION= 1.20.14
|
||||
XORG_VERSION= 21.1.4
|
||||
CATEGORIES= x11
|
||||
MASTER_SITES= ${MASTER_SITE_XORG:=xserver/}
|
||||
EXTRACT_SUFX= .tar.xz
|
||||
|
|
@ -34,7 +34,7 @@ XKB_OUTPUT_DIR?= ${VARBASE}/db/xkb # XXX sync with xkeyboard-config
|
|||
CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q}
|
||||
CONFIGURE_ARGS+= --with-xkb-output=${XKB_OUTPUT_DIR:Q}
|
||||
|
||||
.if !empty(USE_TOOLS:Mauto*)
|
||||
.if ${USE_TOOLS:Mauto*}
|
||||
TOOLS_DEPENDS+= xorg-util-macros>=1.1.5:../../devel/xorg-util-macros
|
||||
.endif
|
||||
|
||||
|
|
@ -95,7 +95,7 @@ SUNOS_ARCH= sparcv8plus
|
|||
.endif
|
||||
|
||||
PLIST_VARS+= sparc
|
||||
.if !empty(MACHINE_ARCH:Msparc*)
|
||||
.if ${MACHINE_ARCH:Msparc*}
|
||||
PLIST.sparc= yes
|
||||
.endif
|
||||
|
||||
|
|
@ -136,6 +136,7 @@ BUILDLINK_API_DEPENDS.libXext+= libXext>=1.1.1
|
|||
.include "../../x11/libXext/buildlink3.mk"
|
||||
.include "../../x11/libXfixes/buildlink3.mk"
|
||||
.include "../../x11/libXfont2/buildlink3.mk"
|
||||
.include "../../x11/libxcvt/buildlink3.mk"
|
||||
.include "../../x11/libXt/buildlink3.mk"
|
||||
.include "../../x11/libXxf86vm/buildlink3.mk"
|
||||
.include "../../x11/libXinerama/buildlink3.mk"
|
||||
|
|
|
|||
|
|
@ -1,13 +1,9 @@
|
|||
@comment $NetBSD: PLIST,v 1.30 2019/08/22 19:52:29 nia Exp $
|
||||
@comment $NetBSD: PLIST,v 1.31 2022/07/15 20:39:49 wiz Exp $
|
||||
bin/X
|
||||
bin/Xnest
|
||||
bin/Xorg
|
||||
bin/Xvfb
|
||||
bin/cvt
|
||||
bin/gtf
|
||||
include/xorg/BT.h
|
||||
include/xorg/IBM.h
|
||||
include/xorg/TI.h
|
||||
include/xorg/XIstubs.h
|
||||
include/xorg/Xprintf.h
|
||||
include/xorg/callback.h
|
||||
|
|
@ -111,7 +107,6 @@ include/xorg/servermd.h
|
|||
include/xorg/shadow.h
|
||||
include/xorg/shadowfb.h
|
||||
include/xorg/shmint.h
|
||||
include/xorg/site.h
|
||||
${PLIST.sunos}include/xorg/solaris-${SUNOS_ARCH}.il
|
||||
include/xorg/syncsdk.h
|
||||
include/xorg/validate.h
|
||||
|
|
@ -125,6 +120,7 @@ include/xorg/windowstr.h
|
|||
include/xorg/xaarop.h
|
||||
include/xorg/xace.h
|
||||
include/xorg/xacestr.h
|
||||
include/xorg/xf86-input-inputtest-protocol.h
|
||||
include/xorg/xf86.h
|
||||
include/xorg/xf86Crtc.h
|
||||
include/xorg/xf86Cursor.h
|
||||
|
|
@ -140,7 +136,6 @@ include/xorg/xf86Pci.h
|
|||
include/xorg/xf86PciInfo.h
|
||||
include/xorg/xf86Priv.h
|
||||
include/xorg/xf86Privstr.h
|
||||
include/xorg/xf86RamDac.h
|
||||
include/xorg/xf86RandR12.h
|
||||
${PLIST.sparc}include/xorg/xf86Sbus.h
|
||||
include/xorg/xf86VGAarbiter.h
|
||||
|
|
@ -171,14 +166,14 @@ include/xorg/xvmcext.h
|
|||
lib/pkgconfig/xorg-server.pc
|
||||
${PLIST.dri}lib/xorg/modules/drivers/modesetting_drv.la
|
||||
${PLIST.dri}lib/xorg/modules/extensions/libglx.la
|
||||
lib/xorg/modules/input/inputtest_drv.la
|
||||
lib/xorg/modules/input/inputtest_drv.so
|
||||
lib/xorg/modules/libexa.la
|
||||
lib/xorg/modules/libfb.la
|
||||
lib/xorg/modules/libfbdevhw.la
|
||||
${PLIST.dri}lib/xorg/modules/libglamoregl.la
|
||||
lib/xorg/modules/libint10.la
|
||||
lib/xorg/modules/libshadow.la
|
||||
lib/xorg/modules/libshadowfb.la
|
||||
lib/xorg/modules/libvbe.la
|
||||
lib/xorg/modules/libvgahw.la
|
||||
lib/xorg/modules/libwfb.la
|
||||
lib/xorg/protocol.txt
|
||||
|
|
@ -186,13 +181,12 @@ man/man1/Xnest.1
|
|||
man/man1/Xorg.1
|
||||
man/man1/Xserver.1
|
||||
man/man1/Xvfb.1
|
||||
man/man1/cvt.1
|
||||
man/man1/gtf.1
|
||||
man/man4/exa.4
|
||||
man/man4/fbdevhw.4
|
||||
man/man4/inputtestdrv.4
|
||||
${PLIST.dri}man/man4/modesetting.4
|
||||
man/man5/xorg.conf.5
|
||||
man/man5/xorg.conf.d.5
|
||||
share/aclocal/xorg-server.m4
|
||||
${PLIST.dtrace}share/doc/xorg-server/Xserver-DTrace.xml
|
||||
@pkgdir lib/xorg/modules/input
|
||||
|
|
|
|||
|
|
@ -1,23 +1,21 @@
|
|||
$NetBSD: distinfo,v 1.117 2022/05/22 21:29:58 dholland Exp $
|
||||
$NetBSD: distinfo,v 1.118 2022/07/15 20:39:49 wiz Exp $
|
||||
|
||||
BLAKE2s (xorg-server-1.20.14.tar.xz) = 207f7e9d968765e4ee9d916007fdd32827ed33516b2457b83002b709476e8319
|
||||
SHA512 (xorg-server-1.20.14.tar.xz) = be3dc32cce7d55d7e38c5f6557027f13f39224c76cc83e5800555d5ce89dbdc3731773a2d186a5b97db9fc8731a2b2dd6e9829af2b01ee2559246d4aef7c4963
|
||||
Size (xorg-server-1.20.14.tar.xz) = 5178288 bytes
|
||||
SHA1 (patch-configure) = b1badceba5a38df6ee898fd1d103d5722986a120
|
||||
BLAKE2s (xorg-server-21.1.4.tar.xz) = 97a0cd59c9035819ad3006d2429d4e0349d579d323c49053b0e3cc39949e38c1
|
||||
SHA512 (xorg-server-21.1.4.tar.xz) = eb5b8520d02908f72719e6ecfbf7a9bf139acb65ccae04d1db4223a8a2384cd3a94bd5afef10cce327b751b800cc2b79bfaa5ae35c95c3a217f775168082e68f
|
||||
Size (xorg-server-21.1.4.tar.xz) = 4940176 bytes
|
||||
SHA1 (patch-configure) = 1d02efcf80d337b923006032d5bb9fccf811948d
|
||||
SHA1 (patch-hw_kdrive_ephyr_hostx.c) = b681ee28bc7af06774f10bc882d355d42ac965d3
|
||||
SHA1 (patch-hw_xfree86_common_xf86AutoConfig.c) = 70adf85be9fc6222a335686e7e9e9f385aca02f9
|
||||
SHA1 (patch-hw_xfree86_common_xf86sbusBus.h) = f56f87336b2f669413ebb1005a2b64568a111f92
|
||||
SHA1 (patch-hw_xfree86_dri2_dri2.c) = 0bf58305059321e10f6f58186301dbb7cb858c2a
|
||||
SHA1 (patch-hw_xfree86_os-support_bsd_alpha__video.c) = deb410b82c461ce36c15651795bf62370a56d5a4
|
||||
SHA1 (patch-hw_xfree86_os-support_bsd_arm__video.c) = 9c03b24f44eafc5fabe27e9d6cc6c54b607e47c3
|
||||
SHA1 (patch-hw_xfree86_os-support_bsd_arm__video.c) = 521cf3bf2bb0529b4546d5343f67388bc59bd68b
|
||||
SHA1 (patch-hw_xfree86_os-support_bsd_bsd__VTsw.c) = 90343f694c27a6fdd5070e1167687943bd056a99
|
||||
SHA1 (patch-hw_xfree86_os-support_bsd_bsd__init.c) = b58ce2005251c1b3f723ee87c759f75bcb27e230
|
||||
SHA1 (patch-hw_xfree86_os-support_bsd_i386__video.c) = f2c72562a40c0e3109991453aff9c2c082526b1b
|
||||
SHA1 (patch-hw_xfree86_os-support_bus_Sbus.c) = 8507a2ac60c77031048a386dc5c48f0ef86cb8de
|
||||
SHA1 (patch-hw_xfree86_os-support_bus_Sbus.c) = 50e6ffa8f58ffeed0f734d3bbabf1939649c3208
|
||||
SHA1 (patch-hw_xfree86_os-support_solaris_solaris-amd64.S) = 088a3118deb7567194e08dd46e34cb6edba38400
|
||||
SHA1 (patch-hw_xfree86_os-support_solaris_sun__init.c) = 6148072cfaf1cb8d0a2f465b51429563c8ea2c15
|
||||
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) = b876642a56f4930dfaa88cff77d4518cfe9d73e0
|
||||
SHA1 (patch-os_backtrace.c) = 8cf93febb737dd850706d140b467b73f61ecd3ad
|
||||
SHA1 (patch-test_xtest.c) = 77622ef481e91e64b3a6dd64b8579404f33ec88f
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
$NetBSD: patch-configure,v 1.7 2021/12/15 23:35:00 wiz Exp $
|
||||
$NetBSD: patch-configure,v 1.8 2022/07/15 20:39:49 wiz Exp $
|
||||
|
||||
Use USE_AMD64_IOPL (actually x86_64_iopl) on NetBSD/amd64.
|
||||
(c.f. patch-hw_xfree86_os-support_bsd_i386.c)
|
||||
|
||||
for netbsd, force pass pthread configure checks (pthread not needed)
|
||||
|
||||
--- configure.orig 2021-12-15 19:01:32.000000000 +0000
|
||||
--- configure.orig 2022-07-12 13:28:08.000000000 +0000
|
||||
+++ configure
|
||||
@@ -24634,7 +24634,7 @@ printf "%s\n" "#define USE_ALPHA_PIO 1"
|
||||
@@ -22981,7 +22981,7 @@ $as_echo "#define USE_ALPHA_PIO 1" >>con
|
||||
esac
|
||||
GLX_ARCH_DEFINES="-D__GLX_ALIGN64 -mieee"
|
||||
;;
|
||||
|
|
@ -16,16 +16,16 @@ for netbsd, force pass pthread configure checks (pthread not needed)
|
|||
ARM_VIDEO=yes
|
||||
DEFAULT_INT10="stub"
|
||||
;;
|
||||
@@ -24676,7 +24676,7 @@ printf "%s\n" "#define USE_DEV_IO 1" >>c
|
||||
printf "%s\n" "#define USE_DEV_IO 1" >>confdefs.h
|
||||
@@ -23023,7 +23023,7 @@ $as_echo "#define USE_DEV_IO 1" >>confde
|
||||
$as_echo "#define USE_DEV_IO 1" >>confdefs.h
|
||||
;;
|
||||
*netbsd*)
|
||||
-printf "%s\n" "#define USE_I386_IOPL 1" >>confdefs.h
|
||||
+printf "%s\n" "#define USE_AMD64_IOPL 1" >>confdefs.h
|
||||
-$as_echo "#define USE_I386_IOPL 1" >>confdefs.h
|
||||
+$as_echo "#define USE_AMD64_IOPL 1" >>confdefs.h
|
||||
|
||||
SYS_LIBS=-lx86_64
|
||||
;;
|
||||
@@ -26605,7 +26605,8 @@ case ${host_os} in
|
||||
@@ -24789,7 +24789,8 @@ case ${host_os} in
|
||||
netbsd*)
|
||||
# use libc stubs, don't link against libpthread, to allow
|
||||
# dynamic loading
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
$NetBSD: patch-hw_xfree86_os-support_bsd_arm__video.c,v 1.1 2016/02/23 22:32:45 tnn Exp $
|
||||
$NetBSD: patch-hw_xfree86_os-support_bsd_arm__video.c,v 1.2 2022/07/15 20:39:49 wiz Exp $
|
||||
|
||||
XXX stubs for now, sufficient for wsfb. Need to sync this file with xsrc.
|
||||
|
||||
--- hw/xfree86/os-support/bsd/arm_video.c.orig 2016-01-06 17:23:08.000000000 +0000
|
||||
--- hw/xfree86/os-support/bsd/arm_video.c.orig 2022-07-12 13:27:57.000000000 +0000
|
||||
+++ hw/xfree86/os-support/bsd/arm_video.c
|
||||
@@ -66,6 +66,12 @@
|
||||
#include "xf86_OSlib.h"
|
||||
@@ -67,6 +67,12 @@
|
||||
#include "xf86OSpriv.h"
|
||||
#include "compiler.h"
|
||||
|
||||
+#if defined(__NetBSD__)
|
||||
+Bool xf86EnableIO(void) { return TRUE; }
|
||||
|
|
@ -17,7 +17,7 @@ XXX stubs for now, sufficient for wsfb. Need to sync this file with xsrc.
|
|||
#if defined(__NetBSD__) && !defined(MAP_FILE)
|
||||
#define MAP_FLAGS MAP_SHARED
|
||||
#else
|
||||
@@ -203,3 +209,4 @@ xf86DisableIO()
|
||||
@@ -206,3 +212,4 @@ xf86DisableIO()
|
||||
}
|
||||
|
||||
#endif /* USE_ARC_MMAP */
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
$NetBSD: patch-hw_xfree86_os-support_bus_Sbus.c,v 1.4 2022/05/22 21:29:58 dholland Exp $
|
||||
$NetBSD: patch-hw_xfree86_os-support_bus_Sbus.c,v 1.5 2022/07/15 20:39:49 wiz Exp $
|
||||
|
||||
Merge most of netbsdSbus.c from xsrc, but leave the Solaris support in place.
|
||||
|
||||
--- hw/xfree86/os-support/bus/Sbus.c.orig 2022-05-22 21:01:31.709546787 +0000
|
||||
--- hw/xfree86/os-support/bus/Sbus.c.orig 2022-07-12 13:27:57.000000000 +0000
|
||||
+++ hw/xfree86/os-support/bus/Sbus.c
|
||||
@@ -34,6 +34,9 @@
|
||||
#ifdef __sun
|
||||
|
|
@ -148,17 +148,15 @@ Merge most of netbsdSbus.c from xsrc, but leave the Solaris support in place.
|
|||
}
|
||||
|
||||
#define PROM_NODE_SIBLING 0x01
|
||||
@@ -180,8 +245,8 @@ promIsP1275(void)
|
||||
@@ -180,7 +245,7 @@ promIsP1275(void)
|
||||
promP1275 = TRUE;
|
||||
else
|
||||
promP1275 = FALSE;
|
||||
-#elif defined(__FreeBSD__)
|
||||
- promP1275 = TRUE;
|
||||
+#elif defined(__FreeBSD__) || defined(__NetBSD__)
|
||||
+ promP1275 = TRUE;
|
||||
promP1275 = TRUE;
|
||||
#else
|
||||
#error Missing promIsP1275() function for this OS
|
||||
#endif
|
||||
@@ -198,8 +263,10 @@ sparcPromClose(void)
|
||||
close(promFd);
|
||||
promFd = -1;
|
||||
|
|
|
|||
|
|
@ -1,21 +0,0 @@
|
|||
$NetBSD: patch-hw_xwayland_xwayland-input.c,v 1.4 2021/06/24 18:43:08 tnn 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 (0x110)
|
||||
+#define BTN_RIGHT (0x111)
|
||||
+#define BTN_MIDDLE (0x112)
|
||||
+#define BTN_SIDE (0x113)
|
||||
+#endif
|
||||
|
||||
#include <sys/mman.h>
|
||||
#include <xkbsrv.h>
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
$NetBSD: patch-test_xtest.c,v 1.1 2019/02/28 12:32:39 tnn Exp $
|
||||
|
||||
xtest.c:64:23: error: suggest braces around initialization of subobject
|
||||
|
||||
--- test/xtest.c.orig 2019-02-26 19:28:50.000000000 +0000
|
||||
+++ test/xtest.c
|
||||
@@ -61,7 +61,7 @@ xtest_init_devices(void)
|
||||
{
|
||||
ScreenRec screen = {0};
|
||||
ClientRec server_client = {0};
|
||||
- WindowRec root = {0};
|
||||
+ WindowRec root = {{0}};
|
||||
WindowOptRec optional = {0};
|
||||
|
||||
/* random stuff that needs initialization */
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile,v 1.12 2021/12/15 23:35:00 wiz Exp $
|
||||
# $NetBSD: Makefile,v 1.13 2022/07/15 20:39:49 wiz Exp $
|
||||
|
||||
DISTNAME= xorg-server-${XORG_VERSION}
|
||||
PKGNAME= modular-xorg-xwayland-${XORG_VERSION}
|
||||
|
|
@ -15,6 +15,7 @@ PATCHDIR= ${.CURDIR}/../../x11/modular-xorg-server/patches
|
|||
MAINTAINER= nia@NetBSD.org
|
||||
COMMENT= Server for running X clients under Wayland from modular X.org
|
||||
|
||||
BROKEN= "needs updating to separate unshared distfile"
|
||||
.include "../../x11/modular-xorg-server/Makefile.common"
|
||||
|
||||
CONFIGURE_ARGS+= --disable-xorg
|
||||
|
|
|
|||
Loading…
Reference in a new issue