From 255b56d1d6b98673c9fa6f8d43e6c3f662861d88 Mon Sep 17 00:00:00 2001 From: Fabian Fingerle Date: Sun, 31 Jan 2010 21:01:18 +0100 Subject: [PATCH] x11-drivers/nvidia-drivers-195.30: fixes --- x11-drivers/nvidia-drivers/Manifest | 4 ++-- x11-drivers/nvidia-drivers/files/NVIDIA_arch.patch | 14 ++++++++------ x11-drivers/nvidia-drivers/nvidia-drivers-195.30.ebuild | 17 ++++++++--------- 3 files changed, 18 insertions(+), 17 deletions(-) diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest index 00f9e12..09e8198 100644 --- a/x11-drivers/nvidia-drivers/Manifest +++ b/x11-drivers/nvidia-drivers/Manifest @@ -1,4 +1,4 @@ -AUX NVIDIA_arch.patch 389 RMD160 fe1174db988281ab36a2d6085e359fdb5257becf SHA1 c292a589f5db0d36d9eeb31ef3a4c4d374d6e1cf SHA256 b9c1889f1d6c66b87a4e79802d039b5a78b66275c190012a9fabc7dae7c89b05 +AUX NVIDIA_arch.patch 393 RMD160 a7cb24efd6d9f7175c9f80df311778c6b77740f5 SHA1 8b72b6624461d376ce3d52a7f309e5419304b4fe SHA256 02a500ced784a99ec62e7f5b35f8ed5e888b477827608d648ea6eb1b833496f9 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 @@ -7,6 +7,6 @@ AUX nvidia-169.07 639 RMD160 8baddb6fd1bf7f0e2688870a78e8ace051d62e3f SHA1 b3048 DIST NVIDIA-FreeBSD-x86-195.30.tar.gz 14178989 RMD160 7057042c2e21108e7e7cb8ec825582e6a0f15a4f SHA1 32a79c7ccac5fa5311d839f20b73d202a022205f SHA256 0c8e7519b5cbafae4eef68f93e9a662678582b6dd0313f553ab960beacc7d64e DIST NVIDIA-Linux-x86-195.30-pkg0.run 24215361 RMD160 2bd3435a1529a820d207651519323fcbe10555da SHA1 ffccb94f8ba136269b4ba87e3463fd86fbe83869 SHA256 67d4681c80e7586cf515b96fde25f5a837dfa6e685ea2e3ac5607f3a582ef69d DIST NVIDIA-Linux-x86_64-195.30-pkg2.run 41604498 RMD160 48b80c01c4472346b9dd4468ad25df0396a66a01 SHA1 f396da8264f17b363f3fed87881fde51c61dc6fc SHA256 5ef42e90ca2c24a2386705e6db5922579ac8f969b433bc280edf6cfd63ac4735 -EBUILD nvidia-drivers-195.30.ebuild 15395 RMD160 11d537c5f46c6ae08c88e2fbec7acf7ce0a2d09e SHA1 084c72aeeaebaa25444c87d1a77a228487f7363b SHA256 dd1cdcf45221f03e35401f30dad7ed9866dc0cf79335c7339d1f8ce2b6add4ef +EBUILD nvidia-drivers-195.30.ebuild 15416 RMD160 7fe6982734e0bff299762be35a0d763f1ba0f300 SHA1 def3985e4032d9bcfd7031b8b4eec89bddfb8301 SHA256 6889849941769600daffe71539e978deb63a9f6f5b17cc9a5b143deb72e3bb6b MISC ChangeLog 4470 RMD160 7a6b81fb166b6480c0e89c42e411be3b0d4d6477 SHA1 7eec55cde04c4a0ff2817df210d20f307df4e925 SHA256 a06ee95003f656c3d189d06d18267ea48e22182c16fe36f01726fc9d9906dd45 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 index dc794be..918cdca 100644 --- a/x11-drivers/nvidia-drivers/files/NVIDIA_arch.patch +++ b/x11-drivers/nvidia-drivers/files/NVIDIA_arch.patch @@ -1,12 +1,14 @@ ---- 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 +--- 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) - + 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) + -CONFTEST := sh ./conftest.sh "$(CC)" "$(HOST_CC)" $(ARCH) $(KERNEL_SOURCES) $(KERNEL_OUTPUT) diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-195.30.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-195.30.ebuild index d3c8091..fed90ed 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-195.30.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-195.30.ebuild @@ -18,7 +18,7 @@ SRC_URI="x86? ( ftp://download.nvidia.com/XFree86/Linux-x86/${PV}/${X86_NV_PACKA LICENSE="NVIDIA" SLOT="0" -KEYWORDS="" +KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd" IUSE="acpi custom-cflags gtk multilib kernel_linux" RESTRICT="strip" EMULTILIB_PKG="true" @@ -32,7 +32,7 @@ DEPEND="${COMMON} RDEPEND="${COMMON} kernel_linux? ( virtual/modutils ) acpi? ( sys-power/acpid )" -PDEPEND=">=x11-libs/libvdpau-0.3-r1 +PDEPEND="x11-libs/libvdpau gtk? ( media-video/nvidia-settings )" QA_TEXTRELS_x86="usr/lib/opengl/nvidia/lib/libnvidia-tls.so.${PV} @@ -65,7 +65,7 @@ QA_EXECSTACK_x86="usr/lib/opengl/nvidia/lib/libGL.so.${PV} QA_EXECSTACK_amd64="usr/lib32/opengl/nvidia/lib/libGLcore.so.${PV} usr/lib32/opengl/nvidia/lib/libGL.so.${PV} - usr/lib64/libnvcompiler.so.${PV} + usr/lib64/libnvidia-compiler.so.${PV} usr/lib64/libXvMCNVIDIA.so.${PV} usr/lib64/libXvMCNVIDIA.a:NVXVMC.o usr/lib64/libnvidia-cfg.so.${PV} @@ -87,7 +87,7 @@ QA_WX_LOAD_amd64="usr/lib32/opengl/nvidia/lib/libGL.so.${PV} usr/lib64/opengl/nvidia/lib/libGLcore.so.${PV} usr/lib64/opengl/nvidia/extensions/libglx.so.${PV}" -QA_SONAME_amd64="usr/lib64/libnvcompiler.so.${PV}" +QA_SONAME_amd64="usr/lib64/libnvidia-compiler.so.${PV}" QA_DT_HASH_amd64="usr/lib32/libcuda.so.${PV} usr/lib32/opengl/nvidia/lib/libGL.so.${PV} @@ -428,18 +428,17 @@ src_install-libs() { #vdpau if [[ -f ${libdir}/vdpau/libvdpau_nvidia.so.${sover} ]]; then - insinto /usr/${inslibdir}/vdpau dolib.so ${libdir}/vdpau/libvdpau_nvidia.so.${sover} - dosym libvdpau_nvidia.so.${sover} /usr/${inslibdir}/libvdpau_nvidia.so.1 + dosym libvdpau_nvidia.so.${sover} /usr/${inslibdir}/vdpau/libvdpau_nvidia.so. fi # OpenCL # NOTE: This isn't currently available in the publicly released drivers. if [[ -f ${libdir}/libOpenCL.so.1.0.0 ]]; then - dolib.so ${libdir}/libnvcompiler.so.${sover} - [[ "${sover}" != "1" ]] && dosym libnvcompiler.so.${sover} /usr/${inslibdir}/libnvcompiler.so.1 - dosym libnvcompiler.so.1 /usr/${inslibdir}/libnvcompiler.so + dolib.so ${libdir}/libnvidia-compiler.so.${sover} + [[ "${sover}" != "1" ]] && dosym libnvidia-compiler.so.${sover} /usr/${inslibdir}/libnvidia-compiler.so.1 + dosym libnvidia-compiler.so.1 /usr/${inslibdir}/libnvidia-compiler.so dolib.so ${libdir}/libOpenCL.so.1.0.0 dosym libOpenCL.so.1.0.0 /usr/${inslibdir}/libOpenCL.so.1 -- 2.11.4.GIT