Missing X11/extensions/xf86vmproto.h include from xf86vidmodeproto to compile with libXxf86vm >= 1.1.0.

Package-Manager: portage-2.2_rc47/cvs/Linux x86_64

4 files changed, 29 insertions, 5 deletions

diff --git a/media-video/nvidia-settings/ChangeLog b/media-video/nvidia-settings/ChangeLog
index 0b68670d1ffd..7f34740f2f73 100644
--- a/media-video/nvidia-settings/ChangeLog
+++ b/media-video/nvidia-settings/ChangeLog
@@ -1,6 +1,12 @@
 # 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.76 2009/10/22 05:33:38 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/ChangeLog,v 1.77 2009/11/01 12:11:44 ssuominen Exp $
+
+  01 Nov 2009; Samuli Suominen <ssuominen@gentoo.org>
+  nvidia-settings-190.42.ebuild,
+  +files/nvidia-settings-190.42-xf86vidmodeproto.patch:
+  Missing X11/extensions/xf86vmproto.h include from xf86vidmodeproto to
+  compile with libXxf86vm >= 1.1.0.
 
 *nvidia-settings-185.18.36 (22 Oct 2009)
 
diff --git a/media-video/nvidia-settings/Manifest b/media-video/nvidia-settings/Manifest
index cb0a9c5f251e..97116190f16a 100644
--- a/media-video/nvidia-settings/Manifest
+++ b/media-video/nvidia-settings/Manifest
@@ -1,6 +1,7 @@
 AUX icon/nvidia-settings.desktop 194 RMD160 a59dae254f65d9665118629b489b33b0fd87c8d5 SHA1 eac0735769b28d7c217d6ab15a3dca3e2adff9b1 SHA256 af43af5db203c1acf9301fa7fb285a7fdfe5aab5ce1aa30a239fd7db1b588168
 AUX icon/nvidia-settings.png 3790 RMD160 a0a8c319ca4b0100d2b7502b6a3dba20a3dc71b9 SHA1 ff485bf300c6e0c56b3d1f08ee87e4d9a425db65 SHA256 171e2d20dfe7fbbb86bf9d3c0bb22909529b351fb06b614018a9597ff2456f12
 AUX nvidia-settings-169.04-no-display.patch 3365 RMD160 798fb467038f56ae0d7efa4cd3000c2fa3d3f0e3 SHA1 8474ba73681e393b26155d7bd1b7041d66733cf9 SHA256 d150daeffdf6b6bb5a57bb6bdfaa6d359c453ad22739d65871978c620dac40c7
+AUX nvidia-settings-190.42-xf86vidmodeproto.patch 545 RMD160 96996b09aae9ac9c0a1db9530ce31a3a10329763 SHA1 8edeb8ebb81085ca9ef3b93d6e8329281ab6f737 SHA256 06181be8543c3e06e60306b3fbf0ac77181211ea7618ee0a2141f1d09aa0cb5a
 DIST nvidia-settings-1.0.20070621.tar.gz 1254616 RMD160 4cb1258ac6c3ae9f74eecb4fde79029a7c15f731 SHA1 5aa0349982208153d016ee4565d79f3e7b2277ce SHA256 45ea3322866beab75927d30d5f8b299410b63cd6ebe3b797bd06bd7bf4ba702f
 DIST nvidia-settings-173.14.09.tar.gz 1298573 RMD160 30245f9165196ed7975a1f9060722800e3c9d785 SHA1 0d489c3fc9df013bf162ad71e08f637bc28027b9 SHA256 9abf878f7864e602a6cae20bac4be950540473ba2ca2836d6aaeb18d2598c55d
 DIST nvidia-settings-173.14.12.tar.gz 1298699 RMD160 0255608b6665918ac7ab86affa8ead816ea7d29c SHA1 1f23d964e13fe5bd112d19f5461f7e42efce7a31 SHA256 00a81a95438da95c720611039d72e0ab446e27329ed1f1b773bcacac15bdeed1
@@ -44,6 +45,6 @@ EBUILD nvidia-settings-190.25.ebuild 1916 RMD160 823787b6cf0b83e6a7557e73393cca6
 EBUILD nvidia-settings-190.32.ebuild 1916 RMD160 a7e8980be449fc363d811bdb582b16cba3301bbc SHA1 ed16e3532cbd47f5f317bb1ad59172acf6766ab8 SHA256 2faff628b670a45cfc835b9c3625fa9f66b71a9b3770935da553ec60d79fe9d6
 EBUILD nvidia-settings-190.36.ebuild 1916 RMD160 d521125984e096b1462f84ce97fef0f7ae921479 SHA1 c3d3557fbdda47de790afdd3f0d617d223f3e700 SHA256 aa4c34041490eacf6311f5aa6da2d3de5a7537ffce8801b060fee23df92fc6c1
 EBUILD nvidia-settings-190.40.ebuild 1916 RMD160 46a50066d050c6608934a4be416117a553347b15 SHA1 d4e3944f41a9328d5a708334f785fc7c122d9246 SHA256 c33beb4a3322b200a1a6af683c31248a5e678cf2743d572885281bc85dc9df8e
