summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Schlemmer <azarah@gentoo.org>2005-11-11 18:41:55 +0000
committerMartin Schlemmer <azarah@gentoo.org>2005-11-11 18:41:55 +0000
commitb53ad4f942fa6ef0e869f789f934312bd8b0ab73 (patch)
tree411d5ce49bf5a1c6468171f7233721d26230defb /media-video/nvidia-glx
parentBump for 7.0RC2. (diff)
downloadgentoo-2-b53ad4f942fa6ef0e869f789f934312bd8b0ab73.tar.gz
gentoo-2-b53ad4f942fa6ef0e869f789f934312bd8b0ab73.tar.bz2
gentoo-2-b53ad4f942fa6ef0e869f789f934312bd8b0ab73.zip
Use $IMAGE in pkg_preinst() if $D not set. Possible fix for bug #82595.
(Portage version: 2.0.53_rc7)
Diffstat (limited to 'media-video/nvidia-glx')
-rw-r--r--media-video/nvidia-glx/ChangeLog8
-rw-r--r--media-video/nvidia-glx/Manifest14
-rw-r--r--media-video/nvidia-glx/files/digest-nvidia-glx-1.0.7676-r23
-rw-r--r--media-video/nvidia-glx/nvidia-glx-1.0.7676-r2.ebuild334
4 files changed, 347 insertions, 12 deletions
diff --git a/media-video/nvidia-glx/ChangeLog b/media-video/nvidia-glx/ChangeLog
index ce55d7c65261..658e6251258d 100644
--- a/media-video/nvidia-glx/ChangeLog
+++ b/media-video/nvidia-glx/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for media-video/nvidia-glx
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/ChangeLog,v 1.103 2005/10/28 10:06:41 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/ChangeLog,v 1.104 2005/11/11 18:41:54 azarah Exp $
+
+*nvidia-glx-1.0.7676-r2 (11 Nov 2005)
+
+ 11 Nov 2005; Martin Schlemmer <azarah@gentoo.org>
+ +nvidia-glx-1.0.7676-r2.ebuild:
+ Use $IMAGE in pkg_preinst() if $D not set. Possible fix for bug #82595.
28 Oct 2005; Diego Pettenò <flameeyes@gentoo.org>
nvidia-glx-1.0.7676-r1.ebuild:
diff --git a/media-video/nvidia-glx/Manifest b/media-video/nvidia-glx/Manifest
index 22618d5b8cd7..084e75631109 100644
--- a/media-video/nvidia-glx/Manifest
+++ b/media-video/nvidia-glx/Manifest
@@ -1,7 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 37f4605482f3be27c005b2e4896b65cf ChangeLog 22342
+MD5 b6aa6275580d78d393015942733c560f ChangeLog 22543
MD5 c3afc69f917a783ebd53cf2de38065dc files/09nvidia 61
MD5 3d8b3ecb3827e2e3a9a45ac6c3210a0a files/1.0.6111/NVIDIA_glx-1.0.6111-defines.patch 437
MD5 32901fb95c4fdc6cfa6b762498240b3c files/1.0.6111/NVIDIA_glx-1.0.6111-glheader.patch 380
@@ -18,6 +15,7 @@ MD5 97b3ec5488fb7f7f6cdde31ee42e45af files/digest-nvidia-glx-1.0.7167-r3 163
MD5 61c3ebdd8604c971bf969ea03040d170 files/digest-nvidia-glx-1.0.7174-r5 163
MD5 ef2c4ecedb45b67d79b43ffe58c660cf files/digest-nvidia-glx-1.0.7667-r1 163
MD5 b23efa632026470bcf33c50fdef740ae files/digest-nvidia-glx-1.0.7676-r1 243
+MD5 b23efa632026470bcf33c50fdef740ae files/digest-nvidia-glx-1.0.7676-r2 243
MD5 6e47667cc38d8ce4ac2f4c7dbb392abe files/libGL.la-r2 751
MD5 e06e73d71a54036f83abf35efc6322e3 metadata.xml 302
MD5 84d76e7e47009583e937b217a139924a nvidia-glx-1.0.6111-r2.ebuild 7643
@@ -29,10 +27,4 @@ MD5 18ddb38a7595329ad585c74ee979ffaf nvidia-glx-1.0.7167-r3.ebuild 8284
MD5 630dc45be727342243d06af61e06d6dd nvidia-glx-1.0.7174-r5.ebuild 8446
MD5 413c2a51514bb61b54b1c9f3ae2e6463 nvidia-glx-1.0.7667-r1.ebuild 8446
MD5 226c3e5fe5d6e5be93b0a3937e563c06 nvidia-glx-1.0.7676-r1.ebuild 9204
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDYfhjj5H05b2HAEkRAvf6AJ45XbGtU6YYnPf5SYMcI2SoNp62VQCghaS8
-05+0OqNevSB2hRb0Psd85lM=
-=GfdM
------END PGP SIGNATURE-----
+MD5 7d613b92aadeab17ff902a818bcaa301 nvidia-glx-1.0.7676-r2.ebuild 9234
diff --git a/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.7676-r2 b/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.7676-r2
new file mode 100644
index 000000000000..42e8231cd30c
--- /dev/null
+++ b/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.7676-r2
@@ -0,0 +1,3 @@
+MD5 6a5b99cfb2cca7b424cefc27fb6a30ce NVIDIA-FreeBSD-x86-1.0-7676.tar.gz 8455397
+MD5 2474c5513006668b0fba401e042dc009 NVIDIA-Linux-x86-1.0-7676-pkg0.run 5631274
+MD5 df2081504b609aaa95ccc8e95aebfb97 NVIDIA-Linux-x86_64-1.0-7676-pkg2.run 8824402
diff --git a/media-video/nvidia-glx/nvidia-glx-1.0.7676-r2.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.7676-r2.ebuild
new file mode 100644
index 000000000000..5d347a3b5af6
--- /dev/null
+++ b/media-video/nvidia-glx/nvidia-glx-1.0.7676-r2.ebuild
@@ -0,0 +1,334 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/nvidia-glx-1.0.7676-r2.ebuild,v 1.1 2005/11/11 18:41:55 azarah Exp $
+
+inherit eutils multilib versionator
+
+X86_PKG_V="pkg0"
+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"
+
+RESTRICT="nostrip multilib-pkg-force"
+IUSE="dlloader"
+
+RDEPEND="|| ( virtual/x11 >=x11-base/xorg-server-0.99.1-r7 )
+ || ( virtual/x11 media-libs/mesa )
+ app-admin/eselect-opengl
+ kernel_linux? ( ~media-video/nvidia-kernel-${PV} )
+ !app-emulation/emul-linux-x86-nvidia"
+# This should be added to have full dependencies for Gentoo FreeBSD
+# but can't be added until the profiles are in main portage (for repoman)
+# kernel_FreeBSD? ( ~media-video/nvidia-freebsd-${PV} )
+
+PROVIDE="virtual/opengl"
+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}"
+
+# On BSD userland it wants real make command
+MAKE="make"
+
+check_xfree() {
+ # This isn't necessary, true. But its about time people got the idea.
+ if has_version "x11-base/xfree"; then
+ eerror "Support for x11-base/xfree is deprecated. Upgrade to x11-base/xorg-x11."
+ fi
+}
+
+pkg_setup() {
+ check_xfree
+
+ if use amd64 && has_multilib_profile && [ "${DEFAULT_ABI}" != "amd64" ]; then
+ eerror "This ebuild doesn't currently support changing your defualt abi."
+ die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}"
+ fi
+}
+
+src_unpack() {
+ local NV_PATCH_PREFIX="${FILESDIR}/${PV}/NVIDIA_glx-${PV}"
+
+ 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
+ cd ${S}
+ if ! use x86-fbsd; then
+ # nVidia wants us to use nvidia-installer, removing warning.
+ epatch ${NV_PATCH_PREFIX//$(get_version_component_range 3)/6629}-makefile.patch
+ else
+ cd ${S}/doc
+ fi
+ # Use the correct defines to make gtkglext build work
+ epatch ${NV_PATCH_PREFIX//$(get_version_component_range 3)/6629}-defines.patch
+ # Use some more sensible gl headers and make way for new glext.h
+ epatch ${NV_PATCH_PREFIX//$(get_version_component_range 3)/6629}-glheader.patch
+
+ # Closing bug #37517 by letting virtual/x11 provide system wide glext.h
+ # 16 July 2004, opengl-update is now supplying glext.h for system wide
+ # compatibility, so we still need to remove this.
+ # 7 November 2004, Keeping this around for 6629 to see what happens.
+ #rm -f usr/include/GL/glext.h
+}
+
+src_install() {
+ local MLTEST=$(type dyn_unpack)
+
+ 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
+ rm -f usr/share/doc/nvidia-settings*
+ dodoc usr/share/doc/*
+ 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 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; then
+ [[ -f ${drvdir}/nvidia_drv.so ]] && \
+ doexe ${drvdir}/nvidia_drv.so
+ else
+ [[ -f ${drvdir}/nvidia_drv.o ]] && \
+ doexe ${drvdir}/nvidia_drv.o
+ fi
+
+ insinto ${X11_LIB_DIR}
+ [[ -f ${libdir}/libXvMCNVIDIA.a ]] && \
+ doins ${libdir}/libXvMCNVIDIA.a
+ exeinto ${X11_LIB_DIR}
+ [[ -f ${libdir}/libXvMCNVIDIA.so.${PV} ]] && \
+ doexe ${libdir}/libXvMCNVIDIA.so.${PV}
+
+ 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 ?!?!?
+ [[ -n ${IMAGE} ]] && D=${IMAGE}
+
+ if ! has_version x11-base/xorg-server ; then
+ for dir in lib lib32 lib64 ; do
+ if [[ -d ${D}/usr/${dir}/xorg ]] ; then
+ mv ${D}/usr/${dir}/xorg/* ${D}/usr/${dir}
+ rmdir ${D}/usr/${dir}/xorg
+ fi
+ done
+ fi
+
+ # The X module
+ # Since we moved away from libs in /usr/X11R6 need to check this
+ if has_version "<x11-base/xorg-x11-6.8.0-r4" || \
+ has_version "x11-base/xfree86" ; then
+ mkdir -p ${D}/usr/X11R6
+ for dir in lib lib32 lib64 ; do
+ [[ -d ${D}/usr/${dir} ]] && mv ${D}/usr/${dir} ${D}/usr/X11R6
+ 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() {
+ #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 have 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.2' && return 1
+
+ local valid_chost="true"
+ if use x86 ; then
+ case ${CHOST/-*} in
+ i486|i586|i686) ;;
+ *) valid_chost="false"
+ esac
+ fi
+
+ [[ ${valid_chost} == "false" ]] && return 1
+
+ # If we've got nptl, we've got tls
+ built_with_use sys-libs/glibc nptl && return 0
+
+ # 2.3.5 turned off tls for linuxthreads glibc on i486 and i586
+ if use x86 && 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
+}