From owner-svn-ports-head@freebsd.org Mon Sep 21 09:05:06 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 070593EB070; Mon, 21 Sep 2020 09:05:06 +0000 (UTC) (envelope-from manu@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bvz6T6RrXz40L7; Mon, 21 Sep 2020 09:05:05 +0000 (UTC) (envelope-from manu@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C0920BF15; Mon, 21 Sep 2020 09:05:05 +0000 (UTC) (envelope-from manu@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 08L955bE055566; Mon, 21 Sep 2020 09:05:05 GMT (envelope-from manu@FreeBSD.org) Received: (from manu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08L954br055560; Mon, 21 Sep 2020 09:05:04 GMT (envelope-from manu@FreeBSD.org) Message-Id: <202009210905.08L954br055560@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: manu set sender to manu@FreeBSD.org using -f From: Emmanuel Vadot Date: Mon, 21 Sep 2020 09:05:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r549424 - in head/x11: nvidia-driver nvidia-driver-304 nvidia-driver-340 nvidia-driver-390 nvidia-driver/files X-SVN-Group: ports-head X-SVN-Commit-Author: manu X-SVN-Commit-Paths: in head/x11: nvidia-driver nvidia-driver-304 nvidia-driver-340 nvidia-driver-390 nvidia-driver/files X-SVN-Commit-Revision: 549424 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Sep 2020 09:05:06 -0000 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 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