nvidia-settings version bump

hardware/graphics/nvidia-settings/actions.py

@@ -0,0 +1,30 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+#
+# Licensed under the GNU General Public License, version 3.
+# See the file http://www.gnu.org/licenses/gpl.txt
+
+from pisi.actionsapi import autotools
+from pisi.actionsapi import pisitools
+from pisi.actionsapi import shelltools
+from pisi.actionsapi import get
+
+def setup():
+    pisitools.dosed("src/Makefile", "static", "dynamic")
+
+def build():
+    shelltools.cd("src/libXNVCtrl")
+    autotools.make('clean')
+    autotools.make('CDEBUGFLAGS="-fPIC %s" CC="%s" libXNVCtrl.a' % (get.CFLAGS(), get.CC()))
+
+    shelltools.cd("%s/%s" % (get.workDIR(), get.srcDIR()))
+    autotools.make('CC="%s"  LD="%s" STRIP_CMD="/bin/true" NV_VERBOSE=1' % (get.CC(), get.LDFLAGS()))
+
+def install():
+    pisitools.dodir("/usr/bin")
+    autotools.install("DESTDIR=%s PREFIX=/usr" % get.installDIR())
+
+    #pisitools.insinto("/usr/lib/static", "src/libXNVCtrl/libXNVCtrl.a")
+    #pisitools.insinto("/usr/include/NVCtrl", "src/libXNVCtrl/*.h")
+
+    pisitools.dodoc("COPYING", "doc/*.txt")

hardware/graphics/nvidia-settings/files/21-nvidia-settings.sh

@@ -0,0 +1 @@
+test -d /proc/driver/nvidia && /usr/bin/nvidia-settings --load-config-only

hardware/graphics/nvidia-settings/files/fix_validation.patch

