diff options
Diffstat (limited to 'media-video/nvidia-settings')
| -rw-r--r-- | media-video/nvidia-settings/ChangeLog | 13 | ||||
| -rw-r--r-- | media-video/nvidia-settings/files/digest-nvidia-settings-1.0.20060516-r1 | 3 | ||||
| -rw-r--r-- | media-video/nvidia-settings/files/digest-nvidia-settings-1.0.20060919 | 3 | ||||
| -rw-r--r-- | media-video/nvidia-settings/files/digest-nvidia-settings-1.0.20070302 | 3 | ||||
| -rw-r--r-- | media-video/nvidia-settings/metadata.xml | 13 | ||||
| -rw-r--r-- | media-video/nvidia-settings/nvidia-settings-1.0.20051122-r3.ebuild | 9 | ||||
| -rw-r--r-- | media-video/nvidia-settings/nvidia-settings-1.0.20060516-r1.ebuild | 101 | ||||
| -rw-r--r-- | media-video/nvidia-settings/nvidia-settings-1.0.20061102.ebuild | 9 | ||||
| -rw-r--r-- | media-video/nvidia-settings/nvidia-settings-1.0.20070302.ebuild (renamed from media-video/nvidia-settings/nvidia-settings-1.0.20060919.ebuild) | 56 |
9 files changed, 58 insertions, 152 deletions
diff --git a/media-video/nvidia-settings/ChangeLog b/media-video/nvidia-settings/ChangeLog index e8a1a5e8c8c5..9deaec5d3fbf 100644 --- a/media-video/nvidia-settings/ChangeLog +++ b/media-video/nvidia-settings/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for media-video/nvidia-settings -# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/ChangeLog,v 1.30 2006/11/10 15:34:19 augustus Exp $ +# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/ChangeLog,v 1.31 2007/03/07 21:57:40 peper Exp $ + +*nvidia-settings-1.0.20070302 (07 Mar 2007) + + 07 Mar 2007; Piotr Jaroszyński <peper@gentoo.org> metadata.xml, + nvidia-settings-1.0.20051122-r3.ebuild, + -nvidia-settings-1.0.20060516-r1.ebuild, + -nvidia-settings-1.0.20060919.ebuild, nvidia-settings-1.0.20061102.ebuild, + +nvidia-settings-1.0.20070302.ebuild: + Version bump and a little clean up. *nvidia-settings-1.0.20061102 (10 Nov 2006) diff --git a/media-video/nvidia-settings/files/digest-nvidia-settings-1.0.20060516-r1 b/media-video/nvidia-settings/files/digest-nvidia-settings-1.0.20060516-r1 deleted file mode 100644 index fab3235ecb7f..000000000000 --- a/media-video/nvidia-settings/files/digest-nvidia-settings-1.0.20060516-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 42eb8e6795b6b7c98e121e4b2b042ff7 nvidia-settings-1.0.20060516.tar.gz 1119552 -RMD160 784cb63001dae40bcd0c2298f3fbc519438a7266 nvidia-settings-1.0.20060516.tar.gz 1119552 -SHA256 884a1152899ffccfa3180dfc1af9d1e5c7f3bb7367882f1971bd601aa715fada nvidia-settings-1.0.20060516.tar.gz 1119552 diff --git a/media-video/nvidia-settings/files/digest-nvidia-settings-1.0.20060919 b/media-video/nvidia-settings/files/digest-nvidia-settings-1.0.20060919 deleted file mode 100644 index 3301a744653e..000000000000 --- a/media-video/nvidia-settings/files/digest-nvidia-settings-1.0.20060919 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 6b70f0a178573b685f6c76e55067756c nvidia-settings-1.0.20060919.tar.gz 1298171 -RMD160 674a1cd4f43ba19495ea174a457b1bfe051d9b73 nvidia-settings-1.0.20060919.tar.gz 1298171 -SHA256 ffde9c181f6769d3de41c5b61b2931fdee764c3bb62a536d732bc701a7e78477 nvidia-settings-1.0.20060919.tar.gz 1298171 diff --git a/media-video/nvidia-settings/files/digest-nvidia-settings-1.0.20070302 b/media-video/nvidia-settings/files/digest-nvidia-settings-1.0.20070302 new file mode 100644 index 000000000000..9481c118f50c --- /dev/null +++ b/media-video/nvidia-settings/files/digest-nvidia-settings-1.0.20070302 @@ -0,0 +1,3 @@ +MD5 414a838f01093ceb0ae8535c35e21eac nvidia-settings-1.0.tar.gz 1100735 +RMD160 96f68ecde52aba2e58976406f4a907e4932b5f32 nvidia-settings-1.0.tar.gz 1100735 +SHA256 48e0a8b6a0b1cae6881e3c33cb0bdbddb34f7f7d009c91dc0a6826f94736c480 nvidia-settings-1.0.tar.gz 1100735 diff --git a/media-video/nvidia-settings/metadata.xml b/media-video/nvidia-settings/metadata.xml index 7b57e87f2cc7..25c7a498245d 100644 --- a/media-video/nvidia-settings/metadata.xml +++ b/media-video/nvidia-settings/metadata.xml @@ -1,9 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<herd>x11-drivers</herd> -<maintainer> - <email>x11-drivers@gentoo.org</email> -</maintainer> -<longdescription>NVIDIA Linux X11 Settings Utility</longdescription> + <herd>x11-drivers</herd> + <maintainer> + <email>peper@gentoo.org</email> + <name>Piotr Jaroszyński</name> + </maintainer> + <longdescription lang="en"> + </longdescription> </pkgmetadata> + diff --git a/media-video/nvidia-settings/nvidia-settings-1.0.20051122-r3.ebuild b/media-video/nvidia-settings/nvidia-settings-1.0.20051122-r3.ebuild index c0e77afe35a7..fce6bffaa8ea 100644 --- a/media-video/nvidia-settings/nvidia-settings-1.0.20051122-r3.ebuild +++ b/media-video/nvidia-settings/nvidia-settings-1.0.20051122-r3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-1.0.20051122-r3.ebuild,v 1.7 2006/10/30 15:22:36 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-1.0.20051122-r3.ebuild,v 1.8 2007/03/07 21:57:40 peper Exp $ inherit eutils toolchain-funcs multilib @@ -25,8 +25,7 @@ IUSE= # This also allows us to optimize out a lot of the other dependancies, as # between gtk and xorg-server, almost all libraries and headers are accounted # for. -DEPEND="virtual/libc - >=x11-libs/gtk+-2 +DEPEND=">=x11-libs/gtk+-2 dev-util/pkgconfig || ( ( x11-base/xorg-server x11-libs/libXt @@ -52,7 +51,7 @@ src_unpack() { # This next voodoo is just to work around xmkmf's broken behaviour # after the Xorg move to /usr (or I think, as I have not messed # with it in ages). - ln -snf ${ROOT}/usr/include/X11 include + ln -snf /usr/include/X11 include # Ensure that libNVCtrl.a is actually built # Regardless of how NormalLibXrandr was built diff --git a/media-video/nvidia-settings/nvidia-settings-1.0.20060516-r1.ebuild b/media-video/nvidia-settings/nvidia-settings-1.0.20060516-r1.ebuild deleted file mode 100644 index e46751f48a74..000000000000 --- a/media-video/nvidia-settings/nvidia-settings-1.0.20060516-r1.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-1.0.20060516-r1.ebuild,v 1.4 2006/10/30 15:22:36 wolf31o2 Exp $ - -inherit eutils toolchain-funcs multilib - -# The following were added to work with the new nvidia-drivers and -# nvidia-legacy-drivers ebuilds. -NVIDIA_NEW_VERSION="1.0.8178" -NVIDIA_LEGACY_VERSION="1.0.7182" -S="${WORKDIR}/${PN}-1.0" -DESCRIPTION="NVIDIA Linux X11 Settings Utility" -HOMEPAGE="http://www.nvidia.com/" -SRC_URI="mirror://gentoo/${P}.tar.gz - http://dev.gentoo.org/~azarah/nvidia/${P}.tar.gz" -# Real SRC_URI: ftp://download.nvidia.com/XFree86/nvidia-settings/ - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="-* ~amd64 ~x86" -IUSE= - -# xorg-server is used in the depends as nvidia-settings builds against some -# headers in /usr/include/xorg/. -# This also allows us to optimize out a lot of the other dependancies, as -# between gtk and xorg-server, almost all libraries and headers are accounted -# for. -DEPEND="virtual/libc - >=x11-libs/gtk+-2 - dev-util/pkgconfig - || ( ( x11-base/xorg-server - x11-libs/libXt - x11-libs/libXv - x11-proto/xf86driproto - x11-misc/imake - x11-misc/gccmakedep ) - virtual/x11 - )" -RDEPEND="|| ( - >=x11-drivers/nvidia-drivers-${NVIDIA_NEW_VERSION} - >=x11-drivers/nvidia-legacy-drivers-${NVIDIA_LEGACY_VERSION} ) - >=x11-libs/gtk+-2 - || ( ( x11-base/xorg-server - x11-libs/libXt ) - virtual/x11 - )" - -src_unpack() { - unpack ${A} - cd ${S}/src/libXNVCtrl - einfo "Tweaking libXNVCtrl for build..." - # This next voodoo is just to work around xmkmf's broken behaviour - # after the Xorg move to /usr (or I think, as I have not messed - # with it in ages). - ln -snf ${ROOT}/usr/include/X11 include - - # Ensure that libNVCtrl.a is actually built - # Regardless of how NormalLibXrandr was built - # (NormalLibXrandr indicates if Xrandr was built as static or not) - # NormalLibXrandr was 'YES' in Xorg-6.8, but is 'NO' in 7.0. - sed -i.orig \ - -e 's,DoNormalLib NormalLibXrandr,DoNormalLib YES,g' \ - Imakefile - - # for a rainy day, when we need a shared libXNVCtrl.so - #-e 'a#define DoSharedLib YES\n' \ -} - -src_compile() { - einfo "Building libXNVCtrl..." - cd ${S}/src/libXNVCtrl - xmkmf -a || die "Running xmkmf failed!" - make clean || die "Cleaning old libXNVCtrl failed" - emake CDEBUGFLAGS="${CFLAGS}" CC="$(tc-getCC)" all || die "Building libXNVCtrl failed!" - - cd ${S} - einfo "Building nVidia-Settings..." - emake CC="$(tc-getCC)" || die "Failed to build nvidia-settings" -} - -src_install() { - # Install the executable - exeinto /usr/bin - doexe nvidia-settings - - # Install libXNVCtrl and headers - insinto "/usr/$(get_libdir)" - doins src/libXNVCtrl/libXNVCtrl.a - insinto /usr/include/NVCtrl - doins src/libXNVCtrl/{NVCtrl,NVCtrlLib}.h - - # Install icon and .desktop entry - doicon "${FILESDIR}/icon/${PN}.png" - domenu "${FILESDIR}/icon/${PN}.desktop" - - # Install manpage - doman doc/nvidia-settings.1 - - # Now install documentation - dodoc doc/*.txt -} diff --git a/media-video/nvidia-settings/nvidia-settings-1.0.20061102.ebuild b/media-video/nvidia-settings/nvidia-settings-1.0.20061102.ebuild index d8cdc3fe5bba..83bfe3767b22 100644 --- a/media-video/nvidia-settings/nvidia-settings-1.0.20061102.ebuild +++ b/media-video/nvidia-settings/nvidia-settings-1.0.20061102.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-1.0.20061102.ebuild,v 1.1 2006/11/10 15:34:19 augustus Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-1.0.20061102.ebuild,v 1.2 2007/03/07 21:57:40 peper Exp $ inherit eutils toolchain-funcs multilib @@ -25,8 +25,7 @@ IUSE= # This also allows us to optimize out a lot of the other dependancies, as # between gtk and xorg-server, almost all libraries and headers are accounted # for. -DEPEND="virtual/libc - >=x11-libs/gtk+-2 +DEPEND=">=x11-libs/gtk+-2 dev-util/pkgconfig x11-base/xorg-server x11-libs/libXt @@ -48,7 +47,7 @@ src_unpack() { # This next voodoo is just to work around xmkmf's broken behaviour # after the Xorg move to /usr (or I think, as I have not messed # with it in ages). - ln -snf ${ROOT}/usr/include/X11 include + ln -snf /usr/include/X11 include # Ensure that libNVCtrl.a is actually built # Regardless of how NormalLibXrandr was built diff --git a/media-video/nvidia-settings/nvidia-settings-1.0.20060919.ebuild b/media-video/nvidia-settings/nvidia-settings-1.0.20070302.ebuild index 75af6fef89a4..dfd9752df832 100644 --- a/media-video/nvidia-settings/nvidia-settings-1.0.20060919.ebuild +++ b/media-video/nvidia-settings/nvidia-settings-1.0.20070302.ebuild @@ -1,54 +1,54 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-1.0.20060919.ebuild,v 1.2 2006/10/30 15:22:36 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-1.0.20070302.ebuild,v 1.1 2007/03/07 21:57:40 peper Exp $ inherit eutils toolchain-funcs multilib -# The following were added to work with the new nvidia-drivers and -# nvidia-legacy-drivers ebuilds. +MY_P="${PN}-1.0" NVIDIA_NEW_VERSION="1.0.9625" NVIDIA_LEGACY_VERSION="1.0.7182" -S="${WORKDIR}/${PN}-1.0" + DESCRIPTION="NVIDIA Linux X11 Settings Utility" HOMEPAGE="http://www.nvidia.com/" -SRC_URI="mirror://gentoo/${P}.tar.gz - http://dev.gentoo.org/~azarah/nvidia/${P}.tar.gz" -#SRC_URI="ftp://download.nvidia.com/XFree86/nvidia-settings/${P}.tar.gz" +SRC_URI="ftp://download.nvidia.com/XFree86/${PN}/${MY_P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="-* ~amd64 ~x86" -IUSE= +IUSE="" # xorg-server is used in the depends as nvidia-settings builds against some # headers in /usr/include/xorg/. # This also allows us to optimize out a lot of the other dependancies, as # between gtk and xorg-server, almost all libraries and headers are accounted # for. -DEPEND="virtual/libc - >=x11-libs/gtk+-2 - dev-util/pkgconfig - x11-base/xorg-server - x11-libs/libXt - x11-libs/libXv - x11-proto/xf86driproto - x11-misc/imake - x11-misc/gccmakedep" -RDEPEND="|| ( - >=x11-drivers/nvidia-drivers-${NVIDIA_NEW_VERSION} - >=x11-drivers/nvidia-legacy-drivers-${NVIDIA_LEGACY_VERSION} ) - >=x11-libs/gtk+-2 - x11-base/xorg-server - x11-libs/libXt" +DEPEND=">=x11-libs/gtk+-2 + dev-util/pkgconfig + x11-base/xorg-server + x11-libs/libXt + x11-libs/libXv + x11-proto/xf86driproto + x11-misc/imake + x11-misc/gccmakedep" + +RDEPEND=">=x11-libs/gtk+-2 + x11-base/xorg-server + x11-libs/libXt + || ( >=x11-drivers/nvidia-drivers-${NVIDIA_NEW_VERSION} + >=x11-drivers/nvidia-legacy-drivers-${NVIDIA_LEGACY_VERSION} )" + +S="${WORKDIR}/${MY_P}" src_unpack() { unpack ${A} - cd ${S}/src/libXNVCtrl + + cd "${S}/src/libXNVCtrl" einfo "Tweaking libXNVCtrl for build..." + # This next voodoo is just to work around xmkmf's broken behaviour # after the Xorg move to /usr (or I think, as I have not messed # with it in ages). - ln -snf ${ROOT}/usr/include/X11 include + #ln -snf /usr/include/X11 include # Ensure that libNVCtrl.a is actually built # Regardless of how NormalLibXrandr was built @@ -64,12 +64,12 @@ src_unpack() { src_compile() { einfo "Building libXNVCtrl..." - cd ${S}/src/libXNVCtrl + cd "${S}/src/libXNVCtrl" xmkmf -a || die "Running xmkmf failed!" make clean || die "Cleaning old libXNVCtrl failed" emake CDEBUGFLAGS="${CFLAGS}" CC="$(tc-getCC)" all || die "Building libXNVCtrl failed!" - cd ${S} + cd "${S}" einfo "Building nVidia-Settings..." emake CC="$(tc-getCC)" || die "Failed to build nvidia-settings" } |