diff options
| author | Tijl Coosemans <tijl@FreeBSD.org> | 2016-11-03 19:46:18 +0000 |
|---|---|---|
| committer | Tijl Coosemans <tijl@FreeBSD.org> | 2016-11-03 19:46:18 +0000 |
| commit | 50a574ae1dd9e6a3888abbbddfeb26a0bd4cc340 (patch) | |
| tree | 7328885c369b1fafd13e5c1be240a27035fd118e /graphics/linux-c6-dri | |
| parent | 69ef63a563da00c2823ea63b1ace84cce4ed7907 (diff) | |
| download | ports-50a574ae1dd9e6a3888abbbddfeb26a0bd4cc340.tar.gz ports-50a574ae1dd9e6a3888abbbddfeb26a0bd4cc340.zip | |
Allow linux-*-dri and nvidia-driver to coexist.
Notes
Notes:
svn path=/head/; revision=425269
Diffstat (limited to 'graphics/linux-c6-dri')
| -rw-r--r-- | graphics/linux-c6-dri/Makefile | 1 | ||||
| -rw-r--r-- | graphics/linux-c6-dri/pkg-plist.i386 | 5 | ||||
| -rw-r--r-- | graphics/linux-c6-dri/pkg-plist.x86_64 | 8 |
3 files changed, 9 insertions, 5 deletions
diff --git a/graphics/linux-c6-dri/Makefile b/graphics/linux-c6-dri/Makefile index 6fd4f5ca7ba5..d930fca6890e 100644 --- a/graphics/linux-c6-dri/Makefile +++ b/graphics/linux-c6-dri/Makefile @@ -3,6 +3,7 @@ PORTNAME= dri PORTVERSION= 11.0.7 +PORTREVISION= 1 CATEGORIES= graphics linux LIB_DISTFILES= mesa-libGL-${PORTVERSION}-4.el6${EXTRACT_SUFX} \ mesa-libGLU-${PORTVERSION}-4.el6${EXTRACT_SUFX} \ diff --git a/graphics/linux-c6-dri/pkg-plist.i386 b/graphics/linux-c6-dri/pkg-plist.i386 index 41c8c66594af..a4850a928128 100644 --- a/graphics/linux-c6-dri/pkg-plist.i386 +++ b/graphics/linux-c6-dri/pkg-plist.i386 @@ -1,4 +1,4 @@ -%%ETCDIR%%rc +etc/drirc lib/udev/rules.d/91-drm-modeset.rules usr/lib/dri/i915_dri.so usr/lib/dri/i965_dri.so @@ -9,7 +9,8 @@ usr/lib/dri/radeon_dri.so usr/lib/dri/radeonsi_dri.so usr/lib/dri/swrast_dri.so usr/lib/dri/vmwgfx_dri.so -usr/lib/libGL.so.1 +@postexec [ -e %D/usr/lib/libGL.so.1 ] || ln -sf libGL.so.1.2.0 %D/usr/lib/libGL.so.1 +@postunexec [ -e %D/usr/lib/libGL.so.1 ] || rm -f %D/usr/lib/libGL.so.1 usr/lib/libGL.so.1.2.0 usr/lib/libGLU.so.1 usr/lib/libGLU.so.1.3.1 diff --git a/graphics/linux-c6-dri/pkg-plist.x86_64 b/graphics/linux-c6-dri/pkg-plist.x86_64 index dd9ab9bdfe96..bee016189caa 100644 --- a/graphics/linux-c6-dri/pkg-plist.x86_64 +++ b/graphics/linux-c6-dri/pkg-plist.x86_64 @@ -1,4 +1,4 @@ -%%ETCDIR%%rc +etc/drirc lib/udev/rules.d/91-drm-modeset.rules usr/lib/dri/i915_dri.so usr/lib/dri/i965_dri.so @@ -9,7 +9,8 @@ usr/lib/dri/radeon_dri.so usr/lib/dri/radeonsi_dri.so usr/lib/dri/swrast_dri.so usr/lib/dri/vmwgfx_dri.so -usr/lib/libGL.so.1 +@postexec [ -e %D/usr/lib/libGL.so.1 ] || ln -sf libGL.so.1.2.0 %D/usr/lib/libGL.so.1 +@postunexec [ -e %D/usr/lib/libGL.so.1 ] || rm -f %D/usr/lib/libGL.so.1 usr/lib/libGL.so.1.2.0 usr/lib/libGLU.so.1 usr/lib/libGLU.so.1.3.1 @@ -39,7 +40,8 @@ usr/lib64/dri/radeon_dri.so usr/lib64/dri/radeonsi_dri.so usr/lib64/dri/swrast_dri.so usr/lib64/dri/vmwgfx_dri.so -usr/lib64/libGL.so.1 +@postexec [ -e %D/usr/lib64/libGL.so.1 ] || ln -sf libGL.so.1.2.0 %D/usr/lib64/libGL.so.1 +@postunexec [ -e %D/usr/lib64/libGL.so.1 ] || rm -f %D/usr/lib64/libGL.so.1 usr/lib64/libGL.so.1.2.0 usr/lib64/libGLU.so.1 usr/lib64/libGLU.so.1.3.1 |