From nobody Wed May 3 07:44:37 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QB89K6kyGz493Mh; Wed, 3 May 2023 07:44:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QB89K3bDYz4YN9; Wed, 3 May 2023 07:44:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683099877; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dvEKPPlXFlt/Xnk0dmNtvloT/9C4xp56hXUmJmaoXFg=; b=I7c0kU/D5uvf1mJ2pKuxhnmjLWVY2Ews82it06qrZCMi9K7gt8+PK20btb5HAiaDcCDuPa rFfkUacpAODq+EP+fCtsDXJ1NSkuGsrSb5L8v14aoZoUXypj/BnmeI5c8s8kk2D0ctlizy 5WuQTGw7S4wlgNMw0NB9b6VVq9pf/utdwTFXKE3jeefDERftC2C0xBpe9g1xsK8ef2fWEQ zQmFji79kbj/TKjWW7rE548Q9GCfaFHt0Y0lc0H01tway9Ryw1HnCbN3qrqvm0kFYiqRn2 86T0JhCQ0ZZciC/F/OW2O74EybVa+ql98hg8U5XfOLZXCM/WXh2Mpa26Yc6cDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683099877; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dvEKPPlXFlt/Xnk0dmNtvloT/9C4xp56hXUmJmaoXFg=; b=RJHo7iXH1Y+cbBOyjP9JnXNeUOLqPHHobSR0ZmxXsha3H657KbYBMquwhINNZTpEECIKZ+ FEynKP2MM35G338WOL568AdXWuE8o0GutwSmWVA2sR17MUwj3+UtZn57v5oa2SJ1s9zkps 4TldxMCNXBffNtJT25TCr5NCZlzhaEDC1UTPPJ334B73+wMOvwfYtkqZBhd4vQwMcHMD5Q 7BJy1CdbGzwSQrfOBK9OfH4vqt9dwbTlQPj6QuJEBmBPATyRRVHKsX99F9RCd52hQaoYWt a1psdMeaCqedovDtw1AHOtKZYTlqpu13Da/RfYoWtJblKVNLnO14IlGAuoWHPQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683099877; a=rsa-sha256; cv=none; b=FgMHXtMdc8URckxmlLG4UB1lbf/VGtuYawnkU1ov2QWMiTX3Fbe+BfkQA6mzC77a6MgI12 DN8dcZkrSBFLpAcYtdYvAFEU4d+rIgiEVnB8O7TeP8kQtjRZeLlU0BZaYEiVeKjgvYzVSC Sm6iZw6tViwcFO+XDQob4MqRiEpWK3PfdHisvJ5A71cqhqEiiT8HmjwPFD7V1281TtI0pi oe5+YDZq2IP7+bXWC0ZJTBRxp50deEgoeLM78SKN6NqRMWOYLFuL6zZVkq7NCMqolslxhw 9DQf7fk/EyCKbvGHtfpOjH5N73UKa4edXGRFLRzBv9Doq4tTMRgNrLns8ZgwHA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QB89K2gBQzMpR; Wed, 3 May 2023 07:44:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 3437ibqx099271; Wed, 3 May 2023 07:44:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3437ibPA099270; Wed, 3 May 2023 07:44:37 GMT (envelope-from git) Date: Wed, 3 May 2023 07:44:37 GMT Message-Id: <202305030744.3437ibPA099270@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Emmanuel Vadot Subject: git: f32b188cc39a - main - x11-servers/xorg-server: add missing features for PRIME List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f32b188cc39ad6326ed65fe4fbb6c517a940bcad Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/ports/commit/?id=f32b188cc39ad6326ed65fe4fbb6c517a940bcad commit f32b188cc39ad6326ed65fe4fbb6c517a940bcad Author: Austin Shafer AuthorDate: 2023-05-03 07:43:19 +0000 Commit: Emmanuel Vadot 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