From bfa03449253af23c5c8e6ac013183f7fdd842ec6 Mon Sep 17 00:00:00 2001 From: Martin Schlemmer Date: Sat, 25 May 2002 23:15:23 +0000 Subject: new version --- media-video/nvidia-glx/ChangeLog | 4 +- .../nvidia-glx/files/digest-nvidia-glx-1.0.2313 | 1 - .../nvidia-glx/files/digest-nvidia-glx-1.0.2313-r1 | 1 - .../nvidia-glx/files/digest-nvidia-glx-1.0.2802-r2 | 1 - .../nvidia-glx/files/digest-nvidia-glx-1.0.2960 | 1 + .../nvidia-glx/nvidia-glx-1.0.2313-r2.ebuild | 80 ------------------ .../nvidia-glx/nvidia-glx-1.0.2802-r2.ebuild | 80 ------------------ media-video/nvidia-glx/nvidia-glx-1.0.2960.ebuild | 94 ++++++++++++++++++++++ 8 files changed, 98 insertions(+), 164 deletions(-) delete mode 100644 media-video/nvidia-glx/files/digest-nvidia-glx-1.0.2313 delete mode 100644 media-video/nvidia-glx/files/digest-nvidia-glx-1.0.2313-r1 delete mode 100644 media-video/nvidia-glx/files/digest-nvidia-glx-1.0.2802-r2 create mode 100644 media-video/nvidia-glx/files/digest-nvidia-glx-1.0.2960 delete mode 100644 media-video/nvidia-glx/nvidia-glx-1.0.2313-r2.ebuild delete mode 100644 media-video/nvidia-glx/nvidia-glx-1.0.2802-r2.ebuild create mode 100644 media-video/nvidia-glx/nvidia-glx-1.0.2960.ebuild (limited to 'media-video/nvidia-glx') diff --git a/media-video/nvidia-glx/ChangeLog b/media-video/nvidia-glx/ChangeLog index 678484465f27..ccf4fc4075a3 100644 --- a/media-video/nvidia-glx/ChangeLog +++ b/media-video/nvidia-glx/ChangeLog @@ -1,6 +1,8 @@ # ChangeLog for media-video/nvidia-glx # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL -# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/ChangeLog,v 1.7 2002/04/13 04:13:38 drobbins Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/ChangeLog,v 1.8 2002/05/25 23:15:23 azarah Exp $ + +*nvidia-glx-1.0.2960 (26 May 2002) *nvidia-glx-1.0.2313-r2 (12 Apr 2002) diff --git a/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.2313 b/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.2313 deleted file mode 100644 index 9d8bd5668c01..000000000000 --- a/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.2313 +++ /dev/null @@ -1 +0,0 @@ -MD5 511f76c01d83cae0917088bdda8a4bc6 NVIDIA_GLX-1.0-2313.tar.gz 1508184 diff --git a/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.2313-r1 b/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.2313-r1 deleted file mode 100644 index 9d8bd5668c01..000000000000 --- a/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.2313-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 511f76c01d83cae0917088bdda8a4bc6 NVIDIA_GLX-1.0-2313.tar.gz 1508184 diff --git a/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.2802-r2 b/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.2802-r2 deleted file mode 100644 index bc600f3e57ae..000000000000 --- a/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.2802-r2 +++ /dev/null @@ -1 +0,0 @@ -MD5 8ac546db964b58b916a1c220271086b3 NVIDIA_glx-1.0-2802.tar.gz 1525481 diff --git a/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.2960 b/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.2960 new file mode 100644 index 000000000000..45e2d3241d75 --- /dev/null +++ b/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.2960 @@ -0,0 +1 @@ +MD5 38947e44a19a576c2ab8e648e1f3cf18 NVIDIA_GLX-1.0-2960.tar.gz 1730225 diff --git a/media-video/nvidia-glx/nvidia-glx-1.0.2313-r2.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.2313-r2.ebuild deleted file mode 100644 index 7da4ad32c16b..000000000000 --- a/media-video/nvidia-glx/nvidia-glx-1.0.2313-r2.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2002 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/nvidia-glx-1.0.2313-r2.ebuild,v 1.2 2002/04/27 23:34:20 bangert Exp $ - -# This portage installs binary XFree drivers for video cards -# with NVIDIA chipsets. The driver is provided by NVIDIA corporation. - -# Do _NOT_ strip symbols in the build! Need both lines for Portage 1.8.9+ -DEBUG="yes" -RESTRICT="nostrip" - -S="${WORKDIR}/${P}" - -DESCRIPTION="Linux kernel module for the NVIDIA's X driver" - -NV_PACKAGE=NVIDIA_GLX-1.0-2313 -NV_ARCHIVE="${NV_PACKAGE}.tar.gz" -SRC_URI="http://205.158.109.140/XFree86_40/1.0-2313/${NV_ARCHIVE}" -HOMEPAGE="http://www.nvidia.com/" -DEPEND="virtual/glibc >=x11-base/xfree-4.0.2 >=media-video/nvidia-kernel-1.0.2314" -PROVIDE="virtual/opengl" - -src_unpack() { - unpack "${NV_ARCHIVE}" - mv "${NV_PACKAGE}" "${P}" -} - -src_install () { - # NVIDIA's stock makefile overwrites headers and libraries - # that come with XFree. I don't like it and prefer to keep - # NVIDIA's stuff in a totally separate place, hence it goes - # into /opt - local NVIDIA_ROOT=/opt/nvidia - - # The X module - exeinto "${NVIDIA_ROOT}/modules/drivers" - doexe usr/X11R6/lib/modules/drivers/nvidia_drv.o - exeinto "${NVIDIA_ROOT}/modules/extensions" - doexe "usr/X11R6/lib/modules/extensions/libglx.so.${PV}" - (cd "${D}/${NVIDIA_ROOT}/modules/extensions" - ln -s "libglx.so.${PV}" libglx.so) - - # The GLX libraries - exeinto "${NVIDIA_ROOT}/lib" - doexe "usr/lib/libGL.so.${PV}" "usr/lib/libGLcore.so.${PV}" - (cd "${D}/${NVIDIA_ROOT}/lib" - ln -s "libGL.so.${PV}" libGL.so - ln -s "libGL.so.${PV}" libGL.so.1 - ln -s "libGLcore.so.${PV}" libGLcore.so - ln -s "libGLcore.so.${PV}" libGLcore.so.1) - - # Not sure whether installing the .la file is neccessary; - # this is adopted from the `nvidia' ebuild - local ver1="`echo ${PV} |cut -d '.' -f 1`" - local ver2="`echo ${PV} |cut -d '.' -f 2`" - local ver3="`echo ${PV} |cut -d '.' -f 3`" - sed -e "s:\${PV}:${PV}:" \ - -e "s:\${ver1}:${ver1}:" \ - -e "s:\${ver2}:${ver2}:" \ - -e "s:\${ver3}:${ver3}:" \ - "${FILESDIR}/libGL.la" > "${D}/${NVIDIA_ROOT}/lib/libGL.la" - - # Make sure /opt/NVIDIA/lib gets into ld.so.conf before xfree's libs - insinto /etc/env.d - doins "${FILESDIR}/09nvidia" - - # Includes - insinto "${NVIDIA_ROOT}/include/GL" - doins usr/include/GL/*.h - - # Docs - dodoc "${FILESDIR}/README.gentoo" usr/share/doc/* -} - -pkg_postinst() { - einfo - einfo "Make sure to read documentation in /doc/share/${P}" - einfo "before you attempt to tweak your XF86Config file!" - einfo -} diff --git a/media-video/nvidia-glx/nvidia-glx-1.0.2802-r2.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.2802-r2.ebuild deleted file mode 100644 index ab55311e028d..000000000000 --- a/media-video/nvidia-glx/nvidia-glx-1.0.2802-r2.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2002 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/nvidia-glx-1.0.2802-r2.ebuild,v 1.2 2002/04/27 23:34:20 bangert Exp $ - -# This portage installs binary XFree drivers for video cards -# with NVIDIA chipsets. The driver is provided by NVIDIA corporation. - -# Do _NOT_ strip symbols in the build! Need both lines for Portage 1.8.9+ -DEBUG="yes" -RESTRICT="nostrip" - -NV_V=1.0-2802 - -DESCRIPTION="Linux kernel module for the NVIDIA's X driver" -HOMEPAGE="http://www.nvidia.com/" - -DEPEND="virtual/glibc - >=x11-base/xfree-4.0.2 - >=media-video/nvidia-kernel-${PV}" -PROVIDE="virtual/opengl" - -NV_PACKAGE=NVIDIA_glx-${NV_V} -SRC_URI="http://205.158.109.140/XFree86_40/${NV_V}/${NV_PACKAGE}.tar.gz" -S="${WORKDIR}/NVIDIA_GLX-${NV_V}" - -src_install () { - # NVIDIA's stock makefile overwrites headers and libraries - # that come with XFree. I don't like it and prefer to keep - # NVIDIA's stuff in a totally separate place, hence it goes - # into /opt - local NV_ROOT=/opt/nvidia - - # The X module - exeinto "${NV_ROOT}/modules/drivers" - doexe "usr/X11R6/lib/modules/drivers/nvidia_drv.o" - exeinto "${NV_ROOT}/modules/extensions" - doexe "usr/X11R6/lib/modules/extensions/libglx.so.${PV}" - dosym "${NV_ROOT}/modules/extensions/libglx.so.${PV}" \ - "${NV_ROOT}/modules/extensions/libglx.so" - - # The GLX libraries - exeinto "${NV_ROOT}/lib" - doexe usr/lib/libGL.so."${PV}" \ - usr/lib/libGLcore.so."${PV}" \ - usr/X11R6/lib/libXvMCNVIDIA.a - dosym "${NV_ROOT}/lib/libGL.so.${PV}" "${NV_ROOT}/lib/libGL.so" - dosym "${NV_ROOT}/lib/libGL.so.${PV}" "${NV_ROOT}/lib/libGL.so.1" - dosym "${NV_ROOT}/lib/libGLcore.so.${PV}" "${NV_ROOT}/lib/libGLcore.so" - dosym "${NV_ROOT}/lib/libGLcore.so.${PV}" "${NV_ROOT}/lib/libGLcore.so.1" - - # Not sure whether installing the .la file is neccessary; - # this is adopted from the `nvidia' ebuild - local ver1="`echo ${PV} |cut -d '.' -f 1`" - local ver2="`echo ${PV} |cut -d '.' -f 2`" - local ver3="`echo ${PV} |cut -d '.' -f 3`" - sed -e "s:\${PV}:${PV}:" \ - -e "s:\${ver1}:${ver1}:" \ - -e "s:\${ver2}:${ver2}:" \ - -e "s:\${ver3}:${ver3}:" \ - "${FILESDIR}"/libGL.la > "${D}/${NV_ROOT}"/lib/libGL.la - - # Make sure /opt/NVIDIA/lib gets into ld.so.conf before xfree's libs - insinto /etc/env.d - doins "${FILESDIR}"/09nvidia - - # Includes - insinto "${NV_ROOT}"/include/GL - doins usr/include/GL/*.h - - # Docs - dodoc usr/share/doc/* \ - "${FILESDIR}"/README.gentoo -} - -pkg_postinst() { - einfo - einfo "Make sure to read documentation in /doc/share/${P}" - einfo "before you attempt to tweak your XF86Config file!" - einfo -} diff --git a/media-video/nvidia-glx/nvidia-glx-1.0.2960.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.2960.ebuild new file mode 100644 index 000000000000..44a486a21582 --- /dev/null +++ b/media-video/nvidia-glx/nvidia-glx-1.0.2960.ebuild @@ -0,0 +1,94 @@ +# Copyright 1999-2002 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License, v2 or later +# Maintainer: Martin Schlemmer +# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/nvidia-glx-1.0.2960.ebuild,v 1.1 2002/05/25 23:15:23 azarah Exp $ + +NV_V=${PV/1.0./1.0-} +NV_PACKAGE=NVIDIA_GLX-${NV_V} +S="${WORKDIR}/NVIDIA_GLX-${NV_V}" +DESCRIPTION="Linux kernel module for the NVIDIA's X driver" +SRC_URI="ftp://download.nvidia.com/XFree86_40/${NV_V}/${NV_PACKAGE}.tar.gz + http://download.nvidia.com/XFree86_40/${NV_V}/${NV_PACKAGE}.tar.gz" +HOMEPAGE="http://www.nvidia.com/" + +# We need xfree-4.2.0-r9 to support the dynamic libGL* stuff +DEPEND="virtual/glibc + >=x11-base/xfree-4.2.0-r9 + ~media-video/nvidia-kernel-${PV}" + +PROVIDE="virtual/opengl" + +# Make sure Portage does _NOT_ strip symbols. Need both lines for +# Portage 1.8.9+ +DEBUG="yes" +RESTRICT="nostrip" + + +src_install() { + local NV_ROOT="/usr/lib/opengl/nvidia" + + # The X module + exeinto /usr/X11R6/lib/modules/drivers + doexe usr/X11R6/lib/modules/drivers/nvidia_drv.o + + # The GLX extension + exeinto ${NV_ROOT}/extensions + newexe usr/X11R6/lib/modules/extensions/libglx.so.${PV} libglx.so + + # The GLX libraries + exeinto ${NV_ROOT}/lib + doexe usr/lib/libGL.so.${PV} \ + usr/lib/libGLcore.so.${PV} + dosym libGL.so.${PV} ${NV_ROOT}/lib/libGL.so + dosym libGL.so.${PV} ${NV_ROOT}/lib/libGL.so.1 + dosym libGLcore.so.${PV} ${NV_ROOT}/lib/libGLcore.so + dosym libGLcore.so.${PV} ${NV_ROOT}/lib/libGLcore.so.1 + + insinto usr/X11R6/lib + doins usr/X11R6/lib/libXvMCNVIDIA.a + + # Includes + insinto ${NV_ROOT}/include + doins usr/include/GL/*.h + + # Docs + dodoc usr/share/doc/* + + # Not sure whether installing the .la file is neccessary; + # this is adopted from the `nvidia' ebuild + local ver1="`echo ${PV} |cut -d '.' -f 1`" + local ver2="`echo ${PV} |cut -d '.' -f 2`" + local ver3="`echo ${PV} |cut -d '.' -f 3`" + sed -e "s:\${PV}:${PV}:" \ + -e "s:\${ver1}:${ver1}:" \ + -e "s:\${ver2}:${ver2}:" \ + -e "s:\${ver3}:${ver3}:" \ + ${FILESDIR}/libGL.la.1 > ${D}/${NV_ROOT}/lib/libGL.la +} + +pkg_preinst() { + #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 + if [ "${ROOT}" = "/" ] + then + /usr/sbin/opengl-update nvidia + fi + + einfo + einfo "To use the Nvidia GLX, run \"opengl-update nvidia\"" + einfo +} + -- cgit v1.2.3-65-gdbad