diff options
| author | Alexey Dokuchaev <danfe@FreeBSD.org> | 2016-08-19 22:29:39 +0000 |
|---|---|---|
| committer | Alexey Dokuchaev <danfe@FreeBSD.org> | 2016-08-19 22:29:39 +0000 |
| commit | f75af964ff85112f5d70a1024d3a7be31114cb84 (patch) | |
| tree | 027146a41997cc11d29503ab224194aab1a61139 /x11/nvidia-driver | |
| parent | mail/sendmail: fix stage-qa error (diff) | |
Deorbit support for nVidia driver legacy versions, part 3:
- libnvidia-cfg.so* files are always installed since version 81.074
- Au contraire, libnvidia-wfb.so.1 is not (since version 195.022)
- Remove now useless checks for NVVERSIONs before 180.029 and 185.01829
(always false) and after 304.128 (always true)
- Unconditionally rename libGLcore -> libnvidia-glcore in pkg-plist
(been that way since version 256.053)
Notes
Notes:
svn path=/head/; revision=420496
Diffstat (limited to 'x11/nvidia-driver')
| -rw-r--r-- | x11/nvidia-driver/Makefile | 17 | ||||
| -rw-r--r-- | x11/nvidia-driver/pkg-plist | 9 |
2 files changed, 4 insertions, 22 deletions
diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile index 49a1cb1dde48..a30d9b932346 100644 --- a/x11/nvidia-driver/Makefile +++ b/x11/nvidia-driver/Makefile @@ -198,24 +198,9 @@ post-install: .SILENT ${INSTALL_SCRIPT} ${WRKSRC}/obj/nvidia-bug-report.sh \ ${STAGEDIR}${PREFIX}/bin # pkg-plist is already overbloated, so use these hacks instead of PLIST_SUB's -.if ${NVVERSION} < 81.074 - ${REINPLACE_CMD} -e '/libnvidia-cfg/d' ${TMPPLIST} -.endif -.if ${NVVERSION} < 97.046 || ${NVVERSION} >= 195.022 - ${REINPLACE_CMD} -e '/wfb/d' ${TMPPLIST} -.endif -.if ${NVVERSION} < 180.029 - ${REINPLACE_CMD} -e '/vdpau/d' ${TMPPLIST} -.elif ${NVVERSION} >= 304.128 && ${NVVERSION} < 310.019 +.if ${NVVERSION} < 310.019 ${REINPLACE_CMD} -E '/libvdpau(_trace)?\.so/d' ${TMPPLIST} .endif -.if ${NVVERSION} < 185.01829 - ${REINPLACE_CMD} -e '/libcuda/d' ${TMPPLIST} -.endif -.if ${NVVERSION} >= 256.053 - ${REINPLACE_CMD} -E 's/libGLcore/libnvidia-glcore/ ; \ - /usr.*(glcore|tls).*so\.1$$/d' ${TMPPLIST} -.endif .if ${NVVERSION} >= 310.019 ${REINPLACE_CMD} -e '/libXvMCNVIDIA/d' ${TMPPLIST} .else # some applications need this symlink (see PR ports/72877) diff --git a/x11/nvidia-driver/pkg-plist b/x11/nvidia-driver/pkg-plist index 4a8b4d5d2a12..c7eac59f810e 100644 --- a/x11/nvidia-driver/pkg-plist +++ b/x11/nvidia-driver/pkg-plist @@ -7,8 +7,6 @@ lib/libGLESv1_CM.so lib/libGLESv1_CM.so.1 lib/.nvidia/libGLESv2.so lib/.nvidia/libGLESv2.so.2 -lib/libGLcore.so -lib/libGLcore.so.1 lib/libXvMCNVIDIA.a lib/libXvMCNVIDIA.so lib/libXvMCNVIDIA.so.1 @@ -17,6 +15,8 @@ lib/libnvidia-cfg.so lib/libnvidia-cfg.so.1 lib/libnvidia-eglcore.so lib/libnvidia-eglcore.so.1 +lib/libnvidia-glcore.so +lib/libnvidia-glcore.so.1 lib/libnvidia-glsi.so lib/libnvidia-glsi.so.1 lib/libnvidia-tls.so @@ -26,7 +26,6 @@ lib/vdpau/libvdpau_nvidia.so.1 %%MODULESDIR%%/drivers/nvidia_drv.so %%MODULESDIR%%/extensions/.nvidia/libglx.so %%MODULESDIR%%/extensions/.nvidia/libglx.so.1 -%%MODULESDIR%%/libnvidia-wfb.so.1 /%%KMODDIR%%/nvidia.ko %%LINUX%%%%LINUXBASE%%/usr/lib/libEGL.so.%%SHLIB_VERSION%% %%LINUX%%%%LINUXBASE%%/usr/lib/libEGL.so.1 @@ -36,14 +35,12 @@ lib/vdpau/libvdpau_nvidia.so.1 %%LINUX%%%%LINUXBASE%%/usr/lib/libGLESv1_CM.so.1 %%LINUX%%%%LINUXBASE%%/usr/lib/libGLESv2.so.%%SHLIB_VERSION%% %%LINUX%%%%LINUXBASE%%/usr/lib/libGLESv2.so.2 -%%LINUX%%%%LINUXBASE%%/usr/lib/libGLcore.so.%%SHLIB_VERSION%% -%%LINUX%%%%LINUXBASE%%/usr/lib/libGLcore.so.1 %%LINUX%%%%LINUXBASE%%/usr/lib/libcuda.so.%%SHLIB_VERSION%% %%LINUX%%%%LINUXBASE%%/usr/lib/libcuda.so.1 %%LINUX%%%%LINUXBASE%%/usr/lib/libnvidia-eglcore.so.%%SHLIB_VERSION%% +%%LINUX%%%%LINUXBASE%%/usr/lib/libnvidia-glcore.so.%%SHLIB_VERSION%% %%LINUX%%%%LINUXBASE%%/usr/lib/libnvidia-glsi.so.%%SHLIB_VERSION%% %%LINUX%%%%LINUXBASE%%/usr/lib/libnvidia-tls.so.%%SHLIB_VERSION%% -%%LINUX%%%%LINUXBASE%%/usr/lib/libnvidia-tls.so.1 %%LINUX%%%%LINUXBASE%%/usr/lib/libvdpau.so.%%SHLIB_VERSION%% %%LINUX%%%%LINUXBASE%%/usr/lib/libvdpau.so.1 %%LINUX%%%%LINUXBASE%%/usr/lib/libvdpau_nvidia.so |