diff options
Diffstat (limited to 'media-video')
4 files changed, 106 insertions, 12 deletions
diff --git a/media-video/nvidia-settings/ChangeLog b/media-video/nvidia-settings/ChangeLog index ee612932a6b3..802cefc6d928 100644 --- a/media-video/nvidia-settings/ChangeLog +++ b/media-video/nvidia-settings/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-video/nvidia-settings -# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/ChangeLog,v 1.17 2005/12/07 12:07:11 azarah Exp $ +# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/ChangeLog,v 1.18 2006/01/19 00:18:55 augustus Exp $ + +*nvidia-settings-1.0.20051122-r3 (19 Jan 2006) + + 19 Jan 2006; Kristopher Kersey <augustus@gentoo.org> + +nvidia-settings-1.0.20051122-r3.ebuild: + Added modular X support. Bug #114603. *nvidia-settings-1.0.20051122-r2 (07 Dec 2005) diff --git a/media-video/nvidia-settings/Manifest b/media-video/nvidia-settings/Manifest index bfd97ce2ed59..abc95dab8871 100644 --- a/media-video/nvidia-settings/Manifest +++ b/media-video/nvidia-settings/Manifest @@ -1,12 +1,10 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - MD5 fa685ee8d19f8bd71d64fddf8bbd7d11 ChangeLog 3352 MD5 ba114bf17302ecdb08e065953295cc03 files/digest-nvidia-settings-1.0.20050525 81 MD5 47ecc5e991834fd43188034d76fbbc96 files/digest-nvidia-settings-1.0.20050729 81 MD5 5f2cbe0077553362cfec46c11a1839fa files/digest-nvidia-settings-1.0.20051122 81 MD5 5f2cbe0077553362cfec46c11a1839fa files/digest-nvidia-settings-1.0.20051122-r1 81 MD5 5f2cbe0077553362cfec46c11a1839fa files/digest-nvidia-settings-1.0.20051122-r2 81 +MD5 5f2cbe0077553362cfec46c11a1839fa files/digest-nvidia-settings-1.0.20051122-r3 81 MD5 d15804c20077d1318d338ec3db0ac495 files/digest-nvidia-settings-1.0.6111 76 MD5 0a39b5babdda1f3d78fee4db5b053b0a files/digest-nvidia-settings-1.0.6629 76 MD5 ce276d6edd87a8f9f2bfc81f2d4fcfed files/digest-nvidia-settings-1.0.7167 76 @@ -18,14 +16,8 @@ MD5 6a85441f269b195cfa3f1a8a6422120c nvidia-settings-1.0.20050525.ebuild 1539 MD5 7bbeebd18631e196cdf02e30c2008310 nvidia-settings-1.0.20050729.ebuild 1607 MD5 5016b0fa9d39b1ed1d46603957c66c7e nvidia-settings-1.0.20051122-r1.ebuild 1659 MD5 de224fd54ba4e9440b3629559f8d8112 nvidia-settings-1.0.20051122-r2.ebuild 1756 +MD5 9431f4b4071efa66015c28f83b5df89c nvidia-settings-1.0.20051122-r3.ebuild 2811 MD5 e7136664ccde2a8050e6b17b803fbdb0 nvidia-settings-1.0.20051122.ebuild 1607 MD5 9df89547cf34bfb5ffa1177e2ce00c00 nvidia-settings-1.0.6111.ebuild 1128 MD5 230d885c5f928254a3791e8f7b2bcc17 nvidia-settings-1.0.6629.ebuild 1128 MD5 d7f90e0d8347493b76fad3613ccd4c91 nvidia-settings-1.0.7167.ebuild 1322 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.2 (GNU/Linux) - -iD8DBQFDltGw1ZcsMnZjRyIRAtTTAJ9pEHaQnKydA6RHU4xXgPcFuS2a3ACgptbl -PolXhSxfgmhQuehJWGdbUNQ= -=v07w ------END PGP SIGNATURE----- diff --git a/media-video/nvidia-settings/files/digest-nvidia-settings-1.0.20051122-r3 b/media-video/nvidia-settings/files/digest-nvidia-settings-1.0.20051122-r3 new file mode 100644 index 000000000000..c850c0cf2f64 --- /dev/null +++ b/media-video/nvidia-settings/files/digest-nvidia-settings-1.0.20051122-r3 @@ -0,0 +1 @@ +MD5 36f53ad25a171cf4be4c9912445cfcdb nvidia-settings-1.0.20051122.tar.gz 1091361 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 new file mode 100644 index 000000000000..971c2f14b4c6 --- /dev/null +++ b/media-video/nvidia-settings/nvidia-settings-1.0.20051122-r3.ebuild @@ -0,0 +1,95 @@ +# 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.20051122-r3.ebuild,v 1.1 2006/01/19 00:18:55 augustus Exp $ + +inherit eutils toolchain-funcs multilib + +NVIDIA_VERSION="1.0.7664" +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="-* ~x86 ~amd64" +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 + || ( ( x11-base/xorg-server + x11-libs/libXt + x11-proto/xf86driproto + x11-misc/imake + x11-misc/gccmakedep ) + virtual/x11 + )" +RDEPEND=">=media-video/nvidia-glx-${NVIDIA_VERSION} + >=media-video/nvidia-kernel-${NVIDIA_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 +} |