diff options
| -rw-r--r-- | x11-drivers/nvidia-drivers/ChangeLog | 5 | ||||
| -rw-r--r-- | x11-drivers/nvidia-drivers/Manifest | 4 | ||||
| -rw-r--r-- | x11-drivers/nvidia-drivers/nvidia-drivers-295.33.ebuild | 46 |
3 files changed, 27 insertions, 28 deletions
diff --git a/x11-drivers/nvidia-drivers/ChangeLog b/x11-drivers/nvidia-drivers/ChangeLog index ee317a9fea55..073ea53f91c6 100644 --- a/x11-drivers/nvidia-drivers/ChangeLog +++ b/x11-drivers/nvidia-drivers/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-drivers/nvidia-drivers # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.326 2012/03/23 16:17:12 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.327 2012/03/26 18:11:12 cardoe Exp $ + + 26 Mar 2012; Doug Goldstein <cardoe@gentoo.org> nvidia-drivers-295.33.ebuild: + ebuild updates that were meant to be committed part of the original commit. *nvidia-drivers-295.33 (23 Mar 2012) diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest index 5b8d3544a895..61a6e0200fd6 100644 --- a/x11-drivers/nvidia-drivers/Manifest +++ b/x11-drivers/nvidia-drivers/Manifest @@ -40,7 +40,7 @@ EBUILD nvidia-drivers-275.43.ebuild 17128 RMD160 a2db0ad52163bfac39c77700ed2ceca EBUILD nvidia-drivers-290.10-r2.ebuild 17535 RMD160 131955b464e0142422dc756d6e9dce3c86ce0781 SHA1 9267af0661366735ea1f6788ef04fb949ee7a920 SHA256 d147ad4c97a8289e5e08799ebf3a4afd4835486aa9ca4e35207f6ba4ffbb5071 EBUILD nvidia-drivers-290.10.ebuild 17126 RMD160 fb0ec889be40c7d3ff58e2c7b4a766aaf63a88f9 SHA1 b60e00df8938acb1ea77bc035d274f9f5b6ea184 SHA256 c768c98da5878b3ee17c84f1b7d2fe999b042d39e6388c28e9cca31c50b50b23 EBUILD nvidia-drivers-295.20-r1.ebuild 17717 RMD160 cbfcdde3d546d8e99b1a48f5120806443685a90c SHA1 fee41516f4d97e65102e170cb880df5ee44ca7b5 SHA256 3fa2c26e5ebadbfd0b6d9a678ee829f344550ce946ee99798aad5f455c0966ab -EBUILD nvidia-drivers-295.33.ebuild 17842 RMD160 8d405a77d5e51c669c989dd05aa61eec5819bbb9 SHA1 5b06092fcf18735d8f7ea2ce48b1e9d38bdf3f69 SHA256 90814c6470f9c3e679406d47696e6a42ec114f8da07c55aca4b80cfb096164e7 +EBUILD nvidia-drivers-295.33.ebuild 17959 RMD160 3357d4c7ded8875aee0f9ca1f77ccb9fdeb9798f SHA1 be542ea65d76cf08cb44fda30c242ffe34cd6502 SHA256 a584b8df81493297d10b8ace01f2c5ff1255f33f6e19f0d2d85675985a9330aa EBUILD nvidia-drivers-96.43.20.ebuild 15606 RMD160 021845276b0cdec4989351d430ce9dfb5034f3e4 SHA1 f9cd2e84e9ae4a9afffa439a1db1366058792e75 SHA256 7343d4e7ec6b4354efabe420ba6413e5e369fe6897eee51cbb3ae49b39d31b13 -MISC ChangeLog 70046 RMD160 e86760b4275232e3135bf4f3521495c2822a9a28 SHA1 198dcc7b7a01fb932907f278ababb16308c82131 SHA256 8f59a8ac1bf9cb2b33cefd11b81183f1dd41411774e71075f864373360188b67 +MISC ChangeLog 70205 RMD160 84253ae79072d52016c227d932647f12bd43bf11 SHA1 a31702076fc6efe3e8673ff57b87f829166ae9af SHA256 dcf1f733b26ed9251b9840a953b3b8cf9419464eb1adc5fdfdea7d626e86968d MISC metadata.xml 653 RMD160 29f9c8662d2c08a9c33921ef606bf7059a30752b SHA1 8653d3a29f241f09b6b377c74f3d6a50bad69bbb SHA256 0e645c5ff2f1726137be71aaabd6c2a661602aa3526ef0500892dbfd63f5c31b diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-295.33.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-295.33.ebuild index 7f0b12fdd7d5..305c17ca2ee1 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-295.33.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-295.33.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-295.33.ebuild,v 1.1 2012/03/23 16:17:12 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-295.33.ebuild,v 1.2 2012/03/26 18:11:12 cardoe Exp $ EAPI="2" @@ -213,6 +213,11 @@ pkg_setup() { MODULE_NAMES="nvidia(video:${S}/kernel)" BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \ SYSOUT=${KV_OUT_DIR} CC=$(tc-getBUILD_CC)" + # linux-mod_src_compile calls set_arch_to_kernel, which + # sets the ARCH to x86 but NVIDIA's wrapping Makefile + # expects x86_64 or i386 and then converts it to x86 + # later on in the build process + BUILD_FIXES="ARCH=$(uname -m | sed -e 's/i.86/i386/')" mtrr_check lockdep_check fi @@ -283,13 +288,6 @@ src_prepare() { -e 's:-Wsign-compare::g' \ "${NV_SRC}"/Makefile.kbuild - epatch "${FILESDIR}"/256.35-unified-arch.patch - - # Fix building with Linux 3.3.x wrt #408841 - sed -i \ - -e '/CFLAGS="$CFLAGS/s:-I$SOURCES/arch/x86/include:& -I$OUTPUT/arch/x86/include/generated:' \ - kernel/conftest.sh || die - # If you set this then it's your own fault when stuff breaks :) use custom-cflags && sed -i "s:-O:${CFLAGS}:" "${NV_SRC}"/Makefile.* @@ -419,14 +417,14 @@ src_install() { # Helper Apps exeinto /opt/bin/ - dobin ${NV_EXEC}/nvidia-xconfig || die - dobin ${NV_EXEC}/nvidia-debugdump || die + doexe ${NV_EXEC}/nvidia-xconfig || die + doexe ${NV_EXEC}/nvidia-debugdump || die if use gtk; then - dobin ${NV_EXEC}/nvidia-settings || die + doexe ${NV_EXEC}/nvidia-settings || die fi - dobin ${NV_EXEC}/nvidia-bug-report.sh || die + doexe ${NV_EXEC}/nvidia-bug-report.sh || die if use kernel_linux; then - dobin ${NV_EXEC}/nvidia-smi || die + doexe ${NV_EXEC}/nvidia-smi || die fi # Desktop entries for nvidia-settings @@ -509,9 +507,7 @@ src_install-libs() { } pkg_preinst() { - if use kernel_linux; then - linux-mod_pkg_postinst - fi + use kernel_linux && linux-mod_pkg_preinst # Clean the dynamic libGL stuff's home to ensure # we dont have stale libs floating around @@ -525,13 +521,11 @@ pkg_preinst() { } pkg_postinst() { - if use kernel_linux; then - linux-mod_pkg_postinst - fi + use kernel_linux && linux-mod_pkg_postinst # Switch to the nvidia implementation - eselect opengl set --use-old nvidia - eselect opencl set --use-old nvidia + "${ROOT}"/usr/bin/eselect opengl set --use-old nvidia + "${ROOT}"/usr/bin/eselect opencl set --use-old nvidia echo elog "You must be in the video group to use the NVIDIA device" @@ -565,9 +559,11 @@ pkg_postinst() { fi } +pkg_prerm() { + "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11 +} + pkg_postrm() { - if use kernel_linux; then - linux-mod_pkg_postrm - fi - eselect opengl set --use-old xorg-x11 + use kernel_linux && linux-mod_pkg_postrm + "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11 } |