@@ -0,0 +1,21 @@
+diff -Nur nvidia-settings-260.19.12-old//src/XF86Config-parser/Device.c nvidia-settings-260.19.12/src/XF86Config-parser/Device.c
+--- nvidia-settings-260.19.12-old//src/XF86Config-parser/Device.c	2010-10-21 10:44:27.683000043 +0300
++++ nvidia-settings-260.19.12/src/XF86Config-parser/Device.c	2010-10-21 10:45:33.802000043 +0300
+@@ -365,7 +365,7 @@
+                      "is required.");
+         return (FALSE);
+     }
+-
++#if 0
+     while (device) {
+         if (!device->driver) {
+             xconfigErrorMsg(ValidationErrorMsg, UNDEFINED_DRIVER_MSG,
+@@ -375,6 +375,8 @@
+     device = device->next;
+     }
+     return (TRUE);
++#endif
++
+ }
+ 
+ XConfigDevicePtr

hardware/graphics/nvidia-settings/files/fix_xconfig_path.patch

@@ -0,0 +1,12 @@
+diff -Nur nvidia-settings-260.19.12-old//src/gtk+-2.x/ctkdisplayconfig-utils.c nvidia-settings-260.19.12/src/gtk+-2.x/ctkdisplayconfig-utils.c
+--- nvidia-settings-260.19.12-old//src/gtk+-2.x/ctkdisplayconfig-utils.c	2010-10-19 15:18:45.690001322 +0300
++++ nvidia-settings-260.19.12/src/gtk+-2.x/ctkdisplayconfig-utils.c	2010-10-19 15:20:00.147000214 +0300
+@@ -3267,7 +3267,7 @@
+     if (tmp_filename) {
+         filename = g_strdup(tmp_filename);
+     } else {
+-        filename = g_strdup("");
++        filename = g_strdup("/etc/X11/xorg.conf");
+     }
+     xconfigCloseConfigFile();
+ 

hardware/graphics/nvidia-settings/files/nvidia-settings.desktop

@@ -0,0 +1,11 @@
+[Desktop Entry]
+Type=Application
+Encoding=UTF-8
+Name=NVIDIA X Server Settings
+Name[tr]=NVIDIA X Sunucu Ayarları
+Comment=Configure NVIDIA X Server Settings
+Comment[tr]=NVIDIA X Sunucu Ayarlarını Yapılandır
+Exec=xdg-su -c "nvidia-settings"
+Icon=nvidia-settings
+Categories=Settings;
+TryExec=/sys/module/nvidia

hardware/graphics/nvidia-settings/files/remove_driver.patch

@@ -0,0 +1,36 @@
+diff -Nur nvidia-settings-260.19.12-old//src/XF86Config-parser/Generate.c nvidia-settings-260.19.12/src/XF86Config-parser/Generate.c
+--- nvidia-settings-260.19.12-old//src/XF86Config-parser/Generate.c	2010-10-22 13:57:02.009000043 +0300
++++ nvidia-settings-260.19.12/src/XF86Config-parser/Generate.c	2010-10-22 13:58:47.343000043 +0300
+@@ -474,7 +474,7 @@
+ 
+     device->identifier = xconfigAlloc(32);
+     snprintf(device->identifier, 32, DEVICE_IDENTIFIER, count);
+-    device->driver = xconfigStrdup("nvidia");
++    device->driver = NULL;
+     device->vendor = xconfigStrdup("NVIDIA Corporation");
+ 
+     if (bus != -1 && domain != -1 && slot != -1) {
+diff -Nur nvidia-settings-260.19.12-old//src/gtk+-2.x/ctkdisplayconfig.c nvidia-settings-260.19.12/src/gtk+-2.x/ctkdisplayconfig.c
+--- nvidia-settings-260.19.12-old//src/gtk+-2.x/ctkdisplayconfig.c	2010-10-22 14:03:50.881000043 +0300
++++ nvidia-settings-260.19.12/src/gtk+-2.x/ctkdisplayconfig.c	2010-10-22 14:10:59.831000043 +0300
+@@ -6845,7 +6845,7 @@
+     device->identifier = (char *)malloc(32);
+     snprintf(device->identifier, 32, "Device%d", device_id);
+ 
+-    device->driver = xconfigStrdup("nvidia");
++    device->driver = NULL;
+     device->vendor = xconfigStrdup("NVIDIA Corporation");
+     device->board = xconfigStrdup(gpu->name);
+ 
+diff -Nur nvidia-settings-260.19.12-old//src/XF86Config-parser/Merge.c nvidia-settings-260.19.12/src/XF86Config-parser/Merge.c
+--- nvidia-settings-260.19.12-old//src/XF86Config-parser/Merge.c	2010-10-22 14:03:50.865000043 +0300
++++ nvidia-settings-260.19.12/src/XF86Config-parser/Merge.c	2010-10-22 14:20:32.606000042 +0300
+@@ -317,7 +317,7 @@
+     /* Update driver */
+     
+     free(dstDevice->driver);
+-    dstDevice->driver = xconfigStrdup(srcDevice->driver);
++    dstDevice->driver = NULL;
+     
+     /* Update vendor */
+     

hardware/graphics/nvidia-settings/files/remove_unused_sections.patch

@@ -0,0 +1,59 @@
+diff -Nur nvidia-settings-260.19.12-old//src/XF86Config-parser/Generate.c nvidia-settings-260.19.12/src/XF86Config-parser/Generate.c
+--- nvidia-settings-260.19.12-old//src/XF86Config-parser/Generate.c	2010-10-22 11:37:31.615000042 +0300
++++ nvidia-settings-260.19.12/src/XF86Config-parser/Generate.c	2010-10-22 11:37:59.976000043 +0300
+@@ -71,9 +71,9 @@
+ 
+     /* add files, fonts, and modules */
+ 
+-    config->files = xconfigAlloc(sizeof(XConfigFilesRec));
+-    add_font_path(gop, config);
+-    add_modules(gop, config);
++    config->files = NULL;
++    /*add_font_path(gop, config);
++    add_modules(gop, config); */
+ 
+     /* add the keyboard and mouse */
+ 
+@@ -82,6 +82,8 @@
+ 
+     /* add the layout */
+ 
++    config->inputs = NULL;
++
+     add_layout(gop, config);
+ 
+     return config;
+@@ -1042,7 +1044,7 @@
+     xconfigAddNewOption(&input->options, "ZAxisMapping", "4 5");
+ 
+     input->next = config->inputs;
+-    config->inputs = input;
++    config->inputs = NULL;
+ 
+     return TRUE;
+ 
+@@ -1303,7 +1305,7 @@
+     }
+ 
+     input->next = config->inputs;
+-    config->inputs = input;
++    config->inputs = NULL;
+ 
+     return TRUE;
+ 
+diff -Nur nvidia-settings-260.19.12-old//src/XF86Config-parser/Generate.c nvidia-settings-260.19.12/src/XF86Config-parser/Generate.c
+--- nvidia-settings-260.19.12-old//src/XF86Config-parser/Generate.c	2010-10-21 11:11:06.251000043 +0300
++++ nvidia-settings-260.19.12/src/XF86Config-parser/Generate.c	2010-10-21 11:32:59.793000043 +0300
+@@ -571,6 +571,12 @@
+ {
+     XConfigInputrefPtr inputRef;
+ 
++    XConfigInputPtr input;
++    input = xconfigFindInput(name, config->inputs);
++
++    if(!input)
++        return;
++
+     inputRef = xconfigAlloc(sizeof(XConfigInputrefRec));
+     inputRef->input_name = xconfigStrdup(name);
+     inputRef->input = xconfigFindInput(inputRef->input_name, config->inputs);

hardware/graphics/nvidia-settings/pspec.xml

@@ -0,0 +1,140 @@
+<?xml version="1.0" ?>
+<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
+<PISI>
+    <Source>
+        <Name>nvidia-settings</Name>
+        <Homepage>http://www.nvidia.com</Homepage>
+        <Packager>
+            <Name>PisiLinux Community</Name>
+            <Email>admins@pisilinux.org</Email>
+        </Packager>
+        <License>GPLv2</License>
+        <Icon>nvidia-settings</Icon>
+        <IsA>app:gui</IsA>
+        <Summary>The NVIDIA X Server Settings tool</Summary>
+        <Description>The nvidia-settings utility is a tool for configuring the NVIDIA graphics driver. It operates by communicating with the NVIDIA X driver, querying and updating state as appropriate.</Description>
+        <Archive sha1sum="94b3a5ace919d9d96f225dadd1f53655c94d87fc" type="tarbz2">ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-355.11.tar.bz2</Archive>
+        <BuildDependencies>
+            <Dependency>atk-devel</Dependency>
+            <Dependency>gtk3-devel</Dependency>
+            <Dependency>cairo-devel</Dependency>
+            <Dependency>fontconfig-devel</Dependency>
+            <Dependency>gtk2-devel</Dependency>
+	    <Dependency>libXext-devel</Dependency>
+            <Dependency>gdk-pixbuf-devel</Dependency>
+            <Dependency>mesa-devel</Dependency>
+            <Dependency>libvdpau-devel</Dependency>
+        </BuildDependencies>
+    </Source>
+
+    <Package>
+        <Name>nvidia-settings</Name>
+        <RuntimeDependencies>
+            <Dependency>atk</Dependency>            
+            <Dependency>cairo</Dependency>
+            <Dependency>glib2</Dependency>
+            <Dependency>libX11</Dependency>
+            <Dependency>freetype</Dependency>
+            <Dependency>fontconfig</Dependency>
+            <Dependency>gtk2</Dependency>
+            <Dependency>libXext</Dependency>
+	    <Dependency>gdk-pixbuf</Dependency>
+            <Dependency>libXxf86vm</Dependency>
+            <Dependency>pango</Dependency>
+        </RuntimeDependencies>
+        <Files>
+            <Path fileType="executable">/usr/bin</Path>
+            <Path fileType="data">/etc/X11/Xsession.d</Path>
+	    <Path fileType="library">/usr/lib</Path>
+            <Path fileType="data">/usr/share/applications</Path>
+            <Path fileType="data">/usr/share/pixmaps</Path>
+            <Path fileType="man">/usr/share/man</Path>
+            <Path fileType="doc">/usr/share/doc</Path>
+        </Files>
+        <AdditionalFiles>
+            <AdditionalFile owner="root" permission="0644" target="/usr/share/applications/nvidia-settings.desktop">nvidia-settings.desktop</AdditionalFile>
+            <AdditionalFile owner="root" permission="0644" target="/usr/share/pixmaps/nvidia-settings.png">nvidia-settings.png</AdditionalFile>
+            <AdditionalFile owner="root" permission="0644" target="/etc/X11/Xsession.d/21-nvidia-settings.sh">21-nvidia-settings.sh</AdditionalFile>
+        </AdditionalFiles>
+    </Package>
+
+    <History>
+        <Update release="11">
+            <Date>2015-11-20</Date>
+            <Version>355.11</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Stefan Gronewold(groni)</Name>
+            <Email>groni@pisilinux.org</Email>
+        </Update>
+        <Update release="10">
+            <Date>2015-05-16</Date>
+            <Version>349.16</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Stefan Gronewold(groni)</Name>
+            <Email>groni@pisilinux.org</Email>
+        </Update>
+        <Update release="9">
+            <Date>2015-03-31</Date>
+            <Version>349.12</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Stefan Gronewold(groni)</Name>
+            <Email>groni@pisilinux.org</Email>
+        </Update>
+        <Update release="8">
+            <Date>2015-03-13</Date>
+            <Version>346.47</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Stefan Gronewold(groni)</Name>
+            <Email>groni@pisilinux.org</Email>
+        </Update>
+        <Update release="7">
+            <Date>2015-01-22</Date>
+            <Version>346.35</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Stefan Gronewold(groni)</Name>
+            <Email>groni@pisilinux.org</Email>
+        </Update>
+        <Update release="6">
+            <Date>2014-10-24</Date>
+            <Version>343.22</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Stefan Gronewold(groni)</Name>
+            <Email>groni@pisilinux.org</Email>
+        </Update>
+        <Update release="5">
+            <Date>2014-05-29</Date>
+            <Version>337.19</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Yusuf Aydemir</Name>
+            <Email>yusuf.aydemir@pisilinux.org</Email>
+        </Update>
+        <Update release="4">
+            <Date>2014-03-08</Date>
+            <Version>334.21</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Yusuf Aydemir</Name>
+            <Email>yusuf.aydemir@pisilinux.org</Email>
+        </Update>
+	<Update release="3">
+            <Date>2013-11-21</Date>
+            <Version>331.20</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Richard de Bruin</Name>
+            <Email>richdb@pisilinux.org</Email>
+        </Update>
+        <Update release="2">
+            <Date>2013-03-06</Date>
+            <Version>313.26</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Marcin Bojara</Name>
+            <Email>marcin@pisilinux.org</Email>
+        </Update>
+        <Update release="1">
+            <Date>2013-01-30</Date>
+            <Version>313.18</Version>
+            <Comment>First release</Comment>
+            <Name>Yusuf Aydemir</Name>
+            <Email>yusuf.aydemir@pisilinux.org</Email>
+        </Update>
+    </History>
+</PISI>

hardware/graphics/nvidia-settings/translations.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" ?>
+<PISI>
+    <Source>
+        <Name>nvidia-settings</Name>
+        <Summary xml:lang="tr">NVIDIA X Sunucusu ayarlama aracı</Summary>
+        <Description xml:lang="tr">nvidia-settings aracı NVIDIA grafik sürücülerini ayarlamak için kullanılan bir araçtır. NVIDIA X sürücüsü ile iletişime geçerek çalışır, durum bilgisini gerekli olduğu gibi uygular, günceller.</Description>
+    </Source>
+</PISI>

pisi-index.xml

@@ -21866,6 +21866,146 @@
             </Update>
         </History>
     </SpecFile>
+    <SpecFile>
+        <Source>
+            <Name>nvidia-settings</Name>
+            <Homepage>http://www.nvidia.com</Homepage>
+            <Packager>
+                <Name>PisiLinux Community</Name>
+                <Email>admins@pisilinux.org</Email>
+            </Packager>
+            <License>GPLv2</License>
+            <IsA>app:gui</IsA>
+            <PartOf>hardware.graphics</PartOf>
+            <Summary xml:lang="en">The NVIDIA X Server Settings tool</Summary>
+            <Summary xml:lang="tr">NVIDIA X Sunucusu ayarlama aracı</Summary>
+            <Description xml:lang="en">The nvidia-settings utility is a tool for configuring the NVIDIA graphics driver. It operates by communicating with the NVIDIA X driver, querying and updating state as appropriate.</Description>
+            <Description xml:lang="tr">nvidia-settings aracı NVIDIA grafik sürücülerini ayarlamak için kullanılan bir araçtır. NVIDIA X sürücüsü ile iletişime geçerek çalışır, durum bilgisini gerekli olduğu gibi uygular, günceller.</Description>
+            <Icon>nvidia-settings</Icon>
+            <Archive type="tarbz2" sha1sum="94b3a5ace919d9d96f225dadd1f53655c94d87fc">ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-355.11.tar.bz2</Archive>
+            <BuildDependencies>
+                <Dependency>atk-devel</Dependency>
+                <Dependency>gtk3-devel</Dependency>
+                <Dependency>cairo-devel</Dependency>
+                <Dependency>fontconfig-devel</Dependency>
+                <Dependency>gtk2-devel</Dependency>
+                <Dependency>libXext-devel</Dependency>
+                <Dependency>gdk-pixbuf-devel</Dependency>
+                <Dependency>mesa-devel</Dependency>
+                <Dependency>libvdpau-devel</Dependency>
+            </BuildDependencies>
+            <SourceURI>hardware/graphics/nvidia-settings/pspec.xml</SourceURI>
+        </Source>
+        <Package>
+            <Name>nvidia-settings</Name>
+            <RuntimeDependencies>
+                <Dependency>atk</Dependency>
+                <Dependency>cairo</Dependency>
+                <Dependency>glib2</Dependency>
+                <Dependency>libX11</Dependency>
+                <Dependency>freetype</Dependency>
+                <Dependency>fontconfig</Dependency>
+                <Dependency>gtk2</Dependency>
+                <Dependency>libXext</Dependency>
+                <Dependency>gdk-pixbuf</Dependency>
+                <Dependency>libXxf86vm</Dependency>
+                <Dependency>pango</Dependency>
+            </RuntimeDependencies>
+            <Files>
+                <Path fileType="executable">/usr/bin</Path>
+                <Path fileType="data">/etc/X11/Xsession.d</Path>
+                <Path fileType="library">/usr/lib</Path>
+                <Path fileType="data">/usr/share/applications</Path>
+                <Path fileType="data">/usr/share/pixmaps</Path>
+                <Path fileType="man">/usr/share/man</Path>
+                <Path fileType="doc">/usr/share/doc</Path>
+            </Files>
+            <AdditionalFiles>
+                <AdditionalFile target="/usr/share/applications/nvidia-settings.desktop" permission="0644" owner="root">nvidia-settings.desktop</AdditionalFile>
+                <AdditionalFile target="/usr/share/pixmaps/nvidia-settings.png" permission="0644" owner="root">nvidia-settings.png</AdditionalFile>
+                <AdditionalFile target="/etc/X11/Xsession.d/21-nvidia-settings.sh" permission="0644" owner="root">21-nvidia-settings.sh</AdditionalFile>
+            </AdditionalFiles>
+        </Package>
+        <History>
+            <Update release="11">
+                <Date>2015-11-20</Date>
+                <Version>355.11</Version>
+                <Comment>Version bump.</Comment>
+                <Name>Stefan Gronewold(groni)</Name>
+                <Email>groni@pisilinux.org</Email>
+            </Update>
+            <Update release="10">
+                <Date>2015-05-16</Date>
+                <Version>349.16</Version>
+                <Comment>Version bump.</Comment>
+                <Name>Stefan Gronewold(groni)</Name>
+                <Email>groni@pisilinux.org</Email>
+            </Update>
+            <Update release="9">
+                <Date>2015-03-31</Date>
+                <Version>349.12</Version>
+                <Comment>Version bump.</Comment>
+                <Name>Stefan Gronewold(groni)</Name>
+                <Email>groni@pisilinux.org</Email>
+            </Update>
+            <Update release="8">
+                <Date>2015-03-13</Date>
+                <Version>346.47</Version>
+                <Comment>Version bump.</Comment>
+                <Name>Stefan Gronewold(groni)</Name>
+                <Email>groni@pisilinux.org</Email>
+            </Update>
+            <Update release="7">
+                <Date>2015-01-22</Date>
+                <Version>346.35</Version>
+                <Comment>Version bump.</Comment>
+                <Name>Stefan Gronewold(groni)</Name>
+                <Email>groni@pisilinux.org</Email>
+            </Update>
+            <Update release="6">
+                <Date>2014-10-24</Date>
+                <Version>343.22</Version>
+                <Comment>Version bump.</Comment>
+                <Name>Stefan Gronewold(groni)</Name>
+                <Email>groni@pisilinux.org</Email>
+            </Update>
+            <Update release="5">
+                <Date>2014-05-29</Date>
+                <Version>337.19</Version>
+                <Comment>Version bump.</Comment>
+                <Name>Yusuf Aydemir</Name>
+                <Email>yusuf.aydemir@pisilinux.org</Email>
+            </Update>
+            <Update release="4">
+                <Date>2014-03-08</Date>
+                <Version>334.21</Version>
+                <Comment>Version bump.</Comment>
+                <Name>Yusuf Aydemir</Name>
+                <Email>yusuf.aydemir@pisilinux.org</Email>
+            </Update>
+            <Update release="3">
+                <Date>2013-11-21</Date>
+                <Version>331.20</Version>
+                <Comment>Version bump.</Comment>
+                <Name>Richard de Bruin</Name>
+                <Email>richdb@pisilinux.org</Email>
+            </Update>
+            <Update release="2">
+                <Date>2013-03-06</Date>
+                <Version>313.26</Version>
+                <Comment>Version bump.</Comment>
+                <Name>Marcin Bojara</Name>
+                <Email>marcin@pisilinux.org</Email>
+            </Update>
+            <Update release="1">
+                <Date>2013-01-30</Date>
+                <Version>313.18</Version>
+                <Comment>First release</Comment>
+                <Name>Yusuf Aydemir</Name>
+                <Email>yusuf.aydemir@pisilinux.org</Email>
+            </Update>
+        </History>
+    </SpecFile>
     <SpecFile>
         <Source>
             <Name>vbetool</Name>

pisi-index.xml.sha1sum

@@ -1 +1 @@
-dc5b9a35a4c715bf99599b64bee2e549052acfb8
+b79d0a10397ba1867ce49e3a8bab0303ac4c95d3

pisi-index.xml.xz.sha1sum

@@ -1 +1 @@
-7a68a79bc49db91ccaf9164b14733f354cf8db21
+6213c4a93d0eb75946bf0e8e21a2f54d60434f15