diff --git a/hardware/graphics/nvidia-settings/actions.py b/hardware/graphics/nvidia-settings/actions.py new file mode 100644 index 0000000000..2008560473 --- /dev/null +++ b/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") diff --git a/hardware/graphics/nvidia-settings/files/21-nvidia-settings.sh b/hardware/graphics/nvidia-settings/files/21-nvidia-settings.sh new file mode 100644 index 0000000000..87a506f0df --- /dev/null +++ b/hardware/graphics/nvidia-settings/files/21-nvidia-settings.sh @@ -0,0 +1 @@ +test -d /proc/driver/nvidia && /usr/bin/nvidia-settings --load-config-only diff --git a/hardware/graphics/nvidia-settings/files/fix_validation.patch b/hardware/graphics/nvidia-settings/files/fix_validation.patch new file mode 100644 index 0000000000..8dbc4ba14e --- /dev/null +++ b/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 diff --git a/hardware/graphics/nvidia-settings/files/fix_xconfig_path.patch b/hardware/graphics/nvidia-settings/files/fix_xconfig_path.patch new file mode 100644 index 0000000000..b9a24b4a53 --- /dev/null +++ b/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(); + diff --git a/hardware/graphics/nvidia-settings/files/nvidia-settings.desktop b/hardware/graphics/nvidia-settings/files/nvidia-settings.desktop new file mode 100644 index 0000000000..a82cae9a47 --- /dev/null +++ b/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 diff --git a/hardware/graphics/nvidia-settings/files/nvidia-settings.png b/hardware/graphics/nvidia-settings/files/nvidia-settings.png new file mode 100644 index 0000000000..b506d99453 Binary files /dev/null and b/hardware/graphics/nvidia-settings/files/nvidia-settings.png differ diff --git a/hardware/graphics/nvidia-settings/files/remove_driver.patch b/hardware/graphics/nvidia-settings/files/remove_driver.patch new file mode 100644 index 0000000000..b4757933d7 --- /dev/null +++ b/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 */ + diff --git a/hardware/graphics/nvidia-settings/files/remove_unused_sections.patch b/hardware/graphics/nvidia-settings/files/remove_unused_sections.patch new file mode 100644 index 0000000000..45963813c1 --- /dev/null +++ b/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); diff --git a/hardware/graphics/nvidia-settings/pspec.xml b/hardware/graphics/nvidia-settings/pspec.xml new file mode 100644 index 0000000000..888d622d96 --- /dev/null +++ b/hardware/graphics/nvidia-settings/pspec.xml @@ -0,0 +1,140 @@ + + + + + nvidia-settings + http://www.nvidia.com + + PisiLinux Community + admins@pisilinux.org + + GPLv2 + nvidia-settings + app:gui + The NVIDIA X Server Settings tool + 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. + ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-355.11.tar.bz2 + + atk-devel + gtk3-devel + cairo-devel + fontconfig-devel + gtk2-devel + libXext-devel + gdk-pixbuf-devel + mesa-devel + libvdpau-devel + + + + + nvidia-settings + + atk + cairo + glib2 + libX11 + freetype + fontconfig + gtk2 + libXext + gdk-pixbuf + libXxf86vm + pango + + + /usr/bin + /etc/X11/Xsession.d + /usr/lib + /usr/share/applications + /usr/share/pixmaps + /usr/share/man + /usr/share/doc + + + nvidia-settings.desktop + nvidia-settings.png + 21-nvidia-settings.sh + + + + + + 2015-11-20 + 355.11 + Version bump. + Stefan Gronewold(groni) + groni@pisilinux.org + + + 2015-05-16 + 349.16 + Version bump. + Stefan Gronewold(groni) + groni@pisilinux.org + + + 2015-03-31 + 349.12 + Version bump. + Stefan Gronewold(groni) + groni@pisilinux.org + + + 2015-03-13 + 346.47 + Version bump. + Stefan Gronewold(groni) + groni@pisilinux.org + + + 2015-01-22 + 346.35 + Version bump. + Stefan Gronewold(groni) + groni@pisilinux.org + + + 2014-10-24 + 343.22 + Version bump. + Stefan Gronewold(groni) + groni@pisilinux.org + + + 2014-05-29 + 337.19 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2014-03-08 + 334.21 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2013-11-21 + 331.20 + Version bump. + Richard de Bruin + richdb@pisilinux.org + + + 2013-03-06 + 313.26 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-01-30 + 313.18 + First release + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + diff --git a/hardware/graphics/nvidia-settings/translations.xml b/hardware/graphics/nvidia-settings/translations.xml new file mode 100644 index 0000000000..28c331c820 --- /dev/null +++ b/hardware/graphics/nvidia-settings/translations.xml @@ -0,0 +1,8 @@ + + + + nvidia-settings + NVIDIA X Sunucusu ayarlama aracı + 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. + + diff --git a/pisi-index.xml b/pisi-index.xml index 0b6f982863..92c42fda8c 100644 --- a/pisi-index.xml +++ b/pisi-index.xml @@ -21866,6 +21866,146 @@ + + + nvidia-settings + http://www.nvidia.com + + PisiLinux Community + admins@pisilinux.org + + GPLv2 + app:gui + hardware.graphics + The NVIDIA X Server Settings tool + NVIDIA X Sunucusu ayarlama aracı + 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. + 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. + nvidia-settings + ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-355.11.tar.bz2 + + atk-devel + gtk3-devel + cairo-devel + fontconfig-devel + gtk2-devel + libXext-devel + gdk-pixbuf-devel + mesa-devel + libvdpau-devel + + hardware/graphics/nvidia-settings/pspec.xml + + + nvidia-settings + + atk + cairo + glib2 + libX11 + freetype + fontconfig + gtk2 + libXext + gdk-pixbuf + libXxf86vm + pango + + + /usr/bin + /etc/X11/Xsession.d + /usr/lib + /usr/share/applications + /usr/share/pixmaps + /usr/share/man + /usr/share/doc + + + nvidia-settings.desktop + nvidia-settings.png + 21-nvidia-settings.sh + + + + + 2015-11-20 + 355.11 + Version bump. + Stefan Gronewold(groni) + groni@pisilinux.org + + + 2015-05-16 + 349.16 + Version bump. + Stefan Gronewold(groni) + groni@pisilinux.org + + + 2015-03-31 + 349.12 + Version bump. + Stefan Gronewold(groni) + groni@pisilinux.org + + + 2015-03-13 + 346.47 + Version bump. + Stefan Gronewold(groni) + groni@pisilinux.org + + + 2015-01-22 + 346.35 + Version bump. + Stefan Gronewold(groni) + groni@pisilinux.org + + + 2014-10-24 + 343.22 + Version bump. + Stefan Gronewold(groni) + groni@pisilinux.org + + + 2014-05-29 + 337.19 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2014-03-08 + 334.21 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2013-11-21 + 331.20 + Version bump. + Richard de Bruin + richdb@pisilinux.org + + + 2013-03-06 + 313.26 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-01-30 + 313.18 + First release + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + vbetool diff --git a/pisi-index.xml.sha1sum b/pisi-index.xml.sha1sum index 1a5aecf38c..9e89a6e10a 100644 --- a/pisi-index.xml.sha1sum +++ b/pisi-index.xml.sha1sum @@ -1 +1 @@ -dc5b9a35a4c715bf99599b64bee2e549052acfb8 \ No newline at end of file +b79d0a10397ba1867ce49e3a8bab0303ac4c95d3 \ No newline at end of file diff --git a/pisi-index.xml.xz b/pisi-index.xml.xz index 88a2e75a1c..5e87838c25 100644 Binary files a/pisi-index.xml.xz and b/pisi-index.xml.xz differ diff --git a/pisi-index.xml.xz.sha1sum b/pisi-index.xml.xz.sha1sum index 5c22fd4ac0..2a2a431217 100644 --- a/pisi-index.xml.xz.sha1sum +++ b/pisi-index.xml.xz.sha1sum @@ -1 +1 @@ -7a68a79bc49db91ccaf9164b14733f354cf8db21 \ No newline at end of file +6213c4a93d0eb75946bf0e8e21a2f54d60434f15 \ No newline at end of file