Date: Sat, 12 Aug 2023 22:59:02 GMT From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 0d5b62609e7d - main - x11-servers/xorg-server: unbreak nvidia-driver < 410 after 88b0ae2bb9c6 Message-ID: <202308122259.37CMx2eK071442@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=0d5b62609e7d66aa4f64519ba822c83498874cd0 commit 0d5b62609e7d66aa4f64519ba822c83498874cd0 Author: Jan Beich <jbeich@FreeBSD.org> AuthorDate: 2023-08-12 22:35:29 +0000 Commit: Jan Beich <jbeich@FreeBSD.org> CommitDate: 2023-08-12 22:58:06 +0000 x11-servers/xorg-server: unbreak nvidia-driver < 410 after 88b0ae2bb9c6 Restore libglx.so -> .nvidia/libglx.so hardlink as symlink when xorg-server is reinstalled after nvidia-driver. PR: 271629 Reported by: gallatin --- x11-servers/xorg-server/Makefile | 2 +- x11-servers/xorg-server/files/pkg-post-install.in | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile index 9187b5e12c12..3489488c8bc4 100644 --- a/x11-servers/xorg-server/Makefile +++ b/x11-servers/xorg-server/Makefile @@ -1,6 +1,6 @@ PORTNAME= xorg PORTVERSION= 21.1.8 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= x11-servers MASTER_SITES= XORG/individual/xserver diff --git a/x11-servers/xorg-server/files/pkg-post-install.in b/x11-servers/xorg-server/files/pkg-post-install.in index 118c4eb9e706..17bfe3cda643 100644 --- a/x11-servers/xorg-server/files/pkg-post-install.in +++ b/x11-servers/xorg-server/files/pkg-post-install.in @@ -2,5 +2,10 @@ 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202308122259.37CMx2eK071442>