git: e0ca8c4e351c - main - x11-servers/xlibre-server: Update to 25.1.0
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 27 Dec 2025 01:45:59 UTC
The branch main has been updated by acm:
URL: https://cgit.FreeBSD.org/ports/commit/?id=e0ca8c4e351c0bffaa8cc6a177a6b19c7c9fb036
commit e0ca8c4e351c0bffaa8cc6a177a6b19c7c9fb036
Author: Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
AuthorDate: 2025-12-27 00:43:03 +0000
Commit: Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
CommitDate: 2025-12-27 01:45:35 +0000
x11-servers/xlibre-server: Update to 25.1.0
In this release XLibre has moved to a semantic versioning system.
Added options NVIDIA_ABI, INPUTTEST and SEATD.
SEATD is enabled by default, it compiles the server with devel/seatd
support for running the X server rootless and in multiseat
configurations.
INPUTTEST is enabled by default, it is used to toggle whether the
inputtest driver should be compiled and included with the server.
NVIDIA_ABI provides fixes in the ABI for some of the older NVIDIA
devices, it is enabled by default on only the "amd64" and "x86" ARCHs,
THIS OPTIONS BREAKS DRIVER ABI WHEN TOGGLED, XLIBRE DRIVERS MUST BE
RECOMPILED WHEN THIS OPTION IS TOGGLED.
Fixed the way options were handled and improved their descriptions.
I reverted an incorrect patch I made to the upstream, we do not need to
rely on the epoll-shim's epoll.h facilities in ospoll. Xserver functions
correctly with the poll.h facilities provided by FreeBSD. We only need
epoll-shim here for the eventfd.h header for DRI3.
Related to the new patch file: patch-fix-epoll.
The patch file patch-hw_xfree86_compat_ones.c has been removed because
it was merged in the upstream.
The patch file patch-config_udev.c has been modified to work with new
changes.
The patch file patch-hw_xfree86_os-support_shared_seatd-libseat.c has
been added to ensure SEATD builds work without UDEV.
The patch file patch-Xkb-revert reverts the removal of some Xkb
functions form the X server SDK that where relied upon by xorgxrdp.
ChangeLog at: https://github.com/X11Libre/xserver/releases/tag/xlibre-xserver-25.1.0
Obtained from: https://github.com/b-aaz/xlibre-ports
With hat: xlibre
---
Mk/Uses/xlibre-cat.mk | 6 +-
x11-servers/xlibre-server/Makefile | 31 ++++++---
x11-servers/xlibre-server/Makefile.common | 2 +-
x11-servers/xlibre-server/Makefile.version | 4 +-
x11-servers/xlibre-server/distinfo | 6 +-
x11-servers/xlibre-server/files/patch-Xkb-revert | 76 ++++++++++++++++++++++
.../xlibre-server/files/patch-config_udev.c | 8 +--
x11-servers/xlibre-server/files/patch-fix-epoll | 32 +++++++++
.../files/patch-hw_xfree86_compat_ones.c | 15 -----
...ch-hw_xfree86_os-support_shared_seatd-libseat.c | 42 ++++++++++++
x11-servers/xlibre-server/files/patch-meson.build | 11 ----
x11-servers/xlibre-server/pkg-plist | 32 ++++-----
12 files changed, 202 insertions(+), 63 deletions(-)
diff --git a/Mk/Uses/xlibre-cat.mk b/Mk/Uses/xlibre-cat.mk
index ef130bed4e1a..2a8bf55cd966 100644
--- a/Mk/Uses/xlibre-cat.mk
+++ b/Mk/Uses/xlibre-cat.mk
@@ -105,8 +105,9 @@ IGNORE= unknown build system specified via xlibre-cat:${xlibre-cat_ARGS:ts,}
USE_GITHUB?= yes
GH_ACCOUNT?= X11Libre
-# Do not set the GitHub upstream for XLibre flavors of 3rd party ports.
+# Do not do the bellow for XLibre flavors of 3rd party ports.
. if empty(PKGNAMEPREFIX) || ${PKGNAMEPREFIX} != xlibre-
+# Set the GitHub upstream.
. if ${_XLIBRE_CAT} == driver
# Removes the xlibre- suffix from the PORTNAME
GH_PROJECT?= ${PORTNAME:tl:C/xlibre-//}
@@ -117,6 +118,8 @@ GH_TAGNAME?= xlibre-xserver-${PORTVERSION}
. else
GH_PROJECT?= ${PORTNAME:tl}
. endif
+# Add conflicts between X.Org and XLibre variants of X drivers:
+CONFLICTS= ${PORTNAME:tl:C/xlibre-//}
. endif
. if ${_XLIBRE_BUILDSYS} == meson
@@ -154,6 +157,7 @@ MODULEDIR=lib/xorg/modules/xlibre-${XLIBRE_MJR_VER}
USE_XLIBRE+= xlibre-server
USE_XORG+= xi xorgproto
CFLAGS+= -Werror=uninitialized
+PLIST_SUB+= MODULEDIR=${MODULEDIR}
. if ${_XLIBRE_BUILDSYS} == meson
# Put special stuff for meson here
. else
diff --git a/x11-servers/xlibre-server/Makefile b/x11-servers/xlibre-server/Makefile
index 829d8dacc862..2b87a05d2d92 100644
--- a/x11-servers/xlibre-server/Makefile
+++ b/x11-servers/xlibre-server/Makefile
@@ -13,22 +13,33 @@ CONFLICTS= xorg-server
USES+= xlibre-cat:server
OPTIONS_SUB= YES
-OPTIONS_DEFINE= UDEV SUID
-OPTIONS_DEFAULT=UDEV SUID
+OPTIONS_DEFINE= UDEV SUID NVIDIA_ABI INPUTTEST SEATD
+OPTIONS_DEFAULT=UDEV SUID INPUTTEST SEATD
-UDEV_DESC= Enable udev (For libinput & autoconfiguration/hotplug).
-UDEV_MESON_ON= -Dudev=true -Dudev_kms=true
-UDEV_MESON_OFF= -Dudev=false -Dudev_kms=false
+UDEV_DESC= Enable udev. (For libinput & autoconfiguration/hotplug)
+UDEV_MESON_TRUE= udev udev_kms
UDEV_LIB_DEPENDS= libudev.so:devel/libudev-devd
-SUID_DESC= Enable the setuid binary (For starting X as a normal user).
-SUID_MESON_ON= -Dsuid_wrapper=true
-SUID_MESON_OFF= -Dsuid_wrapper=false
+SUID_DESC= Enable the setuid binary. (For starting X as a normal user)
+SUID_MESON_TRUE= suid_wrapper
+
+OPTIONS_DEFAULT_amd64= NVIDIA_ABI
+OPTIONS_DEFAULT_i386= NVIDIA_ABI
+
+NVIDIA_ABI_DESC= Rebuild XLibre drivers if switched! Fixes for NVIDIA drivers.
+NVIDIA_ABI_MESON_TRUE= legacy_nvidia_padding legacy_nvidia_340x
+
+INPUTTEST_DESC= Build inputtest driver. (For testing and automation)
+INPUTTEST_MESON_TRUE= xf86-input-inputtest
+
+SEATD_DESC= Build with seatd support. (For running X unprivileged)
+SEATD_MESON_TRUE= seatd_libseat
+SEATD_LIB_DEPENDS= libseat.so:sysutils/seatd
LIB_DEPENDS+= libxcvt.so:x11/libxcvt \
libdrm.so:graphics/libdrm \
- libepoxy.so:graphics/libepoxy \
- libepoll-shim.so:devel/libepoll-shim
+ libepoll-shim.so:devel/libepoll-shim \
+ libepoxy.so:graphics/libepoxy
MESON_ARGS+= -Dlog_dir=/var/log \
-Ddrm=true
diff --git a/x11-servers/xlibre-server/Makefile.common b/x11-servers/xlibre-server/Makefile.common
index 60f301137b51..47eb42b8e208 100644
--- a/x11-servers/xlibre-server/Makefile.common
+++ b/x11-servers/xlibre-server/Makefile.common
@@ -12,7 +12,7 @@ USE_XORG+= pixman xau xdmcp xfont2 xkbfile xorgproto xshmfence xtrans
OPTIONS_DEFINE+=LIBUNWIND
OPTIONS_DEFAULT+=LIBUNWIND
-LIBUNWIND_DESC= Enable libunwind for better stack traces in case of an error.
+LIBUNWIND_DESC= Enable libunwind. (For better stack traces in case of an error)
SERVERS= xorg xnest xephyr xvfb
SERVERNAME= ${PORTNAME:S/^xlibre-/x/:S/xserver/xorg/}
diff --git a/x11-servers/xlibre-server/Makefile.version b/x11-servers/xlibre-server/Makefile.version
index 762f9dcca745..027fab288da4 100644
--- a/x11-servers/xlibre-server/Makefile.version
+++ b/x11-servers/xlibre-server/Makefile.version
@@ -1,4 +1,4 @@
-XLIBRE_MJR_VER=25.0
-XLIBRE_MIN_VER=0.16
+XLIBRE_MJR_VER=25
+XLIBRE_MIN_VER=1.0
XLIBRE_VER=${XLIBRE_MJR_VER}.${XLIBRE_MIN_VER}
diff --git a/x11-servers/xlibre-server/distinfo b/x11-servers/xlibre-server/distinfo
index 9e7aa077a41f..7c379f14182b 100644
--- a/x11-servers/xlibre-server/distinfo
+++ b/x11-servers/xlibre-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1763716462
-SHA256 (xlibre/server/X11Libre-xserver-25.0.0.16-xlibre-xserver-25.0.0.16_GH0.tar.gz) = 0187e57331daefa75ddc33a4f878ef4c08526b83dc91dbc51a25375d2ff33b8c
-SIZE (xlibre/server/X11Libre-xserver-25.0.0.16-xlibre-xserver-25.0.0.16_GH0.tar.gz) = 5415775
+TIMESTAMP = 1766394875
+SHA256 (xlibre/server/X11Libre-xserver-25.1.0-xlibre-xserver-25.1.0_GH0.tar.gz) = b46fe85e306821504a5e0e91aa0d8d54ce7ddfb67106c495a6ca5ac2c3e28f06
+SIZE (xlibre/server/X11Libre-xserver-25.1.0-xlibre-xserver-25.1.0_GH0.tar.gz) = 5488486
diff --git a/x11-servers/xlibre-server/files/patch-Xkb-revert b/x11-servers/xlibre-server/files/patch-Xkb-revert
new file mode 100644
index 000000000000..8a1fec15bfba
--- /dev/null
+++ b/x11-servers/xlibre-server/files/patch-Xkb-revert
@@ -0,0 +1,76 @@
+diff --git Xi/getkmap.c Xi/getkmap.c
+index 04d8cbeaf..3cc614711 100644
+--- Xi/getkmap.c
++++ Xi/getkmap.c
+@@ -59,7 +59,6 @@ SOFTWARE.
+ #include "dix/request_priv.h"
+ #include "dix/rpcbuf_priv.h"
+ #include "Xi/handlers.h"
+-#include "xkb/xkbsrv_priv.h"
+
+ #include "inputstr.h" /* DeviceIntPtr */
+ #include "swaprep.h"
+diff --git hw/xquartz/quartzKeyboard.c hw/xquartz/quartzKeyboard.c
+index a26ea19c5..82b8d45b4 100644
+--- hw/xquartz/quartzKeyboard.c
++++ hw/xquartz/quartzKeyboard.c
+@@ -44,10 +44,6 @@
+ #include <stdlib.h>
+ #include <errno.h>
+ #include <sys/stat.h>
+-#include <assert.h>
+-#include <pthread.h>
+-
+-#include "xkb/xkbsrv_priv.h"
+
+ #include "quartz.h"
+ #include "darwin.h"
+@@ -57,6 +53,9 @@
+
+ #include "X11Application.h"
+
++#include <assert.h>
++#include <pthread.h>
++
+ #include "xkbsrv.h"
+ #include "exevents.h"
+ #include "X11/keysym.h"
+diff --git include/xkbsrv.h include/xkbsrv.h
+index 3604c86af..b06f57bef 100644
+--- include/xkbsrv.h
++++ include/xkbsrv.h
+@@ -197,6 +197,9 @@ extern _X_EXPORT void XkbFreeKeyboard(XkbDescPtr /* xkb */ ,
+ Bool /* freeDesc */
+ );
+
++extern _X_EXPORT KeySymsPtr XkbGetCoreMap(DeviceIntPtr /* keybd */
++ );
++
+ extern _X_EXPORT void XkbApplyMappingChange(DeviceIntPtr /* pXDev */ ,
+ KeySymsPtr /* map */ ,
+ KeyCode /* firstKey */ ,
+@@ -210,6 +213,11 @@ extern _X_EXPORT void XkbDDXChangeControls(DeviceIntPtr /* dev */ ,
+ XkbControlsPtr /* new */
+ );
+
++extern _X_EXPORT void XkbSetRepeatKeys(DeviceIntPtr /* pXDev */ ,
++ int /* key */ ,
++ int /* onoff */
++ );
++
+ extern _X_EXPORT void XkbGetRulesDflts(XkbRMLVOSet * /* rmlvo */
+ );
+
+diff --git xkb/xkbsrv_priv.h xkb/xkbsrv_priv.h
+index 1b348471f..894f27eb2 100644
+--- xkb/xkbsrv_priv.h
++++ xkb/xkbsrv_priv.h
+@@ -303,8 +303,4 @@ int XkbDDXUsesSoftRepeat(DeviceIntPtr dev);
+ void XkbDDXKeybdCtrlProc(DeviceIntPtr dev, KeybdCtrl *ctrl);
+ void XkbDDXUpdateDeviceIndicators(DeviceIntPtr dev, XkbSrvLedInfoPtr sli,
+ CARD32 newState);
+-
+-KeySymsPtr XkbGetCoreMap(DeviceIntPtr keybd);
+-void XkbSetRepeatKeys(DeviceIntPtr pXDev, int key, int onoff);
+-
+ #endif /* _XSERVER_XKBSRV_PRIV_H_ */
diff --git a/x11-servers/xlibre-server/files/patch-config_udev.c b/x11-servers/xlibre-server/files/patch-config_udev.c
index 38b3e84db5ad..f146036534ac 100644
--- a/x11-servers/xlibre-server/files/patch-config_udev.c
+++ b/x11-servers/xlibre-server/files/patch-config_udev.c
@@ -13,7 +13,7 @@
#include "input.h"
@@ -188,7 +189,21 @@ device_added(struct udev_device *udev_de
- attrs.product = strdup(name);
+ char buf[128];
input_options = input_option_new(input_options, "name", name);
input_options = input_option_new(input_options, "path", path);
- input_options = input_option_new(input_options, "device", path);
@@ -32,9 +32,9 @@
+ }
+ else
+ input_options = input_option_new(input_options, "device", path);
- input_options = input_option_new(input_options, "major", itoa(major(devnum)));
- input_options = input_option_new(input_options, "minor", itoa(minor(devnum)));
- if (path)
+ sprintf(buf, "%u", major(devnum));
+ input_options = input_option_new(input_options, "major", buf);
+ sprintf(buf, "%u", minor(devnum));
@@ -272,6 +287,18 @@ device_added(struct udev_device *udev_de
}
}
diff --git a/x11-servers/xlibre-server/files/patch-fix-epoll b/x11-servers/xlibre-server/files/patch-fix-epoll
new file mode 100644
index 000000000000..1e5c15aafbaf
--- /dev/null
+++ b/x11-servers/xlibre-server/files/patch-fix-epoll
@@ -0,0 +1,32 @@
+--- include/meson.build.orig
++++ include/meson.build
+@@ -141,7 +141,7 @@ conf_data.set('HAVE_SYS_SYSMACROS_H', cc.has_header('sys/sysmacros.h') ? '1' : f
+ conf_data.set('HAVE_ARC4RANDOM_BUF', cc.has_function('arc4random_buf', dependencies: libbsd_dep) ? '1' : false)
+ conf_data.set('HAVE_BACKTRACE', cc.has_function('backtrace') ? '1' : false)
+ conf_data.set('HAVE_CBRT', cc.has_function('cbrt') ? '1' : false)
+-conf_data.set('HAVE_EPOLL_CREATE1', cc.has_function('epoll_create1',dependencies:epoll_dep, prefix:'#include<sys/epoll.h>') ? '1' : false)
++conf_data.set('HAVE_EPOLL_CREATE1', cc.has_function('epoll_create1') ? '1' : false)
+ conf_data.set('HAVE_GETUID', cc.has_function('getuid') ? '1' : false)
+ conf_data.set('HAVE_GETEUID', cc.has_function('geteuid') ? '1' : false)
+ conf_data.set('HAVE_ISASTREAM', cc.has_function('isastream') ? '1' : false)
+--- meson.build.orig
++++ meson.build
+@@ -456,10 +456,8 @@ endif
+
+ if host_machine.system() in ['freebsd', 'openbsd']
+ epoll_dep = dependency('epoll-shim')
+- epoll_inc = join_paths(epoll_dep.get_variable('prefix'), get_option('includedir'), 'libepoll-shim')
+ else
+ epoll_dep = []
+- epoll_inc = ''
+ endif
+
+ have_eventfd = cc.has_header('sys/eventfd.h', dependencies: epoll_dep)
+@@ -614,7 +612,6 @@ inc = include_directories(
+ 'randr',
+ 'render',
+ 'xfixes',
+- epoll_inc,
+ )
+
+ build_xselinux = false
diff --git a/x11-servers/xlibre-server/files/patch-hw_xfree86_compat_ones.c b/x11-servers/xlibre-server/files/patch-hw_xfree86_compat_ones.c
deleted file mode 100644
index 1a296ff48141..000000000000
--- a/x11-servers/xlibre-server/files/patch-hw_xfree86_compat_ones.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- hw/xfree86/compat/ones.c.orig
-+++ hw/xfree86/compat/ones.c
-@@ -20,8 +20,12 @@ int
- Ones(unsigned long mask)
- { /* HACKMEM 169 */
- /* can't add a message here because this should be fast */
-+#if defined __has_builtin
- #if __has_builtin(__builtin_popcountl)
- return __builtin_popcountl (mask);
-+#endif
-+#elif defined __builtin_popcountl
-+ return __builtin_popcountl (mask);
- #else
- unsigned long y;
-
diff --git a/x11-servers/xlibre-server/files/patch-hw_xfree86_os-support_shared_seatd-libseat.c b/x11-servers/xlibre-server/files/patch-hw_xfree86_os-support_shared_seatd-libseat.c
new file mode 100644
index 000000000000..b79785f14692
--- /dev/null
+++ b/x11-servers/xlibre-server/files/patch-hw_xfree86_os-support_shared_seatd-libseat.c
@@ -0,0 +1,42 @@
+From edf810adf72ea32de2e75d39e4cba2dabd28ddb1 Mon Sep 17 00:00:00 2001
+From: polaris <251053665+9olaris@users.noreply.github.com>
+Date: Mon, 22 Dec 2025 19:30:55 +0000
+Subject: [PATCH] Only call xf86platformVTProbe() when defined
+
+Signed-off-by: 9olaris <251053665+9olaris@users.noreply.github.com>
+---
+ hw/xfree86/os-support/shared/seatd-libseat.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/hw/xfree86/os-support/shared/seatd-libseat.c b/hw/xfree86/os-support/shared/seatd-libseat.c
+index 4eddc05e22..4d9c3ad86f 100644
+--- hw/xfree86/os-support/shared/seatd-libseat.c
++++ hw/xfree86/os-support/shared/seatd-libseat.c
+@@ -38,14 +38,16 @@
+ #include "os.h"
+ #include "xf86.h"
+ #include "xf86_priv.h"
++#ifdef XSERVER_PLATFORM_BUS
++#include "xf86platformBus_priv.h"
+ #include "xf86platformBus.h"
++#endif
+ #include "xf86Xinput.h"
+ #include "xf86Xinput_priv.h"
+ #include "xf86Priv.h"
+ #include "globals.h"
+
+ #include "config/hotplug_priv.h"
+-#include "xf86platformBus_priv.h"
+
+ #include "seatd-libseat.h"
+
+@@ -89,7 +91,9 @@ enable_seat(struct libseat *seat, void *userdata)
+ }
+ }
+ xf86InputEnableVTProbe(); /* Add any paused input devices */
++ #ifdef XSERVER_PLATFORM_BUS
+ xf86platformVTProbe(); /* Probe for outputs */
++ #endif
+ }
+
+ /*
diff --git a/x11-servers/xlibre-server/files/patch-meson.build b/x11-servers/xlibre-server/files/patch-meson.build
deleted file mode 100644
index f933599bfac2..000000000000
--- a/x11-servers/xlibre-server/files/patch-meson.build
+++ /dev/null
@@ -1,11 +0,0 @@
---- meson.build.orig 2025-09-16 15:49:48 UTC
-+++ meson.build
-@@ -456,7 +456,7 @@ else
- build_dri2 = get_option('dri2') == 'true'
- endif
-
--if host_machine.system() in ['freebsd', 'openbsd']
-+if host_machine.system() in ['dragonfly', 'freebsd', 'openbsd']
- epoll_dep = dependency('epoll-shim')
- else
- epoll_dep = []
diff --git a/x11-servers/xlibre-server/pkg-plist b/x11-servers/xlibre-server/pkg-plist
index 1dec48a8741b..4899a6aee310 100644
--- a/x11-servers/xlibre-server/pkg-plist
+++ b/x11-servers/xlibre-server/pkg-plist
@@ -3,7 +3,6 @@ bin/Xorg
bin/gtf
include/xorg/Xprintf.h
include/xorg/callback.h
-include/xorg/client.h
include/xorg/closure.h
include/xorg/colormap.h
include/xorg/colormapst.h
@@ -44,7 +43,6 @@ include/xorg/glamor.h
include/xorg/globals.h
include/xorg/glxvndabi.h
include/xorg/glyphstr.h
-include/xorg/hotplug.h
include/xorg/i2c_def.h
include/xorg/input.h
include/xorg/inputstr.h
@@ -66,7 +64,6 @@ include/xorg/misyncfd.h
include/xorg/misyncshm.h
include/xorg/misyncstr.h
include/xorg/mizerarc.h
-include/xorg/nonsdk_extinit.h
include/xorg/opaque.h
include/xorg/optionstr.h
include/xorg/os.h
@@ -101,7 +98,7 @@ include/xorg/wfbrename.h
include/xorg/window.h
include/xorg/windowstr.h
include/xorg/xaarop.h
-include/xorg/xf86-input-inputtest-protocol.h
+%%INPUTTEST%%include/xorg/xf86-input-inputtest-protocol.h
include/xorg/xf86.h
include/xorg/xf86Crtc.h
include/xorg/xf86Cursor.h
@@ -134,27 +131,30 @@ include/xorg/xkbrules.h
include/xorg/xkbsrv.h
include/xorg/xkbstr.h
include/xorg/xorg-server.h
+include/xorg/xlibre-server.h
include/xorg/xorgVersion.h
include/xorg/xserver-properties.h
include/xorg/xvdix.h
include/xorg/xvmcext.h
-lib/xorg/modules/xlibre-25.0/drivers/modesetting_drv.so
-lib/xorg/modules/xlibre-25.0/extensions/libglx.so
-lib/xorg/modules/xlibre-25.0/input/inputtest_drv.so
-lib/xorg/modules/xlibre-25.0/libexa.so
-lib/xorg/modules/xlibre-25.0/libfbdevhw.so
-lib/xorg/modules/xlibre-25.0/libglamoregl.so
-lib/xorg/modules/xlibre-25.0/libint10.so
-lib/xorg/modules/xlibre-25.0/libshadow.so
-lib/xorg/modules/xlibre-25.0/libshadowfb.so
-lib/xorg/modules/xlibre-25.0/libvgahw.so
-lib/xorg/modules/xlibre-25.0/libwfb.so
+lib/xorg/modules/xlibre-25/drivers/modesetting_drv.so
+lib/xorg/modules/xlibre-25/extensions/libglx.so
+%%INPUTTEST%%lib/xorg/modules/xlibre-25/input/inputtest_drv.so
+lib/xorg/modules/xlibre-25/libexa.so
+lib/xorg/modules/xlibre-25/libfbdevhw.so
+lib/xorg/modules/xlibre-25/libglamoregl.so
+lib/xorg/modules/xlibre-25/libint10.so
+lib/xorg/modules/xlibre-25/libshadow.so
+lib/xorg/modules/xlibre-25/libshadowfb.so
+lib/xorg/modules/xlibre-25/libvgahw.so
+lib/xorg/modules/xlibre-25/libwfb.so
lib/xorg/protocol.txt
libdata/pkgconfig/xorg-server.pc
+libdata/pkgconfig/xlibre-server.pc
%%SUID%%libexec/Xorg
%%SUID%%@(,,4555) libexec/Xorg.wrap
%%UDEV%%share/X11/xorg.conf.d/10-quirks.conf
share/X11/xorg.conf.d/20-evdev-kbd.conf
+share/X11/xorg.conf.d/10-nvidia.conf
share/aclocal/xorg-server.m4
share/man/man1/Xorg.1.gz
%%SUID%%share/man/man1/Xorg.wrap.1.gz
@@ -162,7 +162,7 @@ share/man/man1/Xserver.1.gz
share/man/man1/gtf.1.gz
share/man/man4/exa.4.gz
share/man/man4/fbdevhw.4.gz
-share/man/man4/inputtestdrv.4.gz
+%%INPUTTEST%%share/man/man4/inputtestdrv.4.gz
share/man/man4/modesetting.4.gz
%%SUID%%share/man/man5/Xwrapper.config.5.gz
share/man/man5/xorg.conf.5.gz