From ff9c45d4e89f80a32072fc2d248533fcb211ce0d Mon Sep 17 00:00:00 2001
From: Doug Goldstein <cardoe@gentoo.org>
Date: Mon, 30 Aug 2010 22:23:24 +0000
Subject: Version bump that works with newer x11-drivers/nvidia-drivers that
 provides its own nvidia-settings app. bug #304255 (Portage version:
 2.1.8.3/cvs/Linux x86_64)

---
 media-video/nvidia-settings/ChangeLog              |  7 ++-
 .../nvidia-settings/nvidia-settings-256.52.ebuild  | 68 ++++++++++++++++++++++
 2 files changed, 74 insertions(+), 1 deletion(-)
 create mode 100644 media-video/nvidia-settings/nvidia-settings-256.52.ebuild

(limited to 'media-video')

diff --git a/media-video/nvidia-settings/ChangeLog b/media-video/nvidia-settings/ChangeLog
index ac6df13d7aed..fe2e766edf42 100644
--- a/media-video/nvidia-settings/ChangeLog
+++ b/media-video/nvidia-settings/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/nvidia-settings
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/ChangeLog,v 1.90 2010/08/30 21:20:22 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/ChangeLog,v 1.91 2010/08/30 22:23:24 cardoe Exp $
+
+  30 Aug 2010; Doug Goldstein <cardoe@gentoo.org>
+  +nvidia-settings-256.52.ebuild:
+  Version bump that works with newer x11-drivers/nvidia-drivers that
+  provides its own nvidia-settings app. bug #304255
 
   30 Aug 2010; Doug Goldstein <cardoe@gentoo.org>
   -nvidia-settings-256.52.ebuild:
diff --git a/media-video/nvidia-settings/nvidia-settings-256.52.ebuild b/media-video/nvidia-settings/nvidia-settings-256.52.ebuild
new file mode 100644
index 000000000000..f1c0dc9d19b1
--- /dev/null
+++ b/media-video/nvidia-settings/nvidia-settings-256.52.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-256.52.ebuild,v 1.3 2010/08/30 22:23:24 cardoe Exp $
+
+EAPI=2
+
+inherit eutils toolchain-funcs multilib flag-o-matic
+
+DESCRIPTION="NVIDIA Linux X11 Settings Utility"
+HOMEPAGE="http://www.nvidia.com/"
+SRC_URI="ftp://download.nvidia.com/XFree86/${PN}/${P}.tar.bz2"
+
+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"
+
+src_prepare() {
+	sed -i -e "s#prefix = .*#prefix = ${D}/usr#" utils.mk
+}
+
+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() {
+	#make STRIP_CMD=/bin/true install
+
+	# 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"
+
+	# Now install documentation
+	dodoc doc/*.txt
+}
-- 
cgit v1.2.3-65-gdbad