From: Fabian Fingerle Date: Sun, 10 Jan 2010 12:49:50 +0000 (+0100) Subject: x11-drivers/nvidia-drivers-195.30: small fixes from portage X-Git-Url: https://repo.or.cz/w/otih-overlay.git/commitdiff_plain/f56b3f7f5670fd8a9aee4db0da3946bb39bf07d7 x11-drivers/nvidia-drivers-195.30: small fixes from portage --- diff --git a/x11-drivers/nvidia-drivers/ChangeLog b/x11-drivers/nvidia-drivers/ChangeLog index c976374..bb5ab78 100644 --- a/x11-drivers/nvidia-drivers/ChangeLog +++ b/x11-drivers/nvidia-drivers/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-drivers/nvidia-drivers # Copyright 2006-2009 Otih Overlay; distributed under the GPL version 2 + 10 Jan 2009, Fabian Fingerle + -files/NVIDIA_arch.patch, nvidia-drivers-195.30.ebuild: + Fixes from portage + 30 Dec 2009, Fabian Fingerle -nvidia-drivers-195.22.ebuild, +nvidia-drivers-195.30.ebuild: Bump diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest index 13d8997..3a55559 100644 --- a/x11-drivers/nvidia-drivers/Manifest +++ b/x11-drivers/nvidia-drivers/Manifest @@ -1,4 +1,3 @@ -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 @@ -7,6 +6,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 15142 RMD160 33fe49fe0b838ad93358a6927f5aa444ba2614d7 SHA1 5105c3d7eefaabb4b13b2cedd3dd540bdc186215 SHA256 9589c14b5b580e6e464fa57d448b823ff773bee8536c2f1420f458e302febec5 -MISC ChangeLog 4198 RMD160 f145956b7e5cd0cc0e425e6528ff8918dc757a4c SHA1 bfbfa1fbd2ed102f7de547c0bde238e62d3276ec SHA256 d0e51aa35035a8bdeaf8b29b09f09f1cef290bebb5d0a436ac331d698eadec90 +EBUILD nvidia-drivers-195.30.ebuild 15318 RMD160 7af6818fc8f916150608de90f2ab2df4df187fbe SHA1 383d24a399ba1660402cf337c9a7f1748a22d402 SHA256 38e5f0ec3227bd8eb5cc1920f59cbd3a30ee397d42e0c31f11b3b77c773abcef +MISC ChangeLog 4334 RMD160 29092b806da5f42fc8e587cf9fdf0ebdaadd2d23 SHA1 f6a6db36000f15f372361c901e23f6316061499a SHA256 7cf5084f99f766bddaaee3f7c49dc0e75403d4bd89e4ab5a18ed58b9ea97f30d 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 deleted file mode 100644 index 55647ea..0000000 --- a/x11-drivers/nvidia-drivers/files/NVIDIA_arch.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- 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-195.30.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-195.30.ebuild index 7c96bb3..d08481f 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-195.30.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-195.30.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 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-r3.ebuild,v 1.4 2009/11/12 19:12:29 cardoe Exp $ @@ -32,7 +32,7 @@ DEPEND="${COMMON} RDEPEND="${COMMON} kernel_linux? ( virtual/modutils ) acpi? ( sys-power/acpid )" -PDEPEND="x11-libs/libvdpau +PDEPEND=">=x11-libs/libvdpau-0.3-r1 gtk? ( media-video/nvidia-settings )" QA_TEXTRELS_x86="usr/lib/opengl/nvidia/lib/libnvidia-tls.so.${PV} @@ -247,9 +247,6 @@ 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 \ @@ -428,14 +425,19 @@ 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 + dosym libvdpau_nvidia.so.${sover} /usr/${inslibdir}/libvdpau_nvidia.so.1 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}/libOpenCL.so.1.0.0 dosym libOpenCL.so.1.0.0 /usr/${inslibdir}/libOpenCL.so.1 dosym libOpenCL.so.1 /usr/${inslibdir}/libOpenCL.so