mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-14 07:43:06 +00:00
Code Issues Releases Activity

x11-servers/xorg-server: complete libmap.d switch after 50a34a0774

Browse Source 
libmap.conf(5) supports dlopen(3) but xorg-server uses absolute paths.

PR:		271686
Reviewed by:	gallatin
This commit is contained in:
Jan Beich 2023-05-27 20:44:33 +00:00
parent 0d5b62609e
commit d1b7aad5f3
11 changed files with 7 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
x11-servers/xorg-server/Makefile
View File

@ -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

1
x11-servers/xorg-server/files/pkg-post-deinstall.in
View File

@ -1 +0,0 @@
rm -f ${PKG_ROOTDIR}${PKG_PREFIX}/lib/xorg/modules/extensions/libglx.so

11
x11-servers/xorg-server/files/pkg-post-install.in
View File

@ -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

2
x11-servers/xorg-server/pkg-plist
View File

@ -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

2
x11/nvidia-driver-304/Makefile
View File

@ -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

2
x11/nvidia-driver-340/Makefile
View File

@ -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

2
x11/nvidia-driver-390/Makefile
View File

@ -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

3
x11/nvidia-driver/Makefile
View File

@ -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

2
x11/nvidia-driver/files/nvidia.conf.in
View File

@ -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

12
x11/nvidia-driver/files/pkg-deinstall.in
View File

@ -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

10
x11/nvidia-driver/files/pkg-install.in
View File

@ -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