Add 169.04 with a patch allowing to run nvidia-setting without :0. Thanks to Tommy Yu <a_korner@hotmail.com> in bug #94240.

Package-Manager: portage-2.1.3.19

5 files changed, 248 insertions, 5 deletions

diff --git a/media-video/nvidia-settings/ChangeLog b/media-video/nvidia-settings/ChangeLog
index 36cda85d8cf6..c3a14ed9391e 100644
--- a/media-video/nvidia-settings/ChangeLog
+++ b/media-video/nvidia-settings/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-video/nvidia-settings
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/ChangeLog,v 1.38 2007/11/12 16:29:06 welp Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/ChangeLog,v 1.39 2007/11/20 20:24:18 peper Exp $
+
+*nvidia-settings-169.04 (20 Nov 2007)
+
+  20 Nov 2007; Piotr Jaroszyński <peper@gentoo.org>
+  +files/nvidia-settings-169.04-no-display.patch,
+  +nvidia-settings-169.04.ebuild:
+  Add 169.04 with a patch allowing to run nvidia-setting without $DISPLAY.
+  Thanks to Tommy Yu <a_korner@hotmail.com> in bug #94240.
 
   12 Nov 2007; Peter Weller <welp@gentoo.org>
   nvidia-settings-1.0.20070621.ebuild:
diff --git a/media-video/nvidia-settings/Manifest b/media-video/nvidia-settings/Manifest
index 24555ed43726..559e88bfe6a4 100644
--- a/media-video/nvidia-settings/Manifest
+++ b/media-video/nvidia-settings/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX icon/nvidia-settings.desktop 194 RMD160 a59dae254f65d9665118629b489b33b0fd87c8d5 SHA1 eac0735769b28d7c217d6ab15a3dca3e2adff9b1 SHA256 af43af5db203c1acf9301fa7fb285a7fdfe5aab5ce1aa30a239fd7db1b588168
 MD5 596d93feba5f2012ed21d3b44bfd0b10 files/icon/nvidia-settings.desktop 194
 RMD160 a59dae254f65d9665118629b489b33b0fd87c8d5 files/icon/nvidia-settings.desktop 194
@@ -6,10 +9,15 @@ AUX icon/nvidia-settings.png 3790 RMD160 a0a8c319ca4b0100d2b7502b6a3dba20a3dc71b
 MD5 0ffd3b3060cafae792a0b7461614a480 files/icon/nvidia-settings.png 3790
 RMD160 a0a8c319ca4b0100d2b7502b6a3dba20a3dc71b9 files/icon/nvidia-settings.png 3790
 SHA256 171e2d20dfe7fbbb86bf9d3c0bb22909529b351fb06b614018a9597ff2456f12 files/icon/nvidia-settings.png 3790
+AUX nvidia-settings-169.04-no-display.patch 3365 RMD160 798fb467038f56ae0d7efa4cd3000c2fa3d3f0e3 SHA1 8474ba73681e393b26155d7bd1b7041d66733cf9 SHA256 d150daeffdf6b6bb5a57bb6bdfaa6d359c453ad22739d65871978c620dac40c7
+MD5 d9f80055ea1bb10b3dd94bda6410e3c0 files/nvidia-settings-169.04-no-display.patch 3365
+RMD160 798fb467038f56ae0d7efa4cd3000c2fa3d3f0e3 files/nvidia-settings-169.04-no-display.patch 3365
+SHA256 d150daeffdf6b6bb5a57bb6bdfaa6d359c453ad22739d65871978c620dac40c7 files/nvidia-settings-169.04-no-display.patch 3365
 DIST nvidia-settings-1.0.20051122.tar.gz 1091361 RMD160 742998d4de33217bbb07f99d2af9480548aeaa07 SHA1 a1a374bb57cd611d26e841d277e7cb7df824ee5f SHA256 d9df3d743f39a5e6961a4f42f77fcf10e57e61b2af68cec03630a1edf5a0a8b1
 DIST nvidia-settings-1.0.20061102.tar.gz 1098727 RMD160 9d182e66ed40799046f213ef4685278f9b4ebf3a SHA1 218560127f9ec9cd34817d7f3cefd86d6421fac3 SHA256 c9cd5f33a8a60c91b6a64915967456289c13ebfee6d83b82fa1b02cd2652b84c
 DIST nvidia-settings-1.0.20070302.tar.gz 1100735 RMD160 96f68ecde52aba2e58976406f4a907e4932b5f32 SHA1 ee81d837cf20fbfa45d4f9d9338e715229d581a5 SHA256 48e0a8b6a0b1cae6881e3c33cb0bdbddb34f7f7d009c91dc0a6826f94736c480
 DIST nvidia-settings-1.0.20070621.tar.gz 1254616 RMD160 4cb1258ac6c3ae9f74eecb4fde79029a7c15f731 SHA1 5aa0349982208153d016ee4565d79f3e7b2277ce SHA256 45ea3322866beab75927d30d5f8b299410b63cd6ebe3b797bd06bd7bf4ba702f
