From nobody Sat Aug 12 22:59:03 2023 X-Original-To: dev-commits-ports-main@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 4RNbgq3KjKz4TwNw; Sat, 12 Aug 2023 22:59:03 +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 4RNbgq2v91z4bRC; Sat, 12 Aug 2023 22:59:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691881143; 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=rUCSyrm28+wWeCDS+zInxMztHTaiSYPspdNieJziFB8=; b=eYMTNK5R5B5n6FKMKl/GrFcxvO/DD8Kb7PIDYrFmWBpbfEdccvTEoIO7UIuwg6W6D+Aoo/ 0648Xyhtkxb7eLQqEJ8bf8V//AuOOBeIgmWISiNUz9xIc1J0GmvfOBKgUisRGASm5xzr2b 3MuvCPM864QxrzLNiN46VJggnGGKtkUmySeso3sNCv30Z6XOqqyEl8ZBpy8y2iGosG6x3S AESSyLWicouOBre1PcSR0z27wLbxsFv8f4WmerG0AuTVoq+o4K8HnjI+80t4w3JnOS9XG7 9oiXDgw39UcOpzSaFJauBmj06bgfN7L99aMca1seZ4SNRAs+bVe1bJB9wgojMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691881143; 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=rUCSyrm28+wWeCDS+zInxMztHTaiSYPspdNieJziFB8=; b=hZUZk5yMlrUswFu7dCytPNrQATdGDnhvJtTVpJLao8Bc09HUuN9Kc6K1k/M7EmYhZ6AZTr Ea2ekD9BM+uA479HUJ6dVH9qb7VKDPupfDovsQkiI6UNgT0MZKtuli0Pfkpa99Bq5wMFJ/ GOVVRNrGeQrgQ749KzX9gF5EZINll2kzqaj5aa35ohP4OzWnP6g0dt1eqKneO4+r5ySjXv cLKy6IbG+/VU5yeKmu2qPEM9Rbdgxh2C6seQzBdiRfqnqoydsZyS44YVsrogqsSKHi4F7+ o5ViQak6H/MpFlzqWT/kTP9JD5xuSfLd2Dd7Onb3r28bgq/hmOsVnutiws0RzA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691881143; a=rsa-sha256; cv=none; b=ub/5vJRzMrLTsAp6D68Mv3vt5g6guykxJ5sQhjKeKPyPidb0Nb+tq4ck2NLkWAn+2YVSwy 6Mupsytii7YybPMS9s4x9kMPUFXgacVdIoNeWVpBzpQhrSZmPYjX13qFVSffsisteIVSUg ga8uVqHKpd+bGMTMS4tDU+/cT49+ZcmCZCIgu8rmjBeSTbr8ZmO7tqD3/pp8Q2bsX0wqP7 XiuPYP937QB2ssj7NhsC61gVQfHMhbq5pX4piMRDBpRieTDhvDhfBhP0zVAsnjD8uFDQVs IEJ5BR5eiFeBBmkH6jKTHsJdbT0nWAFjbbWfx5HbywFePho9FDUzZGO3UCXrhQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RNbgq20WjzfTQ; Sat, 12 Aug 2023 22:59:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37CMx3LD071495; Sat, 12 Aug 2023 22:59:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37CMx3lr071492; Sat, 12 Aug 2023 22:59:03 GMT (envelope-from git) Date: Sat, 12 Aug 2023 22:59:03 GMT Message-Id: <202308122259.37CMx3lr071492@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: d1b7aad5f3cc - main - x11-servers/xorg-server: complete libmap.d switch after 50a34a07740e List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d1b7aad5f3cc475b86222599d0e9eb8d73b3c841 Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=d1b7aad5f3cc475b86222599d0e9eb8d73b3c841 commit d1b7aad5f3cc475b86222599d0e9eb8d73b3c841 Author: Jan Beich AuthorDate: 2023-05-27 20:44:33 +0000 Commit: Jan Beich CommitDate: 2023-08-12 22:58:06 +0000 x11-servers/xorg-server: complete libmap.d switch after 50a34a07740e libmap.conf(5) supports dlopen(3) but xorg-server uses absolute paths. PR: 271686 Reviewed by: gallatin --- x11-servers/xorg-server/Makefile | 9 +-------- x11-servers/xorg-server/files/pkg-post-deinstall.in | 1 - x11-servers/xorg-server/files/pkg-post-install.in | 11 ----------- x11-servers/xorg-server/pkg-plist | 2 +- x11/nvidia-driver-304/Makefile | 2 +- x11/nvidia-driver-340/Makefile | 2 +- x11/nvidia-driver-390/Makefile | 2 +- x11/nvidia-driver/Makefile | 3 --- x11/nvidia-driver/files/nvidia.conf.in | 2 ++ x11/nvidia-driver/files/pkg-deinstall.in | 12 ------------ x11/nvidia-driver/files/pkg-install.in | 10 ---------- 11 files changed, 7 insertions(+), 49 deletions(-) diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile index 3489488c8bc4..06ab654918b0 100644 --- a/x11-servers/xorg-server/Makefile +++ b/x11-servers/xorg-server/Makefile @@ -1,6 +1,6 @@ PORTNAME= xorg PORTVERSION= 21.1.8 -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 1 CATEGORIES= x11-servers MASTER_SITES= XORG/individual/xserver @@ -24,9 +24,6 @@ USE_GL= gl PORTNAME= xephyr .elif ${FLAVOR} == xorg PKGNAMESUFFIX= -server -SUB_FILES= pkg-post-deinstall pkg-post-install -PKGPOSTINSTALL= ${WRKDIR}/pkg-post-install -PKGPOSTDEINSTALL= ${WRKDIR}/pkg-post-deinstall .elif ${FLAVOR} == xnest PORTEPOCH= 2 PKGNAMESUFFIX= -nestserver @@ -133,10 +130,6 @@ PLIST_SUB+= SPARC64="@comment " .if ${FLAVOR} == xorg post-install: - # Avoid conflict with nvidia-driver, move libglx.so into .xorg directory - @${MKDIR} ${STAGEDIR}${PREFIX}/lib/xorg/modules/extensions/.xorg - ${MV} ${STAGEDIR}${PREFIX}/lib/xorg/modules/extensions/libglx.so \ - ${STAGEDIR}${PREFIX}/lib/xorg/modules/extensions/.xorg/ @${MKDIR} ${STAGEDIR}${PREFIX}/etc/X11/xorg.conf.d @${MKDIR} ${STAGEDIR}${FONTPATHD} @${MKDIR} ${STAGEDIR}${PREFIX}/share/X11/xorg.conf.d diff --git a/x11-servers/xorg-server/files/pkg-post-deinstall.in b/x11-servers/xorg-server/files/pkg-post-deinstall.in deleted file mode 100644 index 8d5bca04c35e..000000000000 --- a/x11-servers/xorg-server/files/pkg-post-deinstall.in +++ /dev/null @@ -1 +0,0 @@ -rm -f ${PKG_ROOTDIR}${PKG_PREFIX}/lib/xorg/modules/extensions/libglx.so diff --git a/x11-servers/xorg-server/files/pkg-post-install.in b/x11-servers/xorg-server/files/pkg-post-install.in deleted file mode 100644 index 17bfe3cda643..000000000000 --- a/x11-servers/xorg-server/files/pkg-post-install.in +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh - -PREFIX=${PKG_PREFIX-/usr/local} - -if [ -e ${PKG_ROOTDIR}${PREFIX}/lib/xorg/modules/extensions/.nvidia/libglx.so ]; then -install -l rs ${PKG_ROOTDIR}${PREFIX}/lib/xorg/modules/extensions/.nvidia/libglx.so \ - ${PKG_ROOTDIR}${PREFIX}/lib/xorg/modules/extensions/libglx.so -else -install -l rs ${PKG_ROOTDIR}${PREFIX}/lib/xorg/modules/extensions/.xorg/libglx.so \ - ${PKG_ROOTDIR}${PREFIX}/lib/xorg/modules/extensions/libglx.so -fi diff --git a/x11-servers/xorg-server/pkg-plist b/x11-servers/xorg-server/pkg-plist index c24eecb4f673..1277ba701dcf 100644 --- a/x11-servers/xorg-server/pkg-plist +++ b/x11-servers/xorg-server/pkg-plist @@ -160,7 +160,7 @@ include/xorg/xvdix.h include/xorg/xvmcext.h include/xorg/xf86-input-inputtest-protocol.h lib/xorg/modules/drivers/modesetting_drv.so -lib/xorg/modules/extensions/.xorg/libglx.so +lib/xorg/modules/extensions/libglx.so lib/xorg/modules/input/inputtest_drv.so lib/xorg/modules/libexa.so lib/xorg/modules/libglamoregl.so diff --git a/x11/nvidia-driver-304/Makefile b/x11/nvidia-driver-304/Makefile index d25e094b8d41..737adc80c52f 100644 --- a/x11/nvidia-driver-304/Makefile +++ b/x11/nvidia-driver-304/Makefile @@ -1,6 +1,6 @@ DISTVERSION= 304.137 # Explicitly set PORTREVISION as it can be overridden by the master port -PORTREVISION= 9 +PORTREVISION= 10 MASTERDIR= ${.CURDIR}/../nvidia-driver PKGNAMESUFFIX= -304 diff --git a/x11/nvidia-driver-340/Makefile b/x11/nvidia-driver-340/Makefile index 5c3345ca2634..adeee49ab528 100644 --- a/x11/nvidia-driver-340/Makefile +++ b/x11/nvidia-driver-340/Makefile @@ -1,6 +1,6 @@ DISTVERSION= 340.108 # Explicitly set PORTREVISION as it can be overridden by the master port -PORTREVISION= 3 +PORTREVISION= 4 MASTERDIR= ${.CURDIR}/../nvidia-driver PKGNAMESUFFIX= -340 diff --git a/x11/nvidia-driver-390/Makefile b/x11/nvidia-driver-390/Makefile index 63220845e3a7..71b473d0b033 100644 --- a/x11/nvidia-driver-390/Makefile +++ b/x11/nvidia-driver-390/Makefile @@ -1,6 +1,6 @@ DISTVERSION= 390.154 # Explicitly set PORTREVISION as it can be overridden by the master port -PORTREVISION= 0 +PORTREVISION= 1 MASTERDIR= ${.CURDIR}/../nvidia-driver PKGNAMESUFFIX= -390 diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile index 192af52bc549..a90e005e1252 100644 --- a/x11/nvidia-driver/Makefile +++ b/x11/nvidia-driver/Makefile @@ -64,9 +64,6 @@ SUB_FILES= pkg-message .if !defined(LIBGLDIR) SUB_FILES+= nvidia.conf .endif -.if ${NVVERSION} < 410.057 -SUB_FILES+= pkg-deinstall pkg-install -.endif SUB_PATCHES= extra-patch-src-Makefile \ extra-patch-src-nv-freebsd.h .if ${NVVERSION} < 510.03901 diff --git a/x11/nvidia-driver/files/nvidia.conf.in b/x11/nvidia-driver/files/nvidia.conf.in index 29eba5fa0075..d87cdc4d7a27 100644 --- a/x11/nvidia-driver/files/nvidia.conf.in +++ b/x11/nvidia-driver/files/nvidia.conf.in @@ -3,6 +3,8 @@ libGL.so libGL-NVIDIA.so libGL.so.1 libGL-NVIDIA.so.1 +%%PREFIX%%/lib/xorg/modules/extensions/libglx.so %%PREFIX%%/lib/xorg/modules/extensions/.nvidia/libglx.so + %%NVGL%%libEGL.so libEGL-NVIDIA.so %%NVGL%%libEGL.so.1 libEGL-NVIDIA.so.1 diff --git a/x11/nvidia-driver/files/pkg-deinstall.in b/x11/nvidia-driver/files/pkg-deinstall.in deleted file mode 100644 index d68b850fa9ea..000000000000 --- a/x11/nvidia-driver/files/pkg-deinstall.in +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -PREFIX=${PKG_PREFIX-/usr/local} - -case $2 in -DEINSTALL) - /bin/rm -f ${PREFIX}/lib/xorg/modules/extensions/libglx.so* - - /bin/ln -f ${PREFIX}/lib/xorg/modules/extensions/.xorg/libglx.so \ - ${PREFIX}/lib/xorg/modules/extensions/libglx.so - ;; -esac diff --git a/x11/nvidia-driver/files/pkg-install.in b/x11/nvidia-driver/files/pkg-install.in deleted file mode 100644 index 56634602563e..000000000000 --- a/x11/nvidia-driver/files/pkg-install.in +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -PREFIX=${PKG_PREFIX-/usr/local} - -case $2 in -POST-INSTALL) - /bin/ln -f ${PREFIX}/lib/xorg/modules/extensions/.nvidia/libglx.so.1 \ - ${PREFIX}/lib/xorg/modules/extensions/libglx.so - ;; -esac