From a11e96c94ef5068dc92127fc2a6c2d7a91dbf974 Mon Sep 17 00:00:00 2001 From: Fabian Fingerle Date: Tue, 19 May 2009 12:15:05 +0200 Subject: [PATCH] x11-drivers/nvidia-drivers-185.18.10: bump beta --- Documentation/package.keywords/nvidia-beta | 6 +- media-video/nvidia-settings/ChangeLog | 4 + media-video/nvidia-settings/Manifest | 8 +- .../nvidia-settings-185.18.08.ebuild | 69 --- ....04.ebuild => nvidia-settings-185.18.10.ebuild} | 0 x11-drivers/nvidia-drivers/ChangeLog | 4 + x11-drivers/nvidia-drivers/Manifest | 14 +- .../nvidia-drivers/nvidia-drivers-185.18.08.ebuild | 527 --------------------- ...8.04.ebuild => nvidia-drivers-185.18.10.ebuild} | 0 9 files changed, 18 insertions(+), 614 deletions(-) delete mode 100644 media-video/nvidia-settings/nvidia-settings-185.18.08.ebuild rename media-video/nvidia-settings/{nvidia-settings-185.18.04.ebuild => nvidia-settings-185.18.10.ebuild} (100%) delete mode 100644 x11-drivers/nvidia-drivers/nvidia-drivers-185.18.08.ebuild rename x11-drivers/nvidia-drivers/{nvidia-drivers-185.18.04.ebuild => nvidia-drivers-185.18.10.ebuild} (100%) diff --git a/Documentation/package.keywords/nvidia-beta b/Documentation/package.keywords/nvidia-beta index 748fa24..c69922b 100644 --- a/Documentation/package.keywords/nvidia-beta +++ b/Documentation/package.keywords/nvidia-beta @@ -1,4 +1,2 @@ -# 185.18.05 still no keywords, you can add it yourself - -=media-video/nvidia-settings-185.18.04 ** -=x11-drivers/nvidia-drivers-185.18.04 ** +=media-video/nvidia-settings-185.18.10 ** +=x11-drivers/nvidia-drivers-185.18.10 ** diff --git a/media-video/nvidia-settings/ChangeLog b/media-video/nvidia-settings/ChangeLog index c733b41..87b0577 100644 --- a/media-video/nvidia-settings/ChangeLog +++ b/media-video/nvidia-settings/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-drivers/nvidia-drivers # Copyright 2006-2009 Otih Overlay; distributed under the GPL version 2 + 19 May 2009, Fabian Fingerle + -nvidia-settings-185.18.04.ebuild, -nvidia-settings-185.18.08.ebuild, +nvidia-settings-185.18.10.ebuild + Bump beta + 14 May 2009, Fabian Fingerle -nvidia-settings-180.53.ebuild, +nvidia-settings-180.60.ebuild: Bump prerelease diff --git a/media-video/nvidia-settings/Manifest b/media-video/nvidia-settings/Manifest index a14d375..d905dbf 100644 --- a/media-video/nvidia-settings/Manifest +++ b/media-video/nvidia-settings/Manifest @@ -2,11 +2,9 @@ AUX icon/nvidia-settings.desktop 194 RMD160 a59dae254f65d9665118629b489b33b0fd87 AUX icon/nvidia-settings.png 3790 RMD160 a0a8c319ca4b0100d2b7502b6a3dba20a3dc71b9 SHA1 ff485bf300c6e0c56b3d1f08ee87e4d9a425db65 SHA256 171e2d20dfe7fbbb86bf9d3c0bb22909529b351fb06b614018a9597ff2456f12 DIST nvidia-settings-180.37.05.tar.gz 1342121 RMD160 402acf035919a7750e5562f5d0ded08cbd9ded59 SHA1 46bfe6221b427c4180da32a1232e3ba3e2b71ef5 SHA256 2cc1668f958bd586c36ac703ba31ac87c9094f4974eac136d6de64a69ecdc3c8 DIST nvidia-settings-180.60.tar.gz 1342058 RMD160 28b88b149eae31ab2da897d2ade8bbe75e5086f6 SHA1 ca43e2834c859d18f387bdae20f8b5be65c010e1 SHA256 b62d12b864559ab57ca837111dd4ad7ae53850349a3f5eacc804ad0b517fb477 -DIST nvidia-settings-185.18.04.tar.gz 1347205 RMD160 f882ce07a1022fc354031ff3a0f67c05c9ae4f2b SHA1 9fd3cc81219b1adda86ce0a5bb1965f2d4352189 SHA256 15865e6630ca48b049f04a01bf7e00565dc0e85979d87500f056b942d2ddb44f -DIST nvidia-settings-185.18.08.tar.gz 1347259 RMD160 bf45ba984d767a2ec2a156a63858f6c02346ae1f SHA1 5891ec8753154d419d9ff1e84c2acb8f20c3b8af SHA256 b043c00d9703bfccfe7f21241ab99701bba85aa2c37d190dba2c9ec84d38dba4 +DIST nvidia-settings-185.18.10.tar.gz 1348223 RMD160 b4d17ee8720a7c0495e77f20d35536aba9833bca SHA1 710f63441012e9e894c3dbbfe9309fba5e6f99c1 SHA256 94dcbedc569f49f2384f91ac94010bc6c13f50fe1008704f49811b76fdc851e6 EBUILD nvidia-settings-180.37.05.ebuild 1721 RMD160 f7d6e47cad4e905b8e92208dc97dd1938bbc2394 SHA1 4446f0471e2c2057c9c9bdb1a99e568d69e29390 SHA256 55fbb7c79182e1c8ac8d1edf7b68feccd3f885c0e95520e5c1f2e45965108b10 EBUILD nvidia-settings-180.60.ebuild 1721 RMD160 f7d6e47cad4e905b8e92208dc97dd1938bbc2394 SHA1 4446f0471e2c2057c9c9bdb1a99e568d69e29390 SHA256 55fbb7c79182e1c8ac8d1edf7b68feccd3f885c0e95520e5c1f2e45965108b10 -EBUILD nvidia-settings-185.18.04.ebuild 1721 RMD160 f7d6e47cad4e905b8e92208dc97dd1938bbc2394 SHA1 4446f0471e2c2057c9c9bdb1a99e568d69e29390 SHA256 55fbb7c79182e1c8ac8d1edf7b68feccd3f885c0e95520e5c1f2e45965108b10 -EBUILD nvidia-settings-185.18.08.ebuild 1721 RMD160 f7d6e47cad4e905b8e92208dc97dd1938bbc2394 SHA1 4446f0471e2c2057c9c9bdb1a99e568d69e29390 SHA256 55fbb7c79182e1c8ac8d1edf7b68feccd3f885c0e95520e5c1f2e45965108b10 -MISC ChangeLog 1973 RMD160 5052dee4318a9f5e847a76f7d3a5b585fecdb4c2 SHA1 3582017b5740375d5854ac7b0a3be3542f72498c SHA256 ba144c1600c829e90b6d1d9678b9fca70ebab6062c97e5e84f3492e632cf3183 +EBUILD nvidia-settings-185.18.10.ebuild 1721 RMD160 f7d6e47cad4e905b8e92208dc97dd1938bbc2394 SHA1 4446f0471e2c2057c9c9bdb1a99e568d69e29390 SHA256 55fbb7c79182e1c8ac8d1edf7b68feccd3f885c0e95520e5c1f2e45965108b10 +MISC ChangeLog 2146 RMD160 9e72abc90ec409db91dd0d1942ce388d2ee91a4c SHA1 5c5027558e9143b837da1eb792894bdd0d41c4da SHA256 092b2eecaa12d0eef234a5b1a5fd55a227694f6d7d238ccf7b6dc5ec5579ddf3 MISC metadata.xml 313 RMD160 ef0fd7e80d48cd3ca74f690da28124320f1a5bd9 SHA1 07663307a196dcdd3ae7fd14a87476f7a7aaa67a SHA256 d6e8ff073fd6c7c27d8401c2ccc11bd62003fca57618d4ebc2c3bcc2f3beec21 diff --git a/media-video/nvidia-settings/nvidia-settings-185.18.08.ebuild b/media-video/nvidia-settings/nvidia-settings-185.18.08.ebuild deleted file mode 100644 index f164781..0000000 --- a/media-video/nvidia-settings/nvidia-settings-185.18.08.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.04.ebuild b/media-video/nvidia-settings/nvidia-settings-185.18.10.ebuild similarity index 100% rename from media-video/nvidia-settings/nvidia-settings-185.18.04.ebuild rename to media-video/nvidia-settings/nvidia-settings-185.18.10.ebuild diff --git a/x11-drivers/nvidia-drivers/ChangeLog b/x11-drivers/nvidia-drivers/ChangeLog index 72f6da5..308a99b 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 + 19 May 2009, Fabian Fingerle + +nvidia-drivers-185.18.10.ebuild, -nvidia-drivers-185.18.04.ebuild, -nvidia-drivers-185.18.08.ebuild + Bump beta + 14 May 2009, Fabian Fingerle +nvidia-drivers-180.60.ebuild, -nvidia-drivers-180.53.ebuild: Bump prerelease diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest index 12b9a21..4271744 100644 --- a/x11-drivers/nvidia-drivers/Manifest +++ b/x11-drivers/nvidia-drivers/Manifest @@ -6,19 +6,15 @@ AUX nvidia 1510 RMD160 ca0d0e5375109d9edf682d9bdda743b7c693e4d4 SHA1 85cf9bff167 AUX nvidia-169.07 639 RMD160 8baddb6fd1bf7f0e2688870a78e8ace051d62e3f SHA1 b30487ba2a24a6b1359d1fd831eeb1705060953c SHA256 a8c4860f008d53776fda7a17b59524f271236559af688e9a2c9845cbbcba1577 DIST NVIDIA-FreeBSD-x86-180.37.05.tar.gz 18796655 RMD160 9692fd5de9924dd2a3de91046463ec6e458af6f0 SHA1 d386d6f178c9f119685c16a5a271069d8985b4cc SHA256 4f23f748f56c6e734760643915b5cda3287d651c56ebf196f6692a127e0411a3 DIST NVIDIA-FreeBSD-x86-180.60.tar.gz 18594717 RMD160 f295b96305327c1d125709f35b7a863ad0dfa18e SHA1 a9051cd69a22748c88796a5903d893fcee24718d SHA256 7ddf39476b42ccf1f0585340ad6b384d5c7cdc5825cba33f81138156077bf89a -DIST NVIDIA-FreeBSD-x86-185.18.04.tar.gz 19185492 RMD160 5e3e2504c82a060e33534fa18263ff2230f5b6d1 SHA1 4c41b95a8d84cd96a58f5fc51fac433f09a8c2eb SHA256 b84e769c7ff06478d1989c88475792284388c8e0ed78de31af7f0b0f32a3dc4c -DIST NVIDIA-FreeBSD-x86-185.18.08.tar.gz 19190441 RMD160 e9ad6dcc5874517c3c929cd40e05d6e21cd03b5e SHA1 3c79a5e252380105e3c044059fd983dfdbb27560 SHA256 9f9ee6b0e680a3d6f863d0cc5952194b89656d05941944d2df3c0796d049f6da +DIST NVIDIA-FreeBSD-x86-185.18.10.tar.gz 19196858 RMD160 ac2fe66f332be7f01054568ea1eaf068f6b00afa SHA1 c0856f53312bded5d10d7983a32b2a0382b27399 SHA256 3ad0d692fc0258517c58527c9e1ab37a8d9fadc273d49323b3850aeeb23a12e5 DIST NVIDIA-Linux-x86-180.37.05-pkg0.run 13667040 RMD160 d841a7cc72e1204ad8806ebfeb0411320183af96 SHA1 1151eda8e76122eb461fbd986acb3ec33b697344 SHA256 4c574c7d2b5dba9859fac24d00e0dae36b4b00cbc90caa316bb10b9b1a4a064a DIST NVIDIA-Linux-x86-180.60-pkg0.run 13574190 RMD160 fd43b3a3bdd05b292b6f8f363c45b3ae677f5ad0 SHA1 d9a68f1536edb4f276634acd8ec2377ea252de69 SHA256 42706637c02dfe2aad5df69f5cc2b3ce0ad13021c6a9b49e42c6e5052eaa7d89 -DIST NVIDIA-Linux-x86-185.18.04-pkg0.run 14092597 RMD160 54c92315a57174a251357af42b856ec08878cc29 SHA1 a3934f0f269b97073a9182f2812e799a05509052 SHA256 fc49fbb40c8ab53cf58c1eb52e44ae0ae55316cdd7e4421f1a81e1ce3feb1d62 -DIST NVIDIA-Linux-x86-185.18.08-pkg0.run 14096920 RMD160 0ce540de2aaedd7f7d6c772d46cea636a61846ff SHA1 744819a07882a2f31b22c353711fa12d267a89de SHA256 c737752674337854c77970ee4dada61e96501c2ca15c252b47d8bbbdc8aa9daa +DIST NVIDIA-Linux-x86-185.18.10-pkg0.run 14101763 RMD160 751b831da5b5e8a73564e72677fc274ad39c1016 SHA1 2962bc2735d8d6976f090b25b4ba45494dbdbb2e SHA256 555d63d2dd87fd84a3509d2b2bb5dc18ebe7374567c36e94119ba642f829cb2c DIST NVIDIA-Linux-x86_64-180.37.05-pkg2.run 21702197 RMD160 551fbda4d617c693403ac9d6c4f797ec28b63d74 SHA1 f1fde83e9e1641f9e447fe7c277c893a158cd4c0 SHA256 714133719b8df1c9813f8265f6a446604b6d717f9ed8bc7391639e5a659670b6 DIST NVIDIA-Linux-x86_64-180.60-pkg2.run 21479961 RMD160 150d7841814b58b7e1f570264ef7a3b06df7ad84 SHA1 606b6a9b1cd9fae7d3e3cd11de64b8c6f97b4518 SHA256 69eee4532031cb4107ea5d67743e8a210f83e2e3aa688d50c7f2f0bc8cc95933 -DIST NVIDIA-Linux-x86_64-185.18.04-pkg2.run 22168047 RMD160 0f428d3290d8673ea1f745564004bb03adb75581 SHA1 0e695d7ce87232111e9da95c992691b1276f95ad SHA256 ef9f38b60402144fcfb63b147c3b8b77ef5d1cbbb4ed8f0708b9fa2c480cd06b -DIST NVIDIA-Linux-x86_64-185.18.08-pkg2.run 22179613 RMD160 16c8d7a55e5a2b672d2514e52957da1ffde1be36 SHA1 b3b5e6b0e9f1425799abc7ecb6769cca2e42697b SHA256 85e87ba4554cbf1f63c90a4cea0851b43d618a3b9a4372e40078acf049b9bb56 +DIST NVIDIA-Linux-x86_64-185.18.10-pkg2.run 22190194 RMD160 9d443270a323e8c63fc66219d1d1a75efa453c39 SHA1 f4af77b304e295087658e5f9e6ae7afbd3e2ca8c SHA256 9fb93d78f84081765b145e2c1b046c23ef2fe8fa1c66abd66d8b93a2f6a30126 EBUILD nvidia-drivers-180.37.05.ebuild 15289 RMD160 cf47a2d7d01af2ce0e6a6301dcbe164080719621 SHA1 9e9535233e88c745e3456cbe7494d01872b006ef SHA256 de96edf81436ce01e4d781a4331bd8dfc3989229607cbcfb494be46ceabafd52 EBUILD nvidia-drivers-180.60.ebuild 15289 RMD160 cf47a2d7d01af2ce0e6a6301dcbe164080719621 SHA1 9e9535233e88c745e3456cbe7494d01872b006ef SHA256 de96edf81436ce01e4d781a4331bd8dfc3989229607cbcfb494be46ceabafd52 -EBUILD nvidia-drivers-185.18.04.ebuild 15289 RMD160 cf47a2d7d01af2ce0e6a6301dcbe164080719621 SHA1 9e9535233e88c745e3456cbe7494d01872b006ef SHA256 de96edf81436ce01e4d781a4331bd8dfc3989229607cbcfb494be46ceabafd52 -EBUILD nvidia-drivers-185.18.08.ebuild 15289 RMD160 cf47a2d7d01af2ce0e6a6301dcbe164080719621 SHA1 9e9535233e88c745e3456cbe7494d01872b006ef SHA256 de96edf81436ce01e4d781a4331bd8dfc3989229607cbcfb494be46ceabafd52 -MISC ChangeLog 2252 RMD160 2e48d66b7f382adef2db8975720aa1825bf8615f SHA1 fc9216a9621e733e6575201e766c0a021c413572 SHA256 3caa3a7a2231addc100240664341c7e0b5f1df9a30adeb2beeffd2d6235ac205 +EBUILD nvidia-drivers-185.18.10.ebuild 15289 RMD160 cf47a2d7d01af2ce0e6a6301dcbe164080719621 SHA1 9e9535233e88c745e3456cbe7494d01872b006ef SHA256 de96edf81436ce01e4d781a4331bd8dfc3989229607cbcfb494be46ceabafd52 +MISC ChangeLog 2422 RMD160 1f17bfa8a466ed7bd95651757885effcbbb352c8 SHA1 241054c4109a6ea62d9f0fcd49b35e43411b9241 SHA256 e5c6c243d5547f1fae860bee672c057d7a058bc2902405aa487e968fdbb5018f MISC metadata.xml 167 RMD160 37158b954b5c56848025caab67dff8a1b7cb3146 SHA1 0a1a5e46367626858fc7f28de6fca63ccfa3f7e0 SHA256 4476ca9edabcb9df5e3e77607b3972df652fd44fb82ec2a751a9ce798da17a73 diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-185.18.08.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-185.18.08.ebuild deleted file mode 100644 index 8a72922..0000000 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-185.18.08.ebuild +++ /dev/null @@ -1,527 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -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="" -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 - - # allow on board sensors to work with lm_sensors - if use kernel_linux; then - epatch "${FILESDIR}"/NVIDIA_i2c-hwmon.patch - fi - - 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 - doins "${WORKDIR}"/nvidia || 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 - elif use amd64 ; then - src_install-libs lib32 $(get_multilibdir) - src_install-libs lib $(get_libdir) - - rm -rf "${D}"/usr/$(get_multilibdir)/opengl/nvidia/include - rm -rf "${D}"/usr/$(get_multilibdir)/opengl/nvidia/extensions - else - src_install-libs - fi - - is_final_abi || return 0 - - # 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-185.18.04.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-185.18.10.ebuild similarity index 100% rename from x11-drivers/nvidia-drivers/nvidia-drivers-185.18.04.ebuild rename to x11-drivers/nvidia-drivers/nvidia-drivers-185.18.10.ebuild -- 2.11.4.GIT