summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2009-11-01 12:17:15 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2009-11-01 12:17:15 +0000
commit231923fd48fb31024dd739d082be172c40abf9bd (patch)
tree052e255be3bde0db5cafb93bbd458aa522f27fb5 /media-video
parentMissing X11/extensions/xf86vmproto.h include from xf86vidmodeproto to compile... (diff)
downloadgentoo-2-231923fd48fb31024dd739d082be172c40abf9bd.tar.gz
gentoo-2-231923fd48fb31024dd739d082be172c40abf9bd.tar.bz2
gentoo-2-231923fd48fb31024dd739d082be172c40abf9bd.zip
Update patch for a open bug.
(Portage version: 2.2_rc47/cvs/Linux x86_64)
Diffstat (limited to 'media-video')
-rw-r--r--media-video/nvidia-settings/Manifest2
-rw-r--r--media-video/nvidia-settings/files/nvidia-settings-190.42-xf86vidmodeproto.patch9
2 files changed, 6 insertions, 5 deletions
diff --git a/media-video/nvidia-settings/Manifest b/media-video/nvidia-settings/Manifest
index 97116190f16a..c12445f3e522 100644
--- a/media-video/nvidia-settings/Manifest
+++ b/media-video/nvidia-settings/Manifest
@@ -1,7 +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
+AUX nvidia-settings-190.42-xf86vidmodeproto.patch 405 RMD160 7668240d63c027dfed7cef3a625cb3cbb251b5ad SHA1 2f3dc069b501986dd01136723cb3dffda5b45c48 SHA256 c9cdd05605a0742a6480651f072802d7c271e0c18e8cbdbb158737fe5db691ab
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
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
index d42060cba0b9..159d3f0630ac 100644
--- a/media-video/nvidia-settings/files/nvidia-settings-190.42-xf86vidmodeproto.patch
+++ b/media-video/nvidia-settings/files/nvidia-settings-190.42-xf86vidmodeproto.patch
@@ -1,11 +1,12 @@
-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 @@
+--- src/libXNVCtrlAttributes/NvCtrlAttributesVidMode.c
++++ src/libXNVCtrlAttributes/NvCtrlAttributesVidMode.c
+@@ -28,6 +28,9 @@
#include "msg.h"
#include <X11/extensions/xf86vmode.h>
++#if !defined(XF86VIDMODE_MAJOR_VERSION) || !defined(XF86VIDMODE_MINOR_VERSION)
+#include <X11/extensions/xf86vmproto.h>
++#endif /* XF86VidMode Extension protocol defines */
#include <stdlib.h>
#include <string.h>