From: Chris Gianelloni Date: Tue, 12 Dec 2006 14:46:27 +0000 (+0000) Subject: Update Gentoo/FreeBSD support with a patch from Timothy Redaelli . Closing bug #157625. Package-Manager: portage-2.1.2_rc2-r2 --- diff --git a/x11-drivers/nvidia-drivers/ChangeLog b/x11-drivers/nvidia-drivers/ChangeLog index c33ba0ab47dd..83d4f5411ad0 100644 --- a/x11-drivers/nvidia-drivers/ChangeLog +++ b/x11-drivers/nvidia-drivers/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-drivers/nvidia-drivers # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.34 2006/12/06 21:59:55 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.35 2006/12/12 14:46:27 wolf31o2 Exp $ + + 12 Dec 2006; Chris Gianelloni + nvidia-drivers-1.0.9631.ebuild, nvidia-drivers-1.0.9742.ebuild: + Update Gentoo/FreeBSD support with a patch from Timothy Redaelli + . Closing bug #157625. 06 Dec 2006; Chris Gianelloni -nvidia-drivers-1.0.9629.ebuild, nvidia-drivers-1.0.9742.ebuild: diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest index f3ea752787b6..c4ee110551de 100644 --- a/x11-drivers/nvidia-drivers/Manifest +++ b/x11-drivers/nvidia-drivers/Manifest @@ -49,18 +49,18 @@ EBUILD nvidia-drivers-1.0.8776.ebuild 12801 RMD160 7852ed36ebcb3383e2c71ede6443d MD5 36d824c156eed1bb869ac8c149ef9754 nvidia-drivers-1.0.8776.ebuild 12801 RMD160 7852ed36ebcb3383e2c71ede6443d377d0ade986 nvidia-drivers-1.0.8776.ebuild 12801 SHA256 a09d6c62af5fc869f6b19994045a306105ce988e124ef3a30220f58f91910ffb nvidia-drivers-1.0.8776.ebuild 12801 -EBUILD nvidia-drivers-1.0.9631.ebuild 12635 RMD160 c4af5f2b4bdfd3ce6333b0f61208c4ac80e4f64c SHA1 523625edce894b2d4b93c5e1ff32da16ea4b3845 SHA256 c9d3c860a1722be6d8fedfa41c1a2acd9f5bfe00e64c05a3ed8abf335a08e14e -MD5 c63475f350114376c5616778beea4925 nvidia-drivers-1.0.9631.ebuild 12635 -RMD160 c4af5f2b4bdfd3ce6333b0f61208c4ac80e4f64c nvidia-drivers-1.0.9631.ebuild 12635 -SHA256 c9d3c860a1722be6d8fedfa41c1a2acd9f5bfe00e64c05a3ed8abf335a08e14e nvidia-drivers-1.0.9631.ebuild 12635 -EBUILD nvidia-drivers-1.0.9742.ebuild 12760 RMD160 4d5eea8a9778d988d90aee6b7295bac5628940fe SHA1 bf1c43e7e649e516a954bf1110f2c52bceebe682 SHA256 2e59a81a35464b22057445348c1f51bfd4e656549452e542a4b66383e880324f -MD5 386cdccc8e5eb8b521330ce2806c9a8a nvidia-drivers-1.0.9742.ebuild 12760 -RMD160 4d5eea8a9778d988d90aee6b7295bac5628940fe nvidia-drivers-1.0.9742.ebuild 12760 -SHA256 2e59a81a35464b22057445348c1f51bfd4e656549452e542a4b66383e880324f nvidia-drivers-1.0.9742.ebuild 12760 -MISC ChangeLog 7996 RMD160 35b3f72d80350217c3a0da8e01be8103a8e9ee8b SHA1 49dc139e748bd8c37880a13662205a53679bcc89 SHA256 c144b1c8795ea58db7cc7d0542a5ae1fc774d5629a7d185728563b0c56e648a9 -MD5 b5e3ce1630dcccc8196ebc5ffe1a35e9 ChangeLog 7996 -RMD160 35b3f72d80350217c3a0da8e01be8103a8e9ee8b ChangeLog 7996 -SHA256 c144b1c8795ea58db7cc7d0542a5ae1fc774d5629a7d185728563b0c56e648a9 ChangeLog 7996 +EBUILD nvidia-drivers-1.0.9631.ebuild 12971 RMD160 f0416cc07e8c8cc26bd85d4411bfdd88858e81f8 SHA1 f507c39cef95c5c3ed9d0ac0422ae42c918df980 SHA256 13ba85bc9edcd7b555c0ee006b0179bea81ec1345b0740491d2ff27e67511cda +MD5 20d2d8781149dd482ae6ab2f44c848c3 nvidia-drivers-1.0.9631.ebuild 12971 +RMD160 f0416cc07e8c8cc26bd85d4411bfdd88858e81f8 nvidia-drivers-1.0.9631.ebuild 12971 +SHA256 13ba85bc9edcd7b555c0ee006b0179bea81ec1345b0740491d2ff27e67511cda nvidia-drivers-1.0.9631.ebuild 12971 +EBUILD nvidia-drivers-1.0.9742.ebuild 13096 RMD160 f7bbd310b1841e963cd3923a380a647e9c30b446 SHA1 4d98b7dc5fbeb85881045eff4c7ae5a81641b9e1 SHA256 b97c132bb77e0f1e22bf4f1683c3a315fe420a595ca14a9c8fd82ff338e1d18b +MD5 fe5837df80f28a8ed1d90d3d7c23d7cc nvidia-drivers-1.0.9742.ebuild 13096 +RMD160 f7bbd310b1841e963cd3923a380a647e9c30b446 nvidia-drivers-1.0.9742.ebuild 13096 +SHA256 b97c132bb77e0f1e22bf4f1683c3a315fe420a595ca14a9c8fd82ff338e1d18b nvidia-drivers-1.0.9742.ebuild 13096 +MISC ChangeLog 8228 RMD160 45cf1aa953f5d79ac86dca8a0b089f9c8ba50dc9 SHA1 2601ac5656cfa8bdfed55a302ba88acbfad523bc SHA256 0acddeb9dae5694b0b649baa06e5d7f1b1e3c8a2b4594a0a9064439dd4a00c0d +MD5 8e936b72dbd66c42bb3de8c4f55be83f ChangeLog 8228 +RMD160 45cf1aa953f5d79ac86dca8a0b089f9c8ba50dc9 ChangeLog 8228 +SHA256 0acddeb9dae5694b0b649baa06e5d7f1b1e3c8a2b4594a0a9064439dd4a00c0d ChangeLog 8228 MISC metadata.xml 302 RMD160 66c75d5895f747b8ce5af0f80b90af8fea1d07d7 SHA1 47dde751e4e0c833a65f32e106e594f449fe58a2 SHA256 0aa0f01ad14674164a2898387b83ded31b2b67a12757165debe6b03ee2fd692f MD5 643cec14f7f1dda9a26f163853dbf080 metadata.xml 302 RMD160 66c75d5895f747b8ce5af0f80b90af8fea1d07d7 metadata.xml 302 @@ -80,7 +80,7 @@ SHA256 8dd84c7a6735999dd6c18040ed7dce2e29c6a5e6eef94ae145ecee72fee71c77 files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (GNU/Linux) -iD8DBQFFdz1ykT4lNIS36YERAjw0AJ9kpIUB9pGXqPP24Zo8UfM15/KtowCdHAvz -DFE0PO5ch3URsJ/eDHpJR2s= -=02XH +iD8DBQFFfsDOkT4lNIS36YERAl0DAJ4/8ey9KBzxd1FSptNaGE1NPYVZ1gCgsBRh +4Zg8uvpH9TbB5cRslalf/8o= +=t2nd -----END PGP SIGNATURE----- diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9631.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9631.ebuild index d5628a4759f9..9ec6826facb5 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9631.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9631.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9631.ebuild,v 1.1 2006/12/05 17:27:39 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9631.ebuild,v 1.2 2006/12/12 14:46:27 wolf31o2 Exp $ -inherit eutils multilib versionator linux-mod +inherit eutils multilib versionator linux-mod flag-o-matic NV_V="${PV/1.0./1.0-}" X86_NV_PACKAGE="NVIDIA-Linux-x86-${NV_V}" @@ -39,6 +39,13 @@ QA_TEXTRELS_x86="usr/lib/xorg/libXvMCNVIDIA.so.${PV} usr/lib/xorg/modules/drivers/nvidia_drv.so usr/lib/opengl/nvidia/extensions/libglx.so" +QA_TEXTRELS_x86_fbsd="boot/modules/nvidia.ko + usr/lib/opengl/nvidia/lib/libGL.so.1 + usr/lib/opengl/nvidia/lib/libGLcore.so.1 + usr/lib/opengl/nvidia/no-tls/libnvidia-tls.so.1 + usr/lib/opengl/nvidia/extensions/libglx.so + usr/lib/xorg/modules/drivers/nvidia_drv.so" + QA_EXECSTACK_x86="usr/lib/opengl/nvidia/lib/libGL.so.${PV} usr/lib/opengl/nvidia/lib/libGLcore.so.${PV} usr/lib/opengl/nvidia/extensions/libglx.so" @@ -168,7 +175,8 @@ src_compile() { # it by itself, pass this. if use x86-fbsd; then cd "${WORKDIR}/${NV_PACKAGE}${PKG_V}/src" - MAKE="$(get_bmake)" emake CC="$(tc-getCC)" LD="$(tc-getLD)" + echo LDFLAGS="$(raw-ldflags)" + MAKE="$(get_bmake)" emake CC="$(tc-getCC)" LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die else linux-mod_src_compile fi @@ -219,13 +227,12 @@ src_install() { dodoc usr/share/doc/Copyrights usr/share/doc/NVIDIA_Changelog dodoc usr/share/doc/XF86Config.sample dohtml usr/share/doc/html/* + # nVidia want bug reports using this script + dobin usr/bin/nvidia-bug-report.sh else - dodoc doc/README doc/README.Linux doc/XF86Config.sample + dodoc doc/{README,XF86Config.sample,Copyrights} + dohtml doc/html/* fi - - # nVidia want bug reports using this script - exeinto /usr/bin - doexe usr/bin/nvidia-bug-report.sh } # Install nvidia library: diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9742.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9742.ebuild index c0ae4a785ff0..0ce6077b21bb 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9742.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9742.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9742.ebuild,v 1.3 2006/12/06 21:59:55 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9742.ebuild,v 1.4 2006/12/12 14:46:27 wolf31o2 Exp $ -inherit eutils multilib versionator linux-mod +inherit eutils multilib versionator linux-mod flag-o-matic NV_V="${PV/1.0./1.0-}" X86_NV_PACKAGE="NVIDIA-Linux-x86-${NV_V}" @@ -39,6 +39,13 @@ QA_TEXTRELS_x86="usr/lib/xorg/libXvMCNVIDIA.so.${PV} usr/lib/xorg/modules/drivers/nvidia_drv.so usr/lib/opengl/nvidia/extensions/libglx.so" +QA_TEXTRELS_x86_fbsd="boot/modules/nvidia.ko + usr/lib/opengl/nvidia/lib/libGL.so.1 + usr/lib/opengl/nvidia/lib/libGLcore.so.1 + usr/lib/opengl/nvidia/no-tls/libnvidia-tls.so.1 + usr/lib/opengl/nvidia/extensions/libglx.so + usr/lib/xorg/modules/drivers/nvidia_drv.so" + QA_EXECSTACK_x86="usr/lib/opengl/nvidia/lib/libGL.so.${PV} usr/lib/opengl/nvidia/lib/libGLcore.so.${PV} usr/lib/opengl/nvidia/extensions/libglx.so" @@ -168,7 +175,8 @@ src_compile() { # it by itself, pass this. if use x86-fbsd; then cd "${WORKDIR}/${NV_PACKAGE}${PKG_V}/src" - MAKE="$(get_bmake)" emake CC="$(tc-getCC)" LD="$(tc-getLD)" + echo LDFLAGS="$(raw-ldflags)" + MAKE="$(get_bmake)" emake CC="$(tc-getCC)" LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die else linux-mod_src_compile fi @@ -219,13 +227,12 @@ src_install() { dodoc usr/share/doc/Copyrights usr/share/doc/NVIDIA_Changelog dodoc usr/share/doc/XF86Config.sample dohtml usr/share/doc/html/* + # nVidia want bug reports using this script + dobin usr/bin/nvidia-bug-report.sh else - dodoc doc/README doc/README.Linux doc/XF86Config.sample + dodoc doc/{README,XF86Config.sample,Copyrights} + dohtml doc/html/* fi - - # nVidia want bug reports using this script - exeinto /usr/bin - doexe usr/bin/nvidia-bug-report.sh } # Install nvidia library: