From: Chris Gianelloni Date: Mon, 9 Oct 2006 13:37:18 +0000 (+0000) Subject: Removed virtual/x11 from dependencies, removed blocker on nvidia-kernel and nvidia... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0d7cd9ebb67274eee1d4a7660b6ca9f9292fb829;p=gentoo.git Removed virtual/x11 from dependencies, removed blocker on nvidia-kernel and nvidia-glx, since they're no longer in the tree, changed nostrip to strip, and added QA variables for TEXTRELS and EXECSTACK for amd64 and x86. Closing bug #114894. Package-Manager: portage-2.1.2_pre1-r4 --- diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest index ce41d0aaad83..101f0d2ae9bb 100644 --- a/x11-drivers/nvidia-drivers/Manifest +++ b/x11-drivers/nvidia-drivers/Manifest @@ -45,30 +45,26 @@ DIST NVIDIA-Linux-x86_64-1.0-8178-pkg2.run 9560594 RMD160 ee9b91f58d30d9d4800891 DIST NVIDIA-Linux-x86_64-1.0-8762-pkg2.run 9967191 RMD160 55f0ca9d35f7be6e3b65de2ed1c121e9c39c23a9 SHA1 7f2a73a2e96a94e5d44336db6a3d663cf68ad7f8 SHA256 84fb9bf70684943cc12b3e9be19de0aadbbfaa9d2118e6bef5525ac45fb0462c DIST NVIDIA-Linux-x86_64-1.0-8774-pkg2.run 9982211 RMD160 c4b60dce917fe6720b5fc2a848a195c0174b73c7 SHA1 777c5fec111190eba15b6ffcb50f3bcf24ae8191 SHA256 ffab97398bc034523ee115476d6c8b85fda2c53c18040f1d6e0971278c6f9214 DIST NVIDIA-Linux-x86_64-1.0-9625-pkg2.run 10277484 RMD160 a97d4d52e290ff201fc644c2ecb530833315d83f SHA1 38a1f94a90a31569542ab588c1b755edc15cab73 SHA256 1e126198e40f8eaf4047048d0ebe08262fcc29e440e6bae1b9195a1c751b3329 -EBUILD nvidia-drivers-1.0.8178.ebuild 11169 RMD160 7596b83ffb4b997bc4778aaebd97916826372c36 SHA1 2c672beb33b6cf4e32b76abaca43b0116987c409 SHA256 7ff6a7ebfd75b370997cfedd46c55242d9342678d9c6393b0bc6cd9fa976d047 -MD5 0b62c68452e0ec1524db9d41ca21ac7a nvidia-drivers-1.0.8178.ebuild 11169 -RMD160 7596b83ffb4b997bc4778aaebd97916826372c36 nvidia-drivers-1.0.8178.ebuild 11169 -SHA256 7ff6a7ebfd75b370997cfedd46c55242d9342678d9c6393b0bc6cd9fa976d047 nvidia-drivers-1.0.8178.ebuild 11169 -EBUILD nvidia-drivers-1.0.8762-r1.ebuild 11239 RMD160 915387fa8b107691bd43fc74806c33a269bb39eb SHA1 0cf512f51e638cde73bef32561af51812f3938bc SHA256 9c64c9eb2468f86648143b35da61c8dcd00b3cef1dc286b5b047f2afe62e10d5 -MD5 8efd463e4f6b9cd5b5918c795d432ac4 nvidia-drivers-1.0.8762-r1.ebuild 11239 -RMD160 915387fa8b107691bd43fc74806c33a269bb39eb nvidia-drivers-1.0.8762-r1.ebuild 11239 -SHA256 9c64c9eb2468f86648143b35da61c8dcd00b3cef1dc286b5b047f2afe62e10d5 nvidia-drivers-1.0.8762-r1.ebuild 11239 -EBUILD nvidia-drivers-1.0.8762.ebuild 11171 RMD160 e594a949dcc46aac8ed176672ad43c5db25cc4d5 SHA1 92e5347589d2ceac2f07be894333d7ca78375bb4 SHA256 b6d56468522047560fd057b3f936f9969222d3200df3d7469730e3cfa724098f -MD5 0f8763dd9d4d11c93d4708e5b48af018 nvidia-drivers-1.0.8762.ebuild 11171 -RMD160 e594a949dcc46aac8ed176672ad43c5db25cc4d5 nvidia-drivers-1.0.8762.ebuild 11171 -SHA256 b6d56468522047560fd057b3f936f9969222d3200df3d7469730e3cfa724098f nvidia-drivers-1.0.8762.ebuild 11171 -EBUILD nvidia-drivers-1.0.8774.ebuild 11178 RMD160 e974c70844c96f609c3328cbe361ddc4b9fb05b5 SHA1 ebbf127c876e0eea66a32f596ea25cfc14fbb4e0 SHA256 c9af4aee2c47baca144dd330f0293a07da25ff56d256a0442a819b53f7b73ee6 -MD5 a2545f20377f3a6369d4921cf7f606f9 nvidia-drivers-1.0.8774.ebuild 11178 -RMD160 e974c70844c96f609c3328cbe361ddc4b9fb05b5 nvidia-drivers-1.0.8774.ebuild 11178 -SHA256 c9af4aee2c47baca144dd330f0293a07da25ff56d256a0442a819b53f7b73ee6 nvidia-drivers-1.0.8774.ebuild 11178 -EBUILD nvidia-drivers-1.0.9625.ebuild 11238 RMD160 e7e3216f522a4faef243c97f13026d7c61342da8 SHA1 3d68b7804953c670c5869c03c037c24c8fea1d28 SHA256 3a0318d231cee311a442190b295fce35def4a9ee7d274066054f62d57505a093 -MD5 2a9c81e3938818f514d36f0476a9bf9f nvidia-drivers-1.0.9625.ebuild 11238 -RMD160 e7e3216f522a4faef243c97f13026d7c61342da8 nvidia-drivers-1.0.9625.ebuild 11238 -SHA256 3a0318d231cee311a442190b295fce35def4a9ee7d274066054f62d57505a093 nvidia-drivers-1.0.9625.ebuild 11238 -MISC ChangeLog 3216 RMD160 cd5cb0636c880d5196019abcb712b812f4568c4a SHA1 f92980afff9f6521f9762559daf6cd2414c55f9f SHA256 fb76beacc8af376a4899ab27bb3b999d9a7a830db4af6bb13799203b0e17868a -MD5 1949af60093f96e90ae3ce36b6f81348 ChangeLog 3216 -RMD160 cd5cb0636c880d5196019abcb712b812f4568c4a ChangeLog 3216 -SHA256 fb76beacc8af376a4899ab27bb3b999d9a7a830db4af6bb13799203b0e17868a ChangeLog 3216 +EBUILD nvidia-drivers-1.0.8178.ebuild 12375 RMD160 8d4751292fe5ad280b93348312a456312913c853 SHA1 5dac82fe7b0930f7238b542f2201fa1ed0d6f54d SHA256 9626a7a94f797504e6d0fb71a305f46ead8cd6fb89e682f42910c836def45028 +MD5 d8a6e394af4eaf7d7936744d06388054 nvidia-drivers-1.0.8178.ebuild 12375 +RMD160 8d4751292fe5ad280b93348312a456312913c853 nvidia-drivers-1.0.8178.ebuild 12375 +SHA256 9626a7a94f797504e6d0fb71a305f46ead8cd6fb89e682f42910c836def45028 nvidia-drivers-1.0.8178.ebuild 12375 +EBUILD nvidia-drivers-1.0.8762-r1.ebuild 12447 RMD160 856cd8954bd3513b51793aa1734fea1e00873985 SHA1 ee69f11bef5c52d7c81c0d0b4e36e6c744c8430e SHA256 232e25b696134717f663fbf695c19a7927b56bf0d5204ad7303734a7b888a32c +MD5 319760c249108963d153233f0dd4edf6 nvidia-drivers-1.0.8762-r1.ebuild 12447 +RMD160 856cd8954bd3513b51793aa1734fea1e00873985 nvidia-drivers-1.0.8762-r1.ebuild 12447 +SHA256 232e25b696134717f663fbf695c19a7927b56bf0d5204ad7303734a7b888a32c nvidia-drivers-1.0.8762-r1.ebuild 12447 +EBUILD nvidia-drivers-1.0.8774.ebuild 12387 RMD160 670ab6ce3642529d843d8d2991c7a4a44550a774 SHA1 f213a6c90ec4d9ca7a6175e77b31b7c566646414 SHA256 cfe40c10a05b2ce3b821c643d9228ea59fb396d71d9528d497b41a846451c54b +MD5 74b1f210f3231b1db16148c03eb2e5ab nvidia-drivers-1.0.8774.ebuild 12387 +RMD160 670ab6ce3642529d843d8d2991c7a4a44550a774 nvidia-drivers-1.0.8774.ebuild 12387 +SHA256 cfe40c10a05b2ce3b821c643d9228ea59fb396d71d9528d497b41a846451c54b nvidia-drivers-1.0.8774.ebuild 12387 +EBUILD nvidia-drivers-1.0.9625.ebuild 12447 RMD160 31925d78e8a64e68efc1229ddd3871a266175be1 SHA1 c0d4bc7479167fdadf5cbec334c31e81f5b610d1 SHA256 3b6a9d3c773f6866d496845fdc3452e9b2ab843348169ad60e64185001c5e2d3 +MD5 8009bec1c4187c613ef8f2320319591c nvidia-drivers-1.0.9625.ebuild 12447 +RMD160 31925d78e8a64e68efc1229ddd3871a266175be1 nvidia-drivers-1.0.9625.ebuild 12447 +SHA256 3b6a9d3c773f6866d496845fdc3452e9b2ab843348169ad60e64185001c5e2d3 nvidia-drivers-1.0.9625.ebuild 12447 +MISC ChangeLog 3690 RMD160 acd79d5576c9a67d0ed1099ce6753335e1dadaf7 SHA1 2b4bab23567a2fdd5f827bb6fddeb76da9948200 SHA256 3fde24b765e04cdafc859563d2f3b52499c41a083dd83e5c96d2528c594a97a0 +MD5 0559baa125f717f3456dd1aeb8b6112f ChangeLog 3690 +RMD160 acd79d5576c9a67d0ed1099ce6753335e1dadaf7 ChangeLog 3690 +SHA256 3fde24b765e04cdafc859563d2f3b52499c41a083dd83e5c96d2528c594a97a0 ChangeLog 3690 MISC metadata.xml 302 RMD160 66c75d5895f747b8ce5af0f80b90af8fea1d07d7 SHA1 47dde751e4e0c833a65f32e106e594f449fe58a2 SHA256 0aa0f01ad14674164a2898387b83ded31b2b67a12757165debe6b03ee2fd692f MD5 643cec14f7f1dda9a26f163853dbf080 metadata.xml 302 RMD160 66c75d5895f747b8ce5af0f80b90af8fea1d07d7 metadata.xml 302 @@ -76,9 +72,6 @@ SHA256 0aa0f01ad14674164a2898387b83ded31b2b67a12757165debe6b03ee2fd692f metadata MD5 912d39198d3b3254ec00bf0bdac9c964 files/digest-nvidia-drivers-1.0.8178 870 RMD160 98786a8b1dc700709f538dacb7b2ebc5bb418acc files/digest-nvidia-drivers-1.0.8178 870 SHA256 40ddd0b9152f72be231fb6f701d528ab7e0c586c2f8b6dedfc8512b080f33bed files/digest-nvidia-drivers-1.0.8178 870 -MD5 28f171942bf28c405c08215d4465cc22 files/digest-nvidia-drivers-1.0.8762 870 -RMD160 1ffd48874e5e6d00782f5f9a0ef6251b3c9b8c6d files/digest-nvidia-drivers-1.0.8762 870 -SHA256 7e0343d6e805357410cd03b1ce990bf79b7faf1fa7e01809ea52e14b1e0f8bb0 files/digest-nvidia-drivers-1.0.8762 870 MD5 28f171942bf28c405c08215d4465cc22 files/digest-nvidia-drivers-1.0.8762-r1 870 RMD160 1ffd48874e5e6d00782f5f9a0ef6251b3c9b8c6d files/digest-nvidia-drivers-1.0.8762-r1 870 SHA256 7e0343d6e805357410cd03b1ce990bf79b7faf1fa7e01809ea52e14b1e0f8bb0 files/digest-nvidia-drivers-1.0.8762-r1 870 @@ -91,7 +84,7 @@ SHA256 2b535b61b24af630d83d6617b3c809833616a867164d466812d56b87d8447709 files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (GNU/Linux) -iD8DBQFFJB11kT4lNIS36YERAi7kAJ9Y8+Tdf2vBnCzRigJXJY4IwZm1jwCdGkxC -qG+wJ4jnbR3VLmZkO3SdXGk= -=4TBE +iD8DBQFFKlCPkT4lNIS36YERAo0TAJ43OQC5WqJCFkCPRDcIemliZXMg2wCgkLBc +cf6oBRgLz3txmL+9yoJFrbI= +=XxAl -----END PGP SIGNATURE----- diff --git a/x11-drivers/nvidia-drivers/files/digest-nvidia-drivers-1.0.8762 b/x11-drivers/nvidia-drivers/files/digest-nvidia-drivers-1.0.8762 deleted file mode 100644 index 4fbb37ab6bbc..000000000000 --- a/x11-drivers/nvidia-drivers/files/digest-nvidia-drivers-1.0.8762 +++ /dev/null @@ -1,9 +0,0 @@ -MD5 ddc62c375db4a6db9007bf9e2d667d2c NVIDIA-FreeBSD-x86-1.0-8762.tar.gz 9437999 -RMD160 5b75d9b5e852b0d5222951d9d99c93d7960ee8f6 NVIDIA-FreeBSD-x86-1.0-8762.tar.gz 9437999 -SHA256 f29fa9dd9728a264d0b09267f23acea9ac2c04cc578b1e9644093bb2ade17875 NVIDIA-FreeBSD-x86-1.0-8762.tar.gz 9437999 -MD5 86bcf4a3a9d441dff9e25b82ec8a6060 NVIDIA-Linux-x86-1.0-8762-pkg1.run 13032175 -RMD160 1e887de23c5d0b9eb3a581b2d91989c1b9c45514 NVIDIA-Linux-x86-1.0-8762-pkg1.run 13032175 -SHA256 b38ce2853195175a2b7380fe95968d52a707a08dbe9fcb6ae423c9b9b0a47eee NVIDIA-Linux-x86-1.0-8762-pkg1.run 13032175 -MD5 5eb0b27342fd726fbbdd1d99eadbd0e7 NVIDIA-Linux-x86_64-1.0-8762-pkg2.run 9967191 -RMD160 55f0ca9d35f7be6e3b65de2ed1c121e9c39c23a9 NVIDIA-Linux-x86_64-1.0-8762-pkg2.run 9967191 -SHA256 84fb9bf70684943cc12b3e9be19de0aadbbfaa9d2118e6bef5525ac45fb0462c NVIDIA-Linux-x86_64-1.0-8762-pkg2.run 9967191 diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.8762.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.8762.ebuild deleted file mode 100644 index eee21ef92d5c..000000000000 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.8762.ebuild +++ /dev/null @@ -1,400 +0,0 @@ -# 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.8762.ebuild,v 1.6 2006/10/04 20:45:32 wolf31o2 Exp $ - -inherit eutils multilib versionator linux-mod - -X86_PKG_V="pkg1" -AMD64_PKG_V="pkg2" -NV_V="${PV/1.0./1.0-}" -X86_NV_PACKAGE="NVIDIA-Linux-x86-${NV_V}" -AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${NV_V}" -X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${NV_V}" - -DESCRIPTION="NVIDIA X11 driver and GLX libraries" -HOMEPAGE="http://www.nvidia.com/" -SRC_URI="x86? ( ftp://download.nvidia.com/XFree86/Linux-x86/${NV_V}/${X86_NV_PACKAGE}-${X86_PKG_V}.run ) - amd64? ( http://download.nvidia.com/XFree86/Linux-x86_64/${NV_V}/${AMD64_NV_PACKAGE}-${AMD64_PKG_V}.run ) - x86-fbsd? ( http://download.nvidia.com/freebsd/${NV_V}/${X86_FBSD_NV_PACKAGE}.tar.gz )" - -LICENSE="NVIDIA" -SLOT="0" -KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd" -IUSE="dlloader" -RESTRICT="nostrip multilib-pkg-force" - -DEPEND="kernel_linux? ( virtual/linux-sources )" -RDEPEND="kernel_linux? ( virtual/modutils ) - || ( x11-base/xorg-server virtual/x11 ) - !>=x11-base/xorg-server-1.0.99 - || ( media-libs/mesa virtual/x11 ) - app-admin/eselect-opengl - kernel_linux? ( !media-video/nvidia-kernel ) - kernel_FreeBSD? ( !media-video/nvidia-freebsd ) - !app-emulation/emul-linux-x86-nvidia - !x11-drivers/nvidia-legacy-drivers - !media-video/nvidia-glx" - -export _POSIX2_VERSION="199209" - -if use x86; then - PKG_V="-${X86_PKG_V}" - NV_PACKAGE="${X86_NV_PACKAGE}" -elif use amd64; then - PKG_V="-${AMD64_PKG_V}" - NV_PACKAGE="${AMD64_NV_PACKAGE}" -elif use x86-fbsd; then - PKG_V="" - NV_PACKAGE="${X86_FBSD_NV_PACKAGE}" -fi - -S="${WORKDIR}/${NV_PACKAGE}${PKG_V}/usr/src/nv" - -# On BSD userland it wants real make command -MAKE="make" - -mtrr_check() { - ebegin "Checking for MTRR support" - linux_chkconfig_present MTRR - eend $? - - if [[ $? -ne 0 ]] ; then - eerror "This version needs MTRR support for most chipsets!" - eerror "Please enable MTRR support in your kernel config, found at:" - eerror - eerror " Processor type and features" - eerror " [*] MTRR (Memory Type Range Register) support" - eerror - eerror "and recompile your kernel ..." - die "MTRR support not detected!" - fi -} - -pkg_setup() { - if use amd64 && has_multilib_profile && [ "${DEFAULT_ABI}" != "amd64" ]; then - eerror "This ebuild doesn't currently support changing your default abi." - die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}" - fi - - if ! use x86-fbsd; then - linux-mod_pkg_setup - MODULE_NAMES="nvidia(video:${S})" - BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} SYSOUT=${KV_OUT_DIR}" - mtrr_check - fi -} - -src_unpack() { - local NV_PATCH_PREFIX="${FILESDIR}/${PV}/NVIDIA-${PV}" - - if ! use x86-fbsd; then - if [[ ${KV_MINOR} -eq 6 && ${KV_PATCH} -lt 7 ]] ; then - echo - ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}" - ewarn "This is not officially supported for ${P}. It is likely you" - ewarn "will not be able to compile or use the kernel module." - ewarn "It is recommended that you upgrade your kernel to a version >= 2.6.7" - echo - ewarn "DO NOT file bug reports for kernel versions less than 2.6.7 as they will be ignored." - fi - fi - - if ! use x86-fbsd; then - cd ${WORKDIR} - bash ${DISTDIR}/${NV_PACKAGE}${PKG_V}.run --extract-only - else - unpack ${A} - fi - - # Patchs go below here, add breif description - use x86-fbsd \ - && cd "${WORKDIR}/${NV_PACKAGE}${PKG_V}/doc" \ - || cd "${WORKDIR}/${NV_PACKAGE}${PKG_V}" - # 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 - - if ! use x86-fbsd; then - # Quiet down warnings the user do not need to see - sed -i \ - -e 's:-Wpointer-arith::g' \ - -e 's:-Wsign-compare::g' \ - ${S}/Makefile.kbuild - - # If you set this then it's your own fault when stuff breaks :) - [[ -n ${USE_CRAZY_OPTS} ]] && sed -i "s:-O:${CFLAGS}:" Makefile.* - - # If greater than 2.6.5 use M= instead of SUBDIR= - cd ${S}; convert_to_m Makefile.kbuild - - # Patch the Makefile to not warn about nvidia-installer -# epatch ${FILESDIR}/NVIDIA_glx-makefile.patch - 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. - if use x86-fbsd; then - cd "${WORKDIR}/${NV_PACKAGE}${PKG_V}/src" - MAKE="$(get_bmake)" emake CC="$(tc-getCC)" LD="$(tc-getLD)" - else - linux-mod_src_compile - fi -} - -src_install() { - local MLTEST=$(type dyn_unpack) - - cd ${WORKDIR}/${NV_PACKAGE}${PKG_V} - - if ! use x86-fbsd; then - linux-mod_src_install - - # Add the aliases - sed -e 's:\${PACKAGE}:'${PF}':g' ${FILESDIR}/nvidia > ${WORKDIR}/nvidia - insinto /etc/modules.d - newins ${WORKDIR}/nvidia nvidia - else - insinto /boot/modules - doins "${WORKDIR}/${X86_FBSD_NV_PACKAGE}/src/nvidia.kld" - - exeinto /boot/modules - doexe "${WORKDIR}/${X86_FBSD_NV_PACKAGE}/src/nvidia.ko" - fi - - if [[ "${MLTEST/set_abi}" == "${MLTEST}" ]] && 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 - - if ! use x86-fbsd; then - # Docs, remove nvidia-settings as provided by media-video/nvidia-settings - newdoc usr/share/doc/README.txt README - dodoc usr/share/doc/Copyrights usr/share/doc/NVIDIA_Changelog - dodoc usr/share/doc/XF86Config.sample - dohtml usr/share/doc/html/* - else - dodoc doc/README doc/README.Linux doc/XF86Config.sample - fi - - # nVidia want bug reports using this script - exeinto /usr/bin - doexe usr/bin/nvidia-bug-report.sh -} - -# Install nvidia library: -# the first parameter is the place where to install it -# the second paramis the base name of the library -# the third parameter is the provided soversion -donvidia() { - dodir $1 - exeinto $1 - - libname=$(basename $2) - - doexe $2.$3 - dosym ${libname}.$3 $1/${libname} - - [[ $3 != "1" ]] && dosym ${libname}.$3 $1/${libname}.1 -} - -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 ! has_version x11-base/xorg-server ; then - X11_LIB_DIR="/usr/${inslibdir}" - fi - - 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} - - 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 - # Not sure whether installing the .la file is neccessary; - # this is adopted from the `nvidia' ebuild - 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 - - if use dlloader || has_version ">=x11-base/xorg-x11-6.8.99.15" || - has_version "x11-base/xorg-server"; then - [[ -f ${drvdir}/nvidia_drv.so ]] && \ - doexe ${drvdir}/nvidia_drv.so - else - [[ -f ${drvdir}/nvidia_drv.o ]] && \ - doexe ${drvdir}/nvidia_drv.o - fi - - 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 /usr/${inslibdir}/libXvMCNVIDIA.so.${PV} \ - /usr/${inslibdir}/libXvMCNVIDIA.so - - exeinto ${NV_ROOT}/extensions - [[ -f ${extdir}/libglx.so.${sover} ]] && \ - newexe ${extdir}/libglx.so.${sover} libglx.so - - # Includes - insinto ${NV_ROOT}/include - doins ${incdir}/*.h -} - -pkg_preinst() { - # Can we make up our minds ?!?!? - local NV_D=${IMAGE:-${D}} - - if ! has_version x11-base/xorg-server ; then - for dir in lib lib32 lib64 ; do - if [[ -d ${NV_D}/usr/${dir}/xorg ]] ; then - mv ${NV_D}/usr/${dir}/xorg/* ${NV_D}/usr/${dir} - rmdir ${NV_D}/usr/${dir}/xorg - fi - done - fi - - # Clean the dinamic 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 x86-fbsd; then - linux-mod_pkg_postinst - fi - - #switch to the nvidia implementation - eselect opengl set --use-old nvidia - - echo - einfo "To use the Nvidia GLX, run \"eselect opengl set nvidia\"" - echo - einfo "You may also be interested in media-video/nvidia-settings" - echo - einfo "nVidia has requested that any bug reports submitted have the" - einfo "output of /usr/bin/nvidia-bug-report.sh included." -} - -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() { - eselect opengl set --use-old xorg-x11 -} diff --git a/x11-drivers/nvidia-legacy-drivers/Manifest b/x11-drivers/nvidia-legacy-drivers/Manifest index cce8618b3d38..440851e84adb 100644 --- a/x11-drivers/nvidia-legacy-drivers/Manifest +++ b/x11-drivers/nvidia-legacy-drivers/Manifest @@ -23,14 +23,14 @@ RMD160 e53af79cf9a56377908834bdbe07fa3c99a5530e files/nvidia 704 SHA256 6ac22481314de823ec31e60663521f318c7eceec75162c11cb97260db6ee0fe2 files/nvidia 704 DIST NVIDIA-Linux-x86-1.0-7184-pkg1.run 11508286 RMD160 cb6f793e2d4279e0b3b690cb165c5f6f24be9451 SHA1 e239434492af386c84add8c85ea104d29fb4a694 SHA256 d42b6fdd4607cac10700a870737be8f5d143303a955899d01b2f3ad695d616d7 DIST NVIDIA-Linux-x86_64-1.0-7184-pkg2.run 8779868 RMD160 07c847f6ee245f28f501b08ff01d81e5ec1cc3a5 SHA1 5bad7d3f39aa35e3240a7a7ddef042954890b67c SHA256 660055c55cfba815593408244a9162ca550558331977cc371b50e9f5f9dcb7da -EBUILD nvidia-legacy-drivers-1.0.7184.ebuild 9432 RMD160 13a4b468b4408480a7129bb4aa70272ee8d3cb0f SHA1 771dc40cf441a0b9359065248d75e20d151c5ad0 SHA256 e4fece6234783dd0bde125deb770a1ef33fa6be941ecf81340ad07354ed7c737 -MD5 aef5281c377cd518a44398816b9ed58b nvidia-legacy-drivers-1.0.7184.ebuild 9432 -RMD160 13a4b468b4408480a7129bb4aa70272ee8d3cb0f nvidia-legacy-drivers-1.0.7184.ebuild 9432 -SHA256 e4fece6234783dd0bde125deb770a1ef33fa6be941ecf81340ad07354ed7c737 nvidia-legacy-drivers-1.0.7184.ebuild 9432 -MISC ChangeLog 1754 RMD160 3f1729b36b7bbcd0240f9ad0accda7a88887d6cb SHA1 8f9865abd667f32a71ee2bdada01f1ed2fa60349 SHA256 bd8b938956a9e0baf2c46c93a26969b048ccc54273c4417098909b839ced2696 -MD5 eeff3e0adcd04b20998d0971281dcf62 ChangeLog 1754 -RMD160 3f1729b36b7bbcd0240f9ad0accda7a88887d6cb ChangeLog 1754 -SHA256 bd8b938956a9e0baf2c46c93a26969b048ccc54273c4417098909b839ced2696 ChangeLog 1754 +EBUILD nvidia-legacy-drivers-1.0.7184.ebuild 10631 RMD160 2b145e53223e9ed429bfc72e5da1cdf6c08f6491 SHA1 3ed52f8e06c3ec249f6235dcac72776fd0a9fad1 SHA256 8aa6d3d28b522a6f697b11908bb0f5c1248e2b7c776a71b45e3fc68d5e03ca61 +MD5 1c9da3280e783fe7aa50eb7c61bd5000 nvidia-legacy-drivers-1.0.7184.ebuild 10631 +RMD160 2b145e53223e9ed429bfc72e5da1cdf6c08f6491 nvidia-legacy-drivers-1.0.7184.ebuild 10631 +SHA256 8aa6d3d28b522a6f697b11908bb0f5c1248e2b7c776a71b45e3fc68d5e03ca61 nvidia-legacy-drivers-1.0.7184.ebuild 10631 +MISC ChangeLog 2100 RMD160 761f0a27a2d11acf8f49d7974b36dc93737d1764 SHA1 eee8b7fbd0b9b8d5bb4c06a526502f28b93a1297 SHA256 4dd50e1bdbcc65cb98d64f287b6fb0bd8343ce9ab50ef07398d07dd058dc2c39 +MD5 082794d0ae7539ba6c22ecdc9a2b13e4 ChangeLog 2100 +RMD160 761f0a27a2d11acf8f49d7974b36dc93737d1764 ChangeLog 2100 +SHA256 4dd50e1bdbcc65cb98d64f287b6fb0bd8343ce9ab50ef07398d07dd058dc2c39 ChangeLog 2100 MISC metadata.xml 302 RMD160 66c75d5895f747b8ce5af0f80b90af8fea1d07d7 SHA1 47dde751e4e0c833a65f32e106e594f449fe58a2 SHA256 0aa0f01ad14674164a2898387b83ded31b2b67a12757165debe6b03ee2fd692f MD5 643cec14f7f1dda9a26f163853dbf080 metadata.xml 302 RMD160 66c75d5895f747b8ce5af0f80b90af8fea1d07d7 metadata.xml 302 @@ -41,7 +41,7 @@ SHA256 00a9d6c11e6832279f8c0c9504d2cf991519d477ff8168b6708a41c18b300ca8 files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (GNU/Linux) -iD8DBQFFJB3FkT4lNIS36YERAlr9AJ0bQH75L1SpXJqOS9fPC9GgXNGIQgCfeOF4 -Q1/F7Klgj6laq+rStED8ofw= -=ASWt +iD8DBQFFKlBbkT4lNIS36YERAnMaAJ9EIJLo0dWZJyW/GFDbN/EXF63H7wCgwzyo +M62e8ICRjHKmziYD25FyK+4= +=l1St -----END PGP SIGNATURE-----