From a1ac88c43a318e9aefb71281fab5756026e8b755 Mon Sep 17 00:00:00 2001 From: Fabian Fingerle Date: Mon, 30 Nov 2009 16:16:45 +0100 Subject: [PATCH] x11-drivers/nvidia-drivers-195.22: Bump --- Documentation/package.keywords/nvidia-beta | 2 + Documentation/package.keywords/nvidia-prerelease | 2 - media-video/nvidia-settings/ChangeLog | 5 + media-video/nvidia-settings/Manifest | 8 +- .../nvidia-settings/nvidia-settings-190.42.ebuild | 69 --- ....18.36.ebuild => nvidia-settings-195.22.ebuild} | 0 x11-drivers/nvidia-drivers/ChangeLog | 5 + x11-drivers/nvidia-drivers/Manifest | 27 +- x11-drivers/nvidia-drivers/files/NVIDIA_arch.patch | 13 + .../nvidia-drivers/nvidia-drivers-185.18.36.ebuild | 559 --------------------- ...-190.42.ebuild => nvidia-drivers-195.22.ebuild} | 89 ++-- 11 files changed, 80 insertions(+), 699 deletions(-) delete mode 100644 media-video/nvidia-settings/nvidia-settings-190.42.ebuild rename media-video/nvidia-settings/{nvidia-settings-185.18.36.ebuild => nvidia-settings-195.22.ebuild} (100%) rewrite x11-drivers/nvidia-drivers/Manifest (62%) create mode 100644 x11-drivers/nvidia-drivers/files/NVIDIA_arch.patch delete mode 100644 x11-drivers/nvidia-drivers/nvidia-drivers-185.18.36.ebuild rename x11-drivers/nvidia-drivers/{nvidia-drivers-190.42.ebuild => nvidia-drivers-195.22.ebuild} (86%) diff --git a/Documentation/package.keywords/nvidia-beta b/Documentation/package.keywords/nvidia-beta index e69de29..fa89f5f 100644 --- a/Documentation/package.keywords/nvidia-beta +++ b/Documentation/package.keywords/nvidia-beta @@ -0,0 +1,2 @@ +=media-video/nvidia-settings-195.22 ** +=x11-drivers/nvidia-drivers-195.22 ** diff --git a/Documentation/package.keywords/nvidia-prerelease b/Documentation/package.keywords/nvidia-prerelease index 249afee..e69de29 100644 --- a/Documentation/package.keywords/nvidia-prerelease +++ b/Documentation/package.keywords/nvidia-prerelease @@ -1,2 +0,0 @@ -=media-video/nvidia-settings-190.42 ** -=x11-drivers/nvidia-drivers-190.42 ** diff --git a/media-video/nvidia-settings/ChangeLog b/media-video/nvidia-settings/ChangeLog index 025f162..e2012b1 100644 --- a/media-video/nvidia-settings/ChangeLog +++ b/media-video/nvidia-settings/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-drivers/nvidia-drivers # Copyright 2006-2009 Otih Overlay; distributed under the GPL version 2 + 30 Nov 2009, Fabian Fingerle + -nvidia-settings-185.18.36.ebuild, -nvidia-settings-190.42.ebuild, + +nvidia-settings-195.22.ebuild: + Bump + 25 Oct 2009, Fabian Fingerle -nvidia-settings-190.40.ebuild, +nvidia-settings-190.42.ebuild: Bump diff --git a/media-video/nvidia-settings/Manifest b/media-video/nvidia-settings/Manifest index 65668f4..2fc8429 100644 --- a/media-video/nvidia-settings/Manifest +++ b/media-video/nvidia-settings/Manifest @@ -1,8 +1,6 @@ AUX icon/nvidia-settings.desktop 194 RMD160 a59dae254f65d9665118629b489b33b0fd87c8d5 SHA1 eac0735769b28d7c217d6ab15a3dca3e2adff9b1 SHA256 af43af5db203c1acf9301fa7fb285a7fdfe5aab5ce1aa30a239fd7db1b588168 AUX icon/nvidia-settings.png 3790 RMD160 a0a8c319ca4b0100d2b7502b6a3dba20a3dc71b9 SHA1 ff485bf300c6e0c56b3d1f08ee87e4d9a425db65 SHA256 171e2d20dfe7fbbb86bf9d3c0bb22909529b351fb06b614018a9597ff2456f12 -DIST nvidia-settings-185.18.36.tar.gz 1350273 RMD160 efa62942db7356744bb7abc67656da7f5b34e572 SHA1 895d8bd51c1da50f5a8a6d151f2f9e3711ec59aa SHA256 399dfd5ccd84ca008a798f6ec3b65e1ad4254e40490ff60fa77bce4e14ad47c3 -DIST nvidia-settings-190.42.tar.gz 1395752 RMD160 e6029ebe3899dec2c18997d6774683759c8b63ea SHA1 0793f0da295c3bddbdec21f1b41ee9030439aa55 SHA256 799fd498a643cc430af392461cce81d97797182091055948676a46e4fc75d6bb -EBUILD nvidia-settings-185.18.36.ebuild 1721 RMD160 f7d6e47cad4e905b8e92208dc97dd1938bbc2394 SHA1 4446f0471e2c2057c9c9bdb1a99e568d69e29390 SHA256 55fbb7c79182e1c8ac8d1edf7b68feccd3f885c0e95520e5c1f2e45965108b10 -EBUILD nvidia-settings-190.42.ebuild 1721 RMD160 f7d6e47cad4e905b8e92208dc97dd1938bbc2394 SHA1 4446f0471e2c2057c9c9bdb1a99e568d69e29390 SHA256 55fbb7c79182e1c8ac8d1edf7b68feccd3f885c0e95520e5c1f2e45965108b10 -MISC ChangeLog 3191 RMD160 6cf4a5acc2f027cb8f5defe0a1d9e4af6177364e SHA1 86c81538218fb9f521d95f97de1c6bb7ca971160 SHA256 570902d9dc1ed896dddc78d33991d2a6674ea0e9bd072d2dfff02beeeae6cc51 +DIST nvidia-settings-195.22.tar.gz 1402087 RMD160 f0355db934587f479daa9d78e304ae928fd2fdbc SHA1 083704e7b46006c173ee5f04a170dade893bcbd2 SHA256 42b06d38404e091577a011a3eda63f0abc0021df4045ea40e803973d73a8e846 +EBUILD nvidia-settings-195.22.ebuild 1721 RMD160 f7d6e47cad4e905b8e92208dc97dd1938bbc2394 SHA1 4446f0471e2c2057c9c9bdb1a99e568d69e29390 SHA256 55fbb7c79182e1c8ac8d1edf7b68feccd3f885c0e95520e5c1f2e45965108b10 +MISC ChangeLog 3356 RMD160 53d2adb6be1437891fb40853fb5817ba7602628e SHA1 cf4a07925c656c3b5696ba9100df332477bb7489 SHA256 e5784528b9355d4adf721f99db3992819ef4517db24c01798952cb9f57a7a9c2 MISC metadata.xml 313 RMD160 ef0fd7e80d48cd3ca74f690da28124320f1a5bd9 SHA1 07663307a196dcdd3ae7fd14a87476f7a7aaa67a SHA256 d6e8ff073fd6c7c27d8401c2ccc11bd62003fca57618d4ebc2c3bcc2f3beec21 diff --git a/media-video/nvidia-settings/nvidia-settings-190.42.ebuild b/media-video/nvidia-settings/nvidia-settings-190.42.ebuild deleted file mode 100644 index f164781..0000000 --- a/media-video/nvidia-settings/nvidia-settings-190.42.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -inherit eutils toolchain-funcs multilib - -MY_P="${PN}-1.0" - -DESCRIPTION="NVIDIA Linux X11 Settings Utility" -HOMEPAGE="http://www.nvidia.com/" -SRC_URI="ftp://download.nvidia.com/XFree86/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="" -IUSE="" - -# xorg-server is used in the depends as nvidia-settings builds against some -# headers in /usr/include/xorg/. -# This also allows us to optimize out a lot of the other dependancies, as -# between gtk and xorg-server, almost all libraries and headers are accounted -# for. -DEPEND=">=x11-libs/gtk+-2 - dev-util/pkgconfig - x11-base/xorg-server - x11-libs/libXt - x11-libs/libXv - x11-proto/xf86driproto - x11-proto/xf86vidmodeproto" - -RDEPEND=">=x11-libs/gtk+-2 - x11-base/xorg-server - x11-libs/libXt - x11-drivers/nvidia-drivers" - -S="${WORKDIR}/${MY_P}" - -src_compile() { - einfo "Building libXNVCtrl..." - cd "${S}/src/libXNVCtrl" - make clean || die "Cleaning old libXNVCtrl failed" - emake CDEBUGFLAGS="${CFLAGS}" CC="$(tc-getCC)" libXNVCtrl.a || die "Building libXNVCtrl failed!" - - cd "${S}" - einfo "Building nVidia-Settings..." - emake CC="$(tc-getCC)" || die "Failed to build nvidia-settings" -} - -src_install() { - # Install the executable - exeinto /usr/bin - doexe nvidia-settings - - # Install libXNVCtrl and headers - insinto "/usr/$(get_libdir)" - doins src/libXNVCtrl/libXNVCtrl.a - insinto /usr/include/NVCtrl - doins src/libXNVCtrl/{NVCtrl,NVCtrlLib}.h - - # Install icon and .desktop entry - doicon "${FILESDIR}/icon/${PN}.png" - domenu "${FILESDIR}/icon/${PN}.desktop" - - # Install manpage - doman doc/nvidia-settings.1 - - # Now install documentation - dodoc doc/*.txt -} diff --git a/media-video/nvidia-settings/nvidia-settings-185.18.36.ebuild b/media-video/nvidia-settings/nvidia-settings-195.22.ebuild similarity index 100% rename from media-video/nvidia-settings/nvidia-settings-185.18.36.ebuild rename to media-video/nvidia-settings/nvidia-settings-195.22.ebuild diff --git a/x11-drivers/nvidia-drivers/ChangeLog b/x11-drivers/nvidia-drivers/ChangeLog index 0d88c2d..d6ab985 100644 --- a/x11-drivers/nvidia-drivers/ChangeLog +++ b/x11-drivers/nvidia-drivers/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-drivers/nvidia-drivers # Copyright 2006-2009 Otih Overlay; distributed under the GPL version 2 + 30 Nov 2009, Fabian Fingerle + -nvidia-drivers-185.18.36.ebuild, -nvidia-drivers-190.42.ebuild, + +nvidia-drivers-195.22.ebuild, +files/NVIDIA_arch.patch: + Bump + 25 Oct 2009, Fabian Fingerle +nvidia-drivers-190.42.ebuild, -nvidia-drivers-190.40.ebuild: Bump diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest dissimilarity index 62% index 6e9e596..d2fc63a 100644 --- a/x11-drivers/nvidia-drivers/Manifest +++ b/x11-drivers/nvidia-drivers/Manifest @@ -1,15 +1,12 @@ -AUX NVIDIA_glx-defines.patch 437 RMD160 7cc38de0663c51d9e3718f02035a940a5d31e53c SHA1 eef9bcae32d4e00133b205e27ce766488d5c6cdb SHA256 0007f3d962edb87da4788ce58869679c1b10f28223a6bf1c23696fede57305da -AUX NVIDIA_glx-glheader.patch 380 RMD160 ee9a10cfbed10d5711f58a80553ffebeea5853bf SHA1 72abfedb9dfb7dae7dc23a5701d3e00282fef2c0 SHA256 f630e24067bf6199a64f8fe8c5d6fc158cb4b153bda65ffc3f97b36a9cb08faf -AUX libGL.la-r2 733 RMD160 479612ab30c04ca0683c7d9edaf9ab3de783e4a9 SHA1 88656b7e7234ade4f5564373fd6eb5c040167655 SHA256 4856e7a2c31763ade41c93a395f3e80a2705ac2ab4dbd73e5161cdba132f407b -AUX nvidia 1510 RMD160 ca0d0e5375109d9edf682d9bdda743b7c693e4d4 SHA1 85cf9bff167dcc063ba61426523973e9598085f7 SHA256 b193cc3f6d6f39138720a2282d9f161fc8f2e8a15bc43d183a30eb879add06c5 -AUX nvidia-169.07 639 RMD160 8baddb6fd1bf7f0e2688870a78e8ace051d62e3f SHA1 b30487ba2a24a6b1359d1fd831eeb1705060953c SHA256 a8c4860f008d53776fda7a17b59524f271236559af688e9a2c9845cbbcba1577 -DIST NVIDIA-FreeBSD-x86-185.18.36.tar.gz 19245550 RMD160 9fc751dca64c96fa3c3d54bde581a2a4fe37194b SHA1 7b982e4f43b754987e3654e93fd7108488658d4b SHA256 890b9543d3c81bccc72d60c653647a719c9037f8fc7a88144a18b2a012fbd4a7 -DIST NVIDIA-FreeBSD-x86-190.42.tar.gz 20092575 RMD160 862f6f4fa3ebd5f09b216f2e959e3c0866440963 SHA1 1f3dd0a618d9703d4b7ab87603b002880b561fc3 SHA256 7512f1ce6a0d7202422be25ca9cb11e63f70e9097b048f2bfc6cc5d83598e9df -DIST NVIDIA-Linux-x86-185.18.36-pkg0.run 14146513 RMD160 ec8f2a4f44bf89304f6ab53fd3fe887463967260 SHA1 1565639460c2438753251a89b9beb1a5101816ec SHA256 985e49847ed2f8bc50fe379780e182afea26d052bd1189320ce226acd03d72c4 -DIST NVIDIA-Linux-x86-190.42-pkg0.run 14696051 RMD160 9876e63299fd1f87e6f23939d42985277c325bc8 SHA1 c2b20032160f4b5803a04a1bf7bb67a200516a51 SHA256 e851b5daac4fa1c2ab1bdb86c967eaae6b5cfebc10529d2041a4c087b91b9271 -DIST NVIDIA-Linux-x86_64-185.18.36-pkg2.run 22245788 RMD160 0ffbc35dd13d2ccff87f20e0d6a8b8622c497ec7 SHA1 0ec535765bf07dc7ff47bbede831a89617105ac1 SHA256 c9b413910a26cc55829e018f71e12981fa4140b5e0f7a81bb5e1a1b3d353ef8b -DIST NVIDIA-Linux-x86_64-190.42-pkg2.run 23045797 RMD160 8858aaf1c089a6ad514d68c70db9dac312a3b17c SHA1 cf0a7a8a79cd77ad1363f0568e46866fa528e06f SHA256 3e95f80cbf388a03f0052efdb02cff87e201470c890edead8755fbe7b3368060 -EBUILD nvidia-drivers-185.18.36.ebuild 16848 RMD160 3cd0779f2a0905c328d34a9b2997bd1b34bd0a59 SHA1 b4e51979d885d130e09f27c51a5e6eee9a31e9b9 SHA256 76d8128bd6ee4b4f6c949cb6f0722736c4e586f331ca6aa8962c6d0cb2c21b82 -EBUILD nvidia-drivers-190.42.ebuild 15600 RMD160 0c2ba1785a660ebd625df1e3822ece735bd42e88 SHA1 21babd1eff9be64b9e77846132c068e6fe7413a7 SHA256 c4e8a21ed0e16cd145074756bf2880a9fb56fc5c270634946452e39b9a2e5600 -MISC ChangeLog 3883 RMD160 e1178b78582e07454e676355ddcc73f15d47e1be SHA1 c36e7f19755740931667b1dcc08a39ce7eae0af3 SHA256 458f4c7a83440491a84887d65cc0e40527de49d999813b2fe94825ff3ad5d213 -MISC metadata.xml 167 RMD160 37158b954b5c56848025caab67dff8a1b7cb3146 SHA1 0a1a5e46367626858fc7f28de6fca63ccfa3f7e0 SHA256 4476ca9edabcb9df5e3e77607b3972df652fd44fb82ec2a751a9ce798da17a73 +AUX NVIDIA_arch.patch 392 RMD160 ed4db82204144d3651013bbae332e1c6c48036f7 SHA1 dc3c736bb09c906b1e6c63d688ed5b8ae186fa3a SHA256 19cf468ce273d7f66674b8be8471fcfe8e255492bc5728076f8c38ce5e66db82 +AUX NVIDIA_glx-defines.patch 437 RMD160 7cc38de0663c51d9e3718f02035a940a5d31e53c SHA1 eef9bcae32d4e00133b205e27ce766488d5c6cdb SHA256 0007f3d962edb87da4788ce58869679c1b10f28223a6bf1c23696fede57305da +AUX NVIDIA_glx-glheader.patch 380 RMD160 ee9a10cfbed10d5711f58a80553ffebeea5853bf SHA1 72abfedb9dfb7dae7dc23a5701d3e00282fef2c0 SHA256 f630e24067bf6199a64f8fe8c5d6fc158cb4b153bda65ffc3f97b36a9cb08faf +AUX libGL.la-r2 733 RMD160 479612ab30c04ca0683c7d9edaf9ab3de783e4a9 SHA1 88656b7e7234ade4f5564373fd6eb5c040167655 SHA256 4856e7a2c31763ade41c93a395f3e80a2705ac2ab4dbd73e5161cdba132f407b +AUX nvidia 1510 RMD160 ca0d0e5375109d9edf682d9bdda743b7c693e4d4 SHA1 85cf9bff167dcc063ba61426523973e9598085f7 SHA256 b193cc3f6d6f39138720a2282d9f161fc8f2e8a15bc43d183a30eb879add06c5 +AUX nvidia-169.07 639 RMD160 8baddb6fd1bf7f0e2688870a78e8ace051d62e3f SHA1 b30487ba2a24a6b1359d1fd831eeb1705060953c SHA256 a8c4860f008d53776fda7a17b59524f271236559af688e9a2c9845cbbcba1577 +DIST NVIDIA-FreeBSD-x86-195.22.tar.gz 13985244 RMD160 3dd8ad031847cc79199d0420a9eb71ea2d29fc65 SHA1 10620f4ecc0a028060cc1db0e224d4dc6282f4fb SHA256 4c4f2e09445cb004428a9c7932761b4db5acce964b8a83ad82afca8949881ba9 +DIST NVIDIA-Linux-x86-195.22-pkg0.run 23909177 RMD160 831077eb6e0688be6dcf996e63017d1f365c0d9d SHA1 41ff2ddf1ed76243b3ff39f01e1aa52963bd3aad SHA256 e7bee9cda06b3dcbf357206f7f3fb14e24ed9d09294c7d889c748c87f8590eaf +DIST NVIDIA-Linux-x86_64-195.22-pkg2.run 40958146 RMD160 91d9db09c5b3e3e6b2c987c4ef51c69cc0a32cd2 SHA1 3be72dcd494d9359de8df7f38baf28c74a605485 SHA256 09ad67d5c3c16bea92b1192e47051adb88da253c2c4f32b985f404b13c0b1054 +EBUILD nvidia-drivers-195.22.ebuild 15142 RMD160 33fe49fe0b838ad93358a6927f5aa444ba2614d7 SHA1 5105c3d7eefaabb4b13b2cedd3dd540bdc186215 SHA256 9589c14b5b580e6e464fa57d448b823ff773bee8536c2f1420f458e302febec5 +MISC ChangeLog 4072 RMD160 a08a89d445c3ebf3c800e9b27d291826de6a1623 SHA1 72365d4211b3da547815be58d044acbf532e946a SHA256 135e27e956d6083fcbc59062215c94006037e04218b9dc4f7b8b8b4778857005 +MISC metadata.xml 167 RMD160 37158b954b5c56848025caab67dff8a1b7cb3146 SHA1 0a1a5e46367626858fc7f28de6fca63ccfa3f7e0 SHA256 4476ca9edabcb9df5e3e77607b3972df652fd44fb82ec2a751a9ce798da17a73 diff --git a/x11-drivers/nvidia-drivers/files/NVIDIA_arch.patch b/x11-drivers/nvidia-drivers/files/NVIDIA_arch.patch new file mode 100644 index 0000000..55647ea --- /dev/null +++ b/x11-drivers/nvidia-drivers/files/NVIDIA_arch.patch @@ -0,0 +1,13 @@ +--- usr/src/nv/makefile.org 2009-11-26 20:42:38.000000000 +0100 ++++ usr/src/nv/makefile 2009-11-26 20:43:07.000000000 +0100 +@@ -37,9 +37,7 @@ + CC ?= cc + HOST_CC ?= $(CC) + +-ifndef ARCH +- ARCH := $(shell uname -m | sed -e 's/i.86/i386/') +-endif ++ARCH = $(shell uname -m | sed -e 's/i.86/i386/') + + CONFTEST := sh ./conftest.sh "$(CC)" "$(HOST_CC)" $(ARCH) $(KERNEL_SOURCES) $(KERNEL_OUTPUT) + diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-185.18.36.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-185.18.36.ebuild deleted file mode 100644 index 8c2ab1e..0000000 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-185.18.36.ebuild +++ /dev/null @@ -1,559 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-185.18.31.ebuild,v 1.3 2009/08/03 03:58:20 spock Exp $ - -inherit eutils multilib versionator linux-mod flag-o-matic nvidia-driver - -X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}" -AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}" -X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}" - -DESCRIPTION="NVIDIA X11 driver and GLX libraries" -HOMEPAGE="http://www.nvidia.com/" -SRC_URI="x86? ( ftp://download.nvidia.com/XFree86/Linux-x86/${PV}/${X86_NV_PACKAGE}-pkg0.run ) - amd64? ( ftp://download.nvidia.com/XFree86/Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}-pkg2.run ) - x86-fbsd? ( ftp://download.nvidia.com/freebsd/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )" - -LICENSE="NVIDIA" -SLOT="0" -KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd" -IUSE="acpi custom-cflags gtk multilib kernel_linux" -RESTRICT="strip" -EMULTILIB_PKG="true" - -COMMON="= 2.6.7" - echo - ewarn "DO NOT file bug reports for kernel versions less than 2.6.7 as they will be ignored." - fi - - if ! use x86-fbsd; then - mkdir "${S}" - cd "${S}" - unpack_makeself - else - unpack ${A} - fi - - # Patches go below here, add brief description - cd "${S}" - use x86-fbsd && cd doc - - # 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 - - if use kernel_linux; then - # Quiet down warnings the user does not need to see - sed -i \ - -e 's:-Wpointer-arith::g' \ - -e 's:-Wsign-compare::g' \ - "${NV_SRC}"/Makefile.kbuild - - # If you set this then it's your own fault when stuff breaks :) - use custom-cflags && sed -i "s:-O:${CFLAGS}:" "${NV_SRC}"/Makefile.* - - # If greater than 2.6.5 use M= instead of SUBDIR= - convert_to_m "${NV_SRC}"/Makefile.kbuild - fi -} - -src_compile() { - # This is already the default on Linux, as there's no toplevel Makefile, but - # on FreeBSD there's one and triggers the kernel module build, as we install - # it by itself, pass this. - - cd "${NV_SRC}" - if use x86-fbsd; then - MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \ - LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die - elif use kernel_linux; then - linux-mod_src_compile - fi -} - -src_install() { - local MLTEST=$(type dyn_unpack) - - cd "${S}" - - if use kernel_linux; then - linux-mod_src_install - - VIDEOGROUP="$(egetent group video | cut -d ':' -f 3)" - if [ -z "$VIDEOGROUP" ]; then - eerror "Failed to determine the video group gid." - die "Failed to determine the video group gid." - fi - - # Add the aliases - [ -f "${FILESDIR}/nvidia" ] || die "nvidia missing in FILESDIR" - sed -e 's:PACKAGE:'${PF}':g' \ - -e 's:VIDEOGID:'${VIDEOGROUP}':' "${FILESDIR}"/nvidia-169.07 > \ - "${WORKDIR}"/nvidia - insinto /etc/modprobe.d - newins "${WORKDIR}"/nvidia nvidia.conf || die - elif use x86-fbsd; then - insinto /boot/modules - doins "${WORKDIR}/${NV_PACKAGE}/src/nvidia.kld" || die - - exeinto /boot/modules - doexe "${WORKDIR}/${NV_PACKAGE}/src/nvidia.ko" || die - fi - - if has_multilib_profile ; then - local OABI=${ABI} - for ABI in $(get_install_abis) ; do - src_install-libs - done - ABI=${OABI} - unset OABI - else - src_install-libs - fi - - is_final_abi || return 0 - - # Documentation - dodoc "${NV_DOC}"/{XF86Config.sample,Copyrights} - dohtml "${NV_DOC}"/html/* - if use x86-fbsd; then - dodoc "${NV_DOC}/README" - else - # Docs - newdoc "${NV_DOC}/README.txt" README - dodoc "${NV_DOC}/NVIDIA_Changelog" - fi - - # Helper Apps - dobin ${NV_EXEC}/nvidia-xconfig || die - dobin ${NV_EXEC}/nvidia-bug-report.sh || die -} - -# Install nvidia library: -# the first parameter is the place where to install it -# the second parameter is the base name of the library -# the third parameter is the provided soversion -donvidia() { - dodir $1 - exeinto $1 - - libname=$(basename $2) - - # libnvidia-cfg.so is no longer supplied in lib32; step over it gracefully - if [ -e $2.$3 ] ; then - doexe $2.$3 - dosym ${libname}.$3 $1/${libname} - [[ $3 != "1" ]] && dosym ${libname}.$3 $1/${libname}.1 - fi -} - -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 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 - donvidia ${NV_ROOT}/lib ${usrpkglibdir}/libGL.so ${sover} - donvidia ${NV_ROOT}/lib ${usrpkglibdir}/libGLcore.so ${sover} - - donvidia ${NV_ROOT}/lib ${usrpkglibdir}/libnvidia-cfg.so ${sover} - - dodir ${NO_TLS_ROOT} - 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.${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 - - if ! use x86-fbsd; then - # Install the .la file for libtool, to prevent e.g. bug #176423 - [ -f "${FILESDIR}/libGL.la-r2" ] || die "libGL.la-r2 missing in FILESDIR" - 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 - - [[ -f ${drvdir}/nvidia_drv.so ]] && \ - doexe ${drvdir}/nvidia_drv.so - - insinto /usr/${inslibdir} - [[ -f ${libdir}/libXvMCNVIDIA.a ]] && \ - doins ${libdir}/libXvMCNVIDIA.a - exeinto /usr/${inslibdir} - # fix Bug 131315 - [[ -f ${libdir}/libXvMCNVIDIA.so.${PV} ]] && \ - doexe ${libdir}/libXvMCNVIDIA.so.${PV} && \ - dosym libXvMCNVIDIA.so.${PV} \ - /usr/${inslibdir}/libXvMCNVIDIA.so - - exeinto ${NV_ROOT}/extensions - [[ -f ${libdir}/modules/libnvidia-wfb.so.${sover} ]] && \ - newexe ${libdir}/modules/libnvidia-wfb.so.${sover} libwfb.so - [[ -f ${extdir}/libglx.so.${sover} ]] && \ - newexe ${extdir}/libglx.so.${sover} libglx.so - - # Includes - insinto ${NV_ROOT}/include - doins ${incdir}/*.h - - #cuda - if [[ -f usr/include/cuda/cuda.h ]]; then - dodir /usr/include/cuda - insinto /usr/include/cuda - doins usr/include/cuda/*.h - - if [[ -f usr/${pkglibdir}/libcuda.so.${PV} ]]; then - dolib.so usr/${pkglibdir}/libcuda.so.${PV} - dosym libcuda.so.${PV} /usr/${inslibdir}/libcuda.so.1 - dosym libcuda.so.1 /usr/${inslibdir}/libcuda.so - fi - fi - - #vdpau - if [[ -f usr/include/vdpau/vdpau.h ]]; then - dodir /usr/include/vdpau - insinto /usr/include/vdpau - doins usr/include/vdpau/*.h - - for vdpaulib in vdpau_nvidia vdpau vdpau_trace; do - dolib.so usr/${pkglibdir}/lib${vdpaulib}.so.${PV} - dosym lib${vdpaulib}.so.${PV} /usr/${inslibdir}/lib${vdpaulib}.so.1 - dosym lib${vdpaulib}.so.1 /usr/${inslibdir}/lib${vdpaulib}.so - done - fi -} - -pkg_preinst() { - - # Clean the dynamic 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() { - if use kernel_linux; then - linux-mod_pkg_postinst - fi - - # Switch to the nvidia implementation - eselect opengl set --use-old nvidia - - echo - elog "You must be in the video group to use the NVIDIA device" - elog "For more info, read the docs at" - elog "http://www.gentoo.org/doc/en/nvidia-guide.xml#doc_chap3_sect6" - elog - - elog "This ebuild installs a kernel module and X driver. Both must" - elog "match explicitly in their version. This means, if you restart" - elog "X, you most modprobe -r nvidia before starting it back up" - elog - - elog "To use the NVIDIA GLX, run \"eselect opengl set nvidia\"" - elog - elog "nVidia has requested that any bug reports submitted have the" - elog "output of /usr/bin/nvidia-bug-report.sh included." - elog - elog "To work with compiz, you must enable the AddARGBGLXVisuals option." - elog - elog "If you are having resolution problems, try disabling DynamicTwinView." - echo -} - -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.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 kernel_linux; then - linux-mod_pkg_postrm - fi - eselect opengl set --use-old xorg-x11 -} diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-190.42.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-195.22.ebuild similarity index 86% rename from x11-drivers/nvidia-drivers/nvidia-drivers-190.42.ebuild rename to x11-drivers/nvidia-drivers/nvidia-drivers-195.22.ebuild index 67cbe04..7c96bb3 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-190.42.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-195.22.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-190.42-r2.ebuild,v 1.2 2009/10/31 20:18:19 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-190.42-r3.ebuild,v 1.4 2009/11/12 19:12:29 cardoe Exp $ EAPI="2" @@ -25,26 +25,25 @@ EMULTILIB_PKG="true" COMMON="=sys-libs/glibc-2.6.1 ) - multilib? ( app-emulation/emul-linux-x86-xlibs )" + multilib? ( app-emulation/emul-linux-x86-xlibs ) + >=app-admin/eselect-opengl-1.0.9" DEPEND="${COMMON} - kernel_linux? ( virtual/linux-sources ) - app-admin/eselect-opengl" + kernel_linux? ( virtual/linux-sources )" RDEPEND="${COMMON} kernel_linux? ( virtual/modutils ) - !>=media-libs/mesa-7.6 acpi? ( sys-power/acpid )" PDEPEND="x11-libs/libvdpau gtk? ( media-video/nvidia-settings )" -QA_TEXTRELS_x86="usr/lib/libXvMCNVIDIA.so.${PV} - usr/lib/opengl/nvidia/lib/libnvidia-tls.so.${PV} +QA_TEXTRELS_x86="usr/lib/opengl/nvidia/lib/libnvidia-tls.so.${PV} usr/lib/opengl/nvidia/lib/libGL.so.${PV} usr/lib/opengl/nvidia/lib/libGLcore.so.${PV} usr/lib/opengl/nvidia/extensions/libglx.so.${PV} usr/lib/xorg/modules/drivers/nvidia_drv.so usr/lib/libcuda.so.${PV} usr/lib/libnvidia-cfg.so.${PV} - usr/lib/libvdpau_nvidia.so.${PV}" + usr/lib/libvdpau_nvidia.so.${PV} + usr/lib/libXvMCNVIDIA.so.${PV}" QA_TEXTRELS_x86_fbsd="boot/modules/nvidia.ko usr/lib/opengl/nvidia/lib/libGL.so.1 @@ -108,12 +107,11 @@ QA_DT_HASH_amd64="usr/lib32/libcuda.so.${PV} usr/bin/nvidia-xconfig" QA_DT_HASH_x86="usr/lib/libcuda.so.${PV} - usr/lib/opengl/nvidia/lib/libnvidia-cfg.so.${PV} + usr/lib/libnvidia-cfg.so.${PV} usr/lib/opengl/nvidia/lib/libGLcore.so.${PV} usr/lib/opengl/nvidia/lib/libGL.so.${PV} usr/lib/opengl/nvidia/lib/libnvidia-tls.so.${PV} - usr/lib/opengl/nvidia/extensions/libwfb.so - usr/lib/opengl/nvidia/extensions/libglx.so + usr/lib/opengl/nvidia/extensions/libglx.so.${PV} usr/lib/xorg/modules/drivers/nvidia_drv.so usr/lib/libXvMCNVIDIA.so.${PV} usr/lib/libvdpau_nvidia.so.${PV} @@ -202,6 +200,8 @@ pkg_setup() { NV_SRC="${S}/src" NV_MAN="${S}/x11/man" NV_X11="${S}/obj" + NV_X11_DRV="${NV_X11}" + NV_X11_EXT="${NV_X11}" NV_SOVER=1 elif use kernel_linux; then NV_DOC="${S}/usr/share/doc" @@ -210,6 +210,8 @@ pkg_setup() { NV_SRC="${S}/usr/src/nv" NV_MAN="${S}/usr/share/man/man1" NV_X11="${S}/usr/X11R6/lib" + NV_X11_DRV="${NV_X11}/modules/drivers" + NV_X11_EXT="${NV_X11}/modules/extensions" NV_SOVER=${PV} else die "Could not determine proper NVIDIA package" @@ -245,6 +247,9 @@ src_prepare() { # Use some more sensible gl headers and make way for new glext.h epatch "${FILESDIR}"/NVIDIA_glx-glheader.patch + # Adjust detection of linux kernel + epatch "${FILESDIR}"/NVIDIA_arch.patch + if use kernel_linux; then # Quiet down warnings the user does not need to see sed -i \ @@ -305,11 +310,11 @@ src_install() { # Xorg DDX driver insinto /usr/$(get_libdir)/xorg/modules/drivers - doins ${NV_X11}/modules/drivers/nvidia_drv.so || die "failed to install nvidia_drv.so" + doins ${NV_X11_DRV}/nvidia_drv.so || die "failed to install nvidia_drv.so" # Xorg GLX driver insinto /usr/$(get_libdir)/opengl/nvidia/extensions - doins ${NV_X11}/modules/extensions/libglx.so.${NV_SOVER} || \ + doins ${NV_X11_EXT}/libglx.so.${NV_SOVER} || \ die "failed to install libglx.so" dosym /usr/$(get_libdir)/opengl/nvidia/extensions/libglx.so.${NV_SOVER} \ /usr/$(get_libdir)/opengl/nvidia/extensions/libglx.so || \ @@ -388,22 +393,19 @@ donvidia() { } src_install-libs() { - local pkglibdir=lib local inslibdir=$(get_libdir) - - if has_multilib_profile && [[ ${ABI} == "x86" ]] ; then - pkglibdir=lib32 - fi - local NV_ROOT="/usr/${inslibdir}/opengl/nvidia" - local libdir= sover= if use kernel_linux; then - libdir=usr/${pkglibdir} + if has_multilib_profile && [[ ${ABI} == "x86" ]] ; then + libdir=usr/lib32 + else + libdir=usr/lib + fi sover=${PV} else - pkglibdir=obj + libdir=obj # on FreeBSD it has just .1 suffix sover=1 fi @@ -411,50 +413,39 @@ src_install-libs() { # The GLX libraries donvidia ${NV_ROOT}/lib ${libdir}/libGL.so ${sover} donvidia ${NV_ROOT}/lib ${libdir}/libGLcore.so ${sover} - donvidia ${NV_ROOT}/lib ${libdir}/tls/libnvidia-tls.so ${sover} - - if ! use x86-fbsd; then - # Install the .la file for libtool, to prevent e.g. bug #176423 - [ -f "${FILESDIR}/libGL.la-r2" ] || die "libGL.la-r2 missing in FILESDIR" - 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 + if use x86-fbsd; then + donvidia ${NV_ROOT}/lib ${libdir}/libnvidia-tls.so ${sover} + else + donvidia ${NV_ROOT}/lib ${libdir}/tls/libnvidia-tls.so ${sover} fi #cuda - if [[ -f usr/${pkglibdir}/libcuda.so.${PV} ]]; then - dolib.so usr/${pkglibdir}/libcuda.so.${PV} - dosym libcuda.so.${PV} /usr/${inslibdir}/libcuda.so.1 + if [[ -f ${libdir}/libcuda.so.${sover} ]]; then + dolib.so ${libdir}/libcuda.so.${sover} + [[ "${sover}" != "1" ]] && dosym libcuda.so.${sover} /usr/${inslibdir}/libcuda.so.1 dosym libcuda.so.1 /usr/${inslibdir}/libcuda.so fi #vdpau - if [[ -f usr/${pkglibdir}/libvdpau_nvidia.so.${PV} ]]; then - dolib.so usr/${pkglibdir}/libvdpau_nvidia.so.${PV} - dosym libvdpau_nvidia.so.${PV} /usr/${inslibdir}/libvdpau_nvidia.so + if [[ -f ${libdir}/vdpau/libvdpau_nvidia.so.${sover} ]]; then + dolib.so ${libdir}/vdpau/libvdpau_nvidia.so.${sover} + dosym libvdpau_nvidia.so.${sover} /usr/${inslibdir}/libvdpau_nvidia.so fi # OpenCL # NOTE: This isn't currently available in the publicly released drivers. - if [[ -f usr/${pkglibdir}/libOpenCL.so.1.0.0 ]]; then + if [[ -f ${libdir}/libOpenCL.so.1.0.0 ]]; then - dolib.so usr/${pkglibdir}/libnvcompiler.so.${PV} - dosym libnvcompiler.so.${PV} /usr/${inslibdir}/libnvcompiler.so.1 - dosym libnvcompiler.so.1 /usr/${inslibdir}/libnvcompiler.so - - dolib.so usr/${pkglibdir}/libOpenCL.so.1.0.0 + dolib.so ${libdir}/libOpenCL.so.1.0.0 dosym libOpenCL.so.1.0.0 /usr/${inslibdir}/libOpenCL.so.1 dosym libOpenCL.so.1 /usr/${inslibdir}/libOpenCL.so fi } pkg_preinst() { + if use kernel_linux; then + linux-mod_pkg_postinst + fi # Clean the dynamic libGL stuff's home to ensure # we dont have stale libs floating around @@ -483,7 +474,7 @@ pkg_postinst() { elog "This ebuild installs a kernel module and X driver. Both must" elog "match explicitly in their version. This means, if you restart" - elog "X, you most modprobe -r nvidia before starting it back up" + elog "X, you must modprobe -r nvidia before starting it back up" elog elog "To use the NVIDIA GLX, run \"eselect opengl set nvidia\"" -- 2.11.4.GIT