diff options
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/nvidia-glx/ChangeLog | 9 | ||||
| -rw-r--r-- | media-video/nvidia-glx/Manifest | 4 | ||||
| -rw-r--r-- | media-video/nvidia-glx/files/1.0.6106/NVIDIA_glx-1.0.6106-glheader.patch | 15 | ||||
| -rw-r--r-- | media-video/nvidia-glx/files/digest-nvidia-glx-1.0.6106-r1 | 2 | ||||
| -rw-r--r-- | media-video/nvidia-glx/nvidia-glx-1.0.6106-r1.ebuild | 181 |
5 files changed, 210 insertions, 1 deletions
diff --git a/media-video/nvidia-glx/ChangeLog b/media-video/nvidia-glx/ChangeLog index e8d693c98eb1..d7dea3bc16a2 100644 --- a/media-video/nvidia-glx/ChangeLog +++ b/media-video/nvidia-glx/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-video/nvidia-glx # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/ChangeLog,v 1.52 2004/07/13 16:06:09 lv Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/ChangeLog,v 1.53 2004/07/17 03:28:57 cyfred Exp $ + +*nvidia-glx-1.0.6106-r1 (17 Jul 2004) + + 17 Jul 2004; Andrew Bevitt <cyfred@gentoo.org>; + +files/1.0.6106/NVIDIA_glx-1.0.6106-glheader.patch, + +nvidia-glx-1.0.6106-r1.ebuild: + See bug #54984 -- Changing TLS, glext.h, patching gl.h 13 Jul 2004; Travis Tilley <lv@gentoo.org> nvidia-glx-1.0.6106.ebuild: the previous amd64 nvidia drivers arent exactly what i would call stable, but diff --git a/media-video/nvidia-glx/Manifest b/media-video/nvidia-glx/Manifest index 4ecf430fa7db..5758837a8e82 100644 --- a/media-video/nvidia-glx/Manifest +++ b/media-video/nvidia-glx/Manifest @@ -2,7 +2,9 @@ MD5 30625d4053cb03c505077141edf94976 nvidia-glx-1.0.5336-r2.ebuild 3443 MD5 37e94c0213dc16d73d122ac22df67b78 nvidia-glx-1.0.6106.ebuild 4855 MD5 c79e7c8a94dd542020eec47fcc960e9b nvidia-glx-1.0.5332-r2.ebuild 3686 MD5 d40244500cd750887c4c2074678b91df nvidia-glx-1.0.4499.ebuild 2726 +MD5 6129d1bfc2057b56b43f297c1fb47191 nvidia-glx-1.0.6106-r1.ebuild 5349 MD5 65ab1b807374ee2f065e75be6ce4c587 nvidia-glx-1.0.4496.ebuild 3056 +MD5 1a0154fbe1a9b4b5d43298fe01d893da .#Manifest.1.49 2491 MD5 5eb20c5294063f5553d246f3c97bf8cd nvidia-glx-1.0.4496-r1.ebuild 3376 MD5 01ed7d4ae6ca52293e63a39723d83eb6 nvidia-glx-1.0.4363.ebuild 2984 MD5 ec76697170ba0841f10a3f4b2901a1bb nvidia-glx-1.0.5328-r1.ebuild 3231 @@ -26,6 +28,8 @@ MD5 3d8b3ecb3827e2e3a9a45ac6c3210a0a files/nvidia-glx-1.0.5328-defines.patch 437 MD5 497ffcbd6a91ed9447dfdf7b736925bd files/digest-nvidia-glx-1.0.5328-r1 80 MD5 cf7b2bb276c568f0f66d10951b4ce3ad files/digest-nvidia-glx-1.0.5332-r2 83 MD5 1316f73c0eecd8832bb362a3d5ca4892 files/digest-nvidia-glx-1.0.5336-r2 80 +MD5 50ffea0f5eb12d252905f379bc7be2d6 files/digest-nvidia-glx-1.0.6106-r1 163 MD5 c3afc69f917a783ebd53cf2de38065dc files/09nvidia 61 +MD5 dc042e58fec2cdaab035e7cc41307f46 files/1.0.6106/NVIDIA_glx-1.0.6106-glheader.patch 428 MD5 3d8b3ecb3827e2e3a9a45ac6c3210a0a files/1.0.6106/NVIDIA_glx-1.0.6106-defines.patch 437 MD5 6f55327ce020f7ed0d433ea99dacb315 files/1.0.6106/NVIDIA_glx-1.0.6106-makefile.patch 593 diff --git a/media-video/nvidia-glx/files/1.0.6106/NVIDIA_glx-1.0.6106-glheader.patch b/media-video/nvidia-glx/files/1.0.6106/NVIDIA_glx-1.0.6106-glheader.patch new file mode 100644 index 000000000000..c37dbfb2661c --- /dev/null +++ b/media-video/nvidia-glx/files/1.0.6106/NVIDIA_glx-1.0.6106-glheader.patch @@ -0,0 +1,15 @@ +--- usr/include/GL/gl.h.old 2004-07-14 16:29:58.602003368 +1000 ++++ usr/include/GL/gl.h 2004-07-14 16:34:21.478040136 +1000 +@@ -48,6 +48,12 @@ + # define __DEFINED_GLAPI + #endif + ++/* Defining what we have in this file version wise */ ++#define GL_VERSION_1_2 ++#define GL_VERSION_1_3 ++#define GL_VERSION_1_4 ++#include <GL/glext.h> ++ + /*************************************************************/ + + typedef unsigned int GLenum; diff --git a/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.6106-r1 b/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.6106-r1 new file mode 100644 index 000000000000..a343b4b8810a --- /dev/null +++ b/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.6106-r1 @@ -0,0 +1,2 @@ +MD5 5432f919f0211ce36b854d87108d7db0 NVIDIA-Linux-x86-1.0-6106-pkg1.run 8160802 +MD5 024f21a3fa134bee8339adac64bdc77a NVIDIA-Linux-x86_64-1.0-6106-pkg2.run 7331301 diff --git a/media-video/nvidia-glx/nvidia-glx-1.0.6106-r1.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.6106-r1.ebuild new file mode 100644 index 000000000000..bf530c3407d7 --- /dev/null +++ b/media-video/nvidia-glx/nvidia-glx-1.0.6106-r1.ebuild @@ -0,0 +1,181 @@ +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/nvidia-glx-1.0.6106-r1.ebuild,v 1.1 2004/07/17 03:28:57 cyfred Exp $ + +inherit eutils + +X86_PKG_V="pkg1" +AMD64_PKG_V="pkg2" +NV_V="${PV/1.0./1.0-}" +X86_NV_PACKAGE="NVIDIA-Linux-x86-${NV_V}" +AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${NV_V}" + +DESCRIPTION="NVIDIA X11 driver and GLX libraries" +HOMEPAGE="http://www.nvidia.com/" +SRC_URI="x86? (ftp://download.nvidia.com/XFree86/Linux-x86/${NV_V}/${X86_NV_PACKAGE}-${X86_PKG_V}.run) + amd64? (http://download.nvidia.com/XFree86/Linux-x86_64/${NV_V}/${AMD64_NV_PACKAGE}-${AMD64_PKG_V}.run)" + +if use x86; then + PKG_V="${X86_PKG_V}" + NV_PACKAGE="${X86_NV_PACKAGE}" +elif use amd64; then + PKG_V="${AMD64_PKG_V}" + NV_PACKAGE="${AMD64_NV_PACKAGE}" +fi + +S="${WORKDIR}/${NV_PACKAGE}-${PKG_V}" + +LICENSE="NVIDIA" +SLOT="0" +KEYWORDS="-* ~x86 ~amd64" +RESTRICT="nostrip" +IUSE="multilib" + +DEPEND="virtual/libc + virtual/x11 + >=x11-base/opengl-update-1.8 + ~media-video/nvidia-kernel-${PV}" + +PDEPEND="amd64? ( multilib? ( >=app-emulation/emul-linux-x86-nvidia-${PV}-r1 ) )" + +PROVIDE="virtual/opengl" +export _POSIX2_VERSION="199209" + +pkg_setup() { + # We need xfree-4.2.0-r9 to support the dynamic libGL* stuff + if has_version "x11-base/xfree" + then + if has_version "<x11-base/xfree-4.2.0-r9" + then + die "Upgrade to xfree 4.2.0-r9 or greater." + fi + fi + # Provide some information to the users + if use amd64 ; then + einfo + einfo "This release of nvidia-glx contains 32 bit compatibility" + einfo "libraries. These can be installed by either" + einfo " 1) emerge app-emulation/emul-linux-x86-nvidia" + einfo " 2) USE=\"multilib\" emerge media-video/nvidia-glx" + einfo " (or /etc/portage/package.use, see portage manual)" + einfo + fi +} + +src_unpack() { + cd ${WORKDIR} + bash ${DISTDIR}/${NV_PACKAGE}-${PKG_V}.run --extract-only + + # Patchs go below here, add breif description + + cd ${S} + + # nVidia wants us to use nvidia-installer, removing warning. + epatch ${FILESDIR}/${PV}/NVIDIA_glx-${PV}-makefile.patch + # Use the correct defines to make gtkglext build work + epatch ${FILESDIR}/${PV}/NVIDIA_glx-${PV}-defines.patch + # Use some more sensible gl headers and make way for new glext.h + epatch ${FILESDIR}/${PV}/NVIDIA_glx-${PV}-glheader.patch +} + +src_install() { + local NV_ROOT="/usr/lib/opengl/nvidia" + + # The X module + exeinto /usr/X11R6/lib/modules/drivers + doexe usr/X11R6/lib/modules/drivers/nvidia_drv.o + + # The GLX extension + exeinto ${NV_ROOT}/extensions + newexe usr/X11R6/lib/modules/extensions/libglx.so.${PV} libglx.so + + # The GLX libraries + exeinto ${NV_ROOT}/lib + doexe usr/lib/libGL.so.${PV} \ + usr/lib/libGLcore.so.${PV} \ + usr/lib/libnvidia-tls.so.${PV} + dosym libGL.so.${PV} ${NV_ROOT}/lib/libGL.so + dosym libGL.so.${PV} ${NV_ROOT}/lib/libGL.so.1 + dosym libGLcore.so.${PV} ${NV_ROOT}/lib/libGLcore.so + dosym libGLcore.so.${PV} ${NV_ROOT}/lib/libGLcore.so.1 + dosym libnvidia-tls.so.${PV} ${NV_ROOT}/lib/libnvidia-tls.so + dosym libnvidia-tls.so.${PV} ${NV_ROOT}/lib/libnvidia-tls.so.1 + + local TLS_ROOT="/usr/lib/opengl/nvidia/tls" + dodir ${TLS_ROOT} + exeinto ${TLS_ROOT} + doexe usr/lib/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 + + # Install tls_test + dodir /usr/lib/misc + exeinto /usr/lib/misc + doexe usr/bin/tls_test + doexe usr/bin/tls_test_dso.so + + insinto /usr/X11R6/lib + doins usr/X11R6/lib/libXvMCNVIDIA.a + exeinto /usr/X11R6/lib + doexe usr/X11R6/lib/libXvMCNVIDIA.so.${PV} + + # Closing bug #37517 by letting virtual/x11 provide system wide glext.h + # 16 July 2004, opengl-update is now supplying glext.h for system wide + # compatibility, so we still need to remove this. + rm -f usr/include/GL/glext.h + + # Includes + insinto ${NV_ROOT}/include + doins usr/include/GL/*.h + + # Docs, remove nvidia-settings as provided by media-video/nvidia-settings + rm -f usr/share/doc/nvidia-settings* + dodoc usr/share/doc/* + + # nVidia want bug reports using this script + exeinto /usr/bin + doexe usr/bin/nvidia-bug-report.sh + + # Not sure whether installing the .la file is neccessary; + # this is adopted from the `nvidia' ebuild + local ver1="`echo ${PV} |cut -d '.' -f 1`" + local ver2="`echo ${PV} |cut -d '.' -f 2`" + local ver3="`echo ${PV} |cut -d '.' -f 3`" + sed -e "s:\${PV}:${PV}:" \ + -e "s:\${ver1}:${ver1}:" \ + -e "s:\${ver2}:${ver2}:" \ + -e "s:\${ver3}:${ver3}:" \ + ${FILESDIR}/libGL.la.2 > ${D}/${NV_ROOT}/lib/libGL.la + + # Should we install the .la for the 32bit libs on amd64? I think not. +} + +pkg_preinst() { + #clean the dinamic libGL stuff's home to ensure + #we dont have stale libs floating around + if [ -d ${ROOT}/usr/lib/opengl/nvidia ] + then + rm -rf ${ROOT}/usr/lib/opengl/nvidia/* + fi + #make sure we nuke the old nvidia-glx's env.d file + if [ -e ${ROOT}/etc/env.d/09nvidia ] + then + rm -f ${ROOT}/etc/env.d/09nvidia + fi +} + +pkg_postinst() { + #switch to the nvidia implementation + if [ "${ROOT}" = "/" ] + then + /usr/sbin/opengl-update nvidia + fi + + echo + einfo "To use the Nvidia GLX, run \"opengl-update nvidia\"" + echo + einfo "You may also be interested in media-video/nvidia-settings" + echo + einfo "nVidia have requested that any bug reports submitted have the" + einfo "output of /usr/bin/nvidia-bug-report.sh included." +} |