git: 1a86bea35222 - main - graphics: Make libglvnd a LIB_DEPEND
Kevin Bowling
kbowling at FreeBSD.org
Sun Aug 15 18:47:57 UTC 2021
The branch main has been updated by kbowling:
URL: https://cgit.FreeBSD.org/ports/commit/?id=1a86bea35222459cae676d18682b85e919f50512
commit 1a86bea35222459cae676d18682b85e919f50512
Author: Kevin Bowling <kbowling at FreeBSD.org>
AuthorDate: 2021-08-15 18:44:34 +0000
Commit: Kevin Bowling <kbowling at FreeBSD.org>
CommitDate: 2021-08-15 18:47:47 +0000
graphics: Make libglvnd a LIB_DEPEND
There are still some incoming reports of dep issues when upgrading
old systems. This should help with dep solving and getting past the
file conflicts.
Reviewed by: jbeich, x11 (manu)
Differential Revision: https://reviews.freebsd.org/D31465
---
graphics/mesa-devel/Makefile | 5 +++--
graphics/mesa-libs/Makefile | 4 ++--
x11/nvidia-driver/Makefile | 5 +++--
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/graphics/mesa-devel/Makefile b/graphics/mesa-devel/Makefile
index aa4e360865fe..92aec078f5ec 100644
--- a/graphics/mesa-devel/Makefile
+++ b/graphics/mesa-devel/Makefile
@@ -1,6 +1,7 @@
PORTNAME= mesa
DISTVERSION= 21.2-branchpoint-981
DISTVERSIONSUFFIX= -g38f39cc1e21
+PORTREVISION= 1
CATEGORIES= graphics
PKGNAMESUFFIX= -devel
@@ -23,9 +24,9 @@ ONLY_FOR_ARCHS= aarch64 amd64 i386 powerpc64 powerpc64le
ONLY_FOR_ARCHS_REASON= Limited scope: no old drivers and no software rendering. \
See also https://mesamatrix.net/
-BUILD_DEPENDS= libglvnd>=1.3.2:graphics/libglvnd \
- ${PYTHON_PKGNAMEPREFIX}mako>0:textproc/py-mako@${PY_FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mako>0:textproc/py-mako@${PY_FLAVOR}
LIB_DEPENDS= libdrm.so:graphics/libdrm \
+ libOpenGL.so:graphics/libglvnd \
libexpat.so:textproc/expat2
.if !exists(/usr/lib/libelf.so)
# DragonFly doesn't install it yet
diff --git a/graphics/mesa-libs/Makefile b/graphics/mesa-libs/Makefile
index 265935e99058..0141367c9784 100644
--- a/graphics/mesa-libs/Makefile
+++ b/graphics/mesa-libs/Makefile
@@ -2,12 +2,12 @@
PORTNAME= mesa-libs
PORTVERSION= ${MESAVERSION}
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
COMMENT= OpenGL libraries that support GLX and EGL clients
-BUILD_DEPENDS= libglvnd>0:graphics/libglvnd
+LIB_DEPENDS= libOpenGL.so:graphics/libglvnd
OPTIONS_GROUP= PLATFORM
OPTIONS_GROUP_PLATFORM= PLATFORM_X11 PLATFORM_WAYLAND
diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile
index d20b268874db..4fcc7f8922cb 100644
--- a/x11/nvidia-driver/Makefile
+++ b/x11/nvidia-driver/Makefile
@@ -16,7 +16,7 @@
PORTNAME?= nvidia-driver
DISTVERSION?= 470.63.01
# 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}
@@ -32,7 +32,8 @@ LICENSE_FILE= ${WRKSRC}/doc/license.txt
# obj/libEGL_nvidia.so.0 (see below)
.if ${NVVERSION} >= 410.057
PATCH_DEPENDS= gsed:textproc/gsed
-BUILD_DEPENDS= pkg-config:devel/pkgconf libglvnd>0:graphics/libglvnd
+BUILD_DEPENDS= pkg-config:devel/pkgconf
+LIB_DEPENDS= libOpenGL.so:graphics/libglvnd
.endif
USES= kmod uidfix xorg
More information about the dev-commits-ports-main
mailing list