diff options
| author | makc <makc@FreeBSD.org> | 2010-09-25 03:11:01 +0800 |
|---|---|---|
| committer | makc <makc@FreeBSD.org> | 2010-09-25 03:11:01 +0800 |
| commit | 78ce47384a22d1380bc10fb46c3850b2c04366f2 (patch) | |
| tree | 85ffb723444054c58832ec4679d1735c82758717 /x11/nvidia-driver | |
| parent | a2b79544d6eb96773d6e365426915403fa0d1417 (diff) | |
| download | freebsd-ports-gnome-78ce47384a22d1380bc10fb46c3850b2c04366f2.tar.gz freebsd-ports-gnome-78ce47384a22d1380bc10fb46c3850b2c04366f2.tar.zst freebsd-ports-gnome-78ce47384a22d1380bc10fb46c3850b2c04366f2.zip | |
- Don't install vdpau library and headers, they are now provided by
multimedia/libvdpau. [1]
- Explicitly set PORTREVISION to zero for slaves ports (legacy drivers),
they are not affected by the changes.
PR: ports/150369 [1]
Submitted by: Anonymous <swell.k at gmail.com>
Reviewed by: danfe (maintainer)
Diffstat (limited to 'x11/nvidia-driver')
| -rw-r--r-- | x11/nvidia-driver/Makefile | 4 | ||||
| -rw-r--r-- | x11/nvidia-driver/files/patch-lib::Makefile | 21 | ||||
| -rw-r--r-- | x11/nvidia-driver/pkg-plist | 9 |
3 files changed, 21 insertions, 13 deletions
diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile index f232a88065ca..7c6c89e8254f 100644 --- a/x11/nvidia-driver/Makefile +++ b/x11/nvidia-driver/Makefile @@ -7,7 +7,7 @@ PORTNAME= nvidia-driver DISTVERSION?= 195.36.15 -PORTREVISION?= 0 # As a reminder it can be overridden +PORTREVISION?= 1 # As a reminder it can be overridden CATEGORIES= x11 kld MASTER_SITES= ${MASTER_SITE_NVIDIA} ARCH_SUFX= ${ARCH:S/i386//:S/amd/_/} @@ -144,8 +144,6 @@ post-install: .if ${NVVERSION} < 1802900 @${REINPLACE_CMD} '/vdpau/d' ${TMPPLIST} .else - @${MKDIR} ${PREFIX}/include/vdpau - @${LN} -sf ${DOCSDIR}/vdpau*.h ${PREFIX}/include/vdpau .endif .if ${NVVERSION} < 1851829 @${REINPLACE_CMD} '/libcuda/d' ${TMPPLIST} diff --git a/x11/nvidia-driver/files/patch-lib::Makefile b/x11/nvidia-driver/files/patch-lib::Makefile index 35cd61c4f485..e7b19cc63436 100644 --- a/x11/nvidia-driver/files/patch-lib::Makefile +++ b/x11/nvidia-driver/files/patch-lib::Makefile @@ -1,11 +1,28 @@ --- lib/Makefile.orig Fri Jun 17 09:44:23 2005 +++ lib/Makefile Wed Jun 22 19:12:16 2005 -@@ -6,7 +6,7 @@ +@@ -6,15 +6,13 @@ SUBDIR= libGL \ + libnvidia-tls \ + libnvidia-cfg \ + libGLcore \ +- libvdpau \ + libvdpau_nvidia \ +- libvdpau_trace \ + libXvMCNVIDIA + FIND_DIRS= /usr/lib \ - ${LOCALBASE}/lib + ${X11BASE}/lib -.if exists(/compat/linux) +.if exists(/compat/linux) && !defined(WITHOUT_LINUX) SUBDIR+= compat FIND_DIRS+= /compat/linux/lib \ /compat/linux/usr/lib \ +@@ -27,7 +25,7 @@ FIND_FILES!=(find ${FIND_DIRS} \ + -name libnvidia-tls.so\* -or \ + -name libnvidia-cfg.so\* -or \ + -name libGLcore.\* -or \ +- -name libvdpau\* -or \ ++ -name libvdpau_nvidia\* -or \ + -name libXvMCNVIDIA.\* -or \ + -name libglx.\* \ + | xargs ${ECHO}) diff --git a/x11/nvidia-driver/pkg-plist b/x11/nvidia-driver/pkg-plist index 60b344d26cb0..82094f0dd7f9 100644 --- a/x11/nvidia-driver/pkg-plist +++ b/x11/nvidia-driver/pkg-plist @@ -10,26 +10,19 @@ @unexec mv -f %D/%%MODULESDIR%%/extensions/XXX-libglx.so.%%%%.%%XSERVVERSION%% %D/%%MODULESDIR%%/extensions/libglx.so @exec mv -f %D/lib/libGL.so.1 %D/lib/XXX-libGL.so.1.%%%%.%%LIBGLVERSION%% @unexec mv -f %D/lib/XXX-libGL.so.1.%%%%.%%LIBGLVERSION%% %D/lib/libGL.so.1 -include/vdpau/vdpau.h -include/vdpau/vdpau_x11.h -@dirrm include/vdpau lib/libnvidia-tls.so.1 lib/libnvidia-tls.so lib/libnvidia-cfg.so.1 lib/libnvidia-cfg.so lib/libGLcore.so.1 lib/libGLcore.so -lib/libvdpau.so.1 -lib/libvdpau.so lib/vdpau/libvdpau_nvidia.so.1 lib/libvdpau_nvidia.so -lib/vdpau/libvdpau_trace.so.1 -lib/libvdpau_trace.so lib/libXvMCNVIDIA.so.1 lib/libXvMCNVIDIA.so lib/libXvMCNVIDIA.a lib/libXvMCNVIDIA_dynamic.so.1 -@dirrm lib/vdpau +@dirrmtry lib/vdpau %%MODULESDIR%%/libnvidia-wfb.so.1 %%MODULESDIR%%/drivers/nvidia_drv.so %%MODULESDIR%%/extensions/libglx.so.1 |