Commit 22a47a0e authored by Alexey Dokuchaev's avatar Alexey Dokuchaev
Browse files

Unbreak nVidia driver build against new feature branch 465.xx, which

now includes Vulkan driver for FreeBSD.

We do not offer short-lived/beta driver versions as a port or package,
but we try to support building against arbitrary DISTVERSIONs.  Add a
note about it and sort Linux libraries' port pkg-plist while I'm here.

PR:	254668
parent 76c493b5
......@@ -53,8 +53,8 @@
%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-fbc.so.1
%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-fbc.so.%%SHLIB_VERSION%%
%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-glcore.so.%%SHLIB_VERSION%%
%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-glvkspirv.so.%%SHLIB_VERSION%%
%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-glsi.so.%%SHLIB_VERSION%%
%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-glvkspirv.so.%%SHLIB_VERSION%%
%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-ifr.so
%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-ifr.so.1
%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-ifr.so.%%SHLIB_VERSION%%
......@@ -124,8 +124,8 @@
%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-fbc.so.1
%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-fbc.so.%%SHLIB_VERSION%%
%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-glcore.so.%%SHLIB_VERSION%%
%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-glvkspirv.so.%%SHLIB_VERSION%%
%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-glsi.so.%%SHLIB_VERSION%%
%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-glvkspirv.so.%%SHLIB_VERSION%%
%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-gtk2.so.%%SHLIB_VERSION%%
%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-gtk3.so.%%SHLIB_VERSION%%
%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-ifr.so
......@@ -136,10 +136,10 @@
%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-ml.so.%%SHLIB_VERSION%%
%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-opencl.so.1
%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-opencl.so.%%SHLIB_VERSION%%
%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-rtcore.so.%%SHLIB_VERSION%%
%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-ptxjitcompiler.so
%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-ptxjitcompiler.so.1
%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-ptxjitcompiler.so.%%SHLIB_VERSION%%
%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-rtcore.so.%%SHLIB_VERSION%%
%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-tls.so.%%SHLIB_VERSION%%
%%LINUXBASE%%%%LINUX_LIBDIR%%/libvdpau_nvidia.so.%%SHLIB_VERSION%%
%%LINUXBASE%%%%LINUX_LIBDIR%%/tls/libnvidia-tls.so.%%SHLIB_VERSION%%
......
......@@ -8,6 +8,10 @@
# you need to use legacy driver version and install one of corresponding
# slave ports instead (`x11/nvidia-driver-390', `x11/nvidia-driver-340',
# or `x11/nvidia-driver-304').
#
# To simplify testing of new feature branches and beta driver versions,
# the port aims to support building against arbitrary DISTVERSION, i.e.
# ``make DISTVERSION=xxx.yy.zz -DNO_CHECKSUM'' should typically work.
PORTNAME= nvidia-driver
DISTVERSION?= 460.73.01
......@@ -256,6 +260,8 @@ post-install: .SILENT
.endif
.if ${NVVERSION} < 440.036
${REINPLACE_CMD} -e '/lib32\//d' ${TMPPLIST}
.elif ${NVVERSION} < 465.01901
${REINPLACE_CMD} -e '/lib32\/libnvidia-glvkspirv\.so/d' ${TMPPLIST}
.endif
# Rename some libraries and install a libmap file to resolve conflict with
# Mesa libraries.
......
......@@ -75,6 +75,8 @@ lib32/libnvidia-glcore.so
lib32/libnvidia-glcore.so.1
lib32/libnvidia-glsi.so
lib32/libnvidia-glsi.so.1
lib32/libnvidia-glvkspirv.so
lib32/libnvidia-glvkspirv.so.1
lib32/libnvidia-tls.so
lib32/libnvidia-tls.so.1
lib32/vdpau/libvdpau_nvidia.so.1
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment