diff options
author | Doug Goldstein <cardoe@gentoo.org> | 2007-07-31 13:48:47 +0000 |
---|---|---|
committer | Doug Goldstein <cardoe@gentoo.org> | 2007-07-31 13:48:47 +0000 |
commit | 31800e965b9ee8ef498570315527193d372fdb95 (patch) | |
tree | 2a500b19a224006d245f2af1b1e35df7229ebb95 /x11-drivers | |
parent | Add debug use (diff) | |
download | gentoo-2-31800e965b9ee8ef498570315527193d372fdb95.tar.gz gentoo-2-31800e965b9ee8ef498570315527193d372fdb95.tar.bz2 gentoo-2-31800e965b9ee8ef498570315527193d372fdb95.zip |
nvidia-legacy-drivers move to nvidia-drivers
Diffstat (limited to 'x11-drivers')
11 files changed, 0 insertions, 643 deletions
diff --git a/x11-drivers/nvidia-legacy-drivers/ChangeLog b/x11-drivers/nvidia-legacy-drivers/ChangeLog deleted file mode 100644 index facbbf6596be..000000000000 --- a/x11-drivers/nvidia-legacy-drivers/ChangeLog +++ /dev/null @@ -1,85 +0,0 @@ -# ChangeLog for x11-drivers/nvidia-legacy-drivers -# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-legacy-drivers/ChangeLog,v 1.18 2007/07/30 07:52:52 dberkholz Exp $ - - 30 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; - nvidia-legacy-drivers-1.0.7184.ebuild: - Move eselect-opengl into DEPEND only, so it can be uninstalled later. - - 01 Jul 2007; Piotr Jaroszyński <peper@gentoo.org> - nvidia-legacy-drivers-1.0.7184.ebuild: - (QA) RESTRICT="multilib-pkg-force" -> EMULTILIB_PKG="true" - - 14 Mar 2007; Chris Gianelloni <wolf31o2@gentoo.org> - nvidia-legacy-drivers-1.0.7184.ebuild: - Added a blocker on newer versions of nvidia-settings, which don't work with - these older driver versions. - - 19 Feb 2007; Chris Gianelloni <wolf31o2@gentoo.org> - nvidia-legacy-drivers-1.0.7184.ebuild: - Removing dlloader USE flag wrt bug #166759. - - 05 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org> files/nvidia: - Updated the nvidia file which installs to /etc/modules.d for bug #139756. - - 20 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org> - nvidia-legacy-drivers-1.0.7184.ebuild: - Added fix for bug #145968. - - 18 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org> - nvidia-legacy-drivers-1.0.7184.ebuild: - Changed to pkg0 for x86 for bug #146182. - - 17 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org> - +files/NVIDIA_kernel-2.6.19.patch, nvidia-legacy-drivers-1.0.7184.ebuild: - Added patch for 2.6.19 kernel and closing bug #151317. - - 09 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org> - nvidia-legacy-drivers-1.0.7184.ebuild: - Removed virtual/x11 from dependencies, removed blocker on nvidia-kernel and - nvidia-glx, since they're no longer in the tree, changed nostrip to strip, - and added QA variables for TEXTRELS and EXECSTACK for amd64 and x86. Closing - bug #114894. - - 04 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org> - -nvidia-legacy-drivers-1.0.7182.ebuild, - nvidia-legacy-drivers-1.0.7184.ebuild: - Removed PROVIDE=virtual/opengl since opengl is a new-style virtual. - - 04 Oct 2006; Simon Stelling <blubb@gentoo.org> - nvidia-legacy-drivers-1.0.7184.ebuild: - stable on amd64 - - 27 Aug 2006; Hanno Boeck <hanno@gentoo.org> files/libGL.la-r2: - Fix libdir in libGL.la (bug #140982). - - 27 Aug 2006; Donnie Berkholz <dberkholz@gentoo.org>; - nvidia-legacy-drivers-1.0.7184.ebuild: - Remove blocker on xorg-server 1.1. - - 25 Aug 2006; Donnie Berkholz <dberkholz@gentoo.org>; +metadata.xml: - Someone forgot to add metadata. - -*nvidia-legacy-drivers-1.0.7184 (25 Aug 2006) - - 25 Aug 2006; Kristopher Kersey <augustus@gentoo.org> - nvidia-legacy-drivers-1.0.7182.ebuild, - +nvidia-legacy-drivers-1.0.7184.ebuild: - Added new NVIDIA driver release 1.0.7184. Fixed a couple of whitespace - errors. - - 08 Aug 2006; Joshua Jackson <tsunam@gentoo.org> - nvidia-legacy-drivers-1.0.7182.ebuild: - Stable x86, bug #140923 - - 06 Jul 2006; Kristopher Kersey <augustus@gentoo.org> - nvidia-legacy-drivers-1.0.7182.ebuild: - Quick fix to close bug #133138. - -*nvidia-legacy-drivers-1.0.7182 (06 Jul 2006) - - 06 Jul 2006; Kristopher Kersey <augustus@gentoo.org> +files/09nvidia, - +files/NVIDIA_glx-defines.patch, +files/NVIDIA_glx-glheader.patch, - +files/libGL.la-r2, +files/nvidia, +nvidia-legacy-drivers-1.0.7182.ebuild: - Initial import of x11-drivers/nvidia-legacy-drivers in portage. - diff --git a/x11-drivers/nvidia-legacy-drivers/Manifest b/x11-drivers/nvidia-legacy-drivers/Manifest deleted file mode 100644 index b27a7fa30788..000000000000 --- a/x11-drivers/nvidia-legacy-drivers/Manifest +++ /dev/null @@ -1,41 +0,0 @@ -AUX 09nvidia 61 RMD160 b69c3282ba6195112e312fe34bdcb12544aef8ca SHA1 05dd043f66f53409dfe511636d92a339edb4c765 SHA256 14702d6726cc9f0ad832a3cc90059999eb956f9e3a35397cb63cfa6347b33e39 -MD5 c3afc69f917a783ebd53cf2de38065dc files/09nvidia 61 -RMD160 b69c3282ba6195112e312fe34bdcb12544aef8ca files/09nvidia 61 -SHA256 14702d6726cc9f0ad832a3cc90059999eb956f9e3a35397cb63cfa6347b33e39 files/09nvidia 61 -AUX NVIDIA_glx-defines.patch 437 RMD160 7cc38de0663c51d9e3718f02035a940a5d31e53c SHA1 eef9bcae32d4e00133b205e27ce766488d5c6cdb SHA256 0007f3d962edb87da4788ce58869679c1b10f28223a6bf1c23696fede57305da -MD5 3d8b3ecb3827e2e3a9a45ac6c3210a0a files/NVIDIA_glx-defines.patch 437 -RMD160 7cc38de0663c51d9e3718f02035a940a5d31e53c files/NVIDIA_glx-defines.patch 437 -SHA256 0007f3d962edb87da4788ce58869679c1b10f28223a6bf1c23696fede57305da files/NVIDIA_glx-defines.patch 437 -AUX NVIDIA_glx-glheader.patch 380 RMD160 ee9a10cfbed10d5711f58a80553ffebeea5853bf SHA1 72abfedb9dfb7dae7dc23a5701d3e00282fef2c0 SHA256 f630e24067bf6199a64f8fe8c5d6fc158cb4b153bda65ffc3f97b36a9cb08faf -MD5 32901fb95c4fdc6cfa6b762498240b3c files/NVIDIA_glx-glheader.patch 380 -RMD160 ee9a10cfbed10d5711f58a80553ffebeea5853bf files/NVIDIA_glx-glheader.patch 380 -SHA256 f630e24067bf6199a64f8fe8c5d6fc158cb4b153bda65ffc3f97b36a9cb08faf files/NVIDIA_glx-glheader.patch 380 -AUX NVIDIA_kernel-2.6.19.patch 1715 RMD160 10f7d3927bd87857c7bd51ffe4ee4891fd8a1a02 SHA1 c6422409a7f8fe43b60986eb71836961993cb516 SHA256 2b3c6d0af62dbb18ca3698c7fa4d49812f3df67aa27e4110431b6039ec51e145 -MD5 f0e570320df1a1bab7866c5259eefd7e files/NVIDIA_kernel-2.6.19.patch 1715 -RMD160 10f7d3927bd87857c7bd51ffe4ee4891fd8a1a02 files/NVIDIA_kernel-2.6.19.patch 1715 -SHA256 2b3c6d0af62dbb18ca3698c7fa4d49812f3df67aa27e4110431b6039ec51e145 files/NVIDIA_kernel-2.6.19.patch 1715 -AUX libGL.la-r2 733 RMD160 479612ab30c04ca0683c7d9edaf9ab3de783e4a9 SHA1 88656b7e7234ade4f5564373fd6eb5c040167655 SHA256 4856e7a2c31763ade41c93a395f3e80a2705ac2ab4dbd73e5161cdba132f407b -MD5 ca48410a5f23b1fa3c5895201a7161e6 files/libGL.la-r2 733 -RMD160 479612ab30c04ca0683c7d9edaf9ab3de783e4a9 files/libGL.la-r2 733 -SHA256 4856e7a2c31763ade41c93a395f3e80a2705ac2ab4dbd73e5161cdba132f407b files/libGL.la-r2 733 -AUX nvidia 1152 RMD160 05693b8aa0f5d15336c441f69ca4a05f167b08b9 SHA1 4f1eab22e03b88982e381f0678889f3e2c4d6904 SHA256 a5549cddd18ccd21099d1464fbf12846c280a698672575e67000037cb67d7162 -MD5 afe4717e36604d5c16c3a7db31cd4770 files/nvidia 1152 -RMD160 05693b8aa0f5d15336c441f69ca4a05f167b08b9 files/nvidia 1152 -SHA256 a5549cddd18ccd21099d1464fbf12846c280a698672575e67000037cb67d7162 files/nvidia 1152 -DIST NVIDIA-Linux-x86-1.0-7184-pkg0.run 5580032 RMD160 83c50779fd0a82949972e262e8a6f571a280652e SHA1 ba3cfc1734c179cee628fba89ce557dfc0e78e31 SHA256 248987af3e527f743d3678190dc038853f6ad120e1c9691946e4f88ae359b650 -DIST NVIDIA-Linux-x86_64-1.0-7184-pkg2.run 8779868 RMD160 07c847f6ee245f28f501b08ff01d81e5ec1cc3a5 SHA1 5bad7d3f39aa35e3240a7a7ddef042954890b67c SHA256 660055c55cfba815593408244a9162ca550558331977cc371b50e9f5f9dcb7da -EBUILD nvidia-legacy-drivers-1.0.7184.ebuild 10630 RMD160 b359cf13bfe21bc95747c78fc8e1a910a9e577b3 SHA1 9ae89aca0d37c931b33c9d1ec2caa32325141835 SHA256 2e5344a4e285f5eb07b3714ee6e84fe1b307fbd0663c7a8b1c3e118826b21374 -MD5 d96ffebb8d58b88f532bff10b4605bc8 nvidia-legacy-drivers-1.0.7184.ebuild 10630 -RMD160 b359cf13bfe21bc95747c78fc8e1a910a9e577b3 nvidia-legacy-drivers-1.0.7184.ebuild 10630 -SHA256 2e5344a4e285f5eb07b3714ee6e84fe1b307fbd0663c7a8b1c3e118826b21374 nvidia-legacy-drivers-1.0.7184.ebuild 10630 -MISC ChangeLog 3370 RMD160 a368a1737ef7e6ae26a780df438a3ba846a5c085 SHA1 5423ec40db3e42e13a3977b3d9c25b7fcbe0e60b SHA256 9b80d43d54e73c02a2f0bb10419e662b420ae84f67064c4c32b889066b70e5cd -MD5 b4c14a1056f411d740ebd26e15fc06c7 ChangeLog 3370 -RMD160 a368a1737ef7e6ae26a780df438a3ba846a5c085 ChangeLog 3370 -SHA256 9b80d43d54e73c02a2f0bb10419e662b420ae84f67064c4c32b889066b70e5cd ChangeLog 3370 -MISC metadata.xml 302 RMD160 66c75d5895f747b8ce5af0f80b90af8fea1d07d7 SHA1 47dde751e4e0c833a65f32e106e594f449fe58a2 SHA256 0aa0f01ad14674164a2898387b83ded31b2b67a12757165debe6b03ee2fd692f -MD5 643cec14f7f1dda9a26f163853dbf080 metadata.xml 302 -RMD160 66c75d5895f747b8ce5af0f80b90af8fea1d07d7 metadata.xml 302 -SHA256 0aa0f01ad14674164a2898387b83ded31b2b67a12757165debe6b03ee2fd692f metadata.xml 302 -MD5 62a707a3a94f45168e848e6b29369f82 files/digest-nvidia-legacy-drivers-1.0.7184 581 -RMD160 280a4c2d274da68c4c4c31ff05d280f10a4c8f74 files/digest-nvidia-legacy-drivers-1.0.7184 581 -SHA256 bd8f5c3b515dd0db1a0df3259e35e0aee5d0c432ed146ad0695406bcbbb37476 files/digest-nvidia-legacy-drivers-1.0.7184 581 diff --git a/x11-drivers/nvidia-legacy-drivers/files/09nvidia b/x11-drivers/nvidia-legacy-drivers/files/09nvidia deleted file mode 100644 index 1fcbef41fc7c..000000000000 --- a/x11-drivers/nvidia-legacy-drivers/files/09nvidia +++ /dev/null @@ -1,2 +0,0 @@ -# Has to precede X11's own libraries! -LDPATH=/opt/nvidia/lib diff --git a/x11-drivers/nvidia-legacy-drivers/files/NVIDIA_glx-defines.patch b/x11-drivers/nvidia-legacy-drivers/files/NVIDIA_glx-defines.patch deleted file mode 100644 index da9933f6337c..000000000000 --- a/x11-drivers/nvidia-legacy-drivers/files/NVIDIA_glx-defines.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -ur NVIDIA_GLX-1.0-4191/usr/include/GL/glx.h NVIDIA_GLX-1.0-4191.new/usr/include/GL/glx.h ---- NVIDIA_GLX-1.0-4191/usr/include/GL/glx.h 2002-12-09 21:26:55.000000000 +0100 -+++ NVIDIA_GLX-1.0-4191.new/usr/include/GL/glx.h 2003-01-30 18:20:23.000000000 +0100 -@@ -39,6 +39,7 @@ - typedef XID GLXPixmap; - typedef XID GLXDrawable; - typedef XID GLXPbuffer; -+typedef XID GLXPbufferSGIX; - typedef XID GLXWindow; - typedef XID GLXFBConfigID; - diff --git a/x11-drivers/nvidia-legacy-drivers/files/NVIDIA_glx-glheader.patch b/x11-drivers/nvidia-legacy-drivers/files/NVIDIA_glx-glheader.patch deleted file mode 100644 index e0393e1b9ab0..000000000000 --- a/x11-drivers/nvidia-legacy-drivers/files/NVIDIA_glx-glheader.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- usr/include/GL/gl.g.orig 2004-07-17 19:56:59.789410584 +1000 -+++ usr/include/GL/gl.h 2004-07-17 19:59:08.844791184 +1000 -@@ -66,6 +66,10 @@ - typedef double GLclampd; - typedef void GLvoid; - -+/* Patching for some better defines in the global system */ -+#ifndef GL_GLEXT_LEGACY -+#include <GL/glext.h> -+#endif - - /*************************************************************/ - diff --git a/x11-drivers/nvidia-legacy-drivers/files/NVIDIA_kernel-2.6.19.patch b/x11-drivers/nvidia-legacy-drivers/files/NVIDIA_kernel-2.6.19.patch deleted file mode 100644 index 9d56d428e155..000000000000 --- a/x11-drivers/nvidia-legacy-drivers/files/NVIDIA_kernel-2.6.19.patch +++ /dev/null @@ -1,47 +0,0 @@ -Index: NVIDIA-Linux-x86_64-1.0-9625-pkg2/usr/src/nv/nv-linux.h -=================================================================== ---- NVIDIA-Linux-x86_64-1.0-9625-pkg2.orig/usr/src/nv/nv-linux.h -+++ NVIDIA-Linux-x86_64-1.0-9625-pkg2/usr/src/nv/nv-linux.h -@@ -14,10 +14,11 @@ - - #include "nv.h" - --#include <linux/config.h> - #include <linux/version.h> - #include <linux/utsname.h> -- -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 15) -+#include <linux/config.h> -+#endif - - #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 4, 7) - # error This driver does not support 2.4 kernels older than 2.4.7! -Index: NVIDIA-Linux-x86_64-1.0-9625-pkg2/usr/src/nv/nv.c -=================================================================== ---- NVIDIA-Linux-x86_64-1.0-9625-pkg2.orig/usr/src/nv/nv.c -+++ NVIDIA-Linux-x86_64-1.0-9625-pkg2/usr/src/nv/nv.c -@@ -288,7 +288,11 @@ int nv_kern_ioctl(struct inode - long nv_kern_unlocked_ioctl(struct file *, unsigned int, unsigned long); - long nv_kern_compat_ioctl(struct file *, unsigned int, unsigned long); - void nv_kern_isr_bh(unsigned long); -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19) - irqreturn_t nv_kern_isr(int, void *, struct pt_regs *); -+#else -+irqreturn_t nv_kern_isr(int, void *); -+#endif - void nv_kern_rc_timer(unsigned long); - #if defined(NV_PM_SUPPORT_OLD_STYLE_APM) - static int nv_kern_apm_event(struct pm_dev *, pm_request_t, void *); -@@ -2595,8 +2599,10 @@ long nv_kern_compat_ioctl( - */ - irqreturn_t nv_kern_isr( - int irq, -- void *arg, -- struct pt_regs *regs -+ void *arg -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19) -+ , struct pt_regs *regs -+#endif - ) - { - nv_linux_state_t *nvl = (void *) arg; diff --git a/x11-drivers/nvidia-legacy-drivers/files/digest-nvidia-legacy-drivers-1.0.7184 b/x11-drivers/nvidia-legacy-drivers/files/digest-nvidia-legacy-drivers-1.0.7184 deleted file mode 100644 index 3afc574e76ac..000000000000 --- a/x11-drivers/nvidia-legacy-drivers/files/digest-nvidia-legacy-drivers-1.0.7184 +++ /dev/null @@ -1,6 +0,0 @@ -MD5 149e5e9934387da5da6ebe21d694e82a NVIDIA-Linux-x86-1.0-7184-pkg0.run 5580032 -RMD160 83c50779fd0a82949972e262e8a6f571a280652e NVIDIA-Linux-x86-1.0-7184-pkg0.run 5580032 -SHA256 248987af3e527f743d3678190dc038853f6ad120e1c9691946e4f88ae359b650 NVIDIA-Linux-x86-1.0-7184-pkg0.run 5580032 -MD5 332850387c4e7a4619753b856e3199e5 NVIDIA-Linux-x86_64-1.0-7184-pkg2.run 8779868 -RMD160 07c847f6ee245f28f501b08ff01d81e5ec1cc3a5 NVIDIA-Linux-x86_64-1.0-7184-pkg2.run 8779868 -SHA256 660055c55cfba815593408244a9162ca550558331977cc371b50e9f5f9dcb7da NVIDIA-Linux-x86_64-1.0-7184-pkg2.run 8779868 diff --git a/x11-drivers/nvidia-legacy-drivers/files/libGL.la-r2 b/x11-drivers/nvidia-legacy-drivers/files/libGL.la-r2 deleted file mode 100644 index 863d184419aa..000000000000 --- a/x11-drivers/nvidia-legacy-drivers/files/libGL.la-r2 +++ /dev/null @@ -1,32 +0,0 @@ -# libGL.la - a libtool library file -# Generated by ltmain.sh - GNU libtool 1.4 (1.920 2001/04/24 23:26:18) -# -# Please DO NOT delete this file! -# It is necessary for linking the library. - -# The name that we can dlopen(3). -dlname='libGL.so.1' - -# Names of this library. -library_names='libGL.so.${PV} libGL.so.1 libGL.so' - -# The name of the static archive. -old_library='' - -# Libraries that this one depends upon. -dependency_libs='-L/usr/${libdir} -lm -lX11 -lXext -ldl' - -# Version information for libGL. -current=${ver1} -age=${ver2} -revision=${ver3} - -# Is this an already installed library? -installed=yes - -# Files to dlopen/dlpreopen -dlopen='' -dlpreopen='' - -# Directory that this library needs to be installed in: -libdir='/usr/${libdir}' diff --git a/x11-drivers/nvidia-legacy-drivers/files/nvidia b/x11-drivers/nvidia-legacy-drivers/files/nvidia deleted file mode 100644 index f6cfdd49a15d..000000000000 --- a/x11-drivers/nvidia-legacy-drivers/files/nvidia +++ /dev/null @@ -1,32 +0,0 @@ -# Nvidia drivers support -alias char-major-195 nvidia -alias /dev/nvidiactl char-major-195 - -# To tweak the driver the following options can be used, note that -# you should be careful, as it could cause instability!! For more -# options see /usr/share/doc/${PACKAGE}/README.gz -# -# To enable Side Band Adressing: NVreg_EnableAGPSBA=1 -# -# To enable Fast Writes: NVreg_EnableAGPFW=1 -# -# To enable both for instance, uncomment following line: -# -#options nvidia NVreg_EnableAGPSBA=1 NVreg_EnableAGPFW=1 -# If you have a mobile chip, you may need to enable this option -# if you have hard lockups when starting X. -# -# See: Appendix I. Configuring your laptop -# In /usr/share/doc/${PACKAGE}/README.gz for full details -# -# Choose the appropriate value for NVreg_Mobile from the table: -# Value Meaning -# ---------- -------------------------------------------------- -# 0xFFFFFFFF let the kernel module autodetect the correct value -# 1 Dell laptops -# 2 non-Compal Toshiba laptops -# 3 all other laptops -# 4 Compal Toshiba laptops -# 5 Gateway laptops -# -#options nvidia NVreg_SoftEDIDs=0 NVreg_Mobile=3 diff --git a/x11-drivers/nvidia-legacy-drivers/metadata.xml b/x11-drivers/nvidia-legacy-drivers/metadata.xml deleted file mode 100644 index 554e7570e04b..000000000000 --- a/x11-drivers/nvidia-legacy-drivers/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<herd>x11-drivers</herd> -<maintainer> - <email>x11-drivers@gentoo.org</email> -</maintainer> -<longdescription>NVIDIA X11 driver and GLX libraries</longdescription> -</pkgmetadata> diff --git a/x11-drivers/nvidia-legacy-drivers/nvidia-legacy-drivers-1.0.7184.ebuild b/x11-drivers/nvidia-legacy-drivers/nvidia-legacy-drivers-1.0.7184.ebuild deleted file mode 100644 index 150b0124c356..000000000000 --- a/x11-drivers/nvidia-legacy-drivers/nvidia-legacy-drivers-1.0.7184.ebuild +++ /dev/null @@ -1,365 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-legacy-drivers/nvidia-legacy-drivers-1.0.7184.ebuild,v 1.14 2007/07/30 07:52:52 dberkholz Exp $ - -inherit eutils multilib versionator linux-mod - -X86_PKG_V="pkg0" -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 for older NVIDIA cards" -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 )" - -LICENSE="NVIDIA" -SLOT="0" -KEYWORDS="-* amd64 x86" -IUSE="" -RESTRICT="strip" -EMULTILIB_PKG="true" - -DEPEND="virtual/linux-sources - app-admin/eselect-opengl" -RDEPEND="virtual/modutils - x11-base/xorg-server - media-libs/mesa - kernel_FreeBSD? ( !media-video/nvidia-freebsd ) - !>=media-video/nvidia-settings-1.0.20061102 - !app-emulation/emul-linux-x86-nvidia - !x11-drivers/nvidia-drivers" - -QA_TEXTRELS_x86="usr/lib/xorg/libXvMCNVIDIA.so.${PV} - usr/lib/opengl/nvidia/lib/libGL.so.${PV} - usr/lib/opengl/nvidia/lib/libGLcore.so.${PV} - usr/lib/opengl/nvidia/tls/libnvidia-tls.so.${PV} - usr/lib/opengl/nvidia/no-tls/libnvidia-tls.so.${PV} - usr/lib/opengl/nvidia/extensions/libglx.so" -QA_EXECSTACK_x86="usr/lib/opengl/nvidia/lib/libGL.so.${PV} - usr/lib/opengl/nvidia/lib/libGLcore.so.${PV} - usr/lib/opengl/nvidia/extensions/libglx.so" - -QA_TEXTRELS_amd64="usr/lib64/xorg/libXvMCNVIDIA.so.${PV} - usr/lib64/opengl/nvidia/lib/libGL.so.${PV} - usr/lib64/opengl/nvidia/lib/libGLcore.so.${PV} - usr/lib64/opengl/nvidia/tls/libnvidia-tls.so.${PV} - usr/lib64/opengl/nvidia/no-tls/libnvidia-tls.so.${PV} - usr/lib64/opengl/nvidia/extensions/libglx.so - usr/lib32/xorg/libXvMCNVIDIA.so.${PV} - usr/lib32/opengl/nvidia/lib/libGL.so.${PV} - usr/lib32/opengl/nvidia/lib/libGLcore.so.${PV} - usr/lib32/opengl/nvidia/tls/libnvidia-tls.so.${PV} - usr/lib32/opengl/nvidia/no-tls/libnvidia-tls.so.${PV} - usr/lib32/opengl/nvidia/extensions/libglx.so" - -QA_EXECSTACK_amd64="usr/lib64/opengl/nvidia/lib/libGL.so.${PV} - usr/lib64/opengl/nvidia/lib/libGLcore.so.${PV} - usr/lib64/opengl/nvidia/extensions/libglx.so - usr/lib32/opengl/nvidia/lib/libGL.so.${PV} - usr/lib32/opengl/nvidia/lib/libGLcore.so.${PV} - usr/lib32/opengl/nvidia/extensions/libglx.so" - -export _POSIX2_VERSION="199209" - -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}/usr/src/nv" - -# On BSD userland it wants real make command -MAKE="make" - -mtrr_check() { - ebegin "Checking for MTRR support" - linux_chkconfig_present MTRR - eend $? - - if [[ $? -ne 0 ]] ; then - eerror "This version needs MTRR support for most chipsets!" - eerror "Please enable MTRR support in your kernel config, found at:" - eerror - eerror " Processor type and features" - eerror " [*] MTRR (Memory Type Range Register) support" - eerror - eerror "and recompile your kernel ..." - die "MTRR support not detected!" - fi -} - -pkg_setup() { - if use amd64 && has_multilib_profile && [ "${DEFAULT_ABI}" != "amd64" ]; then - eerror "This ebuild doesn't currently support changing your default abi." - die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}" - fi - - linux-mod_pkg_setup - MODULE_NAMES="nvidia(video:${S})" - BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} SYSOUT=${KV_OUT_DIR}" - mtrr_check -} - -src_unpack() { - local NV_PATCH_PREFIX="${FILESDIR}/${PV}/NVIDIA-${PV}" - - if [[ ${KV_MINOR} -eq 6 && ${KV_PATCH} -lt 7 ]] ; then - echo - ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}" - ewarn "This is not officially supported for ${P}. It is likely you" - ewarn "will not be able to compile or use the kernel module." - ewarn "It is recommended that you upgrade your kernel to a version >= 2.6.7" - echo - ewarn "DO NOT file bug reports for kernel versions less than 2.6.7 as they will be ignored." - fi - - cd ${WORKDIR} - bash ${DISTDIR}/${NV_PACKAGE}${PKG_V}.run --extract-only - - # Patchs go below here, add breif description - cd ${WORKDIR}/${NV_PACKAGE}${PKG_V} - # Use the correct defines to make gtkglext build work - epatch ${FILESDIR}/NVIDIA_glx-defines.patch - # Use some more sensible gl headers and make way for new glext.h - epatch ${FILESDIR}/NVIDIA_glx-glheader.patch - - # Quiet down warnings the user do not need to see - sed -i \ - -e 's:-Wpointer-arith::g' \ - -e 's:-Wsign-compare::g' \ - ${S}/Makefile.kbuild - - # If you set this then it's your own fault when stuff breaks :) - [[ -n ${USE_CRAZY_OPTS} ]] && sed -i "s:-O:${CFLAGS}:" Makefile.* - - # If greater than 2.6.5 use M= instead of SUBDIR= - cd ${S}; convert_to_m Makefile.kbuild - - # Patch for kernel 2.6.19 from Daniel Drake <dsd@gentoo.org> - epatch ${FILESDIR}/NVIDIA_kernel-2.6.19.patch -} - -src_compile() { - linux-mod_src_compile -} - -src_install() { - local MLTEST=$(type dyn_unpack) - - cd ${WORKDIR}/${NV_PACKAGE}${PKG_V} - - linux-mod_src_install - - # Add the aliases - sed -e 's:\${PACKAGE}:'${PF}':g' ${FILESDIR}/nvidia > ${WORKDIR}/nvidia - insinto /etc/modules.d - newins ${WORKDIR}/nvidia nvidia - - if [[ "${MLTEST/set_abi}" == "${MLTEST}" ]] && has_multilib_profile ; then - local OABI=${ABI} - for ABI in $(get_install_abis) ; do - src_install-libs - done - ABI=${OABI} - unset OABI - elif use amd64 ; then - src_install-libs lib32 $(get_multilibdir) - src_install-libs lib $(get_libdir) - - rm -rf ${D}/usr/$(get_multilibdir)/opengl/nvidia/include - rm -rf ${D}/usr/$(get_multilibdir)/opengl/nvidia/extensions - else - src_install-libs - fi - - is_final_abi || return 0 - - # Docs, remove nvidia-settings as provided by media-video/nvidia-settings - dodoc usr/share/doc/README - dodoc usr/share/doc/NVIDIA_Changelog - dodoc usr/share/doc/XF86Config.sample - dohtml usr/share/doc/html/* - - # nVidia want bug reports using this script - exeinto /usr/bin - doexe usr/bin/nvidia-bug-report.sh -} - -# Install nvidia library: -# the first parameter is the place where to install it -# the second paramis the base name of the library -# the third parameter is the provided soversion -donvidia() { - dodir $1 - exeinto $1 - - libname=$(basename $2) - - doexe $2.$3 - dosym ${libname}.$3 $1/${libname} - - [[ $3 != "1" ]] && dosym ${libname}.$3 $1/${libname}.1 -} - -src_install-libs() { - local pkglibdir=lib - local inslibdir=$(get_libdir) - - if [[ ${#} -eq 2 ]] ; then - pkglibdir=${1} - inslibdir=${2} - elif has_multilib_profile && [[ ${ABI} == "x86" ]] ; then - pkglibdir=lib32 - fi - - local usrpkglibdir=usr/${pkglibdir} - local libdir=usr/X11R6/${pkglibdir} - local drvdir=${libdir}/modules/drivers - local extdir=${libdir}/modules/extensions - local incdir=usr/include/GL - local sover=${PV} - local NV_ROOT="/usr/${inslibdir}/opengl/nvidia" - local NO_TLS_ROOT="${NV_ROOT}/no-tls" - local TLS_ROOT="${NV_ROOT}/tls" - local X11_LIB_DIR="/usr/${inslibdir}/xorg" - - if ! has_version x11-base/xorg-server ; then - X11_LIB_DIR="/usr/${inslibdir}" - fi - - # The GLX libraries - donvidia ${NV_ROOT}/lib ${usrpkglibdir}/libGL.so ${sover} - donvidia ${NV_ROOT}/lib ${usrpkglibdir}/libGLcore.so ${sover} - - dodir ${NO_TLS_ROOT} - donvidia ${NO_TLS_ROOT} ${usrpkglibdir}/libnvidia-tls.so ${sover} - - donvidia ${TLS_ROOT} ${usrpkglibdir}/tls/libnvidia-tls.so ${sover} - - if want_tls ; then - dosym ../tls/libnvidia-tls.so ${NV_ROOT}/lib - dosym ../tls/libnvidia-tls.so.1 ${NV_ROOT}/lib - dosym ../tls/libnvidia-tls.so.${sover} ${NV_ROOT}/lib - else - dosym ../no-tls/libnvidia-tls.so ${NV_ROOT}/lib - dosym ../no-tls/libnvidia-tls.so.1 ${NV_ROOT}/lib - dosym ../no-tls/libnvidia-tls.so.${sover} ${NV_ROOT}/lib - fi - - # Not sure whether installing the .la file is neccessary; - # this is adopted from the `nvidia' ebuild - local ver1=$(get_version_component_range 1) - local ver2=$(get_version_component_range 2) - local ver3=$(get_version_component_range 3) - sed -e "s:\${PV}:${PV}:" \ - -e "s:\${ver1}:${ver1}:" \ - -e "s:\${ver2}:${ver2}:" \ - -e "s:\${ver3}:${ver3}:" \ - -e "s:\${libdir}:${inslibdir}:" \ - ${FILESDIR}/libGL.la-r2 > ${D}/${NV_ROOT}/lib/libGL.la - - exeinto ${X11_LIB_DIR}/modules/drivers - - [[ -f ${drvdir}/nvidia_drv.so ]] && \ - doexe ${drvdir}/nvidia_drv.so - - insinto /usr/${inslibdir} - [[ -f ${libdir}/libXvMCNVIDIA.a ]] && \ - doins ${libdir}/libXvMCNVIDIA.a - exeinto /usr/${inslibdir} - [[ -f ${libdir}/libXvMCNVIDIA.so.${PV} ]] && \ - doexe ${libdir}/libXvMCNVIDIA.so.${PV} - - exeinto ${NV_ROOT}/extensions - [[ -f ${extdir}/libglx.so.${sover} ]] && \ - newexe ${extdir}/libglx.so.${sover} libglx.so - - # Includes - insinto ${NV_ROOT}/include - doins ${incdir}/*.h -} - -pkg_preinst() { - # Can we make up our minds ?!?!? - local NV_D=${D} - - if ! has_version x11-base/xorg-server ; then - for dir in lib lib32 lib64 ; do - if [[ -d ${NV_D}/usr/${dir}/xorg ]] ; then - mv ${NV_D}/usr/${dir}/xorg/* ${NV_D}/usr/${dir} - rmdir ${NV_D}/usr/${dir}/xorg - fi - done - fi - - # 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() { - linux-mod_pkg_postinst - - #switch to the nvidia implementation - eselect opengl set --use-old nvidia - - echo - einfo "To use the Nvidia GLX, run \"eselect opengl set nvidia\"" - echo - einfo "You may also be interested in media-video/nvidia-settings" - echo - einfo "nVidia has requested that any bug reports submitted have the" - einfo "output of /usr/bin/nvidia-bug-report.sh included." -} - -want_tls() { - # For uclibc or anything non glibc, return false - has_version sys-libs/glibc || return 1 - - # Old versions of glibc were lt/no-tls only - has_version '<sys-libs/glibc-2.3.2' && return 1 - - local valid_chost="true" - if use x86 ; then - case ${CHOST/-*} in - i486|i586|i686) ;; - *) valid_chost="false" - esac - fi - - [[ ${valid_chost} == "false" ]] && return 1 - - # If we've got nptl, we've got tls - built_with_use sys-libs/glibc nptl && return 0 - - # 2.3.5 turned off tls for linuxthreads glibc on i486 and i586 - if use x86 && has_version '>=sys-libs/glibc-2.3.5' ; then - case ${CHOST/-*} in - i486|i586) return 1 ;; - esac - fi - - # These versions built linuxthreads version to support tls, too - has_version '>=sys-libs/glibc-2.3.4.20040619-r2' && return 0 - - return 1 -} - -pkg_postrm() { - if ! use x86-fbsd; then - linux-mod_pkg_postrm - fi - eselect opengl set --use-old xorg-x11 -} |