diff options
| author |   Martin Schlemmer <azarah@gentoo.org> | 2002-05-29 01:13:41 +0000 |
|---|---|---|
| committer | Martin Schlemmer <azarah@gentoo.org> | 2002-05-29 01:13:41 +0000 |
| commit | fcfd7da1279316898c714f6dc7f0e5dfe8db3760 (patch) | |
| tree | f6c0f5197b1f3fba1c2b83340cdfeb9a327892b8 /x11-base/xfree | |
| parent | small fix (diff) | |
| download | gentoo-2-fcfd7da1279316898c714f6dc7f0e5dfe8db3760.tar.gz gentoo-2-fcfd7da1279316898c714f6dc7f0e5dfe8db3760.tar.bz2 gentoo-2-fcfd7da1279316898c714f6dc7f0e5dfe8db3760.zip | |
moved libGLU
Diffstat (limited to 'x11-base/xfree')
| -rw-r--r-- | x11-base/xfree/ChangeLog | 9 | ||||
| -rw-r--r-- | x11-base/xfree/files/4.2.0-r11/lib/libGLU.la | 2 | ||||
| -rw-r--r-- | x11-base/xfree/xfree-4.2.0-r11.ebuild | 8 |
3 files changed, 14 insertions, 5 deletions
diff --git a/x11-base/xfree/ChangeLog b/x11-base/xfree/ChangeLog index ba93d77600a8..7e3a604ebd0a 100644 --- a/x11-base/xfree/ChangeLog +++ b/x11-base/xfree/ChangeLog @@ -1,9 +1,16 @@ # 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.18 2002/05/29 00:21:58 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.19 2002/05/29 01:13:41 azarah Exp $ + + *xfree-4.2.0-r11 (28 May 2002) + 29 May 2002; Martin Schlemmer <azarah@gentoo.org> xfree-4.2.0-r11.ebuild : + + Too much coffee, and too little sleep :P Moved libGLU.* to /usr/lib where + it should be. + 28 May 2002; Martin Schlemmer <azarah@gentoo.org> xfree-4.2.0-r11.ebuild : New ebuild that adds lots of fixes and patches. Should fix the Wacom diff --git a/x11-base/xfree/files/4.2.0-r11/lib/libGLU.la b/x11-base/xfree/files/4.2.0-r11/lib/libGLU.la index 6ef71b22b03d..4318427383ea 100644 --- a/x11-base/xfree/files/4.2.0-r11/lib/libGLU.la +++ b/x11-base/xfree/files/4.2.0-r11/lib/libGLU.la @@ -29,4 +29,4 @@ dlopen='' dlpreopen='' # Directory that this library needs to be installed in: -libdir='usr/lib/opengl/xfree/lib' +libdir='/usr/lib' diff --git a/x11-base/xfree/xfree-4.2.0-r11.ebuild b/x11-base/xfree/xfree-4.2.0-r11.ebuild index 45012725f072..73672ef643b7 100644 --- a/x11-base/xfree/xfree-4.2.0-r11.ebuild +++ b/x11-base/xfree/xfree-4.2.0-r11.ebuild @@ -46,7 +46,7 @@ DEPEND=">=sys-libs/ncurses-5.1 3dfx? ( >=media-libs/glide-v3-3.10 )" RDEPEND=">=sys-libs/ncurses-5.1 - >=x11-base/opengl-update-1.1" + >=x11-base/opengl-update-1.2" PROVIDE="virtual/x11 virtual/opengl @@ -220,13 +220,15 @@ src_install() { newexe ${FILESDIR}/${PVR}/xdm.start xdm newexe ${FILESDIR}/${PVR}/xfs.start xfs - #next section is to setup the dinamic libGL stuff + # we want libGLU.so* in /usr/lib + mv ${D}/usr/X11R6/lib/libGLU.* ${D}/usr/lib + + # next section is to setup the dinamic libGL stuff 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/libGLU.* ${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 |