+DIST nvidia-settings-169.04.tar.gz 1288405 RMD160 678a82a290b7f5ca5385e74405f36e926e308a0f SHA1 ac9af0b793d7c413ae8133f98ee3ca1820a1f7e0 SHA256 83c6b760b8322dba96252633d80441d70a8c65e5e172b9db6a73edbdd1eb45fc
 EBUILD nvidia-settings-1.0.20051122-r3.ebuild 2668 RMD160 79f74f5533e2a872a684af3a0b64fd7a969c59ae SHA1 1dc5741850f6ac165a033817bbec76e465ef62dc SHA256 35fd4a3bd5498edb685ede0f4ecf19e8def6abe5e220637cc3f294046343085e
 MD5 c137ef46acc2855f4a0dae37019a00e3 nvidia-settings-1.0.20051122-r3.ebuild 2668
 RMD160 79f74f5533e2a872a684af3a0b64fd7a969c59ae nvidia-settings-1.0.20051122-r3.ebuild 2668
@@ -26,10 +34,14 @@ EBUILD nvidia-settings-1.0.20070621.ebuild 2608 RMD160 12b7c9600aa1228ae83f6adaa
 MD5 be8ebe1aa46754466dc4fe1e9999c209 nvidia-settings-1.0.20070621.ebuild 2608
 RMD160 12b7c9600aa1228ae83f6adaa20bcbb03896813e nvidia-settings-1.0.20070621.ebuild 2608
 SHA256 6993ad695632e2669c33a0f7c2916c64222880dda3ae49c8989798e8dbe6ad75 nvidia-settings-1.0.20070621.ebuild 2608
-MISC ChangeLog 7407 RMD160 5c20554c4a4d3089350b6aad6324b1cc0bcae320 SHA1 2e93b94448febe6caa626bf5dfc6ab6950c98b2d SHA256 53434e4dd64317f48a401e7d03d853542d754c1fdc07184294d3fa5a0142e397
-MD5 4ecaf84864cebe2e73ca09c0ba54dbe3 ChangeLog 7407
-RMD160 5c20554c4a4d3089350b6aad6324b1cc0bcae320 ChangeLog 7407
-SHA256 53434e4dd64317f48a401e7d03d853542d754c1fdc07184294d3fa5a0142e397 ChangeLog 7407
+EBUILD nvidia-settings-169.04.ebuild 2733 RMD160 ae786a5b6677eadb2fd6b3f7f9ecdfad4c112700 SHA1 81ae931f744012c92b0bf31d98a916bde1ca41f5 SHA256 ccc174d184f7495f19334fb4669c4af0a3b34e3eed71879f29e5e156afc4e427
+MD5 882cb9ea6ad6da401cb3f0ff67336881 nvidia-settings-169.04.ebuild 2733
+RMD160 ae786a5b6677eadb2fd6b3f7f9ecdfad4c112700 nvidia-settings-169.04.ebuild 2733
+SHA256 ccc174d184f7495f19334fb4669c4af0a3b34e3eed71879f29e5e156afc4e427 nvidia-settings-169.04.ebuild 2733
+MISC ChangeLog 7719 RMD160 cc53243b55f52598fef1c3920c68c7923971685a SHA1 78b5a3f17911fe499bfe0832859d3259f0ccdfa7 SHA256 06d34240cbddc087e8764c5723a6e0604c5883309db3da5943eca8451427e51e
+MD5 dcd9a659b110091c4c0e25e96bd946e2 ChangeLog 7719
+RMD160 cc53243b55f52598fef1c3920c68c7923971685a ChangeLog 7719
+SHA256 06d34240cbddc087e8764c5723a6e0604c5883309db3da5943eca8451427e51e ChangeLog 7719
 MISC metadata.xml 312 RMD160 3f48a9c5af3729238ee2b7b7d8079095593a074a SHA1 a554ca74853c83d3895b1bb65a3489ecc54bd2c7 SHA256 4c5ee3ae30dc1353639de923975c1adbba82362c167dd60b8a90a192085c1fb3
 MD5 8cc89ece64d97d47dbb01662331caf77 metadata.xml 312
 RMD160 3f48a9c5af3729238ee2b7b7d8079095593a074a metadata.xml 312
