diff options
author | Alexey Dokuchaev <danfe@FreeBSD.org> | 2009-08-04 08:27:43 +0000 |
---|---|---|
committer | Alexey Dokuchaev <danfe@FreeBSD.org> | 2009-08-04 08:27:43 +0000 |
commit | 603ca9adcf0b0c7b5ffbc3021c5d571f4ebf3c3c (patch) | |
tree | c86b7def24deca83d13d4feab4a93c2bf85eb989 /x11 | |
parent | Try to workaround strange build error on i386. (diff) |
- Use accurate NVVERSION for checking libcuda compat library presence
- Now that no version of drivers installs nvidia_drv.o, remove the check
and clean up pkg-plist
Notes
Notes:
svn path=/head/; revision=238867
Diffstat (limited to 'x11')
-rw-r--r-- | x11/nvidia-driver/Makefile | 7 | ||||
-rw-r--r-- | x11/nvidia-driver/pkg-plist | 1 |
2 files changed, 4 insertions, 4 deletions
diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile index 248e9b6ba090..632c20a817e1 100644 --- a/x11/nvidia-driver/Makefile +++ b/x11/nvidia-driver/Makefile @@ -108,14 +108,15 @@ post-install: # pkg-plist is already overbloated, so use this hack instead of PLIST_SUB's .if ${NVVERSION} < 817400 @${REINPLACE_CMD} '/libnvidia-cfg/d' ${TMPPLIST} -.else - @${REINPLACE_CMD} '/nvidia_drv\.o/d' ${TMPPLIST} .endif .if ${NVVERSION} < 974600 @${REINPLACE_CMD} '/wfb/d' ${TMPPLIST} .endif .if ${NVVERSION} < 1802900 - @${REINPLACE_CMD} '/libcuda/d ; /libvdpau/d' ${TMPPLIST} + @${REINPLACE_CMD} '/libvdpau/d' ${TMPPLIST} +.endif +.if ${NVVERSION} < 1851829 + @${REINPLACE_CMD} '/libcuda/d' ${TMPPLIST} .endif # Some applications need this symlink (see PR ports/72877) @${LN} -sf libXvMCNVIDIA.so.1 ${PREFIX}/lib/libXvMCNVIDIA_dynamic.so.1 diff --git a/x11/nvidia-driver/pkg-plist b/x11/nvidia-driver/pkg-plist index 9498be854bff..ea374077f974 100644 --- a/x11/nvidia-driver/pkg-plist +++ b/x11/nvidia-driver/pkg-plist @@ -27,7 +27,6 @@ lib/libXvMCNVIDIA.so lib/libXvMCNVIDIA.a lib/libXvMCNVIDIA_dynamic.so.1 %%MODULESDIR%%/libnvidia-wfb.so.1 -%%MODULESDIR%%/drivers/nvidia_drv.o %%MODULESDIR%%/drivers/nvidia_drv.so %%MODULESDIR%%/extensions/libglx.so.1 @dirrmtry %%MODULESDIR%%/drivers |