88b0ae2bb9
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
23 lines
807 B
C
23 lines
807 B
C
* Skip the detection of root rights requirement, the assumption that presence
|
|
* of KMS drivers removes the root requirement is only valid for Linux
|
|
*
|
|
--- 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[])
|
|
|
|
int main(int argc, char *argv[])
|
|
{
|
|
-#ifdef WITH_LIBDRM
|
|
+#if defined(WITH_LIBDRM) && defined(__linux__)
|
|
struct drm_mode_card_res res;
|
|
#endif
|
|
char buf[PATH_MAX];
|
|
@@ -230,7 +230,7 @@ int main(int argc, char *argv[])
|
|
}
|
|
}
|
|
|
|
-#ifdef WITH_LIBDRM
|
|
+#if defined(WITH_LIBDRM) && defined(__linux__)
|
|
/* Detect if we need root rights, except when overridden by the config */
|
|
if (needs_root_rights == -1) {
|
|
for (i = 0; i < 16; i++) {
|