diff options
| author |   Andrew Bevitt <cyfred@gentoo.org> | 2004-07-17 03:33:38 +0000 |
|---|---|---|
| committer | Andrew Bevitt <cyfred@gentoo.org> | 2004-07-17 03:33:38 +0000 |
| commit | 293dde1282f7778b9057adcbcbdc1dcf09ab0108 (patch) | |
| tree | bbb4d93c8007d8f07cd1defa3e0efcc4b26a5795 /app-emulation | |
| parent | Fixing LDPATH for new opengl-update; it will now handle 32bit GL libs (Manife... (diff) | |
| download | gentoo-2-293dde1282f7778b9057adcbcbdc1dcf09ab0108.tar.gz gentoo-2-293dde1282f7778b9057adcbcbdc1dcf09ab0108.tar.bz2 gentoo-2-293dde1282f7778b9057adcbcbdc1dcf09ab0108.zip | |
Matching compatibility commit for nvidia-glx, changes how TLS is installed and removes the need for LD_CONFIG_PATH
Diffstat (limited to 'app-emulation')
4 files changed, 77 insertions, 1 deletions
diff --git a/app-emulation/emul-linux-x86-nvidia/ChangeLog b/app-emulation/emul-linux-x86-nvidia/ChangeLog index 63ecbdd1b466..719644fcd938 100644 --- a/app-emulation/emul-linux-x86-nvidia/ChangeLog +++ b/app-emulation/emul-linux-x86-nvidia/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-emulation/emul-linux-x86-nvidia # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-nvidia/ChangeLog,v 1.3 2004/07/14 21:23:43 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-nvidia/ChangeLog,v 1.4 2004/07/17 03:33:38 cyfred Exp $ + +*emul-linux-x86-nvidia-1.0.6106-r1 (17 Jul 2004) + + 17 Jul 2004; Andrew Bevitt <cyfred@gentoo.org>; + +emul-linux-x86-nvidia-1.0.6106-r1.ebuild: + Matching 32bit compatibility commit for nvidia-glx changes. Basically changes + how TLS is installed, and removes the need for LD_CONFIG_PATH 13 Jul 2004; Travis Tilley <lv@gentoo.org> emul-linux-x86-nvidia-1.0.6106.ebuild: diff --git a/app-emulation/emul-linux-x86-nvidia/Manifest b/app-emulation/emul-linux-x86-nvidia/Manifest index fb6aefd797b4..c3c7cd6b2274 100644 --- a/app-emulation/emul-linux-x86-nvidia/Manifest +++ b/app-emulation/emul-linux-x86-nvidia/Manifest @@ -1,4 +1,6 @@ +MD5 7435c84f922d98eb23c87cb68563867c emul-linux-x86-nvidia-1.0.6106-r1.ebuild 1923 MD5 4ee86ca7038e44a6cf72fb639512dd4b emul-linux-x86-nvidia-1.0.6106.ebuild 1879 MD5 310ecd6e199d603afee06b5039a369f8 ChangeLog 714 MD5 c43db74843f8f0d8b668e13947befe31 metadata.xml 296 MD5 58184a40423b6f855eb526e9f860eea2 files/digest-emul-linux-x86-nvidia-1.0.6106 83 +MD5 58184a40423b6f855eb526e9f860eea2 files/digest-emul-linux-x86-nvidia-1.0.6106-r1 83 diff --git a/app-emulation/emul-linux-x86-nvidia/emul-linux-x86-nvidia-1.0.6106-r1.ebuild b/app-emulation/emul-linux-x86-nvidia/emul-linux-x86-nvidia-1.0.6106-r1.ebuild new file mode 100644 index 000000000000..fd8381c44326 --- /dev/null +++ b/app-emulation/emul-linux-x86-nvidia/emul-linux-x86-nvidia-1.0.6106-r1.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-nvidia/emul-linux-x86-nvidia-1.0.6106-r1.ebuild,v 1.1 2004/07/17 03:33:38 cyfred Exp $ + +inherit eutils + +PKG="pkg2" +NV_V="${PV/1.0./1.0-}" +NV_PACKAGE="NVIDIA-Linux-x86_64-${NV_V}" +S="${WORKDIR}/${NV_PACKAGE}-${PKG}/usr/lib32" +DESCRIPTION="NVIDIA GLX 32-bit compatibility libraries" +HOMEPAGE="http://www.nvidia.com/" +SRC_URI="http://download.nvidia.com/XFree86/Linux-x86_64/${NV_V}/${NV_PACKAGE}-${PKG}.run" + + +LICENSE="NVIDIA" +SLOT="0" +KEYWORDS="-* ~amd64" +RESTRICT="nostrip" +IUSE="" + +DEPEND=">=media-video/nvidia-glx-${PV}-r1 + >=app-emulation/emul-linux-x86-xlibs-1.1-r1" + +export _POSIX2_VERSION="199209" + +src_unpack() { + cd ${WORKDIR} + bash ${DISTDIR}/${NV_PACKAGE}-${PKG}.run --extract-only +} + +src_install() { + local LIB32_ROOT="/usr/lib32" + local LIB_ROOT="${LIB32_ROOT}/opengl/nvidia/lib" + local TLS_ROOT="${LIB32_ROOT}/opengl/nvidia/tls" + + cd ${S} + # The files exist we just have to install them + exeinto ${LIB_ROOT} + doexe libGL.so.${PV} \ + libGLcore.so.${PV} \ + libnvidia-tls.so.${PV} + dosym libGL.so.${PV} ${LIB_ROOT}/libGL.so + dosym libGL.so.${PV} ${LIB_ROOT}/libGL.so.1 + dosym libGLcore.so.${PV} ${LIB_ROOT}/libGLcore.so + dosym libGLcore.so.${PV} ${LIB_ROOT}/libGLcore.so.1 + dosym libnvidia-tls.so.${PV} ${LIB_ROOT}/libnvidia-tls.so + dosym libnvidia-tls.so.${PV} ${LIB_ROOT}/libnvidia-tls.so.1 + + # TLS libraries + # not sure we need these as glibc in emul-linux-x86-baselibs is non-nptl + dodir ${TLS_ROOT} + exeinto ${TLS_ROOT} + doexe tls/libnvidia-tls.so.${PV} + dosym libnvidia-tls.so.${PV} ${TLS_ROOT}/libnvidia-tls.so + dosym libnvidia-tls.so.${PV} ${TLS_ROOT}/libnvidia-tls.so.1 + #dosym ${LIB_ROOT}/tls ${LIB32_ROOT} +} + +pkg_postinst() { + # Setup nvidia opengl implementation + if [ "${ROOT}" = "/" ] + then + /usr/sbin/opengl-update nvidia + fi +} diff --git a/app-emulation/emul-linux-x86-nvidia/files/digest-emul-linux-x86-nvidia-1.0.6106-r1 b/app-emulation/emul-linux-x86-nvidia/files/digest-emul-linux-x86-nvidia-1.0.6106-r1 new file mode 100644 index 000000000000..3e0157fffab3 --- /dev/null +++ b/app-emulation/emul-linux-x86-nvidia/files/digest-emul-linux-x86-nvidia-1.0.6106-r1 @@ -0,0 +1 @@ +MD5 024f21a3fa134bee8339adac64bdc77a NVIDIA-Linux-x86_64-1.0-6106-pkg2.run 7331301 |