svn commit: r516634 - head/x11/linux-nvidia-libs
Alexey Dokuchaev
danfe at FreeBSD.org
Mon Nov 4 11:32:53 UTC 2019
Author: danfe
Date: Mon Nov 4 11:32:52 2019
New Revision: 516634
URL: https://svnweb.freebsd.org/changeset/ports/516634
Log:
- Update NVidia Linux userland components port to version 430.50
- Fix version check when setting PORTSCOUT, 390.xx is also legacy now
Modified:
head/x11/linux-nvidia-libs/Makefile
head/x11/linux-nvidia-libs/distinfo
Modified: head/x11/linux-nvidia-libs/Makefile
==============================================================================
--- head/x11/linux-nvidia-libs/Makefile Mon Nov 4 11:23:45 2019 (r516633)
+++ head/x11/linux-nvidia-libs/Makefile Mon Nov 4 11:32:52 2019 (r516634)
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= nvidia-libs
-DISTVERSION?= 410.104
+DISTVERSION?= 430.50
# Always try to set PORTREVISION as it can be overridden by the slave ports
PORTREVISION?= 0
CATEGORIES= x11 linux
@@ -16,7 +16,7 @@ COMMENT= NVidia graphics libraries and programs (Linux
LICENSE_FILE= ${WRKSRC}/LICENSE
.include "${.CURDIR}/../nvidia-driver/Makefile.common"
-.if ${DISTVERSION:R} >= 390
+.if ${DISTVERSION:R} > 390
PORTSCOUT= limit:\.\d+$$ # ignore *-no-compat32 distfiles
.else
PORTSCOUT= limit:^${DISTVERSION:R}\.\d+$$
@@ -39,8 +39,10 @@ LINUX_LIBS= libcuda.so.${PORTVERSION} \
libnvidia-ml.so.${PORTVERSION} \
libnvidia-opencl.so.${PORTVERSION} \
libnvidia-tls.so.${PORTVERSION} \
- libvdpau_nvidia.so.${PORTVERSION} \
- tls/libnvidia-tls.so.${PORTVERSION}
+ libvdpau_nvidia.so.${PORTVERSION}
+.if ${NVVERSION} < 415.013
+LINUX_LIBS+= tls/libnvidia-tls.so.${PORTVERSION}
+.endif
LINUX_LINKS= libcuda.so.${PORTVERSION} libcuda.so.1 \
libcuda.so.${PORTVERSION} libcuda.so \
libnvcuvid.so.${PORTVERSION} libnvcuvid.so.1 \
@@ -57,8 +59,10 @@ LINUX32_LIBS= libcuda.so.${PORTVERSION} \
libnvidia-ml.so.${PORTVERSION} \
libnvidia-opencl.so.${PORTVERSION} \
libnvidia-tls.so.${PORTVERSION} \
- libvdpau_nvidia.so.${PORTVERSION} \
- tls/libnvidia-tls.so.${PORTVERSION}
+ libvdpau_nvidia.so.${PORTVERSION}
+.if ${NVVERSION} < 415.013
+LINUX32_LIBS+= tls/libnvidia-tls.so.${PORTVERSION}
+.endif
LINUX32_LINKS= libcuda.so.${PORTVERSION} libcuda.so.1 \
libcuda.so.${PORTVERSION} libcuda.so \
libnvidia-ml.so.${PORTVERSION} libnvidia-ml.so.1 \
@@ -118,7 +122,11 @@ PLIST_RE+= '\,${LINUXBASE}.*libGLESv(1_CM|2)_nvidia\.s
'\,${LINUXBASE}.*libnvidia-fatbinaryloader\.so,d' \
'\,${LINUXBASE}.*libnvidia-ptxjitcompiler\.so,d'
.endif
-.if ${NVVERSION} >= 410.057
+.if ${NVVERSION} >= 418.030
+LINUX_LIBS+= libnvidia-egl-wayland.so.1.1.2
+LINUX_LINKS+= libnvidia-egl-wayland.so.1.1.2 libnvidia-egl-wayland.so.1
+PLIST_RE+= '\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.1.1.2/'
+.elif ${NVVERSION} >= 410.057
LINUX_LIBS+= libnvidia-egl-wayland.so.1.1.0
LINUX_LINKS+= libnvidia-egl-wayland.so.1.1.0 libnvidia-egl-wayland.so.1
PLIST_RE+= '\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.1.1.0/'
@@ -376,6 +384,9 @@ do-install:
.else
${REINPLACE_CMD} -E '\,${LINUXBASE},!{/\/lib\/libGLESv[12](_CM)?(\.so)?(_nvidia.so(\.[0-9]|\.[0-9]+\.[0-9]+)?)?$$/d ; \
/libEGL_nvidia\.so\.${PORTVERSION}/d;}' ${TMPPLIST}
+.endif
+.if ${NVVERSION} >= 415.013
+ ${REINPLACE_CMD} -e '/tls\/libnvidia-tls\.so/d' ${TMPPLIST}
.endif
${REINPLACE_CMD} -E ${PLIST_RE:S/^/-e /} ${TMPPLIST}
.for f d in ${LINUX_DATA}
Modified: head/x11/linux-nvidia-libs/distinfo
==============================================================================
--- head/x11/linux-nvidia-libs/distinfo Mon Nov 4 11:23:45 2019 (r516633)
+++ head/x11/linux-nvidia-libs/distinfo Mon Nov 4 11:32:52 2019 (r516634)
@@ -1,6 +1,6 @@
TIMESTAMP = 1482026038
-SHA256 (NVIDIA-Linux-x86_64-410.104.run) = 6ac4f7355a11e4b6ea2ff5b3d6ea677247f286daecf2e9373ef947ee08682cb7
-SIZE (NVIDIA-Linux-x86_64-410.104.run) = 106042115
+SHA256 (NVIDIA-Linux-x86_64-430.50.run) = 0c683394ae47d145f989b74120b482431fa5c7730d41fb3433d8fd68324d3dc5
+SIZE (NVIDIA-Linux-x86_64-430.50.run) = 110545029
SHA256 (NVIDIA-Linux-x86_64-390.129.run) = d690cf21bda0bb6eb5c8a7f71073f0c9aea5857c6dd392a4dac3b48b27631240
SIZE (NVIDIA-Linux-x86_64-390.129.run) = 82314424
SHA256 (NVIDIA-Linux-x86-390.129.run) = 5854268c26f112a16c6fd7ded0031bf95cc8f4dab617ac5d701090fec19d6f36
More information about the svn-ports-all
mailing list