svn commit: r549424 - in head/x11: nvidia-driver nvidia-driver-304 nvidia-driver-340 nvidia-driver-390 nvidia-driver/files

[Emmanuel Vadot]

Author: manu
Date: Mon Sep 21 09:05:04 2020
New Revision: 549424
URL: https://svnweb.freebsd.org/changeset/ports/549424

Log:
  Fix nvidia-driver* after r548950
  
  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 at unislabs.com>

Modified:
  head/x11/nvidia-driver-304/Makefile
  head/x11/nvidia-driver-340/Makefile
  head/x11/nvidia-driver-390/Makefile
  head/x11/nvidia-driver/Makefile
  head/x11/nvidia-driver/files/nvidia.conf.in
  head/x11/nvidia-driver/pkg-plist

Modified: head/x11/nvidia-driver-304/Makefile
==============================================================================
--- head/x11/nvidia-driver-304/Makefile	Mon Sep 21 08:52:29 2020	(r549423)
+++ head/x11/nvidia-driver-304/Makefile	Mon Sep 21 09:05:04 2020	(r549424)
@@ -3,7 +3,7 @@
 
 DISTVERSION=	304.137
 # Explicitly set PORTREVISION as it can be overridden by the master port
-PORTREVISION=	7
+PORTREVISION=	8
 
 MASTERDIR=	${.CURDIR}/../nvidia-driver
 PKGNAMESUFFIX=	-304

Modified: head/x11/nvidia-driver-340/Makefile
==============================================================================
--- head/x11/nvidia-driver-340/Makefile	Mon Sep 21 08:52:29 2020	(r549423)
+++ head/x11/nvidia-driver-340/Makefile	Mon Sep 21 09:05:04 2020	(r549424)
@@ -3,7 +3,7 @@
 
 DISTVERSION=	340.108
 # Explicitly set PORTREVISION as it can be overridden by the master port
-PORTREVISION=	1
+PORTREVISION=	2
 
 MASTERDIR=	${.CURDIR}/../nvidia-driver
 PKGNAMESUFFIX=	-340

Modified: head/x11/nvidia-driver-390/Makefile
==============================================================================
--- head/x11/nvidia-driver-390/Makefile	Mon Sep 21 08:52:29 2020	(r549423)
+++ head/x11/nvidia-driver-390/Makefile	Mon Sep 21 09:05:04 2020	(r549424)
@@ -3,7 +3,7 @@
 
 DISTVERSION=	390.138
 # Explicitly set PORTREVISION as it can be overridden by the master port
-PORTREVISION=	0
+PORTREVISION=	1
 
 MASTERDIR=	${.CURDIR}/../nvidia-driver
 PKGNAMESUFFIX=	-390

Modified: head/x11/nvidia-driver/Makefile
==============================================================================
--- head/x11/nvidia-driver/Makefile	Mon Sep 21 08:52:29 2020	(r549423)
+++ head/x11/nvidia-driver/Makefile	Mon Sep 21 09:05:04 2020	(r549424)
@@ -13,7 +13,7 @@
 PORTNAME=	nvidia-driver
 DISTVERSION?=	440.100
 # Always try to set PORTREVISION as it can be overridden by the slave ports
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	x11
 MASTER_SITES=	NVIDIA/XFree86/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 \
 		${STAGEDIR}${PREFIX}/lib/libEGL-NVIDIA.so.1
 	${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 \
 		${STAGEDIR}${PREFIX}/lib/libGLESv2-NVIDIA.so
 	${MV} -f ${STAGEDIR}${PREFIX}/lib/libGLESv2.so.2 \

Modified: head/x11/nvidia-driver/files/nvidia.conf.in
==============================================================================
--- head/x11/nvidia-driver/files/nvidia.conf.in	Mon Sep 21 08:52:29 2020	(r549423)
+++ head/x11/nvidia-driver/files/nvidia.conf.in	Mon Sep 21 09:05:04 2020	(r549424)
@@ -6,6 +6,9 @@ libGL.so.1	libGL-NVIDIA.so.1
 %%NVGL%%libEGL.so	libEGL-NVIDIA.so
 %%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.2	libGLESv2-NVIDIA.so.2
 

Modified: head/x11/nvidia-driver/pkg-plist
==============================================================================
--- head/x11/nvidia-driver/pkg-plist	Mon Sep 21 08:52:29 2020	(r549423)
+++ head/x11/nvidia-driver/pkg-plist	Mon Sep 21 09:05:04 2020	(r549424)
@@ -8,8 +8,6 @@ lib/libEGL_nvidia.so
 lib/libEGL_nvidia.so.0
 lib/libGL-NVIDIA.so
 lib/libGL-NVIDIA.so.1
-lib/libGLESv1_CM.so
-lib/libGLESv1_CM.so.1
 lib/libGLESv1_CM_nvidia.so
 lib/libGLESv1_CM_nvidia.so.1
 lib/libGLESv2-NVIDIA.so