Date: Wed, 3 May 2023 07:44:37 GMT From: Emmanuel Vadot <manu@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: f32b188cc39a - main - x11-servers/xorg-server: add missing features for PRIME Message-ID: <202305030744.3437ibPA099270@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/ports/commit/?id=f32b188cc39ad6326ed65fe4fbb6c517a940bcad commit f32b188cc39ad6326ed65fe4fbb6c517a940bcad Author: Austin Shafer <ashafer@badland.io> AuthorDate: 2023-05-03 07:43:19 +0000 Commit: Emmanuel Vadot <manu@FreeBSD.org> CommitDate: 2023-05-03 07:44:15 +0000 x11-servers/xorg-server: add missing features for PRIME Modern PRIME X11 setups autoconfigure themselves, which internally uses the udev and udev_kms options to do so. These options are required for X to find the available DRM devices. This is needed for PRIME on FreeBSD. This is also adds the DRM platform code, taken from X commit: https://gitlab.freedesktop.org/xorg/xserver/-/commit/5468123822bbe8cd0a0abe07bbbd3a9cb14ed2cb Differential Revision: https://reviews.freebsd.org/D39886 Which is in master but not yet in any releases. This adds the platform code to the build for DRM so that PRIME setups can work. --- x11-servers/xorg-server/Makefile | 7 ++++--- .../xorg-server/files/patch-hw_xfree86_os-support_meson.build | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile index 16b5db40eba8..9187b5e12c12 100644 --- a/x11-servers/xorg-server/Makefile +++ b/x11-servers/xorg-server/Makefile @@ -1,6 +1,6 @@ PORTNAME= xorg PORTVERSION= 21.1.8 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= x11-servers MASTER_SITES= XORG/individual/xserver @@ -58,7 +58,6 @@ MESON_ARGS+= -Dxwin=false \ -Dxselinux=false \ -Dfallback_input_driver=libinput \ -Ddocs=false \ - -Dudev_kms=false \ -Dxcsecurity=true \ -Dxkb_dir=${LOCALBASE}/share/X11/xkb \ -Dxkb_output_dir=/var/lib/xkb \ @@ -72,10 +71,12 @@ MESON_ARGS+= -D${f}=false LIB_DEPENDS+= libudev.so:devel/libudev-devd \ libxcvt.so:x11/libxcvt MESON_ARGS+= -Dudev=true \ + -Dudev_kms=true \ -Dlog_dir=/var/log \ -Dsuid_wrapper=true .else -MESON_ARGS+= -Dudev=false +MESON_ARGS+= -Dudev=false \ + -Dudev_kms=false .endif .if ${FLAVOR} == xorg || ${FLAVOR} == xephyr diff --git a/x11-servers/xorg-server/files/patch-hw_xfree86_os-support_meson.build b/x11-servers/xorg-server/files/patch-hw_xfree86_os-support_meson.build index e65a3ee6c259..73762e37947d 100644 --- a/x11-servers/xorg-server/files/patch-hw_xfree86_os-support_meson.build +++ b/x11-servers/xorg-server/files/patch-hw_xfree86_os-support_meson.build @@ -1,14 +1,15 @@ ---- hw/xfree86/os-support/meson.build.orig 2022-07-12 13:27:57 UTC +--- hw/xfree86/os-support/meson.build.orig 2023-03-29 12:55:03 UTC +++ hw/xfree86/os-support/meson.build -@@ -96,6 +96,7 @@ elif host_machine.system().endswith('bsd') +@@ -96,6 +96,8 @@ elif host_machine.system().endswith('bsd') 'bsd/bsd_VTsw.c', 'bsd/bsd_bell.c', 'bsd/bsd_init.c', ++ 'linux/lnx_platform.c', + 'misc/SlowBcopy.c', 'shared/pm_noop.c' ] -@@ -111,9 +112,9 @@ elif host_machine.system().endswith('bsd') +@@ -111,9 +113,9 @@ elif host_machine.system().endswith('bsd') if host_machine.system() == 'netbsd' or host_machine.system() == 'openbsd' os_dep += cc.find_library('i386') endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202305030744.3437ibPA099270>