Add 190.53.

(Portage version: 2.1.7.14/cvs/Linux x86_64)

3 files changed, 101 insertions, 1 deletions

diff --git a/media-video/nvidia-settings/ChangeLog b/media-video/nvidia-settings/ChangeLog
index fc085793b80d..1bca1e58f3e1 100644
--- a/media-video/nvidia-settings/ChangeLog
+++ b/media-video/nvidia-settings/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/nvidia-settings
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/ChangeLog,v 1.78 2009/12/01 13:56:06 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/ChangeLog,v 1.79 2009/12/16 22:46:56 peper Exp $
+
+*nvidia-settings-190.53 (16 Dec 2009)
+
+  16 Dec 2009; Piotr Jaroszyński <peper@gentoo.org>
+  +nvidia-settings-190.53.ebuild,
+  +files/nvidia-settings-190.53-xf86vidmodeproto.patch:
+  Add 190.53.
 
   01 Dec 2009; Samuli Suominen <ssuominen@gentoo.org>
   files/nvidia-settings-190.42-xf86vidmodeproto.patch:
diff --git a/media-video/nvidia-settings/files/nvidia-settings-190.53-xf86vidmodeproto.patch b/media-video/nvidia-settings/files/nvidia-settings-190.53-xf86vidmodeproto.patch
new file mode 100644
index 000000000000..77ce7d536011
--- /dev/null
+++ b/media-video/nvidia-settings/files/nvidia-settings-190.53-xf86vidmodeproto.patch
@@ -0,0 +1,16 @@
+--- nvidia-settings-1.0/src/libXNVCtrlAttributes/NvCtrlAttributesVidMode.c
++++ nvidia-settings-1.0/src/libXNVCtrlAttributes/NvCtrlAttributesVidMode.c
+@@ -210,11 +210,12 @@
+     if (vm) free(vm);
+ 
+     /* restore the original error handler, if we overrode it */
+-
++#if defined(X_XF86VidModeGetGammaRampSize)
+     if (prev_error_handler) {
+         XSetErrorHandler(prev_error_handler);
+         prev_error_handler = NULL;
+     }
++#endif
+ 
+     return NULL;
+ 
diff --git a/media-video/nvidia-settings/nvidia-settings-190.53.ebuild b/media-video/nvidia-settings/nvidia-settings-190.53.ebuild
new file mode 100644
index 000000000000..961028554e27
--- /dev/null
+++ b/media-video/nvidia-settings/nvidia-settings-190.53.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-190.53.ebuild,v 1.1 2009/12/16 22:46:56 peper Exp $
+
+inherit eutils toolchain-funcs multilib flag-o-matic
+
+MY_P="${PN}-1.0"
+
+DESCRIPTION="NVIDIA Linux X11 Settings Utility"
+HOMEPAGE="http://www.nvidia.com/"
+SRC_URI="ftp://download.nvidia.com/XFree86/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+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=">=x11-libs/gtk+-2
+	dev-util/pkgconfig
+	x11-base/xorg-server
+	x11-libs/libXt
+	x11-libs/libXv
+	x11-proto/xf86driproto
+	x11-proto/xf86vidmodeproto"
+
+RDEPEND=">=x11-libs/gtk+-2
+	x11-base/xorg-server
+	x11-libs/libXt
+	x11-drivers/nvidia-drivers"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-xf86vidmodeproto.patch
+}
+
+src_compile() {
+	einfo "Building libXNVCtrl..."
+	cd "${S}/src/libXNVCtrl"
+	make clean || die "Cleaning old libXNVCtrl failed"
+	append-flags -fPIC
+	emake CDEBUGFLAGS="${CFLAGS}" CC="$(tc-getCC)" libXNVCtrl.a || die "Building libXNVCtrl failed!"
+	filter-flags -fPIC
+
+	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
+}