From owner-svn-ports-all@FreeBSD.ORG  Tue Aug 21 14:49:34 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 821C71065670;
	Tue, 21 Aug 2012 14:49:34 +0000 (UTC)
	(envelope-from bland@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 6CB7A8FC17;
	Tue, 21 Aug 2012 14:49:34 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q7LEnYBf052817;
	Tue, 21 Aug 2012 14:49:34 GMT (envelope-from bland@svn.freebsd.org)
Received: (from bland@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7LEnYr9052814;
	Tue, 21 Aug 2012 14:49:34 GMT (envelope-from bland@svn.freebsd.org)
Message-Id: <201208211449.q7LEnYr9052814@svn.freebsd.org>
From: Alexander Nedotsukov <bland@FreeBSD.org>
Date: Tue, 21 Aug 2012 14:49:34 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
	svn-ports-head@freebsd.org
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r302865 - in head/x11/nvidia-settings: . files
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
	<mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
	<mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Aug 2012 14:49:34 -0000

Author: bland
Date: Tue Aug 21 14:49:33 2012
New Revision: 302865
URL: http://svn.freebsd.org/changeset/ports/302865

Log:
  Allow display configuration with legacy nvidia-driver versions.
  
  PR:	155011

Modified:
  head/x11/nvidia-settings/Makefile
  head/x11/nvidia-settings/files/patch-src__gtk+-2.x__ctkdisplayconfig-utils.c

Modified: head/x11/nvidia-settings/Makefile
==============================================================================
--- head/x11/nvidia-settings/Makefile	Tue Aug 21 14:35:14 2012	(r302864)
+++ head/x11/nvidia-settings/Makefile	Tue Aug 21 14:49:33 2012	(r302865)
@@ -7,6 +7,7 @@
 
 PORTNAME=	nvidia-settings
 PORTVERSION=	295.71
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	ftp://download.nvidia.com/XFree86/nvidia-settings/ \
 		ftp://download1.nvidia.com/XFree86/nvidia-settings/

Modified: head/x11/nvidia-settings/files/patch-src__gtk+-2.x__ctkdisplayconfig-utils.c
==============================================================================
--- head/x11/nvidia-settings/files/patch-src__gtk+-2.x__ctkdisplayconfig-utils.c	Tue Aug 21 14:35:14 2012	(r302864)
+++ head/x11/nvidia-settings/files/patch-src__gtk+-2.x__ctkdisplayconfig-utils.c	Tue Aug 21 14:49:33 2012	(r302865)
@@ -9,3 +9,20 @@
          }
  
  
+--- src/gtk+-2.x/ctkdisplayconfig-utils.c.orig	2012-08-21 23:36:11.000000000 +0900
++++ src/gtk+-2.x/ctkdisplayconfig-utils.c	2012-08-21 23:36:46.000000000 +0900
+@@ -2534,11 +2534,14 @@
+     /* See if the screen is set to not scanout */
+     ret = NvCtrlGetAttribute(screen->handle, NV_CTRL_NO_SCANOUT, &val);
+     if (ret != NvCtrlSuccess) {
++#if 0
+         *err_str = g_strdup_printf("Failed to query NoScanout for "
+                                    "screen %d.",
+                                    screen_id);
+         nv_warning_msg(*err_str);
+         goto fail;
++#endif
++        val = NV_CTRL_NO_SCANOUT_DISABLED;
+     }
+     screen->no_scanout = (val == NV_CTRL_NO_SCANOUT_ENABLED);
+