summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--media-video/nvidia-settings/ChangeLog8
-rw-r--r--media-video/nvidia-settings/files/nvidia-settings-190.42-xf86vidmodeproto.patch11
-rw-r--r--media-video/nvidia-settings/nvidia-settings-190.42.ebuild10
3 files changed, 26 insertions, 3 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/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..."