Page MenuHomeFreeBSD
Files F152943816

D50048.diff
No OneTemporary
Actions

D50048.diff
View Options

diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile
--- a/x11/nvidia-driver/Makefile
+++ b/x11/nvidia-driver/Makefile
@@ -14,7 +14,7 @@
PORTNAME?= nvidia-driver
DISTVERSION?= ${NVIDIA_DISTVERSION}
# Always try to set PORTREVISION as it can be overridden by the slave ports
-PORTREVISION?= 2
+PORTREVISION?= 3
CATEGORIES= x11
MASTER_SITES= NVIDIA/XFree86/FreeBSD-${ARCH_SUFX}/${DISTVERSION}
DISTNAME= NVIDIA-FreeBSD-${ARCH_SUFX}-${DISTVERSION}
@@ -88,7 +88,7 @@
DOCSDIR= ${PREFIX}/share/doc/NVIDIA_GLX-1.0
MODULESDIR= lib/xorg/modules
-EXTENSIONSDIR?= ${MODULESDIR}/extensions/.nvidia
+EXTENSIONSDIR= ${MODULESDIR}/extensions/.nvidia
PORTDOCS= *
.if ${NVVERSION} >= 331.013
@@ -147,11 +147,6 @@
.else
PLIST_SUB+= EXTENSIONSDIR="@comment "
.endif
-.if defined(LIBGLDIR)
-PLIST_SUB+= LIBGLDIR=${LIBGLDIR} LIBGLMAP="@comment "
-.else
-PLIST_SUB+= LIBGLDIR="@comment " LIBGLMAP=""
-.endif
# Not part of the pkg-plist because DISTVERSION is not on PLIST_SUB
.if ${NVVERSION} >= 515.04304
@@ -410,31 +405,9 @@
${STAGEDIR}${PREFIX}/lib/libGLESv2-NVIDIA.so.2
${RM} ${STAGEDIR}${PREFIX}/lib/libGLESv2.so
. endif
-# Configuration of Nvidia as secondary GPU requires preserving libglvnd or mesa
-# libraries as default implementation; a libmap must not override in this case.
-. if !defined(LIBGLDIR)
@${MKDIR} ${STAGEDIR}${PREFIX}/etc/libmap.d/
${INSTALL_DATA} ${WRKDIR}/nvidia.conf \
${STAGEDIR}${PREFIX}/etc/libmap.d/
-. else
-# libgl proxies require a library path containing unrenamed lib*GL*.so
- ${MKDIR} ${STAGEDIR}${PREFIX}/${LIBGLDIR}
- ${RLN} ${STAGEDIR}${PREFIX}/lib/libGL-NVIDIA.so.1 \
- ${STAGEDIR}${PREFIX}/${LIBGLDIR}/libGL.so.1
- ${RLN} ${STAGEDIR}${PREFIX}/lib/libEGL-NVIDIA.so.1 \
- ${STAGEDIR}${PREFIX}/${LIBGLDIR}/libEGL.so.1
- ${RLN} ${STAGEDIR}${PREFIX}/lib/libGLESv2-NVIDIA.so.2 \
- ${STAGEDIR}${PREFIX}/${LIBGLDIR}/libGLESv2.so.2
-. endif
-# Configuration of Nvidia as secondary GPU requires preserving xorg-server's
-# libglx.so and moving Nvidia's glx to where it can be found by a secondary
-# Xorg instance.
-# Not needed since 410.057: Nvidia driver finds libglxserver_nvidia.so instead.
-. if ${EXTENSIONSDIR} != ${MODULESDIR}/extensions/.nvidia
- ${MKDIR} ${STAGEDIR}${PREFIX}/${EXTENSIONSDIR}
- ${MV} ${STAGEDIR}${PREFIX}/${MODULESDIR}/extensions/.nvidia/* \
- ${STAGEDIR}${PREFIX}/${EXTENSIONSDIR}/
-. endif
.else
${REINPLACE_CMD} -E '/-NVIDIA/d ; \
/lib(Open)?E?GLX?(ESv[12](_CM)?|dispatch)?\.so/d' \
diff --git a/x11/nvidia-driver/pkg-plist b/x11/nvidia-driver/pkg-plist
--- a/x11/nvidia-driver/pkg-plist
+++ b/x11/nvidia-driver/pkg-plist
@@ -1,10 +1,7 @@
bin/nvidia-bug-report.sh
bin/nvidia-debugdump
bin/nvidia-smi
-%%LIBGLMAP%%etc/libmap.d/nvidia.conf
-%%LIBGLDIR%%/libGL.so.1
-%%LIBGLDIR%%/libEGL.so.1
-%%LIBGLDIR%%/libGLESv2.so.2
+etc/libmap.d/nvidia.conf
lib/libEGL-NVIDIA.so
lib/libEGL-NVIDIA.so.1
lib/libEGL_nvidia.so
@@ -17,8 +14,6 @@
lib/libGLESv2-NVIDIA.so.2
lib/libGLESv2_nvidia.so
lib/libGLESv2_nvidia.so.2
-%%LIBGLDIR%%/libGLX.so
-%%LIBGLDIR%%/libGLX.so.0
@comment lib/libGLX_indirect.so.0
lib/libGLX_nvidia.so
lib/libGLX_nvidia.so.0

File Metadata

Mime Type
text/plain
Expires
Sun, Apr 19, 5:51 AM (16 h, 40 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31749433
Default Alt Text
D50048.diff (3 KB)

Event Timeline