diff options
author | Martin Schlemmer <azarah@gentoo.org> | 2002-04-07 20:25:46 +0000 |
---|---|---|
committer | Martin Schlemmer <azarah@gentoo.org> | 2002-04-07 20:25:46 +0000 |
commit | 9b7c1e355691ae2a1a43eb6c5a2c086039af16e5 (patch) | |
tree | 8fdb1ecc9ffc4433235f419fe9a5debc98df63ea /x11-base | |
parent | libtoolize (diff) | |
download | gentoo-2-9b7c1e355691ae2a1a43eb6c5a2c086039af16e5.tar.gz gentoo-2-9b7c1e355691ae2a1a43eb6c5a2c086039af16e5.tar.bz2 gentoo-2-9b7c1e355691ae2a1a43eb6c5a2c086039af16e5.zip |
fix compile problems or opengl apps
Diffstat (limited to 'x11-base')
-rw-r--r-- | x11-base/xfree/ChangeLog | 6 | ||||
-rw-r--r-- | x11-base/xfree/files/4.2.0-r9/lib/libGL.la | 2 | ||||
-rw-r--r-- | x11-base/xfree/files/4.2.0-r9/opengl-update | 28 | ||||
-rw-r--r-- | x11-base/xfree/xfree-4.2.0-r9.ebuild | 4 |
4 files changed, 35 insertions, 5 deletions
diff --git a/x11-base/xfree/ChangeLog b/x11-base/xfree/ChangeLog index 5e042414316b..cd2571dfb15a 100644 --- a/x11-base/xfree/ChangeLog +++ b/x11-base/xfree/ChangeLog @@ -1,10 +1,12 @@ # ChangeLog for x11-base/xfree # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL -# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.12 2002/04/07 15:08:11 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.13 2002/04/07 20:25:46 azarah Exp $ 7 Apr 2002; Martin Schlemmer <azarah@gentoo.org> xfree-4.2.0-r9.ebuild : - Fix a stray symlink in / + Fix a stray symlink in /. Also moved libGL.a to /usr/lib/opengl/xfree/lib, as + it caused compile problems for tuxracer, etc. Fixed opengl-update to generate + the /usr/lib/libGLcore.so symlinks for nvidia implementation. *xfree-4.2.0-r9 (7 Apr 2002) diff --git a/x11-base/xfree/files/4.2.0-r9/lib/libGL.la b/x11-base/xfree/files/4.2.0-r9/lib/libGL.la index 04e36c10b64e..4d71c18c6a56 100644 --- a/x11-base/xfree/files/4.2.0-r9/lib/libGL.la +++ b/x11-base/xfree/files/4.2.0-r9/lib/libGL.la @@ -29,4 +29,4 @@ dlopen='' dlpreopen='' # Directory that this library needs to be installed in: -libdir='/usr/lib/opengl/xfree' +libdir='/usr/lib/opengl/xfree/lib' diff --git a/x11-base/xfree/files/4.2.0-r9/opengl-update b/x11-base/xfree/files/4.2.0-r9/opengl-update index 11c09e6b2519..4d4ea39b7e0d 100644 --- a/x11-base/xfree/files/4.2.0-r9/opengl-update +++ b/x11-base/xfree/files/4.2.0-r9/opengl-update @@ -2,7 +2,7 @@ # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later # Author: Martin Schlemmer <azarah@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/files/4.2.0-r9/opengl-update,v 1.2 2002/04/07 06:05:08 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/files/4.2.0-r9/opengl-update,v 1.3 2002/04/07 20:25:46 azarah Exp $ source /etc/init.d/functions.sh @@ -61,6 +61,32 @@ else /usr/lib/libGL.so ln -sf /usr/lib/opengl/${1}/lib/${realname} \ /usr/lib/libGL.so.1 + + #setup the /usr/X11R6/lib/libMesaGL.so symlink + if [ -e /usr/X11R6/lib/libMesaGL.so ] + then + rm -f /usr/X11R6/lib/libMesaGL.so + fi + ln -sf /usr/lib/opengl/${1}/lib/${realname} \ + /usr/X11R6/lib/libMesaGL.so + + #setup the /usr/lib/libGLcore.so symlink + if [ -e /usr/lib/libGLcore.so ] + then + rm -f /usr/lib/libGLcore.so + fi + if [ -e /usr/lib/libGLcore.so.1 ] + then + rm -f /usr/lib/libGLcore.so.1 + fi + if [ -e /usr/lib/opengl/${1}/lib/libGLcore.so ] + then + realname="$(readlink /usr/lib/opengl/${1}/lib/libGLcore.so)" + ln -sf /usr/lib/opengl/${1}/lib/${realname} \ + /usr/lib/libGLcore.so + ln -sf /usr/lib/opengl/${1}/lib/${realname} \ + /usr/lib/libGLcore.so.1 + fi #setup the /usr/X11R6/lib/modules/extensions/libglx.so symlink if [ -e /usr/X11R6/lib/modules/extensions/libglx.so ] diff --git a/x11-base/xfree/xfree-4.2.0-r9.ebuild b/x11-base/xfree/xfree-4.2.0-r9.ebuild index 12e9c059320f..225031c9cf56 100644 --- a/x11-base/xfree/xfree-4.2.0-r9.ebuild +++ b/x11-base/xfree/xfree-4.2.0-r9.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later # Maintainer: Achim Gottinger <achim@gentoo.org>, Daniel Robbins <drobbins@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.2.0-r9.ebuild,v 1.2 2002/04/07 15:08:11 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.2.0-r9.ebuild,v 1.3 2002/04/07 20:25:46 azarah Exp $ MY_V="`echo ${PV} |sed -e 's:\.::g'`" S=${WORKDIR}/xc @@ -155,6 +155,8 @@ src_install() { dodir /usr/lib/opengl/xfree/{lib,extensions,include} mv ${D}/usr/X11R6/lib/libGL.so* ${D}/usr/lib/opengl/xfree/lib mv ${D}/usr/X11R6/lib/libGL.la ${D}/usr/lib/opengl/xfree/lib + # libGL.a cause problems with tuxracer, etc + mv ${D}/usr/X11R6/lib/libGL.a ${D}/usr/lib/opengl/xfree/lib mv ${D}/usr/X11R6/lib/libMesaGL.so ${D}/usr/lib/opengl/xfree/lib mv ${D}/usr/X11R6/lib/modules/extensions/libglx* \ ${D}/usr/lib/opengl/xfree/extensions |