kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
freebsd-ports/x11-servers/xorg-server/files/patch-hw_xfree86_xorg-wrapper.c

24 lines
807 B
C
Raw Normal View History

Update xorg x11 servers to 1.20.7 Update xorg x11 servers to 1.20.7. This updates x11-servers/xorg-server, xephyr, xorg-dmx, xorg-nestserver, xorg-vbserver and xwayland. Enable the UDEV backend by default, instead of the DEVD backend, for autoconfiguration of input devices on FreeBSD 12 and later. FreeBSD 11 lacks the needed support in base and will keep on using the DEVD backend. Support for the HAL backend is dropped completely, it has been deprecated for a long time. Update and improve the DEVD backend. Add a pkg message about sysctl configuration that might be needed when using UDEV. Use the upstream fix for glamour issues. Use evdev xkb rules by default in xwayland [2] Add x11-drivers/xf86-input-libinput to the list installed by default by x11-drivers/xorg-drivers. Fix net/tigervnc-server and emulators/virtualbox-ose Bump portrevision of all x11 drivers, as well as other ports dependent on xorg-server. This represents work by many people over a long period. These include wulf, ak, dumbbell, hselasky pete AT nomadlogic DOT org, jbeich, manu, myself and possibly others (I tried to look through history, but might have missed people. If so, I am sorry.) PR: 196678 [1], 244129 [2] Submitted by: hselasky, wulf [1], jbeich [2] Obtained from: https://github.com/FreeBSDDesktop/freebsd-ports/tree/feature/xserver-1.20 (in part)
2020-02-20 22:15:44 +01:00
* Skip the detection of root rights requirement, the assumption that presence
* of KMS drivers removes the root requirement is only valid for Linux
*
xorg: upgrade to 21.1.4 Port changes: - flavorize the port - decouple Xwayland as it has been split from Xorg - switch to meson - cleanup non necessary patches anymore - stop butchering the build system to play with Xorg.wrap but do it in post-install - remove dmx (no longer existing) - use libmd for sha1 (remove dependency on open/libre ssl) - always activate RPC security - simplify postinstall/deinstall script and make them cross install friendly - remove the SUID option and make it the default, we cannot startx as user without it - only keep the mesa-dri dependency on xorg-server not others xf86-video-ati: fix build with recent xorg While here incorporate a patch which prevent crash of the driver when xrandr is invoked Update x11/libxcvt to provide cvt(1) and friends which are not provided anymore Xorg Reviewed by: tcberner, manu, jbeich Approved by: tcberner, manu Differential Revision: https://reviews.freebsd.org/D35661
2022-06-29 15:44:41 +02:00
--- hw/xfree86/xorg-wrapper.c.orig 2022-01-02 23:41:56.000000000 +0100
+++ hw/xfree86/xorg-wrapper.c 2022-06-29 16:28:24.797008000 +0200
@@ -191,7 +191,7 @@ int main(int argc, char *argv[])
Update xorg x11 servers to 1.20.7 Update xorg x11 servers to 1.20.7. This updates x11-servers/xorg-server, xephyr, xorg-dmx, xorg-nestserver, xorg-vbserver and xwayland. Enable the UDEV backend by default, instead of the DEVD backend, for autoconfiguration of input devices on FreeBSD 12 and later. FreeBSD 11 lacks the needed support in base and will keep on using the DEVD backend. Support for the HAL backend is dropped completely, it has been deprecated for a long time. Update and improve the DEVD backend. Add a pkg message about sysctl configuration that might be needed when using UDEV. Use the upstream fix for glamour issues. Use evdev xkb rules by default in xwayland [2] Add x11-drivers/xf86-input-libinput to the list installed by default by x11-drivers/xorg-drivers. Fix net/tigervnc-server and emulators/virtualbox-ose Bump portrevision of all x11 drivers, as well as other ports dependent on xorg-server. This represents work by many people over a long period. These include wulf, ak, dumbbell, hselasky pete AT nomadlogic DOT org, jbeich, manu, myself and possibly others (I tried to look through history, but might have missed people. If so, I am sorry.) PR: 196678 [1], 244129 [2] Submitted by: hselasky, wulf [1], jbeich [2] Obtained from: https://github.com/FreeBSDDesktop/freebsd-ports/tree/feature/xserver-1.20 (in part)
2020-02-20 22:15:44 +01:00
int main(int argc, char *argv[])
{
-#ifdef WITH_LIBDRM
xorg: upgrade to 21.1.4 Port changes: - flavorize the port - decouple Xwayland as it has been split from Xorg - switch to meson - cleanup non necessary patches anymore - stop butchering the build system to play with Xorg.wrap but do it in post-install - remove dmx (no longer existing) - use libmd for sha1 (remove dependency on open/libre ssl) - always activate RPC security - simplify postinstall/deinstall script and make them cross install friendly - remove the SUID option and make it the default, we cannot startx as user without it - only keep the mesa-dri dependency on xorg-server not others xf86-video-ati: fix build with recent xorg While here incorporate a patch which prevent crash of the driver when xrandr is invoked Update x11/libxcvt to provide cvt(1) and friends which are not provided anymore Xorg Reviewed by: tcberner, manu, jbeich Approved by: tcberner, manu Differential Revision: https://reviews.freebsd.org/D35661
2022-06-29 15:44:41 +02:00
+#if defined(WITH_LIBDRM) && defined(__linux__)
struct drm_mode_card_res res;
#endif
Update xorg x11 servers to 1.20.7 Update xorg x11 servers to 1.20.7. This updates x11-servers/xorg-server, xephyr, xorg-dmx, xorg-nestserver, xorg-vbserver and xwayland. Enable the UDEV backend by default, instead of the DEVD backend, for autoconfiguration of input devices on FreeBSD 12 and later. FreeBSD 11 lacks the needed support in base and will keep on using the DEVD backend. Support for the HAL backend is dropped completely, it has been deprecated for a long time. Update and improve the DEVD backend. Add a pkg message about sysctl configuration that might be needed when using UDEV. Use the upstream fix for glamour issues. Use evdev xkb rules by default in xwayland [2] Add x11-drivers/xf86-input-libinput to the list installed by default by x11-drivers/xorg-drivers. Fix net/tigervnc-server and emulators/virtualbox-ose Bump portrevision of all x11 drivers, as well as other ports dependent on xorg-server. This represents work by many people over a long period. These include wulf, ak, dumbbell, hselasky pete AT nomadlogic DOT org, jbeich, manu, myself and possibly others (I tried to look through history, but might have missed people. If so, I am sorry.) PR: 196678 [1], 244129 [2] Submitted by: hselasky, wulf [1], jbeich [2] Obtained from: https://github.com/FreeBSDDesktop/freebsd-ports/tree/feature/xserver-1.20 (in part)
2020-02-20 22:15:44 +01:00
char buf[PATH_MAX];
xorg: upgrade to 21.1.4 Port changes: - flavorize the port - decouple Xwayland as it has been split from Xorg - switch to meson - cleanup non necessary patches anymore - stop butchering the build system to play with Xorg.wrap but do it in post-install - remove dmx (no longer existing) - use libmd for sha1 (remove dependency on open/libre ssl) - always activate RPC security - simplify postinstall/deinstall script and make them cross install friendly - remove the SUID option and make it the default, we cannot startx as user without it - only keep the mesa-dri dependency on xorg-server not others xf86-video-ati: fix build with recent xorg While here incorporate a patch which prevent crash of the driver when xrandr is invoked Update x11/libxcvt to provide cvt(1) and friends which are not provided anymore Xorg Reviewed by: tcberner, manu, jbeich Approved by: tcberner, manu Differential Revision: https://reviews.freebsd.org/D35661
2022-06-29 15:44:41 +02:00
@@ -230,7 +230,7 @@ int main(int argc, char *argv[])
Update xorg x11 servers to 1.20.7 Update xorg x11 servers to 1.20.7. This updates x11-servers/xorg-server, xephyr, xorg-dmx, xorg-nestserver, xorg-vbserver and xwayland. Enable the UDEV backend by default, instead of the DEVD backend, for autoconfiguration of input devices on FreeBSD 12 and later. FreeBSD 11 lacks the needed support in base and will keep on using the DEVD backend. Support for the HAL backend is dropped completely, it has been deprecated for a long time. Update and improve the DEVD backend. Add a pkg message about sysctl configuration that might be needed when using UDEV. Use the upstream fix for glamour issues. Use evdev xkb rules by default in xwayland [2] Add x11-drivers/xf86-input-libinput to the list installed by default by x11-drivers/xorg-drivers. Fix net/tigervnc-server and emulators/virtualbox-ose Bump portrevision of all x11 drivers, as well as other ports dependent on xorg-server. This represents work by many people over a long period. These include wulf, ak, dumbbell, hselasky pete AT nomadlogic DOT org, jbeich, manu, myself and possibly others (I tried to look through history, but might have missed people. If so, I am sorry.) PR: 196678 [1], 244129 [2] Submitted by: hselasky, wulf [1], jbeich [2] Obtained from: https://github.com/FreeBSDDesktop/freebsd-ports/tree/feature/xserver-1.20 (in part)
2020-02-20 22:15:44 +01:00
}
}
-#ifdef WITH_LIBDRM
+#if defined(WITH_LIBDRM) && defined(__linux__)
xorg: upgrade to 21.1.4 Port changes: - flavorize the port - decouple Xwayland as it has been split from Xorg - switch to meson - cleanup non necessary patches anymore - stop butchering the build system to play with Xorg.wrap but do it in post-install - remove dmx (no longer existing) - use libmd for sha1 (remove dependency on open/libre ssl) - always activate RPC security - simplify postinstall/deinstall script and make them cross install friendly - remove the SUID option and make it the default, we cannot startx as user without it - only keep the mesa-dri dependency on xorg-server not others xf86-video-ati: fix build with recent xorg While here incorporate a patch which prevent crash of the driver when xrandr is invoked Update x11/libxcvt to provide cvt(1) and friends which are not provided anymore Xorg Reviewed by: tcberner, manu, jbeich Approved by: tcberner, manu Differential Revision: https://reviews.freebsd.org/D35661
2022-06-29 15:44:41 +02:00
/* Detect if we need root rights, except when overridden by the config */
Update xorg x11 servers to 1.20.7 Update xorg x11 servers to 1.20.7. This updates x11-servers/xorg-server, xephyr, xorg-dmx, xorg-nestserver, xorg-vbserver and xwayland. Enable the UDEV backend by default, instead of the DEVD backend, for autoconfiguration of input devices on FreeBSD 12 and later. FreeBSD 11 lacks the needed support in base and will keep on using the DEVD backend. Support for the HAL backend is dropped completely, it has been deprecated for a long time. Update and improve the DEVD backend. Add a pkg message about sysctl configuration that might be needed when using UDEV. Use the upstream fix for glamour issues. Use evdev xkb rules by default in xwayland [2] Add x11-drivers/xf86-input-libinput to the list installed by default by x11-drivers/xorg-drivers. Fix net/tigervnc-server and emulators/virtualbox-ose Bump portrevision of all x11 drivers, as well as other ports dependent on xorg-server. This represents work by many people over a long period. These include wulf, ak, dumbbell, hselasky pete AT nomadlogic DOT org, jbeich, manu, myself and possibly others (I tried to look through history, but might have missed people. If so, I am sorry.) PR: 196678 [1], 244129 [2] Submitted by: hselasky, wulf [1], jbeich [2] Obtained from: https://github.com/FreeBSDDesktop/freebsd-ports/tree/feature/xserver-1.20 (in part)
2020-02-20 22:15:44 +01:00
if (needs_root_rights == -1) {
for (i = 0; i < 16; i++) {
Reference in a new issue Copy permalink