-EBUILD nvidia-settings-190.42.ebuild 1916 RMD160 0ff49cdbdee4b4d5d5208f5595fb2d65f0c44ae3 SHA1 ceea856b7f8992e42532a40b9579b327f3a76018 SHA256 ee9a3c91f7058fa49c26905e5229b5b28bba97b6ae72f7a5ae2d55008eafa3e5
-MISC ChangeLog 13640 RMD160 712ba71f78118b12a7ae9e301e4ee7938d1a7800 SHA1 32a4946dd9055950b53c29a374b9081da5a9eb58 SHA256 5282fe6fc15939b5472397f007a7c6687cbd943d1cc0b34a7546c5ece56cb55a
+EBUILD nvidia-settings-190.42.ebuild 2010 RMD160 e10222b73644a726b185fdfef091cea2ee88df00 SHA1 4fd8cfcdfff36718323df627b835a7ac9fec4066 SHA256 d980d28a60ab771169f249723a17e35bcc3f68bc271bc5833ec8e425b37ae5bf
+MISC ChangeLog 13896 RMD160 93d8c7aea72636d4d60b2dff2e89bd659b73f16b SHA1 d2d5b022e6654acfb9ff80b05854ce63413dbd2a SHA256 ce297be5dc465feccc50b691c3b9ae1e7fe630f53e83526de7a462589216fcc4
 MISC metadata.xml 308 RMD160 bff76dc9f3a6232b09b63a7f8e416ef30fd49ba1 SHA1 07bbc2621be7093f68edda3b41553c422d2dbfbc SHA256 6519f06cce9eac5eeecb7e0cc52227a6d15766957e126a276dad602600a25fd1
diff --git a/media-video/nvidia-settings/files/nvidia-settings-190.42-xf86vidmodeproto.patch b/media-video/nvidia-settings/files/nvidia-settings-190.42-xf86vidmodeproto.patch
new file mode 100644
index 000000000000..d42060cba0b9
--- /dev/null
+++ b/media-video/nvidia-settings/files/nvidia-settings-190.42-xf86vidmodeproto.patch
@@ -0,0 +1,11 @@
+diff -ur nvidia-settings-1.0.orig/src/libXNVCtrlAttributes/NvCtrlAttributesVidMode.c nvidia-settings-1.0/src/libXNVCtrlAttributes/NvCtrlAttributesVidMode.c
+--- nvidia-settings-1.0.orig/src/libXNVCtrlAttributes/NvCtrlAttributesVidMode.c	2009-10-21 07:04:35.000000000 +0300
++++ nvidia-settings-1.0/src/libXNVCtrlAttributes/NvCtrlAttributesVidMode.c	2009-11-01 15:08:53.000000000 +0200
+@@ -28,6 +28,7 @@
+ #include "msg.h"
+ 
+ #include <X11/extensions/xf86vmode.h>
++#include <X11/extensions/xf86vmproto.h>
+ 
+ #include <stdlib.h>
+ #include <string.h>
diff --git a/media-video/nvidia-settings/nvidia-settings-190.42.ebuild b/media-video/nvidia-settings/nvidia-settings-190.42.ebuild
index f2211ca68f1b..ddb3095573bb 100644
--- a/media-video/nvidia-settings/nvidia-settings-190.42.ebuild
+++ b/media-video/nvidia-settings/nvidia-settings-190.42.ebuild
@@ -1,6 +1,6 @@
 # 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.42.ebuild,v 1.1 2009/10/22 05:22:21 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-190.42.ebuild,v 1.2 2009/11/01 12:11:44 ssuominen Exp $
 
 inherit eutils toolchain-funcs multilib flag-o-matic
 
@@ -33,7 +33,13 @@ RDEPEND=">=x11-libs/gtk+-2
 	x11-libs/libXt
 	x11-drivers/nvidia-drivers"
 
-S="${WORKDIR}/${MY_P}"
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-xf86vidmodeproto.patch
+}
 
 src_compile() {
 	einfo "Building libXNVCtrl..."