cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix nvidia-driver* after r548950

Browse Source 
Now that mesa include glesv1 lib, remove the nvidia generic named lib
and add more entries in libmap.conf so the nvidia ones are used.

PR:		249448
Reported by:	VVD <vvd@unislabs.com>
This commit is contained in:
Emmanuel Vadot 2020-09-21 09:05:04 +00:00
parent 19d5bb85c2
commit 07ef89b5a8
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=549424
6 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,7 +3,7 @@
DISTVERSION= 304.137 DISTVERSION= 304.137
# Explicitly set PORTREVISION as it can be overridden by the master port # Explicitly set PORTREVISION as it can be overridden by the master port
PORTREVISION= 7 PORTREVISION= 8
MASTERDIR= ${.CURDIR}/../nvidia-driver MASTERDIR= ${.CURDIR}/../nvidia-driver
PKGNAMESUFFIX= -304 PKGNAMESUFFIX= -304

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

@ -3,7 +3,7 @@
DISTVERSION= 340.108 DISTVERSION= 340.108
# Explicitly set PORTREVISION as it can be overridden by the master port # Explicitly set PORTREVISION as it can be overridden by the master port
PORTREVISION= 1 PORTREVISION= 2
MASTERDIR= ${.CURDIR}/../nvidia-driver MASTERDIR= ${.CURDIR}/../nvidia-driver
PKGNAMESUFFIX= -340 PKGNAMESUFFIX= -340

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

@ -3,7 +3,7 @@
DISTVERSION= 390.138 DISTVERSION= 390.138
# Explicitly set PORTREVISION as it can be overridden by the master port # Explicitly set PORTREVISION as it can be overridden by the master port
PORTREVISION= 0 PORTREVISION= 1
MASTERDIR= ${.CURDIR}/../nvidia-driver MASTERDIR= ${.CURDIR}/../nvidia-driver
PKGNAMESUFFIX= -390 PKGNAMESUFFIX= -390

4
x11/nvidia-driver/Makefile
View File

@ -13,7 +13,7 @@
PORTNAME= nvidia-driver PORTNAME= nvidia-driver
DISTVERSION?= 440.100 DISTVERSION?= 440.100
# Always try to set PORTREVISION as it can be overridden by the slave ports # Always try to set PORTREVISION as it can be overridden by the slave ports
PORTREVISION?= 0 PORTREVISION?= 1
CATEGORIES= x11 CATEGORIES= x11
MASTER_SITES= NVIDIA/XFree86/FreeBSD-${ARCH_SUFX}/${DISTVERSION} MASTER_SITES= NVIDIA/XFree86/FreeBSD-${ARCH_SUFX}/${DISTVERSION}
DISTNAME= NVIDIA-FreeBSD-${ARCH_SUFX}-${DISTVERSION} DISTNAME= NVIDIA-FreeBSD-${ARCH_SUFX}-${DISTVERSION}
@ -261,6 +261,8 @@ post-install: .SILENT
${MV} -f ${STAGEDIR}${PREFIX}/lib/libEGL.so.1 \ ${MV} -f ${STAGEDIR}${PREFIX}/lib/libEGL.so.1 \
${STAGEDIR}${PREFIX}/lib/libEGL-NVIDIA.so.1 ${STAGEDIR}${PREFIX}/lib/libEGL-NVIDIA.so.1
${RM} ${STAGEDIR}${PREFIX}/lib/libEGL.so ${RM} ${STAGEDIR}${PREFIX}/lib/libEGL.so
${RM} ${STAGEDIR}${PREFIX}/lib/libGLESv1_CM.so
${RM} ${STAGEDIR}${PREFIX}/lib/libGLESv1_CM.so.1
${LN} -sf libGLESv2-NVIDIA.so.2 \ ${LN} -sf libGLESv2-NVIDIA.so.2 \
${STAGEDIR}${PREFIX}/lib/libGLESv2-NVIDIA.so ${STAGEDIR}${PREFIX}/lib/libGLESv2-NVIDIA.so
${MV} -f ${STAGEDIR}${PREFIX}/lib/libGLESv2.so.2 \ ${MV} -f ${STAGEDIR}${PREFIX}/lib/libGLESv2.so.2 \

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

@ -6,6 +6,9 @@ libGL.so.1 libGL-NVIDIA.so.1
%%NVGL%%libEGL.so libEGL-NVIDIA.so %%NVGL%%libEGL.so libEGL-NVIDIA.so
%%NVGL%%libEGL.so.1 libEGL-NVIDIA.so.1 %%NVGL%%libEGL.so.1 libEGL-NVIDIA.so.1
%%NVGL%%libGLESv1_CM.so libGLESv1_CM_nvidia.so
%%NVGL%%libGLESv1_CM.so.1 libGLESv1_CM_nvidia.so.1
%%NVGL%%libGLESv2.so libGLESv2-NVIDIA.so %%NVGL%%libGLESv2.so libGLESv2-NVIDIA.so
%%NVGL%%libGLESv2.so.2 libGLESv2-NVIDIA.so.2 %%NVGL%%libGLESv2.so.2 libGLESv2-NVIDIA.so.2

2
x11/nvidia-driver/pkg-plist
View File

@ -8,8 +8,6 @@ lib/libEGL_nvidia.so
lib/libEGL_nvidia.so.0 lib/libEGL_nvidia.so.0
lib/libGL-NVIDIA.so lib/libGL-NVIDIA.so
lib/libGL-NVIDIA.so.1 lib/libGL-NVIDIA.so.1
lib/libGLESv1_CM.so
lib/libGLESv1_CM.so.1
lib/libGLESv1_CM_nvidia.so lib/libGLESv1_CM_nvidia.so
lib/libGLESv1_CM_nvidia.so.1 lib/libGLESv1_CM_nvidia.so.1
lib/libGLESv2-NVIDIA.so lib/libGLESv2-NVIDIA.so