summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2015-09-23 14:54:14 +0200
committerJeroen Roovers <jer@gentoo.org>2015-09-23 14:54:29 +0200
commite09b1dfa8c7069913ed6527dd038059cfe0e8ed4 (patch)
tree9144607f6f97cf61e4df2225b3b04c479e121254
parentnet-dialup/pptpclient: ppc64 stable wrt bug #535550 (diff)
downloadgentoo-e09b1dfa8c7069913ed6527dd038059cfe0e8ed4.tar.gz
gentoo-e09b1dfa8c7069913ed6527dd038059cfe0e8ed4.tar.bz2
gentoo-e09b1dfa8c7069913ed6527dd038059cfe0e8ed4.zip
media-video/nvidia-settings: Stable for AMD64 x86 too.
Package-Manager: portage-2.2.20.1 RepoMan-Options: --ignore-arches
-rw-r--r--media-video/nvidia-settings/nvidia-settings-340.58-r1.ebuild77
-rw-r--r--media-video/nvidia-settings/nvidia-settings-340.58.ebuild4
2 files changed, 79 insertions, 2 deletions
diff --git a/media-video/nvidia-settings/nvidia-settings-340.58-r1.ebuild b/media-video/nvidia-settings/nvidia-settings-340.58-r1.ebuild
new file mode 100644
index 00000000000..2f3f159bfee
--- /dev/null
+++ b/media-video/nvidia-settings/nvidia-settings-340.58-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils multilib toolchain-funcs
+
+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="examples"
+
+COMMON_DEPEND="x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXxf86vm
+ x11-libs/gtk+:2
+ x11-libs/gdk-pixbuf[X]
+ media-libs/mesa
+ x11-libs/pango[X]
+ x11-libs/libXv
+ x11-libs/libXrandr
+ dev-libs/glib:2
+ dev-libs/jansson"
+
+RDEPEND="
+ x11-drivers/nvidia-drivers:0/340
+ ${COMMON_DEPEND}
+ x11-libs/libvdpau"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ x11-proto/xproto"
+
+src_compile() {
+ einfo "Building libXNVCtrl..."
+ emake -C src/ \
+ CC="$(tc-getCC)" \
+ AR="$(tc-getAR)" \
+ RANLIB="$(tc-getRANLIB)" \
+ build-xnvctrl
+
+ einfo "Building nvidia-settings..."
+ emake -C src/ \
+ CC="$(tc-getCC)" \
+ LD="$(tc-getLD)" \
+ STRIP_CMD="$(type -P true)" \
+ NV_VERBOSE=1 \
+ NV_USE_BUNDLED_LIBJANSSON=0
+}
+
+src_install() {
+ emake -C src/ DESTDIR="${D}" PREFIX=/usr NV_USE_BUNDLED_LIBJANSSON=0 install
+
+ insinto /usr/$(get_libdir)
+ doins src/libXNVCtrl/libXNVCtrl.a
+
+ insinto /usr/include/NVCtrl
+ doins src/libXNVCtrl/*.h
+
+# doicon doc/${PN}.png # Installed through nvidia-drivers
+ make_desktop_entry ${PN} "NVIDIA X Server Settings" ${PN} Settings
+
+ # bug 412569 - Installed through nvidia-drivers
+# rm -rf "${D}"/usr/share/man
+
+ dodoc doc/*.txt
+
+ if use examples; then
+ docinto examples/
+ dodoc samples/*.c
+ dodoc samples/README
+ fi
+}
diff --git a/media-video/nvidia-settings/nvidia-settings-340.58.ebuild b/media-video/nvidia-settings/nvidia-settings-340.58.ebuild
index 2f3f159bfee..5c509701133 100644
--- a/media-video/nvidia-settings/nvidia-settings-340.58.ebuild
+++ b/media-video/nvidia-settings/nvidia-settings-340.58.ebuild
@@ -12,7 +12,7 @@ SRC_URI="ftp://download.nvidia.com/XFree86/${PN}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+KEYWORDS="-* amd64 x86 ~x86-fbsd"
IUSE="examples"
COMMON_DEPEND="x11-libs/libX11
@@ -28,7 +28,7 @@ COMMON_DEPEND="x11-libs/libX11
dev-libs/jansson"
RDEPEND="
- x11-drivers/nvidia-drivers:0/340
+ ~x11-drivers/nvidia-drivers-340.93
${COMMON_DEPEND}
x11-libs/libvdpau"
DEPEND="${RDEPEND}