@@ -46,3 +58,13 @@ SHA256 e05714cd969aaab3758e47e8a6372a555a1729b9cd6739158ff0eca8759a4537 files/di
 MD5 a81b8712224f8bf0221bcb1918d6ddd7 files/digest-nvidia-settings-1.0.20070621 289
 RMD160 f803578378d52b0e28b3ae1686b23ff3e1b57dd3 files/digest-nvidia-settings-1.0.20070621 289
 SHA256 8cf2d78b39ed41b68ec459eee524360075a3e92b639e06ec0fe042e774319926 files/digest-nvidia-settings-1.0.20070621 289
+MD5 7ebe6a47f160cca7d94d51694b86addf files/digest-nvidia-settings-169.04 271
+RMD160 82ec0491cddd529e2c1e98933991a580582380e9 files/digest-nvidia-settings-169.04 271
+SHA256 b28a1d85f30c9b8da0a5ecfa18cc5e744dc4fb4d344d2cf9dd6cc27e672f74cc files/digest-nvidia-settings-169.04 271
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHQ0JDppoStNGKGywRAt89AJ9HdHmqsX8Nl+UfQR4GlXr8M+nzxACfbJfK
+hzsARxPPKqJpIjSNC87LoIM=
+=fONk
+-----END PGP SIGNATURE-----
diff --git a/media-video/nvidia-settings/files/digest-nvidia-settings-169.04 b/media-video/nvidia-settings/files/digest-nvidia-settings-169.04
new file mode 100644
index 000000000000..ce40457a2adf
--- /dev/null
+++ b/media-video/nvidia-settings/files/digest-nvidia-settings-169.04
@@ -0,0 +1,3 @@
+MD5 fa954e504cb5b89b400968fcbd86ff27 nvidia-settings-169.04.tar.gz 1288405
+RMD160 678a82a290b7f5ca5385e74405f36e926e308a0f nvidia-settings-169.04.tar.gz 1288405
+SHA256 83c6b760b8322dba96252633d80441d70a8c65e5e172b9db6a73edbdd1eb45fc nvidia-settings-169.04.tar.gz 1288405
diff --git a/media-video/nvidia-settings/files/nvidia-settings-169.04-no-display.patch b/media-video/nvidia-settings/files/nvidia-settings-169.04-no-display.patch
new file mode 100644
index 000000000000..6f47d99609e9
--- /dev/null
+++ b/media-video/nvidia-settings/files/nvidia-settings-169.04-no-display.patch
@@ -0,0 +1,112 @@
+diff -ur nvidia-settings-1.0-old/src/gtk+-2.x/ctkui.c nvidia-settings-1.0/src/gtk+-2.x/ctkui.c
+--- nvidia-settings-1.0-old/src/gtk+-2.x/ctkui.c	2007-11-15 01:43:51.000000000 +0100
++++ nvidia-settings-1.0/src/gtk+-2.x/ctkui.c	2007-11-20 21:07:50.000000000 +0100
+@@ -37,6 +37,11 @@
+     gtk_init(argc, argv);
+ }
+ 
++gboolean ctk_init_check(int *argc, char **argv[])
++{
++    return gtk_init_check(argc, argv);
++}
++
+ char *ctk_get_display(void)
+ {
+     return gdk_get_display();
+diff -ur nvidia-settings-1.0-old/src/gtk+-2.x/ctkui.h nvidia-settings-1.0/src/gtk+-2.x/ctkui.h
+--- nvidia-settings-1.0-old/src/gtk+-2.x/ctkui.h	2007-11-15 01:43:51.000000000 +0100
++++ nvidia-settings-1.0/src/gtk+-2.x/ctkui.h	2007-11-20 21:07:50.000000000 +0100
+@@ -28,9 +28,12 @@
+ #include "NvCtrlAttributes.h"
+ #include "parse.h"
+ #include "config-file.h"
++#include <gtk/gtk.h>
+ 
+ void ctk_init(int *argc, char **argv[]);
+ 
++gboolean ctk_init_check(int *argc, char **argv[]);
++
+ char *ctk_get_display(void);
+ 
+ void ctk_main(NvCtrlAttributeHandle **, int,
+Only in nvidia-settings-1.0/src/gtk+-2.x: ctkui.h.orig
+diff -ur nvidia-settings-1.0-old/src/nvidia-settings.c nvidia-settings-1.0/src/nvidia-settings.c
+--- nvidia-settings-1.0-old/src/nvidia-settings.c	2007-11-15 01:43:51.000000000 +0100
++++ nvidia-settings-1.0/src/nvidia-settings.c	2007-11-20 21:10:31.000000000 +0100
+@@ -22,6 +22,8 @@
+  *
+  */
+ 
++#include <gtk/gtk.h>
++
+ #include "NvCtrlAttributes.h"
+ 
+ #include "command-line.h"
+@@ -44,7 +46,9 @@
+     NvCtrlAttributeHandle **vcsc_handles = NULL;
+     Options *op;
+     int ret, i, num_screen_handles, num_gpu_handles, num_vcsc_handles;
+-    
++    char *dpy = NULL;
++    int gui = 0;
++
+     /*
+      * initialize the ui
+      *
+@@ -52,14 +56,21 @@
+      * may not even use the gui, but we want the toolkit to have a
+      * chance to parse the commandline before we do... we should
+      * investigate gtk_init_check().
++     *
++     * gui flag used to decide if gtk should be used or not, as
++     * use might just use control the display from a remote console
++     * but for some reason cannot initialize the gtk gui. - TY 2005-05-27
+      */
+-    
+-    ctk_init(&argc, &argv);
+-    
++
++
++    if (ctk_init_check(&argc, &argv) == TRUE) {
++        dpy = ctk_get_display();
++        gui = 1;
++    }
++
+     /* parse the commandline */
+     
+-    op = parse_command_line(argc, argv, ctk_get_display());
+-
++    op = parse_command_line(argc, argv, dpy);
+     /* process any query or assignment commandline options */
+ 
+     if (op->num_assignments || op->num_queries) {
+@@ -67,6 +78,14 @@
+         return ret ? 0 : 1;
+     }
+     
++    /* quit here if display is undefineds - TY 2005-05-27 */
++
++    if (op->ctrl_display == NULL) {
++        nv_error_msg("Display is undefined, please run `%s --help` "
++                     "for usage information.\n", argv[0]);
++        return 1;
++    }
++    
+     /* initialize the parsed attribute list */
+ 
+     p = nv_parsed_attribute_init();
+@@ -165,6 +184,14 @@
+     }
+     
+     /* pass control to the gui */
++    /*
++     * if gtk wasn't initiated, exit here.
++     * Using a -c flag without gtk would behave as if using -l - TY 2005-05-27
++     */
++    if (gui == 0) {
++        nv_error_msg("Unable to create gui.\n");
++        return 1;
++    }
+ 
+     ctk_main(screen_handles, num_screen_handles,
+              gpu_handles, num_gpu_handles,
diff --git a/media-video/nvidia-settings/nvidia-settings-169.04.ebuild b/media-video/nvidia-settings/nvidia-settings-169.04.ebuild
new file mode 100644
index 000000000000..77810cb84ad6
--- /dev/null
+++ b/media-video/nvidia-settings/nvidia-settings-169.04.ebuild
@@ -0,0 +1,98 @@
+# 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-169.04.ebuild,v 1.1 2007/11/20 20:24:18 peper Exp $
+
+inherit eutils toolchain-funcs multilib
+
+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-misc/imake
+	x11-misc/gccmakedep"
+
+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}"
+	# This patch was accepted upstream, so next release shouldn't need it. bug #94240
+	epatch "${FILESDIR}/${P}-no-display.patch"
+
+	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 /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
+}