diff options
Diffstat (limited to 'media-video/nvidia-glx')
| -rw-r--r-- | media-video/nvidia-glx/ChangeLog | 588 | ||||
| -rw-r--r-- | media-video/nvidia-glx/Manifest | 56 | ||||
| -rw-r--r-- | media-video/nvidia-glx/files/1.0.6111/NVIDIA_glx-1.0.6111-glheader.patch | 7 | ||||
| -rw-r--r-- | media-video/nvidia-glx/files/digest-nvidia-glx-1.0.7676-r1 | 1 | ||||
| -rw-r--r-- | media-video/nvidia-glx/files/libGL.la-r2 | 4 | ||||
| -rw-r--r-- | media-video/nvidia-glx/metadata.xml | 6 | ||||
| -rw-r--r-- | media-video/nvidia-glx/nvidia-glx-1.0.6111-r2.ebuild | 13 | ||||
| -rw-r--r-- | media-video/nvidia-glx/nvidia-glx-1.0.6111-r3.ebuild | 88 | ||||
| -rw-r--r-- | media-video/nvidia-glx/nvidia-glx-1.0.6629-r6.ebuild | 13 | ||||
| -rw-r--r-- | media-video/nvidia-glx/nvidia-glx-1.0.6629-r7.ebuild | 88 | ||||
| -rw-r--r-- | media-video/nvidia-glx/nvidia-glx-1.0.7167-r2.ebuild | 11 | ||||
| -rw-r--r-- | media-video/nvidia-glx/nvidia-glx-1.0.7167-r3.ebuild | 55 | ||||
| -rw-r--r-- | media-video/nvidia-glx/nvidia-glx-1.0.7174-r5.ebuild | 53 | ||||
| -rw-r--r-- | media-video/nvidia-glx/nvidia-glx-1.0.7667-r1.ebuild | 69 | ||||
| -rw-r--r-- | media-video/nvidia-glx/nvidia-glx-1.0.7676-r1.ebuild | 211 | ||||
| -rw-r--r-- | media-video/nvidia-glx/nvidia-glx-1.0.7676-r2.ebuild | 14 |
16 files changed, 1018 insertions, 259 deletions
diff --git a/media-video/nvidia-glx/ChangeLog b/media-video/nvidia-glx/ChangeLog index a65d0a76c0b8..918b5e7e8718 100644 --- a/media-video/nvidia-glx/ChangeLog +++ b/media-video/nvidia-glx/ChangeLog @@ -1,6 +1,588 @@ -# ChangeLog for media-video/nvidia-glx -# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL -# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/ChangeLog,v 1.1 2002/02/11 04:43:00 drobbins Exp $ +# ChangeLog for media-video/nvidia-glx +# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/ChangeLog,v 1.1.1.1 2005/11/30 09:57:16 chriswhite Exp $ + +*nvidia-glx-1.0.7676-r2 (11 Nov 2005) + + 11 Nov 2005; Martin Schlemmer <azarah@gentoo.org> + +nvidia-glx-1.0.7676-r2.ebuild: + Use $IMAGE in pkg_preinst() if $D not set. Possible fix for bug #82595. + + 28 Oct 2005; Diego Pettenò <flameeyes@gentoo.org> + nvidia-glx-1.0.7676-r1.ebuild: + Added support for FreeBSD drivers as per bug #102274. + + 05 Sep 2005; Jeremy Huddleston <eradicator@gentoo.org> + nvidia-glx-1.0.6111-r3.ebuild, nvidia-glx-1.0.6629-r7.ebuild, + nvidia-glx-1.0.7167-r3.ebuild, nvidia-glx-1.0.7174-r5.ebuild, + nvidia-glx-1.0.7667-r1.ebuild, nvidia-glx-1.0.7676-r1.ebuild: + Cleaned up for modular X. Pushed the install directory choice from + src_install to pkg_preinst since it will depend on the system being + installed on rather than the system building the package. + +*nvidia-glx-1.0.7676-r1 (23 Aug 2005) +*nvidia-glx-1.0.7667-r1 (23 Aug 2005) +*nvidia-glx-1.0.7174-r5 (23 Aug 2005) +*nvidia-glx-1.0.7167-r3 (23 Aug 2005) +*nvidia-glx-1.0.6629-r7 (23 Aug 2005) +*nvidia-glx-1.0.6111-r3 (23 Aug 2005) + + 23 Aug 2005; Jeremy Huddleston <eradicator@gentoo.org> + +nvidia-glx-1.0.6111-r3.ebuild, +nvidia-glx-1.0.6629-r7.ebuild, + +nvidia-glx-1.0.7167-r3.ebuild, -nvidia-glx-1.0.7174-r4.ebuild, + +nvidia-glx-1.0.7174-r5.ebuild, -nvidia-glx-1.0.7667.ebuild, + +nvidia-glx-1.0.7667-r1.ebuild, -nvidia-glx-1.0.7676.ebuild, + +nvidia-glx-1.0.7676-r1.ebuild: + Revbumps to use the new opengl eselect module instead of opengl-update. + +*nvidia-glx-1.0.7676 (15 Aug 2005) + + 15 Aug 2005; <augustus@gentoo.org> +nvidia-glx-1.0.7676.ebuild: + NVIDIA version bump. + + 20 Jul 2005; Jeremy Huddleston <eradicator@gentoo.org> -files/libGL.la, + -nvidia-glx-1.0.6111-r1.ebuild, nvidia-glx-1.0.6111-r2.ebuild, + -nvidia-glx-1.0.6629-r1.ebuild, -nvidia-glx-1.0.6629-r5.ebuild, + nvidia-glx-1.0.6629-r6.ebuild, nvidia-glx-1.0.7167-r2.ebuild, + nvidia-glx-1.0.7174-r4.ebuild, -nvidia-glx-1.0.7664.ebuild, + nvidia-glx-1.0.7667.ebuild: + Removing old versions. Fixing want_tls to work with 2.3.5 on CHOST=i486 and + i586. + +*nvidia-glx-1.0.7667 (07 Jul 2005) + + 07 Jul 2005; <augustus@gentoo.org> nvidia-glx-1.0.7664.ebuild, + +nvidia-glx-1.0.7667.ebuild: + Fixes for the following bugs: bug #91101, bug #96514, bug #96885, bug #97768. + The fixes to these have been added to version 1.0.7664 and 1.0.7667 of the + driver. + +*nvidia-glx-1.0.7664 (03 Jun 2005) + + 03 Jun 2005; <augustus@gentoo.org> +nvidia-glx-1.0.7664.ebuild: + Initial checkin of NVIDIA 7664 release. Not complete but this should work for + those on the bleeding edge. + + 16 May 2005; Jeremy Huddleston <eradicator@gentoo.org> + nvidia-glx-1.0.6629-r6.ebuild: + Stable amd64, x86. + +*nvidia-glx-1.0.6111-r2 (05 May 2005) + + 05 May 2005; Jeremy Huddleston <eradicator@gentoo.org> + +nvidia-glx-1.0.6111-r2.ebuild: + Added an opengl-update-2.2 version of nvidia-glx-1.0.6111 by request. + +*nvidia-glx-1.0.7167-r2 (04 May 2005) +*nvidia-glx-1.0.6629-r6 (04 May 2005) + + 04 May 2005; Jeremy Huddleston <eradicator@gentoo.org> + nvidia-glx-1.0.6111-r1.ebuild, nvidia-glx-1.0.6629-r1.ebuild, + nvidia-glx-1.0.6629-r5.ebuild, +nvidia-glx-1.0.6629-r6.ebuild, + -nvidia-glx-1.0.7167-r1.ebuild, +nvidia-glx-1.0.7167-r2.ebuild, + -nvidia-glx-1.0.7174-r1.ebuild: + Added opengl-update-2.2 versions of 6629 and 7167. Fixed opengl-update + dependencies for older ebuilds to close bug #90922. + +*nvidia-glx-1.0.7174-r4 (02 May 2005) + + 02 May 2005; Jeremy Huddleston <eradicator@gentoo.org> + -nvidia-glx-1.0.7174-r3.ebuild, +nvidia-glx-1.0.7174-r4.ebuild: + Don't use tls enabled lib when the user has CHOST=i386 USE=nptl since they + really DON'T have nptl. Bug #91137. + +*nvidia-glx-1.0.7174-r3 (27 Apr 2005) + + 27 Apr 2005; Jeremy Huddleston <eradicator@gentoo.org> + -nvidia-glx-1.0.7174-r2.ebuild, +nvidia-glx-1.0.7174-r3.ebuild: + Fix for bug #90047. We check if glibc was built with --with-tls and install + the correct libnvidia-tls.so. + + 26 Apr 2005; Jeremy Huddleston <eradicator@gentoo.org> + nvidia-glx-1.0.7174-r2.ebuild: + Make sure we have a valid opengl implementation when uninstalling. Closes + bug #55142. + +*nvidia-glx-1.0.7174-r2 (26 Apr 2005) + + 26 Apr 2005; Jeremy Huddleston <eradicator@gentoo.org> + +nvidia-glx-1.0.7174-r2.ebuild: + Hopefully solve bug #90047 which causes havoc with different + nptl/linuxthreads/tls configurations. + + 25 Apr 2005; Donnie Berkholz <spyderous@gentoo.org>; metadata.xml: + Update maintainer to x11-drivers. + + 02 Apr 2005; Martin Schlemmer <azarah@gentoo.org> + nvidia-glx-1.0.7174-r1.ebuild: + Revert x86 to pkg0 to not use two packages for x86, and the smaller one at + that, to stop getting bug reports on that. + +*nvidia-glx-1.0.7174-r1 (02 Apr 2005) + + 02 Apr 2005; Jeremy Huddleston <eradicator@gentoo.org> + -nvidia-glx-1.0.7174.ebuild, +nvidia-glx-1.0.7174-r1.ebuild: + Go back to the proper packages so we get the 32bit libs on amd64. + + 01 Apr 2005; Jeremy Huddleston <eradicator@gentoo.org> + nvidia-glx-1.0.6629-r5.ebuild: + Stable amd64 for multilib fixups in 2005.0. + +*nvidia-glx-1.0.7174 (01 Apr 2005) + + 01 Apr 2005; Martin Schlemmer <azarah@gentoo.org> + +nvidia-glx-1.0.7174.ebuild: + Update version. + +*nvidia-glx-1.0.7167-r1 (11 Mar 2005) + + 11 Mar 2005; Jeremy Huddleston <eradicator@gentoo.org> + +nvidia-glx-1.0.7167-r1.ebuild, nvidia-glx-1.0.7167.ebuild: + Fix installation on amd64 2005.0. + +*nvidia-glx-1.0.7167 (11 Mar 2005) + + 11 Mar 2005; Martin Schlemmer <azarah@gentoo.org> + +nvidia-glx-1.0.7167.ebuild: + Update version. Add new dlloader module for supported Xorg. + + 09 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org> -files/libGL.la-r1, + files/libGL.la-r2, nvidia-glx-1.0.6629-r5.ebuild: + Remove X11R6 in .la so dependency_libs just uses /usr/lib. + +*nvidia-glx-1.0.6629-r5 (09 Feb 2005) + + 09 Feb 2005; Martin Schlemmer <azarah@gentoo.org> +files/libGL.la-r2, + +nvidia-glx-1.0.6629-r5.ebuild: + Fix libGL.la borkage (wrong paths in dependency_libs). + +*nvidia-glx-1.0.6111-r1 (29 Jan 2005) + + 29 Jan 2005; Andrew Bevitt <cyfred@gentoo.org> + +nvidia-glx-1.0.6111-r1.ebuild, -nvidia-glx-1.0.6111.ebuild: + Updating 6111 to work with >=xorg-x11-6.8.0-r4 + + 25 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org> + nvidia-glx-1.0.6629-r4.ebuild: + Add some testing so error messages (which were safe to ignore) don't display + and confuse the user. + +*nvidia-glx-1.0.6629-r4 (24 Jan 2005) + + 24 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org> files/libGL.la-r1, + -nvidia-glx-1.0.6629-r3.ebuild, +nvidia-glx-1.0.6629-r4.ebuild: + Fix the proper libdir in the .la. Cleaning out older versions. + + 21 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org> +files/libGL.la-r1, + nvidia-glx-1.0.6629-r3.ebuild: + Install .la file for each ABI. + + 20 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org> + nvidia-glx-1.0.6629-r3.ebuild: + Added a keepdir /usr/<libdir>/tls since some opengl-updates don't make it. + +*nvidia-glx-1.0.6629-r3 (20 Jan 2005) + + 20 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org> + -nvidia-glx-1.0.6629-r2.ebuild, +nvidia-glx-1.0.6629-r3.ebuild: + Make new revision install both 32bit and 64bit versions on 2004.3 to make + games herd QA hapy. Forcing revbump to make sure 2004.3 users get updated + correctly. + + 20 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org> + nvidia-glx-1.0.6629-r2.ebuild: + Stable amd64 for 2005.0. + +*nvidia-glx-1.0.6629-r2 (17 Jan 2005) + + 17 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org> + +nvidia-glx-1.0.6629-r2.ebuild: + Revision bumping to support amd64's 2005.0. Now installs both 32bit and + 64bit libs on that profile. + + 17 Jan 2005; Andrew Bevitt <cyfred@gentoo.org> + nvidia-glx-1.0.6629-r1.ebuild, -nvidia-glx-1.0.6629.ebuild: + Marking 6629 stable across archs + + 10 Jan 2005; Jason Huebel <jhuebel@gentoo.org> + nvidia-glx-1.0.6629-r1.ebuild: + stable on amd64 + +*nvidia-glx-1.0.6629-r1 (31 Dec 2004) + + 31 Dec 2004; Andrew Bevitt <cyfred@gentoo.org> + +nvidia-glx-1.0.6629-r1.ebuild: + Changing driver and lib install location to be detected depending on + xorg-x11 version. + + 30 Nov 2004; Andrew Bevitt <cyfred@gentoo.org> -files/README.gentoo, + +files/libGL.la, -files/libGL.la.2, + -files/nvidia-glx-1.0.4363-defines.patch, + -files/nvidia-glx-1.0.4496-defines.patch, + -files/nvidia-glx-1.0.4499-defines.patch, + -files/nvidia-glx-1.0.5328-defines.patch, + -files/nvidia-glx-1.0.5328-glheader.patch, + -files/nvidia-glx-1.0.5332-glheader.patch, + -files/nvidia-glx-1.0.5336-glheader.patch, + -files/1.0.6106/NVIDIA_glx-1.0.6106-defines.patch, + -files/1.0.6106/NVIDIA_glx-1.0.6106-glheader.patch, + -files/1.0.6106/NVIDIA_glx-1.0.6106-makefile.patch, + -nvidia-glx-1.0.4363-r1.ebuild, -nvidia-glx-1.0.4496-r2.ebuild, + -nvidia-glx-1.0.4499-r1.ebuild, -nvidia-glx-1.0.5328-r2.ebuild, + -nvidia-glx-1.0.5332-r2.ebuild, -nvidia-glx-1.0.5336-r2.ebuild, + -nvidia-glx-1.0.6106-r3.ebuild, nvidia-glx-1.0.6111.ebuild, + nvidia-glx-1.0.6629.ebuild: + Removing all masked (deprecated) versions to match the nvidia-kernel removal. + + 10 Nov 2004; Andrew Bevitt <cyfred@gentoo.org> + +files/1.0.6629/NVIDIA_glx-1.0.6629-defines.patch, + +files/1.0.6629/NVIDIA_glx-1.0.6629-glheader.patch, + +files/1.0.6629/NVIDIA_glx-1.0.6629-makefile.patch, + nvidia-glx-1.0.6629.ebuild: + Porting across GL patches for consistency, it was necessary in the end. + + 10 Nov 2004; Andrew Bevitt <cyfred@gentoo.org> nvidia-glx-1.0.6629.ebuild: + Changing to error on xfree install, as opposed to dieing + + 07 Nov 2004; Andrew Bevitt <cyfred@gentoo.org> + nvidia-glx-1.0.4363-r1.ebuild, nvidia-glx-1.0.4496-r2.ebuild, + nvidia-glx-1.0.4499-r1.ebuild, nvidia-glx-1.0.5328-r2.ebuild, + nvidia-glx-1.0.5332-r2.ebuild, nvidia-glx-1.0.5336-r2.ebuild, + nvidia-glx-1.0.6106-r3.ebuild: + Keywords masking as driver/glx being deprecated. + +*nvidia-glx-1.0.6629 (07 Nov 2004) + + 07 Nov 2004; Andrew Bevitt <cyfred@gentoo.org> nvidia-glx-1.0.6111.ebuild, + +nvidia-glx-1.0.6629.ebuild: + New version 1.0.6629! Also marking 1.0.6111-r3 stable to bring things up to + speed with nvidia-kernel. + + 05 Sep 2004; Travis Tilley <lv@gentoo.org> nvidia-glx-1.0.6111.ebuild: + stable on amd64 + + 05 Sep 2004; Sven Wegener <swegener@gentoo.org> : + Fixed ChangeLog header. + + 30 Aug 2004; Andrew Bevitt <cyfred@gentoo.org>; + files/1.0.6111/NVIDIA_glx-1.0.6111-glheader.patch: + Update for proper glext.h inclusion + + 16 Aug 2004; Andrew Bevitt <cyfred@gentoo.org>; + nvidia-glx-1.0.5328-r2.ebuild, nvidia-glx-1.0.5336-r2.ebuild: + Marking up to and including 5336 stable to support newer nvidia cards, eg + FX5700. + +*nvidia-glx-1.0.6111 (06 Aug 2004) + + 06 Aug 2004; Andrew Bevitt <cyfred@gentoo.org>; + +files/1.0.6111/NVIDIA_glx-1.0.6111-defines.patch, + +files/1.0.6111/NVIDIA_glx-1.0.6111-glheader.patch, + +files/1.0.6111/NVIDIA_glx-1.0.6111-makefile.patch, + +nvidia-glx-1.0.6111.ebuild: + Version bump for 6111; nVidia haven't changed their GL headers in this release + so still applying the patches + +*nvidia-glx-1.0.4499-r1 (19 Jul 2004) + + 19 Jul 2004; Andrew Bevitt <cyfred@gentoo.org>; -files/libGL.la.1, + +nvidia-glx-1.0.4363-r1.ebuild, -nvidia-glx-1.0.4363.ebuild, + -nvidia-glx-1.0.4496-r1.ebuild, +nvidia-glx-1.0.4496-r2.ebuild, + -nvidia-glx-1.0.4496.ebuild, +nvidia-glx-1.0.4499-r1.ebuild, + -nvidia-glx-1.0.4499.ebuild, -nvidia-glx-1.0.5328-r1.ebuild, + +nvidia-glx-1.0.5328-r2.ebuild: + Moving all versions over to use proper libGL.la file, removing all versions + that do not use the correct file, and removing the incorrect file; this should + fix pygtk et al bugs. + + 18 Jul 2004; Travis Tilley <lv@gentoo.org> nvidia-glx-1.0.6106-r3.ebuild: + marking stable since our last stable nvidia-glx was just deleted + +*nvidia-glx-1.0.6106-r3 (18 Jul 2004) + + 18 Jul 2004; Andrew Bevitt <cyfred@gentoo.org>; + -nvidia-glx-1.0.6106-r1.ebuild, -nvidia-glx-1.0.6106-r2.ebuild, + +nvidia-glx-1.0.6106-r3.ebuild, -nvidia-glx-1.0.6106.ebuild: + Taking Azarahs' advice, making /usr/lib/tls into a directory and creating + symlinks under it.. Changing opengl-update-1.8.1 to account for this thank + fully links are easier to remove than directories, this will be a transparent + update + +*nvidia-glx-1.0.6106-r2 (18 Jul 2004) + + 18 Jul 2004; Martin Schlemmer <azarah@gentoo.org> + +nvidia-glx-1.0.6106-r2.ebuild: + The /usr/lib/tls dir changed to a symlink - handle it carefully. Personally I + think it would have been better to leave it a dir, and manage the specific + opengl libs as symlinks, as you never know what future may bring ... + +*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 + this release seems to be rock solid. marking stable on amd64 + +*nvidia-glx-1.0.6106 (02 Jul 2004) + + 02 Jul 2004; Andrew Bevitt <cyfred@gentoo.org>; metadata.xml, + +files/1.0.6106/NVIDIA_glx-1.0.6106-defines.patch, + +files/1.0.6106/NVIDIA_glx-1.0.6106-makefile.patch, + +nvidia-glx-1.0.6106.ebuild: + Version bumping to 6106. Thanks to everyone on bug #55714 for testing and + suggesting improvements. Please note the new + app-emulation/emul-linux-x86-nvidia package for 32 bit compatibility on amd64. + + 01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> + nvidia-glx-1.0.4363.ebuild, nvidia-glx-1.0.4496-r1.ebuild, + nvidia-glx-1.0.4496.ebuild, nvidia-glx-1.0.4499.ebuild, + nvidia-glx-1.0.5328-r1.ebuild, nvidia-glx-1.0.5332-r2.ebuild, + nvidia-glx-1.0.5336-r2.ebuild: + virtual/glibc -> virtual/libc + + 10 May 2004; Andrew Bevitt <cyfred@gentoo.org>; + -nvidia-glx-1.0.5332-r1.ebuild: + Removing a duplicate build version + + 06 May 2004; Andrew Bevitt <cyfred@gentoo.org>; + +files/nvidia-glx-1.0.4363-defines.patch, nvidia-glx-1.0.4363.ebuild: + Reintroducing patchset for 4363 which was removed a while ago because of + version name conflicts. + + 27 Apr 2004; Aron Griffis <agriffis@gentoo.org> nvidia-glx-1.0.4363.ebuild, + nvidia-glx-1.0.4496-r1.ebuild, nvidia-glx-1.0.4496.ebuild, + nvidia-glx-1.0.4499.ebuild, nvidia-glx-1.0.5328-r1.ebuild, + nvidia-glx-1.0.5332-r1.ebuild, nvidia-glx-1.0.5332-r2.ebuild, + nvidia-glx-1.0.5336-r2.ebuild: + Add inherit eutils + + 19 Apr 2004; Travis Tilley <lv@gentoo.org> nvidia-glx-1.0.5332-r2.ebuild: + marking stable on amd64 to close bug #48409 + + 15 Apr 2004; <spider@gentoo.org> nvidia-glx-1.0.4363.ebuild, + nvidia-glx-1.0.4496-r1.ebuild, nvidia-glx-1.0.4496.ebuild, + nvidia-glx-1.0.4499.ebuild, nvidia-glx-1.0.5328-r1.ebuild, + nvidia-glx-1.0.5332-r1.ebuild, nvidia-glx-1.0.5332-r2.ebuild, + nvidia-glx-1.0.5336-r2.ebuild: + added export _POSIX2_VERSION="199209" to all ebuilds to work around broken + chown syntax in upstream release. This is a workaround until nvidia fixes + things. + +*nvidia-glx-1.0.4496-r1 (15 Apr 2004) + + 15 Apr 2004; <spider@gentoo.org> +nvidia-glx-1.0.4496-r1.ebuild: + adding the changes necessary to make 4496 versions interact with xorg-x11 + implementation. + + 13 May 2004; Andrew Bevitt <cyfred@gentoo.org>; + nvidia-glx-1.0.5328-r1.ebuild, nvidia-glx-1.0.5332-r2.ebuild, + nvidia-glx-1.0.5336-r2.ebuild, files/nvidia-glx-1.0.4180-defines.patch, + files/nvidia-glx-1.0.4191-defines.patch, + files/nvidia-glx-1.0.5328-glheader.patch, + files/nvidia-glx-1.0.5332-glheader.patch, + files/nvidia-glx-1.0.5336-glheader.patch: + Adding patchset that fixes api breakage as mentioned in bug #37517 + + 13 May 2004; Andrew Bevitt <cyfred@gentoo.org>; + nvidia-glx-1.0.5332-r2.ebuild, nvidia-glx-1.0.5336-r2.ebuild: + We are letting virtual/x11 provide glext.h, removing its install, see bug + #37517 + + 13 May 2004; Andrew Bevitt <cyfred@gentoo.org>; nvidia-glx-1.0.2880.ebuild, + nvidia-glx-1.0.2960-r1.ebuild, nvidia-glx-1.0.3123.ebuild, + nvidia-glx-1.0.4180.ebuild, nvidia-glx-1.0.4191-r1.ebuild, + nvidia-glx-1.0.4191.ebuild, nvidia-glx-1.0.4349.ebuild, + nvidia-glx-1.0.4496-r1.ebuild, nvidia-glx-1.0.5328.ebuild, + nvidia-glx-1.0.5332.ebuild, nvidia-glx-1.0.5336-r1.ebuild, + nvidia-glx-1.0.5336.ebuild, files/libGL.la: + Removing several of the old nvidia glx ebuilds, leaving nvidia kernel + corresponding versions and up to two for each profile. + +*nvidia-glx-1.0.5332-r2 (08 Apr 2004) + + 08 Apr 2004; Travis Tilley <lv@gentoo.org> nvidia-glx-1.0.5332-r2.ebuild: + added amd64-specific ebuild with Donnie Berkholz's xorg-x11 compatibility + update + +*nvidia-glx-1.0.5336-r2 (08 Apr 2004) + + 08 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>; + nvidia-glx-1.0.5336-r2.ebuild: + Update for xorg-x11 compatibility. + +*nvidia-glx-1.0.5336-r1 (14 Feb 2004) +*nvidia-glx-1.0.5332-r1 (14 Feb 2004) + + 14 Feb 2004; Andrew Bevitt <cyfred@gentoo.org>; + nvidia-glx-1.0.5332-r1.ebuild, nvidia-glx-1.0.5336-r1.ebuild, + files/libGL.la.2: + Updating libGL.la to correctly link the location of the opengl libraries, for + nvidia problems on bug + + 07 Feb 2004; Brad House <brad_mssw@gentoo.org> nvidia-glx-1.0.5332.ebuild: + stable on amd64 + +*nvidia-glx-1.0.5336 (01 Feb 2004) + + 01 Feb 2004; Martin Schlemmer <azarah@gentoo.org> nvidia-glx-1.0.5336.ebuild: + Update version + + 01 Feb 2004; Martin Schlemmer <azarah@gentoo.org> nvidia-glx-1.0.5332.ebuild, + files/nvidia-glx-1.0.5332-defines.patch: + Remove dup patch. + + 25 Jan 2004; Caleb Tennis <caleb@gentoo.org> nvidia-glx-1.0.5332.ebuild: + Add a warning for Qt users that GL linkage may be broken after emerging this. + +*nvidia-glx-1.0.5332 (23 Jan 2004) + + 23 Jan 2004; <augustus@gentoo.org> nvidia-glx-1.0.5332.ebuild, + files/nvidia-glx-1.0.5332-defines.patch: + New NVIDIA driver 5332 released to public. See NVIDIA's page for full details: + http://www.nvidia.com/object/linux_display_amd64_1.0-5332.html + +*nvidia-glx-1.0.5328-r1 (05 Jan 2004) + + 05 Jan 2004; Donnie Berkholz <spyderous@gentoo.org>; + nvidia-glx-1.0.5328-r1.ebuild: + Fixing TLS test for bug #36551. Thanks to Ronald Hummelink + <gentoo-bugzilla@hummelink.xs4all.nl> for the patch. + + 26 Dec 2003; Donnie Berkholz <spyderous@gentoo.org>; metadata.xml: + Adding metadata.xml. + +*nvidia-glx-1.0.5328 (26 Dec 2003) + + 26 Dec 2003; Donnie Berkholz <spyderous@gentoo.org>; + nvidia-glx-1.0.5328.ebuild, files/nvidia-glx-1.0.5328-defines.patch: + Version bump. + + 02 Nov 2003; Martin Schlemmer <azarah@gentoo.org> + nvidia-glx-1.0.4496-r1.ebuild: + Add PKG_V to make sure updating the package used will not break things again. + +*nvidia-glx-1.0.4496-r1 (02 Nov 2003) + + 02 Nov 2003; Martin Schlemmer <azarah@gentoo.org> + nvidia-glx-1.0.4496-r1.ebuild: + Update nVidia package to latest (pkg2), bug #32430. + +*nvidia-glx-1.0.4499 (15 Oct 2003) + + 15 Oct 2003; Daniel Robbins <drobbins@gentoo.org>: + nvidia-glx-1.0.4499.ebuild: New version of the ebuild for AMD64 systems. + Thanks to Kris Kersey, James Jones and others for working on this. See bug + #30799. This ebuild does need some testing; adding it so that it can be + tested. + + 20 Sep 2003; Martin Schlemmer <azarah@gentoo.org> + nvidia-glx-1.0.4496.ebuild: + Mark stable (bug #28330). + +*nvidia-glx-1.0.4496 (29 Jul 2003) + + 29 Jul 2003; Martin Schlemmer <azarah@gentoo.org> + nvidia-glx-1.0.4496.ebuild, files/nvidia-glx-1.0.4496-defines.patch: + New version. + +*nvidia-glx-1.0.4180 (18 Jul 2003) + + 18 Jul 2003; Olivier Crete <tester@gentoo.org> nvidia-glx-1.0.4180.ebuild, + files/nvidia-glx-1.0.4180-defines.patch: + Added amd64 version of the driver + + 22 Jun 2003; Martin Schlemmer <azarah@gentoo.org> + nvidia-glx-1.0.4363.ebuild: + Mark stable for x86. + +*nvidia-glx-1.0.4363 (26 Apr 2003) + + 26 Apr 2003; Martin Schlemmer <azarah@gentoo.org> nvidia-glx-1.0.4363.ebuild : + Update version. + +*nvidia-glx-1.0.4349 (21 Apr 2003) + + 21 Apr 2003; Jay Pfeifer <pfeifer@gentoo.org> nvidia-glx-1.0.4349.ebuild : + Moved from ~x86 to stable. + + 30 Mar 2003; Martin Schlemmer <azarah@gentoo.org> nvidia-glx-1.0.4349.ebuild : + New version, closing bug #18541. + +*nvidia-glx-1.0.4191-r1 (13 Feb 2003) + + 12 Jul 2003; Daniel Ahlberg <aliz@gentoo.org> : + Added missing changelog entry. + +*nvidia-glx-1.0.4191 (31 Jan 2003) + + 31 Jan 2003; foser <foser@gentoo.org> nvidia-glx-1.0.4191.ebuild : + Added 2 header file patches + + 11 Dec 2002; Martin Schlemmer <azarah@gentoo.org> nvidia-glx-1.0.4191.ebuild : + Add '-alpha' to KEYWORDS. + +*nvidia-glx-1.0.4191 (11 Dec 2002) + + 11 Dec 2002; Brandon Low <lostlogic@gentoo.org>: + New version thanks Nvidia. :) + + 06 Dec 2002; Rodney Rees <manson@gentoo.org>: + Changed sparc ~sparc keywords + + 14 Sep 2002; Martin Schlemmer <azarah@gentoo.org>: + Remove ftp from SRC_URI, as it seems to give problems to some people. + +*nvidia-glx-1.0.3123 (12 Sep 2002) + + 12 Sep 2002; Martin Schlemmer <azarah@gentoo.org>: + Update version. + + 8 Sep 2002; Martin Schlemmer <azarah@gentoo.org> nvidia-glx-1.0.2960-r1.ebuild : + + Add opengl-update to DEPEND. + +*nvidia-glx-1.0.2960-r1 (26 May 2002) + + 26 May 2002; Martin Schlemmer <azarah@gentoo.org> nvidia-glx-1.0.2960-r1.ebuild : + + Install the new dynamic XvMC library "libXvMCNVIDIA_dynamic.so" as well. + +*nvidia-glx-1.0.2960 (26 May 2002) + +*nvidia-glx-1.0.2313-r2 (12 Apr 2002) + + 12 Apr 2002; Daniel Robbins <drobbins@gentoo.org>: New rev of an older + ebuild to fix stripping problems. + + 7 Apr 2002; M.Schlemmer <azarah@gentoo.org> nvidia-glx-1.0.2880.ebuild : + + Nuke /etc/env.d/09nvidia if it exists, else we get problems. + +*nvidia-glx-1.0.2880 (7 Apr 2002) + + 7 Apr 2002; M.Schlemmer <azarah@gentoo.org> nvidia-glx-1.0.2880.ebuild : + + Moved back to /usr to fix various problems we had. Update for dinamic + OpenGL switching. + +*nvidia-glx-1.0.2802-r2 (07 Mar 2002) + + 14 Mar 2002; Grant Goodyear <g2boojum@gentoo.org>: + + Make sure symbols aren't stripped. + +*nvidia-glx-1.0.2802 (07 Mar 2002) + + 07 Mar 2002; Arcady Genkin <agenkin@thpoon.com>: + Adds libXvMCNVIDIA.a, plus a minor rewrite. + + 07 Mar 2002; Daniel Robbins <drobbins@gentoo.org>: new release and a new NV_V + variable to hold the NVIDIA-style version number (simplifies rolling new + releases.) *nvidia-glx-1.0.2313-r1 (10 Feb 2002) diff --git a/media-video/nvidia-glx/Manifest b/media-video/nvidia-glx/Manifest index d8f0364c7fdc..75c86a5a90f3 100644 --- a/media-video/nvidia-glx/Manifest +++ b/media-video/nvidia-glx/Manifest @@ -1,18 +1,40 @@ -MD5 6fb16aeff7ad833f3ac2027cd268221b nvidia-glx-1.0.4349.ebuild 3162 -MD5 bf9e94e04d62c167baface9cbd58be34 nvidia-glx-1.0.4191-r1.ebuild 2801 -MD5 234657b19a6d19a6981c4aab1ad09fcf nvidia-glx-1.0.3123.ebuild 2658 -MD5 e38d931344afe435a5c06b419d1a64c8 nvidia-glx-1.0.2960-r1.ebuild 2721 -MD5 8b0b8ebf993ec078f34e39fb0a0cfbba nvidia-glx-1.0.4191.ebuild 2665 -MD5 df731a6e32dcbdc8ba416add3d11c15b nvidia-glx-1.0.2880.ebuild 2679 -MD5 feeb34c86d3ef64d45d767daea1c05cb ChangeLog 2766 -MD5 cea66cc5b458a313a9ac72b56e32e10b files/README.gentoo 200 -MD5 fda10e01c37b4518535e3b258be78fa5 files/libGL.la.1 747 -MD5 d95d0e66acb41538e6faace158d2ac21 files/digest-nvidia-glx-1.0.2960-r1 72 -MD5 db715a5b58ba38f9d757cf6be06778e7 files/digest-nvidia-glx-1.0.2880 72 -MD5 fe071363bf9a87e17f14273a23a2192d files/digest-nvidia-glx-1.0.3123 72 -MD5 feb67e9281b725c30e7a45327532267f files/digest-nvidia-glx-1.0.4191 72 -MD5 8b34536317191f4059bebe95beabe1a4 files/digest-nvidia-glx-1.0.4349 72 -MD5 feb67e9281b725c30e7a45327532267f files/digest-nvidia-glx-1.0.4191-r1 72 -MD5 cac348587b9f365512957ab034c2eed2 files/libGL.la 740 -MD5 8bbb4aceec8380bff8456f2e7a824580 files/nvidia-glx-1.0.4191-defines.patch 906 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +MD5 289c3b593d8454bf260834f8d1124b54 ChangeLog 22540 MD5 c3afc69f917a783ebd53cf2de38065dc files/09nvidia 61 +MD5 3d8b3ecb3827e2e3a9a45ac6c3210a0a files/1.0.6111/NVIDIA_glx-1.0.6111-defines.patch 437 +MD5 32901fb95c4fdc6cfa6b762498240b3c files/1.0.6111/NVIDIA_glx-1.0.6111-glheader.patch 380 +MD5 6f55327ce020f7ed0d433ea99dacb315 files/1.0.6111/NVIDIA_glx-1.0.6111-makefile.patch 593 +MD5 3d8b3ecb3827e2e3a9a45ac6c3210a0a files/1.0.6629/NVIDIA_glx-1.0.6629-defines.patch 437 +MD5 32901fb95c4fdc6cfa6b762498240b3c files/1.0.6629/NVIDIA_glx-1.0.6629-glheader.patch 380 +MD5 f6f00d8e915e18f456ad615b4ebd8a21 files/1.0.6629/NVIDIA_glx-1.0.6629-makefile.patch 602 +MD5 ed1e098d85579c75542ef0a49ee4dd5c files/digest-nvidia-glx-1.0.6111-r2 163 +MD5 ed1e098d85579c75542ef0a49ee4dd5c files/digest-nvidia-glx-1.0.6111-r3 163 +MD5 8a4687b0fc3e7cc0b36c247697d94701 files/digest-nvidia-glx-1.0.6629-r6 163 +MD5 8a4687b0fc3e7cc0b36c247697d94701 files/digest-nvidia-glx-1.0.6629-r7 163 +MD5 97b3ec5488fb7f7f6cdde31ee42e45af files/digest-nvidia-glx-1.0.7167-r2 163 +MD5 97b3ec5488fb7f7f6cdde31ee42e45af files/digest-nvidia-glx-1.0.7167-r3 163 +MD5 61c3ebdd8604c971bf969ea03040d170 files/digest-nvidia-glx-1.0.7174-r5 163 +MD5 ef2c4ecedb45b67d79b43ffe58c660cf files/digest-nvidia-glx-1.0.7667-r1 163 +MD5 b23efa632026470bcf33c50fdef740ae files/digest-nvidia-glx-1.0.7676-r1 243 +MD5 b23efa632026470bcf33c50fdef740ae files/digest-nvidia-glx-1.0.7676-r2 243 +MD5 6e47667cc38d8ce4ac2f4c7dbb392abe files/libGL.la-r2 751 +MD5 e06e73d71a54036f83abf35efc6322e3 metadata.xml 302 +MD5 84d76e7e47009583e937b217a139924a nvidia-glx-1.0.6111-r2.ebuild 7643 +MD5 0dcb2c58ba0b70572910592479733275 nvidia-glx-1.0.6111-r3.ebuild 8284 +MD5 d146a360883f212b328c4f0f0922d310 nvidia-glx-1.0.6629-r6.ebuild 7643 +MD5 ba8fa1cac9d24046dc6384ad2882356b nvidia-glx-1.0.6629-r7.ebuild 8284 +MD5 6ca7c051a89c2afafcef2bf3befa6b44 nvidia-glx-1.0.7167-r2.ebuild 7863 +MD5 18ddb38a7595329ad585c74ee979ffaf nvidia-glx-1.0.7167-r3.ebuild 8284 +MD5 630dc45be727342243d06af61e06d6dd nvidia-glx-1.0.7174-r5.ebuild 8446 +MD5 413c2a51514bb61b54b1c9f3ae2e6463 nvidia-glx-1.0.7667-r1.ebuild 8446 +MD5 226c3e5fe5d6e5be93b0a3937e563c06 nvidia-glx-1.0.7676-r1.ebuild 9204 +MD5 a41f37198145f27b1bd3f674d191e0d2 nvidia-glx-1.0.7676-r2.ebuild 9287 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.2 (GNU/Linux) + +iD8DBQFDdVx91ZcsMnZjRyIRAppXAJ9yxSG65Ld6bitwnirD1MxOeNmJZACfR08i +bf/YlCD9e6UelHfes2zhsOM= +=BAyr +-----END PGP SIGNATURE----- diff --git a/media-video/nvidia-glx/files/1.0.6111/NVIDIA_glx-1.0.6111-glheader.patch b/media-video/nvidia-glx/files/1.0.6111/NVIDIA_glx-1.0.6111-glheader.patch index de1c49632c58..e0393e1b9ab0 100644 --- a/media-video/nvidia-glx/files/1.0.6111/NVIDIA_glx-1.0.6111-glheader.patch +++ b/media-video/nvidia-glx/files/1.0.6111/NVIDIA_glx-1.0.6111-glheader.patch @@ -1,14 +1,13 @@ --- 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,11 @@ +@@ -66,6 +66,10 @@ typedef double GLclampd; typedef void GLvoid; +/* Patching for some better defines in the global system */ -+#define GL_VERSION_1_2 -+#define GL_VERSION_1_3 -+#define GL_VERSION_1_4 ++#ifndef GL_GLEXT_LEGACY +#include <GL/glext.h> ++#endif /*************************************************************/ diff --git a/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.7676-r1 b/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.7676-r1 index 14f9d0f6c87b..42e8231cd30c 100644 --- a/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.7676-r1 +++ b/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.7676-r1 @@ -1,2 +1,3 @@ +MD5 6a5b99cfb2cca7b424cefc27fb6a30ce NVIDIA-FreeBSD-x86-1.0-7676.tar.gz 8455397 MD5 2474c5513006668b0fba401e042dc009 NVIDIA-Linux-x86-1.0-7676-pkg0.run 5631274 MD5 df2081504b609aaa95ccc8e95aebfb97 NVIDIA-Linux-x86_64-1.0-7676-pkg2.run 8824402 diff --git a/media-video/nvidia-glx/files/libGL.la-r2 b/media-video/nvidia-glx/files/libGL.la-r2 index 21b6562f5335..ef8d5cc56e0a 100644 --- a/media-video/nvidia-glx/files/libGL.la-r2 +++ b/media-video/nvidia-glx/files/libGL.la-r2 @@ -14,7 +14,7 @@ library_names='libGL.so.${PV} libGL.so.1 libGL.so' old_library='' # Libraries that this one depends upon. -dependency_libs=' -L/usr/X11R6/${xlibdir} -lm -lX11 -lXext -ldl ' +dependency_libs='-L/usr/${libdir} -lm -lX11 -lXext -ldl' # Version information for libGL. current=${ver1} @@ -29,4 +29,4 @@ dlopen='' dlpreopen='' # Directory that this library needs to be installed in: -libdir='${libdir}' +libdir='/usr/${libdir}/opengl/nvidia/lib' diff --git a/media-video/nvidia-glx/metadata.xml b/media-video/nvidia-glx/metadata.xml index d458318e80ba..fe629a37dbd2 100644 --- a/media-video/nvidia-glx/metadata.xml +++ b/media-video/nvidia-glx/metadata.xml @@ -1,5 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<herd>xfree</herd> +<herd>X11-drivers</herd> +<maintainer> + <email>X11-drivers@gentoo.org</email> +</maintainer> +<longdescription>NVIDIA X11 driver and GLX libraries</longdescription> </pkgmetadata> diff --git a/media-video/nvidia-glx/nvidia-glx-1.0.6111-r2.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.6111-r2.ebuild index b8c69a141005..143cb2473ff4 100644 --- a/media-video/nvidia-glx/nvidia-glx-1.0.6111-r2.ebuild +++ b/media-video/nvidia-glx/nvidia-glx-1.0.6111-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 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.6111-r2.ebuild,v 1.1 2005/05/05 23:29:24 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/nvidia-glx-1.0.6111-r2.ebuild,v 1.1.1.1 2005/11/30 09:57:16 chriswhite Exp $ inherit eutils multilib versionator @@ -13,12 +13,12 @@ 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)" + 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" +KEYWORDS="-* amd64 x86" RESTRICT="nostrip multilib-pkg-force" IUSE="" @@ -240,6 +240,13 @@ want_tls() { # 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 diff --git a/media-video/nvidia-glx/nvidia-glx-1.0.6111-r3.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.6111-r3.ebuild index df3a89fdd964..97b7039b180c 100644 --- a/media-video/nvidia-glx/nvidia-glx-1.0.6111-r3.ebuild +++ b/media-video/nvidia-glx/nvidia-glx-1.0.6111-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 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.6111-r3.ebuild,v 1.1 2005/08/23 23:32:46 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/nvidia-glx-1.0.6111-r3.ebuild,v 1.1.1.1 2005/11/30 09:57:16 chriswhite Exp $ inherit eutils multilib versionator @@ -23,11 +23,11 @@ KEYWORDS="-* ~amd64 ~x86" RESTRICT="nostrip multilib-pkg-force" IUSE="" -DEPEND="virtual/libc - virtual/x11 - app-admin/eselect-opengl - ~media-video/nvidia-kernel-${PV} - !app-emulation/emul-linux-x86-nvidia" +RDEPEND="|| ( virtual/x11 >=x11-base/xorg-server-0.99.1-r7 ) + || ( virtual/x11 media-libs/mesa ) + app-admin/eselect-opengl + ~media-video/nvidia-kernel-${PV} + !app-emulation/emul-linux-x86-nvidia" PROVIDE="virtual/opengl" export _POSIX2_VERSION="199209" @@ -59,17 +59,19 @@ pkg_setup() { } src_unpack() { + local NV_PATCH_PREFIX="${FILESDIR}/${PV}/NVIDIA_glx-${PV}" + 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 + epatch ${NV_PATCH_PREFIX//$(get_version_component_range 3)/6629}-makefile.patch # Use the correct defines to make gtkglext build work - epatch ${FILESDIR}/${PV}/NVIDIA_glx-${PV}-defines.patch + epatch ${NV_PATCH_PREFIX//$(get_version_component_range 3)/6629}-defines.patch # Use some more sensible gl headers and make way for new glext.h - epatch ${FILESDIR}/${PV}/NVIDIA_glx-${PV}-glheader.patch + epatch ${NV_PATCH_PREFIX//$(get_version_component_range 3)/6629}-glheader.patch # 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 @@ -80,14 +82,15 @@ src_unpack() { src_install() { local MLTEST=$(type dyn_unpack) - if [ "${MLTEST/set_abi}" = "${MLTEST}" ] && has_multilib_profile; then + + if [[ "${MLTEST/set_abi}" == "${MLTEST}" ]] && has_multilib_profile ; then local OABI=${ABI} - for ABI in $(get_install_abis); do + for ABI in $(get_install_abis) ; do src_install-libs done ABI=${OABI} unset OABI - elif use amd64; then + elif use amd64 ; then src_install-libs lib32 $(get_multilibdir) src_install-libs lib $(get_libdir) @@ -112,14 +115,17 @@ src_install-libs() { local pkglibdir=lib local inslibdir=$(get_libdir) - if [ ${#} -eq 2 ]; then + if [[ ${#} -eq 2 ]] ; then pkglibdir=${1} inslibdir=${2} - elif has_multilib_profile && [ "${ABI}" == "x86" ]; then + elif has_multilib_profile && [[ ${ABI} == "x86" ]] ; then pkglibdir=lib32 fi 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" # The GLX libraries exeinto ${NV_ROOT}/lib @@ -130,14 +136,12 @@ src_install-libs() { dosym libGLcore.so.${PV} ${NV_ROOT}/lib/libGLcore.so dosym libGLcore.so.${PV} ${NV_ROOT}/lib/libGLcore.so.1 - local NO_TLS_ROOT="/usr/${inslibdir}/opengl/nvidia/no-tls" dodir ${NO_TLS_ROOT} exeinto ${NO_TLS_ROOT} doexe usr/${pkglibdir}/libnvidia-tls.so.${PV} dosym libnvidia-tls.so.${PV} ${NO_TLS_ROOT}/libnvidia-tls.so dosym libnvidia-tls.so.${PV} ${NO_TLS_ROOT}/libnvidia-tls.so.1 - local TLS_ROOT="/usr/${inslibdir}/opengl/nvidia/tls" dodir ${TLS_ROOT} exeinto ${TLS_ROOT} doexe usr/${pkglibdir}/tls/libnvidia-tls.so.${PV} @@ -166,24 +170,22 @@ src_install-libs() { -e "s:\${libdir}:${inslibdir}:" \ ${FILESDIR}/libGL.la-r2 > ${D}/${NV_ROOT}/lib/libGL.la - # The X module - # Since we moved away from libs in /usr/X11R6 need to check this - if has_version ">=x11-base/xorg-x11-6.8.0-r4" ; then - local X11_LIB_DIR="/usr/$(get_libdir)" - else - local X11_LIB_DIR="/usr/X11R6/$(get_libdir)" - fi - exeinto ${X11_LIB_DIR}/modules/drivers - [ -f usr/X11R6/${pkglibdir}/modules/drivers/nvidia_drv.o ] && doexe usr/X11R6/${pkglibdir}/modules/drivers/nvidia_drv.o + [[ -f usr/X11R6/${pkglibdir}/modules/drivers/nvidia_drv.o ]] && \ + doexe usr/X11R6/${pkglibdir}/modules/drivers/nvidia_drv.o + [[ -f usr/X11R6/${pkglibdir}/modules/drivers/nvidia_drv.so ]] && \ + doexe usr/X11R6/${pkglibdir}/modules/drivers/nvidia_drv.so insinto ${X11_LIB_DIR} - [ -f usr/X11R6/${pkglibdir}/libXvMCNVIDIA.a ] && doins usr/X11R6/${pkglibdir}/libXvMCNVIDIA.a + [[ -f usr/X11R6/${pkglibdir}/libXvMCNVIDIA.a ]] && \ + doins usr/X11R6/${pkglibdir}/libXvMCNVIDIA.a exeinto ${X11_LIB_DIR} - [ -f usr/X11R6/${pkglibdir}/libXvMCNVIDIA.so.${PV} ] && doexe usr/X11R6/${pkglibdir}/libXvMCNVIDIA.so.${PV} + [[ -f usr/X11R6/${pkglibdir}/libXvMCNVIDIA.so.${PV} ]] && \ + doexe usr/X11R6/${pkglibdir}/libXvMCNVIDIA.so.${PV} exeinto ${NV_ROOT}/extensions - [ -f usr/X11R6/${pkglibdir}/modules/extensions/libglx.so.${PV} ] && newexe usr/X11R6/${pkglibdir}/modules/extensions/libglx.so.${PV} libglx.so + [[ -f usr/X11R6/${pkglibdir}/modules/extensions/libglx.so.${PV} ]] && \ + newexe usr/X11R6/${pkglibdir}/modules/extensions/libglx.so.${PV} libglx.so # Includes insinto ${NV_ROOT}/include @@ -191,22 +193,40 @@ src_install-libs() { } pkg_preinst() { + if ! has_version x11-base/xorg-server ; then + for dir in lib lib32 lib64 ; do + if [[ -d ${D}/usr/${dir}/xorg ]] ; then + mv ${D}/usr/${dir}/xorg/* ${D}/usr/${dir} + rmdir ${D}/usr/${dir}/xorg + fi + done + fi + + # The X module + # Since we moved away from libs in /usr/X11R6 need to check this + if has_version "<x11-base/xorg-x11-6.8.0-r4" || \ + has_version "x11-base/xfree86" ; then + mkdir -p ${D}/usr/X11R6 + for dir in lib lib32 lib64 ; do + [[ -d ${D}/usr/${dir} ]] && mv ${D}/usr/${dir} ${D}/usr/X11R6 + 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 + 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 + if [[ -e ${ROOT}/etc/env.d/09nvidia ]] ; then rm -f ${ROOT}/etc/env.d/09nvidia fi } pkg_postinst() { #switch to the nvidia implementation - /usr/bin/eselect opengl set nvidia + eselect opengl set --use-old nvidia echo einfo "To use the Nvidia GLX, run \"eselect opengl set nvidia\"" @@ -251,5 +271,5 @@ want_tls() { } pkg_postrm() { - /usr/bin/eselect opengl set --use-old xorg-x11 + eselect opengl set --use-old xorg-x11 } diff --git a/media-video/nvidia-glx/nvidia-glx-1.0.6629-r6.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.6629-r6.ebuild index 11d2856e7e58..045961282605 100644 --- a/media-video/nvidia-glx/nvidia-glx-1.0.6629-r6.ebuild +++ b/media-video/nvidia-glx/nvidia-glx-1.0.6629-r6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 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.6629-r6.ebuild,v 1.1 2005/05/04 21:32:06 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/nvidia-glx-1.0.6629-r6.ebuild,v 1.1.1.1 2005/11/30 09:57:17 chriswhite Exp $ inherit eutils multilib versionator @@ -13,12 +13,12 @@ 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)" + 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" +KEYWORDS="-* amd64 x86" RESTRICT="nostrip multilib-pkg-force" IUSE="" @@ -240,6 +240,13 @@ want_tls() { # 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 diff --git a/media-video/nvidia-glx/nvidia-glx-1.0.6629-r7.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.6629-r7.ebuild index 2abe2697a7a6..2078e182e75a 100644 --- a/media-video/nvidia-glx/nvidia-glx-1.0.6629-r7.ebuild +++ b/media-video/nvidia-glx/nvidia-glx-1.0.6629-r7.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 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.6629-r7.ebuild,v 1.1 2005/08/23 23:32:46 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/nvidia-glx-1.0.6629-r7.ebuild,v 1.1.1.1 2005/11/30 09:57:16 chriswhite Exp $ inherit eutils multilib versionator @@ -23,11 +23,11 @@ KEYWORDS="-* ~amd64 ~x86" RESTRICT="nostrip multilib-pkg-force" IUSE="" -DEPEND="virtual/libc - virtual/x11 - app-admin/eselect-opengl - ~media-video/nvidia-kernel-${PV} - !app-emulation/emul-linux-x86-nvidia" +RDEPEND="|| ( virtual/x11 >=x11-base/xorg-server-0.99.1-r7 ) + || ( virtual/x11 media-libs/mesa ) + app-admin/eselect-opengl + ~media-video/nvidia-kernel-${PV} + !app-emulation/emul-linux-x86-nvidia" PROVIDE="virtual/opengl" export _POSIX2_VERSION="199209" @@ -59,17 +59,19 @@ pkg_setup() { } src_unpack() { + local NV_PATCH_PREFIX="${FILESDIR}/${PV}/NVIDIA_glx-${PV}" + 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 + epatch ${NV_PATCH_PREFIX//$(get_version_component_range 3)/6629}-makefile.patch # Use the correct defines to make gtkglext build work - epatch ${FILESDIR}/${PV}/NVIDIA_glx-${PV}-defines.patch + epatch ${NV_PATCH_PREFIX//$(get_version_component_range 3)/6629}-defines.patch # Use some more sensible gl headers and make way for new glext.h - epatch ${FILESDIR}/${PV}/NVIDIA_glx-${PV}-glheader.patch + epatch ${NV_PATCH_PREFIX//$(get_version_component_range 3)/6629}-glheader.patch # 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 @@ -80,14 +82,15 @@ src_unpack() { src_install() { local MLTEST=$(type dyn_unpack) - if [ "${MLTEST/set_abi}" = "${MLTEST}" ] && has_multilib_profile; then + + if [[ "${MLTEST/set_abi}" == "${MLTEST}" ]] && has_multilib_profile ; then local OABI=${ABI} - for ABI in $(get_install_abis); do + for ABI in $(get_install_abis) ; do src_install-libs done ABI=${OABI} unset OABI - elif use amd64; then + elif use amd64 ; then src_install-libs lib32 $(get_multilibdir) src_install-libs lib $(get_libdir) @@ -112,14 +115,17 @@ src_install-libs() { local pkglibdir=lib local inslibdir=$(get_libdir) - if [ ${#} -eq 2 ]; then + if [[ ${#} -eq 2 ]] ; then pkglibdir=${1} inslibdir=${2} - elif has_multilib_profile && [ "${ABI}" == "x86" ]; then + elif has_multilib_profile && [[ ${ABI} == "x86" ]] ; then pkglibdir=lib32 fi 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" # The GLX libraries exeinto ${NV_ROOT}/lib @@ -130,14 +136,12 @@ src_install-libs() { dosym libGLcore.so.${PV} ${NV_ROOT}/lib/libGLcore.so dosym libGLcore.so.${PV} ${NV_ROOT}/lib/libGLcore.so.1 - local NO_TLS_ROOT="/usr/${inslibdir}/opengl/nvidia/no-tls" dodir ${NO_TLS_ROOT} exeinto ${NO_TLS_ROOT} doexe usr/${pkglibdir}/libnvidia-tls.so.${PV} dosym libnvidia-tls.so.${PV} ${NO_TLS_ROOT}/libnvidia-tls.so dosym libnvidia-tls.so.${PV} ${NO_TLS_ROOT}/libnvidia-tls.so.1 - local TLS_ROOT="/usr/${inslibdir}/opengl/nvidia/tls" dodir ${TLS_ROOT} exeinto ${TLS_ROOT} doexe usr/${pkglibdir}/tls/libnvidia-tls.so.${PV} @@ -166,24 +170,22 @@ src_install-libs() { -e "s:\${libdir}:${inslibdir}:" \ ${FILESDIR}/libGL.la-r2 > ${D}/${NV_ROOT}/lib/libGL.la - # The X module - # Since we moved away from libs in /usr/X11R6 need to check this - if has_version ">=x11-base/xorg-x11-6.8.0-r4" ; then - local X11_LIB_DIR="/usr/$(get_libdir)" - else - local X11_LIB_DIR="/usr/X11R6/$(get_libdir)" - fi - exeinto ${X11_LIB_DIR}/modules/drivers - [ -f usr/X11R6/${pkglibdir}/modules/drivers/nvidia_drv.o ] && doexe usr/X11R6/${pkglibdir}/modules/drivers/nvidia_drv.o + [[ -f usr/X11R6/${pkglibdir}/modules/drivers/nvidia_drv.o ]] && \ + doexe usr/X11R6/${pkglibdir}/modules/drivers/nvidia_drv.o + [[ -f usr/X11R6/${pkglibdir}/modules/drivers/nvidia_drv.so ]] && \ + doexe usr/X11R6/${pkglibdir}/modules/drivers/nvidia_drv.so insinto ${X11_LIB_DIR} - [ -f usr/X11R6/${pkglibdir}/libXvMCNVIDIA.a ] && doins usr/X11R6/${pkglibdir}/libXvMCNVIDIA.a + [[ -f usr/X11R6/${pkglibdir}/libXvMCNVIDIA.a ]] && \ + doins usr/X11R6/${pkglibdir}/libXvMCNVIDIA.a exeinto ${X11_LIB_DIR} - [ -f usr/X11R6/${pkglibdir}/libXvMCNVIDIA.so.${PV} ] && doexe usr/X11R6/${pkglibdir}/libXvMCNVIDIA.so.${PV} + [[ -f usr/X11R6/${pkglibdir}/libXvMCNVIDIA.so.${PV} ]] && \ + doexe usr/X11R6/${pkglibdir}/libXvMCNVIDIA.so.${PV} exeinto ${NV_ROOT}/extensions - [ -f usr/X11R6/${pkglibdir}/modules/extensions/libglx.so.${PV} ] && newexe usr/X11R6/${pkglibdir}/modules/extensions/libglx.so.${PV} libglx.so + [[ -f usr/X11R6/${pkglibdir}/modules/extensions/libglx.so.${PV} ]] && \ + newexe usr/X11R6/${pkglibdir}/modules/extensions/libglx.so.${PV} libglx.so # Includes insinto ${NV_ROOT}/include @@ -191,22 +193,40 @@ src_install-libs() { } pkg_preinst() { + if ! has_version x11-base/xorg-server ; then + for dir in lib lib32 lib64 ; do + if [[ -d ${D}/usr/${dir}/xorg ]] ; then + mv ${D}/usr/${dir}/xorg/* ${D}/usr/${dir} + rmdir ${D}/usr/${dir}/xorg + fi + done + fi + + # The X module + # Since we moved away from libs in /usr/X11R6 need to check this + if has_version "<x11-base/xorg-x11-6.8.0-r4" || \ + has_version "x11-base/xfree86" ; then + mkdir -p ${D}/usr/X11R6 + for dir in lib lib32 lib64 ; do + [[ -d ${D}/usr/${dir} ]] && mv ${D}/usr/${dir} ${D}/usr/X11R6 + 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 + 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 + if [[ -e ${ROOT}/etc/env.d/09nvidia ]] ; then rm -f ${ROOT}/etc/env.d/09nvidia fi } pkg_postinst() { #switch to the nvidia implementation - /usr/bin/eselect opengl set nvidia + eselect opengl set --use-old nvidia echo einfo "To use the Nvidia GLX, run \"eselect opengl set nvidia\"" @@ -251,5 +271,5 @@ want_tls() { } pkg_postrm() { - /usr/bin/eselect opengl set --use-old xorg-x11 + eselect opengl set --use-old xorg-x11 } diff --git a/media-video/nvidia-glx/nvidia-glx-1.0.7167-r2.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.7167-r2.ebuild index d79240c5c6ae..da9cf487a95f 100644 --- a/media-video/nvidia-glx/nvidia-glx-1.0.7167-r2.ebuild +++ b/media-video/nvidia-glx/nvidia-glx-1.0.7167-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 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.7167-r2.ebuild,v 1.1 2005/05/04 21:32:06 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/nvidia-glx-1.0.7167-r2.ebuild,v 1.1.1.1 2005/11/30 09:57:15 chriswhite Exp $ inherit eutils multilib versionator @@ -13,7 +13,7 @@ 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)" + amd64? ( http://download.nvidia.com/XFree86/Linux-x86_64/${NV_V}/${AMD64_NV_PACKAGE}-${AMD64_PKG_V}.run )" LICENSE="NVIDIA" SLOT="0" @@ -246,6 +246,13 @@ want_tls() { # 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 diff --git a/media-video/nvidia-glx/nvidia-glx-1.0.7167-r3.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.7167-r3.ebuild index b9a95701d096..394f8778e54b 100644 --- a/media-video/nvidia-glx/nvidia-glx-1.0.7167-r3.ebuild +++ b/media-video/nvidia-glx/nvidia-glx-1.0.7167-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 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.7167-r3.ebuild,v 1.1 2005/08/23 23:32:46 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/nvidia-glx-1.0.7167-r3.ebuild,v 1.1.1.1 2005/11/30 09:57:15 chriswhite Exp $ inherit eutils multilib versionator @@ -23,11 +23,11 @@ KEYWORDS="-* ~amd64 ~x86" RESTRICT="nostrip multilib-pkg-force" IUSE="" -DEPEND="virtual/libc - virtual/x11 - eselect-opengl - ~media-video/nvidia-kernel-${PV} - !app-emulation/emul-linux-x86-nvidia" +RDEPEND="|| ( virtual/x11 >=x11-base/xorg-server-0.99.1-r7 ) + || ( virtual/x11 media-libs/mesa ) + app-admin/eselect-opengl + ~media-video/nvidia-kernel-${PV} + !app-emulation/emul-linux-x86-nvidia" PROVIDE="virtual/opengl" export _POSIX2_VERSION="199209" @@ -67,11 +67,11 @@ src_unpack() { # Patchs go below here, add breif description cd ${S} # nVidia wants us to use nvidia-installer, removing warning. - epatch ${NV_PATCH_PREFIX//7167/6629}-makefile.patch + epatch ${NV_PATCH_PREFIX//$(get_version_component_range 3)/6629}-makefile.patch # Use the correct defines to make gtkglext build work - epatch ${NV_PATCH_PREFIX//7167/6629}-defines.patch + epatch ${NV_PATCH_PREFIX//$(get_version_component_range 3)/6629}-defines.patch # Use some more sensible gl headers and make way for new glext.h - epatch ${NV_PATCH_PREFIX//7167/6629}-glheader.patch + epatch ${NV_PATCH_PREFIX//$(get_version_component_range 3)/6629}-glheader.patch # 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 @@ -123,6 +123,9 @@ src_install-libs() { fi 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" # The GLX libraries exeinto ${NV_ROOT}/lib @@ -133,14 +136,12 @@ src_install-libs() { dosym libGLcore.so.${PV} ${NV_ROOT}/lib/libGLcore.so dosym libGLcore.so.${PV} ${NV_ROOT}/lib/libGLcore.so.1 - local NO_TLS_ROOT="/usr/${inslibdir}/opengl/nvidia/no-tls" dodir ${NO_TLS_ROOT} exeinto ${NO_TLS_ROOT} doexe usr/${pkglibdir}/libnvidia-tls.so.${PV} dosym libnvidia-tls.so.${PV} ${NO_TLS_ROOT}/libnvidia-tls.so dosym libnvidia-tls.so.${PV} ${NO_TLS_ROOT}/libnvidia-tls.so.1 - local TLS_ROOT="/usr/${inslibdir}/opengl/nvidia/tls" dodir ${TLS_ROOT} exeinto ${TLS_ROOT} doexe usr/${pkglibdir}/tls/libnvidia-tls.so.${PV} @@ -169,14 +170,6 @@ src_install-libs() { -e "s:\${libdir}:${inslibdir}:" \ ${FILESDIR}/libGL.la-r2 > ${D}/${NV_ROOT}/lib/libGL.la - # The X module - # Since we moved away from libs in /usr/X11R6 need to check this - if has_version ">=x11-base/xorg-x11-6.8.0-r4" ; then - local X11_LIB_DIR="/usr/$(get_libdir)" - else - local X11_LIB_DIR="/usr/X11R6/$(get_libdir)" - fi - exeinto ${X11_LIB_DIR}/modules/drivers [[ -f usr/X11R6/${pkglibdir}/modules/drivers/nvidia_drv.o ]] && \ doexe usr/X11R6/${pkglibdir}/modules/drivers/nvidia_drv.o @@ -200,6 +193,26 @@ src_install-libs() { } pkg_preinst() { + if ! has_version x11-base/xorg-server ; then + for dir in lib lib32 lib64 ; do + if [[ -d ${D}/usr/${dir}/xorg ]] ; then + mv ${D}/usr/${dir}/xorg/* ${D}/usr/${dir} + rmdir ${D}/usr/${dir}/xorg + fi + done + fi + + # The X module + # Since we moved away from libs in /usr/X11R6 need to check this + if has_version "<x11-base/xorg-x11-6.8.0-r4" || \ + has_version "x11-base/xfree86" ; then + mkdir -p ${D}/usr/X11R6 + for dir in lib lib32 lib64 ; do + [[ -d ${D}/usr/${dir} ]] && mv ${D}/usr/${dir} ${D}/usr/X11R6 + 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 @@ -213,7 +226,7 @@ pkg_preinst() { pkg_postinst() { #switch to the nvidia implementation - /usr/bin/eselect opengl set nvidia + eselect opengl set --use-old nvidia echo einfo "To use the Nvidia GLX, run \"eselect opengl set nvidia\"" @@ -258,5 +271,5 @@ want_tls() { } pkg_postrm() { - /usr/bin/eselect opengl set --use-old xorg-x11 + eselect opengl set --use-old xorg-x11 } diff --git a/media-video/nvidia-glx/nvidia-glx-1.0.7174-r5.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.7174-r5.ebuild index a4665ab7ecaa..78744b053f34 100644 --- a/media-video/nvidia-glx/nvidia-glx-1.0.7174-r5.ebuild +++ b/media-video/nvidia-glx/nvidia-glx-1.0.7174-r5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 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.7174-r5.ebuild,v 1.1 2005/08/23 23:32:46 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/nvidia-glx-1.0.7174-r5.ebuild,v 1.1.1.1 2005/11/30 09:57:17 chriswhite Exp $ inherit eutils multilib versionator @@ -25,15 +25,11 @@ KEYWORDS="-* ~amd64 ~x86" RESTRICT="nostrip multilib-pkg-force" IUSE="" -RDEPEND="virtual/libc - virtual/x11 - eselect-opengl - ~media-video/nvidia-kernel-${PV} - !app-emulation/emul-linux-x86-nvidia" - -# !<sys-libs/glibc-2.3.4.20040619-r2" -# The !<sys-libs/glibc-2.3.4.20040619-r2 is to ensure our glibc has tls -# support if we are atleast CHOST=i486. +RDEPEND="|| ( virtual/x11 >=x11-base/xorg-server-0.99.1-r7 ) + || ( virtual/x11 media-libs/mesa ) + app-admin/eselect-opengl + ~media-video/nvidia-kernel-${PV} + !app-emulation/emul-linux-x86-nvidia" PROVIDE="virtual/opengl" export _POSIX2_VERSION="199209" @@ -129,6 +125,9 @@ src_install-libs() { fi 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" # The GLX libraries exeinto ${NV_ROOT}/lib @@ -139,14 +138,12 @@ src_install-libs() { dosym libGLcore.so.${PV} ${NV_ROOT}/lib/libGLcore.so dosym libGLcore.so.${PV} ${NV_ROOT}/lib/libGLcore.so.1 - local NO_TLS_ROOT="/usr/${inslibdir}/opengl/nvidia/no-tls" dodir ${NO_TLS_ROOT} exeinto ${NO_TLS_ROOT} doexe usr/${pkglibdir}/libnvidia-tls.so.${PV} dosym libnvidia-tls.so.${PV} ${NO_TLS_ROOT}/libnvidia-tls.so dosym libnvidia-tls.so.${PV} ${NO_TLS_ROOT}/libnvidia-tls.so.1 - local TLS_ROOT="/usr/${inslibdir}/opengl/nvidia/tls" dodir ${TLS_ROOT} exeinto ${TLS_ROOT} doexe usr/${pkglibdir}/tls/libnvidia-tls.so.${PV} @@ -175,14 +172,6 @@ src_install-libs() { -e "s:\${libdir}:${inslibdir}:" \ ${FILESDIR}/libGL.la-r2 > ${D}/${NV_ROOT}/lib/libGL.la - # The X module - # Since we moved away from libs in /usr/X11R6 need to check this - if has_version ">=x11-base/xorg-x11-6.8.0-r4" ; then - local X11_LIB_DIR="/usr/$(get_libdir)" - else - local X11_LIB_DIR="/usr/X11R6/$(get_libdir)" - fi - exeinto ${X11_LIB_DIR}/modules/drivers [[ -f usr/X11R6/${pkglibdir}/modules/drivers/nvidia_drv.o ]] && \ doexe usr/X11R6/${pkglibdir}/modules/drivers/nvidia_drv.o @@ -206,6 +195,26 @@ src_install-libs() { } pkg_preinst() { + if ! has_version x11-base/xorg-server ; then + for dir in lib lib32 lib64 ; do + if [[ -d ${D}/usr/${dir}/xorg ]] ; then + mv ${D}/usr/${dir}/xorg/* ${D}/usr/${dir} + rmdir ${D}/usr/${dir}/xorg + fi + done + fi + + # The X module + # Since we moved away from libs in /usr/X11R6 need to check this + if has_version "<x11-base/xorg-x11-6.8.0-r4" || \ + has_version "x11-base/xfree86" ; then + mkdir -p ${D}/usr/X11R6 + for dir in lib lib32 lib64 ; do + [[ -d ${D}/usr/${dir} ]] && mv ${D}/usr/${dir} ${D}/usr/X11R6 + 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 @@ -219,7 +228,7 @@ pkg_preinst() { pkg_postinst() { #switch to the nvidia implementation - /usr/bin/eselect opengl set nvidia + eselect opengl set --use-old nvidia echo einfo "To use the Nvidia GLX, run \"eselect opengl set nvidia\"" @@ -264,5 +273,5 @@ want_tls() { } pkg_postrm() { - /usr/bin/eselect opengl set --use-old xorg-x11 + eselect opengl set --use-old xorg-x11 } diff --git a/media-video/nvidia-glx/nvidia-glx-1.0.7667-r1.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.7667-r1.ebuild index cbddc8a9a1b2..ecb33dd6738f 100644 --- a/media-video/nvidia-glx/nvidia-glx-1.0.7667-r1.ebuild +++ b/media-video/nvidia-glx/nvidia-glx-1.0.7667-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 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.7667-r1.ebuild,v 1.1 2005/08/23 23:32:46 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/nvidia-glx-1.0.7667-r1.ebuild,v 1.1.1.1 2005/11/30 09:57:17 chriswhite Exp $ inherit eutils multilib versionator @@ -18,20 +18,18 @@ SRC_URI="x86? ( ftp://download.nvidia.com/XFree86/Linux-x86/${NV_V}/${X86_NV_PAC LICENSE="NVIDIA" SLOT="0" +# Support for some older cards was removed from newer versions, so don't delete +# this package unless a "legacy" update has been released by nVidia -- eradicator KEYWORDS="-* ~amd64 ~x86" RESTRICT="nostrip multilib-pkg-force" -IUSE="dlloader" +IUSE="" -RDEPEND="virtual/libc - virtual/x11 - eselect-opengl - ~media-video/nvidia-kernel-${PV} - !app-emulation/emul-linux-x86-nvidia" - -# !<sys-libs/glibc-2.3.4.20040619-r2" -# The !<sys-libs/glibc-2.3.4.20040619-r2 is to ensure our glibc has tls -# support if we are atleast CHOST=i486. +RDEPEND="|| ( virtual/x11 >=x11-base/xorg-server-0.99.1-r7 ) + || ( virtual/x11 media-libs/mesa ) + app-admin/eselect-opengl + ~media-video/nvidia-kernel-${PV} + !app-emulation/emul-linux-x86-nvidia" PROVIDE="virtual/opengl" export _POSIX2_VERSION="199209" @@ -127,6 +125,9 @@ src_install-libs() { fi 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" # The GLX libraries exeinto ${NV_ROOT}/lib @@ -137,14 +138,12 @@ src_install-libs() { dosym libGLcore.so.${PV} ${NV_ROOT}/lib/libGLcore.so dosym libGLcore.so.${PV} ${NV_ROOT}/lib/libGLcore.so.1 - local NO_TLS_ROOT="/usr/${inslibdir}/opengl/nvidia/no-tls" dodir ${NO_TLS_ROOT} exeinto ${NO_TLS_ROOT} doexe usr/${pkglibdir}/libnvidia-tls.so.${PV} dosym libnvidia-tls.so.${PV} ${NO_TLS_ROOT}/libnvidia-tls.so dosym libnvidia-tls.so.${PV} ${NO_TLS_ROOT}/libnvidia-tls.so.1 - local TLS_ROOT="/usr/${inslibdir}/opengl/nvidia/tls" dodir ${TLS_ROOT} exeinto ${TLS_ROOT} doexe usr/${pkglibdir}/tls/libnvidia-tls.so.${PV} @@ -173,23 +172,11 @@ src_install-libs() { -e "s:\${libdir}:${inslibdir}:" \ ${FILESDIR}/libGL.la-r2 > ${D}/${NV_ROOT}/lib/libGL.la - # The X module - # Since we moved away from libs in /usr/X11R6 need to check this - if has_version ">=x11-base/xorg-x11-6.8.0-r4" ; then - local X11_LIB_DIR="/usr/$(get_libdir)" - else - local X11_LIB_DIR="/usr/X11R6/$(get_libdir)" - fi - exeinto ${X11_LIB_DIR}/modules/drivers - # The below section was changed to fix bug #96514 and bug #91101. - if use dlloader; then - [[ -f usr/X11R6/${pkglibdir}/modules/drivers/nvidia_drv.so ]] && \ - doexe usr/X11R6/${pkglibdir}/modules/drivers/nvidia_drv.so - else - [[ -f usr/X11R6/${pkglibdir}/modules/drivers/nvidia_drv.o ]] && \ - doexe usr/X11R6/${pkglibdir}/modules/drivers/nvidia_drv.o - fi + [[ -f usr/X11R6/${pkglibdir}/modules/drivers/nvidia_drv.o ]] && \ + doexe usr/X11R6/${pkglibdir}/modules/drivers/nvidia_drv.o + [[ -f usr/X11R6/${pkglibdir}/modules/drivers/nvidia_drv.so ]] && \ + doexe usr/X11R6/${pkglibdir}/modules/drivers/nvidia_drv.so insinto ${X11_LIB_DIR} [[ -f usr/X11R6/${pkglibdir}/libXvMCNVIDIA.a ]] && \ @@ -208,6 +195,26 @@ src_install-libs() { } pkg_preinst() { + if ! has_version x11-base/xorg-server ; then + for dir in lib lib32 lib64 ; do + if [[ -d ${D}/usr/${dir}/xorg ]] ; then + mv ${D}/usr/${dir}/xorg/* ${D}/usr/${dir} + rmdir ${D}/usr/${dir}/xorg + fi + done + fi + + # The X module + # Since we moved away from libs in /usr/X11R6 need to check this + if has_version "<x11-base/xorg-x11-6.8.0-r4" || \ + has_version "x11-base/xfree86" ; then + mkdir -p ${D}/usr/X11R6 + for dir in lib lib32 lib64 ; do + [[ -d ${D}/usr/${dir} ]] && mv ${D}/usr/${dir} ${D}/usr/X11R6 + 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 @@ -221,7 +228,7 @@ pkg_preinst() { pkg_postinst() { #switch to the nvidia implementation - /usr/bin/eselect opengl set nvidia + eselect opengl set --use-old nvidia echo einfo "To use the Nvidia GLX, run \"eselect opengl set nvidia\"" @@ -266,5 +273,5 @@ want_tls() { } pkg_postrm() { - /usr/bin/eselect opengl set --use-old xorg-x11 + eselect opengl set --use-old xorg-x11 } diff --git a/media-video/nvidia-glx/nvidia-glx-1.0.7676-r1.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.7676-r1.ebuild index ce92479d30b8..ced1cfc279af 100644 --- a/media-video/nvidia-glx/nvidia-glx-1.0.7676-r1.ebuild +++ b/media-video/nvidia-glx/nvidia-glx-1.0.7676-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 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.7676-r1.ebuild,v 1.1 2005/08/23 23:32:46 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/nvidia-glx-1.0.7676-r1.ebuild,v 1.1.1.1 2005/11/30 09:57:17 chriswhite Exp $ inherit eutils multilib versionator @@ -9,11 +9,13 @@ 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}" +X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${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 )" + amd64? ( http://download.nvidia.com/XFree86/Linux-x86_64/${NV_V}/${AMD64_NV_PACKAGE}-${AMD64_PKG_V}.run ) + x86-fbsd? ( http://download.nvidia.com/freebsd/${NV_V}/${X86_FBSD_NV_PACKAGE}.tar.gz )" LICENSE="NVIDIA" SLOT="0" @@ -23,28 +25,33 @@ KEYWORDS="-* ~amd64 ~x86" RESTRICT="nostrip multilib-pkg-force" IUSE="dlloader" -RDEPEND="virtual/libc - virtual/x11 - eselect-opengl - ~media-video/nvidia-kernel-${PV} - !app-emulation/emul-linux-x86-nvidia" - -# !<sys-libs/glibc-2.3.4.20040619-r2" -# The !<sys-libs/glibc-2.3.4.20040619-r2 is to ensure our glibc has tls -# support if we are atleast CHOST=i486. +RDEPEND="|| ( virtual/x11 >=x11-base/xorg-server-0.99.1-r7 ) + || ( virtual/x11 media-libs/mesa ) + app-admin/eselect-opengl + kernel_linux? ( ~media-video/nvidia-kernel-${PV} ) + !app-emulation/emul-linux-x86-nvidia" +# This should be added to have full dependencies for Gentoo FreeBSD +# but can't be added until the profiles are in main portage (for repoman) +# kernel_FreeBSD? ( ~media-video/nvidia-freebsd-${PV} ) PROVIDE="virtual/opengl" export _POSIX2_VERSION="199209" if use x86; then - PKG_V="${X86_PKG_V}" + PKG_V="-${X86_PKG_V}" NV_PACKAGE="${X86_NV_PACKAGE}" elif use amd64; then - PKG_V="${AMD64_PKG_V}" + PKG_V="-${AMD64_PKG_V}" NV_PACKAGE="${AMD64_NV_PACKAGE}" +elif use x86-fbsd; then + PKG_V="" + NV_PACKAGE="${X86_FBSD_NV_PACKAGE}" fi -S="${WORKDIR}/${NV_PACKAGE}-${PKG_V}" +S="${WORKDIR}/${NV_PACKAGE}${PKG_V}" + +# On BSD userland it wants real make command +MAKE="make" check_xfree() { # This isn't necessary, true. But its about time people got the idea. @@ -65,13 +72,21 @@ pkg_setup() { src_unpack() { local NV_PATCH_PREFIX="${FILESDIR}/${PV}/NVIDIA_glx-${PV}" - cd ${WORKDIR} - bash ${DISTDIR}/${NV_PACKAGE}-${PKG_V}.run --extract-only + if ! use x86-fbsd; then + cd ${WORKDIR} + bash ${DISTDIR}/${NV_PACKAGE}${PKG_V}.run --extract-only + else + unpack ${A} + fi # Patchs go below here, add breif description cd ${S} - # nVidia wants us to use nvidia-installer, removing warning. - epatch ${NV_PATCH_PREFIX//$(get_version_component_range 3)/6629}-makefile.patch + if ! use x86-fbsd; then + # nVidia wants us to use nvidia-installer, removing warning. + epatch ${NV_PATCH_PREFIX//$(get_version_component_range 3)/6629}-makefile.patch + else + cd ${S}/doc + fi # Use the correct defines to make gtkglext build work epatch ${NV_PATCH_PREFIX//$(get_version_component_range 3)/6629}-defines.patch # Use some more sensible gl headers and make way for new glext.h @@ -106,15 +121,35 @@ src_install() { is_final_abi || return 0 - # Docs, remove nvidia-settings as provided by media-video/nvidia-settings - rm -f usr/share/doc/nvidia-settings* - dodoc usr/share/doc/* + if ! use x86-fbsd; then + # Docs, remove nvidia-settings as provided by media-video/nvidia-settings + rm -f usr/share/doc/nvidia-settings* + dodoc usr/share/doc/* + else + dodoc doc/README doc/README.Linux doc/XF86Config.sample + fi # 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) @@ -126,88 +161,114 @@ src_install-libs() { 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 use x86-fbsd; then + # on FreeBSD everything is on obj/ + pkglibdir=obj + usrpkglibdir=obj + x11pkglibdir=obj + drvdir=obj + extdir=obj + + # don't ask me why the headers are there.. glxext.h is missing + incdir=doc + + # on FreeBSD it has just .1 suffix + sover=1 + fi # The GLX libraries - exeinto ${NV_ROOT}/lib - doexe usr/${pkglibdir}/libGL.so.${PV} - doexe usr/${pkglibdir}/libGLcore.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 - - local NO_TLS_ROOT="/usr/${inslibdir}/opengl/nvidia/no-tls" + donvidia ${NV_ROOT}/lib ${usrpkglibdir}/libGL.so ${sover} + donvidia ${NV_ROOT}/lib ${usrpkglibdir}/libGLcore.so ${sover} + dodir ${NO_TLS_ROOT} - exeinto ${NO_TLS_ROOT} - doexe usr/${pkglibdir}/libnvidia-tls.so.${PV} - dosym libnvidia-tls.so.${PV} ${NO_TLS_ROOT}/libnvidia-tls.so - dosym libnvidia-tls.so.${PV} ${NO_TLS_ROOT}/libnvidia-tls.so.1 - - local TLS_ROOT="/usr/${inslibdir}/opengl/nvidia/tls" - dodir ${TLS_ROOT} - exeinto ${TLS_ROOT} - doexe usr/${pkglibdir}/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 + donvidia ${NO_TLS_ROOT} ${usrpkglibdir}/libnvidia-tls.so ${sover} + + if ! use x86-fbsd; then + donvidia ${TLS_ROOT} ${usrpkglibdir}/tls/libnvidia-tls.so ${sover} + fi 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.${PV} ${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.${PV} ${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 - - # The X module - # Since we moved away from libs in /usr/X11R6 need to check this - if has_version ">=x11-base/xorg-x11-6.8.0-r4" ; then - local X11_LIB_DIR="/usr/$(get_libdir)" - else - local X11_LIB_DIR="/usr/X11R6/$(get_libdir)" + if ! use x86-fbsd; then + # 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 fi exeinto ${X11_LIB_DIR}/modules/drivers - # The below section was changed to fix bug #96514 and bug #91101. + if use dlloader; then - [[ -f usr/X11R6/${pkglibdir}/modules/drivers/nvidia_drv.so ]] && \ - doexe usr/X11R6/${pkglibdir}/modules/drivers/nvidia_drv.so + [[ -f ${drvdir}/nvidia_drv.so ]] && \ + doexe ${drvdir}/nvidia_drv.so else - [[ -f usr/X11R6/${pkglibdir}/modules/drivers/nvidia_drv.o ]] && \ - doexe usr/X11R6/${pkglibdir}/modules/drivers/nvidia_drv.o + [[ -f ${drvdir}/nvidia_drv.o ]] && \ + doexe ${drvdir}/nvidia_drv.o fi insinto ${X11_LIB_DIR} - [[ -f usr/X11R6/${pkglibdir}/libXvMCNVIDIA.a ]] && \ - doins usr/X11R6/${pkglibdir}/libXvMCNVIDIA.a + [[ -f ${libdir}/libXvMCNVIDIA.a ]] && \ + doins ${libdir}/libXvMCNVIDIA.a exeinto ${X11_LIB_DIR} - [[ -f usr/X11R6/${pkglibdir}/libXvMCNVIDIA.so.${PV} ]] && \ - doexe usr/X11R6/${pkglibdir}/libXvMCNVIDIA.so.${PV} + [[ -f ${libdir}/libXvMCNVIDIA.so.${PV} ]] && \ + doexe ${libdir}/libXvMCNVIDIA.so.${PV} exeinto ${NV_ROOT}/extensions - [[ -f usr/X11R6/${pkglibdir}/modules/extensions/libglx.so.${PV} ]] && \ - newexe usr/X11R6/${pkglibdir}/modules/extensions/libglx.so.${PV} libglx.so + [[ -f ${extdir}/libglx.so.${sover} ]] && \ + newexe ${extdir}/libglx.so.${sover} libglx.so # Includes insinto ${NV_ROOT}/include - doins usr/include/GL/*.h + doins ${incdir}/*.h } pkg_preinst() { + if ! has_version x11-base/xorg-server ; then + for dir in lib lib32 lib64 ; do + if [[ -d ${D}/usr/${dir}/xorg ]] ; then + mv ${D}/usr/${dir}/xorg/* ${D}/usr/${dir} + rmdir ${D}/usr/${dir}/xorg + fi + done + fi + + # The X module + # Since we moved away from libs in /usr/X11R6 need to check this + if has_version "<x11-base/xorg-x11-6.8.0-r4" || \ + has_version "x11-base/xfree86" ; then + mkdir -p ${D}/usr/X11R6 + for dir in lib lib32 lib64 ; do + [[ -d ${D}/usr/${dir} ]] && mv ${D}/usr/${dir} ${D}/usr/X11R6 + 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 @@ -221,7 +282,7 @@ pkg_preinst() { pkg_postinst() { #switch to the nvidia implementation - /usr/bin/eselect opengl set nvidia + eselect opengl set --use-old nvidia echo einfo "To use the Nvidia GLX, run \"eselect opengl set nvidia\"" @@ -266,5 +327,5 @@ want_tls() { } pkg_postrm() { - /usr/bin/eselect opengl set --use-old xorg-x11 + eselect opengl set --use-old xorg-x11 } diff --git a/media-video/nvidia-glx/nvidia-glx-1.0.7676-r2.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.7676-r2.ebuild index 5d347a3b5af6..f6facd61cde5 100644 --- a/media-video/nvidia-glx/nvidia-glx-1.0.7676-r2.ebuild +++ b/media-video/nvidia-glx/nvidia-glx-1.0.7676-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 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.7676-r2.ebuild,v 1.1 2005/11/11 18:41:55 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/nvidia-glx-1.0.7676-r2.ebuild,v 1.1.1.1 2005/11/30 09:57:16 chriswhite Exp $ inherit eutils multilib versionator @@ -250,13 +250,13 @@ src_install-libs() { pkg_preinst() { # Can we make up our minds ?!?!? - [[ -n ${IMAGE} ]] && D=${IMAGE} + local NV_D=${IMAGE:-${D}} if ! has_version x11-base/xorg-server ; then for dir in lib lib32 lib64 ; do - if [[ -d ${D}/usr/${dir}/xorg ]] ; then - mv ${D}/usr/${dir}/xorg/* ${D}/usr/${dir} - rmdir ${D}/usr/${dir}/xorg + 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 @@ -265,9 +265,9 @@ pkg_preinst() { # Since we moved away from libs in /usr/X11R6 need to check this if has_version "<x11-base/xorg-x11-6.8.0-r4" || \ has_version "x11-base/xfree86" ; then - mkdir -p ${D}/usr/X11R6 + mkdir -p ${NV_D}/usr/X11R6 for dir in lib lib32 lib64 ; do - [[ -d ${D}/usr/${dir} ]] && mv ${D}/usr/${dir} ${D}/usr/X11R6 + [[ -d ${NV_D}/usr/${dir} ]] && mv ${NV_D}/usr/${dir} ${NV_D}/usr/X11R6 done fi |