Date: Tue, 21 Aug 2012 14:49:34 +0000 (UTC) From: Alexander Nedotsukov <bland@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r302865 - in head/x11/nvidia-settings: . files Message-ID: <201208211449.q7LEnYr9052814@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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); +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201208211449.q7LEnYr9052814>