diff options
author | kwm <kwm@058c260c-8361-11dd-a0ac-aa2bafec7d09> | 2012-08-08 00:42:38 +0800 |
---|---|---|
committer | kwm <kwm@058c260c-8361-11dd-a0ac-aa2bafec7d09> | 2012-08-08 00:42:38 +0800 |
commit | ad3a1d1fbf2f50115514592d6f316c0802d51455 (patch) | |
tree | c581cbadfa226a926e77386b5d56b4585a56fbb2 /graphics | |
parent | f96a2afc7920002f1d99dbea9473285dca43ad0a (diff) | |
download | xorg-devel-ports-ad3a1d1fbf2f50115514592d6f316c0802d51455.tar xorg-devel-ports-ad3a1d1fbf2f50115514592d6f316c0802d51455.tar.gz xorg-devel-ports-ad3a1d1fbf2f50115514592d6f316c0802d51455.tar.bz2 xorg-devel-ports-ad3a1d1fbf2f50115514592d6f316c0802d51455.tar.lz xorg-devel-ports-ad3a1d1fbf2f50115514592d6f316c0802d51455.tar.xz xorg-devel-ports-ad3a1d1fbf2f50115514592d6f316c0802d51455.tar.zst xorg-devel-ports-ad3a1d1fbf2f50115514592d6f316c0802d51455.zip |
Add the current solution for the pkgng where libGL (libGL.so),
xorg-server (libglx.so) and the versions installed by nvidia-driver conflict.
This patch is still under review by the nvidia maintainer.
git-svn-id: https://trillian.chruetertee.ch/svn/ports/trunk@561 058c260c-8361-11dd-a0ac-aa2bafec7d09
Diffstat (limited to 'graphics')
-rw-r--r-- | graphics/libGL/Makefile | 9 | ||||
-rw-r--r-- | graphics/libGL/files/patch-src_mesa_Makefile | 15 | ||||
-rw-r--r-- | graphics/libGL/files/pkg-deinstall.in | 12 | ||||
-rw-r--r-- | graphics/libGL/files/pkg-install.in | 23 | ||||
-rw-r--r-- | graphics/libGL/pkg-plist | 5 |
5 files changed, 62 insertions, 2 deletions
diff --git a/graphics/libGL/Makefile b/graphics/libGL/Makefile index befacac..4ea251a 100644 --- a/graphics/libGL/Makefile +++ b/graphics/libGL/Makefile @@ -7,6 +7,7 @@ PORTNAME= libGL PORTVERSION= ${MESAVERSION} +PORTREVISION= 1 CATEGORIES= graphics COMMENT= OpenGL library that renders using GLX or DRI @@ -16,9 +17,17 @@ LIB_DEPENDS+= drm:${PORTSDIR}/graphics/libdrm \ USE_XORG= glproto:both x11 xext xxf86vm xdamage xfixes dri2proto:both +SUB_FILES= pkg-install pkg-deinstall + +pre-install: + PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL + do-install: ${RM} -f ${WRKSRC}/include/GL/glu*.h cd ${WRKSRC}/src/mesa; ${GMAKE} install-libgl +post-install: + PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL + .include "${.CURDIR}/bsd.mesalib.mk" .include <bsd.port.mk> diff --git a/graphics/libGL/files/patch-src_mesa_Makefile b/graphics/libGL/files/patch-src_mesa_Makefile new file mode 100644 index 0000000..35ce2a9 --- /dev/null +++ b/graphics/libGL/files/patch-src_mesa_Makefile @@ -0,0 +1,15 @@ +--- src/mesa/Makefile.orig 2012-04-22 18:34:50.000000000 +0200 ++++ src/mesa/Makefile 2012-04-22 18:35:00.000000000 +0200 +@@ -183,10 +183,10 @@ + $(DESTDIR)$(INSTALL_INC_DIR)/GL + + install-libgl: default gl.pc install-headers +- $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR) ++ $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/libGL + $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig + $(MINSTALL) $(TOP)/$(LIB_DIR)/$(GL_LIB_GLOB) \ +- $(DESTDIR)$(INSTALL_LIB_DIR) ++ $(DESTDIR)$(INSTALL_LIB_DIR)/libGL + $(INSTALL) -m 644 gl.pc $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig + + install-osmesa: default osmesa.pc diff --git a/graphics/libGL/files/pkg-deinstall.in b/graphics/libGL/files/pkg-deinstall.in new file mode 100644 index 0000000..9762354 --- /dev/null +++ b/graphics/libGL/files/pkg-deinstall.in @@ -0,0 +1,12 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +PREFIX="${PKG_PREFIX-/usr/local}" + +case $2 in + POST-DEINSTALL) + /bin/rm -f ${PREFIX}/lib/libGL.so* + ;; +esac diff --git a/graphics/libGL/files/pkg-install.in b/graphics/libGL/files/pkg-install.in new file mode 100644 index 0000000..d3b04d9 --- /dev/null +++ b/graphics/libGL/files/pkg-install.in @@ -0,0 +1,23 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +PREFIX="${PKG_PREFIX-/usr/local}" + +case $2 in + PRE-INSTALL) + /bin/rm -f ${PREFIX}/lib/libGL.so* + ;; + + POST-INSTALL) + if [ -f ${PREFIX}/lib/nvidia/libGL.so.1 ]; then + /bin/ln -f ${PREFIX}/lib/nvidia/libGL.so.1 ${PREFIX}/lib/libGL.so + /bin/ln -f ${PREFIX}/lib/nvidia/libGL.so.1 ${PREFIX}/lib/libGL.so.1 + else + /bin/ln -f ${PREFIX}/lib/libGL/libGL.so.1 ${PREFIX}/lib/libGL.so + /bin/ln -f ${PREFIX}/lib/libGL/libGL.so.1 ${PREFIX}/lib/libGL.so.1 + fi + ;; +esac + diff --git a/graphics/libGL/pkg-plist b/graphics/libGL/pkg-plist index bc0e3c7..7245ebf 100644 --- a/graphics/libGL/pkg-plist +++ b/graphics/libGL/pkg-plist @@ -14,7 +14,8 @@ include/GL/osmesa.h include/GL/vms_x_fix.h include/GL/wglext.h include/GL/wmesa.h -lib/libGL.so -lib/libGL.so.1 +lib/libGL/libGL.so +lib/libGL/libGL.so.1 libdata/pkgconfig/gl.pc +@dirrm lib/libGL @dirrmtry include/GL |