diff --git a/desktop/font/fontconfig/actions.py b/desktop/font/fontconfig/actions.py new file mode 100644 index 0000000000..dcdcfdc1d9 --- /dev/null +++ b/desktop/font/fontconfig/actions.py @@ -0,0 +1,48 @@ +# -*- 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 libtools +from pisi.actionsapi import get + +def setup(): + # Do not rebuild docs + shelltools.export("HASDOCBOOK", "no") + + libtools.libtoolize("-f") + autotools.autoreconf("-fi") + autotools.configure("--disable-static \ + --disable-docs \ + --with-cache-dir=/var/cache/fontconfig \ + --with-default-fonts=/usr/share/fonts \ + --with-add-fonts=/usr/local/share/fonts") + +def build(): + autotools.make() + +def install(): + autotools.rawInstall("DESTDIR=%s" % get.installDIR()) + + if get.buildTYPE() == "emul32": return + + pisitools.insinto("/etc/fonts", "fonts.conf", "fonts.conf.new") + + enabled_configs = ("10-sub-pixel-rgb.conf", "70-yes-bitmaps.conf") + disabled_configs = ("10-no-sub-pixel.conf",) + + for cfg in enabled_configs: + pisitools.dosym("../conf.avail/%s" % cfg, "/etc/fonts/conf.d/%s" % cfg) + + for cfg in disabled_configs: + pisitools.remove("/usr/share/fontconfig/conf.avail/%s" % cfg) + + for i in ["fc-cat", "fc-list", "fc-match", "fc-cache"]: + pisitools.doman("%s/*.1" % i) + + pisitools.doman("doc/*.3") + + pisitools.dodoc("AUTHORS", "COPYING", "README", "doc/*.txt") diff --git a/desktop/font/fontconfig/comar/package.py b/desktop/font/fontconfig/comar/package.py new file mode 100644 index 0000000000..04bb674866 --- /dev/null +++ b/desktop/font/fontconfig/comar/package.py @@ -0,0 +1,6 @@ +#!/usr/bin/python + +import os + +def postInstall(fromVersion, fromRelease, toVersion, toRelease): + os.spawnle(os.P_WAIT, "/usr/bin/fc-cache", "/usr/bin/fc-cache", "-r", { "HOME": "/root/" }) diff --git a/desktop/font/fontconfig/comar/pakhandler.py b/desktop/font/fontconfig/comar/pakhandler.py new file mode 100644 index 0000000000..7ab387e052 --- /dev/null +++ b/desktop/font/fontconfig/comar/pakhandler.py @@ -0,0 +1,21 @@ +# -*- coding: utf-8 -*- + +import piksemel +import subprocess + +def updateCache(filepath): + doc = piksemel.parse(filepath) + for item in doc.tags("File"): + path = item.getTagData("Path") + if path.startswith("usr/share/fonts"): + subprocess.call(["/usr/bin/fc-cache"]) + return + +def setupPackage(metapath, filepath): + updateCache(filepath) + +def cleanupPackage(metapath, filepath): + pass + +def postCleanupPackage(metapath, filepath): + updateCache(filepath) diff --git a/desktop/font/fontconfig/files/add_hinting_and_antialiasing_to_proper_fonts.patch b/desktop/font/fontconfig/files/add_hinting_and_antialiasing_to_proper_fonts.patch new file mode 100644 index 0000000000..b536421f7d --- /dev/null +++ b/desktop/font/fontconfig/files/add_hinting_and_antialiasing_to_proper_fonts.patch @@ -0,0 +1,60 @@ +diff -Nur fontconfig-2.6.0-old/conf.d/10-antialias.conf fontconfig-2.6.0/conf.d/10-antialias.conf +--- fontconfig-2.6.0-old/conf.d/10-antialias.conf 1970-01-01 02:00:00.000000000 +0200 ++++ fontconfig-2.6.0/conf.d/10-antialias.conf 2008-09-22 11:09:45.000000000 +0300 +@@ -0,0 +1,8 @@ ++ ++ ++ ++ ++ ++ true ++ ++ +diff -Nur fontconfig-2.6.0-old/conf.d/10-hinting.conf fontconfig-2.6.0/conf.d/10-hinting.conf +--- fontconfig-2.6.0-old/conf.d/10-hinting.conf 1970-01-01 02:00:00.000000000 +0200 ++++ fontconfig-2.6.0/conf.d/10-hinting.conf 2008-09-22 11:09:45.000000000 +0300 +@@ -0,0 +1,8 @@ ++ ++ ++ ++ ++ ++ true ++ ++ +diff -Nur fontconfig-2.6.0-old/conf.d/10-hinting-full.conf fontconfig-2.6.0/conf.d/10-hinting-full.conf +--- fontconfig-2.6.0-old/conf.d/10-hinting-full.conf 1970-01-01 02:00:00.000000000 +0200 ++++ fontconfig-2.6.0/conf.d/10-hinting-full.conf 2008-09-22 11:09:45.000000000 +0300 +@@ -0,0 +1,8 @@ ++ ++ ++ ++ ++ ++ hintfull ++ ++ +diff -Nur fontconfig-2.6.0-old/conf.d/10-hinting-medium.conf fontconfig-2.6.0/conf.d/10-hinting-medium.conf +--- fontconfig-2.6.0-old/conf.d/10-hinting-medium.conf 1970-01-01 02:00:00.000000000 +0200 ++++ fontconfig-2.6.0/conf.d/10-hinting-medium.conf 2008-09-22 11:09:45.000000000 +0300 +@@ -0,0 +1,8 @@ ++ ++ ++ ++ ++ ++ hintmedium ++ ++ +diff -Nur fontconfig-2.6.0-old/conf.d/10-hinting-slight.conf fontconfig-2.6.0/conf.d/10-hinting-slight.conf +--- fontconfig-2.6.0-old/conf.d/10-hinting-slight.conf 1970-01-01 02:00:00.000000000 +0200 ++++ fontconfig-2.6.0/conf.d/10-hinting-slight.conf 2008-09-22 11:09:45.000000000 +0300 +@@ -0,0 +1,8 @@ ++ ++ ++ ++ ++ ++ hintslight ++ ++ diff --git a/desktop/font/fontconfig/files/anymetrics_urw.patch b/desktop/font/fontconfig/files/anymetrics_urw.patch new file mode 100644 index 0000000000..96cee28536 --- /dev/null +++ b/desktop/font/fontconfig/files/anymetrics_urw.patch @@ -0,0 +1,128 @@ +Index: fontconfig-2.8.0/conf.d/30-urw-aliases.conf +=================================================================== +--- fontconfig-2.8.0.orig/conf.d/30-urw-aliases.conf ++++ fontconfig-2.8.0/conf.d/30-urw-aliases.conf +@@ -5,6 +5,13 @@ + URW provides metric and shape compatible fonts for some Adobe families. + Helvetica, Courier, and Times are handled in 30-metric-aliases.conf. + --> ++ ++ ++ ++ ++ ++ Avant Garde ++ ++ ++ true ++ ++ ++ URW Gothic L ++ ++ ++ ++ ++ Bookman ++ ++ ++ true ++ ++ ++ URW Bookman L ++ ++ ++ ++ ++ Courier ++ ++ ++ true ++ ++ ++ Nimbus Mono L ++ ++ ++ ++ ++ Helvetica ++ ++ ++ true ++ ++ ++ Nimbus Sans L ++ ++ ++ ++ ++ New Century Schoolbook ++ ++ ++ true ++ ++ ++ Century Schoolbook L ++ ++ ++ ++ ++ Palatino ++ ++ ++ true ++ ++ ++ URW Palladio L ++ ++ ++ ++ ++ Times ++ ++ ++ true ++ ++ ++ Nimbus Roman No9 L ++ ++ ++ ++ ++ Zapf Chancery ++ ++ ++ true ++ ++ ++ URW Chancery L ++ ++ ++ ++ ++ Zapf Dingbats ++ ++ ++ true ++ ++ ++ Dingbats ++ ++ ++ ++ + + + Symbol diff --git a/desktop/font/fontconfig/files/deprecated-user-conf.patch b/desktop/font/fontconfig/files/deprecated-user-conf.patch new file mode 100644 index 0000000000..3defbaab21 --- /dev/null +++ b/desktop/font/fontconfig/files/deprecated-user-conf.patch @@ -0,0 +1,10 @@ +--- conf.d/50-user.conf.orig 2013-04-09 15:15:06.170861118 +0300 ++++ conf.d/50-user.conf 2013-04-09 15:15:37.679861962 +0300 +@@ -9,7 +9,4 @@ + --> + fontconfig/conf.d + fontconfig/fonts.conf +- +- ~/.fonts.conf.d +- ~/.fonts.conf + diff --git a/desktop/font/fontconfig/files/fontconfig-2.8.0-sleep-less.patch b/desktop/font/fontconfig/files/fontconfig-2.8.0-sleep-less.patch new file mode 100644 index 0000000000..5b144315af --- /dev/null +++ b/desktop/font/fontconfig/files/fontconfig-2.8.0-sleep-less.patch @@ -0,0 +1,12 @@ +diff -pruN fontconfig-2.8.90.orig/fc-cache/fc-cache.c fontconfig-2.8.90/fc-cache/fc-cache.c +--- fontconfig-2.8.90.orig/fc-cache/fc-cache.c 2012-02-20 12:49:18.000000000 +0900 ++++ fontconfig-2.8.90/fc-cache/fc-cache.c 2012-03-06 12:28:26.000000000 +0900 +@@ -465,7 +465,7 @@ main (int argc, char **argv) + FcConfigDestroy (config); + FcFini (); + if (changed) +- sleep (2); ++ sleep (1); + if (verbose) + printf ("%s: %s\n", argv[0], ret ? "failed" : "succeeded"); + return ret; diff --git a/desktop/font/fontconfig/files/prefer_dejavu.patch b/desktop/font/fontconfig/files/prefer_dejavu.patch new file mode 100644 index 0000000000..9bc1876ec9 --- /dev/null +++ b/desktop/font/fontconfig/files/prefer_dejavu.patch @@ -0,0 +1,34 @@ +Index: fontconfig-2.8.0/conf.d/60-latin.conf +=================================================================== +--- fontconfig-2.8.0.orig/conf.d/60-latin.conf ++++ fontconfig-2.8.0/conf.d/60-latin.conf +@@ -4,8 +4,8 @@ + + serif + +- Bitstream Vera Serif + DejaVu Serif ++ Bitstream Vera Serif + Times New Roman + Thorndale AMT + Luxi Serif +@@ -16,8 +16,8 @@ + + sans-serif + +- Bitstream Vera Sans + DejaVu Sans ++ Bitstream Vera Sans + Verdana + Arial + Albany AMT +@@ -32,8 +32,8 @@ + + monospace + +- Bitstream Vera Sans Mono + DejaVu Sans Mono ++ Bitstream Vera Sans Mono + Inconsolata + Andale Mono + Courier New diff --git a/desktop/font/fontconfig/files/use_legacy_lcdfilter_on_small_monospace.patch b/desktop/font/fontconfig/files/use_legacy_lcdfilter_on_small_monospace.patch new file mode 100644 index 0000000000..c244be25de --- /dev/null +++ b/desktop/font/fontconfig/files/use_legacy_lcdfilter_on_small_monospace.patch @@ -0,0 +1,26 @@ +diff -Nur fontconfig-2.6.0-old/conf.d/53-monospace-lcd-filter.conf fontconfig-2.6.0/conf.d/53-monospace-lcd-filter.conf +--- fontconfig-2.6.0-old/conf.d/53-monospace-lcd-filter.conf 1970-01-01 02:00:00.000000000 +0200 ++++ fontconfig-2.6.0/conf.d/53-monospace-lcd-filter.conf 2008-09-22 11:07:17.000000000 +0300 +@@ -0,0 +1,22 @@ ++ ++ ++ ++ ++ ++ ++ ++ DejaVu Sans Mono ++ Bitstream Vera Sans Mono ++ ++ ++ 12.0 ++ ++ ++ ++ lcdlegacy ++ ++ ++ hintfull ++ ++ ++ diff --git a/desktop/font/fontconfig/pspec.xml b/desktop/font/fontconfig/pspec.xml new file mode 100644 index 0000000000..61b2fc70c0 --- /dev/null +++ b/desktop/font/fontconfig/pspec.xml @@ -0,0 +1,134 @@ + + + + + fontconfig + http://fontconfig.org + + PisiLinux Community + admins@pisilinux.org + + MIT + library + A library for configuring and customizing font access + Fontconfig is a library designed to provide system-wide font configuration, customization and application access. + http://www.freedesktop.org/software/fontconfig/release/fontconfig-2.11.1.tar.bz2 + + + + + prefer_dejavu.patch + anymetrics_urw.patch + use_legacy_lcdfilter_on_small_monospace.patch + add_hinting_and_antialiasing_to_proper_fonts.patch + + fontconfig-2.8.0-sleep-less.patch + + deprecated-user-conf.patch + + + + + fontconfig + + + + /etc/fonts + /usr/bin + /usr/lib + /usr/share/doc + /var/cache/fontconfig + /usr/share + + + System.Package + System.PackageHandler + + + + + fontconfig-devel + Development files for fontconfig + + fontconfig + + + /usr/include + /usr/lib/pkgconfig + /usr/lib32/pkgconfig + /usr/share/doc/fontconfig/fontconfig-devel.txt + /usr/share/man + + + + + fontconfig-32bit + emul32 + 32-bit shared libraries for fontconfig + emul32 + + expat-32bit + freetype-32bit + + + fontconfig + expat-32bit + freetype-32bit + + + /usr/lib32 + + + + + + 2014-05-17 + 2.11.1 + Release bump. + Alihan Öztürk + alihan@pisilinux.org + + + 2014-03-29 + 2.11.1 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-02-01 + 2.11.0 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2013-09-05 + 2.10.93 + Add missing method to pakhandler.py + Marcin Bojara + marcin@pisilinux.org + + + 2013-07-06 + 2.10.93 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2012-12-06 + 2.10.92 + First release + Marcin Bojara + marcin@pisilinux.org + + + 2012-12-06 + 2.10.2 + First release + Marcin Bojara + marcin@pisilinux.org + + + diff --git a/desktop/font/fontconfig/translations.xml b/desktop/font/fontconfig/translations.xml new file mode 100644 index 0000000000..fde1a2844b --- /dev/null +++ b/desktop/font/fontconfig/translations.xml @@ -0,0 +1,22 @@ + + + + fontconfig + Yazıtiplerinin yapılandırılması ve özelleştirilmesi için bir kitaplık + Biblioteka do konfigurowania pospolitych czcionek - obsługa plików binarnych + Fontconfig sistem genelindeki programlar için yazıtiplerinin ayarlanmasını, özelleştirilmesini ve programlar tarafından erişilmesini sağlar. + Fontconfig est un librairie conçue pour fournir à tout le système accès à la possibilité de configurer, personnaliser et appliquer des fontes. + Fontconfig jest biblioteką do konfigurowania i dostosowywania do własnych potrzeb czcionek, które nie zależą od systemu X Window. Została zaprojektowana, aby znajdować czcionki w systemie i dobierać je do wymagań określanych przez aplikacje. + + + + fontconfig-devel + fontconfig için geliştirme dosyaları + Pliki nagłówkowe fontconfig + + + + fontconfig-32bit + fontconfig için 32-bit paylaşımlı kitaplıklar + + diff --git a/desktop/font/harfbuzz/actions.py b/desktop/font/harfbuzz/actions.py new file mode 100644 index 0000000000..94c480708f --- /dev/null +++ b/desktop/font/harfbuzz/actions.py @@ -0,0 +1,34 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- +# Licensed under the GNU General Public License, version 3. +# See the file http://www.gnu.org/copyleft/gpl.txt + +from pisi.actionsapi import get +from pisi.actionsapi import autotools +from pisi.actionsapi import pisitools +from pisi.actionsapi import shelltools + +def setup(): + options = "--with-glib=yes \ + --with-freetype=yes \ + --with-cairo=yes \ + --with-icu=yes \ + --with-gobject=yes \ + --with-graphite2=yes" + + if get.buildTYPE() == "emul32": + options += "--with-glib=yes \ + --with-graphite2=no \ + --with-cairo=yes \ + --with-icu=yes" + autotools.configure(options) + + pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ") + +def build(): + autotools.make() + +def install(): + autotools.rawInstall("DESTDIR=%s" % get.installDIR()) + + pisitools.dodoc("AUTHORS", "ChangeLog", "COPYING", "README") diff --git a/desktop/font/harfbuzz/pspec.xml b/desktop/font/harfbuzz/pspec.xml new file mode 100644 index 0000000000..cf0467dc16 --- /dev/null +++ b/desktop/font/harfbuzz/pspec.xml @@ -0,0 +1,188 @@ + + + + + harfbuzz + http://www.freedesktop.org/software/harfbuzz + + PisiLinux Community + admins@pisilinux.org + + GPLv2 + library + OpenType text shaping engine. + The Harfbuzz package contains an OpenType text shaping engine. + http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-0.9.40.tar.bz2 + + cairo-devel + glib2-devel + icu4c-devel + graphite2-devel + + + + + harfbuzz + + cairo + glib2 + icu4c + libgcc + freetype + graphite2 + + + /usr/lib + /usr/share/doc + /usr/bin + /usr/share/gir-1.0 + /usr/share/gtk-doc + + + + + harfbuzz-devel + + glib2-devel + icu4c-devel + harfbuzz + + + /usr/include/harfbuzz + /usr/lib/pkgconfig + /usr/lib32/pkgconfig + + + + + harfbuzz-32bit + emul32 + 32-bit shared libraries for harfbuzz + emul32 + + icu4c-32bit + freetype-32bit + fontconfig-32bit + glibc-32bit + cairo-32bit + + + cairo-32bit + glib2-32bit + glibc-32bit + icu4c-32bit + freetype-32bit + + + /usr/lib32 + + + + + + 2015-04-06 + 0.9.40 + Version bump. + Ayhan Yalçınsoy + ayhanyalcinsoy@pisilinux.org + + + 2015-01-24 + 0.9.38 + Version bump. + Hakan Yıldız + hknyldz93@gmail.com + + + 2015-01-12 + 0.9.37 + Version Bump + rebuild. + Osman Erkan + osman.erkan@pisilinux.org + + + 2014-08-15 + 0.9.35 + Version Bump. + Vedat Demir + vedat@pisilinux.org + + + 2014-07-11 + 0.9.30 + Version Bump. + Vedat Demir + vedat@pisilinux.org + + + 2014-06-09 + 0.9.26 + Better harfbuz with icu, cairo. Fix configure option format. + Serdar Soytetir + kaptan@pisilinux.org + + + 2014-05-17 + 0.9.26 + Release bump. + Alihan Öztürk + alihan@pisilinux.org + + + 2014-02-26 + 0.9.26 + Delete Unused Deps. + Varol Maksutoğlu + waroi@pisilinux.org + + + 2014-02-25 + 0.9.26 + Rebuild Unused + Varol Maksutoğlu + waroi@pisilinux.org + + + 2014-02-22 + 0.9.26 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2013-10-14 + 0.9.19 + Rebuild for icu4c + Marcin Bojara + marcin@pisilinux.org + + + 2013-07-26 + 0.9.19 + Version bump. Fix build emul32 + Marcin Bojara + marcin@pisilinux.org + + + 2013-06-30 + 0.9.18 + V.Bump + PisiLinux Community + admins@pisilinux.org + + + 2013-01-22 + 0.9.9 + Add emul32 + Marcin Bojara + marcin@pisilinux.org + + + 2012-12-24 + 0.9.9 + First release + Marcin Bojara + marcin@pisilinux.org + + + diff --git a/desktop/font/harfbuzz/translations.xml b/desktop/font/harfbuzz/translations.xml new file mode 100644 index 0000000000..757c9f48cc --- /dev/null +++ b/desktop/font/harfbuzz/translations.xml @@ -0,0 +1,8 @@ + + + + harfbuzz + OpenType text shaping engine + The Harfbuzz package contains an OpenType text shaping engine. + + diff --git a/desktop/lookandfeel/component.xml b/desktop/lookandfeel/component.xml new file mode 100644 index 0000000000..655942859d --- /dev/null +++ b/desktop/lookandfeel/component.xml @@ -0,0 +1,3 @@ + + desktop.lookandfeel + diff --git a/desktop/lookandfeel/icon-theme-hicolor/actions.py b/desktop/lookandfeel/icon-theme-hicolor/actions.py new file mode 100644 index 0000000000..5834955752 --- /dev/null +++ b/desktop/lookandfeel/icon-theme-hicolor/actions.py @@ -0,0 +1,22 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- +# +# Licensed under the GNU General Public License, version 2 +# See the file http://www.gnu.org/licenses/gpl.txt + +from pisi.actionsapi import autotools +from pisi.actionsapi import pisitools +from pisi.actionsapi import get + +WorkDir = "hicolor-icon-theme-%s" % get.srcVERSION() + +def setup(): + autotools.configure() + +def build(): + autotools.make() + +def install(): + autotools.install() + + pisitools.dodoc("README", "ChangeLog") diff --git a/desktop/lookandfeel/icon-theme-hicolor/pspec.xml b/desktop/lookandfeel/icon-theme-hicolor/pspec.xml new file mode 100644 index 0000000000..e325008b46 --- /dev/null +++ b/desktop/lookandfeel/icon-theme-hicolor/pspec.xml @@ -0,0 +1,42 @@ + + + + + icon-theme-hicolor + http://icon-theme.freedesktop.org/wiki/HicolorTheme + + PisiLinux Community + admins@pisilinux.org + + GPLv2 + data + Default icon theme + Hicolor icon theme contains the basic directories and files needed for icon theme support. + http://icon-theme.freedesktop.org/releases/hicolor-icon-theme-0.12.tar.gz + + + + icon-theme-hicolor + + /usr/share/doc + /usr/share/icons + + + + + + 2013-08-26 + 0.12 + Release bump. + Serdar Soytetir + kaptan@pisilinux.org + + + 2010-10-24 + 0.12 + First release + Pisi Linux Admins + admins@pisilinux.org + + + diff --git a/desktop/lookandfeel/icon-theme-hicolor/translations.xml b/desktop/lookandfeel/icon-theme-hicolor/translations.xml new file mode 100644 index 0000000000..fe5ba4f10f --- /dev/null +++ b/desktop/lookandfeel/icon-theme-hicolor/translations.xml @@ -0,0 +1,8 @@ + + + + icon-theme-hicolor + Temel simge teması + Hicolor, simge teması desteği için ihtiyaç duyulan temel dizin ve dosyalarıni içeren temel bir simge temasıdır. + + diff --git a/desktop/misc/at-spi2-core/actions.py b/desktop/misc/at-spi2-core/actions.py new file mode 100644 index 0000000000..2b12315d27 --- /dev/null +++ b/desktop/misc/at-spi2-core/actions.py @@ -0,0 +1,44 @@ +#!/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 get +from pisi.actionsapi import autotools +from pisi.actionsapi import pisitools + +if get.buildTYPE() == "emul32": + libexec = "/tmp" + sysconf = "--sysconfdir=/tmp" +else: + libexec = "/usr/libexec/at-spi2" + sysconf = "" + +def setup(): + autotools.autoreconf("-vif") + autotools.configure("--disable-static \ + --disable-silent-rules \ + --disable-xevie \ + --libexecdir=%s\ + --with-dbus-daemondir=/usr/bin \ + %s \ + " % (libexec, sysconf)) + + #pisitools.dosed("libtool", "^(hardcode_libdir_flag_spec=).*", '\\1""') + pisitools.dosed("libtool", "^(runpath_var=)LD_RUN_PATH", "\\1DIE_RPATH_DIE") + pisitools.dosed("libtool", "( -shared )", " -Wl,--as-needed\\1") + + +def build(): + autotools.make() + +def install(): + autotools.rawInstall("DESTDIR=%s" % get.installDIR()) + #pisitools.removeDir("/etc") + if get.buildTYPE() == "emul32": + pisitools.dosed("%s/usr/share/dbus-1/services" % get.installDIR(), "^(Exec=)\/tmp", r"\1/usr/libexec/at-spi2") + pisitools.removeDir("/tmp") + return + + pisitools.dodoc("AUTHORS", "COPYING", "README", "NEWS") \ No newline at end of file diff --git a/desktop/misc/at-spi2-core/pspec.xml b/desktop/misc/at-spi2-core/pspec.xml new file mode 100644 index 0000000000..c2fe7d12a4 --- /dev/null +++ b/desktop/misc/at-spi2-core/pspec.xml @@ -0,0 +1,152 @@ + + + + + at-spi2-core + http://www.linuxfoundation.org/collaborate/workgroups/accessibility + + PisiLinux Community + admins@pisilinux.org + + LGPLv2+ + service + Protocol definitions and daemons for D-Bus at-spi + at-spi allows assistive technologies to access GTK-based applications. Essentially it exposes the internals of applications over D-Bus for automation. + mirrors://gnome/at-spi2-core/2.16/at-spi2-core-2.16.0.tar.xz + + libXtst-devel + libXi-devel + + + + + at-spi2-core + + libXtst + + + /etc + /usr/lib + /usr/share/doc + /usr/share/dbus-1 + /usr/share/gtk-doc + /usr/libexec + /usr/share/gir-1.0 + /usr/share/locale + + + + + at-spi2-core-32bit + emul32 + 32-bit shared libraries for at-spi2-core + emul32 + + dbus-32bit + glib2-32bit + libX11-32bit + libXtst-32bit + + + dbus-32bit + glib2-32bit + libX11-32bit + + + /usr/lib32 + + + + + at-spi2-core-devel + at-spi2-core için geliştirme dosyaları + + at-spi2-core + + + /usr/include + /usr/lib/pkgconfig + /usr/lib32/pkgconfig + + + + + + 2015-04-17 + 2.16.0 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2014-04-14 + 2.12.0 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2013-10-10 + 2.10.0 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2013-09-07 + 2.8.0 + Fix build. + Marcin Bojara + marcin@pisilinux.org + + + 2013-08-30 + 2.8.0 + Rebuild. + PisiLinux Community + admins@pisilinux.org + + + 2013-07-27 + 2.8.0 + Rebuild. + Marcin Bojara + marcin@pisilinux.org + + + 2013-06-17 + 2.8.0 + Rebuild with new pisi release + PisiLinux Community + admins@pisilinux.org + + + 2013-06-17 + 2.8.0 + Rebuild with new pisi release + Marcin Bojara + marcin@pisilinux.org + + + 2013-04-23 + 2.8.0 + Dep fixed + PisiLinux Community + admins@pisilinux.org + + + 2013-04-17 + 2.8.0 + Version bump + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2012-10-22 + 2.7.2 + First release + PisiLinux Community + admins@pisilinux.org + + + diff --git a/desktop/misc/at-spi2-core/translations.xml b/desktop/misc/at-spi2-core/translations.xml new file mode 100644 index 0000000000..ad67a8576a --- /dev/null +++ b/desktop/misc/at-spi2-core/translations.xml @@ -0,0 +1,18 @@ + + + + at-spi2-core + D-Bus at-spi için protokol tanımları ve hizmetleri + at-spi2-core, erişilebilirlik teknolojilerinin uygulamalara D-Bus üzerinden erişerek onları otomatik olarak denetlemesini sağlar. + + + + at-spi2-core-32bit + 32-bit shared libraries for at-spi2-core + + + + at-spi2-core-devel + at-spi2-core için geliştirme dosyaları + + \ No newline at end of file diff --git a/desktop/misc/component.xml b/desktop/misc/component.xml new file mode 100644 index 0000000000..edf55c1aeb --- /dev/null +++ b/desktop/misc/component.xml @@ -0,0 +1,3 @@ + + desktop.misc + diff --git a/desktop/misc/desktop-file-utils/actions.py b/desktop/misc/desktop-file-utils/actions.py new file mode 100644 index 0000000000..8c18223677 --- /dev/null +++ b/desktop/misc/desktop-file-utils/actions.py @@ -0,0 +1,22 @@ +#!/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 shelltools +from pisi.actionsapi import autotools +from pisi.actionsapi import pisitools +from pisi.actionsapi import get + +def setup(): + shelltools.export("EMACS", "no") + autotools.configure("--disable-static") + +def build(): + autotools.make() + +def install(): + autotools.rawInstall("DESTDIR=%s" % get.installDIR()) + + pisitools.dodoc("AUTHORS", "ChangeLog", "NEWS", "README") diff --git a/desktop/misc/desktop-file-utils/comar/pakhandler.py b/desktop/misc/desktop-file-utils/comar/pakhandler.py new file mode 100644 index 0000000000..68c67e8807 --- /dev/null +++ b/desktop/misc/desktop-file-utils/comar/pakhandler.py @@ -0,0 +1,23 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +import piksemel +import os + +def updateData(filepath): + parse = piksemel.parse(filepath) + + for icon in parse.tags("File"): + path = icon.getTagData("Path") + if path.startswith("usr/share/applications"): + os.system("/usr/bin/update-desktop-database -q") + return + +def setupPackage(metapath, filepath): + updateData(filepath) + +def cleanupPackage(metapath, filepath): + pass + +def postCleanupPackage(metapath, filepath): + updateData(filepath) diff --git a/desktop/misc/desktop-file-utils/pspec.xml b/desktop/misc/desktop-file-utils/pspec.xml new file mode 100644 index 0000000000..a1c812b348 --- /dev/null +++ b/desktop/misc/desktop-file-utils/pspec.xml @@ -0,0 +1,53 @@ + + + + + desktop-file-utils + http://www.freedesktop.org/software/desktop-file-utils/ + + PisiLinux Community + admins@pisilinux.org + + GPLv2 + library + Command line utilities to work with desktop menu entries + desktop files are used to describe an application for inclusion in GNOME or KDE menus. This package contains desktop-file-validate which checks whether a .desktop file complies with the specification and desktop-file-install which installs a desktop file to the standard directory, optionally fixing it up in the process. + http://freedesktop.org/software/desktop-file-utils/releases/desktop-file-utils-0.21.tar.xz + + + + desktop-file-utils + + /usr/bin + /usr/share/doc + /usr/share/man/man1/ + + + System.PackageHandler + + + + + + 2013-09-07 + 0.21 + Add comar script. + Marcin Bojara + marcin@pisilinux.org + + + 2013-08-26 + 0.21 + Release bump. + Serdar Soytetir + kaptan@pisilinux.org + + + 2012-11-21 + 0.21 + First release + PisiLinux Community + admins@pisilinux.org + + + diff --git a/desktop/misc/desktop-file-utils/translations.xml b/desktop/misc/desktop-file-utils/translations.xml new file mode 100644 index 0000000000..14f04b8dcc --- /dev/null +++ b/desktop/misc/desktop-file-utils/translations.xml @@ -0,0 +1,7 @@ + + + + desktop-file-utils + Masaüstü menü girdilerini yönetmek için komut satırı araçları + + diff --git a/desktop/toolkit/gtk/gtk2/actions.py b/desktop/toolkit/gtk/gtk2/actions.py new file mode 100644 index 0000000000..ae75d08f9b --- /dev/null +++ b/desktop/toolkit/gtk/gtk2/actions.py @@ -0,0 +1,55 @@ +#!/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 get +from pisi.actionsapi import shelltools +from pisi.actionsapi import libtools + +def setup(): + options = "-with-xinput=yes \ + --enable-man" + + #shelltools.export("CFLAGS", get.CFLAGS().replace("-fomit-frame-pointer","")) + #gtk2 needs -DGTK_COMPILATION CPPFLAG when compiling itself + #Avoid "Only can be included directly error" + shelltools.export("CPPFLAGS", "-DGTK_COMPILATION") + + if get.buildTYPE() == "_emul32": + options += " --libdir=/usr/lib32 \ + --bindir=/_emul32/bin \ + --sbindir=/_emul32/sbin \ + --disable-cups" + + shelltools.export("CC", "%s -m32" % get.CC()) + shelltools.export("CXX", "%s -m32" % get.CC()) + shelltools.export("CXXFLAGS", "%s -m32" % get.CFLAGS()) + shelltools.export("LDFLAGS", "%s -m32" % get.LDFLAGS()) + shelltools.export("CPPFLAGS", "-DGTK_COMPILATION") + + autotools.autoconf() + autotools.configure(options) + + pisitools.dosed("libtool"," -shared ", " -Wl,-O1,--as-needed -shared ") + +def build(): + autotools.make() + +def install(): + autotools.rawInstall("DESTDIR=%s" % get.installDIR()) + + # remove empty dir + #pisitools.removeDir("/usr/share/man") + + pisitools.dodoc("AUTHORS", "README*", "HACKING", "ChangeLog*", "NEWS*") + + if get.buildTYPE() == "_emul32": + for binaries in ["gtk-query-immodules-2.0", "gtk-demo"]: + pisitools.domove("/_emul32/bin/%s" % binaries, "/usr/bin/", "%s-32bit" % binaries) + pisitools.removeDir("/_emul32") + #hack to install gdkconfig.h in gdk headers dir + pisitools.dosym("/usr/lib/gtk-2.0/include/gdkconfig.h","/usr/include/gtk-2.0/gdk/gdkconfig.h") \ No newline at end of file diff --git a/desktop/toolkit/gtk/gtk2/comar/pakhandler.py b/desktop/toolkit/gtk/gtk2/comar/pakhandler.py new file mode 100644 index 0000000000..0771670257 --- /dev/null +++ b/desktop/toolkit/gtk/gtk2/comar/pakhandler.py @@ -0,0 +1,41 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +import piksemel +import os +import fnmatch + +def updateData(filepath): + parse = piksemel.parse(filepath) + + iconFound = False + immoduleFound = False + + for icon in parse.tags("File"): + path = icon.getTagData("Path") + if path.startswith("usr/share/icons/hicolor") and not iconFound: + os.system("/usr/bin/gtk-update-icon-cache -f /usr/share/icons/hicolor") + iconFound = True + if immoduleFound: + return + + if fnmatch.fnmatch(path, "usr/lib/gtk-2.0/*immodules/*.so") and not immoduleFound: + os.system("/usr/bin/gtk-query-immodules-2.0 --update-cache") + immoduleFound = True + if iconFound: + return + + if fnmatch.fnmatch(path, "usr/lib32/gtk-2.0/*immodules/*.so") and not immoduleFound: + os.system("/usr/bin/gtk-query-immodules-2.0-32bit --update-cache") + immoduleFound = True + if iconFound: + return + +def setupPackage(metapath, filepath): + updateData(filepath) + +def cleanupPackage(metapath, filepath): + pass + +def postCleanupPackage(metapath, filepath): + updateData(filepath) diff --git a/desktop/toolkit/gtk/gtk2/files/fedora/icon-padding.patch b/desktop/toolkit/gtk/gtk2/files/fedora/icon-padding.patch new file mode 100644 index 0000000000..45083a6548 --- /dev/null +++ b/desktop/toolkit/gtk/gtk2/files/fedora/icon-padding.patch @@ -0,0 +1,258 @@ +diff -up gtk+-2.19.7/gtk/gtkstatusicon.c.icon-padding gtk+-2.19.7/gtk/gtkstatusicon.c +--- gtk+-2.19.7/gtk/gtkstatusicon.c.icon-padding 2010-03-08 08:42:22.000000000 -0500 ++++ gtk+-2.19.7/gtk/gtkstatusicon.c 2010-03-10 00:40:11.165527903 -0500 +@@ -170,6 +170,7 @@ static void gtk_status_icon_screen_c + GdkScreen *old_screen); + static void gtk_status_icon_embedded_changed (GtkStatusIcon *status_icon); + static void gtk_status_icon_orientation_changed (GtkStatusIcon *status_icon); ++static void gtk_status_icon_padding_changed (GtkStatusIcon *status_icon); + static gboolean gtk_status_icon_scroll (GtkStatusIcon *status_icon, + GdkEventScroll *event); + static gboolean gtk_status_icon_query_tooltip (GtkStatusIcon *status_icon, +@@ -850,6 +851,8 @@ gtk_status_icon_init (GtkStatusIcon *sta + G_CALLBACK (gtk_status_icon_embedded_changed), status_icon); + g_signal_connect_swapped (priv->tray_icon, "notify::orientation", + G_CALLBACK (gtk_status_icon_orientation_changed), status_icon); ++ g_signal_connect_swapped (priv->tray_icon, "notify::padding", ++ G_CALLBACK (gtk_status_icon_padding_changed), status_icon); + g_signal_connect_swapped (priv->tray_icon, "button-press-event", + G_CALLBACK (gtk_status_icon_button_press), status_icon); + g_signal_connect_swapped (priv->tray_icon, "button-release-event", +@@ -975,6 +978,8 @@ gtk_status_icon_finalize (GObject *objec + g_signal_handlers_disconnect_by_func (priv->tray_icon, + gtk_status_icon_orientation_changed, status_icon); + g_signal_handlers_disconnect_by_func (priv->tray_icon, ++ gtk_status_icon_padding_changed, status_icon); ++ g_signal_handlers_disconnect_by_func (priv->tray_icon, + gtk_status_icon_button_press, status_icon); + g_signal_handlers_disconnect_by_func (priv->tray_icon, + gtk_status_icon_button_release, status_icon); +@@ -1679,14 +1684,32 @@ gtk_status_icon_screen_changed (GtkStatu + #ifdef GDK_WINDOWING_X11 + + static void ++gtk_status_icon_padding_changed (GtkStatusIcon *status_icon) ++{ ++ GtkStatusIconPrivate *priv = status_icon->priv; ++ GtkOrientation orientation; ++ gint padding; ++ ++ orientation = _gtk_tray_icon_get_orientation (GTK_TRAY_ICON (priv->tray_icon)); ++ padding = _gtk_tray_icon_get_padding (GTK_TRAY_ICON (priv->tray_icon)); ++ ++ if (orientation == GTK_ORIENTATION_HORIZONTAL) ++ gtk_misc_set_padding (GTK_MISC (priv->image), padding, 0); ++ else ++ gtk_misc_set_padding (GTK_MISC (priv->image), 0, padding); ++} ++ ++static void + gtk_status_icon_embedded_changed (GtkStatusIcon *status_icon) + { ++ gtk_status_icon_padding_changed (status_icon); + g_object_notify (G_OBJECT (status_icon), "embedded"); + } + + static void + gtk_status_icon_orientation_changed (GtkStatusIcon *status_icon) + { ++ gtk_status_icon_padding_changed (status_icon); + g_object_notify (G_OBJECT (status_icon), "orientation"); + } + +@@ -1804,7 +1827,7 @@ gtk_status_icon_reset_image_data (GtkSta + + g_object_notify (G_OBJECT (status_icon), "stock"); + break; +- ++ + case GTK_IMAGE_ICON_NAME: + g_free (priv->image_data.icon_name); + priv->image_data.icon_name = NULL; +diff -up gtk+-2.19.7/gtk/gtktrayicon.h.icon-padding gtk+-2.19.7/gtk/gtktrayicon.h +--- gtk+-2.19.7/gtk/gtktrayicon.h.icon-padding 2009-10-18 01:35:45.000000000 -0400 ++++ gtk+-2.19.7/gtk/gtktrayicon.h 2010-03-10 00:40:11.169528392 -0500 +@@ -69,7 +69,8 @@ void _gtk_tray_icon_cancel_mes + guint id); + + GtkOrientation _gtk_tray_icon_get_orientation (GtkTrayIcon *icon); +- ++gint _gtk_tray_icon_get_padding (GtkTrayIcon *icon); ++ + G_END_DECLS + + #endif /* __GTK_TRAY_ICON_H__ */ +diff -up gtk+-2.19.7/gtk/gtktrayicon-x11.c.icon-padding gtk+-2.19.7/gtk/gtktrayicon-x11.c +--- gtk+-2.19.7/gtk/gtktrayicon-x11.c.icon-padding 2010-03-08 21:01:28.000000000 -0500 ++++ gtk+-2.19.7/gtk/gtktrayicon-x11.c 2010-03-10 00:49:48.229509604 -0500 +@@ -43,23 +43,26 @@ + + enum { + PROP_0, +- PROP_ORIENTATION ++ PROP_ORIENTATION, ++ PROP_PADDING + }; + + struct _GtkTrayIconPrivate + { + guint stamp; +- ++ + Atom selection_atom; + Atom manager_atom; + Atom system_tray_opcode_atom; + Atom orientation_atom; + Atom visual_atom; ++ Atom padding_atom; + Window manager_window; + GdkVisual *manager_visual; + gboolean manager_visual_rgba; + + GtkOrientation orientation; ++ gint padding; + }; + + static void gtk_tray_icon_constructed (GObject *object); +@@ -113,6 +116,16 @@ gtk_tray_icon_class_init (GtkTrayIconCla + GTK_ORIENTATION_HORIZONTAL, + GTK_PARAM_READABLE)); + ++ g_object_class_install_property (gobject_class, ++ PROP_PADDING, ++ g_param_spec_int ("padding", ++ P_("Padding"), ++ P_("Padding that should be put around icons in the tray"), ++ 0, ++ G_MAXINT, ++ 0, ++ GTK_PARAM_READABLE)); ++ + g_type_class_add_private (class, sizeof (GtkTrayIconPrivate)); + } + +@@ -124,6 +137,7 @@ gtk_tray_icon_init (GtkTrayIcon *icon) + + icon->priv->stamp = 1; + icon->priv->orientation = GTK_ORIENTATION_HORIZONTAL; ++ icon->priv->padding = 0; + + gtk_widget_set_app_paintable (GTK_WIDGET (icon), TRUE); + gtk_widget_add_events (GTK_WIDGET (icon), GDK_PROPERTY_CHANGE_MASK); +@@ -161,6 +175,10 @@ gtk_tray_icon_constructed (GObject *obje + "_NET_SYSTEM_TRAY_VISUAL", + False); + ++ icon->priv->padding_atom = XInternAtom (xdisplay, ++ "_NET_SYSTEM_TRAY_PADDING", ++ False); ++ + /* Add a root window filter so that we get changes on MANAGER */ + gdk_window_add_filter (root_window, + gtk_tray_icon_manager_filter, icon); +@@ -212,6 +230,9 @@ gtk_tray_icon_get_property (GObject * + case PROP_ORIENTATION: + g_value_set_enum (value, icon->priv->orientation); + break; ++ case PROP_PADDING: ++ g_value_set_int (value, icon->priv->padding); ++ break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; +@@ -372,9 +393,58 @@ gtk_tray_icon_get_visual_property (GtkTr + XFree (prop.prop); + } + ++static void ++gtk_tray_icon_get_padding_property (GtkTrayIcon *icon) ++{ ++ GdkScreen *screen = gtk_widget_get_screen (GTK_WIDGET (icon)); ++ GdkDisplay *display = gdk_screen_get_display (screen); ++ Display *xdisplay = GDK_DISPLAY_XDISPLAY (display); ++ ++ Atom type; ++ int format; ++ union { ++ gulong *prop; ++ guchar *prop_ch; ++ } prop = { NULL }; ++ gulong nitems; ++ gulong bytes_after; ++ int error, result; ++ ++ g_assert (icon->priv->manager_window != None); ++ ++ gdk_error_trap_push (); ++ type = None; ++ result = XGetWindowProperty (xdisplay, ++ icon->priv->manager_window, ++ icon->priv->padding_atom, ++ 0, G_MAXLONG, FALSE, ++ XA_CARDINAL, ++ &type, &format, &nitems, ++ &bytes_after, &(prop.prop_ch)); ++ error = gdk_error_trap_pop (); ++ ++ if (!error && result == Success && ++ type == XA_CARDINAL && nitems == 1 && format == 32) ++ { ++ gint padding; ++ ++ padding = prop.prop[0]; ++ ++ if (icon->priv->padding != padding) ++ { ++ icon->priv->padding = padding; ++ ++ g_object_notify (G_OBJECT (icon), "padding"); ++ } ++ } ++ ++ if (type != None) ++ XFree (prop.prop); ++} ++ + static GdkFilterReturn +-gtk_tray_icon_manager_filter (GdkXEvent *xevent, +- GdkEvent *event, ++gtk_tray_icon_manager_filter (GdkXEvent *xevent, ++ GdkEvent *event, + gpointer user_data) + { + GtkTrayIcon *icon = user_data; +@@ -399,6 +469,11 @@ gtk_tray_icon_manager_filter (GdkXEvent + + gtk_tray_icon_get_orientation_property (icon); + } ++ else if (xev->xany.type == PropertyNotify && ++ xev->xproperty.atom == icon->priv->padding_atom) ++ { ++ gtk_tray_icon_get_padding_property (icon); ++ } + else if (xev->xany.type == DestroyNotify) + { + GTK_NOTE (PLUGSOCKET, +@@ -504,6 +579,7 @@ gtk_tray_icon_update_manager_window (Gtk + + gtk_tray_icon_get_orientation_property (icon); + gtk_tray_icon_get_visual_property (icon); ++ gtk_tray_icon_get_padding_property (icon); + + if (gtk_widget_get_realized (GTK_WIDGET (icon))) + { +@@ -740,6 +816,14 @@ _gtk_tray_icon_get_orientation (GtkTrayI + return icon->priv->orientation; + } + ++gint ++_gtk_tray_icon_get_padding (GtkTrayIcon *icon) ++{ ++ g_return_val_if_fail (GTK_IS_TRAY_ICON (icon), 0); ++ ++ return icon->priv->padding; ++} ++ + + #define __GTK_TRAY_ICON_X11_C__ + #include "gtkaliasdef.c" diff --git a/desktop/toolkit/gtk/gtk2/files/fedora/system-python.patch b/desktop/toolkit/gtk/gtk2/files/fedora/system-python.patch new file mode 100644 index 0000000000..3f697faa7b --- /dev/null +++ b/desktop/toolkit/gtk/gtk2/files/fedora/system-python.patch @@ -0,0 +1,9 @@ +diff -up gtk+-2.18.2/gtk/gtk-builder-convert.system-python gtk+-2.18.2/gtk/gtk-builder-convert +--- gtk+-2.18.2/gtk/gtk-builder-convert.system-python 2009-10-13 15:59:50.423385098 -0400 ++++ gtk+-2.18.2/gtk/gtk-builder-convert 2009-10-13 16:00:31.876142050 -0400 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python + # + # Copyright (C) 2006-2008 Async Open Source + # Henrique Romano diff --git a/desktop/toolkit/gtk/gtk2/files/fedora/tooltip-positioning.patch b/desktop/toolkit/gtk/gtk2/files/fedora/tooltip-positioning.patch new file mode 100644 index 0000000000..49b72c2616 --- /dev/null +++ b/desktop/toolkit/gtk/gtk2/files/fedora/tooltip-positioning.patch @@ -0,0 +1,182 @@ +diff --git a/gtk/gtktooltip.c b/gtk/gtktooltip.c +index 5cc2334..204a2b6 100644 +--- a/gtk/gtktooltip.c ++++ b/gtk/gtktooltip.c +@@ -903,53 +903,128 @@ gtk_tooltip_position (GtkTooltip *tooltip, + { + gint x, y; + GdkScreen *screen; ++ gint monitor_num; ++ GdkRectangle monitor; ++ GtkRequisition requisition; ++ guint cursor_size; ++ GdkRectangle bounds; ++ ++#define MAX_DISTANCE 32 + + tooltip->tooltip_widget = new_tooltip_widget; + ++ screen = gtk_widget_get_screen (new_tooltip_widget); ++ ++ gtk_widget_size_request (GTK_WIDGET (tooltip->current_window), &requisition); ++ ++ monitor_num = gdk_screen_get_monitor_at_point (screen, ++ tooltip->last_x, ++ tooltip->last_y); ++ gdk_screen_get_monitor_geometry (screen, monitor_num, &monitor); ++ ++ get_bounding_box (new_tooltip_widget, &bounds); ++ + /* Position the tooltip */ +- /* FIXME: should we swap this when RTL is enabled? */ +- if (tooltip->keyboard_mode_enabled) ++ ++ cursor_size = gdk_display_get_default_cursor_size (display); ++ ++ /* Try below */ ++ x = bounds.x + bounds.width / 2 - requisition.width / 2; ++ y = bounds.y + bounds.height + 4; ++ ++ if (y + requisition.height <= monitor.y + monitor.height) + { +- GdkRectangle bounds; ++ if (tooltip->keyboard_mode_enabled) ++ goto found; + +- get_bounding_box (new_tooltip_widget, &bounds); ++ if (y <= tooltip->last_y + cursor_size + MAX_DISTANCE) ++ { ++ if (tooltip->last_x + cursor_size + MAX_DISTANCE < x) ++ x = tooltip->last_x + cursor_size + MAX_DISTANCE; ++ else if (x + requisition.width < tooltip->last_x - MAX_DISTANCE) ++ x = tooltip->last_x - MAX_DISTANCE - requisition.width; + +- /* For keyboard mode we position the tooltip below the widget, +- * right of the center of the widget. +- */ +- x = bounds.x + bounds.width / 2; +- y = bounds.y + bounds.height + 4; ++ goto found; ++ } ++ } ++ ++ /* Try above */ ++ x = bounds.x + bounds.width / 2 - requisition.width / 2; ++ y = bounds.y - requisition.height - 4; ++ ++ if (y >= monitor.y) ++ { ++ if (tooltip->keyboard_mode_enabled) ++ goto found; ++ ++ if (y + requisition.height >= tooltip->last_y - MAX_DISTANCE) ++ { ++ if (tooltip->last_x + cursor_size + MAX_DISTANCE < x) ++ x = tooltip->last_x + cursor_size + MAX_DISTANCE; ++ else if (x + requisition.width < tooltip->last_x - MAX_DISTANCE) ++ x = tooltip->last_x - MAX_DISTANCE - requisition.width; ++ ++ goto found; ++ } + } +- else ++ ++ /* Try right FIXME: flip on rtl ? */ ++ x = bounds.x + bounds.width + 4; ++ y = bounds.y + bounds.height / 2 - requisition.height / 2; ++ ++ if (x + requisition.width <= monitor.x + monitor.width) + { +- guint cursor_size; ++ if (tooltip->keyboard_mode_enabled) ++ goto found; + +- x = tooltip->last_x; +- y = tooltip->last_y; ++ if (x <= tooltip->last_x + cursor_size + MAX_DISTANCE) ++ { ++ if (tooltip->last_y + cursor_size + MAX_DISTANCE < y) ++ y = tooltip->last_y + cursor_size + MAX_DISTANCE; ++ else if (y + requisition.height < tooltip->last_y - MAX_DISTANCE) ++ y = tooltip->last_y - MAX_DISTANCE - requisition.height; + +- /* For mouse mode, we position the tooltip right of the cursor, +- * a little below the cursor's center. +- */ +- cursor_size = gdk_display_get_default_cursor_size (display); +- x += cursor_size / 2; +- y += cursor_size / 2; ++ goto found; ++ } + } + +- screen = gtk_widget_get_screen (new_tooltip_widget); ++ /* Try left FIXME: flip on rtl ? */ ++ x = bounds.x - requisition.width - 4; ++ y = bounds.y + bounds.height / 2 - requisition.height / 2; + +- /* Show it */ +- if (tooltip->current_window) ++ if (x >= monitor.x) + { +- gint monitor_num; +- GdkRectangle monitor; +- GtkRequisition requisition; ++ if (tooltip->keyboard_mode_enabled) ++ goto found; + +- gtk_widget_size_request (GTK_WIDGET (tooltip->current_window), +- &requisition); ++ if (x + requisition.width >= tooltip->last_x - MAX_DISTANCE) ++ { ++ if (tooltip->last_y + cursor_size + MAX_DISTANCE < y) ++ y = tooltip->last_y + cursor_size + MAX_DISTANCE; ++ else if (y + requisition.height < tooltip->last_y - MAX_DISTANCE) ++ y = tooltip->last_y - MAX_DISTANCE - requisition.height; + +- monitor_num = gdk_screen_get_monitor_at_point (screen, x, y); +- gdk_screen_get_monitor_geometry (screen, monitor_num, &monitor); ++ goto found; ++ } ++ } + ++ /* Fallback */ ++ if (tooltip->keyboard_mode_enabled) ++ { ++ x = bounds.x + bounds.width / 2 - requisition.width / 2; ++ y = bounds.y + bounds.height + 4; ++ } ++ else ++ { ++ /* At cursor */ ++ x = tooltip->last_x + cursor_size * 3 / 4; ++ y = tooltip->last_y + cursor_size * 3 / 4; ++ } ++ ++found: ++ /* Show it */ ++ if (tooltip->current_window) ++ { + if (x + requisition.width > monitor.x + monitor.width) + x -= x - (monitor.x + monitor.width) + requisition.width; + else if (x < monitor.x) +@@ -957,7 +1032,9 @@ gtk_tooltip_position (GtkTooltip *tooltip, + + if (y + requisition.height > monitor.y + monitor.height) + y -= y - (monitor.y + monitor.height) + requisition.height; +- ++ else if (y < monitor.y) ++ y = monitor.y; ++ + if (!tooltip->keyboard_mode_enabled) + { + /* don't pop up under the pointer */ +@@ -965,7 +1042,7 @@ gtk_tooltip_position (GtkTooltip *tooltip, + y <= tooltip->last_y && tooltip->last_y < y + requisition.height) + y = tooltip->last_y - requisition.height - 2; + } +- ++ + gtk_window_move (GTK_WINDOW (tooltip->current_window), x, y); + gtk_widget_show (GTK_WIDGET (tooltip->current_window)); + } diff --git a/desktop/toolkit/gtk/gtk2/files/fedora/window-dragging.patch b/desktop/toolkit/gtk/gtk2/files/fedora/window-dragging.patch new file mode 100644 index 0000000000..88aa26b466 --- /dev/null +++ b/desktop/toolkit/gtk/gtk2/files/fedora/window-dragging.patch @@ -0,0 +1,116 @@ +diff -up gtk+-2.24.7/gtk/gtkmenushell.c.window-dragging gtk+-2.24.7/gtk/gtkmenushell.c +--- gtk+-2.24.7/gtk/gtkmenushell.c.window-dragging 2011-08-15 22:30:52.000000000 -0400 ++++ gtk+-2.24.7/gtk/gtkmenushell.c 2011-10-17 19:50:52.180468086 -0400 +@@ -589,18 +589,45 @@ gtk_menu_shell_button_press (GtkWidget + + if (!menu_shell->active || !menu_shell->button) + { +- _gtk_menu_shell_activate (menu_shell); ++ gboolean initially_active = menu_shell->active; + + menu_shell->button = event->button; + +- if (menu_item && _gtk_menu_item_is_selectable (menu_item) && +- menu_item->parent == widget && +- menu_item != menu_shell->active_menu_item) ++ if (menu_item) + { +- if (GTK_MENU_SHELL_GET_CLASS (menu_shell)->submenu_placement == GTK_TOP_BOTTOM) ++ if (_gtk_menu_item_is_selectable (menu_item) && ++ menu_item->parent == widget && ++ menu_item != menu_shell->active_menu_item) + { +- menu_shell->activate_time = event->time; +- gtk_menu_shell_select_item (menu_shell, menu_item); ++ _gtk_menu_shell_activate (menu_shell); ++ menu_shell->button = event->button; ++ ++ if (GTK_MENU_SHELL_GET_CLASS (menu_shell)->submenu_placement == GTK_TOP_BOTTOM) ++ { ++ menu_shell->activate_time = event->time; ++ gtk_menu_shell_select_item (menu_shell, menu_item); ++ } ++ } ++ } ++ else ++ { ++ if (!initially_active) ++ { ++ gboolean window_drag = FALSE; ++ ++ gtk_widget_style_get (widget, ++ "window-dragging", &window_drag, ++ NULL); ++ ++ if (window_drag) ++ { ++ gtk_menu_shell_deactivate (menu_shell); ++ gtk_window_begin_move_drag (GTK_WINDOW (gtk_widget_get_toplevel (widget)), ++ event->button, ++ event->x_root, ++ event->y_root, ++ event->time); ++ } + } + } + } +diff -up gtk+-2.24.7/gtk/gtktoolbar.c.window-dragging gtk+-2.24.7/gtk/gtktoolbar.c +--- gtk+-2.24.7/gtk/gtktoolbar.c.window-dragging 2011-10-01 11:29:06.000000000 -0400 ++++ gtk+-2.24.7/gtk/gtktoolbar.c 2011-10-17 19:52:56.104463657 -0400 +@@ -2701,6 +2701,8 @@ static gboolean + gtk_toolbar_button_press (GtkWidget *toolbar, + GdkEventButton *event) + { ++ GtkWidget *window; ++ + if (_gtk_button_event_triggers_context_menu (event)) + { + gboolean return_value; +@@ -2711,7 +2713,29 @@ gtk_toolbar_button_press (GtkWidget + + return return_value; + } +- ++ ++ window = gtk_widget_get_toplevel (toolbar); ++ ++ if (window) ++ { ++ gboolean window_drag = FALSE; ++ ++ gtk_widget_style_get (toolbar, ++ "window-dragging", &window_drag, ++ NULL); ++ ++ if (window_drag) ++ { ++ gtk_window_begin_move_drag (GTK_WINDOW (window), ++ event->button, ++ event->x_root, ++ event->y_root, ++ event->time); ++ ++ return TRUE; ++ } ++ } ++ + return FALSE; + } + +diff -up gtk+-2.24.7/gtk/gtkwidget.c.window-dragging gtk+-2.24.7/gtk/gtkwidget.c +--- gtk+-2.24.7/gtk/gtkwidget.c.window-dragging 2011-10-17 19:50:52.175468086 -0400 ++++ gtk+-2.24.7/gtk/gtkwidget.c 2011-10-17 19:50:52.184468086 -0400 +@@ -2467,6 +2467,13 @@ gtk_widget_class_init (GtkWidgetClass *k + 0.0, 1.0, 0.04, + GTK_PARAM_READABLE)); + ++ gtk_widget_class_install_style_property (klass, ++ g_param_spec_boolean ("window-dragging", ++ P_("Window dragging"), ++ P_("Window dragging"), ++ FALSE, ++ GTK_PARAM_READWRITE)); ++ + /** + * GtkWidget:draw-border: + * diff --git a/desktop/toolkit/gtk/gtk2/files/gtkrc b/desktop/toolkit/gtk/gtk2/files/gtkrc new file mode 100644 index 0000000000..e5b4e26e98 --- /dev/null +++ b/desktop/toolkit/gtk/gtk2/files/gtkrc @@ -0,0 +1,3 @@ +gtk-icon-theme-name = "Faenza" +gtk-theme-name = "MediterraneanLightDarkest" +gtk-font-name = "DejaVuSans 10" diff --git a/desktop/toolkit/gtk/gtk2/files/xid-collision-debug.patch b/desktop/toolkit/gtk/gtk2/files/xid-collision-debug.patch new file mode 100644 index 0000000000..db0816ef16 --- /dev/null +++ b/desktop/toolkit/gtk/gtk2/files/xid-collision-debug.patch @@ -0,0 +1,15 @@ +Index: gtk+-2.16.5/gdk/x11/gdkxid.c +=================================================================== +--- gtk+-2.16.5.orig/gdk/x11/gdkxid.c ++++ gtk+-2.16.5/gdk/x11/gdkxid.c +@@ -57,8 +57,10 @@ _gdk_xid_table_insert (GdkDisplay *displ + display_x11->xid_ht = g_hash_table_new ((GHashFunc) gdk_xid_hash, + (GEqualFunc) gdk_xid_equal); + ++ /* + if (g_hash_table_lookup (display_x11->xid_ht, xid)) + g_warning ("XID collision, trouble ahead"); ++ */ + + g_hash_table_insert (display_x11->xid_ht, xid, data); + } diff --git a/desktop/toolkit/gtk/gtk2/pspec.xml b/desktop/toolkit/gtk/gtk2/pspec.xml new file mode 100644 index 0000000000..0d5963c943 --- /dev/null +++ b/desktop/toolkit/gtk/gtk2/pspec.xml @@ -0,0 +1,258 @@ + + + + + gtk2 + http://www.gtk.org + + PisiLinux Community + admins@pisilinux.org + + LGPLv2.1 + The GIMP Toolkit version 2 + GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete set of widgets, GTK+ is suitable for projects ranging from small one-off projects to complete application suites. + mirrors://gnome/gtk+/2.24/gtk+-2.24.23.tar.xz + + cups-devel + libXi-devel + cairo-devel + libXext-devel + libXrandr-devel + libXfixes-devel + libXrender-devel + libXdamage-devel + libXcursor-devel + fontconfig-devel + libXinerama-devel + libXcomposite-devel + atk-devel + pango-devel + gdk-pixbuf-devel + gobject-introspection-devel + + + + xid-collision-debug.patch + + + fedora/system-python.patch + fedora/icon-padding.patch + fedora/tooltip-positioning.patch + fedora/window-dragging.patch + + + + + gtk2 + + cups + libXi + cairo + libXext + libXrandr + libXfixes + libXrender + libXdamage + libXcursor + fontconfig + libXinerama + libXcomposite + atk + pango + gdk-pixbuf + dejavu-fonts + gtk-theme-mediterranean + + + /etc + /usr/bin + /usr/share/themes + /usr/share/gtk-2.0 + /usr/share/man + /usr/share/doc + /usr/lib + /usr/share/locale + + + + gtkrc + + + System.PackageHandler + + + + + gtk2-demo + app:gui + GTK demo application + + gtk2 + cairo + pango + gdk-pixbuf + + + /usr/bin/gtk-demo + /usr/share/gtk-2.0/demo + + + + + gtk2-docs + data:doc + GTK reference documents + + /usr/share/gtk-doc + + + + + gtk2-devel + Development files for gtk2 + + gtk2 + atk-devel + pango-devel + cairo-devel + gdk-pixbuf-devel + + + /usr/include + /usr/lib/pkgconfig + /usr/lib32/pkgconfig + /usr/share/aclocal + /usr/share/gir-1.0 + + + + + gtk2-32bit + emul32 + 32-bit shared libraries for gtk2 + _emul32 + + cairo-32bit + cups-32bit + fontconfig-32bit + pango-32bit + glib2-32bit + atk-32bit + libX11-32bit + gdk-pixbuf-32bit + libXcomposite-32bit + libXcursor-32bit + libXdamage-32bit + libXext-32bit + libXfixes-32bit + libXi-32bit + libXinerama-32bit + libXrandr-32bit + libXrender-32bit + + + gtk2 + cairo-32bit + pango-32bit + glib2-32bit + atk-32bit + libX11-32bit + cups-32bit + fontconfig-32bit + gdk-pixbuf-32bit + libXcomposite-32bit + libXcursor-32bit + libXdamage-32bit + libXext-32bit + libXfixes-32bit + libXi-32bit + libXinerama-32bit + libXrandr-32bit + libXrender-32bit + + + /usr/bin/*-32bit + /usr/lib32 + + + + + + 2014-05-17 + 2.24.23 + Version bump. + Alihan Öztürk + alihan@pisilinux.org + + + 2014-04-06 + 2.24.22 + Rebuild + Serdar Soytetir + kaptan@pisilinux.org + + + 2014-02-06 + 2.24.22 + Set proper settings to gtkrc, change location of gtkrc. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-10-21 + 2.24.22 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2013-09-05 + 2.24.21 + Minor version bump, cleanup. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-09-05 + 2.24.20 + Add missing method and fix pakhandler.py + Marcin Bojara + marcin@pisilinux.org + + + 2013-07-06 + 2.24.20 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-04-20 + 2.24.17 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-02-23 + 2.24.16 + Version bump, add new cppflags, enhancements. + Erdinç Gültekin + admins@pisilinux.org + + + 2013-01-23 + 2.24.14 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2012-09-25 + 2.24.13 + First release + Erdem Artan + admins@pisilinux.org + + + diff --git a/desktop/toolkit/gtk/gtk2/translations.xml b/desktop/toolkit/gtk/gtk2/translations.xml new file mode 100644 index 0000000000..7717338863 --- /dev/null +++ b/desktop/toolkit/gtk/gtk2/translations.xml @@ -0,0 +1,29 @@ + + + + gtk2 + GTK grafik arayüz kitaplığı versiyon 2 + GTK+, grafik kullanıcı arayüzü oluşturma amaçlı araçlardan oluşur. GTK+ hem küçük, hem de büyük uygulamalar için ideal olan, eksiksiz bir araçtır. + GTK+ est une boîte à outil multi-plateforme servant à créer des interfaces graphiques. Offrant un ensemble complet de widgets (objets graphiques), GTK+ convient aussi bien pour les petits projets que pour les suites complètes d'applications. + + + + gtk2-demo + GTK demo uyulaması + + + + gtk2-docs + GTK referans dökümanları + + + + gtk2-devel + gtk2 için geliştirme dosyaları + + + + gtk2-32bit + gtk2 için 32-bit paylaşımlı kitaplıklar + + diff --git a/hardware/component.xml b/hardware/component.xml new file mode 100644 index 0000000000..3d5a2b3c2e --- /dev/null +++ b/hardware/component.xml @@ -0,0 +1,3 @@ + + hardware + diff --git a/hardware/misc/component.xml b/hardware/misc/component.xml new file mode 100644 index 0000000000..79c4d92674 --- /dev/null +++ b/hardware/misc/component.xml @@ -0,0 +1,3 @@ + + hardware.misc + diff --git a/hardware/misc/libmtdev/actions.py b/hardware/misc/libmtdev/actions.py new file mode 100644 index 0000000000..02b1401a95 --- /dev/null +++ b/hardware/misc/libmtdev/actions.py @@ -0,0 +1,23 @@ +#!/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 get + +WorkDir = "mtdev-%s" % get.srcVERSION() + +def setup(): + autotools.autoreconf('-vfi') + autotools.configure("--disable-static") + +def build(): + autotools.make() + +def install(): + autotools.rawInstall("DESTDIR=%s" % get.installDIR()) + + pisitools.dodoc("ChangeLog", "COPYING", "README") diff --git a/hardware/misc/libmtdev/pspec.xml b/hardware/misc/libmtdev/pspec.xml new file mode 100644 index 0000000000..85f68c1e03 --- /dev/null +++ b/hardware/misc/libmtdev/pspec.xml @@ -0,0 +1,75 @@ + + + + + libmtdev + http://bitmath.org/code/mtdev + + PisiLinux Community + admins@pisilinux.org + + MIT + library + Multitouch Protocol Translation Library + The libmtdev is a stand-alone library which transforms all variants of kernel MT events to the slotted type B protocol. + http://bitmath.org/code/mtdev/mtdev-1.1.5.tar.gz + + + + libmtdev + + /usr/bin + /usr/lib + /usr/share/doc + + + + + libmtdev-devel + Development files of libmtdev + + libmtdev + + + /usr/include + /usr/lib/pkgconfig + + + + + libmtdev-32bit + emul32 + 32-bit shared libraries for libmtdev + emul32 + + libmtdev + + + /usr/lib32 + + + + + + 2014-05-16 + 1.1.5 + Version bump. + Kamil Atlı + suvarice@gmail.com + + + 2014-03-09 + 1.1.3 + Rebuild. + Kamil Atlı + suvarice@gmail.com + + + 2012-10-03 + 1.1.3 + First release + PisiLinux Community + admins@pisilinux.org + + + diff --git a/hardware/misc/libmtdev/translations.xml b/hardware/misc/libmtdev/translations.xml new file mode 100644 index 0000000000..44798c7e42 --- /dev/null +++ b/hardware/misc/libmtdev/translations.xml @@ -0,0 +1,13 @@ + + + + libmtdev + Çoklu Dokunmatik Protokol Dönüşüm Kütüphanesi + Libmtdev kütüphanesi, kernel MT olaylarının tüm çeşitlerini slotlu B tipi protokole dönüştürür. + + + + libmtdev-devel + Libmtdev için geliştirme dosyaları + + diff --git a/hardware/printer/component.xml b/hardware/printer/component.xml new file mode 100644 index 0000000000..42941e1597 --- /dev/null +++ b/hardware/printer/component.xml @@ -0,0 +1,3 @@ + + hardware.printer + diff --git a/hardware/printer/cups/actions.py b/hardware/printer/cups/actions.py new file mode 100644 index 0000000000..1655420abc --- /dev/null +++ b/hardware/printer/cups/actions.py @@ -0,0 +1,98 @@ +#!/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 get +from pisi.actionsapi import autotools +from pisi.actionsapi import pisitools +from pisi.actionsapi import shelltools + +def setup(): + #pisitools.flags.add("-fstack-protector-all", "-DLDAP_DEPRECATED=1") + pisitools.dosed("config-scripts/cups-sharedlibs.m4", "( -shared )", " -Wl,--as-needed\\1") + + # For --enable-avahi + autotools.aclocal("-I config-scripts") + autotools.autoconf("-I config-scripts") + + options = '--with-cups-user=lp \ + --with-cups-group=lp \ + --with-system-groups=lpadmin \ + --with-docdir=/usr/share/cups/html \ + --with-dbusdir=/etc/dbus-1 \ + --with-optim="%s" \ + --with-php=/usr/bin/php-cgi \ + --with-cupsd-file-perm=0755 \ + --with-log-file-perm=0600 \ + --without-java \ + --enable-acl \ + --enable-ssl=yes \ + --enable-libpaper \ + --enable-libusb=yes \ + --enable-debug \ + --enable-avahi \ + --enable-gssapi \ + --enable-dbus \ + --enable-pam=yes \ + --enable-relro \ + --enable-dnssd \ + --enable-browsing \ + --enable-threads \ + --enable-raw-printing \ + --disable-gnutls \ + --disable-launchd \ + --without-rcdir \ + --libdir=/usr/lib \ + --without-perl \ + --with-logdir=/var/log/cups \ + KRB5CONFIG=/usr/bin/krb5-config \ + --localstatedir=/var \ + --with-rundir=/run/cups \ + --with-xinetd=/etc/xinetd.d \ + ' % get.CFLAGS() + + if get.buildTYPE() == "emul32": + options += ' \ + --enable-libusb=no \ + --disable-avahi \ + --disable-dnssd \ + --disable-gssapi \ + --disable-dbus \ + --bindir=/usr/bin32 \ + --sbindir=/usr/sbin32 \ + --libdir=/usr/lib32' + + autotools.configure(options) + +def build(): + autotools.make() + +#def check(): + #autotools.make("check") + +def install(): + if get.buildTYPE() == "emul32": + # SERVERBIN is hardcoded to /usr/lib/cups, thus it overwrites 64 bit libraries + autotools.rawInstall("BUILDROOT=%s SERVERBIN=%s/usr/serverbin32 install-libs" % (get.installDIR(), get.installDIR())) + pisitools.domove("/usr/bin32/cups-config", "/usr/bin", "cups-config-32bit") + pisitools.removeDir("/usr/bin32") + pisitools.removeDir("/usr/sbin32") + pisitools.removeDir("/usr/serverbin32") + + # remove files now part of cups-filters + pisitools.remove("/usr/share/cups/data/testprint") + pisitools.removeDir("/usr/share/cups/banners") + pisitools.dodir("/usr/share/cups/banners") + return + + autotools.rawInstall("BUILDROOT=%s install-headers install-libs install-data install-exec" % get.installDIR()) + shelltools.chmod("%s/run/cups/certs" % get.installDIR(), 0755) + + pisitools.dodir("/usr/share/cups/profiles") + + # Serial backend needs to run as root + #shelltools.chmod("%s/usr/lib/cups/backend/serial" % get.installDIR(), 0700) + + pisitools.dodoc("CHANGES.txt", "CREDITS.txt", "LICENSE.txt", "README.txt") diff --git a/hardware/printer/cups/comar/package.py b/hardware/printer/cups/comar/package.py new file mode 100644 index 0000000000..730d2b67da --- /dev/null +++ b/hardware/printer/cups/comar/package.py @@ -0,0 +1,22 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +import os +import re + +ownerships = { + "/run/cups" : "root:lp", + "/var/log/cups" : "root:lp", + } + +CUPSD_CONFIG_FILE = "/etc/cups/cupsd.conf" + +def postInstall(fromVersion, fromRelease, toVersion, toRelease): + for directory,owners in ownerships.items(): + if os.path.exists(directory): + os.system("chown %s %s" % (owners, directory)) + + # Replace possible pnpadmin leftover from cupsd.conf + if os.path.exists(CUPSD_CONFIG_FILE): + cupsd = open(CUPSD_CONFIG_FILE, "r").read() + open(CUPSD_CONFIG_FILE, "w").write(re.sub("pnpadmin", "lpadmin", cupsd)) diff --git a/hardware/printer/cups/comar/service.py b/hardware/printer/cups/comar/service.py new file mode 100644 index 0000000000..cc3baf190b --- /dev/null +++ b/hardware/printer/cups/comar/service.py @@ -0,0 +1,50 @@ +from comar.service import * +import os + +serviceType = "server" +serviceDefault = "on" +serviceDesc = _({"en": "CUPS Printer Server", + "tr": "CUPS Yazıcı Sunucusu"}) +serviceConf = "cups" + +PIDFILE = "/run/cups/cupsd.pid" + +@synchronized +def start(): + # FIXME: After avahi before hal + startDependencies("avahi") + + # Load ppdev and lp drivers if wanted + if config.get("LOAD_LP_MODULE") == "yes": + os.system("/sbin/modprobe -q lp") + os.system("/sbin/modprobe -q ppdev") + + startService(command="/usr/sbin/cupsd", + donotify=True) + os.system("pidof -o %PPID /usr/sbin/cupsd > " + PIDFILE) + + # Tell udevd to replay printer events + # One for low-level usb + os.system("udevadm trigger --subsystem-match=usb \ + --attr-match=bInterfaceClass=07 \ + --attr-match=bInterfaceSubClass=01 \ + --action=add") + # One for usblp backend + os.system("udevadm trigger --subsystem-match=usb \ + --property-match=DEVNAME=\"/dev/usb/lp*\" \ + --action=add") + + +@synchronized +def reload(): + if os.path.exists(PIDFILE): + # 1 is SIGHUP + os.kill(int(open(PIDFILE, "r").read().strip()), 1) + +@synchronized +def stop(): + stopService(pidfile=PIDFILE, donotify=True) + if os.path.isfile(PIDFILE): os.unlink(PIDFILE) + +def status(): + return isServiceRunning(pidfile=PIDFILE) diff --git a/hardware/printer/cups/files/archlinux/cups-1.6.2-statedir.patch b/hardware/printer/cups/files/archlinux/cups-1.6.2-statedir.patch new file mode 100644 index 0000000000..8b16549815 --- /dev/null +++ b/hardware/printer/cups/files/archlinux/cups-1.6.2-statedir.patch @@ -0,0 +1,12 @@ +diff -ruN cups-1.6.2.orig/config-scripts/cups-directories.m4 cups-1.6.2/config-scripts/cups-directories.m4 +--- cups-1.6.2.orig/config-scripts/cups-directories.m4 2012-10-01 03:55:23.000000000 +0200 ++++ cups-1.6.2/config-scripts/cups-directories.m4 2013-04-02 00:11:41.000000000 +0200 +@@ -420,7 +420,7 @@ + ;; + *) + # All others +- CUPS_STATEDIR="$localstatedir/run/cups" ++ CUPS_STATEDIR="/run/cups" + ;; + esac]) + AC_DEFINE_UNQUOTED(CUPS_STATEDIR, "$CUPS_STATEDIR") diff --git a/hardware/printer/cups/files/archlinux/cups-no-export-ssllibs.patch b/hardware/printer/cups/files/archlinux/cups-no-export-ssllibs.patch new file mode 100644 index 0000000000..e227bd1823 --- /dev/null +++ b/hardware/printer/cups/files/archlinux/cups-no-export-ssllibs.patch @@ -0,0 +1,12 @@ +diff -up cups-1.5b1/config-scripts/cups-ssl.m4.no-export-ssllibs cups-1.5b1/config-scripts/cups-ssl.m4 +--- cups-1.6.2/config-scripts/cups-ssl.m4.no-export-ssllibs 2011-05-11 02:52:08.000000000 +0200 ++++ cups-1.6.2/config-scripts/cups-ssl.m4 2011-05-23 17:47:27.000000000 +0200 +@@ -180,7 +180,7 @@ + AC_SUBST(SSLFLAGS) + AC_SUBST(SSLLIBS) + +-EXPORT_SSLLIBS="$SSLLIBS" ++EXPORT_SSLLIBS="" + AC_SUBST(EXPORT_SSLLIBS) + + dnl diff --git a/hardware/printer/cups/files/archlinux/cups-no-gcrypt.patch b/hardware/printer/cups/files/archlinux/cups-no-gcrypt.patch new file mode 100644 index 0000000000..481b1a7264 --- /dev/null +++ b/hardware/printer/cups/files/archlinux/cups-no-gcrypt.patch @@ -0,0 +1,11 @@ +diff -up cups-2.0rc1/config-scripts/cups-ssl.m4.no-gcry cups-2.0rc1/config-scripts/cups-ssl.m4 +--- cups-2.0rc1/config-scripts/cups-ssl.m4.no-gcry 2014-09-12 15:41:23.324760213 +0200 ++++ cups-2.0rc1/config-scripts/cups-ssl.m4 2014-09-12 15:43:13.124203363 +0200 +@@ -60,7 +60,6 @@ if test x$enable_ssl != xno; then + dnl Then look for GNU TLS... + if test $have_ssl = 0 -a "x$enable_gnutls" != "xno" -a "x$PKGCONFIG" != x; then + AC_PATH_TOOL(LIBGNUTLSCONFIG,libgnutls-config) +- AC_PATH_TOOL(LIBGCRYPTCONFIG,libgcrypt-config) + if $PKGCONFIG --exists gnutls; then + have_ssl=1 + SSLLIBS=`$PKGCONFIG --libs gnutls` diff --git a/hardware/printer/cups/files/archlinux/cups-no-gzip-man.patch b/hardware/printer/cups/files/archlinux/cups-no-gzip-man.patch new file mode 100644 index 0000000000..69899b9cb7 --- /dev/null +++ b/hardware/printer/cups/files/archlinux/cups-no-gzip-man.patch @@ -0,0 +1,18 @@ +diff -up cups-1.5b1/config-scripts/cups-manpages.m4.no-gzip-man cups-1.5b1/config-scripts/cups-manpages.m4 +--- cups-1.5b1/config-scripts/cups-manpages.m4.no-gzip-man 2011-05-12 07:21:56.000000000 +0200 ++++ cups-1.5b1/config-scripts/cups-manpages.m4 2011-05-23 17:25:50.000000000 +0200 +@@ -69,10 +69,10 @@ case "$uname" in + ;; + Linux* | GNU* | Darwin*) + # Linux, GNU Hurd, and OS X +- MAN1EXT=1.gz +- MAN5EXT=5.gz +- MAN7EXT=7.gz +- MAN8EXT=8.gz ++ MAN1EXT=1 ++ MAN5EXT=5 ++ MAN7EXT=7 ++ MAN8EXT=8 + MAN8DIR=8 + ;; + *) diff --git a/hardware/printer/cups/files/cups.logrotate b/hardware/printer/cups/files/cups.logrotate new file mode 100644 index 0000000000..773c70fd2a --- /dev/null +++ b/hardware/printer/cups/files/cups.logrotate @@ -0,0 +1,5 @@ +/var/log/cups/*_log { + missingok + notifempty + sharedscripts +} diff --git a/hardware/printer/cups/files/debian/get-ppd-file-for-statically-configured-ipp-shared-queues.patch b/hardware/printer/cups/files/debian/get-ppd-file-for-statically-configured-ipp-shared-queues.patch new file mode 100644 index 0000000000..ed132d7503 --- /dev/null +++ b/hardware/printer/cups/files/debian/get-ppd-file-for-statically-configured-ipp-shared-queues.patch @@ -0,0 +1,31 @@ +Description: Applications could not get the PPD file for + statically-configured IPP-shared print queues +Author: Till Kamppeter +Bug-Upstream: http://cups.org/str.php?L4178 +Last-Updated: 2012-09-19 + +--- a/cups/util.c ++++ b/cups/util.c +@@ -1731,6 +1731,22 @@ + + return (1); + } ++ else if (device_uri && ++ (!strncmp(device_uri, "ipp:", 4) != NULL || ++ !strncmp(device_uri, "ipps:", 5) != NULL)) ++ { ++ /* ++ * Statically-configured IPP shared printer. ++ */ ++ ++ httpSeparateURI(HTTP_URI_CODING_ALL, ++ device_uri, ++ scheme, sizeof(scheme), username, sizeof(username), ++ host, hostsize, port, resource, resourcesize); ++ ippDelete(response); ++ ++ return (1); ++ } + else if ((attr = ippFindAttribute(response, "member-uris", + IPP_TAG_URI)) != NULL) + { diff --git a/hardware/printer/cups/files/fedora/cups-avahi-address.patch b/hardware/printer/cups/files/fedora/cups-avahi-address.patch new file mode 100644 index 0000000000..308ee89335 --- /dev/null +++ b/hardware/printer/cups/files/fedora/cups-avahi-address.patch @@ -0,0 +1,95 @@ +diff -up cups-1.6.2/cups/http-support.c.avahi-address cups-1.6.2/cups/http-support.c +--- cups-1.6.2/cups/http-support.c.avahi-address 2013-03-11 18:44:36.000000000 +0000 ++++ cups-1.6.2/cups/http-support.c 2013-06-28 13:42:15.834715511 +0100 +@@ -2121,7 +2121,7 @@ http_resolve_cb( + const char *type, /* I - Registration type */ + const char *domain, /* I - Domain (unused) */ + const char *hostTarget, /* I - Hostname */ +- const AvahiAddress *address, /* I - Address (unused) */ ++ const AvahiAddress *address, /* I - Address */ + uint16_t port, /* I - Port number */ + AvahiStringList *txt, /* I - TXT record */ + AvahiLookupResultFlags flags, /* I - Lookup flags (unused) */ +@@ -2248,41 +2248,59 @@ http_resolve_cb( + * getting the IP address of the .local name and then do reverse-lookups... + */ + +- http_addrlist_t *addrlist, /* List of addresses */ +- *addr; /* Current address */ ++ http_addr_t addr; ++ size_t addrlen; ++ int error; + + DEBUG_printf(("8http_resolve_cb: Looking up \"%s\".", hostTarget)); + +- snprintf(fqdn, sizeof(fqdn), "%d", ntohs(port)); +- if ((addrlist = httpAddrGetList(hostTarget, AF_UNSPEC, fqdn)) != NULL) ++ switch (address->proto) + { +- for (addr = addrlist; addr; addr = addr->next) ++ case AVAHI_PROTO_INET: ++ addr.ipv4.sin_family = AF_INET; ++ addrlen = sizeof (addr.ipv4.sin_addr); ++ memcpy (&addr.ipv4.sin_addr, &address->data, addrlen); ++ break; ++ case AVAHI_PROTO_INET6: ++ addr.ipv6.sin6_family = AF_INET6; ++ addrlen = sizeof (addr.ipv6.sin6_addr); ++ memcpy (&addr.ipv6.sin6_addr, &address->data, addrlen); ++ break; ++ default: ++ DEBUG_printf(("8http_resolve_cb: unknown address family %d", ++ address->proto)); ++ addrlen = 0; ++ } ++ ++ if (addrlen > 0) { ++ error = getnameinfo(&addr.addr, httpAddrLength (&addr), ++ fqdn, sizeof(fqdn), NULL, 0, NI_NAMEREQD); ++ ++ if (!error) + { +- int error = getnameinfo(&(addr->addr.addr), +- httpAddrLength(&(addr->addr)), +- fqdn, sizeof(fqdn), NULL, 0, NI_NAMEREQD); ++ DEBUG_printf(("8http_resolve_cb: Found \"%s\".", fqdn)); + +- if (!error) ++ if ((hostptr = fqdn + strlen(fqdn) - 6) <= fqdn || ++ _cups_strcasecmp(hostptr, ".local")) + { +- DEBUG_printf(("8http_resolve_cb: Found \"%s\".", fqdn)); +- +- if ((hostptr = fqdn + strlen(fqdn) - 6) <= fqdn || +- _cups_strcasecmp(hostptr, ".local")) +- { +- hostTarget = fqdn; +- break; +- } ++ hostTarget = fqdn; + } ++ } else { ++ avahi_address_snprint (fqdn, sizeof (fqdn), address); ++ hostTarget = fqdn; + #ifdef DEBUG +- else +- DEBUG_printf(("8http_resolve_cb: \"%s\" did not resolve: %d", +- httpAddrString(&(addr->addr), fqdn, sizeof(fqdn)), +- error)); ++ DEBUG_printf(("8http_resolve_cb: \"%s\" did not resolve: %d", ++ fqdn, error)); + #endif /* DEBUG */ + } +- +- httpAddrFreeList(addrlist); + } ++ } else { ++ /* ++ * Use the IP address that responded... ++ */ ++ ++ avahi_address_snprint (fqdn, sizeof (fqdn), address); ++ hostTarget = fqdn; + } + + /* diff --git a/hardware/printer/cups/files/fedora/cups-enum-all.patch b/hardware/printer/cups/files/fedora/cups-enum-all.patch new file mode 100644 index 0000000000..0ac39835ea --- /dev/null +++ b/hardware/printer/cups/files/fedora/cups-enum-all.patch @@ -0,0 +1,17 @@ +diff -up cups-1.6.2/cups/dest.c.enum-all cups-1.6.2/cups/dest.c +--- cups-1.6.2/cups/dest.c.enum-all 2013-06-04 10:58:36.169786250 +0100 ++++ cups-1.6.2/cups/dest.c 2013-06-04 10:59:02.147900811 +0100 +@@ -2724,9 +2724,12 @@ cups_dnssd_browse_cb( + break; + + case AVAHI_BROWSER_REMOVE: +- case AVAHI_BROWSER_ALL_FOR_NOW: + case AVAHI_BROWSER_CACHE_EXHAUSTED: + break; ++ ++ case AVAHI_BROWSER_ALL_FOR_NOW: ++ avahi_simple_poll_quit(data->simple_poll); ++ break; + } + } + diff --git a/hardware/printer/cups/files/fedora/cups-final-content-type.patch b/hardware/printer/cups/files/fedora/cups-final-content-type.patch new file mode 100644 index 0000000000..7076e2b475 --- /dev/null +++ b/hardware/printer/cups/files/fedora/cups-final-content-type.patch @@ -0,0 +1,17 @@ +diff -up cups-1.6.4/scheduler/job.c.final-content-type cups-1.6.4/scheduler/job.c +--- cups-1.6.4/scheduler/job.c.final-content-type 2013-09-27 16:58:13.934775402 +0100 ++++ cups-1.6.4/scheduler/job.c 2013-09-27 17:00:57.716549576 +0100 +@@ -692,12 +692,7 @@ cupsdContinueJob(cupsd_job_t *job) /* I + + if (!job->printer->remote) + { +- for (filter = (mime_filter_t *)cupsArrayLast(filters); +- filter && filter->dst; +- filter = (mime_filter_t *)cupsArrayPrev(filters)) +- if (strcmp(filter->dst->super, "printer") || +- strcmp(filter->dst->type, job->printer->name)) +- break; ++ filter = (mime_filter_t *)cupsArrayLast(filters); + + if (filter && filter->dst) + { diff --git a/hardware/printer/cups/files/fedora/cups-res_init.patch b/hardware/printer/cups/files/fedora/cups-res_init.patch new file mode 100644 index 0000000000..3866521d77 --- /dev/null +++ b/hardware/printer/cups/files/fedora/cups-res_init.patch @@ -0,0 +1,26 @@ +diff -up cups-1.7b1/cups/http-addr.c.res_init cups-1.7b1/cups/http-addr.c +--- cups-1.7b1/cups/http-addr.c.res_init 2013-03-20 19:14:10.000000000 +0100 ++++ cups-1.7b1/cups/http-addr.c 2013-04-19 12:01:36.927512159 +0200 +@@ -319,7 +319,8 @@ httpAddrLookup( + + if (error) + { +- if (error == EAI_FAIL) ++ if (error == EAI_FAIL || error == EAI_AGAIN || error == EAI_NODATA || ++ error == EAI_NONAME) + cg->need_res_init = 1; + + return (httpAddrString(addr, name, namelen)); +diff -up cups-1.7b1/cups/http-addrlist.c.res_init cups-1.7b1/cups/http-addrlist.c +--- cups-1.7b1/cups/http-addrlist.c.res_init 2013-04-19 12:01:36.930512119 +0200 ++++ cups-1.7b1/cups/http-addrlist.c 2013-04-19 12:03:13.769229554 +0200 +@@ -581,7 +581,8 @@ httpAddrGetList(const char *hostname, /* + } + else + { +- if (error == EAI_FAIL) ++ if (error == EAI_FAIL || error == EAI_AGAIN || error == EAI_NODATA || ++ error == EAI_NONAME) + cg->need_res_init = 1; + + _cupsSetError(IPP_STATUS_ERROR_INTERNAL, gai_strerror(error), 0); diff --git a/hardware/printer/cups/files/fedora/textonly.ppd b/hardware/printer/cups/files/fedora/textonly.ppd new file mode 100644 index 0000000000..89060bc51e --- /dev/null +++ b/hardware/printer/cups/files/fedora/textonly.ppd @@ -0,0 +1,47 @@ +*PPD-Adobe: "4.3" +*% +*% Text-only printer definition +*% +*FormatVersion: "4.3" +*FileVersion: "1.1" +*LanguageVersion: English +*LanguageEncoding: ISOLatin1 +*PCFileName: "TEXTONLY.PPD" +*Manufacturer: "Generic" +*Product: "(Generic)" +*cupsVersion: 1.0 +*cupsManualCopies: True +*cupsModelNumber: 2 +*cupsFilter: "text/plain 0 textonly" +*ModelName: "Generic text-only printer" +*ShortNickName: "Generic text-only printer" +*NickName: "Generic text-only printer" +*PSVersion: "(2017.000) 0" +*LanguageLevel: "2" +*ColorDevice: False +*DefaultColorSpace: Gray +*FileSystem: False +*Throughput: "8" +*LandscapeOrientation: Plus90 +*VariablePaperSize: False +*TTRasterizer: Type42 +*DefaultImageableArea: Letter +*ImageableArea Letter/US Letter: "18 36 594 756" +*DefaultPaperDimension: Letter +*PaperDimension Letter/Letter: "612 792" +*OpenUI *PageSize/Media Size: PickOne +*OrderDependency: 10 AnySetup *PageSize +*DefaultPageSize: Letter +*PageSize Letter/Letter: "<>setpagedevice" +*CloseUI: *PageSize +*OpenUI *PageRegion: PickOne +*OrderDependency: 10 AnySetup *PageRegion +*DefaultPageRegion: Letter +*PageRegion Letter/Letter: "<>setpagedevice" +*CloseUI: *PageRegion + +*OpenUI *SendFF: Boolean +*DefaultSendFF: False +*SendFF True/True: "" +*SendFF False/False: "" +*CloseUI: *SendFF diff --git a/hardware/printer/cups/files/gentoo/cups-1.6.0-fix-install-perms.patch b/hardware/printer/cups/files/gentoo/cups-1.6.0-fix-install-perms.patch new file mode 100644 index 0000000000..2d7a77c44f --- /dev/null +++ b/hardware/printer/cups/files/gentoo/cups-1.6.0-fix-install-perms.patch @@ -0,0 +1,25 @@ +Index: Makedefs.in +=================================================================== +--- Makedefs.in (Revision 10520) ++++ Makedefs.in (Arbeitskopie) +@@ -40,14 +40,14 @@ + # Installation programs... + # + +-INSTALL_BIN = $(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@ +-INSTALL_COMPDATA = $(INSTALL) -c -m 444 @INSTALL_GZIP@ ++INSTALL_BIN = $(LIBTOOL) $(INSTALL) -c -m 755 @INSTALL_STRIP@ ++INSTALL_COMPDATA = $(INSTALL) -c -m 644 @INSTALL_GZIP@ + INSTALL_CONFIG = $(INSTALL) -c -m @CUPS_CONFIG_FILE_PERM@ +-INSTALL_DATA = $(INSTALL) -c -m 444 ++INSTALL_DATA = $(INSTALL) -c -m 644 + INSTALL_DIR = $(INSTALL) -d +-INSTALL_LIB = $(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@ +-INSTALL_MAN = $(INSTALL) -c -m 444 +-INSTALL_SCRIPT = $(INSTALL) -c -m 555 ++INSTALL_LIB = $(LIBTOOL) $(INSTALL) -c -m 755 @INSTALL_STRIP@ ++INSTALL_MAN = $(INSTALL) -c -m 644 ++INSTALL_SCRIPT = $(INSTALL) -c -m 755 + + # + # Default user, group, and system groups for the scheduler... diff --git a/hardware/printer/cups/files/gentoo/cups-2.0.1-fix-compilation.patch b/hardware/printer/cups/files/gentoo/cups-2.0.1-fix-compilation.patch new file mode 100644 index 0000000000..c805978221 --- /dev/null +++ b/hardware/printer/cups/files/gentoo/cups-2.0.1-fix-compilation.patch @@ -0,0 +1,25 @@ +From 7bb9184b40bea3c4b9f46362642e5d40053a3ae1 Mon Sep 17 00:00:00 2001 +From: Matthias Maier +Date: Wed, 19 Nov 2014 18:44:33 +0100 +Subject: [PATCH] fix compilation + +--- + test/ippserver.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/test/ippserver.c b/test/ippserver.c +index c785e5f..1c64668 100644 +--- a/test/ippserver.c ++++ b/test/ippserver.c +@@ -421,7 +421,7 @@ static int valid_job_attributes(_ipp_client_t *client); + + # ifdef HAVE_DNSSD + static DNSServiceRef DNSSDMaster = NULL; +-# else /* HAVE_AVAHI */ ++# elif defined(HAVE_AVAHI) + static AvahiThreadedPoll *DNSSDMaster = NULL; + static AvahiClient *DNSSDClient = NULL; + # endif /* HAVE_DNSSD */ +-- +2.0.4 + diff --git a/hardware/printer/cups/files/gentoo/cups-2.0.1-fix-linkage-to-gnutls.patch b/hardware/printer/cups/files/gentoo/cups-2.0.1-fix-linkage-to-gnutls.patch new file mode 100644 index 0000000000..9714a742d7 --- /dev/null +++ b/hardware/printer/cups/files/gentoo/cups-2.0.1-fix-linkage-to-gnutls.patch @@ -0,0 +1,24 @@ +--- a/cups/usersys.c ++++ b/cups/usersys.c +@@ -1044,7 +1044,9 @@ + options = 0; + } + ++#ifdef HAVE_SSL + _httpTLSSetOptions(options); ++#endif /* HAVE_SSL */ + } + } + +--- a/scheduler/conf.c ++++ b/scheduler/conf.c +@@ -2975,7 +2975,9 @@ + } + } + ++#ifdef HAVE_SSL + _httpTLSSetOptions(options); ++#endif /* HAVE_SSL */ + } + else if ((!_cups_strcasecmp(line, "Port") || !_cups_strcasecmp(line, "Listen") + #ifdef HAVE_SSL diff --git a/hardware/printer/cups/files/gentoo/cups-2.0.1-rename-systemd-service-files.patch b/hardware/printer/cups/files/gentoo/cups-2.0.1-rename-systemd-service-files.patch new file mode 100644 index 0000000000..825d0de2e6 --- /dev/null +++ b/hardware/printer/cups/files/gentoo/cups-2.0.1-rename-systemd-service-files.patch @@ -0,0 +1,73 @@ +From 33e0d4c8e450fe69b195422c0880aaa96ca9478d Mon Sep 17 00:00:00 2001 +From: Matthias Maier +Date: Wed, 19 Nov 2014 18:00:06 +0100 +Subject: [PATCH] change systemd service files to gentoo naming scheme + +--- + scheduler/Makefile | 10 +++++----- + scheduler/org.cups.cupsd.path.in | 2 +- + scheduler/org.cups.cupsd.service.in | 2 +- + 3 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/scheduler/Makefile b/scheduler/Makefile +index 3e0884a..b354420 100644 +--- a/scheduler/Makefile ++++ b/scheduler/Makefile +@@ -203,11 +203,11 @@ install-data: + if test "x$(SYSTEMD_DIR)" != x; then \ + echo Installing systemd configuration files...; \ + $(INSTALL_DIR) $(BUILDROOT)$(SYSTEMD_DIR); \ +- $(INSTALL_DATA) org.cups.cupsd.path $(BUILDROOT)$(SYSTEMD_DIR); \ +- $(INSTALL_DATA) org.cups.cupsd.service $(BUILDROOT)$(SYSTEMD_DIR); \ +- $(INSTALL_DATA) org.cups.cupsd.socket $(BUILDROOT)$(SYSTEMD_DIR); \ +- $(INSTALL_DATA) org.cups.cups-lpdAT.service $(BUILDROOT)$(SYSTEMD_DIR)/org.cups.cups-lpd@.service; \ +- $(INSTALL_DATA) org.cups.cups-lpd.socket $(BUILDROOT)$(SYSTEMD_DIR); \ ++ $(INSTALL_DATA) org.cups.cupsd.path $(BUILDROOT)$(SYSTEMD_DIR)/cups.path; \ ++ $(INSTALL_DATA) org.cups.cupsd.service $(BUILDROOT)$(SYSTEMD_DIR)/cups.service; \ ++ $(INSTALL_DATA) org.cups.cupsd.socket $(BUILDROOT)$(SYSTEMD_DIR)/cups.socket; \ ++ $(INSTALL_DATA) org.cups.cups-lpdAT.service $(BUILDROOT)$(SYSTEMD_DIR)/cups-lpd@.service; \ ++ $(INSTALL_DATA) org.cups.cups-lpd.socket $(BUILDROOT)$(SYSTEMD_DIR)/cups-lpd.socket; \ + elif test "x$(XINETD)" != x; then \ + echo Installing xinetd configuration file for cups-lpd...; \ + $(INSTALL_DIR) -m 755 $(BUILDROOT)$(XINETD); \ +diff --git a/scheduler/org.cups.cupsd.path.in b/scheduler/org.cups.cupsd.path.in +index 1bccc6f..90c8576 100644 +--- a/scheduler/org.cups.cupsd.path.in ++++ b/scheduler/org.cups.cupsd.path.in +@@ -2,7 +2,7 @@ + Description=CUPS Scheduler + + [Path] +-PathExists=@CUPS_CACHEDIR@/org.cups.cupsd ++PathExists=@CUPS_CACHEDIR@/d* + + [Install] + WantedBy=multi-user.target +diff --git a/scheduler/org.cups.cupsd.service.in b/scheduler/org.cups.cupsd.service.in +index 0a27c76..7a04248 100644 +--- a/scheduler/org.cups.cupsd.service.in ++++ b/scheduler/org.cups.cupsd.service.in +@@ -7,5 +7,5 @@ ExecStart=@sbindir@/cupsd -l + Type=simple + + [Install] +-Also=org.cups.cupsd.socket org.cups.cupsd.path ++Also=cups.socket cups.path + WantedBy=printer.target +diff --git a/scheduler/org.cups.cupsd.socket.in b/scheduler/org.cups.cupsd.socket.in +--- a/scheduler/org.cups.cupsd.socket.in ++++ a/scheduler/org.cups.cupsd.socket.in +@@ -3,6 +3,10 @@ + + [Socket] + ListenStream=@CUPS_DEFAULT_DOMAINSOCKET@ ++ListenStream=[::1]:631 ++ListenStream=127.0.0.1:631 ++BindIPv6Only=ipv6-only ++ReusePort=true + + [Install] + WantedBy=sockets.target +-- +2.0.4 + diff --git a/hardware/printer/cups/files/pisilinux/cups-run.patch b/hardware/printer/cups/files/pisilinux/cups-run.patch new file mode 100644 index 0000000000..dbe6dd3416 --- /dev/null +++ b/hardware/printer/cups/files/pisilinux/cups-run.patch @@ -0,0 +1,48 @@ +diff -Nuar cups-1.6.1.orig/config.h.in cups-1.6.1/config.h.in +--- cups-1.6.1.orig/config.h.in 2012-07-16 21:21:43.000000000 +0300 ++++ cups-1.6.1/config.h.in 2013-03-13 18:46:13.805434622 +0200 +@@ -127,7 +127,7 @@ + #define CUPS_SBINDIR "/usr/sbin" + #define CUPS_SERVERBIN "/usr/lib/cups" + #define CUPS_SERVERROOT "/etc/cups" +-#define CUPS_STATEDIR "/var/run/cups" ++#define CUPS_STATEDIR "/run/cups" + + + /* +diff -Nuar cups-1.6.1.orig/doc/help/security.html cups-1.6.1/doc/help/security.html +--- cups-1.6.1.orig/doc/help/security.html 2011-04-29 00:20:12.000000000 +0300 ++++ cups-1.6.1/doc/help/security.html 2013-03-13 18:45:47.222433880 +0200 +@@ -53,7 +53,7 @@ +
  • Local certificate authentication passes 128-bit + "certificates" that identify an authenticated user. + Certificates are created on-the-fly from random data and +- stored in files under /var/run/cups/certs. ++ stored in files under /run/cups/certs. + They have restricted read permissions: root + + system-group(s) for the root certificate, and lp + lp + for CGI certificates. +diff -Nuar cups-1.6.1.orig/scheduler/org.cups.cupsd.plist cups-1.6.1/scheduler/org.cups.cupsd.plist +--- cups-1.6.1.orig/scheduler/org.cups.cupsd.plist 2011-04-20 21:15:44.000000000 +0300 ++++ cups-1.6.1/scheduler/org.cups.cupsd.plist 2013-03-13 18:44:26.286431623 +0200 +@@ -54,7 +54,7 @@ + SockPathMode + 49663 + SockPathName +- /private/var/run/cupsd ++ /run/cupsd + + + +diff -Nuar cups-1.6.1.orig/xcode/config.h cups-1.6.1/xcode/config.h +--- cups-1.6.1.orig/xcode/config.h 2012-07-16 21:21:43.000000000 +0300 ++++ cups-1.6.1/xcode/config.h 2013-03-13 18:43:13.618429596 +0200 +@@ -100,7 +100,7 @@ + * Do we have domain socket support, and if so what is the default one? + */ + +-#define CUPS_DEFAULT_DOMAINSOCKET "/private/var/run/cupsd" ++#define CUPS_DEFAULT_DOMAINSOCKET "/run/cupsd" + + + /* diff --git a/hardware/printer/cups/files/pisilinux/lib64.patch b/hardware/printer/cups/files/pisilinux/lib64.patch new file mode 100644 index 0000000000..bc7b4bae6f --- /dev/null +++ b/hardware/printer/cups/files/pisilinux/lib64.patch @@ -0,0 +1,37 @@ +--- cups-config.in~ 2014-01-18 13:56:12.423297761 +0100 ++++ cups-config.in 2014-01-18 13:56:59.459964275 +0100 +@@ -50,7 +50,7 @@ else + CFLAGS="$CFLAGS -I$includedir" + fi + +- if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64; then ++ if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib; then + LDFLAGS="$LDFLAGS -L$libdir" + fi + fi +--- config-scripts/cups-directories.m4~ 2014-01-18 13:56:23.529964393 +0100 ++++ config-scripts/cups-directories.m4 2014-01-18 13:57:40.706630807 +0100 +@@ -103,8 +103,8 @@ dnl Fix "libdir" variable... + if test "$libdir" = "\${exec_prefix}/lib"; then + case "$uname" in + Linux*) +- if test -d /usr/lib64 -a ! -d /usr/lib64/fakeroot; then +- libdir="$exec_prefix/lib64" ++ if test -d /usr/lib -a ! -d /usr/lib/fakeroot; then ++ libdir="$exec_prefix/lib" + fi + ;; + HP-UX*) +--- configure~ 2014-01-18 13:56:32.346631030 +0100 ++++ configure 2014-01-18 13:57:12.076630898 +0100 +@@ -5893,8 +5893,8 @@ fi + if test "$libdir" = "\${exec_prefix}/lib"; then + case "$uname" in + Linux*) +- if test -d /usr/lib64 -a ! -d /usr/lib64/fakeroot; then +- libdir="$exec_prefix/lib64" ++ if test -d /usr/lib -a ! -d /usr/lib/fakeroot; then ++ libdir="$exec_prefix/lib" + fi + ;; + HP-UX*) diff --git a/hardware/printer/cups/files/pisilinux/nostrip.patch b/hardware/printer/cups/files/pisilinux/nostrip.patch new file mode 100644 index 0000000000..ab38c25d7e --- /dev/null +++ b/hardware/printer/cups/files/pisilinux/nostrip.patch @@ -0,0 +1,26 @@ +Index: cups-1.4.4/config-scripts/cups-compiler.m4 +=================================================================== +--- cups-1.4.4.orig/config-scripts/cups-compiler.m4 ++++ cups-1.4.4/config-scripts/cups-compiler.m4 +@@ -30,7 +30,7 @@ dnl For debugging, keep symbols, otherwi + if test x$enable_debug = xyes; then + OPTIM="-g" + else +- INSTALL_STRIP="-s" ++ INSTALL_STRIP="" + fi + + dnl Debug printfs can slow things down, so provide a separate option for that +Index: cups-1.4.4/configure +=================================================================== +--- cups-1.4.4.orig/configure ++++ cups-1.4.4/configure +@@ -10978,7 +10978,7 @@ fi + if test x$enable_debug = xyes; then + OPTIM="-g" + else +- INSTALL_STRIP="-s" ++ INSTALL_STRIP="" + fi + + if test x$enable_debug_printfs = xyes; then diff --git a/hardware/printer/cups/files/pisilinux/statedir.patch b/hardware/printer/cups/files/pisilinux/statedir.patch new file mode 100644 index 0000000000..d20057e74c --- /dev/null +++ b/hardware/printer/cups/files/pisilinux/statedir.patch @@ -0,0 +1,22 @@ +--- config-scripts/cups-network.m4~ 2014-01-18 14:05:51.353295869 +0100 ++++ config-scripts/cups-network.m4 2014-01-18 14:07:25.179962227 +0100 +@@ -45,7 +45,7 @@ if test x$enable_domainsocket != xno -a + case "$uname" in + Darwin*) + # Darwin and MaxOS X do their own thing... +- CUPS_DEFAULT_DOMAINSOCKET="$localstatedir/run/cupsd" ++ CUPS_DEFAULT_DOMAINSOCKET="/run/cupsd" + ;; + *) + # All others use FHS standard... +--- config-scripts/cups-directories.m4~ 2014-01-18 14:05:59.609962507 +0100 ++++ config-scripts/cups-directories.m4 2014-01-18 14:07:13.516628933 +0100 +@@ -420,7 +420,7 @@ AC_ARG_WITH(rundir, [ --with-rundir + ;; + *) + # All others +- CUPS_STATEDIR="$localstatedir/run/cups" ++ CUPS_STATEDIR="/run/cups" + ;; + esac]) + AC_DEFINE_UNQUOTED(CUPS_STATEDIR, "$CUPS_STATEDIR") diff --git a/hardware/printer/cups/files/pld-linux/cups-avahi-address.patch b/hardware/printer/cups/files/pld-linux/cups-avahi-address.patch new file mode 100644 index 0000000000..1b40df957c --- /dev/null +++ b/hardware/printer/cups/files/pld-linux/cups-avahi-address.patch @@ -0,0 +1,95 @@ +diff -up cups-2.0rc1/cups/http-support.c.avahi-address cups-2.0rc1/cups/http-support.c +--- cups-2.0rc1/cups/http-support.c.avahi-address 2014-08-28 17:37:22.000000000 +0200 ++++ cups-2.0rc1/cups/http-support.c 2014-09-12 15:31:45.062950696 +0200 +@@ -2342,7 +2342,7 @@ http_resolve_cb( + const char *type, /* I - Registration type */ + const char *domain, /* I - Domain (unused) */ + const char *hostTarget, /* I - Hostname */ +- const AvahiAddress *address, /* I - Address (unused) */ ++ const AvahiAddress *address, /* I - Address */ + uint16_t port, /* I - Port number */ + AvahiStringList *txt, /* I - TXT record */ + AvahiLookupResultFlags flags, /* I - Lookup flags (unused) */ +@@ -2495,39 +2495,62 @@ http_resolve_cb( + * getting the IP address of the .local name and then do reverse-lookups... + */ + +- http_addrlist_t *addrlist, /* List of addresses */ +- *addr; /* Current address */ ++ http_addr_t addr; ++ size_t addrlen; ++ int error; + + DEBUG_printf(("8http_resolve_cb: Looking up \"%s\".", hostTarget)); + +- snprintf(fqdn, sizeof(fqdn), "%d", ntohs(port)); +- if ((addrlist = httpAddrGetList(hostTarget, AF_UNSPEC, fqdn)) != NULL) ++ switch (address->proto) + { +- for (addr = addrlist; addr; addr = addr->next) ++ case AVAHI_PROTO_INET: ++ addr.ipv4.sin_family = AF_INET; ++ addrlen = sizeof (addr.ipv4.sin_addr); ++ memcpy (&addr.ipv4.sin_addr, &address->data, addrlen); ++ break; ++ case AVAHI_PROTO_INET6: ++ addr.ipv6.sin6_family = AF_INET6; ++ addrlen = sizeof (addr.ipv6.sin6_addr); ++ memcpy (&addr.ipv6.sin6_addr, &address->data, addrlen); ++ break; ++ default: ++ DEBUG_printf(("8http_resolve_cb: unknown address family %d", ++ address->proto)); ++ addrlen = 0; ++ } ++ ++ if (addrlen > 0) { ++ error = getnameinfo(&addr.addr, httpAddrLength (&addr), ++ fqdn, sizeof(fqdn), NULL, 0, NI_NAMEREQD); ++ ++ if (!error) + { +- int error = getnameinfo(&(addr->addr.addr), (socklen_t)httpAddrLength(&(addr->addr)), fqdn, sizeof(fqdn), NULL, 0, NI_NAMEREQD); ++ DEBUG_printf(("8http_resolve_cb: Found \"%s\".", fqdn)); + +- if (!error) +- { +- DEBUG_printf(("8http_resolve_cb: Found \"%s\".", fqdn)); ++ if ((hostptr = fqdn + strlen(fqdn) - 6) <= fqdn || ++ _cups_strcasecmp(hostptr, ".local")) + +- if ((hostptr = fqdn + strlen(fqdn) - 6) <= fqdn || +- _cups_strcasecmp(hostptr, ".local")) +- { +- hostTarget = fqdn; +- break; +- } ++ { ++ hostTarget = fqdn; + } ++ } else { ++ avahi_address_snprint (fqdn, sizeof (fqdn), address); ++ hostTarget = fqdn; ++ + #ifdef DEBUG +- else +- DEBUG_printf(("8http_resolve_cb: \"%s\" did not resolve: %d", +- httpAddrString(&(addr->addr), fqdn, sizeof(fqdn)), +- error)); ++ DEBUG_printf(("8http_resolve_cb: \"%s\" did not resolve: %d", ++ fqdn, error)); + #endif /* DEBUG */ + } + +- httpAddrFreeList(addrlist); + } ++ } else { ++ /* ++ * Use the IP address that responded... ++ */ ++ ++ avahi_address_snprint (fqdn, sizeof (fqdn), address); ++ hostTarget = fqdn; + } + + /* diff --git a/hardware/printer/cups/files/pld-linux/cups-avahi-no-threaded.patch b/hardware/printer/cups/files/pld-linux/cups-avahi-no-threaded.patch new file mode 100644 index 0000000000..9dd6cc4171 --- /dev/null +++ b/hardware/printer/cups/files/pld-linux/cups-avahi-no-threaded.patch @@ -0,0 +1,1021 @@ +diff -up cups-2.0rc1/scheduler/avahi.c.avahi-no-threaded cups-2.0rc1/scheduler/avahi.c +--- cups-2.0rc1/scheduler/avahi.c.avahi-no-threaded 2014-09-12 15:45:28.772280006 +0200 ++++ cups-2.0rc1/scheduler/avahi.c 2014-09-12 15:45:28.772280006 +0200 +@@ -0,0 +1,441 @@ ++/* ++ * "$Id$" ++ * ++ * Avahi poll implementation for the CUPS scheduler. ++ * ++ * Copyright (C) 2010, 2011 Red Hat, Inc. ++ * Authors: ++ * Tim Waugh ++ * ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions ++ * are met: ++ * ++ * Redistributions of source code must retain the above copyright ++ * notice, this list of conditions and the following disclaimer. ++ * ++ * Redistributions in binary form must reproduce the above copyright ++ * notice, this list of conditions and the following disclaimer in the ++ * documentation and/or other materials provided with the distribution. ++ * ++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ++ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT ++ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS ++ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE ++ * COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, ++ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES ++ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR ++ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) ++ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, ++ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ++ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED ++ * OF THE POSSIBILITY OF SUCH DAMAGE. ++ * ++ * Contents: ++ * ++ * watch_read_cb - Read callback for file descriptor ++ * watch_write_cb - Write callback for file descriptor ++ * watched_fd_add_select() - Call cupsdAddSelect() as needed ++ * watch_new() - Create a new file descriptor watch ++ * watch_free() - Free a file descriptor watch ++ * watch_update() - Update watched events for a file descriptor ++ * watch_get_events() - Get events that happened for a file descriptor ++ * timeout_cb() - Run a timed Avahi callback ++ * timeout_new() - Set a wakeup time ++ * timeout_update() - Update the expiration time for a timeout ++ * timeout_free() - Free a timeout ++ * compare_watched_fds() - Compare watched file descriptors for array sorting ++ * avahi_cups_poll_new() - Create a new Avahi main loop object for CUPS ++ * avahi_cups_poll_free() - Free an Avahi main loop object for CUPS ++ * avahi_cups_poll_get() - Get the abstract poll API structure ++ */ ++ ++#include ++ ++#ifdef HAVE_AVAHI /* Applies to entire file... */ ++ ++/* ++ * Include necessary headers... ++ */ ++ ++#include "cupsd.h" ++ ++#if defined(HAVE_MALLOC_H) && defined(HAVE_MALLINFO) ++# include ++#endif /* HAVE_MALLOC_H && HAVE_MALLINFO */ ++ ++#ifdef HAVE_AVAHI ++# include ++#endif /* HAVE_AVAHI */ ++ ++ ++typedef struct ++{ ++ AvahiCupsPoll *cups_poll; ++ ++ int fd; ++ AvahiWatchEvent occurred; ++ cups_array_t *watches; ++} cupsd_watched_fd_t; ++ ++struct AvahiWatch ++{ ++ cupsd_watched_fd_t *watched_fd; ++ ++ AvahiWatchEvent events; ++ AvahiWatchCallback callback; ++ void *userdata; ++}; ++ ++struct AvahiTimeout ++{ ++ AvahiCupsPoll *cups_poll; ++ AvahiTimeoutCallback callback; ++ void *userdata; ++ cupsd_timeout_t *cupsd_timeout; ++}; ++ ++/* ++ * Local functions... ++ */ ++ ++static AvahiWatch * watch_new(const AvahiPoll *api, ++ int fd, ++ AvahiWatchEvent events, ++ AvahiWatchCallback callback, ++ void *userdata); ++static void watch_free(AvahiWatch *watch); ++static void watch_update(AvahiWatch *watch, ++ AvahiWatchEvent events); ++static AvahiWatchEvent watch_get_events(AvahiWatch *watch); ++ ++ ++/* ++ * 'watch_read_cb' - Read callback for file descriptor ++ */ ++ ++static void ++watch_read_cb (void *userdata) ++{ ++ AvahiWatch *watch; ++ cupsd_watched_fd_t *watched_fd = userdata; ++ watched_fd->occurred |= AVAHI_WATCH_IN; ++ for (watch = (AvahiWatch *)cupsArrayFirst(watched_fd->watches); ++ watch; ++ watch = (AvahiWatch *)cupsArrayNext(watched_fd->watches)) ++ { ++ if (watch->events & watched_fd->occurred) ++ { ++ (watch->callback) (watch, watched_fd->fd, ++ AVAHI_WATCH_IN, watch->userdata); ++ watched_fd->occurred &= ~AVAHI_WATCH_IN; ++ break; ++ } ++ } ++} ++ ++ ++/* ++ * 'watch_write_cb' - Write callback for file descriptor ++ */ ++ ++static void ++watch_write_cb (void *userdata) ++{ ++ AvahiWatch *watch; ++ cupsd_watched_fd_t *watched_fd = userdata; ++ watched_fd->occurred |= AVAHI_WATCH_OUT; ++ for (watch = (AvahiWatch *)cupsArrayFirst(watched_fd->watches); ++ watch; ++ watch = (AvahiWatch *)cupsArrayNext(watched_fd->watches)) ++ { ++ if (watch->events & watched_fd->occurred) ++ { ++ (watch->callback) (watch, watched_fd->fd, ++ AVAHI_WATCH_OUT, watch->userdata); ++ watched_fd->occurred &= ~AVAHI_WATCH_OUT; ++ break; ++ } ++ } ++} ++ ++ ++/* ++ * 'watched_fd_add_select' - Call cupsdAddSelect() as needed ++ */ ++ ++static int /* O - Watches? */ ++watched_fd_add_select (cupsd_watched_fd_t *watched_fd) ++{ ++ AvahiWatch *watch; ++ cupsd_selfunc_t read_cb = NULL, write_cb = NULL; ++ int any_watches = 0; ++ ++ for (watch = (AvahiWatch *)cupsArrayFirst(watched_fd->watches); ++ watch; ++ watch = (AvahiWatch *)cupsArrayNext(watched_fd->watches)) ++ { ++ any_watches = 1; ++ if (watch->events & (AVAHI_WATCH_IN | ++ AVAHI_WATCH_ERR | ++ AVAHI_WATCH_HUP)) ++ { ++ read_cb = (cupsd_selfunc_t)watch_read_cb; ++ if (write_cb != NULL) ++ break; ++ } ++ ++ if (watch->events & AVAHI_WATCH_OUT) ++ { ++ write_cb = (cupsd_selfunc_t)watch_write_cb; ++ if (read_cb != NULL) ++ break; ++ } ++ } ++ ++ if (read_cb || write_cb) ++ cupsdAddSelect (watched_fd->fd, read_cb, write_cb, watched_fd); ++ else ++ cupsdRemoveSelect (watched_fd->fd); ++ ++ return (any_watches); ++} ++ ++/* ++ * 'watch_new' - Create a new file descriptor watch ++ */ ++ ++static AvahiWatch * ++watch_new (const AvahiPoll *api, ++ int fd, ++ AvahiWatchEvent events, ++ AvahiWatchCallback callback, ++ void *userdata) ++{ ++ cupsd_watched_fd_t key, *watched_fd; ++ AvahiCupsPoll *cups_poll = api->userdata; ++ AvahiWatch *watch = malloc(sizeof(AvahiWatch)); ++ if (watch == NULL) ++ return (NULL); ++ ++ watch->events = events; ++ watch->callback = callback; ++ watch->userdata = userdata; ++ ++ key.fd = fd; ++ watched_fd = cupsArrayFind (cups_poll->watched_fds, &key); ++ if (watched_fd == NULL) ++ { ++ watched_fd = malloc(sizeof(cupsd_watched_fd_t)); ++ if (watched_fd == NULL) ++ { ++ free (watch); ++ return (NULL); ++ } ++ ++ watched_fd->fd = fd; ++ watched_fd->occurred = 0; ++ watched_fd->cups_poll = cups_poll; ++ watched_fd->watches = cupsArrayNew (NULL, NULL); ++ cupsArrayAdd (cups_poll->watched_fds, watched_fd); ++ } ++ ++ watch->watched_fd = watched_fd; ++ cupsArrayAdd(watched_fd->watches, watch); ++ watched_fd_add_select (watched_fd); ++ return (watch); ++} ++ ++ ++/* ++ * 'watch_free' - Free a file descriptor watch ++ */ ++ ++static void ++watch_free (AvahiWatch *watch) ++{ ++ cupsd_watched_fd_t *watched_fd = watch->watched_fd; ++ AvahiCupsPoll *cups_poll = watched_fd->cups_poll; ++ ++ cupsArrayRemove (watched_fd->watches, watch); ++ free (watch); ++ ++ if (!watched_fd_add_select (watched_fd)) ++ { ++ /* No more watches */ ++ cupsArrayRemove (cups_poll->watched_fds, watched_fd); ++ free (watched_fd); ++ } ++} ++ ++ ++/* ++ * 'watch_update' - Update watched events for a file descriptor ++ */ ++ ++static void ++watch_update (AvahiWatch *watch, ++ AvahiWatchEvent events) ++{ ++ watch->events = events; ++ watched_fd_add_select (watch->watched_fd); ++} ++ ++ ++/* ++ * 'watch_get_events' - Get events that happened for a file descriptor ++ */ ++ ++static AvahiWatchEvent ++watch_get_events (AvahiWatch *watch) ++{ ++ return (watch->watched_fd->occurred); ++} ++ ++ ++/* ++ * 'timeout_cb()' - Run a timed Avahi callback ++ */ ++ ++static void ++timeout_cb (cupsd_timeout_t *cupsd_timeout, void *userdata) ++{ ++ AvahiTimeout *timeout = userdata; ++ (timeout->callback) (timeout, timeout->userdata); ++} ++ ++ ++/* ++ * 'timeout_new' - Set a wakeup time ++ */ ++ ++static AvahiTimeout * ++timeout_new (const AvahiPoll *api, ++ const struct timeval *tv, ++ AvahiTimeoutCallback callback, ++ void *userdata) ++{ ++ AvahiTimeout *timeout; ++ AvahiCupsPoll *cups_poll = api->userdata; ++ ++ timeout = malloc(sizeof(AvahiTimeout)); ++ if (timeout == NULL) ++ return (NULL); ++ ++ timeout->cups_poll = cups_poll; ++ timeout->callback = callback; ++ timeout->userdata = userdata; ++ timeout->cupsd_timeout = cupsdAddTimeout (tv, ++ (cupsd_timeoutfunc_t)timeout_cb, ++ timeout); ++ cupsArrayAdd (cups_poll->timeouts, timeout); ++ return (timeout); ++} ++ ++ ++/* ++ * 'timeout_update' - Update the expiration time for a timeout ++ */ ++ ++static void ++timeout_update (AvahiTimeout *timeout, ++ const struct timeval *tv) ++{ ++ cupsdUpdateTimeout (timeout->cupsd_timeout, tv); ++} ++ ++ ++/* ++ * ' timeout_free' - Free a timeout ++ */ ++ ++static void ++timeout_free (AvahiTimeout *timeout) ++{ ++ cupsArrayRemove (timeout->cups_poll->timeouts, timeout); ++ cupsdRemoveTimeout (timeout->cupsd_timeout); ++ free (timeout); ++} ++ ++ ++/* ++ * 'compare_watched_fds' - Compare watched file descriptors for array sorting ++ */ ++static int ++compare_watched_fds(cupsd_watched_fd_t *p0, ++ cupsd_watched_fd_t *p1) ++{ ++ /* ++ * Compare by fd (no two elements have the same fd) ++ */ ++ ++ if (p0->fd == p1->fd) ++ return 0; ++ ++ return (p0->fd < p1->fd ? -1 : 1); ++} ++ ++ ++/* ++ * 'avahi_cups_poll_new' - Create a new Avahi main loop object for CUPS ++ */ ++ ++AvahiCupsPoll * ++avahi_cups_poll_new (void) ++{ ++ AvahiCupsPoll *cups_poll = malloc(sizeof(AvahiCupsPoll)); ++ if (cups_poll == NULL) ++ return (NULL); ++ ++ cups_poll->watched_fds = cupsArrayNew ((cups_array_func_t)compare_watched_fds, ++ NULL); ++ cups_poll->timeouts = cupsArrayNew (NULL, NULL); ++ ++ cups_poll->api.userdata = cups_poll; ++ cups_poll->api.watch_new = watch_new; ++ cups_poll->api.watch_free = watch_free; ++ cups_poll->api.watch_update = watch_update; ++ cups_poll->api.watch_get_events = watch_get_events; ++ ++ cups_poll->api.timeout_new = timeout_new; ++ cups_poll->api.timeout_update = timeout_update; ++ cups_poll->api.timeout_free = timeout_free; ++ ++ return (cups_poll); ++} ++ ++ ++/* ++ * 'avahi_cups_poll_free' - Free an Avahi main loop object for CUPS ++ */ ++void ++avahi_cups_poll_free (AvahiCupsPoll *cups_poll) ++{ ++ cupsd_watched_fd_t *watched_fd; ++ ++ for (watched_fd = (cupsd_watched_fd_t*)cupsArrayFirst(cups_poll->watched_fds); ++ watched_fd; ++ watched_fd = (cupsd_watched_fd_t*)cupsArrayNext(cups_poll->watched_fds)) ++ cupsArrayClear (watched_fd->watches); ++ ++ cupsArrayClear (cups_poll->watched_fds); ++ cupsArrayClear (cups_poll->timeouts); ++} ++ ++ ++/* ++ * 'avahi_cups_poll_get' - Get the abstract poll API structure ++ */ ++ ++const AvahiPoll * ++avahi_cups_poll_get (AvahiCupsPoll *cups_poll) ++{ ++ return (&cups_poll->api); ++} ++ ++ ++#endif /* HAVE_AVAHI ... from top of file */ ++ ++/* ++ * End of "$Id$". ++ */ +diff -up cups-2.0rc1/scheduler/avahi.h.avahi-no-threaded cups-2.0rc1/scheduler/avahi.h +--- cups-2.0rc1/scheduler/avahi.h.avahi-no-threaded 2014-09-12 15:45:28.772280006 +0200 ++++ cups-2.0rc1/scheduler/avahi.h 2014-09-12 15:45:28.772280006 +0200 +@@ -0,0 +1,69 @@ ++/* ++ * "$Id$" ++ * ++ * Avahi poll implementation for the CUPS scheduler. ++ * ++ * Copyright (C) 2010, 2011 Red Hat, Inc. ++ * Authors: ++ * Tim Waugh ++ * ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions ++ * are met: ++ * ++ * Redistributions of source code must retain the above copyright ++ * notice, this list of conditions and the following disclaimer. ++ * ++ * Redistributions in binary form must reproduce the above copyright ++ * notice, this list of conditions and the following disclaimer in the ++ * documentation and/or other materials provided with the distribution. ++ * ++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ++ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT ++ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS ++ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE ++ * COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, ++ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES ++ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR ++ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) ++ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, ++ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ++ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED ++ * OF THE POSSIBILITY OF SUCH DAMAGE. ++ */ ++ ++#include ++ ++#ifdef HAVE_AVAHI ++# include ++# include ++#endif /* HAVE_AVAHI */ ++ ++#ifdef HAVE_AUTHORIZATION_H ++# include ++#endif /* HAVE_AUTHORIZATION_H */ ++ ++ ++#ifdef HAVE_AVAHI ++typedef struct ++{ ++ AvahiPoll api; ++ cups_array_t *watched_fds; ++ cups_array_t *timeouts; ++} AvahiCupsPoll; ++#endif /* HAVE_AVAHI */ ++ ++/* ++ * Prototypes... ++ */ ++ ++#ifdef HAVE_AVAHI ++extern AvahiCupsPoll * avahi_cups_poll_new(void); ++extern void avahi_cups_poll_free(AvahiCupsPoll *cups_poll); ++extern const AvahiPoll *avahi_cups_poll_get(AvahiCupsPoll *cups_poll); ++#endif /* HAVE_AVAHI */ ++ ++ ++/* ++ * End of "$Id$". ++ */ +diff -up cups-2.0rc1/scheduler/cupsd.h.avahi-no-threaded cups-2.0rc1/scheduler/cupsd.h +--- cups-2.0rc1/scheduler/cupsd.h.avahi-no-threaded 2014-03-21 17:42:53.000000000 +0100 ++++ cups-2.0rc1/scheduler/cupsd.h 2014-09-12 15:47:02.886945551 +0200 +@@ -119,6 +119,7 @@ extern const char *cups_hstrerror(int); + #include "colorman.h" + #include "conf.h" + #include "banners.h" ++#include "avahi.h" + #include "dirsvc.h" + #include "network.h" + #include "subscriptions.h" +@@ -139,6 +140,15 @@ extern const char *cups_hstrerror(int); + + typedef void (*cupsd_selfunc_t)(void *data); + ++#ifdef HAVE_AVAHI ++/* ++ * Timeout callback function type... ++ */ ++ ++typedef struct _cupsd_timeout_s cupsd_timeout_t; ++typedef void (*cupsd_timeoutfunc_t)(cupsd_timeout_t *timeout, void *data); ++#endif /* HAVE_AVAHI */ ++ + + /* + * Globals... +@@ -163,6 +173,10 @@ VAR int OnDemand VALUE(0); + /* Launched on demand */ + #endif /* HAVE_LAUNCHD || HAVE_SYSTEMD */ + ++#ifdef HAVE_AVAHI ++VAR cups_array_t *Timeouts; /* Timed callbacks for main loop */ ++#endif /* HAVE_AVAHI */ ++ + + /* + * Prototypes... +@@ -226,6 +240,17 @@ extern void cupsdStopSelect(void); + extern void cupsdStartServer(void); + extern void cupsdStopServer(void); + ++#ifdef HAVE_AVAHI ++extern void cupsdInitTimeouts(void); ++extern cupsd_timeout_t *cupsdAddTimeout (const struct timeval *tv, ++ cupsd_timeoutfunc_t cb, ++ void *data); ++extern cupsd_timeout_t *cupsdNextTimeout (long *delay); ++extern void cupsdRunTimeout (cupsd_timeout_t *timeout); ++extern void cupsdUpdateTimeout (cupsd_timeout_t *timeout, ++ const struct timeval *tv); ++extern void cupsdRemoveTimeout (cupsd_timeout_t *timeout); ++#endif /* HAVE_AVAHI */ + + /* + * End of "$Id: cupsd.h 11717 2014-03-21 16:42:53Z msweet $". +diff -up cups-2.0rc1/scheduler/dirsvc.c.avahi-no-threaded cups-2.0rc1/scheduler/dirsvc.c +--- cups-2.0rc1/scheduler/dirsvc.c.avahi-no-threaded 2014-05-09 22:57:11.000000000 +0200 ++++ cups-2.0rc1/scheduler/dirsvc.c 2014-09-12 15:45:28.773279992 +0200 +@@ -195,7 +195,7 @@ cupsdStartBrowsing(void) + cupsdUpdateDNSSDName(); + + # else /* HAVE_AVAHI */ +- if ((DNSSDMaster = avahi_threaded_poll_new()) == NULL) ++ if ((DNSSDMaster = avahi_cups_poll_new()) == NULL) + { + cupsdLogMessage(CUPSD_LOG_ERROR, "Unable to create DNS-SD thread."); + +@@ -206,7 +206,7 @@ cupsdStartBrowsing(void) + { + int error; /* Error code, if any */ + +- DNSSDClient = avahi_client_new(avahi_threaded_poll_get(DNSSDMaster), AVAHI_CLIENT_NO_FAIL, dnssdClientCallback, NULL, &error); ++ DNSSDClient = avahi_client_new(avahi_cups_poll_get(DNSSDMaster), AVAHI_CLIENT_NO_FAIL, dnssdClientCallback, NULL, &error); + + if (DNSSDClient == NULL) + { +@@ -217,11 +217,9 @@ cupsdStartBrowsing(void) + if (FatalErrors & CUPSD_FATAL_BROWSE) + cupsdEndProcess(getpid(), 0); + +- avahi_threaded_poll_free(DNSSDMaster); ++ avahi_cups_poll_free(DNSSDMaster); + DNSSDMaster = NULL; + } +- else +- avahi_threaded_poll_start(DNSSDMaster); + } + # endif /* HAVE_DNSSD */ + } +@@ -608,7 +606,7 @@ dnssdClientCallback( + * Renew Avahi client... + */ + +- DNSSDClient = avahi_client_new(avahi_threaded_poll_get(DNSSDMaster), AVAHI_CLIENT_NO_FAIL, dnssdClientCallback, NULL, &error); ++ DNSSDClient = avahi_client_new(avahi_cups_poll_get(DNSSDMaster), AVAHI_CLIENT_NO_FAIL, dnssdClientCallback, NULL, &error); + + if (!DNSSDClient) + { +@@ -672,13 +670,7 @@ dnssdDeregisterInstance( + DNSServiceRefDeallocate(*srv); + + # else /* HAVE_AVAHI */ +- if (!from_callback) +- avahi_threaded_poll_lock(DNSSDMaster); +- + avahi_entry_group_free(*srv); +- +- if (!from_callback) +- avahi_threaded_poll_unlock(DNSSDMaster); + # endif /* HAVE_DNSSD */ + + *srv = NULL; +@@ -999,16 +991,10 @@ dnssdRegisterInstance( + (void)commit; + + # else /* HAVE_AVAHI */ +- if (!from_callback) +- avahi_threaded_poll_lock(DNSSDMaster); +- + if (!*srv) + *srv = avahi_entry_group_new(DNSSDClient, dnssdRegisterCallback, NULL); + if (!*srv) + { +- if (!from_callback) +- avahi_threaded_poll_unlock(DNSSDMaster); +- + cupsdLogMessage(CUPSD_LOG_WARN, "DNS-SD registration of \"%s\" failed: %s", + name, dnssdErrorString(avahi_client_errno(DNSSDClient))); + return (0); +@@ -1123,9 +1109,6 @@ dnssdRegisterInstance( + cupsdLogMessage(CUPSD_LOG_DEBUG, "DNS-SD commit of \"%s\" failed.", + name); + } +- +- if (!from_callback) +- avahi_threaded_poll_unlock(DNSSDMaster); + # endif /* HAVE_DNSSD */ + + if (error) +@@ -1296,12 +1279,10 @@ dnssdStop(void) + DNSSDMaster = NULL; + + # else /* HAVE_AVAHI */ +- avahi_threaded_poll_stop(DNSSDMaster); +- + avahi_client_free(DNSSDClient); + DNSSDClient = NULL; + +- avahi_threaded_poll_free(DNSSDMaster); ++ avahi_cups_poll_free(DNSSDMaster); + DNSSDMaster = NULL; + # endif /* HAVE_DNSSD */ + +diff -up cups-2.0rc1/scheduler/dirsvc.h.avahi-no-threaded cups-2.0rc1/scheduler/dirsvc.h +--- cups-2.0rc1/scheduler/dirsvc.h.avahi-no-threaded 2013-05-29 13:51:34.000000000 +0200 ++++ cups-2.0rc1/scheduler/dirsvc.h 2014-09-12 15:45:28.773279992 +0200 +@@ -51,7 +51,7 @@ VAR cups_array_t *DNSSDPrinters VALUE(NU + VAR DNSServiceRef DNSSDMaster VALUE(NULL); + /* Master DNS-SD service reference */ + # else /* HAVE_AVAHI */ +-VAR AvahiThreadedPoll *DNSSDMaster VALUE(NULL); ++VAR AvahiCupsPoll *DNSSDMaster VALUE(NULL); + /* Master polling interface for Avahi */ + VAR AvahiClient *DNSSDClient VALUE(NULL); + /* Client information */ +diff -up cups-2.0rc1/scheduler/main.c.avahi-no-threaded cups-2.0rc1/scheduler/main.c +--- cups-2.0rc1/scheduler/main.c.avahi-no-threaded 2014-09-12 15:45:28.736280516 +0200 ++++ cups-2.0rc1/scheduler/main.c 2014-09-12 15:47:43.433370643 +0200 +@@ -127,6 +127,10 @@ main(int argc, /* I - Number of comm + int service_idle_exit; + /* Idle exit on select timeout? */ + #endif /* HAVE_LAUNCHD || HAVE_SYSTEMD */ ++#ifdef HAVE_AVAHI ++ cupsd_timeout_t *tmo; /* Next scheduled timed callback */ ++ long tmo_delay; /* Time before it must be called */ ++#endif /* HAVE_AVAHI */ + + + #ifdef HAVE_GETEUID +@@ -569,6 +573,14 @@ main(int argc, /* I - Number of comm + + httpInitialize(); + ++#ifdef HAVE_AVAHI ++ /* ++ * Initialize timed callback structures. ++ */ ++ ++ cupsdInitTimeouts(); ++#endif /* HAVE_AVAHI */ ++ + cupsdStartServer(); + + /* +@@ -871,6 +883,16 @@ main(int argc, /* I - Number of comm + } + #endif /* __APPLE__ */ + ++#ifdef HAVE_AVAHI ++ /* ++ * If a timed callback is due, run it. ++ */ ++ ++ tmo = cupsdNextTimeout (&tmo_delay); ++ if (tmo && tmo_delay == 0) ++ cupsdRunTimeout (tmo); ++#endif /* HAVE_AVAHI */ ++ + #ifndef __APPLE__ + /* + * Update the network interfaces once a minute... +@@ -1562,6 +1584,10 @@ select_timeout(int fds) /* I - Number + cupsd_job_t *job; /* Job information */ + cupsd_subscription_t *sub; /* Subscription information */ + const char *why; /* Debugging aid */ ++#ifdef HAVE_AVAHI ++ cupsd_timeout_t *tmo; /* Timed callback */ ++ long tmo_delay; /* Seconds before calling it */ ++#endif /* HAVE_AVAHI */ + + + cupsdLogMessage(CUPSD_LOG_DEBUG2, "select_timeout: JobHistoryUpdate=%ld", +@@ -1607,6 +1633,19 @@ select_timeout(int fds) /* I - Number + } + #endif /* __APPLE__ */ + ++#ifdef HAVE_AVAHI ++ /* ++ * See if there are any scheduled timed callbacks to run. ++ */ ++ ++ if ((tmo = cupsdNextTimeout(&tmo_delay)) != NULL && ++ (now + tmo_delay) < timeout) ++ { ++ timeout = tmo_delay; ++ why = "run a timed callback"; ++ } ++#endif /* HAVE_AVAHI */ ++ + /* + * Check whether we are accepting new connections... + */ +diff -up cups-2.0rc1/scheduler/Makefile.avahi-no-threaded cups-2.0rc1/scheduler/Makefile +--- cups-2.0rc1/scheduler/Makefile.avahi-no-threaded 2014-08-29 13:27:18.000000000 +0200 ++++ cups-2.0rc1/scheduler/Makefile 2014-09-12 15:48:35.367634265 +0200 +@@ -17,6 +17,7 @@ include ../Makedefs + + CUPSDOBJS = \ + auth.o \ ++ avahi.o \ + banners.o \ + cert.o \ + classes.o \ +@@ -40,7 +41,8 @@ CUPSDOBJS = \ + server.o \ + statbuf.o \ + subscriptions.o \ +- sysman.o ++ sysman.o \ ++ timeout.o + LIBOBJS = \ + filter.o \ + mime.o \ +diff -up cups-2.0rc1/scheduler/timeout.c.avahi-no-threaded cups-2.0rc1/scheduler/timeout.c +--- cups-2.0rc1/scheduler/timeout.c.avahi-no-threaded 2014-09-12 15:45:28.775279963 +0200 ++++ cups-2.0rc1/scheduler/timeout.c 2014-09-12 15:45:28.775279963 +0200 +@@ -0,0 +1,235 @@ ++/* ++ * "$Id$" ++ * ++ * Timeout functions for the Common UNIX Printing System (CUPS). ++ * ++ * Copyright (C) 2010, 2011 Red Hat, Inc. ++ * Authors: ++ * Tim Waugh ++ * ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions ++ * are met: ++ * ++ * Redistributions of source code must retain the above copyright ++ * notice, this list of conditions and the following disclaimer. ++ * ++ * Redistributions in binary form must reproduce the above copyright ++ * notice, this list of conditions and the following disclaimer in the ++ * documentation and/or other materials provided with the distribution. ++ * ++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ++ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT ++ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS ++ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE ++ * COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, ++ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES ++ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR ++ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) ++ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, ++ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ++ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED ++ * OF THE POSSIBILITY OF SUCH DAMAGE. ++ * ++ * Contents: ++ * ++ * cupsdInitTimeouts() - Initialise timeout structure. ++ * cupsdAddTimeout() - Add a timed callback. ++ * cupsdNextTimeout() - Find the next enabled timed callback. ++ * cupsdUpdateTimeout() - Adjust the time of a timed callback or disable it. ++ * cupsdRemoveTimeout() - Discard a timed callback. ++ * compare_timeouts() - Compare timed callbacks for array sorting. ++ */ ++ ++#include ++ ++#ifdef HAVE_AVAHI /* Applies to entire file... */ ++ ++/* ++ * Include necessary headers... ++ */ ++ ++#include "cupsd.h" ++ ++#if defined(HAVE_MALLOC_H) && defined(HAVE_MALLINFO) ++# include ++#endif /* HAVE_MALLOC_H && HAVE_MALLINFO */ ++ ++#ifdef HAVE_AVAHI ++# include ++#endif /* HAVE_AVAHI */ ++ ++ ++struct _cupsd_timeout_s ++{ ++ struct timeval when; ++ int enabled; ++ cupsd_timeoutfunc_t callback; ++ void *data; ++}; ++ ++/* ++ * Local functions... ++ */ ++ ++/* ++ * 'compare_timeouts()' - Compare timed callbacks for array sorting. ++ */ ++ ++static int ++compare_addrs (void *p0, void *p1) ++{ ++ if (p0 == p1) ++ return (0); ++ if (p0 < p1) ++ return (-1); ++ return (1); ++} ++ ++static int ++compare_timeouts (cupsd_timeout_t *p0, cupsd_timeout_t *p1) ++{ ++ int addrsdiff = compare_addrs (p0, p1); ++ int tvdiff; ++ ++ if (addrsdiff == 0) ++ return (0); ++ ++ if (!p0->enabled || !p1->enabled) ++ { ++ if (!p0->enabled && !p1->enabled) ++ return (addrsdiff); ++ ++ return (p0->enabled ? -1 : 1); ++ } ++ ++ tvdiff = avahi_timeval_compare (&p0->when, &p1->when); ++ if (tvdiff != 0) ++ return (tvdiff); ++ ++ return (addrsdiff); ++} ++ ++ ++/* ++ * 'cupsdInitTimeouts()' - Initialise timeout structures. ++ */ ++ ++void ++cupsdInitTimeouts(void) ++{ ++ Timeouts = cupsArrayNew ((cups_array_func_t)compare_timeouts, NULL); ++} ++ ++ ++/* ++ * 'cupsdAddTimeout()' - Add a timed callback. ++ */ ++ ++cupsd_timeout_t * /* O - Timeout handle */ ++cupsdAddTimeout(const struct timeval *tv, /* I - Absolute time */ ++ cupsd_timeoutfunc_t cb, /* I - Callback function */ ++ void *data) /* I - User data */ ++{ ++ cupsd_timeout_t *timeout; ++ ++ timeout = malloc (sizeof(cupsd_timeout_t)); ++ if (timeout != NULL) ++ { ++ timeout->enabled = (tv != NULL); ++ if (tv) ++ { ++ timeout->when.tv_sec = tv->tv_sec; ++ timeout->when.tv_usec = tv->tv_usec; ++ } ++ ++ timeout->callback = cb; ++ timeout->data = data; ++ cupsArrayAdd (Timeouts, timeout); ++ } ++ ++ return timeout; ++} ++ ++ ++/* ++ * 'cupsdNextTimeout()' - Find the next enabled timed callback. ++ */ ++ ++cupsd_timeout_t * /* O - Next enabled timeout or NULL */ ++cupsdNextTimeout(long *delay) /* O - Seconds before scheduled */ ++{ ++ cupsd_timeout_t *first = cupsArrayFirst (Timeouts); ++ struct timeval curtime; ++ ++ if (first && !first->enabled) ++ first = NULL; ++ ++ if (first && delay) ++ { ++ gettimeofday (&curtime, NULL); ++ if (avahi_timeval_compare (&curtime, &first->when) > 0) ++ { ++ *delay = 0; ++ } else { ++ *delay = 1 + first->when.tv_sec - curtime.tv_sec; ++ if (first->when.tv_usec < curtime.tv_usec) ++ (*delay)--; ++ } ++ } ++ ++ return (first); ++} ++ ++ ++/* ++ * 'cupsdRunTimeout()' - Run a timed callback. ++ */ ++ ++void ++cupsdRunTimeout(cupsd_timeout_t *timeout) /* I - Timeout */ ++{ ++ if (!timeout) ++ return; ++ timeout->enabled = 0; ++ if (!timeout->callback) ++ return; ++ timeout->callback (timeout, timeout->data); ++} ++ ++/* ++ * 'cupsdUpdateTimeout()' - Adjust the time of a timed callback or disable it. ++ */ ++ ++void ++cupsdUpdateTimeout(cupsd_timeout_t *timeout, /* I - Timeout */ ++ const struct timeval *tv) /* I - Absolute time or NULL */ ++{ ++ cupsArrayRemove (Timeouts, timeout); ++ timeout->enabled = (tv != NULL); ++ if (tv) ++ { ++ timeout->when.tv_sec = tv->tv_sec; ++ timeout->when.tv_usec = tv->tv_usec; ++ } ++ cupsArrayAdd (Timeouts, timeout); ++} ++ ++ ++/* ++ * 'cupsdRemoveTimeout()' - Discard a timed callback. ++ */ ++ ++void ++cupsdRemoveTimeout(cupsd_timeout_t *timeout) /* I - Timeout */ ++{ ++ cupsArrayRemove (Timeouts, timeout); ++ free (timeout); ++} ++ ++ ++#endif /* HAVE_AVAHI ... from top of file */ ++ ++/* ++ * End of "$Id$". ++ */ diff --git a/hardware/printer/cups/files/tmpfiles.conf b/hardware/printer/cups/files/tmpfiles.conf new file mode 100644 index 0000000000..c9291d84c2 --- /dev/null +++ b/hardware/printer/cups/files/tmpfiles.conf @@ -0,0 +1,2 @@ +d /run/cups 0755 root lp +d /run/cups/certs 0755 lp lpadmin diff --git a/hardware/printer/cups/pspec.xml b/hardware/printer/cups/pspec.xml new file mode 100644 index 0000000000..c1e11be0c2 --- /dev/null +++ b/hardware/printer/cups/pspec.xml @@ -0,0 +1,244 @@ + + + + + cups + http://www.cups.org/ + + Pisi Linux Admins + admins@pisilinux.org + + GPLv2 + service + Common Unix Printing System + cups provides a portable printing layer for *nix-based operating systems. + http://www.cups.org/software/2.0.3/cups-2.0.3-source.tar.bz2 + + + acl-devel + pam-devel + dbus-devel + zlib-devel + libusb-devel + libgcc + avahi-devel + cups-filters + mit-kerberos + libpaper-devel + + + + archlinux/cups-no-export-ssllibs.patch + archlinux/cups-no-gzip-man.patch + archlinux/cups-1.6.2-statedir.patch + archlinux/cups-no-gcrypt.patch + + + + + + fedora/cups-enum-all.patch + fedora/cups-final-content-type.patch + fedora/cups-res_init.patch + + + gentoo/cups-1.6.0-fix-install-perms.patch + gentoo/cups-2.0.1-rename-systemd-service-files.patch + + + + pisilinux/lib64.patch + pisilinux/nostrip.patch + pisilinux/cups-run.patch + + + pld-linux/cups-avahi-address.patch + + + + + + + cups + + acl + pam + dbus + zlib + libusb + libgcc + libpaper + avahi-libs + mit-kerberos + + + /etc/cups/*conf + /usr/lib/tmpfiles.d/cups.conf + /usr/lib + /usr/sbin + /usr/bin + /var/cache/cups/rss + /var/spool/cups/tmp + /run/cups/certs + /var/log/cups + /etc + /lib/udev/rules.d + /lib/systemd/system + /usr/share/cups + /usr/share/icons + /usr/share/applications + /usr/share/doc + /usr/share/man + /usr/share/locale + + + tmpfiles.conf + + + cups.logrotate + + + fedora/textonly.ppd + + + System.Service + System.Package + + + + + cups-devel + Development files for cups + + cups + + + /usr/include + /usr/bin/cups-config + + + + + cups-32bit + emul32 + 32-bit shared libraries for cups + emul32 + + glibc-32bit + zlib-32bit + openssl-32bit + + + glibc-32bit + zlib-32bit + openssl-32bit + cups + + + /usr/bin/cups-config-32bit + /usr/lib32 + + + + + + 2015-06-10 + 2.0.3 + Version bump. + Ertuğrul Erata + ertugrulerata@gmail.com + + + 2014-02-05 + 2.0.1 + Version bump. + Vedat Demir + vedat@pisilinux.org + + + 2014-09-25 + 1.7.5 + Version bump. + Serdar Soytetir + kaptan@pisilinux.org + + + 2014-05-20 + 1.7.2 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-01-30 + 1.7.1 + Fix comar service. + Marcin Bojara + marcin@pisilinux.org + + + 2014-01-18 + 1.7.1 + Add tmpfiles.conf. Rebuild. + Marcin Bojara + marcin@pisilinux.org + + + 2014-01-17 + 1.7.1 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2013-11-1 + 1.7.0 + Version bump. + Kamil Atlı + suvarice@gmail.com + + + 2013-10-14 + 1.6.4 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2013-07-13 + 1.6.3 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-05-19 + 1.6.1 + Lib64 path correction. + Ertan Güven + ertan@pisilinux.org + + + 2013-03-13 + 1.6.1 + Version bump + Ertan Güven + ertan@pisilinux.org + + + 2012-10-18 + 1.5.4 + Fixed + Osman Erkan + osman.erkan@pisilinux.org + + + 2012-10-18 + 1.5.4 + First release + Erdinç Gültekin + admins@pisilinux.org + + + diff --git a/hardware/printer/cups/translations.xml b/hardware/printer/cups/translations.xml new file mode 100644 index 0000000000..dded592445 --- /dev/null +++ b/hardware/printer/cups/translations.xml @@ -0,0 +1,22 @@ + + + + cups + Unix Ortak Yazdırma Sistemi + + + + cups-php + PHP için CUPS programlama kitaplığı + + + + cups-devel + cups için geliştirme dosyaları + + + + cups-32bit + cups için 32-bit paylaşımlı kitaplıklar + + diff --git a/hardware/sound/alsa-lib/actions.py b/hardware/sound/alsa-lib/actions.py new file mode 100644 index 0000000000..f960849d80 --- /dev/null +++ b/hardware/sound/alsa-lib/actions.py @@ -0,0 +1,36 @@ +#!/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 get +from pisi.actionsapi import shelltools + +def setup(): + options = "--disable-aload" + + if get.buildTYPE() == "emul32": + options += " --disable-python" + shelltools.export("CFLAGS", "%s -m32" % get.CFLAGS()) + + autotools.autoreconf("-fi") + + autotools.configure(options) + pisitools.dosed("libtool", " -shared ", " -Wl,--as-needed -shared ") + + # rpath fix + pisitools.dosed("libtool", "^hardcode_libdir_flag_spec=.*", "hardcode_libdir_flag_spec=\"\"") + pisitools.dosed("libtool", "^runpath_var=LD_RUN_PATH", "runpath_var=DIE_RPATH_DIE") + +def build(): + autotools.make() + +def install(): + autotools.rawInstall("DESTDIR=%s" % get.installDIR()) + + if get.buildTYPE() == "emul32": return + + pisitools.dodoc("ChangeLog", "TODO", "COPYING", "doc/*.txt") diff --git a/hardware/sound/alsa-lib/pspec.xml b/hardware/sound/alsa-lib/pspec.xml new file mode 100644 index 0000000000..28610c93fa --- /dev/null +++ b/hardware/sound/alsa-lib/pspec.xml @@ -0,0 +1,116 @@ + + + + + alsa-lib + http://www.alsa-project.org/ + + PisiLinux Community + admins@pisilinux.org + + GPLv2 + library + app:console + The Advanced Linux Sound Architecture (ALSA) library + alsa-lib provides ALSA runtime libraries to simplify application programming and provide higher level functionality as well as support for the older OSS API, providing binary compatibility for most OSS programs. + ftp://ftp.alsa-project.org/pub/lib/alsa-lib-1.0.29.tar.bz2 + + + + alsa-lib + + /usr/lib + /usr/bin + /usr/share/doc + /usr/share/alsa + + + + + alsa-lib-devel + Development files for alsa-lib + + alsa-lib + + + /usr/lib/pkgconfig + /usr/lib32/pkgconfig + /usr/include/sys + /usr/include/alsa + /usr/share/aclocal + /usr/share/man/man3 + + + + + alsa-lib-32bit + emul32 + 32-bit shared libraries for alsa-lib + emul32 + + alsa-lib + + + /usr/lib32 + + + + + + 2015-03-04 + 1.0.29 + Version bump. + Hakan Yıldız + hknyldz93@gmail.com + + + 2014-08-19 + 1.0.28 + Rebuild version 28. + Serdar Soytetir + kaptan@pisilinux.org + + + 2014-08-19 + 1.0.28 + Version bump. + Serdar Soytetir + kaptan@pisilinux.org + + + 2014-05-26 + 1.0.27.2 + Release bump. + Alihan Öztürk + alihan@pisilinux.org + + + 2014-03-05 + 1.0.27.2 + Rebuild for buildhost + PisiLinux Community + admins@pisilinux.org + + + 2013-08-22 + 1.0.27.2 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-07-27 + 1.0.27.2 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2012-10-13 + 1.0.26.20121013 + First release + Erdinç Gültekin + admins@pisilinux.org + + + diff --git a/hardware/sound/alsa-lib/translations.xml b/hardware/sound/alsa-lib/translations.xml new file mode 100644 index 0000000000..9122b1fb89 --- /dev/null +++ b/hardware/sound/alsa-lib/translations.xml @@ -0,0 +1,18 @@ + + + + alsa-lib + Gelişmiş Linux Ses Mimarisi kütüphanesi + alsa-lib, ses aygıtlarına erişim sağlayarak kolayca uygulama yazılmasını sağlayan bir kütüphanedir. + + + + alsa-lib-devel + alsa-lib için geliştirme dosyaları + + + + alsa-lib-32bit + alsa-lib için 32-bit paylaşımlı kitaplıklar + + diff --git a/hardware/sound/component.xml b/hardware/sound/component.xml new file mode 100644 index 0000000000..e15449bfb7 --- /dev/null +++ b/hardware/sound/component.xml @@ -0,0 +1,3 @@ + + hardware.sound + diff --git a/multimedia/component.xml b/multimedia/component.xml new file mode 100644 index 0000000000..345f24ab0c --- /dev/null +++ b/multimedia/component.xml @@ -0,0 +1,3 @@ + + multimedia + diff --git a/multimedia/graphics/component.xml b/multimedia/graphics/component.xml new file mode 100644 index 0000000000..4215a068ce --- /dev/null +++ b/multimedia/graphics/component.xml @@ -0,0 +1,3 @@ + + multimedia.graphics + diff --git a/multimedia/graphics/libjpeg-turbo/actions.py b/multimedia/graphics/libjpeg-turbo/actions.py new file mode 100644 index 0000000000..85a797beec --- /dev/null +++ b/multimedia/graphics/libjpeg-turbo/actions.py @@ -0,0 +1,26 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- +# Licensed under the GNU General Public License, version 3. +# See the file http://www.gnu.org/copyleft/gpl.txt + +from pisi.actionsapi import autotools +from pisi.actionsapi import get +from pisi.actionsapi import pisitools + +def setup(): + autotools.autoreconf("-fi") + if not get.buildTYPE() == "emul32": + autotools.configure("--with-jpeg8") + else: + pisitools.dosed("configure", "(NAFLAGS='-fel)f64( -DELF -D__x86_64__)", "\\1f32\\2") + autotools.configure("--with-jpeg8 --without-simd") + +def build(): + autotools.make() + +def install(): + autotools.rawInstall("DESTDIR=%s" % get.installDIR()) + if get.buildTYPE() == "emul32": return + + # provide jpegint.h as it is required by various software + pisitools.insinto("/usr/lib/include", "jpegint.h") diff --git a/multimedia/graphics/libjpeg-turbo/files/fix_doc.patch b/multimedia/graphics/libjpeg-turbo/files/fix_doc.patch new file mode 100644 index 0000000000..0faa663772 --- /dev/null +++ b/multimedia/graphics/libjpeg-turbo/files/fix_doc.patch @@ -0,0 +1,18 @@ +--- Makefile.am~ 2013-05-15 20:34:26.015505251 +0200 ++++ Makefile.am 2013-05-15 20:34:45.183504551 +0200 +@@ -123,14 +123,10 @@ + DOCS= install.txt coderules.txt filelist.txt jconfig.txt change.log \ + rdrle.c wrrle.c BUILDING.txt ChangeLog.txt + +-docdir = $(datadir)/doc ++docdir = $(datadir)/doc/libjpeg-turbo + dist_doc_DATA = README README-turbo.txt libjpeg.txt structure.txt usage.txt \ + wizard.txt + +-exampledir = $(datadir)/doc +-dist_example_DATA = example.c +- +- + EXTRA_DIST = win release $(DOCS) testimages CMakeLists.txt \ + sharedlib/CMakeLists.txt cmakescripts libjpeg.map.in doc doxygen.config \ + jccolext.c jdcolext.c jdmrgext.c diff --git a/multimedia/graphics/libjpeg-turbo/pspec.xml b/multimedia/graphics/libjpeg-turbo/pspec.xml new file mode 100644 index 0000000000..087f15ac97 --- /dev/null +++ b/multimedia/graphics/libjpeg-turbo/pspec.xml @@ -0,0 +1,102 @@ + + + + + libjpeg-turbo + http://www.libjpeg-turbo.org/ + + PisiLinux Community + admins@pisilinux.org + + GPLv3 + multimedia.graphics + app:gui + MMX, SSE, and SSE2 SIMD accelerated JPEG library + libjpeg-turbo is a derivative of libjpeg for x86 and x86-64 processors which uses SIMD instructions (MMX, SSE2, etc.) to accelerate baseline JPEG compression and decompression. libjpeg-turbo is generally 2-4x as fast as the unmodified version of libjpeg v6b, all else being equal. + mirrors://sourceforge/libjpeg-turbo/1.3.1/libjpeg-turbo-1.3.1.tar.gz + + fix_doc.patch + + + + + libjpeg-turbo + + jpeg + + + /usr/bin + /usr/lib + /usr/share/doc + /usr/share/man + + + + + libjpeg-turbo-devel + Development files for libjpeg-turbo + + libjpeg-turbo + + + jpeg-devel + + + /usr/include/ + + + + + libjpeg-turbo-32bit + emul32 + 32-bit shared libraries for jpeg + emul32 + + libjpeg-turbo + + + jpeg-32bit + + + /usr/lib32 + + + + + + 2014-05-15 + 1.3.1 + Version bump. + Stefan Gronewold(groni) + groni@pisilinux.org + + + 2013-05-15 + 1.2.1 + Switching from jpeg to libjpeg-turbo + Marcin Bojara + marcin@pisilinux.org + + + 2013-05-12 + 1.2.1 + Source url write mirrors + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2013-04-21 + 1.2.1 + Fixed + PisiLinux Community + admins@pisilinux.org + + + 2012-07-31 + 1.2.1 + First Release + PisiLinux Community + admins@pisilinux.org + + + diff --git a/multimedia/graphics/libjpeg-turbo/translations.xml b/multimedia/graphics/libjpeg-turbo/translations.xml new file mode 100644 index 0000000000..bb3fd4435d --- /dev/null +++ b/multimedia/graphics/libjpeg-turbo/translations.xml @@ -0,0 +1,13 @@ + + + + libjpeg-turbo + MMX, SSE, and SSE2 SIMD accelerated JPEG library + libjpeg-turbo is a derivative of libjpeg for x86 and x86-64 processors which +uses SIMD instructions (MMX, SSE2, etc.) to accelerate baseline JPEG compression and decompression. libjpeg-turbo is generally 2-4x as fast as the unmodified version of libjpeg v6b, all else being equal. + + + libjpeg-turbo-devel + libjpeg-turbo için geliştirme dosyaları + + diff --git a/multimedia/graphics/libmng/actions.py b/multimedia/graphics/libmng/actions.py new file mode 100644 index 0000000000..dc5e35dfd2 --- /dev/null +++ b/multimedia/graphics/libmng/actions.py @@ -0,0 +1,42 @@ +#!/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(): + shelltools.sym("makefiles/configure.in", "configure.in") + shelltools.sym("makefiles/Makefile.am", "Makefile.am") + shelltools.sym("makefiles/makefile.linux", "Makefile") + #shelltools.sym("contrib/gcc/sdl-mngplay/acinclude.m4", "acinclude.m4") + + shelltools.system("sed -i -e 's/unroll-loops/& -fPIC/' Makefile ") + + autotools.autoreconf("-fiv") + autotools.configure("--with-jpeg \ + --with-lcms \ + --disable-static \ + --disable-dependency-tracking") + + if get.buildTYPE() == "emul32": + options = " --libdir=/usr/lib32 \ + --with-jpeg \ + --disable-static \ + --disable-dependency-tracking" + shelltools.export("CFLAGS", "%s -m32" % get.CFLAGS()) + autotools.configure(options) + +def build(): + autotools.make() + +def install(): + autotools.rawInstall("DESTDIR=%s" % get.installDIR()) + + pisitools.doman("doc/man/*") + pisitools.dodoc("CHANGES", "LICENSE", "README*", "doc/doc.readme", "doc/misc/*", "doc/libmng.txt") diff --git a/multimedia/graphics/libmng/pspec.xml b/multimedia/graphics/libmng/pspec.xml new file mode 100644 index 0000000000..c381ad2c9b --- /dev/null +++ b/multimedia/graphics/libmng/pspec.xml @@ -0,0 +1,84 @@ + + + + + libmng + http://www.libmng.com/ + + PisiLinux Community + admins@pisilinux.org + + as-is + library + Multiple Image Networkgraphics lib (animated png's) + Libmng -The reference library for reading, displaying, writing and examining Multiple-Image Network Graphics. MNG is the animation extension to the popular PNG image-format. + http://sourceforge.net/projects/libmng/files/libmng-devel/2.0.2/libmng-2.0.2.tar.gz + + lcms-devel + libjpeg-turbo-devel + + + + + libmng + + libjpeg-turbo + lcms2 + + + /usr/lib + + + + + libmng-devel + + libmng + + + /usr/share/doc + /usr/share/man + /usr/include/ + + + + + libmng-32bit + emul32 + 32-bit shared libraries for libmng + emul32 + + zlib-32bit + lcms2-32bit + libjpeg-turbo-32bit + libmng + + + /usr/lib32 + + + + + + 2014-05-19 + 2.0.2 + Release bump. + Alihan Öztürk + alihan@pisilinux.org + + + 2014-01-31 + 2.0.2 + Version bump. + Stefan Gronewold(groni) + groni@pisilinux.org + + + 2012-12-16 + 1.0.10 + First release + Erdinç Gültekin + admins@pisilinux.org + + + diff --git a/multimedia/graphics/libmng/translations.xml b/multimedia/graphics/libmng/translations.xml new file mode 100644 index 0000000000..95233ecb33 --- /dev/null +++ b/multimedia/graphics/libmng/translations.xml @@ -0,0 +1,10 @@ + + + + libmng + Çoklu resim Networkgraphics (Animasyonlu png) + Libmng, Çoklu Görüntü Ağ Grafiklerini (MNG) okuma, görüntüleme, yazma ve denemek için başvuru kütüphanesidir. MNG popüler PNG görüntü formatı için animasyon uzantısıdır. + Libmng - La librairie de référence pour lire, afficher, écrire et examiner des Multiple-Image Network Graphics (graphiques orientés réseaux composés d'images multiples). MNG est l'extension d'animation pour le format d'image populaire PNG. + Libmng -librería de referencia para lectura, visualización, escritura y análisis de gráficos tipo Multiple-Image Network. MNG es la extensión de animación al formato popular de imágenes PNG. + + diff --git a/multimedia/graphics/tiff/actions.py b/multimedia/graphics/tiff/actions.py new file mode 100644 index 0000000000..b189da6cb3 --- /dev/null +++ b/multimedia/graphics/tiff/actions.py @@ -0,0 +1,32 @@ +#!/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(): + shelltools.export("CFLAGS", "%s -fno-strict-aliasing" % get.CFLAGS()) + + autotools.autoreconf("-vfi") + autotools.configure("--disable-static \ + --disable-rpath \ + --without-x \ + --enable-cxx \ + --with-pic") + + pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ") + +def build(): + autotools.make() + +def install(): + autotools.rawInstall("DESTDIR=%s" % get.installDIR()) + + if get.buildTYPE() == "emul32": return + + pisitools.rename("/%s/tiff-%s" % (get.docDIR(), get.srcVERSION()), get.srcNAME()) diff --git a/multimedia/graphics/tiff/files/tiff-3.9.1-CVE-2011-0191.diff b/multimedia/graphics/tiff/files/tiff-3.9.1-CVE-2011-0191.diff new file mode 100644 index 0000000000..ff51719b81 --- /dev/null +++ b/multimedia/graphics/tiff/files/tiff-3.9.1-CVE-2011-0191.diff @@ -0,0 +1,13 @@ +--- libtiff/tif_dir.c 2011-04-04 05:58:54.000000000 -0400 ++++ libtiff/tif_dir.c.oden 2011-04-04 05:59:08.000000000 -0400 +@@ -370,6 +370,10 @@ _TIFFVSetField(TIFF* tif, ttag_t tag, va + case TIFFTAG_YCBCRSUBSAMPLING: + td->td_ycbcrsubsampling[0] = (uint16) va_arg(ap, int); + td->td_ycbcrsubsampling[1] = (uint16) va_arg(ap, int); ++ if (td->td_ycbcrsubsampling[0] > 4) ++ td->td_ycbcrsubsampling[0] = (td->td_compression == 7) ? 1 : 2; ++ if (td->td_ycbcrsubsampling[1] > 4) ++ td->td_ycbcrsubsampling[1] = (td->td_compression == 7) ? 1 : 2; + break; + case TIFFTAG_TRANSFERFUNCTION: + v = (td->td_samplesperpixel - td->td_extrasamples) > 1 ? 3 : 1; diff --git a/multimedia/graphics/tiff/files/tiff-3.9.1-no_contrib.diff b/multimedia/graphics/tiff/files/tiff-3.9.1-no_contrib.diff new file mode 100644 index 0000000000..eff5d4ec8d --- /dev/null +++ b/multimedia/graphics/tiff/files/tiff-3.9.1-no_contrib.diff @@ -0,0 +1,24 @@ +diff -Naur tiff-3.9.1/Makefile.am tiff-3.9.1.oden/Makefile.am +--- tiff-3.9.1/Makefile.am 2009-08-21 18:46:01.000000000 +0200 ++++ tiff-3.9.1.oden/Makefile.am 2009-08-30 12:43:13.000000000 +0200 +@@ -47,7 +47,7 @@ + + dist_doc_DATA = $(docfiles) + +-SUBDIRS = port libtiff tools build contrib test man html ++SUBDIRS = port libtiff tools build test man html + + release: + (rm -f $(top_srcdir)/RELEASE-DATE && echo $(LIBTIFF_RELEASE_DATE) > $(top_srcdir)/RELEASE-DATE) +diff -Naur tiff-3.9.1/Makefile.in tiff-3.9.1.oden/Makefile.in +--- tiff-3.9.1/Makefile.in 2009-08-28 20:41:13.000000000 +0200 ++++ tiff-3.9.1.oden/Makefile.in 2009-08-30 12:43:33.000000000 +0200 +@@ -331,7 +331,7 @@ + nmake.opt + + dist_doc_DATA = $(docfiles) +-SUBDIRS = port libtiff tools build contrib test man html ++SUBDIRS = port libtiff tools build test man html + all: all-recursive + + .SUFFIXES: diff --git a/multimedia/graphics/tiff/files/tiff-3.9.2-libjpeg7+.diff b/multimedia/graphics/tiff/files/tiff-3.9.2-libjpeg7+.diff new file mode 100644 index 0000000000..ebb229c3dc --- /dev/null +++ b/multimedia/graphics/tiff/files/tiff-3.9.2-libjpeg7+.diff @@ -0,0 +1,10 @@ +--- libtiff/tif_jpeg.c 2010-09-30 13:43:31.045146032 +0200 ++++ libtiff/tif_jpeg.c.oden 2010-09-30 13:44:59.005141117 +0200 +@@ -850,6 +850,7 @@ JPEGPreDecode(TIFF* tif, tsample_t s) + if (downsampled_output) { + /* Need to use raw-data interface to libjpeg */ + sp->cinfo.d.raw_data_out = TRUE; ++ sp->cinfo.d.do_fancy_upsampling = FALSE; + tif->tif_decoderow = JPEGDecodeRaw; + tif->tif_decodestrip = JPEGDecodeRaw; + tif->tif_decodetile = JPEGDecodeRaw; diff --git a/multimedia/graphics/tiff/pspec.xml b/multimedia/graphics/tiff/pspec.xml new file mode 100644 index 0000000000..3dc29b051f --- /dev/null +++ b/multimedia/graphics/tiff/pspec.xml @@ -0,0 +1,107 @@ + + + + + tiff + http://www.remotesensing.org/libtiff/ + + PisiLinux Community + admins@pisilinux.org + + as-is + library + Library for manipulation of TIFF (Tag Image File Format) images + This software provides support for the Tag Image File Format (TIFF), a widely used format for storing image data. + ftp://ftp.remotesensing.org/pub/libtiff/tiff-4.0.3.tar.gz + + libjpeg-turbo-devel + jbigkit-devel + + + + + tiff + + libjpeg-turbo + jbigkit + + + /usr/bin + /usr/lib + + + + + tiff-devel + Developement files for tiff + + tiff + + + /usr/include + /usr/lib/pkgconfig + /usr/lib32/pkgconfig + + + + + tiff-docs + Documentation for tiff + + tiff + + + /usr/share/doc + /usr/share/man + + + + + tiff-32bit + emul32 + 32-bit shared libraries for tiff + emul32 + + libjpeg-turbo-32bit + + + tiff + libjpeg-turbo-32bit + xz-32bit + zlib-32bit + + + /usr/lib32 + + + + + 2014-05-19 + 4.0.3 + Release bump. + Alihan Öztürk + alihan@pisilinux.org + + + 2014-02-08 + 4.0.3 + Rebuild Unused + Varol Maksutoğlu + waroi@pisilinux.org + + + 2013-07-26 + 4.0.3 + Version bump. + Serdar Soytetir + kaptan@pisilinux.org + + + 2012-08-29 + 4.0.2 + First release + PisiLinux Community + admins@pisilinux.org + + + diff --git a/multimedia/graphics/tiff/translations.xml b/multimedia/graphics/tiff/translations.xml new file mode 100644 index 0000000000..10eb85863e --- /dev/null +++ b/multimedia/graphics/tiff/translations.xml @@ -0,0 +1,26 @@ + + + + tiff + TIFF (Tag Image File Format) türündeki resimleri işlemeye aracılık eden kütüphane + Bu kütüphane TIFF (Tag Image File Format) resim biçimi desteği sağlar. Bu biçim resim bilgisi saklamak için pek çok yerde kullanılır. + Ce logiciel fournit le support pour le format "Tag Image File Format" (TIFF), un format très employé pour stocker des informations d'image. + Este software facilita soporte para el formato de imagen etiqueteado (TIFF), un formato para almacenamiento de imágenes de uso común. + Biblioteka do manipulacji plikami w formacie TIFF. + + + + tiff-docs + tiff için belgelendirme dosyaları + + + + tiff-devel + tiff için geliştirme dosyaları + + + + tiff-32bit + tiff için 32-bit paylaşımlı kitaplıklar + + diff --git a/multimedia/graphics/webp/actions.py b/multimedia/graphics/webp/actions.py new file mode 100644 index 0000000000..18d47cc67d --- /dev/null +++ b/multimedia/graphics/webp/actions.py @@ -0,0 +1,32 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- +# +# Licensed under the GNU General Public License, version 2 +# See the file http://www.gnu.org/copyleft/gpl.txt + +from pisi.actionsapi import get +from pisi.actionsapi import autotools +from pisi.actionsapi import pisitools +from pisi.actionsapi import shelltools + +def setup(): + autotools.configure("\ + --disable-static \ + --enable-experimental \ + --enable-libwebpdecoder \ + --enable-libwebpdemux \ + --enable-libwebpmux \ + --enable-swap-16bit-csp \ + ") + + pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ") + +def build(): + autotools.make() + +def install(): + autotools.rawInstall("DESTDIR=%s" % get.installDIR()) + + pisitools.dodoc("AUTHORS", "COPYING", "ChangeLog", "NEWS", "PATENTS", "README") + #shelltools.move("%s/libwebp-0.2.1/doc/*" % get.workDIR(),"%s/usr/share/doc/webp" % get.installDIR()) + #shelltools.move("%s/libwebp-0.2.1/README" % get.workDIR(),"%s/usr/share/doc/webp" % get.installDIR()) diff --git a/multimedia/graphics/webp/pspec.xml b/multimedia/graphics/webp/pspec.xml new file mode 100644 index 0000000000..8c429afb5f --- /dev/null +++ b/multimedia/graphics/webp/pspec.xml @@ -0,0 +1,99 @@ + + + + + webp + http://code.google.com/p/webp/downloads/list + + PisiLinux Community + admins@pisilinux.org + + Copyright (c) 2010, Google Inc. All rights reserved. + application + webp image format and format conversion png,jpeg,tiff + webp image format and format conversion png,jpeg,tiff + http://downloads.webmproject.org/releases/webp/libwebp-0.4.3.tar.gz + + mesa-devel + tiff-devel + giflib-devel + mesa-glu-devel + freeglut-devel + libjpeg-turbo-devel + + + + + webp + + tiff + mesa + giflib + libpng + freeglut + libjpeg-turbo + + + /usr/lib/libwebp* + /usr/bin + /usr/share/man + /usr/share/doc/webp + + + + + webp-devel + + webp + + + /usr/include + /usr/lib/pkgconfig + + + + + + 2015-04-06 + 0.4.3 + Version bump. + Ayhan Yalçınsoy + ayhanyalcinsoy@pisilinux.org + + + 2014-05-21 + 0.4.0 + rebuild + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2014-04-21 + 0.4.0 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-01-25 + 0.3.1 + rebuild for unused + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2013-07-19 + 0.3.1 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2012-12-11 + 0.2.1 + First release + can + qazsew@mynet.com + + + diff --git a/multimedia/graphics/webp/translations.xml b/multimedia/graphics/webp/translations.xml new file mode 100644 index 0000000000..41441bffd0 --- /dev/null +++ b/multimedia/graphics/webp/translations.xml @@ -0,0 +1,17 @@ + + + + webp + webp resim formatı kütüphanesi ve png,jpeg,tiff resim formatlarına dönüştürme aracı + webp resim formatı kütüphanesi ve png,jpeg,tiff resim formatlarına dönüştürme aracı + + + + webp + webp resim formatı kütüphanesi ve png,jpeg,tiff resim formatlarına dönüştürme aracı + + + webp-devel + webp için geliştirme dosyaları + + diff --git a/multimedia/misc/DirectFB/actions.py b/multimedia/misc/DirectFB/actions.py new file mode 100644 index 0000000000..9c928c1a20 --- /dev/null +++ b/multimedia/misc/DirectFB/actions.py @@ -0,0 +1,44 @@ +#!/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(): + autotools.configure('--enable-fbdev \ + --enable-mmx \ + --enable-sse \ + --enable-jpeg \ + --enable-png \ + --enable-gif \ + --enable-freetype \ + --enable-multi \ + --enable-sysfs \ + --disable-sdl \ + --disable-multi \ + --disable-debug \ + --disable-static \ + --enable-zlib \ + --enable-x11 \ + --enable-video4linux \ + --enable-video4linux2 \ + --with-inputdrivers="all" \ + --with-gfxdrivers="all" \ + --disable-vnc') + + pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ") + +def build(): + autotools.make() + +def install(): + autotools.rawInstall("DESTDIR=%s" % get.installDIR()) + + pisitools.dohtml("docs/html/") + pisitools.dodoc("AUTHORS", "ChangeLog", "NEWS", "README*", "TODO", "fb.modes") + diff --git a/multimedia/misc/DirectFB/pspec.xml b/multimedia/misc/DirectFB/pspec.xml new file mode 100644 index 0000000000..aeaba3efcd --- /dev/null +++ b/multimedia/misc/DirectFB/pspec.xml @@ -0,0 +1,115 @@ + + + + + DirectFB + http://www.directfb.org/ + + PisiLinux Community + admins@pisilinux.org + + LGPLv2.1 + library + Thin library on top of the Linux framebuffer devices + DirectFB is a thin library that provides hardware graphics acceleration, input device handling and abstraction, integrated windowing system with support for translucent windows and multiple display layers. + http://www.directfb.org/downloads/Core/DirectFB-1.7/DirectFB-1.7.1.tar.gz + + giflib-devel + libX11-devel + libXext-devel + mesa-devel + mesa-glu-devel + libdrm-devel + libjpeg-turbo-devel + libmng-devel + libvdpau-devel + + + + + + + DirectFB-docs + + DirectFB + + + /usr/share/doc + + + + + DirectFB + + giflib + libX11 + libXext + mesa + mesa-glu + libdrm + libjpeg-turbo + libmng + libvdpau + webp + tiff + jasper + libkms + + + /usr/bin + /usr/lib + /usr/share/man + /usr/share + + + + + DirectFB-devel + Development files for DirectFB + + DirectFB + + + /usr/include + /usr/lib/pkgconfig + + + + + + 2014-05-21 + 1.7.1 + Rebuild + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2014-04-23 + 1.7.1 + Rebuild for webp + Kamil Atlı + suvarice@gmail.com + + + 2014-01-28 + 1.7.1 + Rebuild Unused + Varol Maksutoğlu + waroi@pisilinux.org + + + 2013-10-14 + 1.7.1 + version bump + Erdinç >Gültekin + erdincgultekin@pisilinux.org + + + 2012-08-29 + 1.5.3 + First release + PisiLinux Community + admins@pisilinux.org + + + diff --git a/multimedia/misc/DirectFB/translations.xml b/multimedia/misc/DirectFB/translations.xml new file mode 100644 index 0000000000..0a65572c30 --- /dev/null +++ b/multimedia/misc/DirectFB/translations.xml @@ -0,0 +1,13 @@ + + + + DirectFB + Linux framebuffer aygıtlarının üstünde çalışan hafif bir kütüphane + DirectFB donanımsal grafik hızlandırması, giriş aygıtları işleme ve soyutlama sağlayan yarısaydam pencereler ve çoklu görüntü katmanlarını destekleyen pencere sistemi ile bütünleşik bir kütüphanedir. + + + + DirectFB-devel + DirectFB için geliştirme dosyaları + + diff --git a/multimedia/misc/component.xml b/multimedia/misc/component.xml new file mode 100644 index 0000000000..fa8d512866 --- /dev/null +++ b/multimedia/misc/component.xml @@ -0,0 +1,3 @@ + + multimedia.misc + diff --git a/multimedia/sound/component.xml b/multimedia/sound/component.xml new file mode 100644 index 0000000000..60d7faf29e --- /dev/null +++ b/multimedia/sound/component.xml @@ -0,0 +1,3 @@ + + multimedia.sound + diff --git a/multimedia/sound/openal/actions.py b/multimedia/sound/openal/actions.py new file mode 100644 index 0000000000..f80d78493a --- /dev/null +++ b/multimedia/sound/openal/actions.py @@ -0,0 +1,41 @@ +#!/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 cmaketools +from pisi.actionsapi import pisitools +from pisi.actionsapi import shelltools +from pisi.actionsapi import get + +WorkDir = "openal-soft-%s" % get.srcVERSION() + +def setup(): + options = "-DALSA=1 \ + -DPULSEAUDIO=1 \ + -DOSS=1 \ + -DEXAMPLES=OFF" + + if get.buildTYPE() == "emul32": + options += " -DCMAKE_INSTALL_PREFIX=/emul32 \ + -DLIB_SUFFIX=32" + shelltools.export("CFLAGS", "%s -m32" % get.CFLAGS()) + + cmaketools.configure(options) + +def build(): + cmaketools.make() + +def install(): + cmaketools.rawInstall("DESTDIR=%s" % get.installDIR()) + + # is there any "libdir" prefix for cmake ? + if get.buildTYPE() == "emul32": + from distutils.dir_util import copy_tree + copy_tree("%s/emul32/lib32/" % get.installDIR(), "%s/usr/lib32" % get.installDIR()) + pisitools.removeDir("/emul32") + pisitools.dosed("%s/usr/lib32/pkgconfig/openal.pc" % get.installDIR(), "emul32", "usr") + return + + pisitools.dodoc("COPYING", "alsoftrc.sample") diff --git a/multimedia/sound/openal/files/no-fpuextended.patch b/multimedia/sound/openal/files/no-fpuextended.patch new file mode 100644 index 0000000000..d6a6834d16 --- /dev/null +++ b/multimedia/sound/openal/files/no-fpuextended.patch @@ -0,0 +1,32 @@ +--- OpenAL32/Include/alu.h.orig ++++ OpenAL32/Include/alu.h +@@ -224,6 +224,29 @@ + return a0*mu*mu2 + a1*mu2 + a2*mu + a3; + } + ++#if defined(_FPU_GETCW) && defined(_FPU_SETCW) ++ #ifndef _FPU_EXTENDED ++ #define _FPU_EXTENDED 0 ++ #endif ++ #ifndef _FPU_DOUBLE ++ #define _FPU_DOUBLE 0 ++ #endif ++ #ifndef _FPU_SINGLE ++ #define _FPU_SINGLE 0 ++ #endif ++ #ifndef _FPU_RC_NEAREST ++ #define _FPU_RC_NEAREST 0 ++ #endif ++ #ifndef _FPU_RC_DOWN ++ #define _FPU_RC_DOWN 0 ++ #endif ++ #ifndef _FPU_RC_UP ++ #define _FPU_RC_UP 0 ++ #endif ++ #ifndef _FPU_RC_ZERO ++ #define _FPU_RC_ZERO 0 ++ #endif ++#endif + + static __inline int SetMixerFPUMode(void) + { \ No newline at end of file diff --git a/multimedia/sound/openal/files/pthread.patch b/multimedia/sound/openal/files/pthread.patch new file mode 100644 index 0000000000..44ab94187b --- /dev/null +++ b/multimedia/sound/openal/files/pthread.patch @@ -0,0 +1,17 @@ +diff -Nur openal-soft-1.13-old//CMakeLists.txt openal-soft-1.13/CMakeLists.txt +--- openal-soft-1.13-old//CMakeLists.txt 2011-04-15 10:39:56.860000093 +0300 ++++ openal-soft-1.13/CMakeLists.txt 2011-04-15 11:30:47.593000620 +0300 +@@ -246,10 +246,10 @@ + MESSAGE(FATAL_ERROR "No sleep function found!") + ENDIF() + +- CHECK_C_COMPILER_FLAG(-pthread HAVE_PTHREAD) ++ CHECK_C_COMPILER_FLAG(-lpthread HAVE_PTHREAD) + IF(HAVE_PTHREAD) +- ADD_DEFINITIONS(-pthread) +- SET(EXTRA_LIBS ${EXTRA_LIBS} -pthread) ++ ADD_DEFINITIONS(-lpthread) ++ SET(EXTRA_LIBS ${EXTRA_LIBS} -lpthread) + ENDIF() + + # We need pthreads outside of Windows diff --git a/multimedia/sound/openal/pspec.xml b/multimedia/sound/openal/pspec.xml new file mode 100644 index 0000000000..a062aa84bc --- /dev/null +++ b/multimedia/sound/openal/pspec.xml @@ -0,0 +1,91 @@ + + + + + openal + http://kcat.strangesoft.net/openal.html + + PisiLinux Community + admins@pisilinux.org + + LGPLv2 + library + Open Audio Library is a vendor-neutral API for interactive spatialized audio + OpenAL is a cross-platform 3D audio API appropriate for use with gaming applications and many other types of audio applications. The basic OpenAL objects are a Listener, a Source, and a Buffer. + http://kcat.strangesoft.net/openal-releases/openal-soft-1.15.1.tar.bz2 + + alsa-lib-devel + pulseaudio-libs-devel + + + pthread.patch + no-fpuextended.patch + + + + + + + openal + + alsa-lib + + + /usr/bin + /usr/lib + /usr/share/doc/openal + /usr/share/openal + + + + + openal-devel + Development files for openal + + openal + pulseaudio + + + /usr/include + /usr/lib/pkgconfig/openal.pc + /usr/lib32/pkgconfig/openal.pc + + + + + openal-32bit + emul32 + 32-bit shared libraries for openal + emul32 + + openal + + + /usr/lib32 + + + + + + 2014-05-25 + 1.15.1 + Rebuild. + Alihan Öztürk + alihan@pisilinux.org + + + 2014-02-01 + 1.15.1 + Version Bump. + Alihan Öztürk + alihan@pisilinux.org + + + 2012-08-31 + 1.14 + First release + Fatih Turgel + admins@pisilinux.org + + + diff --git a/multimedia/sound/openal/translations.xml b/multimedia/sound/openal/translations.xml new file mode 100644 index 0000000000..3a49170a16 --- /dev/null +++ b/multimedia/sound/openal/translations.xml @@ -0,0 +1,19 @@ + + + + openal + Açık ses kütüphanesi + OpenAL, oyun uygulamaları ve diğer birçok audio uygulama tipleriyle kullanılmaya tahsisli bir üç boyutlu audio API(Uygulama Programlama Arayüzü) çapraz platformudur. + OpenAL est une API audio 3D multi-plateforme utilisable pour les jeux et beaucoup d'autre types d'application audio. Les objets de base d'OpenAL sont le Listener (auditeur), a Source (source), et le Buffer (tampon). + + + + openal-devel + openal için geliştirme dosyaları + + + + openal-32bit + openal için 32-bit paylaşımlı kitaplıklar + + diff --git a/multimedia/sound/pulseaudio/actions.py b/multimedia/sound/pulseaudio/actions.py new file mode 100644 index 0000000000..3d3c7f72d6 --- /dev/null +++ b/multimedia/sound/pulseaudio/actions.py @@ -0,0 +1,101 @@ +#!/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 get +from pisi.actionsapi import libtools +from pisi.actionsapi import autotools +from pisi.actionsapi import pisitools +from pisi.actionsapi import shelltools + +# FIXME: libpulsedsp.la should be added, but it doesn't build on our system +emul32_libs = "libpulsecommon-%s.la \ + libpulse.la \ + libpulse-simple.la \ + libpulse-mainloop-glib.la \ + " % get.srcVERSION() + +def setup(): + options = "--prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --libexecdir=/usr/libexec \ + --disable-dependency-tracking \ + --disable-static \ + --disable-rpath \ + --disable-jack \ + --disable-systemd \ + --disable-bluez4 \ + --disable-oss-output \ + --enable-largefile \ + --with-system-user=pulse \ + --with-system-group=pulse \ + --with-access-group=pulse-access \ + --with-database=tdb \ + --with-module-dir=/usr/lib/pulse/modules \ + --with-udev-rules-dir=/lib/udev/rules.d" + + if get.buildTYPE() == "emul32": + options += " --libdir=/usr/lib32 \ + --libexecdir=/usr/lib32 \ + --disable-gconf \ + --disable-gtk2 \ + --disable-jack \ + --disable-bluez4 \ + --disable-bluez5 \ + --disable-asyncns \ + --disable-lirc \ + --disable-x11 \ + --disable-oss-output \ + --disable-oss-wrapper \ + --disable-solaris \ + --disable-manpages \ + --disable-samplerate \ + --disable-default-build-tests" + + shelltools.echo(".tarball-version", get.srcVERSION()) + #shelltools.system("NOCONFIGURE=1 ./bootstrap.sh") + autotools.configure(options) + + pisitools.dosed("libtool", "CC(\s-shared\s)", r"CC -Wl,-O1,--as-needed\1") + +def build(): + if get.buildTYPE() == "emul32": + autotools.make("-C src %s" % emul32_libs) + return + + autotools.make() + + #generate html docs + autotools.make("doxygen") + +def install(): + if get.buildTYPE() == "emul32": + autotools.rawInstall("-C src \ + lib_LTLIBRARIES=\"%s\" \ + DESTDIR=%s" % (emul32_libs, get.installDIR()), + "install-libLTLIBRARIES") + autotools.rawInstall("DESTDIR=%s" % get.installDIR(), "install-pkgconfigDATA") + return + + autotools.rawInstall("DESTDIR=%s" % get.installDIR()) + + # Disable autospawn by default + shelltools.system("sed -e '/autospawn/iautospawn=yes' -i '%s/etc/pulse/client.conf'" % get.installDIR()) + # Speed up pulseaudio shutdown + # Lower resample quality, saves CPU + shelltools.system("sed -e '/exit-idle-time/iexit-idle-time=0' \ + -e '/resample-method/iresample-method=speex-float-0' \ + -i '%s/etc/pulse/daemon.conf'" % get.installDIR()) + + # Needed for service.py + pisitools.dodir("/run/pulse") + pisitools.dodir("/var/lib/pulse") + + # HAL is no longer supported by default + pisitools.removeDir("/etc/dbus-1") + + pisitools.dodoc("README", "LICENSE", "GPL", "LGPL") + pisitools.dohtml("doxygen/html/*") diff --git a/multimedia/sound/pulseaudio/comar/package.py b/multimedia/sound/pulseaudio/comar/package.py new file mode 100644 index 0000000000..3b22bcb3b3 --- /dev/null +++ b/multimedia/sound/pulseaudio/comar/package.py @@ -0,0 +1,9 @@ +#!/usr/bin/python + +import os + +PULSE_DIR="/var/lib/pulse" + +def postInstall(fromVersion, fromRelease, toVersion, toRelease): + os.system("/bin/chown pulse:pulse %s" % PULSE_DIR) + os.chmod(PULSE_DIR, 0700) \ No newline at end of file diff --git a/multimedia/sound/pulseaudio/files/02PulseAudio b/multimedia/sound/pulseaudio/files/02PulseAudio new file mode 100644 index 0000000000..b631f48072 --- /dev/null +++ b/multimedia/sound/pulseaudio/files/02PulseAudio @@ -0,0 +1,98 @@ +#! /bin/sh + +. "${PM_FUNCTIONS}" + +test_pulse_system() { + getent passwd pulse | awk -F: '{print $3}' +} + +get_pulse_users() { + PULSE_SYSTEM_USER=$(test_pulse_system) + if [ -z "${PULSE_SYSTEM_USER}" ]; then + ps -C pulseaudio -o uid= | tr -d ' ' + else + ps -C pulseaudio -o uid= | tr -d ' ' | sed s/${PULSE_SYSTEM_USER}// + fi +} + +# $1 = sink|source +# $2 = username +save_pulse_state() { + su "${2}" -c -- "pacmd list-${1}s" | \ + sed -n "s/^[[:space:]*]*//; /\(index\|mute\)/p" | \ + (index=""; + while read field value; do + if [ ${field%:} = "index" ]; then + index=${value} + else + savestate pulse:"${2}":${1}${index} ${value} + fi + done) +} + +# $1 = sink|source +# $2 = username +restore_pulse_state() { + su "${2}" -c -- "pacmd list-${1}s" | \ + sed -n "s/^[[:space:]*]*index: //p" | \ + while read index; do + if state_exists pulse:"${2}":${1}${index}; then + su "${2}" -c -- "pacmd \ + set-${1}-mute \ + ${index} \ + $(restorestate pulse:"${2}":${1}${index})" + fi + done +} + +# $1 = sink|source +# $2 = username +mute_pulse() { + su "${2}" -c -- "pacmd list-${1}s" | \ + sed -n "s/^[[:space:]*]*//; /\(index\|mute\)/p" | \ + (index=""; + while read field value; do + if [ ${field%:} = "index" ]; then + index=${value} + su "${2}" -c -- "pacmd \ + set-${1}-mute ${index} yes" + fi + done) +} + +suspend_pulse() { + for i in $(get_pulse_users); do + THIS_USER="$(getent passwd ${i} | cut -f1 -d:)" + save_pulse_state sink "${THIS_USER}" + save_pulse_state source "${THIS_USER}" + su "${THIS_USER}" -c -- 'pacmd suspend true' > /dev/null 2>&1 + done + for i in $(get_pulse_users); do + THIS_USER="$(getent passwd ${i} | cut -f1 -d:)" + if su "${THIS_USER}" -c -- 'ck-list-sessions | grep "active = TRUE"' > /dev/null 2>&1; then + mute_pulse sink "${THIS_USER}" + mute_pulse source "${THIS_USER}" + break + fi + done +} + +resume_pulse() { + for i in $(get_pulse_users); do + THIS_USER="$(getent passwd ${i} | cut -f1 -d:)" + restore_pulse_state sink "${THIS_USER}" + restore_pulse_state source "${THIS_USER}" + su "${THIS_USER}" -c -- 'pacmd suspend false' > /dev/null 2>&1 + done +} + +case $1 in + hibernate|suspend) + suspend_pulse + ;; + thaw|resume) + resume_pulse + ;; + *) exit $NA + ;; +esac diff --git a/multimedia/sound/pulseaudio/files/fedora/0036-module-switch-on-port-available-Don-t-switch-profile.patch b/multimedia/sound/pulseaudio/files/fedora/0036-module-switch-on-port-available-Don-t-switch-profile.patch new file mode 100644 index 0000000000..e8ff6e051a --- /dev/null +++ b/multimedia/sound/pulseaudio/files/fedora/0036-module-switch-on-port-available-Don-t-switch-profile.patch @@ -0,0 +1,35 @@ +From ef4a41e8b0ef81a53769d853dbc7679b25252327 Mon Sep 17 00:00:00 2001 +From: David Henningsson +Date: Fri, 28 Mar 2014 11:59:09 +0100 +Subject: [PATCH 36/38] module-switch-on-port-available: Don't switch profiles + on uninitialized cards + +This could cause the HDMI port to become the default on some systems +where analog output was available. + +BugLink: https://bugs.launchpad.net/ubuntu/+source/pulseaudio/+bug/1256511 +BugLink: https://bugs.freedesktop.org/show_bug.cgi?id=73375 +Signed-off-by: David Henningsson +--- + src/modules/module-switch-on-port-available.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/modules/module-switch-on-port-available.c b/src/modules/module-switch-on-port-available.c +index 2c7ad17..c560306 100644 +--- a/src/modules/module-switch-on-port-available.c ++++ b/src/modules/module-switch-on-port-available.c +@@ -173,6 +173,11 @@ static pa_hook_result_t port_available_hook_callback(pa_core *c, pa_device_port + return PA_HOOK_OK; + } + ++ if (pa_idxset_size(card->sinks) == 0 && pa_idxset_size(card->sources) == 0) ++ /* This card is not initialized yet. We'll handle it in ++ sink_new / source_new callbacks later. */ ++ return PA_HOOK_OK; ++ + find_sink_and_source(card, port, &sink, &source); + + is_active_profile = card->active_profile == pa_hashmap_get(port->profiles, card->active_profile->name); +-- +1.9.0 + diff --git a/multimedia/sound/pulseaudio/files/fedora/pulseaudio-4.0-kde_autostart_phase.patch b/multimedia/sound/pulseaudio/files/fedora/pulseaudio-4.0-kde_autostart_phase.patch new file mode 100644 index 0000000000..853f665c3f --- /dev/null +++ b/multimedia/sound/pulseaudio/files/fedora/pulseaudio-4.0-kde_autostart_phase.patch @@ -0,0 +1,16 @@ +diff -up pulseaudio-4.0-266-gf81e3/src/daemon/pulseaudio-kde.desktop.in.kde_autostart_phase pulseaudio-4.0-266-gf81e3/src/daemon/pulseaudio-kde.desktop.in +--- pulseaudio-4.0-266-gf81e3/src/daemon/pulseaudio-kde.desktop.in.kde_autostart_phase 2013-10-10 17:02:01.000000000 -0500 ++++ pulseaudio-4.0-266-gf81e3/src/daemon/pulseaudio-kde.desktop.in 2013-12-07 13:15:24.034110082 -0600 +@@ -9,3 +9,4 @@ Type=Application + Categories= + GenericName= + OnlyShowIn=KDE; ++X-KDE-autostart-phase=1 +diff -up pulseaudio-4.0-266-gf81e3/src/daemon/pulseaudio.desktop.in.kde_autostart_phase pulseaudio-4.0-266-gf81e3/src/daemon/pulseaudio.desktop.in +--- pulseaudio-4.0-266-gf81e3/src/daemon/pulseaudio.desktop.in.kde_autostart_phase 2013-10-10 17:02:01.000000000 -0500 ++++ pulseaudio-4.0-266-gf81e3/src/daemon/pulseaudio.desktop.in 2013-12-07 13:15:17.579180709 -0600 +@@ -9,3 +9,4 @@ Type=Application + Categories= + GenericName= + X-GNOME-Autostart-Phase=Initialization ++X-KDE-autostart-phase=1 diff --git a/multimedia/sound/pulseaudio/files/fedora/pulseaudio-x11_device_manager.patch b/multimedia/sound/pulseaudio/files/fedora/pulseaudio-x11_device_manager.patch new file mode 100644 index 0000000000..f8e4cdf2b0 --- /dev/null +++ b/multimedia/sound/pulseaudio/files/fedora/pulseaudio-x11_device_manager.patch @@ -0,0 +1,14 @@ +diff -up pulseaudio-4.0-266-gf81e3/src/daemon/start-pulseaudio-x11.in.x11_device_manager pulseaudio-4.0-266-gf81e3/src/daemon/start-pulseaudio-x11.in +--- pulseaudio-4.0-266-gf81e3/src/daemon/start-pulseaudio-x11.in.x11_device_manager 2013-10-10 17:02:01.000000000 -0500 ++++ pulseaudio-4.0-266-gf81e3/src/daemon/start-pulseaudio-x11.in 2013-10-14 09:44:04.375542726 -0500 +@@ -26,6 +26,10 @@ if [ x"$DISPLAY" != x ] ; then + @PACTL_BINARY@ load-module module-x11-publish "display=$DISPLAY" > /dev/null + @PACTL_BINARY@ load-module module-x11-cork-request "display=$DISPLAY" > /dev/null + ++ if [ x"$KDE_FULL_SESSION" = x"true" ]; then ++ @PACTL_BINARY@ load-module module-device-manager "do_routing=1" > /dev/null ++ fi ++ + if [ x"$SESSION_MANAGER" != x ] ; then + @PACTL_BINARY@ load-module module-x11-xsmp "display=$DISPLAY session_manager=$SESSION_MANAGER" > /dev/null + fi diff --git a/multimedia/sound/pulseaudio/files/mandriva/pulseaudio.svg b/multimedia/sound/pulseaudio/files/mandriva/pulseaudio.svg new file mode 100644 index 0000000000..a79e03daf7 --- /dev/null +++ b/multimedia/sound/pulseaudio/files/mandriva/pulseaudio.svg @@ -0,0 +1,287 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + PulseAudio logotype + 2006-08-28 + + + Pierre Ossman <ossman@cendio.se> for Cendio AB + + + + + + + + + + Rafael Jannone (basic idea) + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/multimedia/sound/pulseaudio/files/mandriva/pulseaudio.sysconfig b/multimedia/sound/pulseaudio/files/mandriva/pulseaudio.sysconfig new file mode 100644 index 0000000000..2d125fa37f --- /dev/null +++ b/multimedia/sound/pulseaudio/files/mandriva/pulseaudio.sysconfig @@ -0,0 +1,14 @@ +# Set the below variable to suit your needs. +# Possible values are: +# personal Start a personal pulseaudio server per-user (recommended) +# system Start a system wide daemon (not yet implemented) +# none Don't start pulse +# +# NB For the system wide daemon, users need to be in the group pulse-access. +# +PULSE_SERVER_TYPE=personal + +# Set the various arguments to the daemon here +# This defaults to: +# --log-target=syslog for "personal" +#PULSE_ARGS= diff --git a/multimedia/sound/pulseaudio/files/mandriva/pulseaudio.xinit b/multimedia/sound/pulseaudio/files/mandriva/pulseaudio.xinit new file mode 100644 index 0000000000..b2ce7151e7 --- /dev/null +++ b/multimedia/sound/pulseaudio/files/mandriva/pulseaudio.xinit @@ -0,0 +1,12 @@ +#!/bin/sh +# to be sourced + +case "$SESSION" in + GNOME|KDE*|xfce4) + # XDG is supported so we don't need to do anything. + # as XDG Autostart will "just work"(tm) + ;; + *) + /usr/bin/start-pulseaudio-x11 + ;; +esac diff --git a/multimedia/sound/pulseaudio/files/mandriva/pulseaudio128.png b/multimedia/sound/pulseaudio/files/mandriva/pulseaudio128.png new file mode 100644 index 0000000000..49706c8cce Binary files /dev/null and b/multimedia/sound/pulseaudio/files/mandriva/pulseaudio128.png differ diff --git a/multimedia/sound/pulseaudio/files/mandriva/pulseaudio16.png b/multimedia/sound/pulseaudio/files/mandriva/pulseaudio16.png new file mode 100644 index 0000000000..3cedaa1783 Binary files /dev/null and b/multimedia/sound/pulseaudio/files/mandriva/pulseaudio16.png differ diff --git a/multimedia/sound/pulseaudio/files/mandriva/pulseaudio22.png b/multimedia/sound/pulseaudio/files/mandriva/pulseaudio22.png new file mode 100644 index 0000000000..899ff1d296 Binary files /dev/null and b/multimedia/sound/pulseaudio/files/mandriva/pulseaudio22.png differ diff --git a/multimedia/sound/pulseaudio/files/mandriva/pulseaudio32.png b/multimedia/sound/pulseaudio/files/mandriva/pulseaudio32.png new file mode 100644 index 0000000000..04308a8686 Binary files /dev/null and b/multimedia/sound/pulseaudio/files/mandriva/pulseaudio32.png differ diff --git a/multimedia/sound/pulseaudio/files/mandriva/pulseaudio48.png b/multimedia/sound/pulseaudio/files/mandriva/pulseaudio48.png new file mode 100644 index 0000000000..ac8fc13d4a Binary files /dev/null and b/multimedia/sound/pulseaudio/files/mandriva/pulseaudio48.png differ diff --git a/multimedia/sound/pulseaudio/files/mandriva/pulseaudio64.png b/multimedia/sound/pulseaudio/files/mandriva/pulseaudio64.png new file mode 100644 index 0000000000..4813309284 Binary files /dev/null and b/multimedia/sound/pulseaudio/files/mandriva/pulseaudio64.png differ diff --git a/multimedia/sound/pulseaudio/files/pisilinux/pulseaudio.sysconfig b/multimedia/sound/pulseaudio/files/pisilinux/pulseaudio.sysconfig new file mode 100644 index 0000000000..9c7c0ebce9 --- /dev/null +++ b/multimedia/sound/pulseaudio/files/pisilinux/pulseaudio.sysconfig @@ -0,0 +1,22 @@ +# Set the below variable to suit your needs. +# Possible values are: +# personal Start a personal pulseaudio server per-user (recommended) +# system Start a system wide daemon (not yet implemented) +# none Don't start pulse +# +# NB For the system wide daemon, users need to be in the group pulse-access. +# +PULSE_SERVER_TYPE=personal + +# Set the various arguments to the daemon here +# This defaults to: +# --log-target=syslog for "personal" +#PULSE_ARGS= +## Path: Hardware/Soundcard/PulseAudio +## Description: PulseAudio configuration +## Type: list(yes,no,custom) +# +# Enable or disable PulseAudio system. Can be set to "custom" to not have +# scripts automatically change sound-related configuration for PulseAudio. +# +PULSEAUDIO_ENABLE="yes" diff --git a/multimedia/sound/pulseaudio/files/pulseaudio.conf b/multimedia/sound/pulseaudio/files/pulseaudio.conf new file mode 100644 index 0000000000..699915f6b2 --- /dev/null +++ b/multimedia/sound/pulseaudio/files/pulseaudio.conf @@ -0,0 +1 @@ +d /run/pulse 0755 root root \ No newline at end of file diff --git a/multimedia/sound/pulseaudio/files/tmpfiles.conf b/multimedia/sound/pulseaudio/files/tmpfiles.conf new file mode 100644 index 0000000000..b04555ea28 --- /dev/null +++ b/multimedia/sound/pulseaudio/files/tmpfiles.conf @@ -0,0 +1 @@ +d //run/pulse 0755 root root diff --git a/multimedia/sound/pulseaudio/pspec.xml b/multimedia/sound/pulseaudio/pspec.xml new file mode 100644 index 0000000000..28430f1a28 --- /dev/null +++ b/multimedia/sound/pulseaudio/pspec.xml @@ -0,0 +1,255 @@ + + + + + pulseaudio + http://pulseaudio.org/ + + PisiLinux Community + admins@pisilinux.org + + LGPLv2 + GPLv2 + BSD + app:console + library + A networked sound server with an advanced plugin system + pulseaudio is a sound server for POSIX and Win32 systems. It allows you to do advanced operations on your sound data as it passes between your application and your hardware. + http://freedesktop.org/software/pulseaudio/releases/pulseaudio-6.0.tar.xz + + orc-devel + sbc-devel + fftw3-devel + doxygen + xcb-proto + gtk2-devel + lirc-devel + gconf-devel + avahi-devel + speex-devel + libSM-devel + libtdb-devel + libICE-devel + libXtst-devel + xcb-util-devel + alsa-lib-devel + bluez-libs-devel + libsndfile-devel + libasyncns-devel + libatomic_ops-devel + libsamplerate-devel + libasyncns-devel + + + + + pulseaudio-libs + Libraries for PulseAudio clients + + orc + sbc + lirc + fftw3 + libSM + speex + libICE + libXtst + alsa-lib + avahi-libs + libasyncns + libsndfile + + + /usr/bin/pa* + /etc/pulse/client.conf + /usr/lib/libpulse.so + /usr/lib/libpulse.so* + /usr/lib/libpulse-simple.so + /usr/lib/libpulse-simple.so* + /usr/lib/pulseaudio/libpulsecommon-* + /usr/lib/libpulse-mainloop-glib.so + /usr/lib/libpulse-mainloop-glib.so* + /usr/lib/pulseaudio/libpulsedsp.* + /usr/lib/pulse/modules + /usr/lib/udev/rules.d + + + + + pulseaudio-libs-devel + Development files for pulseaudio-libs + + pulseaudio-libs + + + /usr/include + /usr/lib/pkgconfig + /usr/lib32/pkgconfig + /usr/share/vala/vapi + /usr/lib/cmake/PulseAudio + + + + pulseaudio-docs + doxygen generated API documentation for PulseAudio + + /usr/share/doc/pulseaudio/html + + + + + pulseaudio + + orc + speex + libtdb + libsndfile + pulseaudio-libs + + + /usr/bin/pulseaudio + /usr/bin/qpaeq + /usr/bin/start-pulseaudio-kde + /usr/bin/esdcompat + /usr/bin/start-pulseaudio-x11 + /usr/lib/pm-utils/sleep.d + /usr/libexec + /usr/lib/pulse-5.0/modules + /usr/lib/libpulsecore-*.so + /etc + /usr/lib/tmpfiles.d/pulseaudio.conf + /lib/udev/rules.d + /usr/share/pulseaudio/alsa-mixer + /usr/share + /usr/share/icons + /var/lib/pulse + /run/pulse + + + pulseaudio.conf + + pisilinux/pulseaudio.sysconfig + + mandriva/pulseaudio.svg + mandriva/pulseaudio.svg + + mandriva/pulseaudio16.png + mandriva/pulseaudio22.png + mandriva/pulseaudio32.png + mandriva/pulseaudio48.png + mandriva/pulseaudio64.png + mandriva/pulseaudio128.png + + mandriva/pulseaudio16.png + mandriva/pulseaudio22.png + mandriva/pulseaudio32.png + mandriva/pulseaudio48.png + mandriva/pulseaudio64.png + mandriva/pulseaudio128.png + + + + System.Package + + + + + pulseaudio-gconf + GConf configuration backend for the PulseAudio sound server + + pulseaudio-libs + gconf + + + /usr/lib/pulse-2.1/modules/module-gconf.so + /usr/libexec/pulse/gconf-helper + + + + + pulseaudio-libs-32bit + emul32 + 32-bit shared libraries for pulseaudio-libs + emul32 + + json-c-32bit + dbus-32bit + glib2-32bit + speex-32bit + libcap-32bit + libsndfile-32bit + libtool-ltdl-32bit + + + pulseaudio-libs + dbus-32bit + glib2-32bit + libsndfile-32bit + json-c-32bit + + + /usr/lib32 + + + + + + 2015-02-20 + 6.0 + Version bump. Dep fixed + Hakan Yıldız + hknyldz93@gmail.com + + + 2014-07-25 + 5.0 + Rebuild for smplayer + Vedat Demir + vedat@pisilinux.org + + + 2014-05-12 + 5.0 + version bump + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2014-02-14 + 4.0 + add git version + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2014-01-11 + 4.0 + Add tmpfiles.con; add updates from git. + Marcin Bojara + marcin@pisilinux.org + + + 2013-07-06 + 4.0 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-04-16 + 3.99 + Version bump + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2012-12-18 + 3.0 + First release + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + diff --git a/multimedia/sound/pulseaudio/translations.xml b/multimedia/sound/pulseaudio/translations.xml new file mode 100644 index 0000000000..e9a8a6f2cb --- /dev/null +++ b/multimedia/sound/pulseaudio/translations.xml @@ -0,0 +1,38 @@ + + + + pulseaudio + Gelişmiş eklenti desteğine sahip ağ temelli bir ses sunucusu + pulseaudio, POSIX ve Win32 sistemler için tasarlanmış, donanım ve uygulamalar arasında gezinen ses verilerinin üzerinde gelişmiş işlemler yapılmasına olanak sağlayan bir ses sunucusudur. + + + + pulseaudio-gconf + pulseaudio ses sunucusu için Gconf yapılandırma arayüzü + + + + pulseaudio-docs + Doxygen tarafından üretilmiş PulseAudio API belgeleri + + + + pulseaudio-jack + JACK ses arayüzü için PulseAudio modülleri + + + + pulseaudio-libs + PulseAudio istemci kitaplığı + + + + pulseaudio-libs-devel + pulseaudio-libs için geliştirme dosyaları + + + + pulseaudio-libs-32bit + pulseaudio-libs için 32-bit paylaşımlı kitaplıklar + + diff --git a/multimedia/video/component.xml b/multimedia/video/component.xml new file mode 100644 index 0000000000..057c7822fe --- /dev/null +++ b/multimedia/video/component.xml @@ -0,0 +1,3 @@ + + multimedia.video + diff --git a/multimedia/video/gst-plugins-bad/actions.py b/multimedia/video/gst-plugins-bad/actions.py new file mode 100644 index 0000000000..b2be714676 --- /dev/null +++ b/multimedia/video/gst-plugins-bad/actions.py @@ -0,0 +1,46 @@ +#!/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(): + shelltools.export("AUTOPOINT", "true") + pisitools.dosed("autogen.sh", "tool_run.*autopoint --force.*") + + pisitools.dosed("ext/modplug/gstmodplug.cc", "stdafx.h", "libmodplug/stdafx.h") + + shelltools.export("NOCONFIGURE", "1") + shelltools.system("./autogen.sh") + + autotools.configure("--disable-static \ + --disable-examples \ + --disable-gtk-doc \ + --disable-rpath \ + --with-package-name='PisiLinux gstreamer-plugins-bad package' \ + --with-package-origin='http://www.pisilinux.org' \ + --disable-experimental \ + --disable-assrender") + + # for fix unused dependency + pisitools.dosed("libtool"," -shared ", " -Wl,--as-needed -shared ") + + +def build(): + autotools.make() + +#FIXME: tests now tries to +#def check(): +# # for sandbox violations +# autotools.make("-C tests/check check") + +def install(): + autotools.rawInstall("DESTDIR=%s" % get.installDIR()) + + pisitools.dodoc("ABOUT-NLS", "AUTHORS", "ChangeLog", "COPYING*", "NEWS", "README", "RELEASE", "REQUIREMENTS") + diff --git a/multimedia/video/gst-plugins-bad/files/directfb.patch b/multimedia/video/gst-plugins-bad/files/directfb.patch new file mode 100644 index 0000000000..b96a26d5fc --- /dev/null +++ b/multimedia/video/gst-plugins-bad/files/directfb.patch @@ -0,0 +1,12 @@ +diff -ur gst-plugins-bad-0.10.23.orig/ext/directfb/dfb-example.c gst-plugins-bad-0.10.23/ext/directfb/dfb-example.c +--- ext/directfb/dfb-example.c 2011-12-11 20:49:11.000000000 +0200 ++++ ext/directfb/dfb-example.c 2012-11-07 20:57:47.614763209 +0200 +@@ -1,7 +1,7 @@ + +-#include + #include + #include ++#include + + static IDirectFB *dfb = NULL; + static IDirectFBSurface *primary = NULL; diff --git a/multimedia/video/gst-plugins-bad/pspec.xml b/multimedia/video/gst-plugins-bad/pspec.xml new file mode 100644 index 0000000000..8b585bf008 --- /dev/null +++ b/multimedia/video/gst-plugins-bad/pspec.xml @@ -0,0 +1,217 @@ + + + + + gst-plugins-bad + http://gstreamer.freedesktop.org/modules/gst-plugins-bad.html + + PisiLinux Community + admins@pisilinux.org + + GPLv2 + library + A set of GStreamer plug-ins that aren't up to par compared to the rest + GStreamer Bad Plug-ins is a set of plug-ins that aren't up to par compared to the rest. They might be close to being good quality, but they're missing something - be it a good code review, some documentation, a set of tests, a real live maintainer, or some actual wide use. + http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-0.10.23.tar.bz2 + + gst-plugins-base-devel + gstreamer-devel + DirectFB-devel + libcdaudio-devel + libdc1394-devel + libdca-devel + faac-devel + faad2-devel + jasper-devel + gsm-devel + alsa-lib-devel + jack-audio-connection-kit-devel + ladspa-sdk-devel + libmms-devel + liblrdf-devel + libmimic-devel + libmodplug-devel + libmpcdec-devel + mjpegtools-devel + musicbrainz-devel + neon-devel + libofa-devel + libsdl-devel + liboil-devel + soundtouch-devel + libdvdnav-devel + libtheora-devel + libsndfile-devel + xvid-devel + libdvdread-devel + exempi-devel + slv2-devel + libvdpau-devel + libkate-devel + cairo-devel + librsvg-devel + libvpx-devel + flite-devel + rtmpdump-devel + opencv-devel + schroedinger-devel + libopus-devel + orc-devel + zvbi-devel + openal-devel + gdk-pixbuf-devel + libvo-aacenc-devel + libvo-amrwbenc-devel + nas-devel + libSM-devel + libICE-devel + celt-devel + + + + directfb.patch + + + + + gst-plugins-bad + + gst-plugins-base + gstreamer + DirectFB + libcdaudio + nas + celt + libSM + libICE + libdc1394 + libdca + faac + faad2 + jasper + gsm + alsa-lib + jack-audio-connection-kit + ladspa-sdk + libmms + liblrdf + libmimic + libmodplug + libmpcdec + mjpegtools + musicbrainz + neon + libofa + libsdl + liboil + soundtouch + libdvdnav + libtheora + libsndfile + libexif + xvid + libdvdread + exempi + slv2 + libvdpau + libkate + cairo + librsvg + libvpx + flite + rtmpdump + opencv + schroedinger + libopus + orc + zvbi + openal + gdk-pixbuf + libvo-aacenc + libvo-amrwbenc + + + /usr/bin + /usr/lib + /usr/share/locale + /usr/share/gstreamer-0.10 + /usr/share/doc + /usr/share/gtk-doc + /usr/share/glib-2.0/schemas + + + + + gst-plugins-bad-devel + Development files for gst-plugins-bad + + gst-plugins-bad + gstreamer-devel + + + /usr/lib/pkgconfig + /usr/include + + + + + + 2014-05-26 + 0.10.23 + Rebuild. + Alihan Öztürk + alihan@pisilinux.org + + + 2014-02-13 + 0.10.23 + Rebuild for mjpegtools + Kamil Atlı + suvarice@gmail.com + + + 2013-10-19 + 0.10.23 + Fix build dependency's. + Ertuğrul Erata + ertugrulerata@gmail.com + + + 2013-10-14 + 0.10.23 + clean build. + Erdinç Gültekin + erdincgultekin@pisilinux.org + + + 2013-10-14 + 0.10.23 + rebuild for DirectFB. + Erdinç Gültekin + erdincgultekin@pisilinux.org + + + 2013-07-28 + 0.10.23 + Dep Fixed. + Erdinç Gültekin + erdincgultekin@pisilinux.org + + + 2013-05-25 + 0.10.23 + Dep Fixed. + Osman Erkan + osman.erkan@pisilinux.org + + + 2012-11-09 + 0.10.23 + First release + Serdar Soytetir + kaptan@pisilinux.org + + + diff --git a/multimedia/video/gst-plugins-bad/translations.xml b/multimedia/video/gst-plugins-bad/translations.xml new file mode 100644 index 0000000000..9489ea72f0 --- /dev/null +++ b/multimedia/video/gst-plugins-bad/translations.xml @@ -0,0 +1,13 @@ + + + + gst-plugins-bad + Diğer eklentilerle karşılaştırıldığında çok iyi durumda olmayan gstreamer eklentileri + gst-plugins-bad, iyiye yakın kalitede olan ancak gerçek bir geliştirici, belgelendirme, test seti gibi eksikleri bulunan eklentilerdir. + + + + gst-plugins-bad-devel + gst-plugins-bad için geliştirme dosyaları + + diff --git a/multimedia/video/gst-plugins-base-next/actions.py b/multimedia/video/gst-plugins-base-next/actions.py new file mode 100644 index 0000000000..9461f54231 --- /dev/null +++ b/multimedia/video/gst-plugins-base-next/actions.py @@ -0,0 +1,32 @@ +#!/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(): + autotools.autoreconf("-vfi") + autotools.configure("--disable-static \ + --enable-experimental \ + --with-package-name='PisiLinux gstreamer-plugins-base package' \ + --with-package-origin='http://www.pisilinux.org'") + + pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ") + +def build(): + autotools.make() + +# tests fail sandbox +#def check(): +# autotools.make("-C tests/check check") + +def install(): + autotools.install() + + pisitools.dodoc("AUTHORS", "ChangeLog", "COPYING", "README") diff --git a/multimedia/video/gst-plugins-base-next/pspec.xml b/multimedia/video/gst-plugins-base-next/pspec.xml new file mode 100644 index 0000000000..35f9946e0d --- /dev/null +++ b/multimedia/video/gst-plugins-base-next/pspec.xml @@ -0,0 +1,135 @@ + + + + + gst-plugins-base-next + http://gstreamer.net/ + + PisiLinux Community + admins@pisilinux.org + + GPLv2 + library + Basepack of plugins for gstreamer + GStreamer base plugins are a well-groomed and well-maintained collection of GStreamer plugins and elements, spanning the range of possible types of elements one would want to write for GStreamer. It also contains helper libraries and base classes useful for writing elements. A wide range of video and audio decoders, encoders, and filters are included. + http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.4.5.tar.xz + + gstreamer-next-devel + cdparanoia + pango-devel + cairo-devel + libXv-devel + liboil-devel + libogg-devel + libXext-devel + alsa-lib-devel + libvorbis-devel + libtheora-devel + libvisual-devel + gobject-introspection-devel + orc-devel + + + + + + gst-plugins-base-next + + gstreamer-next + cdparanoia + pango + cairo + libXv + liboil + libogg + libXext + alsa-lib + libvorbis + libvisual + libtheora + orc + libSM + libICE + + + /usr/bin + /usr/lib + /usr/share/doc + /usr/share/gtk-doc + /usr/share/gir-1.0 + /usr/share/man + /usr/share/locale + /usr/share/gst-plugins-base/1.0 + + + + + gst-plugins-base-next-devel + Development files for gst-plugins-base + + gst-plugins-base-next + gstreamer-next-devel + + + /usr/include + /usr/lib/pkgconfig + + /usr/share/man/man3 + + + + + + 2015-04-18 + 1.4.5 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2014-08-22 + 1.4.0 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2014-05-28 + 1.2.4 + Version bump. + Alihan Öztürk + alihan@pisilinux.org + + + 2014-02-14 + 1.2.3 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2013-11-20 + 1.2.1 + Version bump + Richard de Bruin + richdb@pisilinux.org + + + 2013-10-14 + 1.2 + bump + Erdinç Gültekin + erdincgultekin@pisilinux.org + + + 2013-08-30 + 1.1.4 + First release + PisiLinux Community + admins@pisilinux.org + + + diff --git a/multimedia/video/gst-plugins-base-next/translations.xml b/multimedia/video/gst-plugins-base-next/translations.xml new file mode 100644 index 0000000000..5b1cb10920 --- /dev/null +++ b/multimedia/video/gst-plugins-base-next/translations.xml @@ -0,0 +1,14 @@ + + + + gst-plugins-base + Gstreamer için temel eklentiler paketi + Bu paket, Gstreamer'ın rahatlıkla genişleyebilmesini sağlayan ve bakımları sürekli yapılan temel eklentileri içerir. Program parçacığı yazmak için yardımcı kütüphaneler ve temel sınıflar da bulunur. + Les plug-ins (greffons) de base GStreamer est une collection bien peaufinée et bien maintenues de plug-ins et d'éléments GStreamer, couvrant l'éventail des types d'éléments que quelqu'un pourrait vouloir écrire pour GStreamer. Il contient également des librairies d'aide ainsi que les classes de bases utiles pour l'écriture d'éléments. Un grand nombre de décodeurs, d'encodeurs et de filtres audio et vidéos sont également inclus. + + + + gst-plugins-base-devel + gst-plugins-base için geliştirme dosyaları + + diff --git a/multimedia/video/gst-plugins-base/actions.py b/multimedia/video/gst-plugins-base/actions.py new file mode 100644 index 0000000000..d1fd9bec31 --- /dev/null +++ b/multimedia/video/gst-plugins-base/actions.py @@ -0,0 +1,43 @@ +#!/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 get +from pisi.actionsapi import autotools +from pisi.actionsapi import pisitools +from pisi.actionsapi import shelltools + +def setup(): + pisitools.dosed("configure.ac", "AM_CONFIG_HEADER", "AC_CONFIG_HEADERS") + opts = { + "introspection": "no" if get.buildTYPE() == "emul32" else "yes", + "gnome-vfs": "dis" if get.buildTYPE() == "emul32" else "en" + } + autotools.configure("--disable-static \ + --disable-rpath \ + --disable-examples \ + --%(gnome-vfs)sable-gnome-vfs \ + --enable-libvisual \ + --enable-experimental \ + --enable-introspection=%(introspection)s \ + --with-package-name='PisiLinux gstreamer-plugins-base package' \ + --with-package-origin='http://www.pisilinux.org' \ + " % opts) + + pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ") + +def build(): + autotools.make() + +# tests fail sandbox +#def check(): + #autotools.make("-C tests/check check") + +def install(): + autotools.rawInstall("DESTDIR=%s" % get.installDIR()) + + pisitools.removeDir("/usr/share/gtk-doc") + + pisitools.dodoc("AUTHORS", "ChangeLog", "COPYING", "README") \ No newline at end of file diff --git a/multimedia/video/gst-plugins-base/pspec.xml b/multimedia/video/gst-plugins-base/pspec.xml new file mode 100644 index 0000000000..04c8425212 --- /dev/null +++ b/multimedia/video/gst-plugins-base/pspec.xml @@ -0,0 +1,189 @@ + + + + + gst-plugins-base + http://gstreamer.net/ + + PisiLinux Community + admins@pisilinux.org + + GPLv2 + library + Basepack of plugins for gstreamer + GStreamer base plugins are a well-groomed and well-maintained collection of GStreamer plugins and elements, spanning the range of possible types of elements one would want to write for GStreamer. It also contains helper libraries and base classes useful for writing elements. A wide range of video and audio decoders, encoders, and filters are included. + http://ftp.gnome.org/pub/gnome/sources/gst-plugins-base/0.10/gst-plugins-base-0.10.36.tar.xz + + gstreamer-devel + libcdio-devel + cdparanoia-devel + pango-devel + cairo-devel + libXv-devel + liboil-devel + libogg-devel + libXext-devel + alsa-lib-devel + libvorbis-devel + libtheora-devel + libvisual-devel + gobject-introspection-devel + orc-devel + gnome-vfs-devel + + + + + gst-plugins-base + + gstreamer + libcdio + cdparanoia + pango + cairo + libXv + libogg + libXext + alsa-lib + libvorbis + libvisual + libtheora + orc + gnome-vfs + + + /usr/bin + /usr/lib/girepository-1.0 + /usr/lib/gstreamer-0.10 + /usr/lib/libgst* + /usr/share/doc + /usr/share/gir-1.0 + /usr/share/gst-plugins-base + /usr/share/man + /usr/share/locale + + + + + gst-plugins-base-32bit + emul32 + 32-bit shared libraries for gst-plugins-base + emul32 + + orc-32bit + zlib-32bit + glib2-32bit + libXv-32bit + cairo-32bit + pango-32bit + libSM-32bit + libogg-32bit + libICE-32bit + libX11-32bit + libxml2-32bit + libXext-32bit + alsa-lib-32bit + libtheora-32bit + gstreamer-32bit + libvorbis-32bit + libvisual-32bit + + + gst-plugins-base + orc-32bit + zlib-32bit + glib2-32bit + libXv-32bit + cairo-32bit + pango-32bit + libogg-32bit + libX11-32bit + libxml2-32bit + libXext-32bit + alsa-lib-32bit + libtheora-32bit + gstreamer-32bit + libvorbis-32bit + libvisual-32bit + + + /usr/lib32/gstreamer-0.10 + /usr/lib32/libgst* + + + + + gst-plugins-base-devel + Development files for gst-plugins-base + + gst-plugins-base + gstreamer-devel + + + /usr/include + /usr/lib/pkgconfig + /usr/lib32/pkgconfig/gstreamer*.pc + + /usr/share/man/man3 + + + + + + 2014-05-20 + 0.10.36 + Release bump. + Alihan Öztürk + alihan@pisilinux.org + + + 2014-02-27 + 0.10.36 + Rebuild Unused + Varol Maksutoğlu + waroi@pisilinux.org + + + 2014-01-01 + 0.10.36 + Fixed. + PisiLinux Community + admins@pisilinux.org + + + 2013-07-27 + 0.10.36 + Move pc files to devel pack, rebuild. + PisiLinux Community + admins@pisilinux.org + + + 2013-07-07 + 0.10.36 + Rebuild for libcdio-0.90 + Marcin Bojara + marcin@pisilinux.org + + + 2013-05-25 + 0.10.36 + configure fix. + PisiLinux Community + admins@pisilinux.org + + + 2013-02-14 + 0.10.36 + Add emul32 + Marcin Bojara + marcin@pisilinux.org + + + 2012-11-09 + 0.10.36 + First release + Serdar Soytetir + kaptan@pisilinux.org + + + diff --git a/multimedia/video/gst-plugins-base/translations.xml b/multimedia/video/gst-plugins-base/translations.xml new file mode 100644 index 0000000000..5b1cb10920 --- /dev/null +++ b/multimedia/video/gst-plugins-base/translations.xml @@ -0,0 +1,14 @@ + + + + gst-plugins-base + Gstreamer için temel eklentiler paketi + Bu paket, Gstreamer'ın rahatlıkla genişleyebilmesini sağlayan ve bakımları sürekli yapılan temel eklentileri içerir. Program parçacığı yazmak için yardımcı kütüphaneler ve temel sınıflar da bulunur. + Les plug-ins (greffons) de base GStreamer est une collection bien peaufinée et bien maintenues de plug-ins et d'éléments GStreamer, couvrant l'éventail des types d'éléments que quelqu'un pourrait vouloir écrire pour GStreamer. Il contient également des librairies d'aide ainsi que les classes de bases utiles pour l'écriture d'éléments. Un grand nombre de décodeurs, d'encodeurs et de filtres audio et vidéos sont également inclus. + + + + gst-plugins-base-devel + gst-plugins-base için geliştirme dosyaları + + diff --git a/multimedia/video/gstreamer-next/actions.py b/multimedia/video/gstreamer-next/actions.py new file mode 100644 index 0000000000..d45dd015a9 --- /dev/null +++ b/multimedia/video/gstreamer-next/actions.py @@ -0,0 +1,48 @@ +#!/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 shelltools +from pisi.actionsapi import autotools +from pisi.actionsapi import pisitools +from pisi.actionsapi import get + +def setup(): + shelltools.export("AUTOPOINT", "true") + autotools.autoreconf("-vfi") + + options = '--with-package-name="GStreamer for PisiLinux" \ + --with-package-origin="http://www.pisilinux.org" \ + --enable-nls \ + --disable-dependency-tracking \ + --disable-examples \ + --enable-introspection \ + --disable-static \ + --disable-rpath \ + --disable-valgrind \ + --disable-gtk-doc' + + if get.buildTYPE() == "emul32": + options += " --bindir=/usr/bin32 \ + --libexecdir=/usr/libexec32 \ + --disable-introspection" + + shelltools.export("PKG_CONFIG_PATH", "/usr/lib32/pkgconfig") + + autotools.configure(options) + + pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ") + +def build(): + autotools.make() + +def install(): + autotools.rawInstall("DESTDIR=%s" % get.installDIR()) + + if get.buildTYPE() == "emul32": + pisitools.removeDir("/usr/bin32") + pisitools.removeDir("/usr/libexec32") + + pisitools.dodoc("AUTHORS", "ChangeLog", "COPYING*", "NEWS", "README") \ No newline at end of file diff --git a/multimedia/video/gstreamer-next/pspec.xml b/multimedia/video/gstreamer-next/pspec.xml new file mode 100644 index 0000000000..3e7d094b82 --- /dev/null +++ b/multimedia/video/gstreamer-next/pspec.xml @@ -0,0 +1,126 @@ + + + + + gstreamer-next + http://gstreamer.freedesktop.org/ + + PisiLinux Community + admins@pisilinux.org + + LGPLv2.1 + library + app:console + GStreamer streaming media framework runtime + GStreamer is a streaming media framework, based on graphs of filters which operate on media data. Applications using this library can do anything from real-time sound processing to playing videos, and just about anything else media-related. + http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.4.5.tar.xz + + check + valgrind + gobject-introspection-devel + libxml2-devel + ghostscript-devel + clutter + + + + + gstreamer-next + + + + + /usr/bin + /usr/lib + /usr/libexec + /usr/share/gir-1.0 + /usr/share/doc + /usr/share/gtk-doc + /usr/share/locale + /usr/share/man + + + + + gstreamer-next-32bit + emul32 + 32-bit shared libraries for gstreamer + emul32 + + glib2-32bit + + + glib2-32bit + gstreamer-next + + + /usr/lib32 + + + + + gstreamer-next-devel + Development files for gstreamer + + gstreamer-next + + + /usr/include + /usr/lib/pkgconfig + /usr/lib32/pkgconfig + /usr/share/aclocal + + + + + + 2015-04-18 + 1.4.5 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2014-08-22 + 1.4.0 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2014-05-26 + 1.2.4 + Version bump. + Alihan Öztürk + alihan@pisilinux.org + + + 2014-02-13 + 1.2.3 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2013-11-20 + 1.2.1 + Version bump + Richard de Bruin + richdb@pisilinux.org + + + 2013-10-11 + 1.2.0 + bump + Erdinç Gültekin + erdincgultekin@pisilinux.org + + + 2013-08-30 + 1.1.4 + First release + PisiLinux Community + admins@pisilinux.org + + + diff --git a/multimedia/video/gstreamer-next/translations.xml b/multimedia/video/gstreamer-next/translations.xml new file mode 100644 index 0000000000..bd76538442 --- /dev/null +++ b/multimedia/video/gstreamer-next/translations.xml @@ -0,0 +1,19 @@ + + + + gstreamer + GStreamer ses yayın altyapısı + gstreamer bir ses yayın altyapısı kütüphanesidir. Bu kütüphaneyi kullanan uygulamalar, gerçek zamanlı ses işleme, görüntü oynatma gibi çokluortam ile ilgili birçok işlem gerçekleştirebilirler. + GStreamer est la librairies principale. Elle contient les entêtes, les fichiers et les éléments centraux. + + + + gstreamer-devel + gstreamer için geliştirme dosyaları + + + + gstreamer-32bit + gstreamer için 32-bit paylaşımlı kitaplıklar + + diff --git a/multimedia/video/gstreamer/actions.py b/multimedia/video/gstreamer/actions.py new file mode 100644 index 0000000000..8eb4ee7e5b --- /dev/null +++ b/multimedia/video/gstreamer/actions.py @@ -0,0 +1,51 @@ +#!/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 shelltools +from pisi.actionsapi import autotools +from pisi.actionsapi import pisitools +from pisi.actionsapi import get + +def setup(): + shelltools.export("AUTOPOINT", "true") + autotools.autoreconf("-vfi") + #shelltools.system("./autogen.sh --disable-gtk-doc --disable-docbook") + + options = '--with-package-name="GStreamer for PisiLinux" \ + --with-package-origin="http://www.pisilinux.org" \ + --enable-nls \ + --disable-dependency-tracking \ + --disable-examples \ + --enable-introspection \ + --disable-static \ + --disable-rpath \ + --disable-valgrind \ + --disable-gtk-doc' + + if get.buildTYPE() == "emul32": + options += " --bindir=/usr/bin32 \ + --libexecdir=/usr/libexec32 \ + --disable-introspection" + + shelltools.export("PKG_CONFIG_PATH", "/usr/lib32/pkgconfig") + + autotools.configure(options) + + pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ") + +def build(): + autotools.make() + +def install(): + autotools.rawInstall("DESTDIR=%s" % get.installDIR()) + + if get.buildTYPE() == "emul32": + pisitools.removeDir("/usr/bin32") + pisitools.removeDir("/usr/libexec32") + + pisitools.removeDir("/usr/share/gtk-doc") + + pisitools.dodoc("AUTHORS", "ChangeLog", "COPYING*", "NEWS", "README") diff --git a/multimedia/video/gstreamer/files/bison3.patch b/multimedia/video/gstreamer/files/bison3.patch new file mode 100644 index 0000000000..4f4f521116 --- /dev/null +++ b/multimedia/video/gstreamer/files/bison3.patch @@ -0,0 +1,31 @@ +From bd2a01cfe222367493a71f3269f12250c8972db0 Mon Sep 17 00:00:00 2001 +From: Kerrick Staley +Date: Wed, 21 Aug 2013 06:59:29 +0000 +Subject: parse: make grammar.y work with Bison 3 + +YYLEX_PARAM is no longer supported in Bison 3. + +https://bugzilla.gnome.org/show_bug.cgi?id=706462 +--- +diff --git a/gst/parse/grammar.y b/gst/parse/grammar.y +index 8a9019c..f533389 100644 +--- a/gst/parse/grammar.y ++++ b/gst/parse/grammar.y +@@ -26,7 +26,6 @@ + */ + + #define YYERROR_VERBOSE 1 +-#define YYLEX_PARAM scanner + + #define YYENABLE_NLS 0 + +@@ -659,6 +658,7 @@ static int yyerror (void *scanner, graph_t *graph, const char *s); + %right '.' + %left '!' '=' + ++%lex-param { void *scanner } + %parse-param { void *scanner } + %parse-param { graph_t *graph } + %pure-parser +-- +cgit v0.9.0.2-2-gbebe diff --git a/multimedia/video/gstreamer/files/wrapper-plugins.patch b/multimedia/video/gstreamer/files/wrapper-plugins.patch new file mode 100644 index 0000000000..8810da1dea --- /dev/null +++ b/multimedia/video/gstreamer/files/wrapper-plugins.patch @@ -0,0 +1,179 @@ +diff -Nur gstreamer-0.10.32.4-old//gst/gstplugin.c gstreamer-0.10.32.4/gst/gstplugin.c +--- gstreamer-0.10.32.4-old//gst/gstplugin.c 2011-05-03 10:00:04.763000288 +0300 ++++ gstreamer-0.10.32.4/gst/gstplugin.c 2011-05-03 10:02:15.244000278 +0300 +@@ -68,6 +68,8 @@ + + #include + ++#include ++ + #define GST_CAT_DEFAULT GST_CAT_PLUGIN_LOADING + + static guint _num_static_plugins; /* 0 */ +@@ -753,6 +755,74 @@ + goto return_error; + } + ++ /* Workarounds for all known plugins that might have changed features ++ * although the plugin timestamp didn't change */ ++ ++ /* GnomeVFS */ ++ if (g_str_has_suffix (filename, "/libgstgnomevfs.so")) { ++ struct stat tmp_status; ++ ++ if (!g_stat (LIBDIR "/gnome-vfs-2.0/modules", &tmp_status)) { ++ file_status.st_mtime = MAX (file_status.st_mtime, tmp_status.st_mtime); ++ } ++ } ++ ++ /* LADSPA */ ++ if (g_str_has_suffix (filename, "/libgstladspa.so")) { ++ struct stat tmp_status; ++ ++ if (!g_stat (LIBDIR "/ladspa", &tmp_status)) { ++ file_status.st_mtime = MAX (file_status.st_mtime, tmp_status.st_mtime); ++ } ++ } ++ ++ /* libvisual */ ++ if (g_str_has_suffix (filename, "/libgstlibvisual.so")) { ++ struct stat tmp_status; ++ ++ if (!g_stat (LIBDIR "/libvisual-0.4", &tmp_status)) { ++ GDir *dir; ++ const gchar *file; ++ ++ file_status.st_mtime = MAX (file_status.st_mtime, tmp_status.st_mtime); ++ dir = g_dir_open (LIBDIR "/libvisual-0.4", 0, NULL); ++ if (dir) { ++ while ((file = g_dir_read_name (dir))) { ++ gchar *filename = g_strdup_printf (LIBDIR "/libvisual-0.4/%s", file); ++ ++ if (!g_stat (filename, &tmp_status)) { ++ file_status.st_mtime = ++ MAX (file_status.st_mtime, tmp_status.st_mtime); ++ } ++ g_free (filename); ++ } ++ g_dir_close (dir); ++ } ++ } ++ } ++ ++ /* FFMPEG */ ++ if (g_str_has_suffix (filename, "/libgstffmpeg.so") || ++ g_str_has_suffix (filename, "/libgstpostproc.so")) { ++ struct stat tmp_status; ++ glob_t gl = { 0, }; ++ int i; ++ ++ glob (LIBDIR "/libavcodec.so.*.*", GLOB_NOSORT, NULL, &gl); ++ glob (LIBDIR "/libavutil.so.*.*", GLOB_APPEND | GLOB_NOSORT, NULL, &gl); ++ glob (LIBDIR "/libavformat.so.*.*", GLOB_APPEND | GLOB_NOSORT, NULL, &gl); ++ glob (LIBDIR "/libpostproc.so.*.*", GLOB_APPEND | GLOB_NOSORT, NULL, &gl); ++ glob (LIBDIR "/libswscale.so.*.*", GLOB_APPEND | GLOB_NOSORT, NULL, &gl); ++ ++ for (i = 0; i < gl.gl_pathc; i++) { ++ if (!g_stat (gl.gl_pathv[i], &tmp_status)) { ++ file_status.st_mtime = MAX (file_status.st_mtime, tmp_status.st_mtime); ++ } ++ } ++ ++ globfree (&gl); ++ } ++ + flags = G_MODULE_BIND_LOCAL; + /* libgstpython.so is the gst-python plugin loader. It needs to be loaded with + * G_MODULE_BIND_LAZY. +diff -Nur gstreamer-0.10.32.4-old//gst/gstregistry.c gstreamer-0.10.32.4/gst/gstregistry.c +--- gstreamer-0.10.32.4-old//gst/gstregistry.c 2011-05-03 10:00:04.770000288 +0300 ++++ gstreamer-0.10.32.4/gst/gstregistry.c 2011-05-03 10:00:25.707000262 +0300 +@@ -142,6 +142,8 @@ + extern HMODULE _priv_gst_dll_handle; + #endif + ++#include ++ + #define GST_CAT_DEFAULT GST_CAT_REGISTRY + + struct _GstRegistryPrivate +@@ -1203,6 +1205,79 @@ + * update the plugin to ensure the registry cache will reflect up + * to date information */ + ++ /* Workarounds for all known plugins that might have changed features ++ * although the plugin timestamp didn't change */ ++ ++ /* GnomeVFS */ ++ if (g_str_has_suffix (filename, "/libgstgnomevfs.so")) { ++ struct stat tmp_status; ++ ++ if (!g_stat (LIBDIR "/gnome-vfs-2.0/modules", &tmp_status)) { ++ file_status.st_mtime = ++ MAX (file_status.st_mtime, tmp_status.st_mtime); ++ } ++ } ++ ++ /* LADSPA */ ++ if (g_str_has_suffix (filename, "/libgstladspa.so")) { ++ struct stat tmp_status; ++ ++ if (!g_stat (LIBDIR "/ladspa", &tmp_status)) { ++ file_status.st_mtime = ++ MAX (file_status.st_mtime, tmp_status.st_mtime); ++ } ++ } ++ ++ /* libvisual */ ++ if (g_str_has_suffix (filename, "/libgstlibvisual.so")) { ++ struct stat tmp_status; ++ ++ if (!g_stat (LIBDIR "/libvisual-0.4", &tmp_status)) { ++ GDir *dir; ++ const gchar *file; ++ ++ file_status.st_mtime = ++ MAX (file_status.st_mtime, tmp_status.st_mtime); ++ dir = g_dir_open (LIBDIR "/libvisual-0.4", 0, NULL); ++ if (dir) { ++ while ((file = g_dir_read_name (dir))) { ++ gchar *filename = ++ g_strdup_printf (LIBDIR "/libvisual-0.4/%s", file); ++ ++ if (!g_stat (filename, &tmp_status)) { ++ file_status.st_mtime = ++ MAX (file_status.st_mtime, tmp_status.st_mtime); ++ } ++ g_free (filename); ++ } ++ g_dir_close (dir); ++ } ++ } ++ } ++ ++ /* FFMPEG */ ++ if (g_str_has_suffix (filename, "/libgstffmpeg.so") || ++ g_str_has_suffix (filename, "/libgstpostproc.so")) { ++ struct stat tmp_status; ++ glob_t gl = { 0, }; ++ int i; ++ ++ glob (LIBDIR "/libavcodec.so.*.*", GLOB_NOSORT, NULL, &gl); ++ glob (LIBDIR "/libavutil.so.*.*", GLOB_APPEND | GLOB_NOSORT, NULL, &gl); ++ glob (LIBDIR "/libavformat.so.*.*", GLOB_APPEND | GLOB_NOSORT, NULL, &gl); ++ glob (LIBDIR "/libpostproc.so.*.*", GLOB_APPEND | GLOB_NOSORT, NULL, &gl); ++ glob (LIBDIR "/libswscale.so.*.*", GLOB_APPEND | GLOB_NOSORT, NULL, &gl); ++ ++ for (i = 0; i < gl.gl_pathc; i++) { ++ if (!g_stat (gl.gl_pathv[i], &tmp_status)) { ++ file_status.st_mtime = ++ MAX (file_status.st_mtime, tmp_status.st_mtime); ++ } ++ } ++ ++ globfree (&gl); ++ } ++ + if (plugin->file_mtime == file_status.st_mtime && + plugin->file_size == file_status.st_size && !env_vars_changed && + !(deps_changed = _priv_plugin_deps_files_changed (plugin)) && diff --git a/multimedia/video/gstreamer/pspec.xml b/multimedia/video/gstreamer/pspec.xml new file mode 100644 index 0000000000..87a1071184 --- /dev/null +++ b/multimedia/video/gstreamer/pspec.xml @@ -0,0 +1,107 @@ + + + + + gstreamer + http://gstreamer.freedesktop.org/ + + PisiLinux Community + admins@pisilinux.org + + LGPLv2.1 + library + app:console + GStreamer streaming media framework runtime + GStreamer is a streaming media framework, based on graphs of filters which operate on media data. Applications using this library can do anything from real-time sound processing to playing videos, and just about anything else media-related. + http://ftp.gnome.org/pub/gnome/sources/gstreamer/0.10/gstreamer-0.10.36.tar.xz + + + wrapper-plugins.patch + bison3.patch + + + + + gstreamer + + /usr/bin + /usr/lib + /usr/libexec + /usr/share/gir-1.0 + /usr/share/doc + /usr/share/locale + /usr/share/man + + + + + gstreamer-devel + Development files for gstreamer + + gstreamer + + + /usr/include + /usr/lib/pkgconfig + /usr/lib32/pkgconfig + /usr/share/aclocal + + + + + gstreamer-32bit + emul32 + 32-bit shared libraries for gstreamer + emul32 + + glib2-32bit + libxml2-32bit + + + gstreamer + glib2-32bit + libxml2-32bit + + + /usr/lib32 + + + + + + 2014-05-19 + 0.10.36 + Release bump. + Alihan Öztürk + alihan@pisilinux.org + + + 2014-04-23 + 0.10.36 + Rebuild for webp + Kamil Atlı + suvarice@gmail.com + + + 2014-02-27 + 0.10.36 + Rebuild Unused + Varol Maksutoğlu + waroi@pisilinux.org + + + 2014-01-26 + 0.10.36 + Release Bump + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2012-08-20 + 0.10.36 + First release + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + diff --git a/multimedia/video/gstreamer/translations.xml b/multimedia/video/gstreamer/translations.xml new file mode 100644 index 0000000000..bd76538442 --- /dev/null +++ b/multimedia/video/gstreamer/translations.xml @@ -0,0 +1,19 @@ + + + + gstreamer + GStreamer ses yayın altyapısı + gstreamer bir ses yayın altyapısı kütüphanesidir. Bu kütüphaneyi kullanan uygulamalar, gerçek zamanlı ses işleme, görüntü oynatma gibi çokluortam ile ilgili birçok işlem gerçekleştirebilirler. + GStreamer est la librairies principale. Elle contient les entêtes, les fichiers et les éléments centraux. + + + + gstreamer-devel + gstreamer için geliştirme dosyaları + + + + gstreamer-32bit + gstreamer için 32-bit paylaşımlı kitaplıklar + + diff --git a/network/component.xml b/network/component.xml new file mode 100644 index 0000000000..7e1ba9e55c --- /dev/null +++ b/network/component.xml @@ -0,0 +1,3 @@ + + network + diff --git a/network/misc/geoclue/actions.py b/network/misc/geoclue/actions.py new file mode 100644 index 0000000000..6266341387 --- /dev/null +++ b/network/misc/geoclue/actions.py @@ -0,0 +1,19 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- +# Licensed under the GNU General Public License, version 3. +# See the file http://www.gnu.org/copyleft/gpl.txt + +from pisi.actionsapi import autotools +from pisi.actionsapi import get +from pisi.actionsapi import pisitools + +def setup(): + autotools.configure() + +def build(): + autotools.make() + +def install(): + autotools.rawInstall("DESTDIR=%s" % get.installDIR()) + + pisitools.dodoc("NEWS", "COPYING", "README") diff --git a/network/misc/geoclue/pspec.xml b/network/misc/geoclue/pspec.xml new file mode 100644 index 0000000000..84db589630 --- /dev/null +++ b/network/misc/geoclue/pspec.xml @@ -0,0 +1,88 @@ + + + + + geoclue + http://www.freedesktop.org/wiki/Software/GeoClue + + PisiLinux Community + admins@pisilinux.org + + LGPLv2 + network.misc + library + The Geoinformation Service. + Geoclue is a modular geoinformation service built on top of the D-Bus messaging system. + + gpsd-devel + gtk2-devel + + http://people.freedesktop.org/~hadess/geoclue-0.12.99.tar.gz + + + + + geoclue + + gpsd + gtk2 + libsoup + NetworkManager + + + /usr/lib/ + /usr/share/ + /usr/libexec/ + + + + + geoclue-devel + geoclue için geliştirme dosyaları + + geoclue + + + /usr/include/geoclue + /usr/lib/pkgconfig + + + + + + 2015-02-12 + 0.12.99 + Rebuild + Stefan Gronewold(groni) + groni@pisilinux.org + + + 2014-02-23 + 0.12.99 + rebuild + Osman Erkan + osman.erkan@pisilinux.org + + + 2013-07-29 + 0.12.99 + Dep Fixed + Osman Erkan + osman.erkan@pisilinux.org + + + 2013-07-26 + 0.12.99 + Release no bump + Serdar Soytetir + kaptan@pisilinux.org + + + 2012-09-03 + 0.12.99 + First release + Osman Erkan + osman.erkan@pisilinux.org + + + diff --git a/network/misc/geoclue/translations.xml b/network/misc/geoclue/translations.xml new file mode 100644 index 0000000000..a5f4c042b5 --- /dev/null +++ b/network/misc/geoclue/translations.xml @@ -0,0 +1,13 @@ + + + + geoclue + The Geoinformation Service. + Geoclue is a modular geoinformation service built on top of the D-Bus messaging system. + + + + geoclue-devel + geoclue için geliştirme dosyaları + + \ No newline at end of file diff --git a/programming/component.xml b/programming/component.xml new file mode 100644 index 0000000000..f694995e99 --- /dev/null +++ b/programming/component.xml @@ -0,0 +1,3 @@ + + programming + diff --git a/programming/language/component.xml b/programming/language/component.xml new file mode 100644 index 0000000000..71e3f075b9 --- /dev/null +++ b/programming/language/component.xml @@ -0,0 +1,3 @@ + + programming.language + diff --git a/programming/language/ruby/component.xml b/programming/language/ruby/component.xml new file mode 100644 index 0000000000..e8aa89765a --- /dev/null +++ b/programming/language/ruby/component.xml @@ -0,0 +1,3 @@ + + programming.language.ruby + diff --git a/programming/language/ruby/ruby-gtk2/actions.py b/programming/language/ruby/ruby-gtk2/actions.py new file mode 100644 index 0000000000..f5dd1d58d2 --- /dev/null +++ b/programming/language/ruby/ruby-gtk2/actions.py @@ -0,0 +1,20 @@ +#!/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(): + shelltools.system("ruby extconf.rb") + +def build(): + autotools.make() + +def install(): + autotools.rawInstall("DESTDIR=%s" % get.installDIR()) + pisitools.dodoc("README", "COPYING.*", "AUTHORS") diff --git a/programming/language/ruby/ruby-gtk2/pspec.xml b/programming/language/ruby/ruby-gtk2/pspec.xml new file mode 100644 index 0000000000..4aea627c08 --- /dev/null +++ b/programming/language/ruby/ruby-gtk2/pspec.xml @@ -0,0 +1,63 @@ + + + + + ruby-gtk2 + http://ruby-gnome2.sourceforge.jp/ + + Merve Yüzbaşıoğlu + admins@pisilinux.org + + LLGPL-2.1 + library + GNOME 2 bindings for Ruby + Ruby-gtk2 is a set of bindings for the GNOME-2.x libraries to use from Ruby. + mirrors://sourceforge/ruby-gnome2/ruby-gtk2-2.2.0.tar.gz + + atk-devel + ruby-devel + gtk2-devel + pango-devel + gdk-pixbuf-devel + + + + + ruby-gtk2 + + atk + ruby + gtk2 + pango + gdk-pixbuf + + + /usr/lib + /usr/share/doc + + + + + + 2014-05-24 + 2.2.0 + Version Bump. + Alihan Öztürk + alihan@pisilinux.org + + + 2014-02-11 + 2.1.0 + Version Bump. + Alihan Öztürk + alihan@pisilinux.org + + + 2012-05-03 + 1.1.3 + First release + Erdinç Gültekin + admins@pisilinux.org + + + diff --git a/programming/language/ruby/ruby-gtk2/translations.xml b/programming/language/ruby/ruby-gtk2/translations.xml new file mode 100644 index 0000000000..cab6c85bae --- /dev/null +++ b/programming/language/ruby/ruby-gtk2/translations.xml @@ -0,0 +1,9 @@ + + + + ruby-gtk2 + Ruby için GNOME 2 bağlayıcıları + ruby-gtk2, GNOME 2 kütüphaneleri için bağlayıcıları içerir. + + + diff --git a/programming/misc/component.xml b/programming/misc/component.xml new file mode 100644 index 0000000000..1b5368127b --- /dev/null +++ b/programming/misc/component.xml @@ -0,0 +1,3 @@ + + programming.misc + diff --git a/programming/misc/icu4c/actions.py b/programming/misc/icu4c/actions.py new file mode 100644 index 0000000000..5faea38a08 --- /dev/null +++ b/programming/misc/icu4c/actions.py @@ -0,0 +1,43 @@ +#!/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 get +from pisi.actionsapi import autotools +from pisi.actionsapi import pisitools +from pisi.actionsapi import shelltools + +WorkDir="icu/source" + +def setup(): + autotools.autoconf("-f") + options = "--with-data-packaging=library \ + --disable-samples \ + --disable-silent-rules" + if get.buildTYPE() == "_emul32": + options += " --libdir=/usr/lib32 \ + --bindir=/_emul32/bin \ + --sbindir=/_emul32/sbin" + shelltools.export("CC", "%s -m32" % get.CC()) + shelltools.export("CXX", "%s -m32" % get.CXX()) + autotools.configure(options) + pisitools.dosed("config/mh-linux", "-nodefaultlibs -nostdlib") + +def build(): + autotools.make() + +def check(): + autotools.make("check") + +def install(): + autotools.rawInstall('-j1 DESTDIR="%s"' % get.installDIR()) + if get.buildTYPE() == "_emul32": + pisitools.domove("/_emul32/bin/icu-config", "/usr/bin", "icu-config-32") + pisitools.removeDir("/_emul32") + for f in shelltools.ls("%s/usr/lib32/pkgconfig" % get.installDIR()): + pisitools.dosed("%s/usr/lib32/pkgconfig/%s" % (get.installDIR(), f), "_emul32", "usr") + return + + pisitools.dohtml("../*.html") diff --git a/programming/misc/icu4c/files/icu.8198.revert.icu5431.patch b/programming/misc/icu4c/files/icu.8198.revert.icu5431.patch new file mode 100644 index 0000000000..4027f848c7 --- /dev/null +++ b/programming/misc/icu4c/files/icu.8198.revert.icu5431.patch @@ -0,0 +1,129 @@ +Index: icu/trunk/source/layout/IndicReordering.cpp +=================================================================== +--- icu/trunk/source/layout/IndicReordering.cpp (revision 25772) ++++ icu/trunk/source/layout/IndicReordering.cpp (revision 26090) +@@ -126,4 +126,8 @@ + FeatureMask fSMFeatures; + ++ LEUnicode fPreBaseConsonant; ++ LEUnicode fPreBaseVirama; ++ le_int32 fPBCIndex; ++ FeatureMask fPBCFeatures; + + void saveMatra(LEUnicode matra, le_int32 matraIndex, IndicClassTable::CharClass matraClass) +@@ -172,5 +176,6 @@ + fMatraFeatures(0), fMPreOutIndex(-1), fMPreFixups(mpreFixups), + fVMabove(0), fVMpost(0), fVMIndex(0), fVMFeatures(0), +- fSMabove(0), fSMbelow(0), fSMIndex(0), fSMFeatures(0) ++ fSMabove(0), fSMbelow(0), fSMIndex(0), fSMFeatures(0), ++ fPreBaseConsonant(0), fPreBaseVirama(0), fPBCIndex(0), fPBCFeatures(0) + { + // nothing else to do... +@@ -191,4 +196,6 @@ + fVMabove = fVMpost = 0; + fSMabove = fSMbelow = 0; ++ ++ fPreBaseConsonant = fPreBaseVirama = 0; + } + +@@ -386,4 +393,12 @@ + } + ++ void notePreBaseConsonant(le_uint32 index,LEUnicode PBConsonant, LEUnicode PBVirama, FeatureMask features) ++ { ++ fPBCIndex = index; ++ fPreBaseConsonant = PBConsonant; ++ fPreBaseVirama = PBVirama; ++ fPBCFeatures = features; ++ } ++ + void noteBaseConsonant() + { +@@ -465,4 +480,20 @@ + } + ++ void writePreBaseConsonant() ++ { ++ // The TDIL spec says that consonant + virama + RRA should produce a rakar in Malayalam. However, ++ // it seems that almost none of the fonts for Malayalam are set up to handle this. ++ // So, we're going to force the issue here by using the rakar as defined with RA in most fonts. ++ ++ if (fPreBaseConsonant == 0x0d31) { // RRA ++ fPreBaseConsonant = 0x0d30; // RA ++ } ++ ++ if (fPreBaseConsonant != 0) { ++ writeChar(fPreBaseConsonant, fPBCIndex, fPBCFeatures); ++ writeChar(fPreBaseVirama,fPBCIndex-1,fPBCFeatures); ++ } ++ } ++ + le_int32 getOutputIndex() + { +@@ -723,4 +754,5 @@ + } + ++ + IndicClassTable::CharClass charClass = CC_RESERVED; + IndicClassTable::CharClass nextClass = CC_RESERVED; +@@ -730,7 +762,9 @@ + le_bool seenVattu = FALSE; + le_bool seenBelowBaseForm = FALSE; ++ le_bool seenPreBaseForm = FALSE; + le_bool hasNukta = FALSE; + le_bool hasBelowBaseForm = FALSE; + le_bool hasPostBaseForm = FALSE; ++ le_bool hasPreBaseForm = FALSE; + + if (postBase < markStart && classTable->isNukta(chars[postBase])) { +@@ -746,12 +780,20 @@ + hasBelowBaseForm = IndicClassTable::hasBelowBaseForm(charClass) && !hasNukta; + hasPostBaseForm = IndicClassTable::hasPostBaseForm(charClass) && !hasNukta; ++ hasPreBaseForm = IndicClassTable::hasPreBaseForm(charClass) && !hasNukta; + + if (IndicClassTable::isConsonant(charClass)) { + if (postBaseLimit == 0 || seenVattu || + (baseConsonant > baseLimit && !classTable->isVirama(chars[baseConsonant - 1])) || +- !(hasBelowBaseForm || hasPostBaseForm)) { ++ !(hasBelowBaseForm || hasPostBaseForm || hasPreBaseForm)) { + break; + } + ++ // Note any pre-base consonants ++ if ( baseConsonant == lastConsonant && lastConsonant > 0 && ++ hasPreBaseForm && classTable->isVirama(chars[baseConsonant - 1])) { ++ output.notePreBaseConsonant(lastConsonant,chars[lastConsonant],chars[lastConsonant-1],tagArray2); ++ seenPreBaseForm = TRUE; ++ ++ } + // consonants with nuktas are never vattus + seenVattu = IndicClassTable::isVattu(charClass) && !hasNukta; +@@ -786,10 +828,12 @@ + + // write any pre-base consonants ++ output.writePreBaseConsonant(); ++ + le_bool supressVattu = TRUE; + + for (i = baseLimit; i < baseConsonant; i += 1) { + LEUnicode ch = chars[i]; +- // Don't put 'blwf' on first consonant. +- FeatureMask features = (i == baseLimit? tagArray2 : tagArray1); ++ // Don't put 'pstf' or 'blwf' on anything before the base consonant. ++ FeatureMask features = tagArray1 & ~( pstfFeatureMask | blwfFeatureMask ); + + charClass = classTable->getCharClass(ch); +@@ -842,5 +886,5 @@ + + // write below-base consonants +- if (baseConsonant != lastConsonant) { ++ if (baseConsonant != lastConsonant && !seenPreBaseForm) { + for (i = bcSpan + 1; i < postBase; i += 1) { + output.writeChar(chars[i], i, tagArray1); +@@ -872,5 +916,5 @@ + // write post-base consonants + // FIXME: does this put the right tags on post-base consonants? +- if (baseConsonant != lastConsonant) { ++ if (baseConsonant != lastConsonant && !seenPreBaseForm) { + if (postBase <= lastConsonant) { + for (i = postBase; i <= lastConsonant; i += 1) { diff --git a/programming/misc/icu4c/files/icu.icu6213.worstcase.patch b/programming/misc/icu4c/files/icu.icu6213.worstcase.patch new file mode 100644 index 0000000000..c2585d566b --- /dev/null +++ b/programming/misc/icu4c/files/icu.icu6213.worstcase.patch @@ -0,0 +1,27 @@ +--- icu.orig/source/layout/IndicClassTables.cpp 2007-12-12 18:58:06.000000000 +0000 ++++ icu/source/layout/IndicClassTables.cpp 2008-03-18 10:10:51.000000000 +0000 +@@ -255,7 +269,7 @@ + // + static const IndicClassTable devaClassTable = {0x0900, 0x0970, 2, DEVA_SCRIPT_FLAGS, devaCharClasses, NULL}; + +-static const IndicClassTable bengClassTable = {0x0980, 0x09FA, 3, BENG_SCRIPT_FLAGS, bengCharClasses, bengSplitTable}; ++static const IndicClassTable bengClassTable = {0x0980, 0x09FA, 4, BENG_SCRIPT_FLAGS, bengCharClasses, bengSplitTable}; + + static const IndicClassTable punjClassTable = {0x0A00, 0x0A74, 2, PUNJ_SCRIPT_FLAGS, punjCharClasses, NULL}; + +@@ -263,13 +277,13 @@ + + static const IndicClassTable oryaClassTable = {0x0B00, 0x0B71, 3, ORYA_SCRIPT_FLAGS, oryaCharClasses, oryaSplitTable}; + +-static const IndicClassTable tamlClassTable = {0x0B80, 0x0BF2, 3, TAML_SCRIPT_FLAGS, tamlCharClasses, tamlSplitTable}; ++static const IndicClassTable tamlClassTable = {0x0B80, 0x0BF2, 4, TAML_SCRIPT_FLAGS, tamlCharClasses, tamlSplitTable}; + + static const IndicClassTable teluClassTable = {0x0C00, 0x0C6F, 3, TELU_SCRIPT_FLAGS, teluCharClasses, teluSplitTable}; + + static const IndicClassTable kndaClassTable = {0x0C80, 0x0CEF, 4, KNDA_SCRIPT_FLAGS, kndaCharClasses, kndaSplitTable}; + +-static const IndicClassTable mlymClassTable = {0x0D00, 0x0D6F, 3, MLYM_SCRIPT_FLAGS, mlymCharClasses, mlymSplitTable}; ++static const IndicClassTable mlymClassTable = {0x0D00, 0x0D6F, 4, MLYM_SCRIPT_FLAGS, mlymCharClasses, mlymSplitTable}; + + static const IndicClassTable sinhClassTable = {0x0D80, 0x0DF4, 4, SINH_SCRIPT_FLAGS, sinhCharClasses, sinhSplitTable}; + diff --git a/programming/misc/icu4c/pspec.xml b/programming/misc/icu4c/pspec.xml new file mode 100644 index 0000000000..449b658c96 --- /dev/null +++ b/programming/misc/icu4c/pspec.xml @@ -0,0 +1,115 @@ + + + + + icu4c + http://site.icu-project.org/home + + PisiLinux Community + admins@pisilinux.org + + as-is + library + International Components for Unicode + ICU is a mature, widely used set of C/C++ and Java libraries for Unicode support, software internationalization and globalization (i18n/g11n). This package contains the C/C++ libraries. + + http://download.icu-project.org/files/icu4c/54.1/icu4c-54_1-src.tgz + + + + + + + icu4c + + /usr/bin + /usr/sbin + /usr/lib + /usr/share/man + /usr/share/doc/icu4c/html + + + + + icu4c-devel + Development files for icu4c + + icu4c + + + /usr/bin/icu-config + /usr/lib/icu + /usr/share/icu + /usr/include + /usr/lib/pkgconfig + /usr/lib32/pkgconfig/ + + + + + icu4c-32bit + emul32 + 32-bit shared libraries for icu4c + _emul32 + + icu4c + + + /usr/lib32/libicu* + /usr/lib32/icu + + + + + + 2015-01-22 + 54.1 + Version bump. + Ergün Salman + poyraz76@pisilinux.org + + + 2014-05-17 + 53.1 + Version bump and add patch. + Alihan Öztürk + alihan@pisilinux.org + + + 2013-10-13 + 52.1 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2013-07-27 + 51.2 + Move pc files to devel pack, rebuild + V.Bump + PisiLinux Community + admins@pisilinux.org + + + 2013-05-15 + 51.1 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-01-22 + 50.1.2 + Version bump, add emul32 + Marcin Bojara + marcin@pisilinux.org + + + 2012-12-24 + 50.1.1 + First release + Marcin Bojara + marcin@pisilinux.org + + + diff --git a/programming/misc/icu4c/translations.xml b/programming/misc/icu4c/translations.xml new file mode 100644 index 0000000000..e8a1b0e539 --- /dev/null +++ b/programming/misc/icu4c/translations.xml @@ -0,0 +1,15 @@ + + + + icu4c + Unicode desteği için uluslarası bileşenler + ICU, Unicode desteği, yazılım uluslararasılaştırma ve yerelleştirme konusunda yaygın olarak kullanılan gelişmiş bir kitaplıktır. ICU, Unicode ve u10a desteği için C/C++ ve Java kitaplıklarını içerir. + ICU est un ensemble mature de librairies C/C++ et Java pour le support de l'Unicode, l'internationalisation et la globalisation de logiciel (i18n/g11n). Ce paquet contient les librairies C/C++. + ICU es un conjunto maduro y muy utilizado de librerías C/C++ y Java para soporte Unicode, internacionalización y globalización de software (i18n/g11n). Este paque te contiene las librerías C/C++. + + + + icu4c-devel + icu4c için geliştirme dosyaları + + diff --git a/programming/misc/unixODBC/actions.py b/programming/misc/unixODBC/actions.py new file mode 100644 index 0000000000..f07d16e599 --- /dev/null +++ b/programming/misc/unixODBC/actions.py @@ -0,0 +1,34 @@ +#!/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 libtools +from pisi.actionsapi import pisitools +from pisi.actionsapi import shelltools +from pisi.actionsapi import get + +def setup(): + # Use system libtool instead of bundled one + shelltools.unlinkDir("libltdl") + libtools.libtoolize("-c -f --ltdl") + autotools.autoreconf("-fi") + + autotools.configure("--sysconfdir=/etc/unixODBC \ + --disable-dependency-tracking \ + --disable-gui \ + --enable-threads \ + --enable-drivers \ + --enable-driver-conf \ + --disable-stats ") + +def build(): + autotools.make() + +def install(): + autotools.rawInstall("DESTDIR=%s" % get.installDIR()) + + pisitools.dodoc("AUTHORS", "ChangeLog", "NEWS", "README") + pisitools.dohtml("doc/*") diff --git a/programming/misc/unixODBC/pspec.xml b/programming/misc/unixODBC/pspec.xml new file mode 100644 index 0000000000..a485f7aa73 --- /dev/null +++ b/programming/misc/unixODBC/pspec.xml @@ -0,0 +1,68 @@ + + + + + unixODBC + http://www.unixodbc.org/ + + PisiLinux Community + admins@pisilinux.org + + GPLv2 + LGPLv2.1 + app:console + ODBC Interface for Linux + The unixODBC Project goals are to develop and promote unixODBC to be the definitive standard for ODBC on non MS Windows platforms. + http://www.unixodbc.org/unixODBC-2.3.2.tar.gz + + + + unixODBC + + /etc + /usr/bin + /usr/lib + /usr/share/man + /usr/share/doc/unixODBC/AUTHORS + /usr/share/doc/unixODBC/README + + + + + unixODBC-devel + Development files for unixODBC + + unixODBC + + + /usr/bin/odbc_config + /usr/include + + + + + unixODBC-docs + data:doc + Documentation for unixODBC + + /usr/share/doc/unixODBC + + + + + + 2014-05-19 + 2.3.2 + Version bump. + Alihan Öztürk + alihan@pisilinux.org + + + 2012-10-04 + 2.3.1 + First release + PisiLinux Community + admins@pisilinux.org + + + diff --git a/programming/misc/unixODBC/translations.xml b/programming/misc/unixODBC/translations.xml new file mode 100644 index 0000000000..320d367ae5 --- /dev/null +++ b/programming/misc/unixODBC/translations.xml @@ -0,0 +1,20 @@ + + + + unixodbc + Linux için ODBC arayüzü + unixODBC Projesinin amacı, unixODBC'yi geliştirip ilerleterek MS Windows harici platformlarda ODBC için kesin bir standart haline getirmektir. + Les objectifs du projet unixODBC sont de développer et promouvoir unixODBC pour en faire le standard définitif pour ODBC sur les plateformes non MS Windows. + El proyecto unixODBC apunta a desarollar y promocio. + + + + unixODBC-devel + unixODBC için geliştirme dosyaları. + + + + unixODBC-docs + unixODBC için belgelendirme dosyaları. + + diff --git a/server/component.xml b/server/component.xml new file mode 100644 index 0000000000..cee83d0e74 --- /dev/null +++ b/server/component.xml @@ -0,0 +1,3 @@ + + server + diff --git a/server/database/component.xml b/server/database/component.xml new file mode 100644 index 0000000000..800ed1d6cf --- /dev/null +++ b/server/database/component.xml @@ -0,0 +1,3 @@ + + server.database + diff --git a/server/database/firebird/actions.py b/server/database/firebird/actions.py new file mode 100644 index 0000000000..675877ee6c --- /dev/null +++ b/server/database/firebird/actions.py @@ -0,0 +1,85 @@ +#!/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 + +import os +from pisi.actionsapi import autotools +from pisi.actionsapi import pisitools +from pisi.actionsapi import shelltools +from pisi.actionsapi import get + +WorkDir="Firebird-%s-0" % get.srcVERSION() + +def setup(): + pisitools.dosed("src/isql/isql.epp", '"isql\s', '"fbsql ') + pisitools.dosed("src/msgs/history2.sql", 'isql\s', 'fbsql ') + pisitools.dosed("src/msgs/messages2.sql", 'isql\s', 'fbsql ') + pisitools.dosed("src/msgs/messages2.sql", 'ISQL\s', 'FBSQL ') + shelltools.system("find ./ -name \*.sh -print0 | xargs -0 chmod +x") + for d in ("btyacc", "editline", "icu"): + shelltools.unlinkDir("extern/%s" % d) + autotools.autoreconf("-fi") + autotools.configure("--prefix=/opt/firebird \ + --disable-static \ + --enable-superserver \ + --with-editline \ + --with-gnu-ld \ + --with-system-editline \ + --with-system-icu \ + ") + +def build(): + #Parallel build is broken + autotools.make("-j1") + shelltools.cd("gen") + pisitools.dosed("install/makeInstallImage.sh", "exit 1", "# exit 1") + pisitools.dosed("install/makeInstallImage.sh", "chown", 'echo ""# chown') + pisitools.dosed("install/makeInstallImage.sh", "chmod", 'echo ""# chmod') + autotools.make("-f Makefile.install buildRoot") + +def install(): + # Copy to install directory + shelltools.copytree("gen/buildroot/", get.installDIR()) + + # Move headers + pisitools.remove("/usr/include/*") + pisitools.domove("/opt/firebird/include", "/usr/include", "firebird") + + # Fix client libraries symlinks + pisitools.removeDir("/usr/lib*") + for libs in os.listdir("%s/opt/firebird/lib" % get.installDIR()): + pisitools.dosym("/opt/firebird/lib/%s" % libs, "/usr/lib/%s" % libs) + pisitools.dosym("/opt/firebird/plugins/libfbtrace.so", "/usr/lib/libfbtrace.so") + + # Add support for old client's + pisitools.dosym("libfbclient.so", "/usr/lib/libgds.so") + pisitools.dosym("libfbclient.so", "/usr/lib/libgds.so.0") + pisitools.dosym("libfbclient.so", "/opt/firebird/lib/libgds.so") + pisitools.dosym("libfbclient.so", "/opt/firebird/lib/libgds.so.0") + + # Move configuration files and security DB to /etc/firebird for painless upgrade + pisitools.domove("/opt/firebird/aliases.conf", "/etc/firebird") + pisitools.domove("/opt/firebird/firebird.conf", "/etc/firebird") + pisitools.domove("/opt/firebird/security2.fdb", "/etc/firebird") + pisitools.dosym("/etc/firebird/aliases.conf", "/opt/firebird/aliases.conf") + pisitools.dosym("/etc/firebird/firebird.conf", "/opt/firebird/firebird.conf") + pisitools.dosym("/etc/firebird/security2.fdb", "/opt/firebird/security2.fdb") + + # Set PID directory + shelltools.makedirs("%s/run/firebird" % get.installDIR()) + #pisitools.dodir("/opt/firebird/run") + + # Set permissions + shelltools.chmod("%s/etc/firebird/security2.fdb" % get.installDIR(), 0600) + shelltools.chmod("%s/run/firebird" % get.installDIR(), 0755) + #shelltools.chmod("%s/opt/firebird/run" % get.installDIR(), 0755) + + pisitools.dosym("/var/log/firebird.log", "/opt/firebird/firebird.log") + + # Useless init.d stuff + pisitools.removeDir("/opt/firebird/misc/") + + # Prevent to conflict isql with UnixODBC's + pisitools.domove("/opt/firebird/bin/isql", "/opt/firebird/bin", "fb_isql") diff --git a/server/database/firebird/comar/package.py b/server/database/firebird/comar/package.py new file mode 100644 index 0000000000..e0bafd53e7 --- /dev/null +++ b/server/database/firebird/comar/package.py @@ -0,0 +1,43 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +import os, pwd, socket + +pid_dir = "/run/firebird" +log_file = "/var/log/firebird.log" + +uid = pwd.getpwnam("firebird")[2] +hostname = socket.gethostname() + +def touch(filename): + try: + f = open(filename, "w") + f.close() + except IOError: + fail("Failed to create %s file" % filename) + +def postInstall(fromVersion, fromRelease, toVersion, toRelease): +# # Configure PID directory + os.chown(pid_dir, uid, -1) + + # Create log file + touch(log_file) + os.chown(log_file, uid, -1) + os.chmod(log_file, 0644) + + # Configure security2.fdb file + os.chown("/opt/firebird/security2.fdb", uid, -1) + + # Create lock files + for lock_filename in ("isc_guard1", "isc_init1", "isc_lock1"): + lock_filename = "/opt/firebird/%s.%s" % (lock_filename, hostname) + touch(lock_filename) + os.chown(lock_filename, uid, -1) + os.chmod(lock_filename, 0644) + +def preRemove(): + # Remove lock files + for lock_filename in ("isc_guard1", "isc_init1", "isc_lock1"): + lock_filename = "/opt/firebird/%s.%s" % (lock_filename, hostname) + if os.path.exists(lock_filename): + os.remove(lock_filename) diff --git a/server/database/firebird/comar/service.py b/server/database/firebird/comar/service.py new file mode 100644 index 0000000000..123ccf4dcf --- /dev/null +++ b/server/database/firebird/comar/service.py @@ -0,0 +1,26 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +serviceType="server" +serviceDesc = _({"en": "Firebird Database Server", + "tr": "Firebird Veritabanı Sunucusu"}) + +from comar.service import * + +pid_file = "/run/firebird/firebird.pid" + +@synchronized +def start(): + startService(command="/opt/firebird/bin/fbguard", + args="-pidfile %s -start -forever -daemon" % pid_file, + pidfile="/run/firebird/firebird.pid", + donotify=True) +# chuid="firebird", + +@synchronized +def stop(): + stopService(pidfile=pid_file, + donotify=True) + +def status(): + return isServiceRunning(pid_file) diff --git a/server/database/firebird/files/50firebird b/server/database/firebird/files/50firebird new file mode 100644 index 0000000000..35cf8d0e1b --- /dev/null +++ b/server/database/firebird/files/50firebird @@ -0,0 +1 @@ +ROOTPATH="/opt/firebird/bin" diff --git a/server/database/firebird/files/editline-dumb-tr.patch b/server/database/firebird/files/editline-dumb-tr.patch new file mode 100644 index 0000000000..935feb76cc --- /dev/null +++ b/server/database/firebird/files/editline-dumb-tr.patch @@ -0,0 +1,12 @@ +diff -Nuar Firebird-2.1.0.17798-0.orig/extern/editline/src/makelist Firebird-2.1.0.17798-0/extern/editline/src/makelist +--- Firebird-2.1.0.17798-0.orig/extern/editline/src/makelist 2007-04-09 15:57:41.000000000 +0300 ++++ Firebird-2.1.0.17798-0/extern/editline/src/makelist 2008-07-12 14:02:29.000000000 +0300 +@@ -140,7 +140,7 @@ + # + -fh) + cat $FILES | $AWK '/el_action_t/ { print $3 }' | \ +- sort | tr '[:lower:]' '[:upper:]' | $AWK ' ++ sort | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ | $AWK ' + BEGIN { + printf("/* Automatically generated file, do not edit */\n"); + printf("#ifndef _h_fcns_c\n#define _h_fcns_c\n"); diff --git a/server/database/firebird/files/firebird-2.5.1.26351.0-deps-flags.patch b/server/database/firebird/files/firebird-2.5.1.26351.0-deps-flags.patch new file mode 100644 index 0000000000..8be521cc0f --- /dev/null +++ b/server/database/firebird/files/firebird-2.5.1.26351.0-deps-flags.patch @@ -0,0 +1,59 @@ +diff -Naur Firebird-2.5.0.26074-0_orig/builds/posix/Makefile.in.firebird Firebird-2.5.0.26074-0_deps-flags/builds/posix/Makefile.in.firebird +--- Firebird-2.5.0.26074-0_orig/builds/posix/Makefile.in.firebird 2010-11-09 12:42:45.000000000 -0500 ++++ Firebird-2.5.0.26074-0_deps-flags/builds/posix/Makefile.in.firebird 2011-03-28 15:10:09.814370706 -0400 +@@ -158,7 +158,7 @@ + # some complications particularly for super in needing to start the server + # that you are currently building. MOD 28-July-2002 + +-firebird_basic: btyacc_binary external_libraries firebird_boot basic_targets ++firebird_basic: firebird_boot basic_targets + + firebird_boot: updateBuildNum boot_phase1 boot_phase2 + +diff -Naur Firebird-2.5.0.26074-0_orig/builds/posix/make.defaults Firebird-2.5.0.26074-0_deps-flags/builds/posix/make.defaults +--- Firebird-2.5.0.26074-0_orig/builds/posix/make.defaults 2010-11-09 12:42:45.000000000 -0500 ++++ Firebird-2.5.0.26074-0_deps-flags/builds/posix/make.defaults 2011-03-28 15:21:26.904370708 -0400 +@@ -138,7 +138,7 @@ + AR= ar @AR_OPTIONS@ crsu + LN= @LN_S@ + RANLIB= @RANLIB@ +-BTYACC=$(ROOT)/extern/btyacc/btyacc ++BTYACC=/usr/bin/btyacc + + CC = @CC@ + CXX = @CXX@ +diff -Naur Firebird-2.5.0.26074-0_orig/builds/posix/prefix.linux Firebird-2.5.0.26074-0_deps-flags/builds/posix/prefix.linux +--- Firebird-2.5.0.26074-0_orig/builds/posix/prefix.linux 2010-11-09 12:42:45.000000000 -0500 ++++ Firebird-2.5.0.26074-0_deps-flags/builds/posix/prefix.linux 2011-03-25 21:38:29.031037374 -0400 +@@ -18,11 +18,10 @@ + # + # 2 Oct 2002, Nickolay Samofatov - Major cleanup + +-COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -pipe -MMD -fPIC -fmessage-length=0 +-OPTIMIZE_FLAGS=-O3 -march=i586 -mtune=i686 -fno-omit-frame-pointer ++COMMON_FLAGS=-DLINUX -MMD -fPIC -fmessage-length=0 + WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable + +-PROD_FLAGS=-DNDEBUG $(COMMON_FLAGS) $(OPTIMIZE_FLAGS) ++PROD_FLAGS=$(COMMON_FLAGS) + #DEV_FLAGS=-DUSE_VALGRIND -p $(COMMON_FLAGS) $(WARN_FLAGS) + DEV_FLAGS=-p $(COMMON_FLAGS) $(WARN_FLAGS) + +diff -Naur Firebird-2.5.0.26074-0_orig/builds/posix/prefix.linux_amd64 Firebird-2.5.0.26074-0_deps-flags/builds/posix/prefix.linux_amd64 +--- Firebird-2.5.0.26074-0_orig/builds/posix/prefix.linux_amd64 2010-11-09 12:42:45.000000000 -0500 ++++ Firebird-2.5.0.26074-0_deps-flags/builds/posix/prefix.linux_amd64 2011-03-25 21:39:15.134370707 -0400 +@@ -18,12 +18,11 @@ + # + # 2 Oct 2002, Nickolay Samofatov - Major cleanup + +-COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -DAMD64 -pipe -MMD -fPIC -fmessage-length=0 +-OPTIMIZE_FLAGS=-O3 -fno-omit-frame-pointer ++COMMON_FLAGS=-DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -DAMD64 -MMD -fPIC -fmessage-length=0 + WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable + CXXFLAGS:= $(CXXFLAGS) -fno-rtti + +-PROD_FLAGS=-DNDEBUG $(COMMON_FLAGS) $(OPTIMIZE_FLAGS) ++PROD_FLAGS=$(COMMON_FLAGS) + #DEV_FLAGS=-DUSE_VALGRIND $(COMMON_FLAGS) $(WARN_FLAGS) + DEV_FLAGS=$(COMMON_FLAGS) $(WARN_FLAGS) + diff --git a/server/database/firebird/files/fix-lib64-dir.diff b/server/database/firebird/files/fix-lib64-dir.diff new file mode 100644 index 0000000000..1f9281936d --- /dev/null +++ b/server/database/firebird/files/fix-lib64-dir.diff @@ -0,0 +1,13 @@ +Index: Firebird-2.1.3.18185-0/configure.in +=================================================================== +--- Firebird-2.1.3.18185-0.orig/configure.in ++++ Firebird-2.1.3.18185-0/configure.in +@@ -142,7 +142,7 @@ dnl CPU_TYPE=ppc64 + LOCK_MANAGER_FLG=Y + EDITLINE_FLG=Y + SHRLIB_EXT=so +- libdir=/usr/lib64 ++ libdir=/usr/lib + CPU_TYPE=amd64 + RPM64='()(64bit)' + ;; diff --git a/server/database/firebird/files/hosts.equiv b/server/database/firebird/files/hosts.equiv new file mode 100644 index 0000000000..49f48a8506 --- /dev/null +++ b/server/database/firebird/files/hosts.equiv @@ -0,0 +1,3 @@ +# Insert host names here to allow connect to Firebird +localhost.localdomain +localhost diff --git a/server/database/firebird/pspec.xml b/server/database/firebird/pspec.xml new file mode 100644 index 0000000000..705b0c7ec9 --- /dev/null +++ b/server/database/firebird/pspec.xml @@ -0,0 +1,130 @@ + + + + + firebird + http://www.firebirdsql.org/ + + PisiLinux Community + admins@pisilinux.org + + IPL-1 + IDPL-1 + LGPLv2.1 + service + library + A relational database offering many ANSI SQL-99 features + Firebird is an open source relational database management system offering many ANSI SQL-99 features. + http://sourceforge.net/projects/firebird/files/firebird/2.5.2-Release/Firebird-2.5.2.26540-0.tar.bz2/download + + icu4c-devel + btyacc + libedit-devel + + + + editline-dumb-tr.patch + firebird-2.5.1.26351.0-deps-flags.patch + + + + + firebird-client + Firebird database client library + Firebird relational database client library. + + /usr/lib/libfbclient.* + /usr/lib/libgds.* + /usr/lib/libib_util.* + /usr/lib/libfbtrace.so + /opt/firebird/lib/libfbclient.* + /opt/firebird/lib/libgds.* + /opt/firebird/lib/libib_util.* + /opt/firebird/plugins/libfbtrace.so + + + + + firebird-superserver + Firebird super server + + firebird-client + icu4c + libedit + + + /etc/firebird + /etc/env.d/50firebird + /opt/firebird/*.conf + /opt/firebird/*.msg + /opt/firebird/security2.fdb + /opt/firebird/README + /opt/firebird/WhatsNew + /opt/firebird/UDF + /opt/firebird/bin + /opt/firebird/doc + /opt/firebird/examples + /opt/firebird/help + /opt/firebird/intl + /opt/firebird/lib/libicu* + /opt/firebird/upgrade + /opt/firebird/firebird.log + /opt/firebird + /run/firebird + + + hosts.equiv + 50firebird + + + System.Service + System.Package + + + + + firebird-devel + Development files for firebird + + firebird-client + + + /usr/include/firebird + + + + + + 2014-05-19 + 2.5.2.26540 + Version bump. + Alihan Öztürk + alihan@pisilinux.org + + + 2013-10-14 + 2.5.2.26539 + Rebuild for icu4c + Ertan Güven + ertan@pisilinux.org + + + 2013-03-20 + 2.5.2.26539 + Version bump + Ertan Güven + ertan@pisilinux.org + + + 2012-10-15 + 2.5.1.26351 + First release + Marcin Bojara + marcin@pisilinux.org + + + \ No newline at end of file diff --git a/server/database/firebird/translations.xml b/server/database/firebird/translations.xml new file mode 100644 index 0000000000..56d5835ee8 --- /dev/null +++ b/server/database/firebird/translations.xml @@ -0,0 +1,26 @@ + + + + firebird + Birçok ANSI SQL-99 özelliği sunan ilişkisel bir veritabanı + Birçok ANSI SQL-99 özelliği sunan, küçük, hızlı ve çok kararlı bir veritabanı sunucu. + + + + firebird-client + Firebird veritabanı istemci kütüphanesi + Firebird sunucuya bağlantı için kullanılan istemci kütüphanesi + + + + firebird-superserver + Firebird veritabanı sunucusu + Firebird veritabanı için super sunucu. Klasik sunucu mimarisine göre, SMP performansı daha fazladır. + + + + firebird-devel + Firebird için geliştirme dosyaları + + + diff --git a/server/database/mariadb/actions.py b/server/database/mariadb/actions.py new file mode 100644 index 0000000000..f10f171246 --- /dev/null +++ b/server/database/mariadb/actions.py @@ -0,0 +1,80 @@ +#!/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 get +from pisi.actionsapi import pisitools +from pisi.actionsapi import cmaketools + + +#pisitools.flags.add("-fno-strict-aliasing -DBIG_JOINS=1") +#pisitools.cflags.add("-fomit-frame-pointer") +#pisitools.cxxflags.add("-felide-constructors -fno-rtti -fno-delete-null-pointer-checks") + +def setup(): + #pisitools.dosed("storage/tokudb/ft-index/ft/ft-ops.cc", "LEAFENTRY leaf_entry;", "LEAFENTRY leaf_entry = 0;") + cmaketools.configure("-DBUILD_CONFIG=mysql_release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DSYSCONFDIR=/etc/mysql \ + -DMYSQL_DATADIR=/var/lib/mysql \ + -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock \ + -DDEFAULT_CHARSET=utf8 \ + -DDEFAULT_COLLATION=utf8_general_ci \ + -DENABLED_LOCAL_INFILE=ON \ + -DINSTALL_INFODIR=share/mysql/docs \ + -DINSTALL_MANDIR=share/man \ + -DINSTALL_PLUGINDIR=lib/mysql/plugin \ + -DINSTALL_SCRIPTDIR=bin \ + -DINSTALL_INCLUDEDIR=include/mysql \ + -DINSTALL_DOCREADMEDIR=share/mysql \ + -DINSTALL_SUPPORTFILESDIR=share/mysql \ + -DINSTALL_MYSQLSHAREDIR=share/mysql \ + -DINSTALL_DOCDIR=share/mysql/docs \ + -DINSTALL_SHAREDIR=share/mysql \ + -DWITH_READLINE=ON \ + -DWITH_ZLIB=system \ + -DWITH_SSL=system \ + -DWITH_PCRE=system \ + -DWITH_LIBWRAP=OFF \ + -DWITH_JEMALLOC=ON \ + -DWITH_EXTRA_CHARSETS=complex \ + -DWITH_EMBEDDED_SERVER=ON \ + -DWITH_ARCHIVE_STORAGE_ENGINE=1 \ + -DWITH_BLACKHOLE_STORAGE_ENGINE=1 \ + -DWITH_INNOBASE_STORAGE_ENGINE=1 \ + -DWITH_PARTITION_STORAGE_ENGINE=1 \ + -DWITHOUT_TOKUDB_STORAGE_ENGINE=1 \ + -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \ + -DWITHOUT_FEDERATED_STORAGE_ENGINE=1 \ + -DWITHOUT_PBXT_STORAGE_ENGINE=1 \ + -DCMAKE_C_FLAGS='-fPIC %s -fno-strict-aliasing -DBIG_JOINS=1 -fomit-frame-pointer -fno-delete-null-pointer-checks' \ + -DCMAKE_CXX_FLAGS='-fPIC %s -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-rtti -fno-delete-null-pointer-checks' \ + -DWITH_MYSQLD_LDFLAGS='-pie %s,-z,now'" % (get.CFLAGS(), get.CXXFLAGS(), get.LDFLAGS())) +#-DCMAKE_EXE_LINKER_FLAGS='-ljemalloc' \ +def build(): + cmaketools.make() + +def install(): + cmaketools.install("DESTDIR=%s benchdir_root=\"/usr/share/mysql\"" % get.installDIR()) + + # Config + pisitools.insinto("/etc/mysql", "%s/usr/share/mysql/my-medium.cnf" % get.installDIR(), "my.cnf") + pisitools.insinto("/etc/mysql", "%s/%s/scripts/mysqlaccess.conf" % (get.workDIR(), get.srcDIR())) + pisitools.insinto("/usr/bin", "%s/%s/scripts/mysql_config" % (get.workDIR(), get.srcDIR())) + # Data dir + pisitools.dodir("/var/lib/mysql") + + # Documents + pisitools.dodoc("%s/%s/support-files/my-*.cnf" % (get.workDIR(), get.srcDIR())) + pisitools.dodoc("COPYING", "INSTALL-SOURCE", "README", "VERSION") + + # Remove not needed files + pisitools.removeDir("/usr/data") + pisitools.removeDir("/usr/mysql-test") + pisitools.removeDir("/usr/sql-bench") + pisitools.remove("/usr/share/man/man1/mysql-test-run.pl.1") + + # Remove -lprobes_mysql + #pisitools.dosed("%s/usr/bin/mysql_config" % get.installDIR(), "-lprobes_mysql") diff --git a/server/database/mariadb/comar/package.py b/server/database/mariadb/comar/package.py new file mode 100644 index 0000000000..43f51fade3 --- /dev/null +++ b/server/database/mariadb/comar/package.py @@ -0,0 +1,39 @@ +#!/usr/bin/python + +import os, re +import shutil + +OUR_ID = 794 +OUR_NAME = "mysql" +OUR_DESC = "mysql" + +DATADIR = "/var/lib/mysql" +DATADIRMODE = 0755 + +def postInstall(fromVersion, fromRelease, toVersion, toRelease): + try: + os.system ("groupadd -g %d %s" % (OUR_ID, OUR_NAME)) + os.system ("useradd -m -d /var/lib/mysql -r -s /bin/false -u %d -g %d %s -c %s" % (OUR_ID, OUR_ID, OUR_NAME, OUR_DESC)) + except: + pass + + + os.system("/sbin/mudur_tmpfiles.py /usr/lib/tmpfiles.d/mariadb.conf") + + # Create the database + os.system("/bin/chown -R mysql:mysql %s" % DATADIR) + os.system("/bin/chown -R mysql:mysql /var/log/mysqld.log") + os.system("/usr/bin/mysql_install_db --user=mysql --datadir=/var/lib/mysql --basedir=/usr --force") + os.system("/usr/bin/mysql_upgrade --force") + + # On first install... + if not os.path.exists(DATADIR): + os.makedirs(DATADIR, DATADIRMODE) + + +def postRemove(): + try: + os.system ("userdel %s" % OUR_NAME) + os.system ("groupdel %s" % OUR_NAME) + except: + pass diff --git a/server/database/mariadb/comar/service.py b/server/database/mariadb/comar/service.py new file mode 100644 index 0000000000..9552b147c9 --- /dev/null +++ b/server/database/mariadb/comar/service.py @@ -0,0 +1,32 @@ +# -*- coding: utf-8 -*- +from comar.service import * +import os + +serviceType="server" +serviceDesc=_({"en": "MariaDB Database Server", + "tr": "MariaDB Veritabanı Sunucusu"}) + +PIDFILE="/run/mysqld/mysqld.pid" +DAEMON="/usr/bin/mysqld" + +@synchronized +def start(): + startService(command=DAEMON, + pidfile=PIDFILE, + detach=True, + donotify=True) + #os.system("pidof mariadb_server + /usr/bin/mysqld > /run/mysqld/mysqld.pid") + + +@synchronized +def stop(): + stopService(pidfile=PIDFILE, + donotify=True) + + try: + os.unlink(PIDFILE) + except OSError: + pass + +def status(): + return isServiceRunning(PIDFILE) diff --git a/server/database/mariadb/files/my.cnf b/server/database/mariadb/files/my.cnf new file mode 100644 index 0000000000..84667c1214 --- /dev/null +++ b/server/database/mariadb/files/my.cnf @@ -0,0 +1,150 @@ +# The following options will be passed to all MySQL clients +[client] +#password= your_password +port= 3306 +socket= /run/mysqld/mysqld.sock + +[mysql] +character-sets-dir=/usr/share/mysql/charsets +default-character-set=utf8 + +[mysqladmin] +character-sets-dir=/usr/share/mysql/charsets +default-character-set=utf8 + +[mysqlcheck] +character-sets-dir=/usr/share/mysql/charsets +default-character-set=utf8 + +[mysqldump] +character-sets-dir=/usr/share/mysql/charsets +default-character-set=utf8 + +[mysqlimport] +character-sets-dir=/usr/share/mysql/charsets +default-character-set=utf8 + +[mysqlshow] +character-sets-dir=/usr/share/mysql/charsets +default-character-set=utf8 + +[myisamchk] +character-sets-dir=/usr/share/mysql/charsets + +[myisampack] +character-sets-dir=/usr/share/mysql/charsets + +# use [safe_mysqld] with mysql-3 +[mysqld_safe] +err-log= /var/log/mysql/mysql.err + +# add a section [mysqld-4.1] or [mysqld-5.0] for specific configurations +[mysqld] +character-set-server= utf8 +user = mysql +port = 3306 +socket = /run/mysqld/mysqld.sock +pid-file = /run/mysqld/mysqld.pid +log-error = /var/log/mysql/mysqld.err +basedir = /usr +datadir = /var/lib/mysql +skip-external-locking +key_buffer = 16M +max_allowed_packet = 4M +table_open_cache = 400 +sort_buffer_size = 512K +net_buffer_length = 16K +read_buffer_size = 256K +read_rnd_buffer_size = 512K +myisam_sort_buffer_size = 8M +lc_messages_dir = /usr/share/mysql +#Set this to your desired error message language +lc_messages = en_US + +# security: +# using "localhost" in connects uses sockets by default +# skip-networking +bind-address = 127.0.0.1 +log-bin +#log-bin = mysqld-bin +server-id = 1 + +# point the following paths to different dedicated disks +tmpdir = /tmp/ +#log-update = /path-to-dedicated-directory/hostname + +# you need the debug USE flag enabled to use the following directives, +# if needed, uncomment them, start the server and issue +# #tail -f /tmp/mysqld.sql /tmp/mysqld.trace +# this will show you *exactly* what's happening in your server ;) + +#log = /tmp/mysqld.sql +#gdb +#debug = d:t:i:o,/tmp/mysqld.trace +#one-thread + +# uncomment the following directives if you are using BDB tables +#bdb_cache_size = 4M +#bdb_max_lock = 10000 + +# the following is the InnoDB configuration +# if you wish to disable innodb instead +# uncomment just the next line +#skip-innodb +# +# the rest of the innodb config follows: +# don't eat too much memory, we're trying to be safe on 64Mb boxes +# you might want to bump this up a bit on boxes with more RAM +innodb_buffer_pool_size = 128M +# +# i'd like to use /var/lib/mysql/innodb, but that is seen as a database :-( +# and upstream wants things to be under /var/lib/mysql/, so that's the route +# we have to take for the moment +#innodb_data_home_dir = /var/lib/mysql/ +#innodb_log_arch_dir = /var/lib/mysql/ +#innodb_log_group_home_dir = /var/lib/mysql/ +# you may wish to change this size to be more suitable for your system +# the max is there to avoid run-away growth on your machine +innodb_data_file_path = ibdata1:10M:autoextend:max:128M +# we keep this at around 25% of of innodb_buffer_pool_size +# sensible values range from 1MB to (1/innodb_log_files_in_group*innodb_buffer_pool_size) +innodb_log_file_size = 48M +# this is the default, increase it if you have very large transactions going on +innodb_log_buffer_size = 8M +# this is the default and won't hurt you +# you shouldn't need to tweak it +innodb_log_files_in_group=2 +# see the innodb config docs, the other options are not always safe +innodb_flush_log_at_trx_commit = 1 +innodb_lock_wait_timeout = 50 +innodb_file_per_table + +# Uncomment this to get FEDERATED engine support +#plugin-load=federated=ha_federated.so +loose-federated + +[mysqldump] +quick +max_allowed_packet = 16M + +[mysql] +# uncomment the next directive if you are not familiar with SQL +#safe-updates + +[isamchk] +key_buffer = 20M +sort_buffer_size = 20M +read_buffer = 2M +write_buffer = 2M + +[myisamchk] +key_buffer = 20M +sort_buffer_size = 20M +read_buffer = 2M +write_buffer = 2M + +[mysqlhotcopy] +interactive-timeout + +[mariadb] + \ No newline at end of file diff --git a/server/database/mariadb/files/tmpfiles.conf b/server/database/mariadb/files/tmpfiles.conf new file mode 100644 index 0000000000..6883dc7988 --- /dev/null +++ b/server/database/mariadb/files/tmpfiles.conf @@ -0,0 +1 @@ +d /run/mysqld 0755 mysql mysql - diff --git a/server/database/mariadb/pspec.xml b/server/database/mariadb/pspec.xml new file mode 100644 index 0000000000..fd048025ec --- /dev/null +++ b/server/database/mariadb/pspec.xml @@ -0,0 +1,216 @@ + + + + + mariadb + https://mariadb.org + + Pisi Linux Admins + admins@pisilinux.org + + GPLv2 + app:console + MariaDB is a drop-in replacement for MySQL + MariaDB strives to be the logical choice for database professionals looking for a robust, scalable, and reliable SQL server. + ftp://ftp.ulak.net.tr/pub/MariaDB/mariadb-10.0.17/source/mariadb-10.0.17.tar.gz + + libaio-devel + unixODBC-devel + + + + + + + mariadb-lib + app:console + library + The shared libraries required for MariaDB clients + + libaio + unixODBC + + + mysql-lib + + + /usr/bin/mysql_config + /usr/include + /usr/lib + /usr/share/mysql/charsets + /usr/share/mysql/czech + /usr/share/mysql/danish + /usr/share/mysql/dutch + /usr/share/mysql/english + /usr/share/mysql/estonian + /usr/share/mysql/french + /usr/share/mysql/german + /usr/share/mysql/greek + /usr/share/mysql/hungarian + /usr/share/mysql/italian + /usr/share/mysql/japanese + /usr/share/mysql/korean + /usr/share/mysql/norwegian + /usr/share/mysql/norwegian-ny + /usr/share/mysql/polish + /usr/share/mysql/portuguese + /usr/share/mysql/romanian + /usr/share/mysql/russian + /usr/share/mysql/serbian + /usr/share/mysql/slovak + /usr/share/mysql/spanish + /usr/share/mysql/swedish + /usr/share/mysql/ukrainian + /usr/share/mysql/errmsg.txt + /usr/share/mysql + + + + + mariadb-client + app:console + MariaDB client programs + + mariadb-lib + libaio + + + mysql-client + + + /usr/bin + + + + + mariadb-server + service + The MariaDB server and related files + + mariadb-lib + mariadb-client + libaio + + + mysql-server + + + /etc + /usr/sbin + /usr/bin/mysql_install_db + /usr/bin/mysqlmanagerc + /usr/bin/mysqlmanager-pwgen + /usr/bin/mysqlmanager + /usr/bin/mysql_secure_installation + /usr/bin/mysql_fix_privilege_tables + /usr/bin/mysqld_safe + /usr/bin/myisamchk + /usr/bin/myisamlog + /usr/bin/myisampack + /usr/bin/myisam_ftdump + /usr/bin/isamchk + /usr/bin/isamlog + /usr/bin/mysql_waitpid + /usr/bin/mysqlbinlog + /usr/bin/pack_isam + /usr/share/mysql/binary-configure + /usr/share/mysql/fill_help_tables.sql + /usr/share/mysql/mysqld_multi.server + /usr/share/mysql/mysql_fix_privilege_tables.sql + /usr/share/mysql/mysql_system_tables_data.sql + /usr/share/mysql/mysql_system_tables.sql + /usr/share/mysql/mysql_test_data_timezone.sql + /usr/share/mysql/ndb-config-2-node.ini + /usr/share/info + /var + /usr/share/doc + /usr/lib/tmpfiles.d/mariadb.conf + /run/mysqld + + + my.cnf + tmpfiles.conf + + + System.Service + System.Package + + + + + mariadb-man-pages + data + Man pages for MariaDB server and client + + mysql-man-pages + + + /usr/share/man + + + + + + 2015-01-25 + 10.0.17 + Version bump. + Vedat Demir + vedat@pisilinux.org + + + 2014-09-25 + 10.0.13 + Version bump. + Serdar Soytetir + kaptan@pisilinux.org + + + 2014-09-03 + 5.5.37 + Fix package.py, first create initial db then chown. + Serdar Soytetir + kaptan@pisilinux.org + + + 2014-05-25 + 5.5.37 + Rebuild. + Aydın Demirel + aydin.demirel@pisilinux.org + + + 2014-05-19 + 5.5.37 + Version bump. + Alihan Öztürk + alihan@pisilinux.org + + + 2014-02-21 + 5.5.35 + Fix -lprobes_mysql issue + Marcin Bojara + marcin@pisilinux.org + + + 2014-02-18 + 5.5.35 + + Fix package.py + Add tmpfiles.conf + Fix replacing mysql + Remove not needed files + Fix and clean actions.py + + Marcin Bojara + marcin@pisilinux.org + + + 2014-02-11 + 5.5.35 + First release + Aydın Demirel + aydin.demirel@pisilinux.org + + + diff --git a/server/database/mariadb/translations.xml b/server/database/mariadb/translations.xml new file mode 100644 index 0000000000..8c33770f59 --- /dev/null +++ b/server/database/mariadb/translations.xml @@ -0,0 +1,30 @@ + + + + mariadb + Hızlı, çok kullanıcılı ve çok görevli SQL veritabanı sunucusu + MySQL, çoklu iş parçacıklı (multi-threaded), çok kullanıcılı (multi-user), hızlı ve sağlam (robust) bir Veritabanı yönetim sistemidir. Özelllikle basit web uygulamaları için LAMP sistemi içinde sıkça tercih edilmektedir. + + + + mariadb-lib + MariaDB client tools + MySQL istemcileri tarafından gereken paylaşımlı kitaplıklar + + + + mariadb-client + MariaDB client libraries + MariaDB istemci uygulamaları + + + mariadb-server + MariaDB server and releated files + MariaDB sunucusu ve ilgili dosyalar + + + mariadb-man-pages + MariaDB server and client man pages + MariaDB sunucu ve istemci uygulamarına ait kılavuz sayfaları + + diff --git a/server/database/postgresql/actions.py b/server/database/postgresql/actions.py new file mode 100644 index 0000000000..437615bb7b --- /dev/null +++ b/server/database/postgresql/actions.py @@ -0,0 +1,83 @@ +#!/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(): + autotools.configure("--with-python \ + --with-perl \ + --include=/usr/include/postgresql \ + --with-includes=/usr/include/libxml2/ \ + --with-tcl \ + --with-krb5 \ + --with-openssl \ + --enable-nls \ + --with-pam \ + --with-libxml \ + --with-libxslt \ + --with-ldap \ + --enable-integer-datetimes \ + --enable-thread-safety \ + --enable-depend \ + --host=%s \ + --libdir=/usr/lib \ + --disable-rpath \ + --with-docdir=/usr/share/doc/postgresql" % get.CHOST()) + +def build(): + if get.LDFLAGS(): + ld = "-j1 LD=%s %s" % (get.LD(), get.LDFLAGS()) + else: + ld = "-j1 LD=%s" % get.LD() + + autotools.make(ld) + + shelltools.cd("contrib") + autotools.make(ld) + shelltools.cd("..") + + shelltools.cd("contrib/xml2") + autotools.make(ld) + shelltools.cd("../..") + + shelltools.cd("src/interfaces/libpq") + autotools.make(ld) + shelltools.cd("../../..") + + shelltools.cd("doc") + autotools.make(ld) + shelltools.cd("..") + +def install(): + autotools.rawInstall("DESTDIR=%s LIBDIR=%s/usr/lib" % (get.installDIR(), get.installDIR())) + + shelltools.cd("contrib") + autotools.rawInstall("DESTDIR=%s LIBDIR=%s/usr/lib" % (get.installDIR(), get.installDIR())) + shelltools.cd("..") + + shelltools.cd("contrib/xml2") + autotools.rawInstall("DESTDIR=%s LIBDIR=%s/usr/lib" % (get.installDIR(), get.installDIR())) + shelltools.cd("../..") + + shelltools.cd("src/interfaces/libpq") + autotools.rawInstall("DESTDIR=%s LIBDIR=%s/usr/lib" % (get.installDIR(), get.installDIR())) + shelltools.cd("../../..") + + shelltools.cd("doc") + autotools.rawInstall("DESTDIR=%s LIBDIR=%s/usr/lib" % (get.installDIR(), get.installDIR())) + shelltools.cd("..") + + # No static libs + pisitools.remove("/usr/lib/*.a") + + pisitools.dodoc("README", "HISTORY", "COPYRIGHT") + pisitools.dodoc("doc/MISSING_FEATURES", "doc/KNOWN_BUGS", "doc/TODO", "doc/bug.template") + pisitools.dodir("/var/lib/postgresql") + pisitools.dodir("/var/lib/postgresql/data") + pisitools.dodir("/var/lib/postgresql/backups") diff --git a/server/database/postgresql/comar/package.py b/server/database/postgresql/comar/package.py new file mode 100644 index 0000000000..289666e299 --- /dev/null +++ b/server/database/postgresql/comar/package.py @@ -0,0 +1,15 @@ +#!/usr/bin/python + +import os + +def postInstall(fromVersion, fromRelease, toVersion, toRelease): + os.system("/bin/chown -R postgres:postgres /var/lib/postgresql") + os.system("/bin/chmod -R 0700 /var/lib/postgresql/data") + os.system("/bin/chmod -R 0700 /var/lib/postgresql/backups") + + # On first install... + if not os.path.exists("/var/lib/postgresql/data/base"): + for i in ["LANG", "LANGUAGE", "LC_ALL"]: + os.environ[i] = "en_US.UTF-8" + + os.system('/bin/su postgres -s /bin/sh -p -c "/usr/bin/initdb --pgdata /var/lib/postgresql/data"') \ No newline at end of file diff --git a/server/database/postgresql/comar/service.py b/server/database/postgresql/comar/service.py new file mode 100644 index 0000000000..3126257eec --- /dev/null +++ b/server/database/postgresql/comar/service.py @@ -0,0 +1,45 @@ +# -*- coding: utf-8 -*- + +from comar.service import * + +serviceType="server" + +serviceDesc = _({"en": "PostgreSQL Database Server", + "tr": "PostgreSQL Veritabanı Sunucusu"}) + +serviceConf = "postgresql" + +MSG_ERR_PGSQLNOTINST = _({"en": "PostgreSQL is not configured properly, please re-install the package.", + "tr": "PostgreSQL düzgün yapılandırılmamış, lütfen paketi tekrar yükleyin.", + }) + +def check_postgresql(): + import os + if not os.path.exists(config.get("PGDATA", "/var/lib/postgresql/data")): + fail(MSG_ERR_PGSQLNOTINST) + +PIDFILE = "%s/postmaster.pid" % config.get("PGDATA", "/var/lib/postgresql/data") + +@synchronized +def start(): + check_postgresql() + startService(command="/usr/bin/pg_ctl", + args=["start", "-D", config.get("PGDATA", "/var/lib/postgresql/data"), "-l", config.get("PGLOG", "/var/lib/postgresql/data/postgresql.log"), "-o", config.get("PGOPTS", "")], + pidfile=PIDFILE, + chuid=config.get("PGUSER", "postgres"), + donotify=True) + +@synchronized +def stop(): + stopService(command="/usr/bin/pg_ctl", + args=["stop", "-D", config.get("PGDATA", "/var/lib/postgresql/data"), "-s", "-m", "fast"], + chuid=config.get("PGUSER", "postgres"), + donotify=True) + +def reload(): + stopService(command="/usr/bin/pg_ctl", + args=["reload", "-D", config.get("PGDATA", "/var/lib/postgresql/data"), "-s"], + donotify=True) + +def status(): + return isServiceRunning(PIDFILE) \ No newline at end of file diff --git a/server/database/postgresql/files/postgresql.conf-8 b/server/database/postgresql/files/postgresql.conf-8 new file mode 100644 index 0000000000..0f7cf5d495 --- /dev/null +++ b/server/database/postgresql/files/postgresql.conf-8 @@ -0,0 +1,13 @@ +# PostgreSQL's Database Directory +PGDATA=/var/lib/postgresql/data + +# Logfile path: (NOTE: This must be uid/gid owned by the value of $PGUSER!) +PGLOG=/var/lib/postgresql/data/postgresql.log + +# Run the PostgreSQL user as: +PGUSER=postgres + +# Extra options to run postmaster with. +# If you want to enable TCP/IP for PostgreSQL, add -i to the following: +# PGOPTS="-N 1024 -B 2048 -i" +PGOPTS="" \ No newline at end of file diff --git a/server/database/postgresql/pspec.xml b/server/database/postgresql/pspec.xml new file mode 100644 index 0000000000..260fb7cb12 --- /dev/null +++ b/server/database/postgresql/pspec.xml @@ -0,0 +1,151 @@ + + + + + postgresql + http://www.postgresql.org/ + + PisiLinux Community + admins@pisilinux.org + + GPLv2 + service + A powerful, open source relational database system + PostgreSQL is a powerful, open source relational database system. + http://ftp.postgresql.org/pub/source/v9.3.4/postgresql-9.3.4.tar.bz2 + + mit-kerberos + tcl-devel + libxslt-devel + libxml2-devel + + + + + + + + postgresql-lib + library + Essential shared libraries for any PostgreSQL client program or interface + + mit-kerberos + tcl + libxslt + openldap-client + + + /usr/lib + /usr/include + /usr/share/postgresql + /usr/bin/pg_config + + + + + postgresql-doc + data:doc + Postgresql documents + Additional documentation for PostgreSQL. + + postgresql-lib + + + /usr/share/doc + + + + + postgresql-server + service + + postgresql-lib + mit-kerberos + openldap-client + + + /etc + /usr/bin + /usr/share/locale + /usr/share/postgresql/contrib + /usr/share/man + /var/lib + + + postgresql.conf-8 + + + System.Package + System.Service + + + + + postgresql-pl + + postgresql-lib + tcl + + + /usr/bin/pltcl_listmod + /usr/bin/pltcl_loadmod + /usr/bin/pltcl_delmod + /usr/lib/postgresql/plperl.so + /usr/lib/postgresql/plpython.so + /usr/lib/postgresql/pltcl.so + /usr/share/postgresql/unknown.pltcl + + + + + + 2014-05-19 + 9.3.4 + Version bump. + Alihan Öztürk + alihan@pisilinux.org + + + 2014-04-23 + 9.3.3 + Rebuild for webp. + Kamil Atlı + suvarice@gmail.com + + + 2014-02-21 + 9.3.3 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2013-11-17 + 9.3.1 + Fix demp + Richard de Bruin + richdb@pisilinux.org + + + 2013-11-15 + 9.3.1 + Version bump + Aydın Demirel + aydin.demirel@pisilinux.org + + + 2013-02-25 + 9.2.3 + Version bump + Ertan Güven + ertan@pisilinux.org + + + 2012-10-04 + 9.2.0 + First release + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + diff --git a/server/database/postgresql/translations.xml b/server/database/postgresql/translations.xml new file mode 100644 index 0000000000..c34825a9e8 --- /dev/null +++ b/server/database/postgresql/translations.xml @@ -0,0 +1,14 @@ + + + + postgresql + Güçlü bir açık kaynaklı ilişkisel veritabanı sistemi + PostgreSQL, açık kaynak kodlu, güçlü bir ilişkisel veritabanıdır + + + + postgresql-doc + Postegresql belgeleri + PostegreSQL için ek belgelendirme + + diff --git a/system/base/component.xml b/system/base/component.xml new file mode 100644 index 0000000000..4b3b583dbf --- /dev/null +++ b/system/base/component.xml @@ -0,0 +1,3 @@ + + system + diff --git a/system/base/gperf/actions.py b/system/base/gperf/actions.py new file mode 100644 index 0000000000..44bf0507c7 --- /dev/null +++ b/system/base/gperf/actions.py @@ -0,0 +1,26 @@ +#!/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 + +def setup(): + autotools.configure() + +def build(): + autotools.make() + +def check(): + autotools.make("check -j1") + +def install(): + autotools.install() + + pisitools.dohtml("doc/*.html") + + pisitools.remove("/usr/share/doc/gperf.html") + + pisitools.dodoc("AUTHORS", "COPYING", "NEWS", "README") diff --git a/system/base/gperf/pspec.xml b/system/base/gperf/pspec.xml new file mode 100644 index 0000000000..bed477ce21 --- /dev/null +++ b/system/base/gperf/pspec.xml @@ -0,0 +1,61 @@ + + + + + gperf + http://www.gnu.org/software/gperf/gperf.html + + PisiLinux Community + admins@pisilinux.org + + GPLv2 + app:console + A perfect hash function generator + gperf is a perfect hash function generator. For a given list of strings, it produces a hash function and hash table, in form of C or C++ code, for looking up a value depending on the input string. The hash function is perfect, which means that the hash table has no collisions, and the hash table lookup needs a single string comparison only. + mirrors://gnu/gperf/gperf-3.0.4.tar.gz + + + + gperf + + libgcc + + + /usr/bin + /usr/share/doc + /usr/share/info + /usr/share/man + + + + + + 2014-05-11 + 3.0.4 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-10-24 + 3.0.4 + Rebuild. + Ertuğrul Erata + ertugrulerata@gmail.com + + + 2013-07-26 + 3.0.4 + Fix dep,release bump. + PisiLinux Community + admins@pisilinux.org + + + 2012-08-23 + 3.0.4 + First release + PisiLinux Community + admins@pisilinux.org + + + diff --git a/system/base/gperf/translations.xml b/system/base/gperf/translations.xml new file mode 100644 index 0000000000..245bf2bd32 --- /dev/null +++ b/system/base/gperf/translations.xml @@ -0,0 +1,9 @@ + + + + gperf + Mükemmel hash üreticisi + gperf mükemmel hash fonksiyonu üretecidir. Verilen bir katar listesi için C ve C++ kodu biçiminde bir hash fonksiyonu ve hash tablosu üretir. + GNU gperf es un generador de perfect hash. Produce una función hash y una tabla hash a base de una lista de cadenas, en forma de código C o C++ , para revisar valores dependiendo de una cadena de entrada. La función de hash es perfecta, lo que quiere decir que no hay colisiones en la tabla de hash, y para la búsqueda en la tabla hash se necesita solamente una comparación. + + diff --git a/system/base/libX11/actions.py b/system/base/libX11/actions.py new file mode 100644 index 0000000000..4d41b1e29c --- /dev/null +++ b/system/base/libX11/actions.py @@ -0,0 +1,26 @@ +# -*- 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 get +from pisi.actionsapi import autotools +from pisi.actionsapi import pisitools +from pisi.actionsapi import shelltools + +def setup(): + autotools.autoreconf("-vif") + autotools.configure("--disable-static") + + pisitools.dosed("libtool", "^(hardcode_libdir_flag_spec=).*", '\\1""') + pisitools.dosed("libtool", "^(runpath_var=)LD_RUN_PATH", "\\1DIE_RPATH_DIE") + pisitools.dosed("libtool"," -shared ", " -Wl,--as-needed -shared ") + +def build(): + autotools.make() + +def install(): + autotools.rawInstall("DESTDIR=%s" % get.installDIR()) + if get.buildTYPE() == "emul32": return + + pisitools.dodoc("AUTHORS", "COPYING", "NEWS", "README") diff --git a/system/base/libX11/files/fix-null-pointer.patch b/system/base/libX11/files/fix-null-pointer.patch new file mode 100644 index 0000000000..8b37f365b5 --- /dev/null +++ b/system/base/libX11/files/fix-null-pointer.patch @@ -0,0 +1,12 @@ +diff -Naur libX11-1.3.5//src/xlibi18n/ICWrap.c libX11-1.3.5.tpg//src/xlibi18n/ICWrap.c +--- libX11-1.3.5//src/xlibi18n/ICWrap.c 2010-08-10 04:59:44.000000000 +0000 ++++ libX11-1.3.5.tpg//src/xlibi18n/ICWrap.c 2010-09-17 17:11:21.000000000 +0000 +@@ -283,7 +283,7 @@ + XIMArg *args; + char *ret; + +- if (!ic->core.im) ++ if (!ic || !ic->core.im) + return (char *) NULL; + + /* diff --git a/system/base/libX11/files/fix-segfault.diff b/system/base/libX11/files/fix-segfault.diff new file mode 100644 index 0000000000..a38c0ce2a2 --- /dev/null +++ b/system/base/libX11/files/fix-segfault.diff @@ -0,0 +1,50 @@ +Index: libX11-1.4.99.1/src/Xrm.c +=================================================================== +--- libX11-1.4.99.1.orig/src/Xrm.c ++++ libX11-1.4.99.1/src/Xrm.c +@@ -2540,30 +2540,40 @@ Bool XrmQGetResource( + VClosureRec closure; + + if (db && *names) { +- _XLockMutex(&db->linfo); ++ if ((_XLockMutex_fn) && db->linfo.lock ) { ++ _XLockMutex(&db->linfo); ++ } + closure.type = pType; + closure.value = pValue; + table = db->table; + if (names[1]) { + if (table && !table->leaf) { + if (GetNEntry(table, names, classes, &closure)) { +- _XUnlockMutex(&db->linfo); ++ if ((_XUnlockMutex_fn) && db->linfo.lock ) { ++ _XUnlockMutex(&db->linfo); ++ } + return True; + } + } else if (table && table->hasloose && + GetLooseVEntry((LTable)table, names, classes, &closure)) { +- _XUnlockMutex (&db->linfo); ++ if ((_XUnlockMutex_fn) && db->linfo.lock ) { ++ _XUnlockMutex (&db->linfo); ++ } + return True; + } + } else { + if (table && !table->leaf) + table = table->next; + if (table && GetVEntry((LTable)table, names, classes, &closure)) { +- _XUnlockMutex(&db->linfo); ++ if ((_XUnlockMutex_fn) && db->linfo.lock ) { ++ _XUnlockMutex(&db->linfo); ++ } + return True; + } + } +- _XUnlockMutex(&db->linfo); ++ if ((_XUnlockMutex_fn) && db->linfo.lock ) { ++ _XUnlockMutex(&db->linfo); ++ } + } + *pType = NULLQUARK; + pValue->addr = (XPointer)NULL; diff --git a/system/base/libX11/files/fix_typo.diff b/system/base/libX11/files/fix_typo.diff new file mode 100644 index 0000000000..a55a940744 --- /dev/null +++ b/system/base/libX11/files/fix_typo.diff @@ -0,0 +1,27 @@ +From 5dcb40f28d59587597d2ff6e6ac64c71cfe6ff7b Mon Sep 17 00:00:00 2001 +From: James Cloos +Date: Tue, 17 Sep 2013 16:50:42 +0000 +Subject: nls/en_US.UTF-8/Compose.pre: Fix typo. + +Fix typo added in 215ce6a67863, s/actute/acute/. + +Fixes bug #69476. Reported by Jean Krohn. + +Signed-off-by: James Cloos +--- +diff --git a/nls/en_US.UTF-8/Compose.pre b/nls/en_US.UTF-8/Compose.pre +index a741332..7314d7f 100644 +--- a/nls/en_US.UTF-8/Compose.pre ++++ b/nls/en_US.UTF-8/Compose.pre +@@ -743,7 +743,7 @@ XCOMM Part 3 + : "ï" idiaeresis # LATIN SMALL LETTER I WITH DIAERESIS + : "ï" idiaeresis # LATIN SMALL LETTER I WITH DIAERESIS + : "ï" idiaeresis # LATIN SMALL LETTER I WITH DIAERESIS +- : "j́" # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301 ++ : "j́" # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301 + : "j́" # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301 + : "j́" # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301 + : "j́" # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301 +-- +cgit v0.9.0.2-2-gbebe + diff --git a/system/base/libX11/pspec.xml b/system/base/libX11/pspec.xml new file mode 100644 index 0000000000..562ee95894 --- /dev/null +++ b/system/base/libX11/pspec.xml @@ -0,0 +1,128 @@ + + + + + libX11 + http://www.x.org/ + + PisiLinux Community + admins@pisilinux.org + + MIT + library + X.Org X11 library + Core X11 protocol client library. + mirrors://xorg/individual/lib/libX11-1.6.3.tar.bz2 + + libxcb-devel + xorg-proto + util-macros + xtrans + + + + + + + + libX11 + + libxcb + + + /usr/lib/libX11* + /usr/lib/X11 + /usr/share/X11 + /usr/share/doc/libX11 + + + + + libX11-devel + Development files for X11 library + + libX11 + libxcb-devel + xorg-proto + + + /usr/include/X11 + /usr/lib/pkgconfig + /usr/lib32/pkgconfig + /usr/share/man + + + + + libX11-32bit + emul32 + 32-bit shared libraries for libX11 + emul32 + + libxcb-32bit + glibc-32bit + + + libX11 + libxcb-32bit + glibc-32bit + + + /usr/lib32 + + + + + + 2015-05-22 + 1.6.3 + Version bump. + Ertuğrul Erata + ertugrulerata@gmail.com + + + 2014-05-11 + 1.6.2 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-10-07 + 1.6.2 + Rebuild. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-09-12 + 1.6.2 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-07-30 + 1.6.1 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-06-21 + 1.6.0 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2012-11-24 + 1.5.0 + First release + Serdar Soytetir + kaptan@pisilinux.org + + + diff --git a/system/base/libX11/translations.xml b/system/base/libX11/translations.xml new file mode 100644 index 0000000000..f7b669ffdf --- /dev/null +++ b/system/base/libX11/translations.xml @@ -0,0 +1,19 @@ + + + + libX11 + X.Org X11 kitaplığı + Librairie X11 de X.Org. + X.Org X11 Bibliothek + + + + libX11-devel + libX11 için geliştirme dosyaları + + + + libX11-32bit + libX11 için 32-bit paylaşımlı kitaplıklar + + diff --git a/system/base/libxcb/actions.py b/system/base/libxcb/actions.py new file mode 100644 index 0000000000..bfab6647d2 --- /dev/null +++ b/system/base/libxcb/actions.py @@ -0,0 +1,30 @@ +# -*- 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 get + +def setup(): + pisitools.flags.add("-DNDEBUG") + + autotools.autoreconf("-vif") + autotools.configure("--disable-static \ + --enable-xevie \ + --enable-xprint \ + --enable-xinput \ + --enable-xkb \ + --without-launchd \ + --without-doxygen") + + pisitools.dosed("libtool"," -shared ", " -Wl,--as-needed -shared ") + +def build(): + autotools.make() + +def install(): + autotools.rawInstall("-j1 DESTDIR=%s" % get.installDIR()) + + pisitools.dodoc("COPYING", "NEWS", "README") diff --git a/system/base/libxcb/files/libxcb-1.1-no-pthread-stubs.patch b/system/base/libxcb/files/libxcb-1.1-no-pthread-stubs.patch new file mode 100644 index 0000000000..84c7f8e2fb --- /dev/null +++ b/system/base/libxcb/files/libxcb-1.1-no-pthread-stubs.patch @@ -0,0 +1,11 @@ +--- libxcb-1.8.1/configure.ac 2012-03-09 15:38:38.000000000 +0100 ++++ libxcb-1.8.1/configure.ac.new 2012-03-09 16:50:40.107109896 +0100 +@@ -43,7 +43,7 @@ + + # Checks for pkg-config packages + PKG_CHECK_MODULES(XCBPROTO, xcb-proto >= 1.11) +-NEEDED="pthread-stubs xau >= 0.99.2" ++NEEDED="xau >= 0.99.2" + PKG_CHECK_MODULES(NEEDED, $NEEDED) + + have_xdmcp="no" diff --git a/system/base/libxcb/files/pthread-stubs.pc b/system/base/libxcb/files/pthread-stubs.pc new file mode 100644 index 0000000000..ad7b91b632 --- /dev/null +++ b/system/base/libxcb/files/pthread-stubs.pc @@ -0,0 +1,8 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=${exec_prefix}/lib + +Name: pthread stubs +Description: Stubs missing from libc for standard pthread functions +Version: 0.3 +Libs: diff --git a/system/base/libxcb/pspec.xml b/system/base/libxcb/pspec.xml new file mode 100644 index 0000000000..48357b1ebd --- /dev/null +++ b/system/base/libxcb/pspec.xml @@ -0,0 +1,125 @@ + + + + + libxcb + http://xcb.freedesktop.org/ + + PisiLinux Community + admins@pisilinux.org + + MIT + library + The X protocol C-language Binding (XCB) + The X protocol C-language Binding (XCB) is a replacement for Xlib featuring a small footprint, latency hiding, direct access to the protocol, improved threading support, and extensibility. + http://xcb.freedesktop.org/dist/libxcb-1.11.tar.bz2 + + libXau-devel + libXdmcp-devel + libxslt + util-macros + xcb-proto + + + libxcb-1.1-no-pthread-stubs.patch + + + + + libxcb + + libXau + libXdmcp + glibc + + + /usr/lib + /usr/share/man + /usr/share/doc + + + + + libxcb-devel + Development files for libxcb + + libxcb + libXau-devel + libXdmcp-devel + + + /usr/include/xcb + /usr/lib/pkgconfig + /usr/lib32/pkgconfig + + + pthread-stubs.pc + + + + + libxcb-32bit + emul32 + 32-bit shared libraries for libxcb + emul32 + + libXau-32bit + libXdmcp-32bit + glibc-32bit + + + libxcb + libXau-32bit + libXdmcp-32bit + glibc-32bit + + + /usr/lib32 + + + + + + 2015-05-22 + 1.11 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-05-11 + 1.10 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-03-07 + 1.10 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2013-10-08 + 1.9.1 + Rebuild. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-07-28 + 1.9.1 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2012-11-18 + 1.9 + First release + Erdinç Gültekin + admins@pisilinux.org + + + diff --git a/system/base/libxcb/translations.xml b/system/base/libxcb/translations.xml new file mode 100644 index 0000000000..d1bf19d273 --- /dev/null +++ b/system/base/libxcb/translations.xml @@ -0,0 +1,17 @@ + + + + libxcb + X protokolü için C dili bağlayıcısı (XCB) + + + + libxcb-devel + libxcb için geliştirme dosyaları + + + + libxcb-32bit + libxcb için 32-bit paylaşımlı kitaplıklar + + diff --git a/system/component.xml b/system/component.xml new file mode 100644 index 0000000000..4b3b583dbf --- /dev/null +++ b/system/component.xml @@ -0,0 +1,3 @@ + + system + diff --git a/util/component.xml b/util/component.xml new file mode 100644 index 0000000000..c00325f4c0 --- /dev/null +++ b/util/component.xml @@ -0,0 +1,3 @@ + + util + diff --git a/util/crypt/nss/actions.py b/util/crypt/nss/actions.py new file mode 100644 index 0000000000..70b3f28930 --- /dev/null +++ b/util/crypt/nss/actions.py @@ -0,0 +1,68 @@ +#!/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 get +from pisi.actionsapi import autotools +from pisi.actionsapi import pisitools +from pisi.actionsapi import shelltools + +WorkDir="%s-%s" % (get.srcNAME(), get.srcVERSION()) +pisitools.cflags.add("-fno-strict-aliasing") + +def setup(): + # nss-pem + #shelltools.copytree("../nss-pem-3ade37c5c4ca5a6094e3f4b2e4591405db1867dd/nss/lib/ckfw/pem", "nss/lib/ckfw") + + # Respect LDFLAGS + pisitools.dosed("nss/coreconf/rules.mk", "(\$\(MKSHLIB\))\s-o", r"\1 $(LDFLAGS) -o") + + # Create nss.pc and nss-config dynamically + shelltools.system("./generate-pc-config.sh") + +def build(): + pisitools.dosed("nss/coreconf/Linux.mk", " -shared ", " -Wl,-O1,--as-needed -shared ") + if get.ARCH() == "x86_64": + shelltools.export("USE_64", "1") + + shelltools.export("BUILD_OPT", "1") + shelltools.export("NSS_ENABLE_ECC", "1") + shelltools.export("NSS_USE_SYSTEM_SQLITE", "1") + shelltools.export("NSPR_INCLUDE_DIR", "`nspr-config --includedir`") + shelltools.export("NSPR_LIB_DIR", "`nspr-config --libdir`") + shelltools.export("XCFLAGS", get.CFLAGS()) + + # Use system zlib + shelltools.export("PKG_CONFIG_ALLOW_SYSTEM_LIBS", "1") + shelltools.export("PKG_CONFIG_ALLOW_SYSTEM_CFLAGS", "1") + + autotools.make("-C nss/coreconf -j1") + autotools.make("-C nss/lib/dbm") + autotools.make("-C nss -j1") + +def install(): + for binary in ["*util", "shlibsign", "signtool", "signver", "ssltap"]: + pisitools.insinto("/usr/bin","dist/Linux*/bin/%s" % binary, sym=False) + + for lib in ["*.a","*.chk","*.so"]: + pisitools.insinto("/usr/lib/nss","dist/Linux*/lib/%s" % lib, sym=False) + + # Headers + for header in ["dist/private/nss/*.h","dist/public/nss/*.h"]: + pisitools.insinto("/usr/include/nss", header, sym=False) + + # Drop executable bits from headers + shelltools.chmod("%s/usr/include/nss/*.h" % get.installDIR(), mode=0644) + + # Install nss-config and nss.pc + pisitools.insinto("/usr/lib/pkgconfig", "dist/pkgconfig/nss.pc") + pisitools.insinto("/usr/bin", "dist/pkgconfig/nss-config") + + # create empty NSS database + pisitools.dodir("/etc/pki/nssdb") + shelltools.export("LD_LIBRARY_PATH", "%s/usr/lib/nss" % get.installDIR()) + shelltools.system("%s/usr/bin/modutil -force -dbdir \"sql:%s/etc/pki/nssdb\" -create" % (get.installDIR(), get.installDIR())) + shelltools.chmod("%s/etc/pki/nssdb/*" % get.installDIR(), 0644) + pisitools.dosed("%s/etc/pki/nssdb/*" % get.installDIR(), get.installDIR(), "") diff --git a/util/crypt/nss/files/add_spi+cacert_ca_certs.patch b/util/crypt/nss/files/add_spi+cacert_ca_certs.patch new file mode 100644 index 0000000000..14c65e0a44 --- /dev/null +++ b/util/crypt/nss/files/add_spi+cacert_ca_certs.patch @@ -0,0 +1,624 @@ +--- security/nss/lib/ckfw/builtins/certdata.txt.orig 2012-08-19 16:22:51.726895174 +0200 ++++ security/nss/lib/ckfw/builtins/certdata.txt 2012-08-19 17:40:41.233306703 +0200 +@@ -24454,3 +24454,621 @@ + CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_MUST_VERIFY_TRUST + CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST + CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE ++ ++# ++# Certificate "CAcert.org Class 1 Root CA" ++# ++# Issuer: E=support@cacert.org,CN=CA Cert Signing Authority,OU=http://www.cacert.org,O=Root CA ++# Serial Number: 0 (0x0) ++# Subject: E=support@cacert.org,CN=CA Cert Signing Authority,OU=http://www.cacert.org,O=Root CA ++# Not Valid Before: Sun Mar 30 12:29:49 2003 ++# Not Valid After : Tue Mar 29 12:29:49 2033 ++# Fingerprint (MD5): A6:1B:37:5E:39:0D:9C:36:54:EE:BD:20:31:46:1F:6B ++# Fingerprint (SHA1): 13:5C:EC:36:F4:9C:B8:E9:3B:1A:B2:70:CD:80:88:46:76:CE:8F:33 ++CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE ++CKA_TOKEN CK_BBOOL CK_TRUE ++CKA_PRIVATE CK_BBOOL CK_FALSE ++CKA_MODIFIABLE CK_BBOOL CK_FALSE ++CKA_LABEL UTF8 "CAcert.org Class 1 Root CA" ++CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 ++CKA_SUBJECT MULTILINE_OCTAL ++\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157 ++\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150 ++\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164 ++\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103 ++\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101 ++\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206 ++\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164 ++\100\143\141\143\145\162\164\056\157\162\147 ++END ++CKA_ID UTF8 "0" ++CKA_ISSUER MULTILINE_OCTAL ++\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157 ++\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150 ++\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164 ++\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103 ++\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101 ++\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206 ++\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164 ++\100\143\141\143\145\162\164\056\157\162\147 ++END ++CKA_SERIAL_NUMBER MULTILINE_OCTAL ++\002\001\000 ++END ++CKA_VALUE MULTILINE_OCTAL ++\060\202\007\075\060\202\005\045\240\003\002\001\002\002\001\000 ++\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060 ++\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157\164 ++\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150\164 ++\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164\056 ++\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103\101 ++\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101\165 ++\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206\110 ++\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164\100 ++\143\141\143\145\162\164\056\157\162\147\060\036\027\015\060\063 ++\060\063\063\060\061\062\062\071\064\071\132\027\015\063\063\060 ++\063\062\071\061\062\062\071\064\071\132\060\171\061\020\060\016 ++\006\003\125\004\012\023\007\122\157\157\164\040\103\101\061\036 ++\060\034\006\003\125\004\013\023\025\150\164\164\160\072\057\057 ++\167\167\167\056\143\141\143\145\162\164\056\157\162\147\061\042 ++\060\040\006\003\125\004\003\023\031\103\101\040\103\145\162\164 ++\040\123\151\147\156\151\156\147\040\101\165\164\150\157\162\151 ++\164\171\061\041\060\037\006\011\052\206\110\206\367\015\001\011 ++\001\026\022\163\165\160\160\157\162\164\100\143\141\143\145\162 ++\164\056\157\162\147\060\202\002\042\060\015\006\011\052\206\110 ++\206\367\015\001\001\001\005\000\003\202\002\017\000\060\202\002 ++\012\002\202\002\001\000\316\042\300\342\106\175\354\066\050\007 ++\120\226\362\240\063\100\214\113\361\073\146\077\061\345\153\002 ++\066\333\326\174\366\361\210\217\116\167\066\005\101\225\371\011 ++\360\022\317\106\206\163\140\267\156\176\350\300\130\144\256\315 ++\260\255\105\027\014\143\372\147\012\350\326\322\277\076\347\230 ++\304\360\114\372\340\003\273\065\135\154\041\336\236\040\331\272 ++\315\146\062\067\162\372\367\010\365\307\315\130\311\216\347\016 ++\136\352\076\376\034\241\024\012\025\154\206\204\133\144\146\052 ++\172\251\113\123\171\365\210\242\173\356\057\012\141\053\215\262 ++\176\115\126\245\023\354\352\332\222\236\254\104\101\036\130\140 ++\145\005\146\370\300\104\275\313\224\367\102\176\013\367\145\150 ++\230\121\005\360\363\005\221\004\035\033\027\202\354\310\127\273 ++\303\153\172\210\361\260\162\314\045\133\040\221\354\026\002\022 ++\217\062\351\027\030\110\320\307\005\056\002\060\102\270\045\234 ++\005\153\077\252\072\247\353\123\110\367\350\322\266\007\230\334 ++\033\306\064\177\177\311\034\202\172\005\130\053\010\133\363\070 ++\242\253\027\135\146\311\230\327\236\020\213\242\322\335\164\232 ++\367\161\014\162\140\337\315\157\230\063\235\226\064\166\076\044 ++\172\222\260\016\225\036\157\346\240\105\070\107\252\327\101\355 ++\112\267\022\366\327\033\203\212\017\056\330\011\266\131\327\252 ++\004\377\322\223\175\150\056\335\213\113\253\130\272\057\215\352 ++\225\247\240\303\124\211\245\373\333\213\121\042\235\262\303\276 ++\021\276\054\221\206\213\226\170\255\040\323\212\057\032\077\306 ++\320\121\145\207\041\261\031\001\145\177\105\034\207\365\174\320 ++\101\114\117\051\230\041\375\063\037\165\014\004\121\372\031\167 ++\333\324\024\034\356\201\303\035\365\230\267\151\006\221\042\335 ++\000\120\314\201\061\254\022\007\173\070\332\150\133\346\053\324 ++\176\311\137\255\350\353\162\114\363\001\345\113\040\277\232\246 ++\127\312\221\000\001\213\241\165\041\067\265\143\015\147\076\106 ++\117\160\040\147\316\305\326\131\333\002\340\360\322\313\315\272 ++\142\267\220\101\350\335\040\344\051\274\144\051\102\310\042\334 ++\170\232\377\103\354\230\033\011\121\113\132\132\302\161\361\304 ++\313\163\251\345\241\013\002\003\001\000\001\243\202\001\316\060 ++\202\001\312\060\035\006\003\125\035\016\004\026\004\024\026\265 ++\062\033\324\307\363\340\346\216\363\275\322\260\072\356\262\071 ++\030\321\060\201\243\006\003\125\035\043\004\201\233\060\201\230 ++\200\024\026\265\062\033\324\307\363\340\346\216\363\275\322\260 ++\072\356\262\071\030\321\241\175\244\173\060\171\061\020\060\016 ++\006\003\125\004\012\023\007\122\157\157\164\040\103\101\061\036 ++\060\034\006\003\125\004\013\023\025\150\164\164\160\072\057\057 ++\167\167\167\056\143\141\143\145\162\164\056\157\162\147\061\042 ++\060\040\006\003\125\004\003\023\031\103\101\040\103\145\162\164 ++\040\123\151\147\156\151\156\147\040\101\165\164\150\157\162\151 ++\164\171\061\041\060\037\006\011\052\206\110\206\367\015\001\011 ++\001\026\022\163\165\160\160\157\162\164\100\143\141\143\145\162 ++\164\056\157\162\147\202\001\000\060\017\006\003\125\035\023\001 ++\001\377\004\005\060\003\001\001\377\060\062\006\003\125\035\037 ++\004\053\060\051\060\047\240\045\240\043\206\041\150\164\164\160 ++\163\072\057\057\167\167\167\056\143\141\143\145\162\164\056\157 ++\162\147\057\162\145\166\157\153\145\056\143\162\154\060\060\006 ++\011\140\206\110\001\206\370\102\001\004\004\043\026\041\150\164 ++\164\160\163\072\057\057\167\167\167\056\143\141\143\145\162\164 ++\056\157\162\147\057\162\145\166\157\153\145\056\143\162\154\060 ++\064\006\011\140\206\110\001\206\370\102\001\010\004\047\026\045 ++\150\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162 ++\164\056\157\162\147\057\151\156\144\145\170\056\160\150\160\077 ++\151\144\075\061\060\060\126\006\011\140\206\110\001\206\370\102 ++\001\015\004\111\026\107\124\157\040\147\145\164\040\171\157\165 ++\162\040\157\167\156\040\143\145\162\164\151\146\151\143\141\164 ++\145\040\146\157\162\040\106\122\105\105\040\150\145\141\144\040 ++\157\166\145\162\040\164\157\040\150\164\164\160\072\057\057\167 ++\167\167\056\143\141\143\145\162\164\056\157\162\147\060\015\006 ++\011\052\206\110\206\367\015\001\001\004\005\000\003\202\002\001 ++\000\050\307\356\234\202\002\272\134\200\022\312\065\012\035\201 ++\157\211\152\231\314\362\150\017\177\247\341\215\130\225\076\275 ++\362\006\303\220\132\254\265\140\366\231\103\001\243\210\160\234 ++\235\142\235\244\207\257\147\130\015\060\066\073\346\255\110\323 ++\313\164\002\206\161\076\342\053\003\150\361\064\142\100\106\073 ++\123\352\050\364\254\373\146\225\123\212\115\135\375\073\331\140 ++\327\312\171\151\073\261\145\222\246\306\201\202\134\234\315\353 ++\115\001\212\245\337\021\125\252\025\312\037\067\300\202\230\160 ++\141\333\152\174\226\243\216\056\124\076\117\041\251\220\357\334 ++\202\277\334\350\105\255\115\220\163\010\074\224\145\260\004\231 ++\166\177\342\274\302\152\025\252\227\004\067\044\330\036\224\116 ++\155\016\121\276\326\304\217\312\226\155\367\103\337\350\060\145 ++\047\073\173\273\103\103\143\304\103\367\262\354\150\314\341\031 ++\216\042\373\230\341\173\132\076\001\067\073\213\010\260\242\363 ++\225\116\032\313\233\315\232\261\333\262\160\360\055\112\333\330 ++\260\343\157\105\110\063\022\377\376\074\062\052\124\367\304\367 ++\212\360\210\043\302\107\376\144\172\161\300\321\036\246\143\260 ++\007\176\244\057\323\001\217\334\237\053\266\306\010\251\017\223 ++\110\045\374\022\375\237\102\334\363\304\076\366\127\260\327\335 ++\151\321\006\167\064\012\113\322\312\240\377\034\306\214\311\026 ++\276\304\314\062\067\150\163\137\010\373\121\367\111\123\066\005 ++\012\225\002\114\362\171\032\020\366\330\072\165\234\363\035\361 ++\242\015\160\147\206\033\263\026\365\057\345\244\353\171\206\371 ++\075\013\302\163\013\245\231\254\157\374\147\270\345\057\013\246 ++\030\044\215\173\321\110\065\051\030\100\254\223\140\341\226\206 ++\120\264\172\131\330\217\041\013\237\317\202\221\306\073\277\153 ++\334\007\221\271\227\126\043\252\266\154\224\306\110\006\074\344 ++\316\116\252\344\366\057\011\334\123\157\056\374\164\353\072\143 ++\231\302\246\254\211\274\247\262\104\240\015\212\020\343\154\362 ++\044\313\372\233\237\160\107\056\336\024\213\324\262\040\011\226 ++\242\144\361\044\034\334\241\065\234\025\262\324\274\125\056\175 ++\006\365\234\016\125\364\132\326\223\332\166\255\045\163\114\305 ++\103 ++END ++ ++# Trust for "CAcert.org Class 1 Root CA" ++# Issuer: E=support@cacert.org,CN=CA Cert Signing Authority,OU=http://www.cacert.org,O=Root CA ++# Serial Number: 0 (0x0) ++# Subject: E=support@cacert.org,CN=CA Cert Signing Authority,OU=http://www.cacert.org,O=Root CA ++# Not Valid Before: Sun Mar 30 12:29:49 2003 ++# Not Valid After : Tue Mar 29 12:29:49 2033 ++# Fingerprint (MD5): A6:1B:37:5E:39:0D:9C:36:54:EE:BD:20:31:46:1F:6B ++# Fingerprint (SHA1): 13:5C:EC:36:F4:9C:B8:E9:3B:1A:B2:70:CD:80:88:46:76:CE:8F:33 ++CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST ++CKA_TOKEN CK_BBOOL CK_TRUE ++CKA_PRIVATE CK_BBOOL CK_FALSE ++CKA_MODIFIABLE CK_BBOOL CK_FALSE ++CKA_LABEL UTF8 "CAcert.org Class 1 Root CA" ++CKA_CERT_SHA1_HASH MULTILINE_OCTAL ++\023\134\354\066\364\234\270\351\073\032\262\160\315\200\210\106 ++\166\316\217\063 ++END ++CKA_CERT_MD5_HASH MULTILINE_OCTAL ++\246\033\067\136\071\015\234\066\124\356\275\040\061\106\037\153 ++END ++CKA_ISSUER MULTILINE_OCTAL ++\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157 ++\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150 ++\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164 ++\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103 ++\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101 ++\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206 ++\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164 ++\100\143\141\143\145\162\164\056\157\162\147 ++END ++CKA_SERIAL_NUMBER MULTILINE_OCTAL ++\002\001\000 ++END ++CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR ++CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR ++CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR ++CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE ++ ++# ++# Certificate "CAcert.org Class 3 Root CA" ++# ++# Issuer: E=support@cacert.org,CN=CA Cert Signing Authority,OU=http://www.cacert.org,O=Root CA ++# Serial Number: 672138 (0xa418a) ++# Subject: CN=CAcert Class 3 Root,OU=http://www.CAcert.org,O=CAcert Inc. ++# Not Valid Before: Mon May 23 17:48:02 2011 ++# Not Valid After : Thu May 20 17:48:02 2021 ++# Fingerprint (MD5): F7:25:12:82:4E:67:B5:D0:8D:92:B7:7C:0B:86:7A:42 ++# Fingerprint (SHA1): AD:7C:3F:64:FC:44:39:FE:F4:E9:0B:E8:F4:7C:6C:FA:8A:AD:FD:CE ++CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE ++CKA_TOKEN CK_BBOOL CK_TRUE ++CKA_PRIVATE CK_BBOOL CK_FALSE ++CKA_MODIFIABLE CK_BBOOL CK_FALSE ++CKA_LABEL UTF8 "CAcert.org Class 3 Root CA" ++CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 ++CKA_SUBJECT MULTILINE_OCTAL ++\060\124\061\024\060\022\006\003\125\004\012\023\013\103\101\143 ++\145\162\164\040\111\156\143\056\061\036\060\034\006\003\125\004 ++\013\023\025\150\164\164\160\072\057\057\167\167\167\056\103\101 ++\143\145\162\164\056\157\162\147\061\034\060\032\006\003\125\004 ++\003\023\023\103\101\143\145\162\164\040\103\154\141\163\163\040 ++\063\040\122\157\157\164 ++END ++CKA_ID UTF8 "0" ++CKA_ISSUER MULTILINE_OCTAL ++\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157 ++\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150 ++\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164 ++\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103 ++\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101 ++\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206 ++\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164 ++\100\143\141\143\145\162\164\056\157\162\147 ++END ++CKA_SERIAL_NUMBER MULTILINE_OCTAL ++\002\003\012\101\212 ++END ++CKA_VALUE MULTILINE_OCTAL ++\060\202\007\131\060\202\005\101\240\003\002\001\002\002\003\012 ++\101\212\060\015\006\011\052\206\110\206\367\015\001\001\013\005 ++\000\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157 ++\157\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025 ++\150\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162 ++\164\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031 ++\103\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040 ++\101\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052 ++\206\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162 ++\164\100\143\141\143\145\162\164\056\157\162\147\060\036\027\015 ++\061\061\060\065\062\063\061\067\064\070\060\062\132\027\015\062 ++\061\060\065\062\060\061\067\064\070\060\062\132\060\124\061\024 ++\060\022\006\003\125\004\012\023\013\103\101\143\145\162\164\040 ++\111\156\143\056\061\036\060\034\006\003\125\004\013\023\025\150 ++\164\164\160\072\057\057\167\167\167\056\103\101\143\145\162\164 ++\056\157\162\147\061\034\060\032\006\003\125\004\003\023\023\103 ++\101\143\145\162\164\040\103\154\141\163\163\040\063\040\122\157 ++\157\164\060\202\002\042\060\015\006\011\052\206\110\206\367\015 ++\001\001\001\005\000\003\202\002\017\000\060\202\002\012\002\202 ++\002\001\000\253\111\065\021\110\174\322\046\176\123\224\317\103 ++\251\335\050\327\102\052\213\363\207\170\031\130\174\017\236\332 ++\211\175\341\373\353\162\220\015\164\241\226\144\253\237\240\044 ++\231\163\332\342\125\166\307\027\173\365\004\254\106\270\303\276 ++\177\144\215\020\154\044\363\141\234\300\362\220\372\121\346\365 ++\151\001\143\303\017\126\342\112\102\317\342\104\214\045\050\250 ++\305\171\011\175\106\271\212\363\351\363\064\051\010\105\344\034 ++\237\313\224\004\034\201\250\024\263\230\145\304\103\354\116\202 ++\215\011\321\275\252\133\215\222\320\354\336\220\305\177\012\302 ++\343\353\346\061\132\136\164\076\227\063\131\350\303\003\075\140 ++\063\277\367\321\157\107\304\315\356\142\203\122\156\056\010\232 ++\244\331\025\030\221\246\205\222\107\260\256\110\353\155\267\041 ++\354\205\032\150\162\065\253\377\360\020\135\300\364\224\247\152 ++\325\073\222\176\114\220\005\176\223\301\054\213\244\216\142\164 ++\025\161\156\013\161\003\352\257\025\070\232\324\322\005\162\157 ++\214\371\053\353\132\162\045\371\071\106\343\162\033\076\004\303 ++\144\047\042\020\052\212\117\130\247\003\255\276\264\056\023\355 ++\135\252\110\327\325\175\324\052\173\134\372\106\004\120\344\314 ++\016\102\133\214\355\333\362\317\374\226\223\340\333\021\066\124 ++\142\064\070\217\014\140\233\073\227\126\070\255\363\322\133\213 ++\240\133\352\116\226\270\174\327\325\240\206\160\100\323\221\051 ++\267\242\074\255\365\214\273\317\032\222\212\344\064\173\300\330 ++\154\137\351\012\302\303\247\040\232\132\337\054\135\122\134\272 ++\107\325\233\357\044\050\160\070\040\057\325\177\051\300\262\101 ++\003\150\222\314\340\234\314\227\113\105\357\072\020\012\253\160 ++\072\230\225\160\255\065\261\352\205\053\244\034\200\041\061\251 ++\256\140\172\200\046\110\000\270\001\300\223\143\125\042\221\074 ++\126\347\257\333\072\045\363\217\061\124\352\046\213\201\131\371 ++\241\321\123\021\305\173\235\003\366\164\021\340\155\261\054\077 ++\054\206\221\231\161\232\246\167\213\064\140\321\024\264\054\254 ++\235\257\214\020\323\237\304\152\370\157\023\374\163\131\367\146 ++\102\164\036\212\343\370\334\322\157\230\234\313\107\230\225\100 ++\005\373\351\002\003\001\000\001\243\202\002\015\060\202\002\011 ++\060\035\006\003\125\035\016\004\026\004\024\165\250\161\140\114 ++\210\023\360\170\331\211\167\265\155\305\211\337\274\261\172\060 ++\201\243\006\003\125\035\043\004\201\233\060\201\230\200\024\026 ++\265\062\033\324\307\363\340\346\216\363\275\322\260\072\356\262 ++\071\030\321\241\175\244\173\060\171\061\020\060\016\006\003\125 ++\004\012\023\007\122\157\157\164\040\103\101\061\036\060\034\006 ++\003\125\004\013\023\025\150\164\164\160\072\057\057\167\167\167 ++\056\143\141\143\145\162\164\056\157\162\147\061\042\060\040\006 ++\003\125\004\003\023\031\103\101\040\103\145\162\164\040\123\151 ++\147\156\151\156\147\040\101\165\164\150\157\162\151\164\171\061 ++\041\060\037\006\011\052\206\110\206\367\015\001\011\001\026\022 ++\163\165\160\160\157\162\164\100\143\141\143\145\162\164\056\157 ++\162\147\202\001\000\060\017\006\003\125\035\023\001\001\377\004 ++\005\060\003\001\001\377\060\135\006\010\053\006\001\005\005\007 ++\001\001\004\121\060\117\060\043\006\010\053\006\001\005\005\007 ++\060\001\206\027\150\164\164\160\072\057\057\157\143\163\160\056 ++\103\101\143\145\162\164\056\157\162\147\057\060\050\006\010\053 ++\006\001\005\005\007\060\002\206\034\150\164\164\160\072\057\057 ++\167\167\167\056\103\101\143\145\162\164\056\157\162\147\057\143 ++\141\056\143\162\164\060\112\006\003\125\035\040\004\103\060\101 ++\060\077\006\010\053\006\001\004\001\201\220\112\060\063\060\061 ++\006\010\053\006\001\005\005\007\002\001\026\045\150\164\164\160 ++\072\057\057\167\167\167\056\103\101\143\145\162\164\056\157\162 ++\147\057\151\156\144\145\170\056\160\150\160\077\151\144\075\061 ++\060\060\064\006\011\140\206\110\001\206\370\102\001\010\004\047 ++\026\045\150\164\164\160\072\057\057\167\167\167\056\103\101\143 ++\145\162\164\056\157\162\147\057\151\156\144\145\170\056\160\150 ++\160\077\151\144\075\061\060\060\120\006\011\140\206\110\001\206 ++\370\102\001\015\004\103\026\101\124\157\040\147\145\164\040\171 ++\157\165\162\040\157\167\156\040\143\145\162\164\151\146\151\143 ++\141\164\145\040\146\157\162\040\106\122\105\105\054\040\147\157 ++\040\164\157\040\150\164\164\160\072\057\057\167\167\167\056\103 ++\101\143\145\162\164\056\157\162\147\060\015\006\011\052\206\110 ++\206\367\015\001\001\013\005\000\003\202\002\001\000\051\050\205 ++\256\104\251\271\257\244\171\023\360\250\243\053\227\140\363\134 ++\356\343\057\301\366\342\146\240\021\256\066\067\072\166\025\004 ++\123\352\102\365\371\352\300\025\330\246\202\331\344\141\256\162 ++\013\051\134\220\103\350\101\262\341\167\333\002\023\104\170\107 ++\125\257\130\374\314\230\366\105\271\321\040\370\330\041\007\376 ++\155\252\163\324\263\306\007\351\011\205\314\073\362\266\276\054 ++\034\045\325\161\214\071\265\056\352\276\030\201\272\260\223\270 ++\017\343\346\327\046\214\061\132\162\003\204\122\346\246\365\063 ++\042\105\012\310\013\015\212\270\066\157\220\011\241\253\275\327 ++\325\116\056\161\242\324\256\372\247\124\053\353\065\215\132\267 ++\124\210\057\356\164\237\355\110\026\312\015\110\320\224\323\254 ++\244\242\366\044\337\222\343\275\353\103\100\221\156\034\030\216 ++\126\264\202\022\363\251\223\237\324\274\234\255\234\165\356\132 ++\227\033\225\347\164\055\034\017\260\054\227\237\373\251\063\071 ++\172\347\003\072\222\216\042\366\214\015\344\331\176\015\166\030 ++\367\001\371\357\226\226\242\125\163\300\074\161\264\035\032\126 ++\103\267\303\012\215\162\374\342\020\011\013\101\316\214\224\240 ++\371\003\375\161\163\113\212\127\063\345\216\164\176\025\001\000 ++\346\314\112\034\347\177\225\031\055\305\245\014\213\273\265\355 ++\205\263\134\323\337\270\271\362\312\307\015\001\024\254\160\130 ++\305\214\215\063\324\235\146\243\032\120\225\043\374\110\340\006 ++\103\022\331\315\247\206\071\057\066\162\243\200\020\344\341\363 ++\321\313\133\032\300\344\200\232\174\023\163\006\117\333\243\153 ++\044\012\272\263\034\274\112\170\273\345\343\165\070\245\110\247 ++\242\036\257\166\324\136\367\070\206\126\132\211\316\326\303\247 ++\171\262\122\240\306\361\205\264\045\214\362\077\226\263\020\331 ++\215\154\127\073\237\157\206\072\030\202\042\066\310\260\221\070 ++\333\052\241\223\252\204\077\365\047\145\256\163\325\310\325\323 ++\167\352\113\235\307\101\273\307\300\343\240\077\344\175\244\215 ++\163\346\022\113\337\241\163\163\163\072\200\350\325\313\216\057 ++\313\352\023\247\326\101\213\254\372\074\211\327\044\365\116\264 ++\340\141\222\267\363\067\230\304\276\226\243\267\212 ++END ++ ++# Trust for "CAcert.org Class 3 Root CA" ++# Issuer: E=support@cacert.org,CN=CA Cert Signing Authority,OU=http://www.cacert.org,O=Root CA ++# Serial Number: 672138 (0xa418a) ++# Subject: CN=CAcert Class 3 Root,OU=http://www.CAcert.org,O=CAcert Inc. ++# Not Valid Before: Mon May 23 17:48:02 2011 ++# Not Valid After : Thu May 20 17:48:02 2021 ++# Fingerprint (MD5): F7:25:12:82:4E:67:B5:D0:8D:92:B7:7C:0B:86:7A:42 ++# Fingerprint (SHA1): AD:7C:3F:64:FC:44:39:FE:F4:E9:0B:E8:F4:7C:6C:FA:8A:AD:FD:CE ++CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST ++CKA_TOKEN CK_BBOOL CK_TRUE ++CKA_PRIVATE CK_BBOOL CK_FALSE ++CKA_MODIFIABLE CK_BBOOL CK_FALSE ++CKA_LABEL UTF8 "CAcert.org Class 3 Root CA" ++CKA_CERT_SHA1_HASH MULTILINE_OCTAL ++\255\174\077\144\374\104\071\376\364\351\013\350\364\174\154\372 ++\212\255\375\316 ++END ++CKA_CERT_MD5_HASH MULTILINE_OCTAL ++\367\045\022\202\116\147\265\320\215\222\267\174\013\206\172\102 ++END ++CKA_ISSUER MULTILINE_OCTAL ++\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157 ++\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150 ++\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164 ++\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103 ++\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101 ++\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206 ++\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164 ++\100\143\141\143\145\162\164\056\157\162\147 ++END ++CKA_SERIAL_NUMBER MULTILINE_OCTAL ++\002\003\012\101\212 ++END ++CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR ++CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR ++CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR ++CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE ++ ++# ++# Certificate "Software in the Public Interest" ++# ++# Issuer: E=hostmaster@spi-inc.org,CN=Certificate Authority,OU=hostmaster,O=Software in the Public Interest,L=Indianapolis,ST=Indiana,C=US ++# Serial Number:00:e8:8e:b6:c9:f8:2a:14:28 ++# Subject: E=hostmaster@spi-inc.org,CN=Certificate Authority,OU=hostmaster,O=Software in the Public Interest,L=Indianapolis,ST=Indiana,C=US ++# Not Valid Before: Tue May 13 08:07:56 2008 ++# Not Valid After : Fri May 11 08:07:56 2018 ++# Fingerprint (MD5): 2A:47:9F:60:BB:83:74:6F:01:03:D7:0B:0D:F6:0D:78 ++# Fingerprint (SHA1): AF:70:88:43:83:82:02:15:CD:61:C6:BC:EC:FD:37:24:A9:90:43:1C ++CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE ++CKA_TOKEN CK_BBOOL CK_TRUE ++CKA_PRIVATE CK_BBOOL CK_FALSE ++CKA_MODIFIABLE CK_BBOOL CK_FALSE ++CKA_LABEL UTF8 "Software in the Public Interest" ++CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 ++CKA_SUBJECT MULTILINE_OCTAL ++\060\201\274\061\013\060\011\006\003\125\004\006\023\002\125\123 ++\061\020\060\016\006\003\125\004\010\023\007\111\156\144\151\141 ++\156\141\061\025\060\023\006\003\125\004\007\023\014\111\156\144 ++\151\141\156\141\160\157\154\151\163\061\050\060\046\006\003\125 ++\004\012\023\037\123\157\146\164\167\141\162\145\040\151\156\040 ++\164\150\145\040\120\165\142\154\151\143\040\111\156\164\145\162 ++\145\163\164\061\023\060\021\006\003\125\004\013\023\012\150\157 ++\163\164\155\141\163\164\145\162\061\036\060\034\006\003\125\004 ++\003\023\025\103\145\162\164\151\146\151\143\141\164\145\040\101 ++\165\164\150\157\162\151\164\171\061\045\060\043\006\011\052\206 ++\110\206\367\015\001\011\001\026\026\150\157\163\164\155\141\163 ++\164\145\162\100\163\160\151\055\151\156\143\056\157\162\147 ++END ++CKA_ID UTF8 "0" ++CKA_ISSUER MULTILINE_OCTAL ++\060\201\274\061\013\060\011\006\003\125\004\006\023\002\125\123 ++\061\020\060\016\006\003\125\004\010\023\007\111\156\144\151\141 ++\156\141\061\025\060\023\006\003\125\004\007\023\014\111\156\144 ++\151\141\156\141\160\157\154\151\163\061\050\060\046\006\003\125 ++\004\012\023\037\123\157\146\164\167\141\162\145\040\151\156\040 ++\164\150\145\040\120\165\142\154\151\143\040\111\156\164\145\162 ++\145\163\164\061\023\060\021\006\003\125\004\013\023\012\150\157 ++\163\164\155\141\163\164\145\162\061\036\060\034\006\003\125\004 ++\003\023\025\103\145\162\164\151\146\151\143\141\164\145\040\101 ++\165\164\150\157\162\151\164\171\061\045\060\043\006\011\052\206 ++\110\206\367\015\001\011\001\026\026\150\157\163\164\155\141\163 ++\164\145\162\100\163\160\151\055\151\156\143\056\157\162\147 ++END ++CKA_SERIAL_NUMBER MULTILINE_OCTAL ++\002\011\000\350\216\266\311\370\052\024\050 ++END ++CKA_VALUE MULTILINE_OCTAL ++\060\202\010\016\060\202\005\366\240\003\002\001\002\002\011\000 ++\350\216\266\311\370\052\024\050\060\015\006\011\052\206\110\206 ++\367\015\001\001\005\005\000\060\201\274\061\013\060\011\006\003 ++\125\004\006\023\002\125\123\061\020\060\016\006\003\125\004\010 ++\023\007\111\156\144\151\141\156\141\061\025\060\023\006\003\125 ++\004\007\023\014\111\156\144\151\141\156\141\160\157\154\151\163 ++\061\050\060\046\006\003\125\004\012\023\037\123\157\146\164\167 ++\141\162\145\040\151\156\040\164\150\145\040\120\165\142\154\151 ++\143\040\111\156\164\145\162\145\163\164\061\023\060\021\006\003 ++\125\004\013\023\012\150\157\163\164\155\141\163\164\145\162\061 ++\036\060\034\006\003\125\004\003\023\025\103\145\162\164\151\146 ++\151\143\141\164\145\040\101\165\164\150\157\162\151\164\171\061 ++\045\060\043\006\011\052\206\110\206\367\015\001\011\001\026\026 ++\150\157\163\164\155\141\163\164\145\162\100\163\160\151\055\151 ++\156\143\056\157\162\147\060\036\027\015\060\070\060\065\061\063 ++\060\070\060\067\065\066\132\027\015\061\070\060\065\061\061\060 ++\070\060\067\065\066\132\060\201\274\061\013\060\011\006\003\125 ++\004\006\023\002\125\123\061\020\060\016\006\003\125\004\010\023 ++\007\111\156\144\151\141\156\141\061\025\060\023\006\003\125\004 ++\007\023\014\111\156\144\151\141\156\141\160\157\154\151\163\061 ++\050\060\046\006\003\125\004\012\023\037\123\157\146\164\167\141 ++\162\145\040\151\156\040\164\150\145\040\120\165\142\154\151\143 ++\040\111\156\164\145\162\145\163\164\061\023\060\021\006\003\125 ++\004\013\023\012\150\157\163\164\155\141\163\164\145\162\061\036 ++\060\034\006\003\125\004\003\023\025\103\145\162\164\151\146\151 ++\143\141\164\145\040\101\165\164\150\157\162\151\164\171\061\045 ++\060\043\006\011\052\206\110\206\367\015\001\011\001\026\026\150 ++\157\163\164\155\141\163\164\145\162\100\163\160\151\055\151\156 ++\143\056\157\162\147\060\202\002\042\060\015\006\011\052\206\110 ++\206\367\015\001\001\001\005\000\003\202\002\017\000\060\202\002 ++\012\002\202\002\001\000\334\066\346\107\102\302\304\121\165\051 ++\207\100\303\330\216\041\006\322\030\116\353\357\040\275\220\074 ++\205\020\023\214\051\133\224\143\366\364\055\361\006\102\221\271 ++\031\304\102\151\010\277\213\066\105\352\050\005\063\111\110\240 ++\047\103\223\065\212\101\330\170\263\360\357\263\156\055\335\321 ++\313\175\352\364\165\046\323\076\220\072\356\327\347\054\004\265 ++\174\341\365\174\305\116\357\167\275\134\242\223\063\222\316\175 ++\201\110\317\153\265\042\054\010\203\375\323\325\317\073\055\375 ++\265\111\220\133\366\255\115\023\312\336\323\246\235\123\121\161 ++\143\106\370\112\026\134\230\356\055\155\232\026\241\166\220\342 ++\140\103\231\326\211\326\154\056\172\230\262\013\003\054\343\172 ++\117\307\335\343\314\343\112\152\215\171\122\372\364\301\257\056 ++\217\052\010\313\033\051\202\222\162\103\274\316\210\251\252\247 ++\212\121\103\125\205\232\067\003\170\223\310\360\275\264\101\310 ++\007\102\232\313\065\227\172\212\201\145\336\035\124\010\001\361 ++\144\134\267\027\032\121\274\036\303\131\207\166\030\026\230\356 ++\277\366\147\201\213\006\065\305\113\155\131\031\307\322\306\110 ++\276\156\024\050\203\112\020\234\033\365\157\274\251\216\365\151 ++\376\262\301\125\314\347\024\311\371\133\024\123\121\007\352\316 ++\075\344\117\050\037\074\141\011\327\063\322\156\247\156\324\307 ++\023\011\157\153\135\024\356\235\211\033\245\152\362\366\370\320 ++\162\216\352\162\037\057\064\152\051\012\305\012\354\034\100\205 ++\022\367\246\245\323\117\255\300\205\214\114\174\163\040\314\123 ++\030\361\262\130\114\001\365\277\352\144\325\134\071\305\316\154 ++\314\123\132\126\272\101\017\045\337\153\120\266\307\212\240\275 ++\002\302\305\073\125\245\262\144\042\204\121\050\126\256\061\356 ++\136\373\013\026\115\106\005\221\200\104\355\254\155\360\127\250 ++\372\353\141\110\240\313\033\263\037\216\315\305\041\167\003\204 ++\036\374\254\243\103\010\143\214\355\371\047\357\264\260\135\147 ++\326\117\355\320\213\076\135\133\311\221\275\226\002\204\075\305 ++\115\274\102\077\164\375\074\135\254\134\110\066\136\207\061\057 ++\030\154\304\150\356\241\213\311\131\320\030\343\000\200\263\124 ++\047\056\231\360\025\123\002\003\001\000\001\243\202\002\017\060 ++\202\002\013\060\035\006\003\125\035\016\004\026\004\024\064\161 ++\321\070\327\025\066\203\107\153\327\067\144\102\073\216\215\122 ++\235\253\060\201\361\006\003\125\035\043\004\201\351\060\201\346 ++\200\024\064\161\321\070\327\025\066\203\107\153\327\067\144\102 ++\073\216\215\122\235\253\241\201\302\244\201\277\060\201\274\061 ++\013\060\011\006\003\125\004\006\023\002\125\123\061\020\060\016 ++\006\003\125\004\010\023\007\111\156\144\151\141\156\141\061\025 ++\060\023\006\003\125\004\007\023\014\111\156\144\151\141\156\141 ++\160\157\154\151\163\061\050\060\046\006\003\125\004\012\023\037 ++\123\157\146\164\167\141\162\145\040\151\156\040\164\150\145\040 ++\120\165\142\154\151\143\040\111\156\164\145\162\145\163\164\061 ++\023\060\021\006\003\125\004\013\023\012\150\157\163\164\155\141 ++\163\164\145\162\061\036\060\034\006\003\125\004\003\023\025\103 ++\145\162\164\151\146\151\143\141\164\145\040\101\165\164\150\157 ++\162\151\164\171\061\045\060\043\006\011\052\206\110\206\367\015 ++\001\011\001\026\026\150\157\163\164\155\141\163\164\145\162\100 ++\163\160\151\055\151\156\143\056\157\162\147\202\011\000\350\216 ++\266\311\370\052\024\050\060\017\006\003\125\035\023\001\001\377 ++\004\005\060\003\001\001\377\060\021\006\011\140\206\110\001\206 ++\370\102\001\001\004\004\003\002\000\007\060\011\006\003\125\035 ++\022\004\002\060\000\060\056\006\011\140\206\110\001\206\370\102 ++\001\015\004\041\026\037\123\157\146\164\167\141\162\145\040\151 ++\156\040\164\150\145\040\120\165\142\154\151\143\040\111\156\164 ++\145\162\145\163\164\060\060\006\011\140\206\110\001\206\370\102 ++\001\004\004\043\026\041\150\164\164\160\163\072\057\057\143\141 ++\056\163\160\151\055\151\156\143\056\157\162\147\057\143\141\055 ++\143\162\154\056\160\145\155\060\062\006\011\140\206\110\001\206 ++\370\102\001\003\004\045\026\043\150\164\164\160\163\072\057\057 ++\143\141\056\163\160\151\055\151\156\143\056\157\162\147\057\143 ++\145\162\164\055\143\162\154\056\160\145\155\060\041\006\003\125 ++\035\021\004\032\060\030\201\026\150\157\163\164\155\141\163\164 ++\145\162\100\163\160\151\055\151\156\143\056\157\162\147\060\016 ++\006\003\125\035\017\001\001\377\004\004\003\002\001\006\060\015 ++\006\011\052\206\110\206\367\015\001\001\005\005\000\003\202\002 ++\001\000\264\315\275\340\271\352\262\003\053\176\062\351\336\162 ++\077\311\113\202\136\235\342\257\125\011\242\014\124\350\317\030 ++\074\050\040\035\251\273\003\002\057\122\071\042\371\027\317\255 ++\147\220\263\003\177\330\025\343\153\176\273\233\126\001\257\065 ++\324\332\271\307\147\027\233\324\325\016\067\263\040\101\056\014 ++\001\304\133\371\145\076\302\141\350\322\360\152\225\160\303\306 ++\157\325\065\244\254\131\162\341\211\337\241\240\235\044\275\051 ++\171\351\141\052\331\323\036\311\106\244\010\170\101\222\162\017 ++\253\024\165\355\011\360\242\360\134\357\303\012\142\040\267\302 ++\050\146\256\114\057\056\217\105\143\046\226\360\356\061\346\213 ++\125\233\252\072\371\202\071\035\210\074\342\007\165\032\341\017 ++\261\060\274\161\062\322\072\376\372\241\211\363\103\054\326\162 ++\304\171\247\025\110\005\300\330\055\162\002\343\313\075\026\152 ++\272\311\270\021\020\342\111\205\314\226\107\140\005\045\056\357 ++\165\131\063\365\107\031\026\357\332\154\137\007\310\246\120\266 ++\035\313\146\064\045\374\146\203\353\305\266\060\101\370\106\104 ++\142\250\301\014\124\346\352\114\132\050\346\256\306\267\376\177 ++\073\226\250\056\356\307\150\076\335\000\075\051\257\052\143\253 ++\137\356\111\052\055\305\334\373\321\306\323\321\227\126\122\206 ++\266\224\353\324\140\121\267\374\036\233\314\002\233\324\037\217 ++\371\112\217\266\056\050\073\027\314\305\246\005\343\322\323\265 ++\306\003\311\341\110\102\233\313\077\344\027\340\376\015\001\225 ++\011\272\270\015\161\344\011\160\167\102\330\115\341\102\251\140 ++\203\327\027\211\103\322\324\335\247\030\266\253\324\044\045\207 ++\265\324\342\374\056\042\151\275\255\150\054\377\162\265\230\252 ++\006\234\347\052\152\270\241\223\166\316\260\363\177\234\341\340 ++\117\270\330\206\106\245\063\002\054\045\141\067\052\222\310\254 ++\201\164\150\143\207\063\166\275\005\177\136\325\325\002\155\275 ++\257\377\052\132\252\111\354\230\171\107\123\221\366\016\064\132 ++\311\245\306\353\262\343\305\254\266\240\160\065\273\310\121\151 ++\320\362\265\242\062\156\274\077\240\067\071\174\161\066\246\005 ++\337\014\022\344\026\247\305\326\313\143\243\225\160\077\346\004 ++\243\140 ++END ++ ++# Trust for "Software in the Public Interest" ++# Issuer: E=hostmaster@spi-inc.org,CN=Certificate Authority,OU=hostmaster,O=Software in the Public Interest,L=Indianapolis,ST=Indiana,C=US ++# Serial Number:00:e8:8e:b6:c9:f8:2a:14:28 ++# Subject: E=hostmaster@spi-inc.org,CN=Certificate Authority,OU=hostmaster,O=Software in the Public Interest,L=Indianapolis,ST=Indiana,C=US ++# Not Valid Before: Tue May 13 08:07:56 2008 ++# Not Valid After : Fri May 11 08:07:56 2018 ++# Fingerprint (MD5): 2A:47:9F:60:BB:83:74:6F:01:03:D7:0B:0D:F6:0D:78 ++# Fingerprint (SHA1): AF:70:88:43:83:82:02:15:CD:61:C6:BC:EC:FD:37:24:A9:90:43:1C ++CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST ++CKA_TOKEN CK_BBOOL CK_TRUE ++CKA_PRIVATE CK_BBOOL CK_FALSE ++CKA_MODIFIABLE CK_BBOOL CK_FALSE ++CKA_LABEL UTF8 "Software in the Public Interest" ++CKA_CERT_SHA1_HASH MULTILINE_OCTAL ++\257\160\210\103\203\202\002\025\315\141\306\274\354\375\067\044 ++\251\220\103\034 ++END ++CKA_CERT_MD5_HASH MULTILINE_OCTAL ++\052\107\237\140\273\203\164\157\001\003\327\013\015\366\015\170 ++END ++CKA_ISSUER MULTILINE_OCTAL ++\060\201\274\061\013\060\011\006\003\125\004\006\023\002\125\123 ++\061\020\060\016\006\003\125\004\010\023\007\111\156\144\151\141 ++\156\141\061\025\060\023\006\003\125\004\007\023\014\111\156\144 ++\151\141\156\141\160\157\154\151\163\061\050\060\046\006\003\125 ++\004\012\023\037\123\157\146\164\167\141\162\145\040\151\156\040 ++\164\150\145\040\120\165\142\154\151\143\040\111\156\164\145\162 ++\145\163\164\061\023\060\021\006\003\125\004\013\023\012\150\157 ++\163\164\155\141\163\164\145\162\061\036\060\034\006\003\125\004 ++\003\023\025\103\145\162\164\151\146\151\143\141\164\145\040\101 ++\165\164\150\157\162\151\164\171\061\045\060\043\006\011\052\206 ++\110\206\367\015\001\011\001\026\026\150\157\163\164\155\141\163 ++\164\145\162\100\163\160\151\055\151\156\143\056\157\162\147 ++END ++CKA_SERIAL_NUMBER MULTILINE_OCTAL ++\002\011\000\350\216\266\311\370\052\024\050 ++END ++CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR ++CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR ++CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR ++CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE diff --git a/util/crypt/nss/files/fedora/add-relro-linker-option.patch b/util/crypt/nss/files/fedora/add-relro-linker-option.patch new file mode 100644 index 0000000000..7ab9db1f54 --- /dev/null +++ b/util/crypt/nss/files/fedora/add-relro-linker-option.patch @@ -0,0 +1,16 @@ +diff -up nss/coreconf/Linux.mk.relro nss/coreconf/Linux.mk +--- nss/coreconf/Linux.mk.relro 2013-04-09 14:29:45.943228682 -0700 ++++ nss/coreconf/Linux.mk 2013-04-09 14:31:26.194953927 -0700 +@@ -174,6 +174,12 @@ endif + endif + endif + ++# harden DSOs/executables a bit against exploits ++ifeq (2.6,$(firstword $(sort 2.6 $(OS_RELEASE)))) ++DSO_LDOPTS+=-Wl,-z,relro ++LDFLAGS += -Wl,-z,relro ++endif ++ + USE_SYSTEM_ZLIB = 1 + ZLIB_LIBS = -lz + diff --git a/util/crypt/nss/files/fedora/nss-539183.patch b/util/crypt/nss/files/fedora/nss-539183.patch new file mode 100644 index 0000000000..3798c35200 --- /dev/null +++ b/util/crypt/nss/files/fedora/nss-539183.patch @@ -0,0 +1,54 @@ +diff -up nss/cmd/httpserv/httpserv.c.539183 nss/cmd/httpserv/httpserv.c +--- nss/cmd/httpserv/httpserv.c.539183 2013-05-28 14:43:24.000000000 -0700 ++++ nss/cmd/httpserv/httpserv.c 2013-05-30 22:16:46.685373471 -0700 +@@ -661,14 +661,18 @@ getBoundListenSocket(unsigned short port + PRStatus prStatus; + PRNetAddr addr; + PRSocketOptionData opt; ++ PRUint16 socketDomain = PR_AF_INET; + +- addr.inet.family = PR_AF_INET; +- addr.inet.ip = PR_INADDR_ANY; +- addr.inet.port = PR_htons(port); ++ if (PR_SetNetAddr(PR_IpAddrAny, PR_AF_INET6, port, &addr) != PR_SUCCESS) { ++ errExit("PR_SetNetAddr"); ++ } + +- listen_sock = PR_NewTCPSocket(); ++ if (PR_GetEnv("NSS_USE_SDP")) { ++ socketDomain = PR_AF_INET_SDP; ++ } ++ listen_sock = PR_OpenTCPSocket(PR_AF_INET6); + if (listen_sock == NULL) { +- errExit("PR_NewTCPSocket"); ++ errExit("PR_OpenTCPSocket error"); + } + + opt.option = PR_SockOpt_Nonblocking; +diff -up nss/cmd/selfserv/selfserv.c.539183 nss/cmd/selfserv/selfserv.c +--- nss/cmd/selfserv/selfserv.c.539183 2013-05-28 14:43:24.000000000 -0700 ++++ nss/cmd/selfserv/selfserv.c 2013-05-30 22:16:46.688373495 -0700 +@@ -1687,14 +1687,18 @@ getBoundListenSocket(unsigned short port + PRStatus prStatus; + PRNetAddr addr; + PRSocketOptionData opt; ++ PRUint16 socketDomain = PR_AF_INET; + +- addr.inet.family = PR_AF_INET; +- addr.inet.ip = PR_INADDR_ANY; +- addr.inet.port = PR_htons(port); ++ if (PR_SetNetAddr(PR_IpAddrAny, PR_AF_INET6, port, &addr) != PR_SUCCESS) { ++ errExit("PR_SetNetAddr"); ++ } + +- listen_sock = PR_NewTCPSocket(); ++ if (PR_GetEnv("NSS_USE_SDP")) { ++ socketDomain = PR_AF_INET_SDP; ++ } ++ listen_sock = PR_OpenTCPSocket(PR_AF_INET6); + if (listen_sock == NULL) { +- errExit("PR_NewTCPSocket"); ++ errExit("PR_OpenTCPSocket error"); + } + + opt.option = PR_SockOpt_Nonblocking; diff --git a/util/crypt/nss/files/fedora/nss-646045.patch b/util/crypt/nss/files/fedora/nss-646045.patch new file mode 100644 index 0000000000..33b80fe5e7 --- /dev/null +++ b/util/crypt/nss/files/fedora/nss-646045.patch @@ -0,0 +1,34 @@ +diff -up nss/tests/dbtests/dbtests.sh.646045 nss/tests/dbtests/dbtests.sh +--- nss/tests/dbtests/dbtests.sh.646045 2013-04-04 13:31:55.000000000 -0700 ++++ nss/tests/dbtests/dbtests.sh 2013-04-04 15:57:46.298127149 -0700 +@@ -168,6 +168,9 @@ dbtest_main() + cat $RONLY_DIR/* > /dev/null + fi + ++ # skipping the next two tests when user is root, ++ # otherwise they would fail due to rooty powers ++ if [[ $EUID -ne 0 ]] then + ${BINDIR}/dbtest -d $RONLY_DIR + ret=$? + if [ $ret -ne 46 ]; then +@@ -175,6 +178,10 @@ dbtest_main() + else + html_passed "Dbtest r/w didn't work in an readonly dir $ret" + fi ++ else ++ html_passed "Skipping Dbtest r/w in a readonly dir because user is root" ++ fi ++ if [[ $EUID -ne 0 ]] then + ${BINDIR}/certutil -D -n "TestUser" -d . + ret=$? + if [ $ret -ne 255 ]; then +@@ -182,6 +189,9 @@ dbtest_main() + else + html_passed "Certutil didn't work in an readonly dir $ret" + fi ++ else ++ html_passed "Skipping Certutil delete cert in an readonly directory test because user is root" ++ fi + + Echo "test opening the database ronly in a readonly directory" + diff --git a/util/crypt/nss/files/generate-pc-config.sh b/util/crypt/nss/files/generate-pc-config.sh new file mode 100644 index 0000000000..7d355140fe --- /dev/null +++ b/util/crypt/nss/files/generate-pc-config.sh @@ -0,0 +1,46 @@ +#!/bin/bash + +# Generate nss.pc and nss-config from nss.pc.in and nss-config.in +# Ozan Caglayan, 2010 + +LIBDIR="/usr/lib/nss" +PREFIX="/usr" +EXEC_PREFIX="/usr" +INCLUDEDIR="/usr/include/nss" + +PKGCONFIG="dist/pkgconfig/nss.pc.in" +NSSCONFIG="dist/pkgconfig/nss-config.in" + +NSS_VMAJOR=`cat nss/lib/nss/nss.h | grep "#define.*NSS_VMAJOR" | awk '{print $3}'` +NSS_VMINOR=`cat nss/lib/nss/nss.h | grep "#define.*NSS_VMINOR" | awk '{print $3}'` +NSS_VPATCH=`cat nss/lib/nss/nss.h | grep "#define.*NSS_VPATCH" | awk '{print $3}'` +NSS_VERSION="$NSS_VMAJOR.$NSS_VMINOR.$NSS_VPATCH" +NSPR_VERSION=`nspr-config --version` + +echo "NSS_VMAJOR: $NSS_VMAJOR" +echo "NSS_VMINOR: $NSS_VMINOR" +echo "NSS_VPATCH: $NSS_VPATCH" +echo "NSS_VERSION: $NSS_VERSION" + +# Setup nss-config +cat $NSSCONFIG | sed -e "s,@prefix@,$PREFIX,g" \ + -e "s,@MOD_MAJOR_VERSION@,$NSS_VMAJOR,g" \ + -e "s,@MOD_MINOR_VERSION@,$NSS_VMINOR,g" \ + -e "s,@MOD_PATCH_VERSION@,$NSS_VPATCH,g" \ + > dist/pkgconfig/nss-config + +# Set executable bit +chmod 755 dist/pkgconfig/nss-config + +# Setup pkgconfig file +cat $PKGCONFIG | sed -e "s,@libdir@,$LIBDIR,g" \ + -e "s,@prefix@,$PREFIX,g" \ + -e "s,@exec_prefix@,$EXEC_PREFIX,g" \ + -e "s,@includedir@,$INCLUDEDIR,g" \ + -e "s,@NSS_VERSION@,$NSS_VERSION,g" \ + -e "s,@NSPR_VERSION@,$NSPR_VERSION,g" \ + > dist/pkgconfig/nss.pc + + +# Clear .in files +rm -rf $PKGCONFIG $NSSCONFIG diff --git a/util/crypt/nss/files/gentoo/nss-3.15.4-enable-pem.patch b/util/crypt/nss/files/gentoo/nss-3.15.4-enable-pem.patch new file mode 100644 index 0000000000..8e61024390 --- /dev/null +++ b/util/crypt/nss/files/gentoo/nss-3.15.4-enable-pem.patch @@ -0,0 +1,13 @@ +Patches taken from http://pkgs.fedoraproject.org/cgit/nss.git/ + +--- nss/lib/ckfw/manifest.mn.libpem ++++ nss/lib/ckfw/manifest.mn +@@ -5,7 +5,7 @@ + + CORE_DEPTH = ../.. + +-DIRS = builtins ++DIRS = builtins pem + + PRIVATE_EXPORTS = \ + ck.h \ diff --git a/util/crypt/nss/files/ld.so.conf b/util/crypt/nss/files/ld.so.conf new file mode 100644 index 0000000000..9fe2ce8946 --- /dev/null +++ b/util/crypt/nss/files/ld.so.conf @@ -0,0 +1 @@ +/usr/lib/nss diff --git a/util/crypt/nss/files/nss-3.18.1-standalone-1.patch b/util/crypt/nss/files/nss-3.18.1-standalone-1.patch new file mode 100644 index 0000000000..dfe0e1adba --- /dev/null +++ b/util/crypt/nss/files/nss-3.18.1-standalone-1.patch @@ -0,0 +1,245 @@ +Submitted By: Armin K. +Date: 2014-09-26 +Initial Package Version: 3.15 +Comment: Modified manifest.mn diff (Fernando) +Upstream Status: Not applicable +Origin: Based on dj's original patch, rediffed and modified for 3.15 +Description: Adds auto-generated nss.pc and nss-config script, and allows + building without nspr in the source tree. + +--- a/nss/config/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ b/nss/config/Makefile 2013-07-02 14:53:56.684750636 +0200 +@@ -0,0 +1,40 @@ ++CORE_DEPTH = .. ++DEPTH = .. ++ ++include $(CORE_DEPTH)/coreconf/config.mk ++ ++NSS_MAJOR_VERSION = `grep "NSS_VMAJOR" ../lib/nss/nss.h | awk '{print $$3}'` ++NSS_MINOR_VERSION = `grep "NSS_VMINOR" ../lib/nss/nss.h | awk '{print $$3}'` ++NSS_PATCH_VERSION = `grep "NSS_VPATCH" ../lib/nss/nss.h | awk '{print $$3}'` ++PREFIX = /usr ++ ++all: export libs ++ ++export: ++ # Create the nss.pc file ++ mkdir -p $(DIST)/lib/pkgconfig ++ sed -e "s,@prefix@,$(PREFIX)," \ ++ -e "s,@exec_prefix@,\$${prefix}," \ ++ -e "s,@libdir@,\$${prefix}/lib," \ ++ -e "s,@includedir@,\$${prefix}/include/nss," \ ++ -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION),g" \ ++ -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \ ++ -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \ ++ nss.pc.in > nss.pc ++ chmod 0644 nss.pc ++ ln -sf ../../../../nss/config/nss.pc $(DIST)/lib/pkgconfig ++ ++ # Create the nss-config script ++ mkdir -p $(DIST)/bin ++ sed -e "s,@prefix@,$(PREFIX)," \ ++ -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION)," \ ++ -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \ ++ -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \ ++ nss-config.in > nss-config ++ chmod 0755 nss-config ++ ln -sf ../../../nss/config/nss-config $(DIST)/bin ++ ++libs: ++ ++dummy: all export libs ++ +--- a/nss/config/nss-config.in 1970-01-01 01:00:00.000000000 +0100 ++++ b/nss/config/nss-config.in 2013-07-02 14:52:58.328084334 +0200 +@@ -0,0 +1,153 @@ ++#!/bin/sh ++ ++prefix=@prefix@ ++ ++major_version=@NSS_MAJOR_VERSION@ ++minor_version=@NSS_MINOR_VERSION@ ++patch_version=@NSS_PATCH_VERSION@ ++ ++usage() ++{ ++ cat <&2 ++fi ++ ++lib_nss=yes ++lib_nssutil=yes ++lib_smime=yes ++lib_ssl=yes ++lib_softokn=yes ++ ++while test $# -gt 0; do ++ case "$1" in ++ -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; ++ *) optarg= ;; ++ esac ++ ++ case $1 in ++ --prefix=*) ++ prefix=$optarg ++ ;; ++ --prefix) ++ echo_prefix=yes ++ ;; ++ --exec-prefix=*) ++ exec_prefix=$optarg ++ ;; ++ --exec-prefix) ++ echo_exec_prefix=yes ++ ;; ++ --includedir=*) ++ includedir=$optarg ++ ;; ++ --includedir) ++ echo_includedir=yes ++ ;; ++ --libdir=*) ++ libdir=$optarg ++ ;; ++ --libdir) ++ echo_libdir=yes ++ ;; ++ --version) ++ echo ${major_version}.${minor_version}.${patch_version} ++ ;; ++ --cflags) ++ echo_cflags=yes ++ ;; ++ --libs) ++ echo_libs=yes ++ ;; ++ nss) ++ lib_nss=yes ++ ;; ++ nssutil) ++ lib_nssutil=yes ++ ;; ++ smime) ++ lib_smime=yes ++ ;; ++ ssl) ++ lib_ssl=yes ++ ;; ++ softokn) ++ lib_softokn=yes ++ ;; ++ *) ++ usage 1 1>&2 ++ ;; ++ esac ++ shift ++done ++ ++# Set variables that may be dependent upon other variables ++if test -z "$exec_prefix"; then ++ exec_prefix=`pkg-config --variable=exec_prefix nss` ++fi ++if test -z "$includedir"; then ++ includedir=`pkg-config --variable=includedir nss` ++fi ++if test -z "$libdir"; then ++ libdir=`pkg-config --variable=libdir nss` ++fi ++ ++if test "$echo_prefix" = "yes"; then ++ echo $prefix ++fi ++ ++if test "$echo_exec_prefix" = "yes"; then ++ echo $exec_prefix ++fi ++ ++if test "$echo_includedir" = "yes"; then ++ echo $includedir ++fi ++ ++if test "$echo_libdir" = "yes"; then ++ echo $libdir ++fi ++ ++if test "$echo_cflags" = "yes"; then ++ echo -I$includedir ++fi ++ ++if test "$echo_libs" = "yes"; then ++ libdirs="-L$libdir" ++ if test -n "$lib_nss"; then ++ libdirs="$libdirs -lnss${major_version}" ++ fi ++ if test -n "$lib_nssutil"; then ++ libdirs="$libdirs -lnssutil${major_version}" ++ fi ++ if test -n "$lib_smime"; then ++ libdirs="$libdirs -lsmime${major_version}" ++ fi ++ if test -n "$lib_ssl"; then ++ libdirs="$libdirs -lssl${major_version}" ++ fi ++ if test -n "$lib_softokn"; then ++ libdirs="$libdirs -lsoftokn${major_version}" ++ fi ++ echo $libdirs ++fi ++ +--- a/nss/config/nss.pc.in 1970-01-01 01:00:00.000000000 +0100 ++++ b/nss/config/nss.pc.in 2013-07-02 14:52:58.328084334 +0200 +@@ -0,0 +1,12 @@ ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++libdir=@libdir@ ++includedir=@includedir@ ++ ++Name: NSS ++Description: Network Security Services ++Version: @NSS_MAJOR_VERSION@.@NSS_MINOR_VERSION@.@NSS_PATCH_VERSION@ ++Requires: nspr >= 4.8 ++Libs: -L@libdir@ -lnss@NSS_MAJOR_VERSION@ -lnssutil@NSS_MAJOR_VERSION@ -lsmime@NSS_MAJOR_VERSION@ -lssl@NSS_MAJOR_VERSION@ -lsoftokn@NSS_MAJOR_VERSION@ ++Cflags: -I${includedir} ++ +--- a/nss/Makefile 2013-05-28 23:43:24.000000000 +0200 ++++ b/nss/Makefile 2013-07-02 14:52:58.328084334 +0200 +@@ -44,7 +44,7 @@ + # (7) Execute "local" rules. (OPTIONAL). # + ####################################################################### + +-nss_build_all: build_nspr all ++nss_build_all: all + + nss_clean_all: clobber_nspr clobber + +--- a/nss/manifest.mn.orig 2014-09-26 16:46:44.201965538 -0300 ++++ b/nss/manifest.mn 2014-09-26 16:51:11.386336520 -0300 +@@ -10,7 +10,7 @@ + + RELEASE = nss + +-DIRS = coreconf lib cmd ++DIRS = coreconf lib cmd config + + ifdef NSS_BUILD_GTESTS + DIRS += external_tests diff --git a/util/crypt/nss/files/nss-config.in b/util/crypt/nss/files/nss-config.in new file mode 100644 index 0000000000..5ab3a1f79e --- /dev/null +++ b/util/crypt/nss/files/nss-config.in @@ -0,0 +1,137 @@ +#!/bin/sh + +prefix=@prefix@ + +major_version=@MOD_MAJOR_VERSION@ +minor_version=@MOD_MINOR_VERSION@ +patch_version=@MOD_PATCH_VERSION@ + +usage() +{ + cat <&2 +fi + +lib_ssl=yes +lib_smime=yes +lib_nss=yes + +while test $# -gt 0; do + case "$1" in + -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; + *) optarg= ;; + esac + + case $1 in + --prefix=*) + prefix=$optarg + ;; + --prefix) + echo_prefix=yes + ;; + --exec-prefix=*) + exec_prefix=$optarg + ;; + --exec-prefix) + echo_exec_prefix=yes + ;; + --includedir=*) + includedir=$optarg + ;; + --includedir) + echo_includedir=yes + ;; + --libdir=*) + libdir=$optarg + ;; + --libdir) + echo_libdir=yes + ;; + --version) + echo ${major_version}.${minor_version}.${patch_version} + ;; + --cflags) + echo_cflags=yes + ;; + --libs) + echo_libs=yes + ;; + ssl) + lib_ssl=yes + ;; + smime) + lib_smime=yes + ;; + nss) + lib_nss=yes + ;; + *) + usage 1 1>&2 + ;; + esac + shift +done + +# Set variables that may be dependent upon other variables +if test -z "$exec_prefix"; then + exec_prefix=`pkg-config --variable=exec_prefix nss` +fi +if test -z "$includedir"; then + includedir=`pkg-config --variable=includedir nss` +fi +if test -z "$libdir"; then + libdir=`pkg-config --variable=libdir nss` +fi + +if test "$echo_prefix" = "yes"; then + echo $prefix +fi + +if test "$echo_exec_prefix" = "yes"; then + echo $exec_prefix +fi + +if test "$echo_includedir" = "yes"; then + echo $includedir +fi + +if test "$echo_libdir" = "yes"; then + echo $libdir +fi + +if test "$echo_cflags" = "yes"; then + echo -I$includedir +fi + +if test "$echo_libs" = "yes"; then + libdirs="-Wl,-rpath-link,$libdir -L$libdir" + if test -n "$lib_ssl"; then + libdirs="$libdirs -lssl${major_version}" + fi + if test -n "$lib_smime"; then + libdirs="$libdirs -lsmime${major_version}" + fi + if test -n "$lib_nss"; then + libdirs="$libdirs -lnss${major_version} -lnssutil${major_version}" + fi + echo $libdirs +fi + diff --git a/util/crypt/nss/files/nss.pc.in b/util/crypt/nss/files/nss.pc.in new file mode 100644 index 0000000000..3ef02a906c --- /dev/null +++ b/util/crypt/nss/files/nss.pc.in @@ -0,0 +1,11 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: NSS +Description: Network Security Services +Version: @NSS_VERSION@ +Requires: nspr >= @NSPR_VERSION@ +Libs: -L${libdir} -lnss3 -lnssutil3 -lsmime3 -lssl3 -lsoftokn3 +Cflags: -I${includedir} diff --git a/util/crypt/nss/files/nssdb/cert8.db b/util/crypt/nss/files/nssdb/cert8.db new file mode 100644 index 0000000000..ac40a33257 Binary files /dev/null and b/util/crypt/nss/files/nssdb/cert8.db differ diff --git a/util/crypt/nss/files/nssdb/key3.db b/util/crypt/nss/files/nssdb/key3.db new file mode 100644 index 0000000000..31e3975669 Binary files /dev/null and b/util/crypt/nss/files/nssdb/key3.db differ diff --git a/util/crypt/nss/files/nssdb/secmod.db b/util/crypt/nss/files/nssdb/secmod.db new file mode 100644 index 0000000000..9a028078d6 Binary files /dev/null and b/util/crypt/nss/files/nssdb/secmod.db differ diff --git a/util/crypt/nss/files/ssl-renegotiate-transitional.patch b/util/crypt/nss/files/ssl-renegotiate-transitional.patch new file mode 100644 index 0000000000..f457c55518 --- /dev/null +++ b/util/crypt/nss/files/ssl-renegotiate-transitional.patch @@ -0,0 +1,21 @@ +Enable transitional scheme for ssl renegotiation: + +(from mozilla/security/nss/lib/ssl/ssl.h) +Disallow unsafe renegotiation in server sockets only, but allow clients +to continue to renegotiate with vulnerable servers. +This value should only be used during the transition period when few +servers have been upgraded. + +diff --git a/mozilla/security/nss/lib/ssl/sslsock.c b/mozilla/security/nss/lib/ssl/sslsock.c +index f1d1921..c074360 100644 +--- a/mozilla/security/nss/lib/ssl/sslsock.c ++++ b/mozilla/security/nss/lib/ssl/sslsock.c +@@ -181,7 +181,7 @@ static sslOptions ssl_defaults = { + PR_FALSE, /* noLocks */ + PR_FALSE, /* enableSessionTickets */ + PR_FALSE, /* enableDeflate */ +- 2, /* enableRenegotiation (default: requires extension) */ ++ 3, /* enableRenegotiation (default: transitional) */ + PR_FALSE, /* requireSafeNegotiation */ + }; + diff --git a/util/crypt/nss/pspec.xml b/util/crypt/nss/pspec.xml new file mode 100644 index 0000000000..c76c168577 --- /dev/null +++ b/util/crypt/nss/pspec.xml @@ -0,0 +1,180 @@ + + + + + nss + http://www.mozilla.org/projects/security/pki/nss/ + + Erdinç Gültekin + admins@pisilinux.org + + MPL-2.0 + GPLv2 + LGPLv2.1 + util.crypt + library + Network Security Services + Network Security Services (NSS) is a set of libraries designed to support cross-platform development of security-enabled client and server applications. Applications built with NSS can support SSL v2 and v3, TLS, PKCS #5, PKCS #7, PKCS #11, PKCS #12, S/MIME, X.509 v3 certificates, and other security standards. + ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_3_18_1_RTM/src/nss-3.18.1.tar.gz + + + nss.pc.in + nss-config.in + generate-pc-config.sh + + + nspr-devel + + + nss-3.18.1-standalone-1.patch + add_spi+cacert_ca_certs.patch + ssl-renegotiate-transitional.patch + + + fedora/add-relro-linker-option.patch + fedora/nss-539183.patch + + + + + + + + + nss + + zlib + sqlite + nspr + + + /usr/lib + /usr/bin + /etc + + + ld.so.conf + + + nssdb/cert8.db + nssdb/key3.db + nssdb/secmod.db + + + + + nss-devel + Development files for nss + + nspr-devel + nss + + + /usr/bin/nss-config + /usr/include + /usr/lib/pkgconfig + /usr/lib/nss/*.a + + + + + + 2015-05-01 + 3.18.1 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2015-02-28 + 3.17.4 + Version bump. + Hakan Yıldız + hknyldz93@gmail.com + + + 2014-12-13 + 3.17.3 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2014-11-02 + 3.17.2 + Version bump. + Osman Erkan + osman.erkan@pisilinux.org + + + 2014-08-10 + 3.16.4 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-05-20 + 3.16.1 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-04-11 + 3.16 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-02-04 + 3.15.4 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-11-18 + 3.15.3 + Version bump. + Richard de Bruin + richdb@pisilinux.org + + + 2013-11-11 + 3.15.2 + Version bump. + PisiLinux Community + admins@pisilinux.org + + + 2013-07-18 + 3.15.1 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-05-19 + 3.14.3 + vbump + Erdinç Gültekin + admins@pisilinux.org + + + 2013-03-01 + 3.14.3 + vbump + Erdinç Gültekin + admins@pisilinux.org + + + 2013-01-10 + 3.14.1 + First release + Erdinç Gültekin + admins@pisilinux.org + + + diff --git a/util/crypt/nss/translations.xml b/util/crypt/nss/translations.xml new file mode 100644 index 0000000000..0076b6dddc --- /dev/null +++ b/util/crypt/nss/translations.xml @@ -0,0 +1,15 @@ + + + + nss + Ağ Güvenlik Servisleri + NSS, platform bağımsız güvenli ağ servisi geliştirme kitaplıklarından oluşur. Bu kitaplık yardımı ile SSL v2 ve v3, PKCS #5, PKCS #7, PKCS #11, PKCS #12, S/MIME, X.509 v3 sertifikaları ve diğer bir çok güvenlik standardına uygun güvenli sunucu-istemci yazılımları geliştirilebilir. + Network Security Services (NSS) est un ensemble de librairies conçues pour faciliter le développement multi-plateforme d'applications client et serveur sécurisées. Les applications ocnstruite avec NSS peuvent gérer SSL v2 et v3, TLS, PKCS #5, PKCS #7, PKCS #11, PKCS #12, S/MIME, les certificats X.509 v3 et d'autres standards de sécurité. + Network Security Services (NSS) es un conjunto de librerías para desarrollo cross-plataforma de aplicaciones cliente-servidor con facilidad de seguridad. Aplicaciones usando NSS pueden soportar certificados SSL v2 y v3, TLS, PKCS #5, PKCS #7, PKCS #11, PKCS #12, S/MIME, X.509 v3, y otros estándares de seguridad. + + + + nss-devel + nss için geliştirme dosyaları + + diff --git a/x11/component.xml b/x11/component.xml new file mode 100644 index 0000000000..9f5e422d15 --- /dev/null +++ b/x11/component.xml @@ -0,0 +1,3 @@ + + x11 + diff --git a/x11/library/component.xml b/x11/library/component.xml new file mode 100644 index 0000000000..909168f033 --- /dev/null +++ b/x11/library/component.xml @@ -0,0 +1,3 @@ + + x11.library + diff --git a/x11/library/libICE/actions.py b/x11/library/libICE/actions.py new file mode 100644 index 0000000000..c8572db65a --- /dev/null +++ b/x11/library/libICE/actions.py @@ -0,0 +1,22 @@ +# -*- 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 get + +def setup(): + autotools.autoreconf("-vif") + autotools.configure("--disable-static \ + --enable-ipv6 \ + --without-fop") + +def build(): + autotools.make() + +def install(): + autotools.rawInstall("DESTDIR=%s" % get.installDIR()) + + pisitools.dodoc("AUTHORS", "ChangeLog", "COPYING", "README") diff --git a/x11/library/libICE/pspec.xml b/x11/library/libICE/pspec.xml new file mode 100644 index 0000000000..524670aa01 --- /dev/null +++ b/x11/library/libICE/pspec.xml @@ -0,0 +1,96 @@ + + + + + libICE + http://www.x.org/ + + PisiLinux Community + admins@pisilinux.org + + MIT + library + X.Org ICE library + libICE is the Inter-Client Exchange library. + mirrors://xorg/individual/lib/libICE-1.0.9.tar.bz2 + + libbsd-devel + + + + + libICE + + libbsd + + + /usr/lib + /usr/share/doc + + + + + libICE-devel + Development files for libICE + + libICE + + + /usr/include/X11 + /usr/lib/pkgconfig + /usr/lib32/pkgconfig + + + + + libICE-32bit + emul32 + 32-bit shared libraries for libICE + emul32 + + libICE + + + + /usr/lib32 + + + + + + 2014-08-31 + 1.0.9 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-05-16 + 1.0.8 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-10-07 + 1.0.8 + Rebuild. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-08-25 + 1.0.8 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2012-06-01 + 1.0.8 + First release + Erdem Artan + admins@pisilinux.org + + + diff --git a/x11/library/libICE/translations.xml b/x11/library/libICE/translations.xml new file mode 100644 index 0000000000..224e964f67 --- /dev/null +++ b/x11/library/libICE/translations.xml @@ -0,0 +1,20 @@ + + + + libICE + X.Org ICE kitaplığı + libICE, Inter-Client Exchange protokolüne bir arayüz sağlayan X.Org kitaplığıdır. + Utilitaire ICE de X.Org. + X.Org ICE Bibliothek + + + + libICE-devel + libICE için geliştirme dosyaları + + + + libICE-32bit + libICE için 32-bit paylaşımlı kitaplıklar + + diff --git a/x11/library/libSM/actions.py b/x11/library/libSM/actions.py new file mode 100644 index 0000000000..bf9a5f24ed --- /dev/null +++ b/x11/library/libSM/actions.py @@ -0,0 +1,23 @@ +# -*- 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 get + + +def setup(): + autotools.autoreconf("-vif") + autotools.configure("--disable-static \ + --without-xmlto \ + --with-libuuid \ + --without-fop") +def build(): + autotools.make() + +def install(): + autotools.rawInstall("DESTDIR=%s" % get.installDIR()) + + pisitools.dodoc("AUTHORS", "ChangeLog", "COPYING", "README") diff --git a/x11/library/libSM/pspec.xml b/x11/library/libSM/pspec.xml new file mode 100644 index 0000000000..b7a105bad9 --- /dev/null +++ b/x11/library/libSM/pspec.xml @@ -0,0 +1,119 @@ + + + + + libSM + http://www.x.org/ + + PisiLinux Community + admins@pisilinux.org + + MIT + library + X.Org SM library + libSM is the X Session Management library. + mirrors://xorg/individual/lib/libSM-1.2.2.tar.bz2 + + libICE-devel + libuuid-devel + + + + + libSM + + libICE + + + /usr/lib + /usr/share/X11 + /usr/share/doc + + + + + libSM-devel + Development files for libSM + + libICE-devel + libSM + + + /usr/include/X11 + /usr/lib/pkgconfig + /usr/lib32/pkgconfig + /usr/share/doc/*.xml + + + + + libSM-32bit + emul32 + 32-bit shared libraries for libSM + emul32 + + libICE-32bit + libuuid-32bit + + + libICE-32bit + libuuid-32bit + libSM + + + /usr/lib32 + + + + + + 2014-05-16 + 1.2.2 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-03-07 + 1.2.2 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2013-11-06 + 1.2.1 + Fix deps. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-10-07 + 1.2.1 + Revert back to 1.2.1, cleanup. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-09-12 + 1.2.2 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-08-25 + 1.2.1 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2012-06-01 + 1.2.1 + First release + Erdem Artan + admins@pisilinux.org + + + diff --git a/x11/library/libSM/translations.xml b/x11/library/libSM/translations.xml new file mode 100644 index 0000000000..d8fb8d619d --- /dev/null +++ b/x11/library/libSM/translations.xml @@ -0,0 +1,19 @@ + + + + libSM + X.Org SM kitaplığı. + Librairie SM de X.Org. + X.Org SM Bibliothek + + + + libSM-devel + libSM için geliştirme dosyaları + + + + libSM-32bit + libSM için 32-bit paylaşımlı kitaplıklar + + diff --git a/x11/library/libXcomposite/actions.py b/x11/library/libXcomposite/actions.py new file mode 100644 index 0000000000..8230c2214c --- /dev/null +++ b/x11/library/libXcomposite/actions.py @@ -0,0 +1,20 @@ +# -*- 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 get + +def setup(): + autotools.autoreconf("-vif") + autotools.configure("--disable-static") + +def build(): + autotools.make() + +def install(): + autotools.rawInstall("DESTDIR=%s" % get.installDIR()) + + pisitools.dodoc("AUTHORS", "ChangeLog", "COPYING", "README") diff --git a/x11/library/libXcomposite/pspec.xml b/x11/library/libXcomposite/pspec.xml new file mode 100644 index 0000000000..ac64c422a5 --- /dev/null +++ b/x11/library/libXcomposite/pspec.xml @@ -0,0 +1,98 @@ + + + + + libXcomposite + http://www.x.org/ + + PisiLinux Community + admins@pisilinux.org + + MIT + library + X.Org composite library + libXcomposite is the X Composite library. Compositing allows modification of the window system's base elements like window borders, window buttons and window titlebars. + mirrors://xorg/individual/lib/libXcomposite-0.4.4.tar.bz2 + + libXfixes-devel + + + + + libXcomposite + + /usr/lib + /usr/share/doc + + + + + libXcomposite-devel + Development files for libXcomposite + + libXcomposite + libXfixes-devel + + + /usr/include/X11 + /usr/lib/pkgconfig + /usr/lib32/pkgconfig + /usr/share/man + + + + + libXcomposite-32bit + emul32 + 32-bit shared libraries for libXcomposite + emul32 + + libX11-32bit + + + libXcomposite + libX11-32bit + + + /usr/lib32 + + + + + + 2014-05-16 + 0.4.4 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-10-07 + 0.4.4 + Rebuild. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-08-25 + 0.4.4 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-02-17 + 0.4.4 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2012-11-22 + 0.4.3 + First release + Marcin Bojara + marcin@pisilinux.org + + + diff --git a/x11/library/libXcomposite/translations.xml b/x11/library/libXcomposite/translations.xml new file mode 100644 index 0000000000..19de7ac598 --- /dev/null +++ b/x11/library/libXcomposite/translations.xml @@ -0,0 +1,20 @@ + + + + libXcomposite + X.Org composite kitaplığı + Librairie composite X.Org + X.Org composite Bibliothek + libXcomposite, X Birleşiklik kitaplığıdır. Birleşiklik, pencerelere ait kenarlar, butonlar ve başlık çubukları gibi pencere sisteminin temel elemanlarını değiştirmeye izin verir. + + + + libXcomposite-devel + libXcomposite için geliştirme dosyaları + + + + libXcomposite-32bit + libXcomposite için 32-bit paylaşımlı kitaplıklar + + diff --git a/x11/library/libXcursor/actions.py b/x11/library/libXcursor/actions.py new file mode 100644 index 0000000000..6810f9974c --- /dev/null +++ b/x11/library/libXcursor/actions.py @@ -0,0 +1,20 @@ +# -*- 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 get +from pisi.actionsapi import autotools +from pisi.actionsapi import pisitools + +def setup(): + autotools.autoreconf("-vif") + autotools.configure("--disable-static") + +def build(): + autotools.make() + +def install(): + autotools.rawInstall("DESTDIR=%s" % get.installDIR()) + + pisitools.dodoc("AUTHORS", "ChangeLog", "COPYING", "README") diff --git a/x11/library/libXcursor/pspec.xml b/x11/library/libXcursor/pspec.xml new file mode 100644 index 0000000000..3e3f65ee8c --- /dev/null +++ b/x11/library/libXcursor/pspec.xml @@ -0,0 +1,115 @@ + + + + + libXcursor + http://www.x.org/ + + PisiLinux Community + admins@pisilinux.org + + MIT + library + X.Org Xcursor library + libXcursor is the X Cursor management library. It allows using different mouse skins and modifying of the text cursor. + mirrors://xorg/individual/lib/libXcursor-1.1.14.tar.bz2 + + libXfixes-devel + libXrender-devel + + + + + libXcursor + + libXfixes + libXrender + + + /usr/lib + /usr/share/doc + + + + + libXcursor-devel + Development files for libXcursor + + libXcursor + libXfixes-devel + libXrender-devel + + + /usr/include/X11 + /usr/lib/pkgconfig + /usr/lib32/pkgconfig + /usr/share/man + + + + + libXcursor-32bit + emul32 + 32-bit shared libraries for libXcursor + emul32 + + libX11-32bit + libXfixes-32bit + libXrender-32bit + + + libXcursor + libX11-32bit + libXfixes-32bit + libXrender-32bit + + + /usr/lib32 + + + + + + 2014-05-16 + 1.1.14 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-10-07 + 1.1.14 + Rebuild. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-08-25 + 1.1.14 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-07-30 + 1.1.14 + Rebuild + PisiLinux Community + admins@pisilinux.org + + + 2013-06-21 + 1.1.14 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2012-06-01 + 1.1.13 + First release + Erdem Artan + admins@pisilinux.org + + + diff --git a/x11/library/libXcursor/translations.xml b/x11/library/libXcursor/translations.xml new file mode 100644 index 0000000000..456663ad26 --- /dev/null +++ b/x11/library/libXcursor/translations.xml @@ -0,0 +1,19 @@ + + + + libXcursor + X.Org Xcursor kitaplığı + Librairie Xcursor de X.Org + X.Org Xcursor Bibliothek + + + + libXcursor-devel + libXcursor için geliştirme dosyaları + + + + libXcursor-32bit + libXcursor için 32-bit paylaşımlı kitaplıklar + + diff --git a/x11/library/libXdamage/actions.py b/x11/library/libXdamage/actions.py new file mode 100644 index 0000000000..248eeb13af --- /dev/null +++ b/x11/library/libXdamage/actions.py @@ -0,0 +1,23 @@ +#!/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 get +from pisi.actionsapi import autotools +from pisi.actionsapi import pisitools + +def setup(): + autotools.autoreconf("-vif") + autotools.configure("--disable-static") + + pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ") + +def build(): + autotools.make() + +def install(): + autotools.rawInstall("DESTDIR=%s" % get.installDIR()) + + pisitools.dodoc("AUTHORS", "ChangeLog", "COPYING", "README") diff --git a/x11/library/libXdamage/pspec.xml b/x11/library/libXdamage/pspec.xml new file mode 100644 index 0000000000..6a64695fcb --- /dev/null +++ b/x11/library/libXdamage/pspec.xml @@ -0,0 +1,116 @@ + + + + + libXdamage + http://www.x.org/ + + PisiLinux Community + admins@pisilinux.org + + MIT + library + X.Org damage library + LibXdamage provides an X Window System client interface to the DAMAGE extension to the X protocol. The Damage extension provides for notification of when on-screen regions have been 'damaged' (altered). + mirrors://xorg/individual/lib/libXdamage-1.1.4.tar.bz2 + + libXfixes-devel + util-macros + + + + + libXdamage + + libXfixes + + + /usr/lib + /usr/share/doc + + + + + libXdamage-devel + Development files for libXdamage + + libXdamage + libXfixes-devel + + + /usr/include/X11 + /usr/lib/pkgconfig + /usr/lib32/pkgconfig + + + + + libXdamage-32bit + emul32 + 32-bit shared libraries for libXdamage + emul32 + + libXfixes + + + libXdamage + libXfixes-32bit + libX11-32bit + + + /usr/lib32 + + + + + + 2014-05-16 + 1.1.4 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-02-20 + 1.1.4 + Rebuild Unused + Varol Maksutoğlu + waroi@pisilinux.org + + + 2013-10-07 + 1.1.4 + Rebuild. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-08-25 + 1.1.4 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-07-30 + 1.1.4 + Rebuild + PisiLinux Community + admins@pisilinux.org + + + 2013-02-17 + 1.1.4 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2012-06-01 + 1.1.3 + First release + Erdem Artan + admins@pisilinux.org + + + diff --git a/x11/library/libXdamage/translations.xml b/x11/library/libXdamage/translations.xml new file mode 100644 index 0000000000..3d791d24fb --- /dev/null +++ b/x11/library/libXdamage/translations.xml @@ -0,0 +1,21 @@ + + + + libXdamage + X.Org damege kitaplığı. + Librairie damege de X.Org. + X.Org damege Bibliothek + LibXdamage, X protokolü uzantısı DAMAGE için istemci kitaplığıdır. Damage uzantısı ekranda herhangi bir bölümde bozulma (değişiklik) meydana geldiğinde bildirim yapılmasını sağlar. + + + + libXdamage-devel + libXdamage için geliştirme dosyaları + + + + libXdamage-32bit + libXdamage için 32-bit paylaşımlı kitaplıklar + + + diff --git a/x11/library/libXext/actions.py b/x11/library/libXext/actions.py new file mode 100644 index 0000000000..6810f9974c --- /dev/null +++ b/x11/library/libXext/actions.py @@ -0,0 +1,20 @@ +# -*- 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 get +from pisi.actionsapi import autotools +from pisi.actionsapi import pisitools + +def setup(): + autotools.autoreconf("-vif") + autotools.configure("--disable-static") + +def build(): + autotools.make() + +def install(): + autotools.rawInstall("DESTDIR=%s" % get.installDIR()) + + pisitools.dodoc("AUTHORS", "ChangeLog", "COPYING", "README") diff --git a/x11/library/libXext/pspec.xml b/x11/library/libXext/pspec.xml new file mode 100644 index 0000000000..b7eed6dc8c --- /dev/null +++ b/x11/library/libXext/pspec.xml @@ -0,0 +1,104 @@ + + + + + libXext + http://www.x.org/ + + PisiLinux Community + admins@pisilinux.org + + MIT + library + X.Org Xext library + LibXext provides an X Window System client interface to several extensions to the X protocol. + mirrors://xorg/individual/lib/libXext-1.3.3.tar.bz2 + + xorg-proto + + + + + libXext + + /usr/lib + /usr/share/doc + + + + + libXext-devel + Development files for libXext + + libXext + + + /usr/include + /usr/lib/pkgconfig + /usr/lib32/pkgconfig + /usr/share/man + + + + + libXext-32bit + emul32 + 32-bit shared libraries for libXext + emul32 + + libX11-32bit + + + libXext + libX11-32bit + + + /usr/lib32 + + + + + + 2014-08-31 + 1.3.3 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-05-16 + 1.3.2 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-08-25 + 1.3.2 + Rebuild. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-08-25 + 1.3.2 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-06-21 + 1.3.2 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2012-06-01 + 1.3.1 + First release + Erdem Artan + admins@pisilinux.org + + + diff --git a/x11/library/libXext/translations.xml b/x11/library/libXext/translations.xml new file mode 100644 index 0000000000..9234bea004 --- /dev/null +++ b/x11/library/libXext/translations.xml @@ -0,0 +1,20 @@ + + + + libXext + X.Org Xext kitaplığı + Librairie Xext de X.Org + X.Org Xext Bibliothek + LibXext, çeşitli X protokolü uzantıları için X Pencere Sistemi istemci arayüzü sunar. + + + + libXext-devel + libXext için geliştirme dosyaları + + + + libXext-32bit + libXext için 32-bit paylaşımlı kitaplıklar + + diff --git a/x11/library/libXfixes/actions.py b/x11/library/libXfixes/actions.py new file mode 100644 index 0000000000..e4605bcc9d --- /dev/null +++ b/x11/library/libXfixes/actions.py @@ -0,0 +1,22 @@ +#!/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 get +from pisi.actionsapi import autotools +from pisi.actionsapi import pisitools + +def setup(): + autotools.autoreconf("-vif") + autotools.configure("--disable-static") + +def build(): + autotools.make() + +def install(): + autotools.rawInstall("DESTDIR=%s" % get.installDIR()) + + pisitools.dodoc("AUTHORS", "ChangeLog", "COPYING", "README") + diff --git a/x11/library/libXfixes/pspec.xml b/x11/library/libXfixes/pspec.xml new file mode 100644 index 0000000000..e2acd32ff3 --- /dev/null +++ b/x11/library/libXfixes/pspec.xml @@ -0,0 +1,111 @@ + + + + + libXfixes + http://www.x.org/ + + PisiLinux Community + admins@pisilinux.org + + MIT + library + X.Org Xfixes library + libXfixes is a library to provide augmented versions of core protocol requests. + mirrors://xorg/individual/lib/libXfixes-5.0.1.tar.bz2 + + xorg-proto + + + + + libXfixes + + /usr/lib + /usr/share/doc + + + + + libXfixes-devel + Development files for libXfixes + + libXfixes + + + /usr/include/X11 + /usr/lib/pkgconfig + /usr/lib32/pkgconfig + /usr/share/man + + + + + libXfixes-32bit + emul32 + 32-bit shared libraries for libXfixes + emul32 + + libX11-32bit + + + libXfixes + libX11-32bit + + + /usr/lib32 + + + + + + 2014-05-16 + 5.0.1 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-10-07 + 5.0.1 + Rebuild. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-08-25 + 5.0.1 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-07-27 + 5.0.1 + Move pc files to devel pack, rebuild + PisiLinux Community + admins@pisilinux.org + + + 2013-07-27 + 5.0.1 + Move .pc files to devel package + Fatih Turgel + hitaf@pisilinux.org + + + 2013-06-21 + 5.0.1 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2012-06-01 + 5.0 + First release + Erdem Artan + admins@pisilinux.org + + + diff --git a/x11/library/libXfixes/translations.xml b/x11/library/libXfixes/translations.xml new file mode 100644 index 0000000000..5308b106db --- /dev/null +++ b/x11/library/libXfixes/translations.xml @@ -0,0 +1,19 @@ + + + + libXfixes + X.Org Xfixes kitaplığı + Librairie Xfixes de X.Org + X.Org Xfixes Bibliothek + + + + libXfixes-devel + libXfixes için geliştirme dosyaları + + + + libXfixes-32bit + libXfixes için 32-bit paylaşımlı kitaplıklar + + diff --git a/x11/library/libXi/actions.py b/x11/library/libXi/actions.py new file mode 100644 index 0000000000..bb0f1e0d0f --- /dev/null +++ b/x11/library/libXi/actions.py @@ -0,0 +1,24 @@ +# -*- 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 get +from pisi.actionsapi import autotools +from pisi.actionsapi import pisitools + +def setup(): + autotools.autoreconf("-vif") + autotools.configure("--disable-static") + + pisitools.dosed("libtool", "^(hardcode_libdir_flag_spec=).*", '\\1""') + pisitools.dosed("libtool", "^(runpath_var=)LD_RUN_PATH", "\\1DIE_RPATH_DIE") + pisitools.dosed("libtool"," -shared ", " -Wl,--as-needed -shared ") + +def build(): + autotools.make() + +def install(): + autotools.rawInstall("DESTDIR=%s" % get.installDIR()) + + pisitools.dodoc("ChangeLog", "COPYING", "README") diff --git a/x11/library/libXi/pspec.xml b/x11/library/libXi/pspec.xml new file mode 100644 index 0000000000..12cc5b9588 --- /dev/null +++ b/x11/library/libXi/pspec.xml @@ -0,0 +1,125 @@ + + + + + libXi + http://www.x.org/ + + PisiLinux Community + admins@pisilinux.org + + MIT + library + X.Org Xi library + LibXi provides an X Window System client interface to the XINPUT extension to the X protocol. + mirrors://xorg/individual/lib/libXi-1.7.4.tar.bz2 + + libXext-devel + + + + + libXi + + libXext + + + /usr/lib + /usr/share/doc + + + + + libXi-devel + Development files for libXi + + libXi + libXext-devel + libXfixes-devel + + + /usr/include/X11 + /usr/lib/pkgconfig + /usr/lib32/pkgconfig + /usr/share/man + + + + + libXi-32bit + emul32 + 32-bit shared libraries for libXi + emul32 + + libXext-32bit + libX11-32bit + + + libXi + libXext-32bit + libX11-32bit + + + /usr/lib32 + + + + + + 2014-08-31 + 1.7.4 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-05-16 + 1.7.2 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-10-07 + 1.7.2 + Rebuild. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-08-25 + 1.7.2 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-07-30 + 1.7.2 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-06-21 + 1.7.1 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-02-17 + 1.6.2 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2012-06-01 + 1.6.1 + First release + Erdem Artan + admins@pisilinux.org + + + diff --git a/x11/library/libXi/translations.xml b/x11/library/libXi/translations.xml new file mode 100644 index 0000000000..ad7be16a5f --- /dev/null +++ b/x11/library/libXi/translations.xml @@ -0,0 +1,19 @@ + + + + libXi + X.Org Xi kitaplığı + Librairie Xi de X.Org + X.Org Xi Bibliothek + + + + libXi-devel + libXi için geliştirme dosyaları + + + + libXi-32bit + libXi için 32-bit paylaşımlı kitaplıklar + + diff --git a/x11/library/libXrandr/actions.py b/x11/library/libXrandr/actions.py new file mode 100644 index 0000000000..344b70c590 --- /dev/null +++ b/x11/library/libXrandr/actions.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +#actions.py +# Licensed under the GNU General Public License, version 3. +# See the file http://www.gnu.org/licenses/gpl.txt + +from pisi.actionsapi import get +from pisi.actionsapi import autotools +from pisi.actionsapi import pisitools + +def setup(): + autotools.autoreconf("-vif") + autotools.configure("--disable-static") + +def build(): + autotools.make() + +def install(): + autotools.rawInstall("DESTDIR=%s" % get.installDIR()) + + pisitools.dodoc("AUTHORS", "ChangeLog", "COPYING") diff --git a/x11/library/libXrandr/pspec.xml b/x11/library/libXrandr/pspec.xml new file mode 100644 index 0000000000..97f78c4c12 --- /dev/null +++ b/x11/library/libXrandr/pspec.xml @@ -0,0 +1,136 @@ + + + + + libXrandr + http://www.x.org/ + + PisiLinux Community + admins@pisilinux.org + + MIT + library + X.Org Xrandr library + Xrandr is a simple library designed to interface the X Resize and Rotate Extension. This allows clients to change the size and rotation of the root window of a screen, along with the ability to reflect the screen about either axis. + mirrors://xorg/individual/lib/libXrandr-1.4.2.tar.bz2 + + libXext-devel + libXrender-devel + + + + + libXrandr + + libXext + libXrender + + + /usr/lib + /usr/share/doc + + + + + libXrandr-devel + Development files for libXrandr + + libXrandr + libXrender-devel + libXext-devel + + + /usr/include/X11 + /usr/lib/pkgconfig + /usr/lib32/pkgconfig + /usr/share/man + + + + + libXrandr-32bit + emul32 + 32-bit shared libraries for libXrandr + emul32 + + libX11-32bit + libXext-32bit + libXrender-32bit + + + libXrandr + libX11-32bit + libXext-32bit + libXrender-32bit + + + /usr/lib32 + + + + + + 2014-09-15 + 1.4.2 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-05-16 + 1.4.2 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-03-07 + 1.4.2 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2013-10-07 + 1.4.1 + Revert back to 1.4.1. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-09-12 + 1.4.2 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-08-25 + 1.4.1 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-07-30 + 1.4.1 + Rebuild + PisiLinux Community + admins@pisilinux.org + + + 2013-06-21 + 1.4.1 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2012-11-22 + 1.4.0 + First release + Marcin Bojara + marcin@pisilinux.org + + + diff --git a/x11/library/libXrandr/translations.xml b/x11/library/libXrandr/translations.xml new file mode 100644 index 0000000000..6d939ec5a7 --- /dev/null +++ b/x11/library/libXrandr/translations.xml @@ -0,0 +1,19 @@ + + + + libXrandr + X.Org Xrand kitaplığı. + Librairie Xrand de X.Org. + X.Org Xrand Bibliothek + + + + libXrandr-devel + libXrandr için geliştirme dosyaları + + + + libXrandr-32bit + libXrandr için 32-bit paylaşımlı kitaplıklar + + diff --git a/x11/library/libXrender/actions.py b/x11/library/libXrender/actions.py new file mode 100644 index 0000000000..6810f9974c --- /dev/null +++ b/x11/library/libXrender/actions.py @@ -0,0 +1,20 @@ +# -*- 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 get +from pisi.actionsapi import autotools +from pisi.actionsapi import pisitools + +def setup(): + autotools.autoreconf("-vif") + autotools.configure("--disable-static") + +def build(): + autotools.make() + +def install(): + autotools.rawInstall("DESTDIR=%s" % get.installDIR()) + + pisitools.dodoc("AUTHORS", "ChangeLog", "COPYING", "README") diff --git a/x11/library/libXrender/pspec.xml b/x11/library/libXrender/pspec.xml new file mode 100644 index 0000000000..481bb72a7a --- /dev/null +++ b/x11/library/libXrender/pspec.xml @@ -0,0 +1,94 @@ + + + + + libXrender + http://www.x.org/ + + PisiLinux Community + admins@pisilinux.org + + MIT + library + X.Org Xrender library + The X Rendering Extension (Render) introduces digital image composition as the foundation of a new rendering model within the X Window System. Rendering geometric figures is accomplished by client-side tesselation into either triangles or trapezoids. + mirrors://xorg/individual/lib/libXrender-0.9.8.tar.bz2 + + + + libXrender + + /usr/lib + /usr/share/doc + + + + + libXrender-devel + Development files for libXrender + + libXrender + + + /usr/include/X11 + /usr/lib/pkgconfig + /usr/lib32/pkgconfig + /usr/share/doc/libXrender/libXrender.txt + + + + + libXrender-32bit + emul32 + 32-bit shared libraries for libXrender + emul32 + + libX11-32bit + + + libXrender + libX11-32bit + + + /usr/lib32 + + + + + + 2014-05-16 + 0.9.8 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-10-07 + 0.9.8 + Rebuild. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-08-25 + 0.9.8 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-06-21 + 0.9.8 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2012-06-01 + 0.9.7 + First release + Erdem Artan + admins@pisilinux.org + + + diff --git a/x11/library/libXrender/translations.xml b/x11/library/libXrender/translations.xml new file mode 100644 index 0000000000..f0cf097070 --- /dev/null +++ b/x11/library/libXrender/translations.xml @@ -0,0 +1,19 @@ + + + + libXrender + X.Org Xrender kitaplığı + Librairie Xrender de X.Org + X.Org Xrender Bibliothek + + + + libXrender-devel + libXrender için geliştirme dosyaları + + + + libXrender-32bit + libXrender için 32-bit paylaşımlı kitaplıklar + + diff --git a/x11/library/libXtst/actions.py b/x11/library/libXtst/actions.py new file mode 100644 index 0000000000..07efa3381b --- /dev/null +++ b/x11/library/libXtst/actions.py @@ -0,0 +1,22 @@ +# -*- 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 get +from pisi.actionsapi import autotools +from pisi.actionsapi import pisitools + +def setup(): + autotools.autoreconf("-vif") + autotools.configure("--disable-static") + + pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ") + +def build(): + autotools.make() + +def install(): + autotools.rawInstall("DESTDIR=%s" % get.installDIR()) + + pisitools.dodoc("ChangeLog", "COPYING", "README") diff --git a/x11/library/libXtst/pspec.xml b/x11/library/libXtst/pspec.xml new file mode 100644 index 0000000000..d34703764a --- /dev/null +++ b/x11/library/libXtst/pspec.xml @@ -0,0 +1,117 @@ + + + + + libXtst + http://www.x.org/ + + PisiLinux Community + admins@pisilinux.org + + MIT + library + X.Org Xtst library + libXtst provides an X Window System client interface to the Record extension to the X protocol. The Record extension allows X clients to synthesise input events, which is useful for automated testing. + mirrors://xorg/individual/lib/libXtst-1.2.2.tar.bz2 + + libXext-devel + libXi-devel + util-macros + + + + + libXtst + + libXext + + + /usr/lib + /usr/share/X11 + /usr/share/doc + + + + + libXtst-32bit + emul32 + 32-bit shared libraries for libXtst + emul32 + + libXext-32bit + libXi-32bit + libX11-32bit + + + libX11-32bit + libXext-32bit + libXtst + + + /usr/lib32 + + + + + libXtst-devel + Development files for libXtst + + libXi-devel + libXext-devel + libXtst + + + /usr/include/X11 + /usr/lib/pkgconfig + /usr/lib32/pkgconfig + /usr/share/aclocal + /usr/share/doc/*/*.xml + /usr/share/man + + + + + + 2014-05-16 + 1.2.2 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-02-19 + 1.2.2 + Rebuild Unused + Varol Maksutoğlu + waroi@pisilinux.org + + + 2013-08-25 + 1.2.2 + Rebuild. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-08-25 + 1.2.2 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-06-21 + 1.2.2 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2012-06-01 + 1.2.1 + First release + Erdem Artan + admins@pisilinux.org + + + diff --git a/x11/library/libXtst/translations.xml b/x11/library/libXtst/translations.xml new file mode 100644 index 0000000000..1f6f0cf274 --- /dev/null +++ b/x11/library/libXtst/translations.xml @@ -0,0 +1,19 @@ + + + + libXtst + X.Org Xtst kitaplığı + Librairie Xtst de X.Org + X.Org Xtst Bibliothek + + + + libXtst-devel + libXtst için geliştirme dosyaları + + + + libXtst-32bit + libXtst için 32-bit paylaşımlı kitaplıklar + + diff --git a/x11/library/libdrm/actions.py b/x11/library/libdrm/actions.py new file mode 100644 index 0000000000..f484ef8faf --- /dev/null +++ b/x11/library/libdrm/actions.py @@ -0,0 +1,21 @@ +# -*- 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 get +from pisi.actionsapi import autotools +from pisi.actionsapi import pisitools +from pisi.actionsapi import shelltools + +def setup(): + pisitools.dosed("configure.ac", "pthread-stubs", deleteLine=True) + autotools.autoreconf("-fi") + autotools.configure("--enable-udev") + +def build(): + autotools.make() + +def install(): + autotools.rawInstall("DESTDIR=%s" % get.installDIR()) + pisitools.dodoc("README") diff --git a/x11/library/libdrm/files/91-drm-modeset.rules b/x11/library/libdrm/files/91-drm-modeset.rules new file mode 100644 index 0000000000..17f996649a --- /dev/null +++ b/x11/library/libdrm/files/91-drm-modeset.rules @@ -0,0 +1 @@ +KERNEL=="controlD[0-9]*", NAME="dri/%k", MODE="0666", GROUP="video" diff --git a/x11/library/libdrm/pspec.xml b/x11/library/libdrm/pspec.xml new file mode 100644 index 0000000000..6ed19f1aee --- /dev/null +++ b/x11/library/libdrm/pspec.xml @@ -0,0 +1,254 @@ + + + + + libdrm + http://dri.freedesktop.org/libdrm/ + + PisiLinux Community + admins@pisilinux.org + + MIT + library + Userspace interface to kernel DRM services + libdrm is a library providing the userspace interface to kernel DRM services. + http://dri.freedesktop.org/libdrm/libdrm-2.4.60.tar.bz2 + + libpciaccess-devel + cairo-32bit + + + + + libdrm + + libpciaccess + + + /etc + /usr/lib/libdrm.* + /lib/udev/rules.d + /usr/share/doc + /usr/share/man + + + 91-drm-modeset.rules + + + + + libdrm-intel + Userspace interface to kernel DRM services for intel + + libdrm + libpciaccess + + + /usr/lib/libdrm_intel.* + + + + + libdrm-nouveau + Userspace interface to kernel DRM services for nouveau + + libdrm + + + /usr/lib/libdrm_nouveau.* + + + + + libdrm-radeon + Userspace interface to kernel DRM services for radeon + + libdrm + + + /usr/lib/libdrm_radeon.* + + + + + libkms + Userspace library for kernel mode setting + + libdrm + + + /usr/lib/libkms.* + + + + + libdrm-devel + Development files for libdrm + + libdrm + libdrm-intel + libdrm-nouveau + libdrm-radeon + libkms + + + /usr/include + /usr/lib/pkgconfig + /usr/lib32/pkgconfig + + + + + libdrm-32bit + emul32 + 32-bit shared libraries for libdrm + emul32 + + libpciaccess-32bit + + + libdrm + libpciaccess-32bit + + + /usr/lib32/libdrm.* + + + + + libdrm-intel-32bit + emul32 + 32-bit shared libraries for libdrm-intel + emul32 + + libdrm-intel + libdrm-32bit + libpciaccess-32bit + + + /usr/lib32/libdrm_intel.* + + + + + libdrm-nouveau-32bit + emul32 + 32-bit shared libraries for libdrm-nouveau + emul32 + + libdrm-nouveau + libdrm-32bit + + + /usr/lib32/libdrm_nouveau.* + + + + + libdrm-radeon-32bit + emul32 + 32-bit shared libraries for libdrm-radeon + emul32 + + libdrm-radeon + libdrm-32bit + + + /usr/lib32/libdrm_radeon.* + + + + + libkms-32bit + emul32 + 32-bit shared libraries for libkms + emul32 + + libkms + libdrm-32bit + + + /usr/lib32/libkms.* + + + + + + 2015-05-05 + 2.4.60 + Version bump. + Ergün Salman + poyraz76@pisilinux.org + + + 2015-01-28 + 2.4.59 + Version bump. + Ergün Salman + poyraz76@pisilinux.org + + + 2014-10-18 + 2.4.58 + Version bump. + Ergün Salman + poyraz76@pisilinux.org + + + 2014-09-08 + 2.4.56 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-05-16 + 2.4.54 + Version bump. + Kamil Atlı + suvarice@gmail.com + + + 2014-03-07 + 2.4.52 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2013-10-07 + 2.4.46 + Rebuild. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-08-25 + 2.4.46 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-07-13 + 2.4.46 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-02-28 + 2.4.42 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2012-11-22 + 2.4.40 + First release + Marcin Bojara + marcin@pisilinux.org + + + diff --git a/x11/library/libdrm/translations.xml b/x11/library/libdrm/translations.xml new file mode 100644 index 0000000000..d86458933d --- /dev/null +++ b/x11/library/libdrm/translations.xml @@ -0,0 +1,59 @@ + + + + libdrm + Çekirdekteki DRM servisleri için kullanıcı düzeyi arayüz + libdrm, çekirdekteki DRM servisleri için kullanıcı düzeyi arayüz sağlayan bir kitaplıktır. + + + + libdrm-intel + Çekirdekteki intel DRM servisleri için kullanıcı düzeyi arayüz + + + + libdrm-nouveau + Çekirdekteki nouveau DRM servisleri için kullanıcı düzeyi arayüz + + + + libdrm-radeon + Çekirdekteki radeon DRM servisleri için kullanıcı düzeyi arayüz + + + + libkms + Çekirdekteki ekran modu değiştirme servisleri için kullanıcı düzeyi arayüz + + + + libdrm-devel + libdrm için geliştirme dosyaları + + + + libdrm-32bit + libdrm için 32-bit paylaşımlı kitaplıklar + + + + libdrm-intel-32bit + libdrm-intel için 32-bit paylaşımlı kitaplıklar + + + + libdrm-nouveau-32bit + libdrm-nouveau için 32-bit paylaşımlı kitaplıklar + + + + libdrm-radeon-32bit + libdrm-radeon için 32-bit paylaşımlı kitaplıklar + + + + libkms-32bit + libkms için 32-bit paylaşımlı kitaplıklar + + + diff --git a/desktop/x11/libepoxy/actions.py b/x11/library/libepoxy/actions.py similarity index 100% rename from desktop/x11/libepoxy/actions.py rename to x11/library/libepoxy/actions.py diff --git a/desktop/x11/libepoxy/pspec.xml b/x11/library/libepoxy/pspec.xml similarity index 100% rename from desktop/x11/libepoxy/pspec.xml rename to x11/library/libepoxy/pspec.xml diff --git a/x11/library/libxkbcommon/actions.py b/x11/library/libxkbcommon/actions.py new file mode 100755 index 0000000000..e7956df4b9 --- /dev/null +++ b/x11/library/libxkbcommon/actions.py @@ -0,0 +1,22 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- +# +# Copyright 2010 TUBITAK/BILGEM +# Licensed under the GNU General Public License, version 2. +# See the file http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt + +from pisi.actionsapi import autotools +from pisi.actionsapi import pisitools +from pisi.actionsapi import get + +def setup(): + autotools.autoreconf("-vif") + autotools.configure("--disable-static") + +def build(): + autotools.make() + +def install(): + autotools.rawInstall("DESTDIR=%s" % get.installDIR()) + + pisitools.dodoc("COPYING", "NEWS", "README.md") diff --git a/x11/library/libxkbcommon/pspec.xml b/x11/library/libxkbcommon/pspec.xml new file mode 100755 index 0000000000..6fa3d452df --- /dev/null +++ b/x11/library/libxkbcommon/pspec.xml @@ -0,0 +1,83 @@ + + + + + libxkbcommon + http://xkbcommon.org/ + + Osman Erkan + osman.erkan@pisilinux.org + + GPLv2 + library + Library to convert evdev keycodes to keysyms + Library to convert evdev keycodes to keysyms + https://github.com/xkbcommon/libxkbcommon/archive/xkbcommon-0.5.0.tar.gz + + + + libxkbcommon + + /usr/share/doc/libxkbcommon/ + /usr/lib/lib*.so* + + + + + libxkbcommon-devel + Development files for libxkbcommon + + libxkbcommon + + + /usr/include + /usr/lib/pkgconfig + /usr/lib32/pkgconfig + + + + + libxkbcommon-32bit + emul32 + 32-bit shared libraries for libxkbcommon + emul32 + + libxkbcommon + libxcb-32bit + + + /usr/lib32 + + + + + + 2015-03-04 + 0.5.0 + Version bump. + Stefan Gronewold(groni) + groni@pisilinux.org + + + 2014-05-16 + 0.4.2 + Version bump. + Alihan Öztürk + alihan@pisilinux.org + + + 2013-10-07 + 0.3.1 + Rebuild, clean emul32 installation. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-09-02 + 0.3.1 + First release. + Osman Erkan + osman.erkan@pisilinux.org + + + diff --git a/x11/library/libxkbcommon/translations.xml b/x11/library/libxkbcommon/translations.xml new file mode 100755 index 0000000000..ea84e48846 --- /dev/null +++ b/x11/library/libxkbcommon/translations.xml @@ -0,0 +1,18 @@ + + + + libxkbcommon + Evdev keycode'larını keysms türüne çeviren bir kitaplık + Evdev keycode'larını keysms türüne çeviren bir kitaplık + + + + libxkbcommon-devel + libxkbcommon için geliştirme dosyaları + + + + libxkbcommon-32bit + 32-bit shared libraries for libxkbcommon + + \ No newline at end of file diff --git a/x11/library/mesa/actions.py b/x11/library/mesa/actions.py new file mode 100755 index 0000000000..a7f9bc3b24 --- /dev/null +++ b/x11/library/mesa/actions.py @@ -0,0 +1,72 @@ +# -*- 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 get +from pisi.actionsapi import autotools +from pisi.actionsapi import pisitools + +Libdir = "/usr/lib32" if get.buildTYPE() == "emul32" else "/usr/lib" + +def setup(): + autotools.autoreconf("-vif") + +# --enable-sysfs option provides better hardware information support with "lspci" +# --enable-32-bit option is not present anymore. Although build fails in emul32. With --disable-asm option, not fail. Needs to be tested. + + options ="\ + --with-dri-driverdir=/usr/lib/xorg/modules/dri \ + --with-gallium-drivers=r300,r600,nouveau,svga,swrast \ + --with-dri-drivers=i915,i965,r200,radeon,nouveau,swrast \ + --with-egl-platforms=x11,drm,wayland \ + --enable-xa \ + --enable-dri \ + --enable-egl \ + --enable-gbm \ + --enable-glx \ + --enable-dri3 \ + --enable-gles1 \ + --enable-gles2 \ + --enable-vdpau \ + --enable-osmesa \ + --enable-sysfs \ + --enable-xvmc \ + --enable-glx-tls \ + --enable-gallium-llvm \ + --enable-llvm-shared-libs \ + --enable-shared-glapi \ + --enable-texture-float \ + " + + if get.buildTYPE() == "emul32": + # compile with llvm doesn't work for now, test it later + options += " --with-dri-driverdir=/usr/lib32/xorg/modules/dri \ + --with-gallium-drivers=r600,nouveau,swrast \ + --with-clang-libdir=/usr/lib32 \ + --disable-gallium-llvm \ + --disable-asm " + + elif get.ARCH() == "x86_64": + + options += " --with-clang-libdir=/usr/lib \ + --enable-opencl-icd \ + " + + autotools.configure(options) + pisitools.dosed("libtool","( -shared )", " -Wl,--as-needed\\1") + +def build(): + autotools.make() + +def install(): + autotools.rawInstall("DESTDIR=%s" % get.installDIR()) + + pisitools.domove("%s/libGL.so.1.2.0" % Libdir, "%s/mesa" % Libdir) + pisitools.dosym("libGL.so.1.2.0", "%s/libGL.so.1.2" % Libdir) + + if get.buildTYPE() == "emul32": + return + + pisitools.dodoc("docs/COPYING") + pisitools.dohtml("docs/*") \ No newline at end of file diff --git a/x11/library/mesa/comar/package-emul32.py b/x11/library/mesa/comar/package-emul32.py new file mode 100755 index 0000000000..3be11c93b8 --- /dev/null +++ b/x11/library/mesa/comar/package-emul32.py @@ -0,0 +1,17 @@ +#!/usr/bin/python + +import os + +def postInstall(fromVersion, fromRelease, toVersion, toRelease): + os.system("/usr/sbin/alternatives \ + --install /usr/lib32/libGL.so.1.2.0 libGL-32bit /usr/lib32/mesa/libGL.so.1.2.0 80 \ + --slave /usr/lib32/xorg/modules/volatile xorg-modules-volatile-32bit /var/empty") + + if not os.path.lexists("/usr/lib32/libGL.so.1"): + os.symlink("libGL.so.1.2.0", "/usr/lib32/libGL.so.1") + +def preRemove(): + # FIXME This is not needed when upgrading package; but pisi does not + # provide a way to learn operation type. + #os.system("/usr/sbin/alternatives --remove libGL-32bit /usr/lib32/mesa/libGL.so.1.2") + pass diff --git a/x11/library/mesa/comar/package.py b/x11/library/mesa/comar/package.py new file mode 100755 index 0000000000..846c81d4ec --- /dev/null +++ b/x11/library/mesa/comar/package.py @@ -0,0 +1,18 @@ +#!/usr/bin/python + +import os + +def postInstall(fromVersion, fromRelease, toVersion, toRelease): + os.system("/usr/sbin/alternatives \ + --install /usr/lib/libGL.so.1.2.0 libGL /usr/lib/mesa/libGL.so.1.2.0 80 \ + --slave /usr/lib/xorg/modules/volatile xorg-modules-volatile /var/empty") + + if not os.path.lexists("/usr/lib/libGL.so.1"): + os.symlink("libGL.so.1.2.0", "/usr/lib/libGL.so.1") + +def preRemove(): + # FIXME This is not needed when upgrading package; but pisi does not + # provide a way to learn operation type. + #os.system("/usr/sbin/alternatives --remove libGL /usr/lib/mesa/libGL.so.1.2") + pass + diff --git a/x11/library/mesa/files/drirc b/x11/library/mesa/files/drirc new file mode 100755 index 0000000000..0486acbb74 --- /dev/null +++ b/x11/library/mesa/files/drirc @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + diff --git a/x11/library/mesa/pspec.xml b/x11/library/mesa/pspec.xml new file mode 100755 index 0000000000..b06c88cd31 --- /dev/null +++ b/x11/library/mesa/pspec.xml @@ -0,0 +1,282 @@ + + + + + mesa + http://www.mesa3d.org + + PisiLinux Community + admins@pisilinux.org + + MIT + library + app:console + Mesa graphics libraries and utilities + Mesa is an open-source implementation of the OpenGL specification - a system for rendering interactive 3D graphics. + ftp://ftp.freedesktop.org/pub/mesa/10.5.5/mesa-10.5.5.tar.gz + + llvm-libs + llvm-clang-devel + xorg-proto + libdrm-devel + libXext-devel + wayland-devel + libvdpau-devel + libXfixes-devel + libtalloc-devel + libXdamage-devel + libomxil-bellagio-devel + libXxf86vm-devel + libXvMC-devel + libXv-devel + python-mako + libxshmfence-devel + + + + + mesa + + llvm-libs + libdrm + libXext + libXfixes + libXdamage + libXxf86vm + libXv + libXvMC + libdrm-intel + libdrm-radeon + libdrm-nouveau + wayland-client + wayland-server + llvm-clang + libclc + libxshmfence + + + /etc + /usr/bin + /usr/lib + /usr/share/doc + + + drirc + + + System.Package + + + + + mesa-devel + Development files for mesa + + libdrm-devel + libXext-devel + wayland-devel + libXfixes-devel + libXdamage-devel + libXxf86vm-devel + libxshmfence-devel + mesa + + + /usr/include + /usr/lib/pkgconfig + /usr/lib32/pkgconfig + + + + + mesa-32bit + emul32 + 32-bit shared libraries for mesa + emul32 + + expat-32bit + libXt-devel + libXv-32bit + libX11-32bit + libcap-32bit + libdrm-32bit + libXext-32bit + libXvMC-32bit + libudev-32bit + wayland-32bit + libvdpau-32bit + libXfixes-32bit + libXdamage-32bit + libXxf86vm-32bit + libdrm-intel-32bit + libdrm-radeon-32bit + libdrm-nouveau-32bit + + + expat-32bit + libX11-32bit + libdrm-32bit + libxcb-32bit + libXext-32bit + wayland-32bit + libXfixes-32bit + libXdamage-32bit + libXxf86vm-32bit + libXv-32bit + libXvMC-32bit + libdrm-intel-32bit + libxshmfence-32bit + libdrm-radeon-32bit + libdrm-nouveau-32bit + mesa + + + /usr/lib32 + + + System.Package + + + + + 2015-05-16 + 10.5.5 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2014-05-05 + 10.5.4 + Version bump. + Serdar Soytetir + kaptan@pisilinux.org + + + 2015-01-28 + 10.4.3 + Version bump. + Ergün Salman + poyraz76@pisilinux.org + + + 2015-01-20 + 10.4.2 + Version bump. + Ergün Salman + poyraz76@pisilinux.org + + + 2014-09-24 + 10.3.0 + Version bump. + Serdar Soytetir + kaptan@pisilinux.org + + + 2014-08-31 + 10.2.6 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-07-08 + 10.1.6 + Version bump. + Vedat Demir + vedat@pisilinux.org + + + 2014-05-24 + 10.1.4 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2014-05-16 + 10.1.3 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-05-10 + 10.1.3 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2014-04-23 + 10.1.1 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-03-08 + 10.1.0 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2013-11-06 + 9.2.0 + Fix deps. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-09-02 + 9.2.0 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-08-25 + 9.1.5 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-07-18 + 9.1.5 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-07-14 + 9.1.4 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-06-01 + 9.1 + add missing dep. + Erdinç Gültekin + erdincgultekin@pisilinux.org + + + 2013-02-28 + 9.1 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2012-11-04 + 9.0 + First release + Marcin Bojara + marcin@pisilinux.org + + + diff --git a/x11/library/mesa/translations.xml b/x11/library/mesa/translations.xml new file mode 100755 index 0000000000..47b2d2f37e --- /dev/null +++ b/x11/library/mesa/translations.xml @@ -0,0 +1,20 @@ + + + + mesa + Mesa grafik kitaplıkları ve yardımcı uygulamalar + Mesa, OpenGL belirtiminin (etkileşimli 3B grafiklerin gerçeklenmesi için bir sistem) açık kaynaklı bir uyarlamasıdır. + Mesa biblioteki graficzne i narzędzia + Mesa jest open-source'ową implementacją specyfikacji OpenGL do renderowania trójwymiarowej grafiki. + + + + mesa-devel + mesa için geliştirme dosyaları + + + + mesa-32bit + mesa için 32-bit paylaşımlı kitaplıklar + + diff --git a/x11/library/wayland/actions.py b/x11/library/wayland/actions.py new file mode 100755 index 0000000000..6cc4baebf8 --- /dev/null +++ b/x11/library/wayland/actions.py @@ -0,0 +1,29 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- +# +# Copyright 2010 TUBITAK/BILGEM +# Licensed under the GNU General Public License, version 2. +# See the file http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt + +from pisi.actionsapi import autotools +from pisi.actionsapi import pisitools +from pisi.actionsapi import get + +Libdir = "/usr/lib32" if get.buildTYPE() == "emul32" else "/usr/lib" + +def setup(): + autotools.autoreconf("-vif") + autotools.configure("--disable-documentation --disable-static") + + pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ") + +def build(): + autotools.make() + +def install(): + autotools.rawInstall("DESTDIR=%s" % get.installDIR()) + + if get.buildTYPE() == "emul32": + return + + pisitools.dodoc("COPYING", "TODO", "README") \ No newline at end of file diff --git a/x11/library/wayland/pspec.xml b/x11/library/wayland/pspec.xml new file mode 100755 index 0000000000..6d4dd2f714 --- /dev/null +++ b/x11/library/wayland/pspec.xml @@ -0,0 +1,152 @@ + + + + + wayland + http://wayland.freedesktop.org/ + + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + GPLv2 + library + Wayland Compositor Infrastructure + Wayland is a protocol for a compositor to talk to its clients as well as a C library implementation of that protocol. + http://wayland.freedesktop.org/releases/wayland-1.7.0.tar.xz + + + + wayland + + /usr/bin + /usr/share/doc/ + /usr/share/aclocal + /usr/share/wayland + /usr/share/man + + + + + wayland-client + Wayland client library + + wayland + + + /usr/lib/libwayland-client* + + + + + wayland-cursor + Wayland cursor library + + wayland + wayland-client + + + /usr/lib/libwayland-cursor* + + + + + wayland-server + Wayland server library + + wayland + + + /usr/lib/libwayland-server* + + + + + wayland-devel + Development files for wayland + + wayland + + + /usr/include + /usr/lib/pkgconfig + /usr/lib32/pkgconfig + /usr/share/pkgconfig + + + + + wayland-32bit + emul32 + 32-bit shared libraries for wayland + emul32 + + libffi-32bit + + + wayland + libffi-32bit + + + /usr/lib32 + + + + + + 2015-02-16 + 1.7.0 + Version bump. + Hakan Yıldız + hknyldz93@gmail.com + + + 2014-09-25 + 1.6.0 + Version Bump. + Vedat Demir + vedat@pisilinux.org + + + 2014-07-06 + 1.5.0 + Version Bump. + Vedat Demir + vedat@pisilinux.org + + + 2014-05-16 + 1.4.0 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-02-13 + 1.4.0 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2014-01-27 + 1.2.1 + Rebuild Unused + Varol Maksutoğlu + waroi@pisilinux.org + + + 2013-11-06 + 1.2.1 + Fix deps. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-08-31 + 1.2.1 + First release. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + diff --git a/x11/library/wayland/translations.xml b/x11/library/wayland/translations.xml new file mode 100755 index 0000000000..b565068246 --- /dev/null +++ b/x11/library/wayland/translations.xml @@ -0,0 +1,33 @@ + + + + libwayland + Wayland pencere yöneticisi kitaplıkları + Wayland is a protocol for a compositor to talk to its clients as well as a C library implementation of that protocol. + + + + wayland-client + Wayland client library + + + + wayland-cursor + Wayland cursor library + + + + wayland-server + Wayland server library + + + + wayland-32bit + 32-bit shared libraries for wayland + + + + libwayland-devel + libwayland için geliştirme dosyaları + + \ No newline at end of file diff --git a/x11/library/xcb-util-image/actions.py b/x11/library/xcb-util-image/actions.py new file mode 100644 index 0000000000..d10620b979 --- /dev/null +++ b/x11/library/xcb-util-image/actions.py @@ -0,0 +1,21 @@ +#!/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 get + +def setup(): + autotools.autoreconf("-vif") + autotools.configure("--disable-static \ + --with-pic") +def build(): + autotools.make() + +def install(): + autotools.rawInstall("DESTDIR=%s" % get.installDIR()) + + pisitools.dodoc("README") diff --git a/x11/library/xcb-util-image/pspec.xml b/x11/library/xcb-util-image/pspec.xml new file mode 100644 index 0000000000..da85a07eba --- /dev/null +++ b/x11/library/xcb-util-image/pspec.xml @@ -0,0 +1,96 @@ + + + + + xcb-util-image + http://xcb.freedesktop.org + + PisiLinux Community + admins@pisilinux.org + + MIT + library + A number of libraries which sit on top of libxcb + The xcb-util-image module provides a number of libraries which sit on top of libxcb, the core X protocol library, and some of the extension libraries. + http://xcb.freedesktop.org/dist/xcb-util-image-0.3.9.tar.bz2 + + + + xcb-util-image + + xcb-util + + + /usr/lib + /usr/share/doc + + + + + xcb-util-image-devel + Development files for xcb-util + + xcb-util-image + + + /usr/include + /usr/lib/pkgconfig + /usr/lib32/pkgconfig + + + + + xcb-util-image-32bit + emul32 + 32-bit shared libraries for xcb-util + emul32 + + libxcb-32bit + + + xcb-util-32bit + libxcb-32bit + + + /usr/lib32 + + + + + + 2014-05-16 + 0.3.9 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-10-07 + 0.3.9 + Clean actions.py emul32 build. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-08-25 + 0.3.9 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-07-30 + 0.3.9 + Rebuild + PisiLinux Community + admins@pisilinux.org + + + 2012-12-08 + 0.3.9 + First release + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + diff --git a/x11/library/xcb-util-image/translations.xml b/x11/library/xcb-util-image/translations.xml new file mode 100644 index 0000000000..f78ac53b48 --- /dev/null +++ b/x11/library/xcb-util-image/translations.xml @@ -0,0 +1,18 @@ + + + + xcb-util-image + libxcb temelli birtakım kitaplıklar + xcb-util-image modülü, çekirdek X protokolü ve bazı eklentiler için libxcb temelli kitaplıklar içerir. + + + + xcb-util-image-devel + xcb-util-image için geliştirme dosyaları + + + + xcb-util-image-32bit + xcb-util-image için 32-bit paylaşımlı kitaplıklar + + diff --git a/x11/library/xcb-util-keysyms/actions.py b/x11/library/xcb-util-keysyms/actions.py new file mode 100644 index 0000000000..f481b862c8 --- /dev/null +++ b/x11/library/xcb-util-keysyms/actions.py @@ -0,0 +1,22 @@ +#!/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 get + +def setup(): + autotools.autoreconf("-vif") + autotools.configure("--disable-static \ + --with-pic") + +def build(): + autotools.make() + +def install(): + autotools.rawInstall("DESTDIR=%s" % get.installDIR()) + + pisitools.dodoc("README") diff --git a/x11/library/xcb-util-keysyms/pspec.xml b/x11/library/xcb-util-keysyms/pspec.xml new file mode 100644 index 0000000000..f633804891 --- /dev/null +++ b/x11/library/xcb-util-keysyms/pspec.xml @@ -0,0 +1,86 @@ + + + + + xcb-util-keysyms + http://xcb.freedesktop.org + + PisiLinux Community + admins@pisilinux.org + + MIT + library + A number of libraries which sit on top of libxcb + The xcb-util-keysyms module provides a number of libraries which sit on top of libxcb, the core X protocol library, and some of the extension libraries. + http://xcb.freedesktop.org/dist/xcb-util-keysyms-0.3.9.tar.bz2 + + + + xcb-util-keysyms + + /usr/lib + /usr/share/doc + + + + + xcb-util-keysyms-devel + Development files for xcb-util-keysyms + + xcb-util-keysyms + + + /usr/include + /usr/lib/pkgconfig + /usr/lib32/pkgconfig + + + + + xcb-util-keysyms-32bit + emul32 + 32-bit shared libraries for xcb-util-keysyms + emul32 + + libxcb-32bit + + + xcb-util-keysyms + libxcb-32bit + + + /usr/lib32 + + + + + + 2014-05-16 + 0.3.9 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-10-07 + 0.3.9 + Clean actions.py emul32 build. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-08-25 + 0.3.9 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2012-12-08 + 0.3.9 + First release + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + diff --git a/x11/library/xcb-util-keysyms/translations.xml b/x11/library/xcb-util-keysyms/translations.xml new file mode 100644 index 0000000000..86041acfea --- /dev/null +++ b/x11/library/xcb-util-keysyms/translations.xml @@ -0,0 +1,18 @@ + + + + xcb-util-keysyms + libxcb temelli birtakım kitaplıklar + xcb-util-keysyms modülü, çekirdek X protokolü ve bazı eklentiler için libxcb temelli kitaplıklar içerir. + + + + xcb-util-keysyms-devel + xcb-util-keysyms için geliştirme dosyaları + + + + xcb-uti-keysymsl-32bit + xcb-util-keysyms için 32-bit paylaşımlı kitaplıklar + + diff --git a/x11/library/xcb-util-renderutil/actions.py b/x11/library/xcb-util-renderutil/actions.py new file mode 100644 index 0000000000..1555a985e7 --- /dev/null +++ b/x11/library/xcb-util-renderutil/actions.py @@ -0,0 +1,21 @@ +#!/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 get +from pisi.actionsapi import autotools +from pisi.actionsapi import pisitools + +def setup(): + autotools.configure("--disable-static \ + --with-pic") + +def build(): + autotools.make() + +def install(): + autotools.rawInstall("DESTDIR=%s" % get.installDIR()) + + pisitools.dodoc("README") diff --git a/x11/library/xcb-util-renderutil/pspec.xml b/x11/library/xcb-util-renderutil/pspec.xml new file mode 100644 index 0000000000..e87b73674c --- /dev/null +++ b/x11/library/xcb-util-renderutil/pspec.xml @@ -0,0 +1,93 @@ + + + + + xcb-util-renderutil + http://xcb.freedesktop.org + + PisiLinux Community + admins@pisilinux.org + + MIT + library + A number of libraries which sit on top of libxcb + The xcb-util-renderutil module provides a number of libraries which sit on top of libxcb, the core X protocol library, and some of the extension libraries. + http://xcb.freedesktop.org/dist/xcb-util-renderutil-0.3.9.tar.bz2 + + + + xcb-util-renderutil + + /usr/lib + /usr/share/doc + + + + + xcb-util-renderutil-devel + Development files for xcb-util-renderutil + + xcb-util-renderutil + + + /usr/include + /usr/lib/pkgconfig + /usr/lib32/pkgconfig + + + + + xcb-util-renderutil-32bit + emul32 + 32-bit shared libraries for xcb-util-renderutil + emul32 + + libxcb-32bit + + + xcb-util + libxcb-32bit + + + /usr/lib32 + + + + + + 2014-09-01 + 0.3.9 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-05-16 + 0.3.8 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-10-07 + 0.3.8 + Clean actions.py emul32 build. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-08-25 + 0.3.8 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2012-12-08 + 0.3.8 + First release + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + diff --git a/x11/library/xcb-util-renderutil/translations.xml b/x11/library/xcb-util-renderutil/translations.xml new file mode 100644 index 0000000000..6bcd806ff8 --- /dev/null +++ b/x11/library/xcb-util-renderutil/translations.xml @@ -0,0 +1,18 @@ + + + + xcb-util-renderutil + libxcb temelli birtakım kitaplıklar + xcb-util-renderutil modülü, çekirdek X protokolü ve bazı eklentiler için libxcb temelli kitaplıklar içerir. + + + + xcb-util-renderutil-devel + xcb-util-renderutil için geliştirme dosyaları + + + + xcb-util-renderutil-32bit + xcb-util-renderutil için 32-bit paylaşımlı kitaplıklar + + diff --git a/x11/library/xcb-util-wm/actions.py b/x11/library/xcb-util-wm/actions.py new file mode 100644 index 0000000000..f481b862c8 --- /dev/null +++ b/x11/library/xcb-util-wm/actions.py @@ -0,0 +1,22 @@ +#!/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 get + +def setup(): + autotools.autoreconf("-vif") + autotools.configure("--disable-static \ + --with-pic") + +def build(): + autotools.make() + +def install(): + autotools.rawInstall("DESTDIR=%s" % get.installDIR()) + + pisitools.dodoc("README") diff --git a/x11/library/xcb-util-wm/pspec.xml b/x11/library/xcb-util-wm/pspec.xml new file mode 100644 index 0000000000..3e1c2c4ba9 --- /dev/null +++ b/x11/library/xcb-util-wm/pspec.xml @@ -0,0 +1,93 @@ + + + + + xcb-util-wm + http://xcb.freedesktop.org + + PisiLinux Community + admins@pisilinux.org + + MIT + library + A number of libraries which sit on top of libxcb + The xcb-util-wm module provides a number of libraries which sit on top of libxcb, the core X protocol library, and some of the extension libraries. + http://xcb.freedesktop.org/dist/xcb-util-wm-0.4.1.tar.bz2 + + + + xcb-util-wm + + /usr/lib + /usr/share/doc + + + + + xcb-util-wm-devel + Development files for xcb-util-wm + + xcb-util-wm + + + /usr/include + /usr/lib/pkgconfig + /usr/lib32/pkgconfig + + + + + xcb-util-wm-32bit + emul32 + 32-bit shared libraries for xcb-util-wm + emul32 + + libxcb-32bit + + + xcb-util-wm + libxcb-32bit + + + /usr/lib32 + + + + + + 2014-05-16 + 0.4.1 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-05-16 + 0.4.1 + Version bump + Alihan Öztürk + alihan@pisilinux.org + + + 2013-10-07 + 0.3.9 + Clean actions.py emul32 build. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-08-25 + 0.3.9 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2012-12-08 + 0.3.9 + First release + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + diff --git a/x11/library/xcb-util-wm/translations.xml b/x11/library/xcb-util-wm/translations.xml new file mode 100644 index 0000000000..f10ef9faca --- /dev/null +++ b/x11/library/xcb-util-wm/translations.xml @@ -0,0 +1,18 @@ + + + + xcb-util-wm + libxcb temelli birtakım kitaplıklar + xcb-util-wm modülü, çekirdek X protokolü ve bazı eklentiler için libxcb temelli kitaplıklar içerir. + + + + xcb-util-wm-devel + xcb-util-wm için geliştirme dosyaları + + + + xcb-util-wm-32bit + xcb-util-wm için 32-bit paylaşımlı kitaplıklar + + diff --git a/x11/library/xcb-util/actions.py b/x11/library/xcb-util/actions.py new file mode 100644 index 0000000000..25adb86a95 --- /dev/null +++ b/x11/library/xcb-util/actions.py @@ -0,0 +1,23 @@ +#!/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 shelltools +from pisi.actionsapi import autotools +from pisi.actionsapi import pisitools +from pisi.actionsapi import get + +def setup(): + autotools.autoreconf("-vif") + autotools.configure("--disable-static \ + --with-pic") + +def build(): + autotools.make() + +def install(): + autotools.rawInstall("DESTDIR=%s" % get.installDIR()) + + pisitools.dodoc("README") diff --git a/x11/library/xcb-util/pspec.xml b/x11/library/xcb-util/pspec.xml new file mode 100644 index 0000000000..5e6be8ddc7 --- /dev/null +++ b/x11/library/xcb-util/pspec.xml @@ -0,0 +1,79 @@ + + + + + xcb-util + http://xcb.freedesktop.org + + PisiLinux Community + admins@pisilinux.org + + MIT + library + A number of libraries which sit on top of libxcb + The xcb-util module provides a number of libraries which sit on top of libxcb, the core X protocol library, and some of the extension libraries. + http://xcb.freedesktop.org/dist/xcb-util-0.3.9.tar.bz2 + + + + xcb-util + + /usr/lib + /usr/share/doc + + + + + xcb-util-devel + Development files for xcb-util + + xcb-util + + + /usr/include + /usr/lib/pkgconfig + /usr/lib32/pkgconfig + + + + + xcb-util-32bit + emul32 + 32-bit shared libraries for xcb-util + emul32 + + libxcb-32bit + + + xcb-util + libxcb-32bit + + + /usr/lib32 + + + + + + 2013-10-07 + 0.3.9 + Clean actions.py emul32 build. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-08-25 + 0.3.9 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2012-06-01 + 0.3.9 + First release + Erdem Artan + admins@pisilinux.org + + + diff --git a/x11/library/xcb-util/translations.xml b/x11/library/xcb-util/translations.xml new file mode 100644 index 0000000000..9888b57ce3 --- /dev/null +++ b/x11/library/xcb-util/translations.xml @@ -0,0 +1,18 @@ + + + + xcb-util + libxcb temelli birtakım kitaplıklar + xcb-util modülü, çekirdek X protokolü ve bazı eklentiler için libxcb temelli kitaplıklar içerir. + + + + xcb-util-devel + xcb-util için geliştirme dosyaları + + + + xcb-util-32bit + xcb-util için 32-bit paylaşımlı kitaplıklar + + diff --git a/x11/sever/component.xml b/x11/sever/component.xml new file mode 100644 index 0000000000..a5a52b44b2 --- /dev/null +++ b/x11/sever/component.xml @@ -0,0 +1,3 @@ + + x11.server + diff --git a/x11/sever/xorg-server/actions.py b/x11/sever/xorg-server/actions.py new file mode 100755 index 0000000000..61d7540511 --- /dev/null +++ b/x11/sever/xorg-server/actions.py @@ -0,0 +1,76 @@ +# -*- 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(): +# shelltools.chmod("hw/vnc/symlink-vnc.sh") + + + autotools.autoreconf("-fi") + autotools.configure("--enable-install-libxf86config \ + --disable-systemd-logind \ + --enable-aiglx \ + --enable-glx-tls \ + --enable-composite \ + --enable-xcsecurity \ + --enable-record \ + --enable-dri \ + --enable-dri2 \ + --enable-glamor \ + --enable-xwayland \ + --enable-config-udev \ + --disable-config-hal \ + --enable-xfree86-utils \ + --enable-xorg \ + --enable-dmx \ + --enable-xvfb \ + --enable-xnest \ + --enable-kdrive \ + --enable-kdrive-evdev \ + --enable-kdrive-kbd \ + --enable-kdrive-mouse \ + --enable-xephyr \ + --disable-xfake \ + --disable-xfbdev \ + --disable-devel-docs \ + --disable-static \ + --without-doxygen \ + --with-pic \ + --without-dtrace \ + --with-int10=x86emu \ + --with-os-name=\"PisiLinux\" \ + --with-os-vendor=\"Pisi GNU/Linux Community\" \ + --with-builderstring=\"Package: %s\" \ + --with-fontrootdir=/usr/share/fonts \ + --with-default-font-path=catalogue:/etc/X11/fontpath.d,built-ins \ + --with-xkb-output=/var/lib/xkb \ + --with-dri-driver-path=/usr/lib/xorg/modules/dri \ + --without-xmlto \ + --without-fop \ + --localstatedir=/var \ + PCI_TXT_IDS_DIR=/usr/share/X11/pci \ + " % get.srcTAG()) + + pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ") + +def build(): + autotools.make() + +def install(): + autotools.rawInstall("DESTDIR=%s" % get.installDIR()) + + pisitools.dodir("/etc/X11/fontpath.d") + pisitools.dodir("/etc/X11/xorg.conf.d") + pisitools.dodir("/usr/share/X11/pci") + pisitools.dodir("/usr/share/X11/xorg.conf.d") + + # Remove empty dir + pisitools.removeDir("/var/log") + + pisitools.dodoc("COPYING", "README") diff --git a/x11/sever/xorg-server/files/DriversDB b/x11/sever/xorg-server/files/DriversDB new file mode 100755 index 0000000000..355a78c1d1 --- /dev/null +++ b/x11/sever/xorg-server/files/DriversDB @@ -0,0 +1,969 @@ +10021304 fglrx +10021305 fglrx +10021306 fglrx +10021307 fglrx +10021309 fglrx +1002130a fglrx +1002130b fglrx +1002130c fglrx +1002130d fglrx +1002130e fglrx +1002130f fglrx +10021310 fglrx +10021311 fglrx +10021312 fglrx +10021313 fglrx +10021315 fglrx +10021316 fglrx +10021317 fglrx +10021318 fglrx +1002131b fglrx +1002131c fglrx +1002131d fglrx +10026600 fglrx +10026601 fglrx +10026602 fglrx +10026603 fglrx +10026604 fglrx +10026605 fglrx +10026606 fglrx +10026607 fglrx +10026608 fglrx +10026610 fglrx +10026611 fglrx +10026613 fglrx +10026620 fglrx +10026621 fglrx +10026623 fglrx +10026631 fglrx +10026640 fglrx +10026641 fglrx +10026646 fglrx +10026647 fglrx +10026649 fglrx +10026650 fglrx +10026651 fglrx +10026658 fglrx +1002665c fglrx +1002665d fglrx +10026660 fglrx +10026663 fglrx +10026664 fglrx +10026665 fglrx +10026667 fglrx +1002666f fglrx +10026700 fglrx +10026701 fglrx +10026702 fglrx +10026703 fglrx +10026704 fglrx +10026705 fglrx +10026706 fglrx +10026707 fglrx +10026708 fglrx +10026709 fglrx +10026718 fglrx +10026719 fglrx +1002671c fglrx +1002671d fglrx +1002671f fglrx +10026720 fglrx +10026721 fglrx +10026722 fglrx +10026723 fglrx +10026724 fglrx +10026725 fglrx +10026726 fglrx +10026727 fglrx +10026728 fglrx +10026729 fglrx +10026738 fglrx +10026739 fglrx +1002673e fglrx +10026740 fglrx +10026741 fglrx +10026742 fglrx +10026743 fglrx +10026744 fglrx +10026745 fglrx +10026746 fglrx +10026747 fglrx +10026748 fglrx +10026749 fglrx +1002674a fglrx +10026750 fglrx +10026751 fglrx +10026758 fglrx +10026759 fglrx +1002675b fglrx +1002675d fglrx +1002675f fglrx +10026760 fglrx +10026761 fglrx +10026762 fglrx +10026763 fglrx +10026764 fglrx +10026765 fglrx +10026766 fglrx +10026767 fglrx +10026768 fglrx +10026770 fglrx +10026771 fglrx +10026772 fglrx +10026778 fglrx +10026779 fglrx +1002677b fglrx +10026780 fglrx +10026784 fglrx +10026788 fglrx +1002678a fglrx +10026790 fglrx +10026792 fglrx +10026798 fglrx +10026799 fglrx +1002679a fglrx +1002679b fglrx +1002679e fglrx +100267a0 fglrx +100267a1 fglrx +100267a2 fglrx +100267b0 fglrx +100267b1 fglrx +100267b8 fglrx +100267b9 fglrx +100267ba fglrx +100267be fglrx +10026800 fglrx +10026801 fglrx +10026806 fglrx +10026808 fglrx +10026809 fglrx +10026810 fglrx +10026811 fglrx +10026818 fglrx +10026819 fglrx +10026820 fglrx +10026821 fglrx +10026822 fglrx +10026823 fglrx +10026824 fglrx +10026825 fglrx +10026826 fglrx +10026827 fglrx +10026828 fglrx +1002682a fglrx +1002682b fglrx +1002682c fglrx +1002682d fglrx +1002682f fglrx +10026830 fglrx +10026831 fglrx +10026835 fglrx +10026837 fglrx +10026838 fglrx +10026839 fglrx +1002683b fglrx +1002683d fglrx +1002683f fglrx +10026840 fglrx +10026841 fglrx +10026842 fglrx +10026843 fglrx +10026849 fglrx +1002684c fglrx +10026850 fglrx +10026858 fglrx +10026859 fglrx +10026880 fglrx +10026888 fglrx +10026889 fglrx +1002688a fglrx +1002688c fglrx +1002688d fglrx +10026898 fglrx +10026899 fglrx +1002689b fglrx +1002689c fglrx +1002689d fglrx +1002689e fglrx +100268a0 fglrx +100268a1 fglrx +100268a8 fglrx +100268a9 fglrx +100268b0 fglrx +100268b8 fglrx +100268b9 fglrx +100268ba fglrx +100268be fglrx +100268bf fglrx +100268c0 fglrx +100268c1 fglrx +100268c7 fglrx +100268c8 fglrx +100268c9 fglrx +100268d8 fglrx +100268d9 fglrx +100268da fglrx +100268de fglrx +100268e0 fglrx +100268e1 fglrx +100268e4 fglrx +100268e5 fglrx +100268e8 fglrx +100268e9 fglrx +100268f1 fglrx +100268f2 fglrx +100268f8 fglrx +100268f9 fglrx +100268fa fglrx +100268fe fglrx +10026900 fglrx +10026901 fglrx +10026902 fglrx +10026903 fglrx +10026907 fglrx +10026920 fglrx +10026921 fglrx +1002692b fglrx +1002692f fglrx +10026938 fglrx +10026939 fglrx +10029640 fglrx +10029641 fglrx +10029642 fglrx +10029643 fglrx +10029644 fglrx +10029645 fglrx +10029647 fglrx +10029648 fglrx +10029649 fglrx +1002964a fglrx +1002964b fglrx +1002964c fglrx +1002964e fglrx +1002964f fglrx +10029802 fglrx +10029803 fglrx +10029804 fglrx +10029805 fglrx +10029806 fglrx +10029807 fglrx +10029808 fglrx +10029809 fglrx +1002980a fglrx +10029830 fglrx +10029831 fglrx +10029832 fglrx +10029833 fglrx +10029834 fglrx +10029835 fglrx +10029836 fglrx +10029837 fglrx +10029838 fglrx +10029839 fglrx +1002983a fglrx +1002983b fglrx +1002983c fglrx +1002983d fglrx +1002983e fglrx +1002983f fglrx +10029850 fglrx +10029851 fglrx +10029852 fglrx +10029853 fglrx +10029854 fglrx +10029855 fglrx +10029856 fglrx +10029857 fglrx +10029858 fglrx +10029859 fglrx +1002985a fglrx +1002985b fglrx +1002985c fglrx +1002985d fglrx +1002985e fglrx +1002985f fglrx +10029870 fglrx +10029874 fglrx +10029875 fglrx +10029876 fglrx +10029877 fglrx +100298b0 fglrx +100298b1 fglrx +10029900 fglrx +10029901 fglrx +10029903 fglrx +10029904 fglrx +10029905 fglrx +10029906 fglrx +10029907 fglrx +10029908 fglrx +10029909 fglrx +1002990a fglrx +1002990b fglrx +1002990c fglrx +1002990d fglrx +1002990e fglrx +1002990f fglrx +10029910 fglrx +10029913 fglrx +10029917 fglrx +10029918 fglrx +10029919 fglrx +10029990 fglrx +10029991 fglrx +10029992 fglrx +10029993 fglrx +10029994 fglrx +10029995 fglrx +10029996 fglrx +10029997 fglrx +10029998 fglrx +10029999 fglrx +1002999a fglrx +1002999b fglrx +1002999c fglrx +1002999d fglrx +100299a0 fglrx +100299a2 fglrx +100299a4 fglrx +10de0040 nvidia304 +10de0041 nvidia304 +10de0042 nvidia304 +10de0043 nvidia304 +10de0044 nvidia304 +10de0045 nvidia304 +10de0046 nvidia304 +10de0047 nvidia304 +10de0048 nvidia304 +10de004e nvidia304 +10de0090 nvidia304 +10de0091 nvidia304 +10de0092 nvidia304 +10de0093 nvidia304 +10de0095 nvidia304 +10de0098 nvidia304 +10de0099 nvidia304 +10de009d nvidia304 +10de00c0 nvidia304 +10de00c1 nvidia304 +10de00c2 nvidia304 +10de00c3 nvidia304 +10de00c8 nvidia304 +10de00c9 nvidia304 +10de00cc nvidia304 +10de00cd nvidia304 +10de00ce nvidia304 +10de00f1 nvidia304 +10de00f2 nvidia304 +10de00f3 nvidia304 +10de00f4 nvidia304 +10de00f5 nvidia304 +10de00f6 nvidia304 +10de00f8 nvidia304 +10de00f9 nvidia304 +10de0140 nvidia304 +10de0141 nvidia304 +10de0142 nvidia304 +10de0143 nvidia304 +10de0144 nvidia304 +10de0145 nvidia304 +10de0146 nvidia304 +10de0147 nvidia304 +10de0148 nvidia304 +10de0149 nvidia304 +10de014a nvidia304 +10de014c nvidia304 +10de014d nvidia304 +10de014e nvidia304 +10de014f nvidia304 +10de0160 nvidia304 +10de0161 nvidia304 +10de0162 nvidia304 +10de0163 nvidia304 +10de0164 nvidia304 +10de0165 nvidia304 +10de0166 nvidia304 +10de0167 nvidia304 +10de0168 nvidia304 +10de0169 nvidia304 +10de016a nvidia304 +10de01d0 nvidia304 +10de01d1 nvidia304 +10de01d2 nvidia304 +10de01d3 nvidia304 +10de01d6 nvidia304 +10de01d7 nvidia304 +10de01d8 nvidia304 +10de01da nvidia304 +10de01db nvidia304 +10de01dc nvidia304 +10de01dd nvidia304 +10de01de nvidia304 +10de01df nvidia304 +10de0211 nvidia304 +10de0212 nvidia304 +10de0215 nvidia304 +10de0218 nvidia304 +10de0221 nvidia304 +10de0222 nvidia304 +10de0240 nvidia304 +10de0241 nvidia304 +10de0242 nvidia304 +10de0244 nvidia304 +10de0245 nvidia304 +10de0247 nvidia304 +10de0290 nvidia304 +10de0291 nvidia304 +10de0292 nvidia304 +10de0293 nvidia304 +10de0294 nvidia304 +10de0295 nvidia304 +10de0297 nvidia304 +10de0298 nvidia304 +10de0299 nvidia304 +10de029a nvidia304 +10de029b nvidia304 +10de029c nvidia304 +10de029d nvidia304 +10de029e nvidia304 +10de029f nvidia304 +10de02e0 nvidia304 +10de02e1 nvidia304 +10de02e2 nvidia304 +10de02e3 nvidia304 +10de02e4 nvidia304 +10de038b nvidia304 +10de0390 nvidia304 +10de0391 nvidia304 +10de0392 nvidia304 +10de0393 nvidia304 +10de0394 nvidia304 +10de0395 nvidia304 +10de0397 nvidia304 +10de0398 nvidia304 +10de0399 nvidia304 +10de039c nvidia304 +10de039e nvidia304 +10de03d0 nvidia304 +10de03d1 nvidia304 +10de03d2 nvidia304 +10de03d5 nvidia304 +10de03d6 nvidia304 +10de0531 nvidia304 +10de0533 nvidia304 +10de053a nvidia304 +10de053b nvidia304 +10de053e nvidia304 +10de07e0 nvidia304 +10de07e1 nvidia304 +10de07e2 nvidia304 +10de07e3 nvidia304 +10de07e5 nvidia304 +10de0191 nvidia340 +10de0193 nvidia340 +10de0194 nvidia340 +10de0197 nvidia340 +10de019d nvidia340 +10de019e nvidia340 +10de0400 nvidia340 +10de0401 nvidia340 +10de0402 nvidia340 +10de0403 nvidia340 +10de0404 nvidia340 +10de0405 nvidia340 +10de0406 nvidia340 +10de0407 nvidia340 +10de0408 nvidia340 +10de0409 nvidia340 +10de040a nvidia340 +10de040b nvidia340 +10de040c nvidia340 +10de040d nvidia340 +10de040e nvidia340 +10de040f nvidia340 +10de0410 nvidia340 +10de0420 nvidia340 +10de0421 nvidia340 +10de0422 nvidia340 +10de0423 nvidia340 +10de0424 nvidia340 +10de0425 nvidia340 +10de0426 nvidia340 +10de0427 nvidia340 +10de0428 nvidia340 +10de0429 nvidia340 +10de042a nvidia340 +10de042b nvidia340 +10de042c nvidia340 +10de042d nvidia340 +10de042e nvidia340 +10de042f nvidia340 +10de05e0 nvidia340 +10de05e1 nvidia340 +10de05e2 nvidia340 +10de05e3 nvidia340 +10de05e6 nvidia340 +10de05e7 nvidia340 +10de05ea nvidia340 +10de05eb nvidia340 +10de05ed nvidia340 +10de05f8 nvidia340 +10de05f9 nvidia340 +10de05fd nvidia340 +10de05fe nvidia340 +10de05ff nvidia340 +10de0600 nvidia340 +10de0601 nvidia340 +10de0602 nvidia340 +10de0603 nvidia340 +10de0604 nvidia340 +10de0605 nvidia340 +10de0606 nvidia340 +10de0607 nvidia340 +10de0608 nvidia340 +10de0609 nvidia340 +10de0609 nvidia340 +10de060a nvidia340 +10de060b nvidia340 +10de060c nvidia340 +10de060d nvidia340 +10de060f nvidia340 +10de0610 nvidia340 +10de0611 nvidia340 +10de0612 nvidia340 +10de0613 nvidia340 +10de0614 nvidia340 +10de0615 nvidia340 +10de0617 nvidia340 +10de0618 nvidia340 +10de0619 nvidia340 +10de061a nvidia340 +10de061b nvidia340 +10de061c nvidia340 +10de061d nvidia340 +10de061e nvidia340 +10de061f nvidia340 +10de0621 nvidia340 +10de0622 nvidia340 +10de0623 nvidia340 +10de0625 nvidia340 +10de0626 nvidia340 +10de0627 nvidia340 +10de0628 nvidia340 +10de062a nvidia340 +10de062b nvidia340 +10de062c nvidia340 +10de062d nvidia340 +10de062e nvidia340 +10de0630 nvidia340 +10de0631 nvidia340 +10de0632 nvidia340 +10de0635 nvidia340 +10de0637 nvidia340 +10de0638 nvidia340 +10de063a nvidia340 +10de0640 nvidia340 +10de0641 nvidia340 +10de0643 nvidia340 +10de0644 nvidia340 +10de0645 nvidia340 +10de0646 nvidia340 +10de0647 nvidia340 +10de0648 nvidia340 +10de0649 nvidia340 +10de0649 nvidia340 +10de064a nvidia340 +10de064b nvidia340 +10de064c nvidia340 +10de0651 nvidia340 +10de0652 nvidia340 +10de0652 nvidia340 +10de0653 nvidia340 +10de0654 nvidia340 +10de0654 nvidia340 +10de0654 nvidia340 +10de0655 nvidia340 +10de0656 nvidia340 +10de0658 nvidia340 +10de0659 nvidia340 +10de065a nvidia340 +10de065b nvidia340 +10de065c nvidia340 +10de06e0 nvidia340 +10de06e1 nvidia340 +10de06e2 nvidia340 +10de06e3 nvidia340 +10de06e4 nvidia340 +10de06e5 nvidia340 +10de06e6 nvidia340 +10de06e7 nvidia340 +10de06e8 nvidia340 +10de06e8 nvidia340 +10de06e9 nvidia340 +10de06ea nvidia340 +10de06eb nvidia340 +10de06ec nvidia340 +10de06ef nvidia340 +10de06f1 nvidia340 +10de06f8 nvidia340 +10de06f9 nvidia340 +10de06f9 nvidia340 +10de06fa nvidia340 +10de06fb nvidia340 +10de06fd nvidia340 +10de06ff nvidia340 +10de06ff nvidia340 +10de0840 nvidia340 +10de0844 nvidia340 +10de0845 nvidia340 +10de0846 nvidia340 +10de0847 nvidia340 +10de0848 nvidia340 +10de0849 nvidia340 +10de084a nvidia340 +10de084b nvidia340 +10de084c nvidia340 +10de084d nvidia340 +10de084f nvidia340 +10de0860 nvidia340 +10de0861 nvidia340 +10de0862 nvidia340 +10de0863 nvidia340 +10de0864 nvidia340 +10de0865 nvidia340 +10de0866 nvidia340 +10de0866 nvidia340 +10de0867 nvidia340 +10de0868 nvidia340 +10de0869 nvidia340 +10de086a nvidia340 +10de086c nvidia340 +10de086d nvidia340 +10de086e nvidia340 +10de086f nvidia340 +10de0870 nvidia340 +10de0871 nvidia340 +10de0872 nvidia340 +10de0873 nvidia340 +10de0873 nvidia340 +10de0874 nvidia340 +10de0876 nvidia340 +10de087a nvidia340 +10de087d nvidia340 +10de087e nvidia340 +10de087f nvidia340 +10de08a0 nvidia340 +10de08a2 nvidia340 +10de08a3 nvidia340 +10de08a4 nvidia340 +10de08a5 nvidia340 +10de0a20 nvidia340 +10de0a22 nvidia340 +10de0a23 nvidia340 +10de0a26 nvidia340 +10de0a27 nvidia340 +10de0a28 nvidia340 +10de0a29 nvidia340 +10de0a2a nvidia340 +10de0a2b nvidia340 +10de0a2c nvidia340 +10de0a2d nvidia340 +10de0a32 nvidia340 +10de0a34 nvidia340 +10de0a35 nvidia340 +10de0a38 nvidia340 +10de0a3c nvidia340 +10de0a60 nvidia340 +10de0a62 nvidia340 +10de0a63 nvidia340 +10de0a64 nvidia340 +10de0a65 nvidia340 +10de0a66 nvidia340 +10de0a67 nvidia340 +10de0a68 nvidia340 +10de0a69 nvidia340 +10de0a6a nvidia340 +10de0a6c nvidia340 +10de0a6e nvidia340 +10de0a6f nvidia340 +10de0a70 nvidia340 +10de0a70 nvidia340 +10de0a70 nvidia340 +10de0a71 nvidia340 +10de0a72 nvidia340 +10de0a73 nvidia340 +10de0a74 nvidia340 +10de0a74 nvidia340 +10de0a75 nvidia340 +10de0a75 nvidia340 +10de0a76 nvidia340 +10de0a78 nvidia340 +10de0a7a nvidia340 +10de0a7c nvidia340 +10de0ca0 nvidia340 +10de0ca2 nvidia340 +10de0ca3 nvidia340 +10de0ca4 nvidia340 +10de0ca5 nvidia340 +10de0ca7 nvidia340 +10de0ca8 nvidia340 +10de0ca9 nvidia340 +10de0cac nvidia340 +10de0caf nvidia340 +10de0cb0 nvidia340 +10de0cb1 nvidia340 +10de0cbc nvidia340 +10de10c0 nvidia340 +10de10c3 nvidia340 +10de10c5 nvidia340 +10de10d8 nvidia340 +10de06c0 nvidia-current +10de06c4 nvidia-current +10de06ca nvidia-current +10de06cd nvidia-current +10de0dc0 nvidia-current +10de0dc4 nvidia-current +10de0dc5 nvidia-current +10de0dc6 nvidia-current +10de0dcd nvidia-current +10de0dce nvidia-current +10de0dd1 nvidia-current +10de0dd2 nvidia-current +10de0dd3 nvidia-current +10de0dd6 nvidia-current +10de0de0 nvidia-current +10de0de1 nvidia-current +10de0de2 nvidia-current +10de0de3 nvidia-current +10de0de4 nvidia-current +10de0de5 nvidia-current +10de0de7 nvidia-current +10de0de8 nvidia-current +10de0de9 nvidia-current +10de0dea nvidia-current +10de0deb nvidia-current +10de0dec nvidia-current +10de0ded nvidia-current +10de0dee nvidia-current +10de0df0 nvidia-current +10de0df1 nvidia-current +10de0df2 nvidia-current +10de0df3 nvidia-current +10de0df4 nvidia-current +10de0df4 nvidia-current +10de0df4 nvidia-current +10de0df5 nvidia-current +10de0df6 nvidia-current +10de0df7 nvidia-current +10de0e22 nvidia-current +10de0e23 nvidia-current +10de0e24 nvidia-current +10de0e30 nvidia-current +10de0e31 nvidia-current +10de0f00 nvidia-current +10de0f01 nvidia-current +10de0f02 nvidia-current +10de0fc0 nvidia-current +10de0fc1 nvidia-current +10de0fc2 nvidia-current +10de0fc6 nvidia-current +10de0fc8 nvidia-current +10de0fcd nvidia-current +10de0fce nvidia-current +10de0fd1 nvidia-current +10de0fd2 nvidia-current +10de0fd3 nvidia-current +10de0fd4 nvidia-current +10de0fd5 nvidia-current +10de0fd8 nvidia-current +10de0fd9 nvidia-current +10de0fdf nvidia-current +10de0fe0 nvidia-current +10de0fe1 nvidia-current +10de0fe2 nvidia-current +10de0fe3 nvidia-current +10de0fe3 nvidia-current +10de0fe4 nvidia-current +10de0fe9 nvidia-current +10de0fea nvidia-current +10de1001 nvidia-current +10de1004 nvidia-current +10de1005 nvidia-current +10de1007 nvidia-current +10de1008 nvidia-current +10de100a nvidia-current +10de100c nvidia-current +10de1040 nvidia-current +10de1042 nvidia-current +10de1048 nvidia-current +10de1049 nvidia-current +10de104a nvidia-current +10de104b nvidia-current +10de104c nvidia-current +10de1050 nvidia-current +10de1051 nvidia-current +10de1052 nvidia-current +10de1054 nvidia-current +10de1055 nvidia-current +10de1058 nvidia-current +10de1059 nvidia-current +10de105a nvidia-current +10de105b nvidia-current +10de105b nvidia-current +10de1080 nvidia-current +10de1081 nvidia-current +10de1082 nvidia-current +10de1084 nvidia-current +10de1086 nvidia-current +10de1087 nvidia-current +10de1088 nvidia-current +10de1089 nvidia-current +10de108b nvidia-current +10de1140 nvidia-current +10de1180 nvidia-current +10de1183 nvidia-current +10de1184 nvidia-current +10de1185 nvidia-current +10de1185 nvidia-current +10de1187 nvidia-current +10de1188 nvidia-current +10de1189 nvidia-current +10de118e nvidia-current +10de1193 nvidia-current +10de1195 nvidia-current +10de1198 nvidia-current +10de1199 nvidia-current +10de1199 nvidia-current +10de119a nvidia-current +10de119d nvidia-current +10de119e nvidia-current +10de119f nvidia-current +10de11a0 nvidia-current +10de11a1 nvidia-current +10de11a2 nvidia-current +10de11a3 nvidia-current +10de11a7 nvidia-current +10de11c0 nvidia-current +10de11c2 nvidia-current +10de11c3 nvidia-current +10de11c4 nvidia-current +10de11c6 nvidia-current +10de11c8 nvidia-current +10de11e0 nvidia-current +10de11e1 nvidia-current +10de11e2 nvidia-current +10de11e3 nvidia-current +10de1200 nvidia-current +10de1201 nvidia-current +10de1203 nvidia-current +10de1205 nvidia-current +10de1206 nvidia-current +10de1207 nvidia-current +10de1208 nvidia-current +10de1210 nvidia-current +10de1211 nvidia-current +10de1212 nvidia-current +10de1213 nvidia-current +10de1241 nvidia-current +10de1243 nvidia-current +10de1244 nvidia-current +10de1245 nvidia-current +10de1246 nvidia-current +10de1247 nvidia-current +10de1248 nvidia-current +10de1249 nvidia-current +10de124b nvidia-current +10de124d nvidia-current +10de124d nvidia-current +10de1251 nvidia-current +10de1280 nvidia-current +10de1281 nvidia-current +10de1282 nvidia-current +10de1284 nvidia-current +10de1286 nvidia-current +10de1287 nvidia-current +10de1290 nvidia-current +10de1290 nvidia-current +10de1291 nvidia-current +10de1292 nvidia-current +10de1293 nvidia-current +10de1296 nvidia-current +10de1298 nvidia-current +10de1340 nvidia-current +10de1340 nvidia-current +10de1341 nvidia-current +10de1380 nvidia-current +10de1381 nvidia-current +10de1382 nvidia-current +10de1390 nvidia-current +10de1391 nvidia-current +10de1392 nvidia-current +10de13c0 nvidia-current +10de13c2 nvidia-current +10de06d8 nvidia-current +10de06d9 nvidia-current +10de06da nvidia-current +10de06dc nvidia-current +10de06dd nvidia-current +10de0dd8 nvidia-current +10de0dda nvidia-current +10de0df8 nvidia-current +10de0df9 nvidia-current +10de0dfa nvidia-current +10de0e3a nvidia-current +10de0e3b nvidia-current +10de0ff3 nvidia-current +10de0ff6 nvidia-current +10de0ff8 nvidia-current +10de0ff9 nvidia-current +10de0ffa nvidia-current +10de0ffb nvidia-current +10de0ffc nvidia-current +10de0ffe nvidia-current +10de0fff nvidia-current +10de103a nvidia-current +10de103c nvidia-current +10de109a nvidia-current +10de109b nvidia-current +10de11b4 nvidia-current +10de11b6 nvidia-current +10de11b7 nvidia-current +10de11b8 nvidia-current +10de11ba nvidia-current +10de11bc nvidia-current +10de11bd nvidia-current +10de11be nvidia-current +10de11fa nvidia-current +10de11fc nvidia-current +10de12b9 nvidia-current +10de12ba nvidia-current +10de13ba nvidia-current +10de13bb nvidia-current +10de0def nvidia-current +10de0dfc nvidia-current +10de0ffd nvidia-current +10de1056 nvidia-current +10de1057 nvidia-current +10de107c nvidia-current +10de107d nvidia-current +10de06d1 nvidia-current +10de06d2 nvidia-current +10de06de nvidia-current +10de06df nvidia-current +10de1021 nvidia-current +10de1022 nvidia-current +10de1023 nvidia-current +10de1024 nvidia-current +10de1026 nvidia-current +10de1027 nvidia-current +10de1028 nvidia-current +10de1029 nvidia-current +10de1091 nvidia-current +10de1094 nvidia-current +10de1096 nvidia-current +10de118f nvidia-current +10de0fef nvidia-current +10de0ff2 nvidia-current +10de118a nvidia-current +10de11bf nvidia-current \ No newline at end of file diff --git a/x11/sever/xorg-server/files/default-module-path.patch b/x11/sever/xorg-server/files/default-module-path.patch new file mode 100644 index 0000000000..8cb4cc3c74 --- /dev/null +++ b/x11/sever/xorg-server/files/default-module-path.patch @@ -0,0 +1,13 @@ +Index: xorg-server-1.9.0/hw/xfree86/common/xf86Globals.c +=================================================================== +--- xorg-server-1.9.0.orig/hw/xfree86/common/xf86Globals.c ++++ xorg-server-1.9.0/hw/xfree86/common/xf86Globals.c +@@ -140,7 +140,7 @@ xf86InfoRec xf86Info = { + }; + const char *xf86ConfigFile = NULL; + const char *xf86ConfigDir = NULL; +-const char *xf86ModulePath = DEFAULT_MODULE_PATH; ++const char *xf86ModulePath = DEFAULT_MODULE_PATH "/updates," DEFAULT_MODULE_PATH "/volatile," DEFAULT_MODULE_PATH; + MessageType xf86ModPathFrom = X_DEFAULT; + const char *xf86LogFile = DEFAULT_LOGPREFIX; + MessageType xf86LogFileFrom = X_DEFAULT; diff --git a/x11/sever/xorg-server/files/fedora/0001-pixmap-fix-reverse-optimus-support-with-multiple-hea.patch b/x11/sever/xorg-server/files/fedora/0001-pixmap-fix-reverse-optimus-support-with-multiple-hea.patch new file mode 100755 index 0000000000..366cc2df7c --- /dev/null +++ b/x11/sever/xorg-server/files/fedora/0001-pixmap-fix-reverse-optimus-support-with-multiple-hea.patch @@ -0,0 +1,99 @@ +From 4b281c11423b7bac8f0265e650a3e7ff890081bc Mon Sep 17 00:00:00 2001 +From: Dave Airlie +Date: Tue, 30 Jul 2013 13:48:04 +1000 +Subject: [PATCH] pixmap: fix reverse optimus support with multiple heads + +For doing reverese optimus to multiple outputs on a secondary GPU +the GPU can store the blits into a large screen pixmap, unfortunately +this means we need a destination offset into the dirty code, so +add a new API that just adds this interface. + +Signed-off-by: Dave Airlie +--- + dix/pixmap.c | 18 ++++++++++++++---- + include/pixmap.h | 6 ++++++ + include/pixmapstr.h | 1 + + 3 files changed, 21 insertions(+), 4 deletions(-) + +diff --git a/dix/pixmap.c b/dix/pixmap.c +index fe92147..e01d961 100644 +--- a/dix/pixmap.c ++++ b/dix/pixmap.c +@@ -164,9 +164,9 @@ PixmapPtr PixmapShareToSlave(PixmapPtr pixmap, ScreenPtr slave) + } + + Bool +-PixmapStartDirtyTracking(PixmapPtr src, +- PixmapPtr slave_dst, +- int x, int y) ++PixmapStartDirtyTracking2(PixmapPtr src, ++ PixmapPtr slave_dst, ++ int x, int y, int dst_x, int dst_y) + { + ScreenPtr screen = src->drawable.pScreen; + PixmapDirtyUpdatePtr dirty_update; +@@ -179,6 +179,8 @@ PixmapStartDirtyTracking(PixmapPtr src, + dirty_update->slave_dst = slave_dst; + dirty_update->x = x; + dirty_update->y = y; ++ dirty_update->dst_x = dst_x; ++ dirty_update->dst_y = dst_y; + + dirty_update->damage = DamageCreate(NULL, NULL, + DamageReportNone, +@@ -195,6 +197,14 @@ PixmapStartDirtyTracking(PixmapPtr src, + } + + Bool ++PixmapStartDirtyTracking(PixmapPtr src, ++ PixmapPtr slave_dst, ++ int x, int y) ++{ ++ return PixmapStartDirtyTracking2(src, slave_dst, x, y, 0, 0); ++} ++ ++Bool + PixmapStopDirtyTracking(PixmapPtr src, PixmapPtr slave_dst) + { + ScreenPtr screen = src->drawable.pScreen; +@@ -262,7 +272,7 @@ Bool PixmapSyncDirtyHelper(PixmapDirtyUpdatePtr dirty, RegionPtr dirty_region) + h = dst_box.y2 - dst_box.y1; + + pGC->ops->CopyArea(&dirty->src->drawable, &dst->drawable, pGC, +- dirty->x + dst_box.x1, dirty->y + dst_box.y1, w, h, dst_box.x1, dst_box.y1); ++ dirty->x + dst_box.x1, dirty->y + dst_box.y1, w, h, dirty->dst_x + dst_box.x1, dirty->dst_y + dst_box.y1); + b++; + } + FreeScratchGC(pGC); +diff --git a/include/pixmap.h b/include/pixmap.h +index 921a94d..d7d0a5e 100644 +--- a/include/pixmap.h ++++ b/include/pixmap.h +@@ -120,6 +120,12 @@ PixmapStartDirtyTracking(PixmapPtr src, + PixmapPtr slave_dst, + int x, int y); + ++#define HAS_DIRTYTRACKING2 1 ++extern _X_EXPORT Bool ++PixmapStartDirtyTracking2(PixmapPtr src, ++ PixmapPtr slave_dst, ++ int x, int y, int dst_x, int dst_y); ++ + extern _X_EXPORT Bool + PixmapStopDirtyTracking(PixmapPtr src, PixmapPtr slave_dst); + +diff --git a/include/pixmapstr.h b/include/pixmapstr.h +index 2a1ef9b..2bdff98 100644 +--- a/include/pixmapstr.h ++++ b/include/pixmapstr.h +@@ -90,6 +90,7 @@ typedef struct _PixmapDirtyUpdate { + int x, y; + DamagePtr damage; + struct xorg_list ent; ++ int dst_x, dst_y; + } PixmapDirtyUpdateRec; + + static inline void +-- +1.8.2.1 + diff --git a/x11/sever/xorg-server/files/fedora/10-quirks.conf b/x11/sever/xorg-server/files/fedora/10-quirks.conf new file mode 100755 index 0000000000..47907d82de --- /dev/null +++ b/x11/sever/xorg-server/files/fedora/10-quirks.conf @@ -0,0 +1,38 @@ +# Collection of quirks and blacklist/whitelists for specific devices. + + +# Accelerometer device, posts data through ABS_X/ABS_Y, making X unusable +# http://bugs.freedesktop.org/show_bug.cgi?id=22442 +Section "InputClass" + Identifier "ThinkPad HDAPS accelerometer blacklist" + MatchProduct "ThinkPad HDAPS accelerometer data" + Option "Ignore" "on" +EndSection + +# https://bugzilla.redhat.com/show_bug.cgi?id=523914 +# Mouse does not move in PV Xen guest +# Explicitly tell evdev to not ignore the absolute axes. +Section "InputClass" + Identifier "Xen Virtual Pointer axis blacklist" + MatchProduct "Xen Virtual Pointer" + Option "IgnoreAbsoluteAxes" "off" + Option "IgnoreRelativeAxes" "off" +EndSection + +# https://bugs.freedesktop.org/show_bug.cgi?id=55867 +# Bug 55867 - Doesn't know how to tag XI_TRACKBALL +Section "InputClass" + Identifier "Tag trackballs as XI_TRACKBALL" + MatchProduct "trackball" + MatchDriver "evdev" + Option "TypeName" "TRACKBALL" +EndSection + +# https://bugs.freedesktop.org/show_bug.cgi?id=62831 +# Bug 62831 - Mionix Naos 5000 mouse detected incorrectly +Section "InputClass" + Identifier "Tag Mionix Naos 5000 mouse XI_MOUSE" + MatchProduct "La-VIEW Technology Naos 5000 Mouse" + MatchDriver "evdev" + Option "TypeName" "MOUSE" +EndSection diff --git a/x11/sever/xorg-server/files/ubuntu/001_fedora_extramodes.patch b/x11/sever/xorg-server/files/ubuntu/001_fedora_extramodes.patch new file mode 100644 index 0000000000..77005b2717 --- /dev/null +++ b/x11/sever/xorg-server/files/ubuntu/001_fedora_extramodes.patch @@ -0,0 +1,83 @@ +From: Adam Jackson +Date: Sun, 28 Oct 2007 09:37:52 +0100 +Subject: [PATCH] Fedora extra modes list + +--- +--- a/hw/xfree86/common/extramodes ++++ b/hw/xfree86/common/extramodes +@@ -3,16 +3,75 @@ + // + // $XFree86: xc/programs/Xserver/hw/xfree86/etc/extramodes,v 1.5 2002/06/05 19:43:05 dawes Exp $ + // ++// NOTE: Please keep all video modes sorted in order of X res, then Y res for ++// ease of maintenance and readability. + + # 832x624 @ 75Hz (74.55Hz) (fix if the official/Apple spec is different) hsync: 49.725kHz + ModeLine "832x624" 57.284 832 864 928 1152 624 625 628 667 -Hsync -Vsync + ++# 1152x864 @ 60.00 Hz (GTF) hsync: 53.70 kHz; pclk: 81.62 MHz ++Modeline "1152x864" 81.62 1152 1216 1336 1520 864 865 868 895 -HSync +Vsync ++ ++# 1152x864 @ 70.00 Hz (GTF) hsync: 63.00 kHz; pclk: 96.77 MHz ++Modeline "1152x864" 96.77 1152 1224 1344 1536 864 865 868 900 -HSync +Vsync ++ ++# 1152x864 @ 75.00 Hz (GTF) hsync: 67.65 kHz; pclk: 104.99 MHz ++Modeline "1152x864" 104.99 1152 1224 1352 1552 864 865 868 902 -HSync +Vsync ++ ++# 1152x864 @ 85.00 Hz (GTF) hsync: 77.10 kHz; pclk: 119.65 MHz ++Modeline "1152x864" 119.65 1152 1224 1352 1552 864 865 868 907 -HSync +Vsync ++ ++# 1152x864 @ 85Hz (Red Hat custom modeline) ++ModeLine "1152x864" 121.5 1152 1216 1344 1568 864 865 868 911 +hsync -vsync ++ ++# 1152x864 @ 100.00 Hz (GTF) hsync: 91.50 kHz; pclk: 143.47 MHz ++Modeline "1152x864" 143.47 1152 1232 1360 1568 864 865 868 915 -HSync +Vsync ++ ++# 1360x768 59.96 Hz (CVT) hsync: 47.37 kHz; pclk: 72.00 MHz ++Modeline "1360x768" 72.00 1360 1408 1440 1520 768 771 781 790 +hsync -vsync ++ ++# 1360x768 59.80 Hz (CVT) hsync: 47.72 kHz; pclk: 84.75 MHz ++Modeline "1360x768" 84.75 1360 1432 1568 1776 768 771 781 798 -hsync +vsync ++ + # 1400x1050 @ 60Hz (VESA GTF) hsync: 65.5kHz + ModeLine "1400x1050" 122.0 1400 1488 1640 1880 1050 1052 1064 1082 +hsync +vsync + ++# 1400x1050 @ 70.00 Hz (GTF) hsync: 76.51 kHz; pclk: 145.06 MHz ++Modeline "1400x1050" 145.06 1400 1496 1648 1896 1050 1051 1054 1093 -HSync +Vsync ++ + # 1400x1050 @ 75Hz (VESA GTF) hsync: 82.2kHz + ModeLine "1400x1050" 155.8 1400 1464 1784 1912 1050 1052 1064 1090 +hsync +vsync + ++# 1400x1050 @ 85.00 Hz (GTF) hsync: 93.76 kHz; pclk: 179.26 MHz ++Modeline "1400x1050" 179.26 1400 1504 1656 1912 1050 1051 1054 1103 -HSync +Vsync ++ ++# 1440x900 @ 60.00 Hz (CVT) field rate 59.89 Hz; hsync: 55.93 kHz; pclk: 106.50 MHz ++Modeline "1440x900" 106.50 1440 1520 1672 1904 900 903 909 934 -HSync +Vsync ++ ++# 1600x1024 for SGI 1600 SW ++ModeLine "1600x1024" 103.125 1600 1600 1656 1664 1024 1024 1029 1030 +Hsync +Vsync ++ ++# 1680x1050 59.88 Hz (CVT 1.76MA-R) hsync: 64.67 kHz; pclk: 119.00 MHz ++Modeline "1680x1050" 119.00 1680 1728 1760 1840 1050 1053 1059 1080 +hsync -vsync ++ ++# 1680x1050 59.95 Hz (CVT 1.76MA) hsync: 65.29 kHz; pclk: 146.25 MHz ++Modeline "1680x1050" 146.25 1680 1784 1960 2240 1050 1053 1059 1089 -hsync +vsync ++ ++# 1680x1050 69.88 Hz (CVT) hsync: 76.58 kHz; pclk: 174.00 MHz ++Modeline "1680x1050" 174.00 1680 1800 1976 2272 1050 1053 1059 1096 -hsync +vsync ++ ++# 1680x1050 74.89 Hz (CVT 1.76MA) hsync: 82.31 kHz; pclk: 187.00 MHz ++Modeline "1680x1050" 187.00 1680 1800 1976 2272 1050 1053 1059 1099 -hsync +vsync ++ ++# 1680x1050 84.94 Hz (CVT 1.76MA) hsync: 93.86 kHz; pclk: 214.75 MHz ++Modeline "1680x1050" 214.75 1680 1808 1984 2288 1050 1053 1059 1105 -hsync +vsync ++ ++# 1920x1080 59.93 Hz (CVT 2.07M9-R) hsync: 66.59 kHz; pclk: 138.50 MHz ++Modeline "1920x1080" 138.50 1920 1968 2000 2080 1080 1083 1088 1111 +hsync -vsync ++ ++# 1920x1200 59.95 Hz (CVT 2.30MA-R) hsync: 74.04 kHz; pclk: 154.00 MHz ++Modeline "1920x1200" 154.00 1920 1968 2000 2080 1200 1203 1209 1235 +hsync -vsync ++ + # 1920x1440 @ 85Hz (VESA GTF) hsync: 128.5kHz + Modeline "1920x1440" 341.35 1920 2072 2288 2656 1440 1441 1444 1512 -hsync +vsync + diff --git a/x11/sever/xorg-server/files/ubuntu/03_static-nettle.diff b/x11/sever/xorg-server/files/ubuntu/03_static-nettle.diff new file mode 100644 index 0000000000..4a48338caf --- /dev/null +++ b/x11/sever/xorg-server/files/ubuntu/03_static-nettle.diff @@ -0,0 +1,17 @@ +Link against static libnettle + +There's no libnettle udeb. + +Index: xorg-server/configure.ac +=================================================================== +--- xorg-server.orig/configure.ac 2013-08-02 20:15:25.471466837 +0200 ++++ xorg-server/configure.ac 2013-08-02 20:17:12.875999417 +0200 +@@ -1433,7 +1433,7 @@ + if test "x$with_sha1" = xlibnettle; then + AC_DEFINE([HAVE_SHA1_IN_LIBNETTLE], [1], + [Use libnettle SHA1 functions]) +- SHA1_LIBS=-lnettle ++ SHA1_LIBS=-l:libnettle.a + fi + AC_CHECK_LIB([gcrypt], [gcry_md_open], [HAVE_LIBGCRYPT=yes]) + if test "x$with_sha1" = x && test "x$HAVE_LIBGCRYPT" = xyes; then diff --git a/x11/sever/xorg-server/files/ubuntu/05_Revert-Unload-submodules.diff b/x11/sever/xorg-server/files/ubuntu/05_Revert-Unload-submodules.diff new file mode 100644 index 0000000000..1cc8ff865c --- /dev/null +++ b/x11/sever/xorg-server/files/ubuntu/05_Revert-Unload-submodules.diff @@ -0,0 +1,28 @@ +From 272537ae14a04911fcf2fec51492fa0f91c4a676 Mon Sep 17 00:00:00 2001 +From: Julien Cristau +Date: Wed, 29 Aug 2012 20:16:40 +0200 +Subject: [PATCH] Revert "Unload submodules." + +This reverts commit 0d4bb5442ceb8e8e4a8de6cfc4203cae469eee72. + +This doesn't seem to work quite well. See Debian bug#686152. +--- + hw/xfree86/common/xf86Helper.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +--- a/hw/xfree86/common/xf86Helper.c ++++ b/hw/xfree86/common/xf86Helper.c +@@ -1596,7 +1596,13 @@ xf86LoadOneModule(char *name, pointer op + void + xf86UnloadSubModule(pointer mod) + { ++ /* ++ * This is disabled for now. The loader isn't smart enough yet to undo ++ * relocations. ++ */ ++#if 0 + UnloadSubModule(mod); ++#endif + } + + Bool diff --git a/x11/sever/xorg-server/files/ubuntu/06_Revert-fb-reorder-Bresenham-error-correction-to-avoi.diff b/x11/sever/xorg-server/files/ubuntu/06_Revert-fb-reorder-Bresenham-error-correction-to-avoi.diff new file mode 100644 index 0000000000..c3a6e509aa --- /dev/null +++ b/x11/sever/xorg-server/files/ubuntu/06_Revert-fb-reorder-Bresenham-error-correction-to-avoi.diff @@ -0,0 +1,68 @@ +From 10aaa5d2ffa62df99f03c857dc78e6ff2b33c183 Mon Sep 17 00:00:00 2001 +From: Julien Cristau +Date: Sun, 30 Sep 2012 12:02:11 +0200 +Subject: [PATCH] Revert "fb: reorder Bresenham error correction to avoid + overshoot." + +This reverts commit 3e62f48edf47a59d923ac58b6d4262b02456a556. + +Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=54168 +Debian: http://buss.debian.org/688908 + +Signed-off-by: Julien Cristau +--- + fb/fbseg.c | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +diff --git a/fb/fbseg.c b/fb/fbseg.c +index 1848387..0e4e0a9 100644 +--- a/fb/fbseg.c ++++ b/fb/fbseg.c +@@ -65,12 +65,6 @@ fbBresSolid(DrawablePtr pDrawable, + if (axis == X_AXIS) { + bits = 0; + while (len--) { +- if (e >= 0) { +- WRITE(dst, FbDoMaskRRop (READ(dst), and, xor, bits)); +- bits = 0; +- dst += dstStride; +- e += e3; +- } + bits |= mask; + mask = fbBresShiftMask(mask, signdx, dstBpp); + if (!mask) { +@@ -80,12 +74,21 @@ fbBresSolid(DrawablePtr pDrawable, + mask = mask0; + } + e += e1; ++ if (e >= 0) { ++ WRITE(dst, FbDoMaskRRop(READ(dst), and, xor, bits)); ++ bits = 0; ++ dst += dstStride; ++ e += e3; ++ } + } + if (bits) + WRITE(dst, FbDoMaskRRop(READ(dst), and, xor, bits)); + } + else { + while (len--) { ++ WRITE(dst, FbDoMaskRRop(READ(dst), and, xor, mask)); ++ dst += dstStride; ++ e += e1; + if (e >= 0) { + e += e3; + mask = fbBresShiftMask(mask, signdx, dstBpp); +@@ -94,9 +97,6 @@ fbBresSolid(DrawablePtr pDrawable, + mask = mask0; + } + } +- WRITE(dst, FbDoMaskRRop(READ(dst), and, xor, mask)); +- dst += dstStride; +- e += e1; + } + } + +-- +1.7.10.4 + diff --git a/x11/sever/xorg-server/files/ubuntu/105_nvidia_fglrx_autodetect.patch b/x11/sever/xorg-server/files/ubuntu/105_nvidia_fglrx_autodetect.patch new file mode 100644 index 0000000000..1d08205394 --- /dev/null +++ b/x11/sever/xorg-server/files/ubuntu/105_nvidia_fglrx_autodetect.patch @@ -0,0 +1,53 @@ +diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c +index 43c746b..750b425 100644 +--- a/hw/xfree86/common/xf86AutoConfig.c ++++ b/hw/xfree86/common/xf86AutoConfig.c +@@ -75,6 +75,13 @@ + "\tDevice\t" BUILTIN_DEVICE_NAME "\n" \ + "EndSection\n\n" + ++#define BUILTIN_SCREEN_SECTION_PROPRIETARY \ ++ "Section \"Screen\"\n" \ ++ "\tIdentifier\t" BUILTIN_SCREEN_NAME "\n" \ ++ "\tDevice\t" BUILTIN_DEVICE_NAME "\n" \ ++ "\tDefaultDepth\t24\n" \ ++ "EndSection\n\n" ++ + #define BUILTIN_LAYOUT_SECTION_PRE \ + "Section \"ServerLayout\"\n" \ + "\tIdentifier\t\"Builtin Default Layout\"\n" +@@ -153,7 +160,11 @@ xf86AutoConfig(void) + for (p = deviceList; *p; p++) { + snprintf(buf, sizeof(buf), BUILTIN_DEVICE_SECTION, *p, 0, *p); + AppendToConfig(buf); +- snprintf(buf, sizeof(buf), BUILTIN_SCREEN_SECTION, *p, 0, *p, 0); ++ if (strcmp(*p, "fglrx") == 0 || strcmp(*p, "nvidia") == 0) ++ snprintf(buf, sizeof(buf), BUILTIN_SCREEN_SECTION_PROPRIETARY, *p, ++ 0, *p, 0); ++ else ++ snprintf(buf, sizeof(buf), BUILTIN_SCREEN_SECTION, *p, 0, *p, 0); + AppendToConfig(buf); + } + +diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c +index e52f1da..bd62a7e 100644 +--- a/hw/xfree86/common/xf86pciBus.c ++++ b/hw/xfree86/common/xf86pciBus.c +@@ -1107,7 +1107,8 @@ videoPtrToDriverList(struct pci_device *dev, + driverList[0] = "ast"; + break; + case 0x1002: +- driverList[0] = "ati"; ++ driverList[0] = "fglrx"; ++ driverList[1] = "ati"; + break; + case 0x102c: + driverList[0] = "chips"; +@@ -1143,6 +1144,7 @@ videoPtrToDriverList(struct pci_device *dev, + { + int idx = 0; + ++ driverList[idx++] = "nvidia"; + #ifdef __linux__ + driverList[idx++] = "nouveau"; + #endif diff --git a/x11/sever/xorg-server/files/ubuntu/10_Include-missing-selection-h.diff b/x11/sever/xorg-server/files/ubuntu/10_Include-missing-selection-h.diff new file mode 100644 index 0000000000..873b14e097 --- /dev/null +++ b/x11/sever/xorg-server/files/ubuntu/10_Include-missing-selection-h.diff @@ -0,0 +1,20 @@ +Description: Fix build failure with GCC 4.8 + This patches fixes the following build failure: + + ../../dix/window.c:887:5: error: implicit declaration of function 'DeleteWindowFromAnySelections' [-Werror=implicit-function-declaration] + + by including "selection.h", where the function is prototyped. + +Author: Gerardo Malazdrewicz +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=701372 +--- xorg-server-1.12.4/dix/window.c 2012-05-17 14:09:02.000000000 -0300 ++++ xorg-server-1.12.4.good/dix/window.c 2013-04-18 11:53:06.787521781 -0300 +@@ -131,6 +131,8 @@ + #include "xace.h" + #include "exevents.h" + ++#include "selection.h" ++ + #include /* must come after server includes */ + + /****** diff --git a/x11/sever/xorg-server/files/ubuntu/188_default_primary_to_first_busid.patch b/x11/sever/xorg-server/files/ubuntu/188_default_primary_to_first_busid.patch new file mode 100644 index 0000000000..99c33c0b56 --- /dev/null +++ b/x11/sever/xorg-server/files/ubuntu/188_default_primary_to_first_busid.patch @@ -0,0 +1,15 @@ +diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c +index e52f1da..462faa9 100644 +--- a/hw/xfree86/common/xf86pciBus.c ++++ b/hw/xfree86/common/xf86pciBus.c +@@ -135,8 +135,8 @@ xf86PciProbe(void) + } + else { + xf86Msg(X_NOTICE, +- "More than one possible primary device found\n"); +- primaryBus.type ^= (BusType) (-1); ++ "More than one possible primary device found. Using first one seen.\n"); ++ break; + } + } + } diff --git a/x11/sever/xorg-server/files/ubuntu/226_fall_back_to_autoconfiguration.patch b/x11/sever/xorg-server/files/ubuntu/226_fall_back_to_autoconfiguration.patch new file mode 100644 index 0000000000..70fa7e532c --- /dev/null +++ b/x11/sever/xorg-server/files/ubuntu/226_fall_back_to_autoconfiguration.patch @@ -0,0 +1,78 @@ +--- a/hw/xfree86/common/xf86Globals.c ++++ b/hw/xfree86/common/xf86Globals.c +@@ -161,6 +161,7 @@ + int xf86NumInputDrivers = 0; + int xf86NumScreens = 0; + int xf86NumGPUScreens = 0; ++Bool xf86AttemptedFallback = FALSE; + + const char *xf86VisualNames[] = { + "StaticGray", +--- a/hw/xfree86/common/xf86Init.c ++++ b/hw/xfree86/common/xf86Init.c +@@ -481,20 +481,34 @@ + free(optionlist); + } + ++ Fallback: + /* Load all driver modules specified in the config file */ + /* If there aren't any specified in the config file, autoconfig them */ + /* FIXME: Does not handle multiple active screen sections, but I'm not + * sure if we really want to handle that case*/ + configured_device = xf86ConfigLayout.screens->screen->device; +- if ((!configured_device) || (!configured_device->driver)) { ++ if (xf86AttemptedFallback) { ++ configured_device->driver = NULL; ++ if (!autoConfigDevice(configured_device)) { ++ xf86Msg(X_ERROR, "Auto configuration on fallback failed\n"); ++ return; ++ } ++ } ++ else if ((!configured_device) || (!configured_device->driver)) { + if (!autoConfigDevice(configured_device)) { + xf86Msg(X_ERROR, "Automatic driver configuration failed\n"); + return; + } + } + if ((modulelist = xf86DriverlistFromConfig())) { +- xf86LoadModules(modulelist, NULL); +- free(modulelist); ++ if (!xf86LoadModules(modulelist, NULL) && !xf86AttemptedFallback) { ++ free(modulelist); ++ xf86AttemptedFallback = TRUE; ++ goto Fallback; ++ } ++ else { ++ free(modulelist); ++ } + } + + /* Load all input driver modules specified in the config file. */ +@@ -554,8 +568,15 @@ + else + xf86Info.dontVTSwitch = TRUE; + +- if (xf86BusConfig() == FALSE) +- return; ++ if (xf86BusConfig() == FALSE) { ++ if (!xf86AttemptedFallback) { ++ xf86AttemptedFallback = TRUE; ++ goto Fallback; ++ } ++ else { ++ return; ++ } ++ } + + xf86PostProbe(); + +--- a/hw/xfree86/common/xf86Priv.h ++++ b/hw/xfree86/common/xf86Priv.h +@@ -89,6 +89,7 @@ + extern _X_EXPORT Bool xf86Resetting; + extern _X_EXPORT Bool xf86Initialising; + extern _X_EXPORT int xf86NumScreens; ++extern _X_EXPORT Bool xf86AttemptedFallback; + extern _X_EXPORT const char *xf86VisualNames[]; + extern _X_EXPORT int xf86Verbose; /* verbosity level */ + extern _X_EXPORT int xf86LogVerbose; /* log file verbosity level */ diff --git a/x11/sever/xorg-server/files/ubuntu/227_null_ptr_midispcur.patch b/x11/sever/xorg-server/files/ubuntu/227_null_ptr_midispcur.patch new file mode 100644 index 0000000000..4b26c161b8 --- /dev/null +++ b/x11/sever/xorg-server/files/ubuntu/227_null_ptr_midispcur.patch @@ -0,0 +1,15 @@ +diff --git a/mi/midispcur.c b/mi/midispcur.c +index 24b9a70..266c7e0 100644 +--- a/mi/midispcur.c ++++ b/mi/midispcur.c +@@ -466,6 +466,10 @@ miDCRestoreUnderCursor(DeviceIntPtr pDev, ScreenPtr pScreen, + GCPtr pGC; + + pBuffer = miGetDCDevice(pDev, pScreen); ++ ++ if (!pBuffer) ++ return FALSE; ++ + pSave = pBuffer->pSave; + + pWin = pScreen->root; diff --git a/x11/sever/xorg-server/files/ubuntu/228_autobind_gpu.patch b/x11/sever/xorg-server/files/ubuntu/228_autobind_gpu.patch new file mode 100644 index 0000000000..e950c9dff0 --- /dev/null +++ b/x11/sever/xorg-server/files/ubuntu/228_autobind_gpu.patch @@ -0,0 +1,111 @@ +From 37d51acb3b6a38af1717bfaa7925043c35bfb447 Mon Sep 17 00:00:00 2001 +From: Dave Airlie +Date: Fri, 17 Aug 2012 09:49:24 +1000 +Subject: [PATCH] autobind GPUs to the screen, (v3) + +this is racy and really not what we want for hotplug going forward, +but until DE support is in GNOME its probably for the best. + +v2: fix if config or slave config is NULL +v3: fix multi useful slaves +DO NOT UPSTREAM. +--- + hw/xfree86/common/xf86Init.c | 12 ++++++++++++ + hw/xfree86/common/xf86platformBus.c | 3 +++ + hw/xfree86/modes/xf86Crtc.c | 32 ++++++++++++++++++++++++++++++++ + 3 files changed, 47 insertions(+), 0 deletions(-) + +diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c +index d231ced..89629c1 100644 +--- a/hw/xfree86/common/xf86Init.c ++++ b/hw/xfree86/common/xf86Init.c +@@ -361,6 +361,16 @@ xf86CreateRootWindow(WindowPtr pWin) + return ret; + } + ++extern void xf86AutoConfigOutputDevice(ScrnInfoPtr pScrn, ScrnInfoPtr master); ++static void ++xf86AutoConfigOutputDevices(void) ++{ ++ int i; ++ ++ for (i = 0; i < xf86NumGPUScreens; i++) ++ xf86AutoConfigOutputDevice(xf86GPUScreens[i], xf86Screens[0]); ++} ++ + static void + InstallSignalHandlers(void) + { +@@ -926,6 +936,8 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv) + for (i = 0; i < xf86NumGPUScreens; i++) + AttachUnboundGPU(xf86Screens[0]->pScreen, xf86GPUScreens[i]->pScreen); + ++ xf86AutoConfigOutputDevices(); ++ + xf86VGAarbiterWrapFunctions(); + if (sigio_blocked) + OsReleaseSIGIO(); +diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c +index 0525e39..82fef32 100644 +--- a/hw/xfree86/common/xf86platformBus.c ++++ b/hw/xfree86/common/xf86platformBus.c +@@ -387,6 +387,8 @@ xf86platformProbeDev(DriverPtr drvp) + return foundScreen; + } + ++extern void xf86AutoConfigOutputDevice(ScrnInfoPtr pScrn, ScrnInfoPtr master); ++ + int + xf86platformAddDevice(int index) + { +@@ -446,6 +448,7 @@ xf86platformAddDevice(int index) + + /* attach unbound to 0 protocol screen */ + AttachUnboundGPU(xf86Screens[0]->pScreen, xf86GPUScreens[i]->pScreen); ++ xf86AutoConfigOutputDevice(xf86GPUScreens[i], xf86Screens[0]); + + return 0; + } +diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c +index 3011f13..34c1848 100644 +--- a/hw/xfree86/modes/xf86Crtc.c ++++ b/hw/xfree86/modes/xf86Crtc.c +@@ -3323,3 +3323,35 @@ xf86DetachAllCrtc(ScrnInfoPtr scrn) + crtc->x = crtc->y = 0; + } + } ++ ++ ++void xf86AutoConfigOutputDevice(ScrnInfoPtr pScrn, ScrnInfoPtr master) ++{ ++ RRProviderPtr master_provider; ++ xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(master); ++ xf86CrtcConfigPtr slave_config = XF86_CRTC_CONFIG_PTR(pScrn); ++ Bool unbound = FALSE; ++ ++ if (!config || !slave_config) ++ return; ++ ++ master_provider = config->randr_provider; ++ ++ if ((master->capabilities & RR_Capability_SinkOffload) && ++ pScrn->capabilities & RR_Capability_SourceOffload) { ++ /* source offload */ ++ ++ DetachUnboundGPU(pScrn->pScreen); ++ unbound = TRUE; ++ AttachOffloadGPU(master->pScreen, pScrn->pScreen); ++ slave_config->randr_provider->offload_sink = master_provider; ++ } ++ if ((master->capabilities & RR_Capability_SourceOutput) && ++ pScrn->capabilities & RR_Capability_SinkOutput) { ++ /* sink offload */ ++ if (!unbound) ++ DetachUnboundGPU(pScrn->pScreen); ++ AttachOutputGPU(master->pScreen, pScrn->pScreen); ++ slave_config->randr_provider->output_source = master_provider; ++ } ++} +-- +1.8.1 + diff --git a/x11/sever/xorg-server/files/ubuntu/include-selection-h.patch b/x11/sever/xorg-server/files/ubuntu/include-selection-h.patch new file mode 100644 index 0000000000..e145c362c3 --- /dev/null +++ b/x11/sever/xorg-server/files/ubuntu/include-selection-h.patch @@ -0,0 +1,12 @@ +diff --git a/dix/window.c b/dix/window.c +index 49ef4a0..5b87238 100644 +--- a/dix/window.c ++++ b/dix/window.c +@@ -110,6 +110,7 @@ Equipment Corporation. + #include "input.h" + #include "inputstr.h" + #include "resource.h" ++#include "selection.h" + #include "colormapst.h" + #include "cursorstr.h" + #include "dixstruct.h" diff --git a/x11/sever/xorg-server/files/ubuntu/no-nv.patch b/x11/sever/xorg-server/files/ubuntu/no-nv.patch new file mode 100644 index 0000000000..4fb23e78bf --- /dev/null +++ b/x11/sever/xorg-server/files/ubuntu/no-nv.patch @@ -0,0 +1,24 @@ +commit b770266fa9c3fab5374bdf109676e0b129ac4546 +Author: Bryce Harrington +Date: Wed Apr 3 13:36:20 2013 -0700 + + Don't bother probing -nv on linux. + + For linux this driver is long obsolete now. It may have some relevance + on non-linux systems. + +diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c +index b2545be..73a662d 100644 +--- a/hw/xfree86/common/xf86pciBus.c ++++ b/hw/xfree86/common/xf86pciBus.c +@@ -1220,8 +1220,9 @@ xf86VideoPtrToDriverList(struct pci_device *dev, + driverList[idx++] = "nvidia"; + #ifdef __linux__ + driverList[idx++] = "nouveau"; +-#endif ++#else + driverList[idx++] = "nv"; ++#endif + break; + } + case 0x1106: diff --git a/x11/sever/xorg-server/files/ubuntu/xf86-inactive-gpuscreen.patch b/x11/sever/xorg-server/files/ubuntu/xf86-inactive-gpuscreen.patch new file mode 100644 index 0000000000..11ffec493a --- /dev/null +++ b/x11/sever/xorg-server/files/ubuntu/xf86-inactive-gpuscreen.patch @@ -0,0 +1,26 @@ +diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c +index c790d50..a47c2d0 100644 +--- a/hw/xfree86/common/xf86platformBus.c ++++ b/hw/xfree86/common/xf86platformBus.c +@@ -387,7 +387,7 @@ xf86platformProbeDev(DriverPtr drvp) + Bool foundScreen = FALSE; + GDevPtr *devList; + const unsigned numDevs = xf86MatchDevice(drvp->driverName, &devList); +- int i, j; ++ int i, j, flags; + + /* find the main device or any device specificed in xorg.conf */ + for (i = 0; i < numDevs; i++) { +@@ -415,7 +415,11 @@ xf86platformProbeDev(DriverPtr drvp) + if (j == xf86_num_platform_devices) + continue; + +- foundScreen = probeSingleDevice(&xf86_platform_devices[j], drvp, devList[i], 0); ++ flags = 0; ++ if (!devList[i]->active) ++ flags |= PLATFORM_PROBE_GPU_SCREEN; ++ ++ foundScreen = probeSingleDevice(&xf86_platform_devices[j], drvp, devList[i], flags); + if (!foundScreen) + continue; + } diff --git a/x11/sever/xorg-server/files/ubuntu/xfree86-no-xv-for-gpuscreens.patch b/x11/sever/xorg-server/files/ubuntu/xfree86-no-xv-for-gpuscreens.patch new file mode 100644 index 0000000000..cfb0f0891d --- /dev/null +++ b/x11/sever/xorg-server/files/ubuntu/xfree86-no-xv-for-gpuscreens.patch @@ -0,0 +1,36 @@ +diff --git a/hw/xfree86/common/xf86xv.c b/hw/xfree86/common/xf86xv.c +index 92d0f6d..a33366a 100644 +--- a/hw/xfree86/common/xf86xv.c ++++ b/hw/xfree86/common/xf86xv.c +@@ -234,7 +234,7 @@ xf86XVScreenInit(ScreenPtr pScreen, XF86VideoAdaptorPtr * adaptors, int num) + XF86XVScreenPtr ScreenPriv; + XvScreenPtr pxvs; + +- if (num <= 0 || noXvExtension) ++ if (num <= 0 || noXvExtension || pScreen->isGPU) + return FALSE; + + if (Success != XvScreenInit(pScreen)) +diff --git a/hw/xfree86/common/xf86xvmc.c b/hw/xfree86/common/xf86xvmc.c +index 78a32bf..a0f6fcd 100644 +--- a/hw/xfree86/common/xf86xvmc.c ++++ b/hw/xfree86/common/xf86xvmc.c +@@ -148,11 +148,15 @@ xf86XvMCScreenInit(ScreenPtr pScreen, + { + XvMCAdaptorPtr pAdapt; + xf86XvMCScreenPtr pScreenPriv; +- XvScreenPtr pxvs = (XvScreenPtr) dixLookupPrivate(&pScreen->devPrivates, +- XF86XvScreenKey); ++ XvScreenPtr pxvs; + int i, j; + +- if (noXvExtension) ++ if (noXvExtension || pScreen->isGPU || !XF86XvScreenKey) ++ return FALSE; ++ ++ pxvs = (XvScreenPtr) dixLookupPrivate(&pScreen->devPrivates, ++ XF86XvScreenKey); ++ if (!pxvs) + return FALSE; + + if (!(pAdapt = malloc(sizeof(XvMCAdaptorRec) * num_adaptors))) diff --git a/x11/sever/xorg-server/files/xorg-save-xkb-config.sh b/x11/sever/xorg-server/files/xorg-save-xkb-config.sh new file mode 100755 index 0000000000..5d675e6a7e --- /dev/null +++ b/x11/sever/xorg-server/files/xorg-save-xkb-config.sh @@ -0,0 +1,29 @@ +#!/bin/sh + +ROOT=$1 +test -d "$ROOT" || exit 1 + +eval "$(xprop -root -notype 8s "=1; RULES=\$0; MODEL=\$1; LAYOUT=\$2; VARIANT=\$3; OPTIONS=\$4" _XKB_RULES_NAMES)" + +test -z "$_XKB_RULES_NAMES" && exit 1 +test -z "$VARIANT" && COMMENT_VARIANT="#" +test -z "$OPTIONS" && COMMENT_OPTIONS="#" + +cat << EOF > $ROOT/etc/X11/xorg.conf.d/00-configured-keymap.conf +# This file is generated by $0. +# +# If you want to override settings in this file, edit +# 10-keyboard.conf in the same directory. + +Section "InputClass" + Identifier "Configured Keymap" + MatchIsKeyboard "on" + MatchTag "use_configured_keymap" + + Option "xkb_rules" "$RULES" + Option "xkb_model" "$MODEL" + Option "xkb_layout" "$LAYOUT" + ${COMMENT_VARIANT}Option "xkb_variant" "$VARIANT" + ${COMMENT_OPTIONS}Option "xkb_options" "$OPTIONS" +EndSection +EOF diff --git a/x11/sever/xorg-server/files/xorg-server-1.16.0-add_prime_support-1.patch b/x11/sever/xorg-server/files/xorg-server-1.16.0-add_prime_support-1.patch new file mode 100644 index 0000000000..428ec37c43 --- /dev/null +++ b/x11/sever/xorg-server/files/xorg-server-1.16.0-add_prime_support-1.patch @@ -0,0 +1,88 @@ +Submitted By: Armin K. +Date: 2012-12-30 +Initial Package Version: 1.13.1 +Upstream Status: Not submitted. +Origin: Upstream mailing list. +Description: Adds PRIME support to Xorg Server to make GPU offloading work. + +--- xorg-server.orig/hw/xfree86/common/xf86Init.c 2012-10-14 01:38:50.000000000 +0200 ++++ xorg-server/hw/xfree86/common/xf86Init.c 2012-12-01 19:51:53.249922134 +0100 +@@ -361,6 +361,16 @@ + return ret; + } + ++extern void xf86AutoConfigOutputDevice(ScrnInfoPtr pScrn, ScrnInfoPtr master); ++static void ++xf86AutoConfigOutputDevices(void) ++{ ++ int i; ++ ++ for (i = 0; i < xf86NumGPUScreens; i++) ++ xf86AutoConfigOutputDevice(xf86GPUScreens[i], xf86Screens[0]); ++} ++ + static void + InstallSignalHandlers(void) + { +@@ -927,6 +937,8 @@ + for (i = 0; i < xf86NumGPUScreens; i++) + AttachUnboundGPU(xf86Screens[0]->pScreen, xf86GPUScreens[i]->pScreen); + ++ xf86AutoConfigOutputDevices(); ++ + xf86VGAarbiterWrapFunctions(); + if (sigio_blocked) + OsReleaseSIGIO(); +--- xorg-server.orig/hw/xfree86/common/xf86platformBus.c 2012-11-02 05:17:59.000000000 +0100 ++++ xorg-server/hw/xfree86/common/xf86platformBus.c 2012-12-01 19:51:53.249922134 +0100 +@@ -387,6 +387,8 @@ + return foundScreen; + } + ++extern void xf86AutoConfigOutputDevice(ScrnInfoPtr pScrn, ScrnInfoPtr master); ++ + int + xf86platformAddDevice(int index) + { +@@ -446,6 +448,7 @@ + + /* attach unbound to 0 protocol screen */ + AttachUnboundGPU(xf86Screens[0]->pScreen, xf86GPUScreens[i]->pScreen); ++ xf86AutoConfigOutputDevice(xf86GPUScreens[i], xf86Screens[0]); + + return 0; + } +--- xorg-server.orig/hw/xfree86/modes/xf86Crtc.c 2012-10-14 01:38:50.000000000 +0200 ++++ xorg-server/hw/xfree86/modes/xf86Crtc.c 2012-12-01 19:51:53.250922153 +0100 +@@ -3258,3 +3258,31 @@ + crtc->x = crtc->y = 0; + } + } ++ ++ ++void xf86AutoConfigOutputDevice(ScrnInfoPtr pScrn, ScrnInfoPtr master) ++{ ++ RRProviderPtr master_provider; ++ xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(master); ++ xf86CrtcConfigPtr slave_config = XF86_CRTC_CONFIG_PTR(pScrn); ++ ++ if (!config || !slave_config) ++ return; ++ ++ master_provider = config->randr_provider; ++ ++ if ((master->capabilities & RR_Capability_SinkOffload) && ++ pScrn->capabilities & RR_Capability_SourceOffload) { ++ /* source offload */ ++ ++ DetachUnboundGPU(pScrn->pScreen); ++ AttachOffloadGPU(master->pScreen, pScrn->pScreen); ++ slave_config->randr_provider->offload_sink = master_provider; ++ } else if ((master->capabilities & RR_Capability_SourceOutput) && ++ pScrn->capabilities & RR_Capability_SinkOutput) { ++ /* sink offload */ ++ DetachUnboundGPU(pScrn->pScreen); ++ AttachOutputGPU(master->pScreen, pScrn->pScreen); ++ slave_config->randr_provider->output_source = master_provider; ++ } ++} diff --git a/x11/sever/xorg-server/files/xorg-server-1.16.0-upstream_glamor_fix-1.patch b/x11/sever/xorg-server/files/xorg-server-1.16.0-upstream_glamor_fix-1.patch new file mode 100644 index 0000000000..53614afa4d --- /dev/null +++ b/x11/sever/xorg-server/files/xorg-server-1.16.0-upstream_glamor_fix-1.patch @@ -0,0 +1,186 @@ +Submitted By: Ken Moffat +Date: 2014-08-18 +Initial Package Version: 1.16.0 +Upstream Status: Applied +Origin: Upstream +Description: Fixes bug in glamor. + +From 3c0431b8911241552a15a43e4279c50658b50a18 Mon Sep 17 00:00:00 2001 +From: Keith Packard +Date: Wed, 16 Jul 2014 16:03:23 -0700 +Subject: glamor: Fix temp picture coordinates in + glamor_composite_clipped_region + +To understand this patch, let's start at the protocol interface where +the relationship between the coordinate spaces is documented: + + static Bool + _glamor_composite(CARD8 op, + PicturePtr source, + PicturePtr mask, + PicturePtr dest, + INT16 x_source, + INT16 y_source, + INT16 x_mask, + INT16 y_mask, + INT16 x_dest, INT16 y_dest, + CARD16 width, CARD16 height, Bool fallback) + +The coordinates are passed to this function directly off the wire and +are all relative to their respective drawables. For Windows, this means +that they are relative to the upper left corner of the window, in +whatever pixmap that window is getting drawn to. + +_glamor_composite calls miComputeCompositeRegion to construct a clipped +region to actually render to. In reality, miComputeCompositeRegion clips +only to the destination these days; source clip region based clipping +would have to respect the transform, which isn't really possible. The +returned region is relative to the screen in which dest lives; offset by +dest->drawable.x and dest->drawable.y. + +What is important to realize here is that, because of clipping, the +composite region may not have the same position within the destination +drawable as x_dest, y_dest. The protocol coordinates now exist solely to +'pin' the three objects together. + + extents->x1,y1 Screen origin of clipped operation + width,height Extents of the clipped operation + x_dest,y_dest Unclipped destination-relative operation coordinate + x_source,y_source Unclipped source-relative operation coordinate + x_mask,y_mask Unclipped mask-relative operation coordinate + +One thing we want to know is what the offset is from the original +operation origin to the clipped origin + + Destination drawable relative coordinates of the clipped operation: + + x_dest_clipped = extents->x1 - dest->drawable.x + y_dest_clipped = extents->y1 - dest->drawable.y + + Offset from the original operation origin: + + x_off_clipped = x_dest_clipped - x_dest + y_off_clipped = y_dest_clipped - y_dest + + Source drawable relative coordinates of the clipped operation: + + x_source_clipped = x_source + x_off_clipped; + y_source_clipped = y_source + y_off_clipped; + + Mask drawable relative coordinates of the clipped operation: + + x_mask_clipped = x_source + x_off_clipped; + y_mask_clipped = y_source + y_off_clipped; + +This is where the original code fails -- it doesn't subtract the +destination drawable location when computing the distance that the +operation has been moved by clipping. Here's what it does when +constructing a temporary source picture: + + temp_src = + glamor_convert_gradient_picture(screen, source, + extent->x1 + x_source - x_dest, + extent->y1 + y_source - y_dest, + width, height); + ... + x_temp_src = -extent->x1 + x_dest; + y_temp_src = -extent->y1 + y_dest; + +glamor_convert_gradient_picture needs source drawable relative +coordinates, but that is not what it's getting; it's getting +screen-relative coordinates for the destination, adjusted by the +distance between the provided source and destination operation +coordinates. We want x_source_clipped and y_source_clipped: + + x_source_clipped = x_source + x_off_clipped + = x_source + x_dest_clipped - x_dest + = x_source + extents->x1 - dest->drawable.x - x_dest + +x_temp_src/y_temp_src are supposed to be the coordinates of the original +operation translated to the temporary picture: + + x_temp_src = x_source - x_source_clipped; + y_temp_src = y_source - y_source_clipped; + +Note that x_source_clipped/y_source_clipped will never be less than +x_source/y_source because all we're doing is clipping. This means that +x_temp_src/y_temp_src will always be non-positive; the original source +coordinate can never be strictly *inside* the temporary image or we +could have made the temporary image smaller. + + x_temp_src = x_source - x_source_clipped + = x_source - (x_source + x_off_clipped) + = -x_off_clipped + = x_dest - x_dest_clipped + = x_dest - (extents->x1 - dest->drawable.x) + +Again, this is off by the destination origin within the screen +coordinate space. + +The code should look like: + + temp_src = + glamor_convert_gradient_picture(screen, source, + extent->x1 + x_source - x_dest - dest->pDrawable->x, + extent->y1 + y_source - y_dest - dest->pDrawable->y, + width, height); + + x_temp_src = -extent->x1 + x_dest + dest->pDrawable->x; + y_temp_src = -extent->y1 + y_dest + dest->pDrawable->y; + +Signed-off-by: Keith Packard +Reviewed-by: Markus Wick +(cherry picked from commit 55f5bfb578e934319d1308cbb56c900c5ac7cfa7) +Signed-off-by: Julien Cristau + +diff --git a/glamor/glamor_render.c b/glamor/glamor_render.c +index 14ab738..e5d5d2c 100644 +--- a/glamor/glamor_render.c ++++ b/glamor/glamor_render.c +@@ -1450,8 +1450,8 @@ glamor_composite_clipped_region(CARD8 op, + || source_pixmap->drawable.height != height)))) { + temp_src = + glamor_convert_gradient_picture(screen, source, +- extent->x1 + x_source - x_dest, +- extent->y1 + y_source - y_dest, ++ extent->x1 + x_source - x_dest - dest->pDrawable->x, ++ extent->y1 + y_source - y_dest - dest->pDrawable->y, + width, height); + if (!temp_src) { + temp_src = source; +@@ -1459,8 +1459,8 @@ glamor_composite_clipped_region(CARD8 op, + } + temp_src_priv = + glamor_get_pixmap_private((PixmapPtr) (temp_src->pDrawable)); +- x_temp_src = -extent->x1 + x_dest; +- y_temp_src = -extent->y1 + y_dest; ++ x_temp_src = -extent->x1 + x_dest + dest->pDrawable->x; ++ y_temp_src = -extent->y1 + y_dest + dest->pDrawable->y; + } + + if (mask +@@ -1474,8 +1474,8 @@ glamor_composite_clipped_region(CARD8 op, + * to do reduce one convertion. */ + temp_mask = + glamor_convert_gradient_picture(screen, mask, +- extent->x1 + x_mask - x_dest, +- extent->y1 + y_mask - y_dest, ++ extent->x1 + x_mask - x_dest - dest->pDrawable->x, ++ extent->y1 + y_mask - y_dest - dest->pDrawable->y, + width, height); + if (!temp_mask) { + temp_mask = mask; +@@ -1483,8 +1483,8 @@ glamor_composite_clipped_region(CARD8 op, + } + temp_mask_priv = + glamor_get_pixmap_private((PixmapPtr) (temp_mask->pDrawable)); +- x_temp_mask = -extent->x1 + x_dest; +- y_temp_mask = -extent->y1 + y_dest; ++ x_temp_mask = -extent->x1 + x_dest + dest->pDrawable->x; ++ y_temp_mask = -extent->y1 + y_dest + dest->pDrawable->y; + } + /* Do two-pass PictOpOver componentAlpha, until we enable + * dual source color blending. +-- +cgit v0.10.2 + diff --git a/x11/sever/xorg-server/files/xorg-server-1.16.3-add_prime_support-1.patch b/x11/sever/xorg-server/files/xorg-server-1.16.3-add_prime_support-1.patch new file mode 100644 index 0000000000..b2007551cd --- /dev/null +++ b/x11/sever/xorg-server/files/xorg-server-1.16.3-add_prime_support-1.patch @@ -0,0 +1,92 @@ +Submitted By: Armin K. +Date: 2012-12-30 +Initial Package Version: 1.13.1 +Upstream Status: Not submitted. +Origin: Upstream mailing list. +Description: Adds PRIME support to Xorg Server to make GPU offloading work. + +--- a/hw/xfree86/common/xf86Init.c 2014-06-04 12:49:11.000000000 +0200 ++++ b/hw/xfree86/common/xf86Init.c 2014-06-04 14:00:29.539324458 +0200 +@@ -363,6 +363,16 @@ + return ret; + } + ++extern void xf86AutoConfigOutputDevice(ScrnInfoPtr pScrn, ScrnInfoPtr master); ++static void ++xf86AutoConfigOutputDevices(void) ++{ ++ int i; ++ ++ for (i = 0; i < xf86NumGPUScreens; i++) ++ xf86AutoConfigOutputDevice(xf86GPUScreens[i], xf86Screens[0]); ++} ++ + static void + InstallSignalHandlers(void) + { +@@ -952,6 +962,8 @@ + for (i = 0; i < xf86NumGPUScreens; i++) + AttachUnboundGPU(xf86Screens[0]->pScreen, xf86GPUScreens[i]->pScreen); + ++ xf86AutoConfigOutputDevices(); ++ + xf86VGAarbiterWrapFunctions(); + if (sigio_blocked) + OsReleaseSIGIO(); +--- a/hw/xfree86/common/xf86platformBus.c 2014-06-04 12:49:11.000000000 +0200 ++++ b/hw/xfree86/common/xf86platformBus.c 2014-06-04 14:00:29.539324458 +0200 +@@ -426,6 +426,8 @@ + return foundScreen; + } + ++extern void xf86AutoConfigOutputDevice(ScrnInfoPtr pScrn, ScrnInfoPtr master); ++ + int + xf86platformAddDevice(int index) + { +@@ -494,6 +496,7 @@ + } + /* attach unbound to 0 protocol screen */ + AttachUnboundGPU(xf86Screens[0]->pScreen, xf86GPUScreens[i]->pScreen); ++ xf86AutoConfigOutputDevice(xf86GPUScreens[i], xf86Screens[0]); + + RRResourcesChanged(xf86Screens[0]->pScreen); + RRTellChanged(xf86Screens[0]->pScreen); +--- a/hw/xfree86/modes/xf86Crtc.c 2014-06-04 12:49:11.000000000 +0200 ++++ b/hw/xfree86/modes/xf86Crtc.c 2014-06-04 14:00:29.540324474 +0200 +@@ -3387,3 +3387,35 @@ + crtc->x = crtc->y = 0; + } + } ++ ++ ++void xf86AutoConfigOutputDevice(ScrnInfoPtr pScrn, ScrnInfoPtr master) ++{ ++ RRProviderPtr master_provider; ++ xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(master); ++ xf86CrtcConfigPtr slave_config = XF86_CRTC_CONFIG_PTR(pScrn); ++ Bool unbound = FALSE; ++ ++ if (!config || !slave_config) ++ return; ++ ++ master_provider = config->randr_provider; ++ ++ if ((master->capabilities & RR_Capability_SinkOffload) && ++ pScrn->capabilities & RR_Capability_SourceOffload) { ++ /* source offload */ ++ ++ DetachUnboundGPU(pScrn->pScreen); ++ unbound = TRUE; ++ AttachOffloadGPU(master->pScreen, pScrn->pScreen); ++ slave_config->randr_provider->offload_sink = master_provider; ++ } ++ if ((master->capabilities & RR_Capability_SourceOutput) && ++ pScrn->capabilities & RR_Capability_SinkOutput) { ++ /* sink offload */ ++ if (!unbound) ++ DetachUnboundGPU(pScrn->pScreen); ++ AttachOutputGPU(master->pScreen, pScrn->pScreen); ++ slave_config->randr_provider->output_source = master_provider; ++ } ++} diff --git a/x11/sever/xorg-server/files/xorg-server-1.17.1-add_prime_support-1.patch b/x11/sever/xorg-server/files/xorg-server-1.17.1-add_prime_support-1.patch new file mode 100644 index 0000000000..726c996396 --- /dev/null +++ b/x11/sever/xorg-server/files/xorg-server-1.17.1-add_prime_support-1.patch @@ -0,0 +1,92 @@ +Submitted By: Armin K. +Date: 2012-12-30 +Initial Package Version: 1.13.1 +Upstream Status: Not submitted. +Origin: Upstream mailing list. +Description: Adds PRIME support to Xorg Server to make GPU offloading work. + +--- a/hw/xfree86/common/xf86Init.c 2014-06-04 12:49:11.000000000 +0200 ++++ b/hw/xfree86/common/xf86Init.c 2014-06-04 14:00:29.539324458 +0200 +@@ -363,6 +363,16 @@ + return ret; + } + ++extern void xf86AutoConfigOutputDevice(ScrnInfoPtr pScrn, ScrnInfoPtr master); ++static void ++xf86AutoConfigOutputDevices(void) ++{ ++ int i; ++ ++ for (i = 0; i < xf86NumGPUScreens; i++) ++ xf86AutoConfigOutputDevice(xf86GPUScreens[i], xf86Screens[0]); ++} ++ + static void + InstallSignalHandlers(void) + { +@@ -952,6 +962,8 @@ + for (i = 0; i < xf86NumGPUScreens; i++) + AttachUnboundGPU(xf86Screens[0]->pScreen, xf86GPUScreens[i]->pScreen); + ++ xf86AutoConfigOutputDevices(); ++ + xf86VGAarbiterWrapFunctions(); + if (sigio_blocked) + OsReleaseSIGIO(); +--- a/hw/xfree86/common/xf86platformBus.c 2014-06-04 12:49:11.000000000 +0200 ++++ b/hw/xfree86/common/xf86platformBus.c 2014-06-04 14:00:29.539324458 +0200 +@@ -426,6 +426,8 @@ + return foundScreen; + } + ++extern void xf86AutoConfigOutputDevice(ScrnInfoPtr pScrn, ScrnInfoPtr master); ++ + int + xf86platformAddDevice(int index) + { +@@ -494,6 +496,7 @@ + } + /* attach unbound to 0 protocol screen */ + AttachUnboundGPU(xf86Screens[0]->pScreen, xf86GPUScreens[i]->pScreen); ++ xf86AutoConfigOutputDevice(xf86GPUScreens[i], xf86Screens[0]); + + RRResourcesChanged(xf86Screens[0]->pScreen); + RRTellChanged(xf86Screens[0]->pScreen); +--- a/hw/xfree86/modes/xf86Crtc.c 2014-06-04 12:49:11.000000000 +0200 ++++ b/hw/xfree86/modes/xf86Crtc.c 2014-06-04 14:00:29.540324474 +0200 +@@ -3387,3 +3387,35 @@ + crtc->x = crtc->y = 0; + } + } ++ ++ ++void xf86AutoConfigOutputDevice(ScrnInfoPtr pScrn, ScrnInfoPtr master) ++{ ++ RRProviderPtr master_provider; ++ xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(master); ++ xf86CrtcConfigPtr slave_config = XF86_CRTC_CONFIG_PTR(pScrn); ++ Bool unbound = FALSE; ++ ++ if (!config || !slave_config) ++ return; ++ ++ master_provider = config->randr_provider; ++ ++ if ((master->capabilities & RR_Capability_SinkOffload) && ++ pScrn->capabilities & RR_Capability_SourceOffload) { ++ /* source offload */ ++ ++ DetachUnboundGPU(pScrn->pScreen); ++ unbound = TRUE; ++ AttachOffloadGPU(master->pScreen, pScrn->pScreen); ++ slave_config->randr_provider->offload_sink = master_provider; ++ } ++ if ((master->capabilities & RR_Capability_SourceOutput) && ++ pScrn->capabilities & RR_Capability_SinkOutput) { ++ /* sink offload */ ++ if (!unbound) ++ DetachUnboundGPU(pScrn->pScreen); ++ AttachOutputGPU(master->pScreen, pScrn->pScreen); ++ slave_config->randr_provider->output_source = master_provider; ++ } ++} diff --git a/x11/sever/xorg-server/files/xvfb-run.sh b/x11/sever/xorg-server/files/xvfb-run.sh new file mode 100755 index 0000000000..d499df1664 --- /dev/null +++ b/x11/sever/xorg-server/files/xvfb-run.sh @@ -0,0 +1,187 @@ +#!/bin/sh +# --- T2-COPYRIGHT-NOTE-BEGIN --- +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# +# T2 SDE: package/.../xorg-server/xvfb-run.sh +# Copyright (C) 2005 The T2 SDE Project +# Copyright (C) XXXX - 2005 Debian +# +# More information can be found in the files COPYING and README. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. A copy of the +# GNU General Public License can be found in the file COPYING. +# --- T2-COPYRIGHT-NOTE-END --- + +# $Id: xvfb-run 2166 2005-01-27 07:54:19Z branden $ +# from: http://necrotic.deadbeast.net/xsf/XFree86/trunk/debian/local/xvfb-run + +# This script starts an instance of Xvfb, the "fake" X server, runs a command +# with that server available, and kills the X server when done. The return +# value of the command becomes the return value of this script. +# +# If anyone is using this to build a Debian package, make sure the package +# Build-Depends on xvfb, xbase-clients, and xfonts-base. + +set -e + +PROGNAME=xvfb-run +SERVERNUM=99 +AUTHFILE= +ERRORFILE=/dev/null +STARTWAIT=3 +XVFBARGS="-screen 0 640x480x8" +LISTENTCP="-nolisten tcp" +XAUTHPROTO=. + +# Query the terminal to establish a default number of columns to use for +# displaying messages to the user. This is used only as a fallback in the event +# the COLUMNS variable is not set. ($COLUMNS can react to SIGWINCH while the +# script is running, and this cannot, only being calculated once.) +DEFCOLUMNS=$(stty size 2>/dev/null | awk '{print $2}') || true +if ! expr "$DEFCOLUMNS" : "[[:digit:]]\+$" >/dev/null 2>&1; then + DEFCOLUMNS=80 +fi + +# Display a message, wrapping lines at the terminal width. +message () { + echo "$PROGNAME: $*" | fmt -t -w ${COLUMNS:-$DEFCOLUMNS} +} + +# Display an error message. +error () { + message "error: $*" >&2 +} + +# Display a usage message. +usage () { + if [ -n "$*" ]; then + message "usage error: $*" + fi + cat <&2 + exit 2 +fi + +if ! which xauth >/dev/null; then + error "xauth command not found" + exit 3 +fi + +# If the user did not specify an X authorization file to use, set up a temporary +# directory to house one. +if [ -z "$AUTHFILE" ]; then + XVFB_RUN_TMPDIR="${TMPDIR:-/tmp}/$PROGNAME.$$" + if ! mkdir -p -m 700 "$XVFB_RUN_TMPDIR"; then + error "temporary directory $XVFB_RUN_TMPDIR already exists" + exit 4 + fi + AUTHFILE=$(unset TMPDIR && mktemp -p "$XVFB_RUN_TMPDIR" Xauthority.XXXXXXXX) +fi + +# Start Xvfb. +MCOOKIE=$(mcookie) +XAUTHORITY=$AUTHFILE xauth add ":$SERVERNUM" "$XAUTHPROTO" "$MCOOKIE" \ + >"$ERRORFILE" 2>&1 +XAUTHORITY=$AUTHFILE Xvfb ":$SERVERNUM" $XVFBARGS $LISTENTCP >"$ERRORFILE" \ + 2>&1 & +XVFBPID=$! +sleep "$STARTWAIT" + +# Start the command and save its exit status. +set +e +DISPLAY=:$SERVERNUM XAUTHORITY=$AUTHFILE "$@" 2>&1 +RETVAL=$? +set -e + +# Kill Xvfb now that the command has exited. +kill $XVFBPID + +# Clean up. +XAUTHORITY=$AUTHFILE xauth remove ":$SERVERNUM" >"$ERRORFILE" 2>&1 +if [ -n "$XVFB_RUN_TMPDIR" ]; then + if ! rm -r "$XVFB_RUN_TMPDIR"; then + error "problem while cleaning up temporary directory" + exit 5 + fi +fi + +# Return the executed command's exit status. +exit $RETVAL + +# vim:set ai et sts=4 sw=4 tw=80: diff --git a/x11/sever/xorg-server/pspec.xml b/x11/sever/xorg-server/pspec.xml new file mode 100755 index 0000000000..0270ceb3bf --- /dev/null +++ b/x11/sever/xorg-server/pspec.xml @@ -0,0 +1,390 @@ + + + + + xorg-server + http://www.x.org + + PisiLinux Community + admins@pisilinux.org + + MIT + X.Org X Server + X server is the main application that allows a graphical interface. + mirrors://xorg/individual/xserver/xorg-server-1.17.1.tar.bz2 + + font-util + libjpeg-turbo-devel + libdmx-devel + libdrm-devel + libgcrypt-devel + libpciaccess-devel + libX11-devel + libXaw-devel + libXext-devel + libXfixes-devel + libXfont-devel + libXi-devel + libxkbfile-devel + libXmu-devel + libXpm-devel + libXrender-devel + libXres-devel + libXt-devel + libXtst-devel + libXv-devel + mesa-devel + pixman-devel + xorg-app + nettle-devel + libepoxy-devel + xcb-util-devel + xcb-util-image-devel + xcb-util-wm-devel + xcb-util-keysyms-devel + xcb-util-renderutil-devel + + + xorg-server-1.17.1-add_prime_support-1.patch + default-module-path.patch + ubuntu/001_fedora_extramodes.patch + ubuntu/03_static-nettle.diff + ubuntu/05_Revert-Unload-submodules.diff + ubuntu/105_nvidia_fglrx_autodetect.patch + ubuntu/10_Include-missing-selection-h.diff + ubuntu/188_default_primary_to_first_busid.patch + ubuntu/226_fall_back_to_autoconfiguration.patch + ubuntu/227_null_ptr_midispcur.patch + ubuntu/include-selection-h.patch + ubuntu/no-nv.patch + ubuntu/xf86-inactive-gpuscreen.patch + ubuntu/xfree86-no-xv-for-gpuscreens.patch + + + + + xorg-server-common + data + Common files for X servers + + /etc/X11/fontpath.d + /etc/dbus-1 + /usr/lib/xorg/protocol.txt + /var/lib/xkb + /usr/share/doc + /usr/share/man/man1/Xserver.1 + + + + + xorg-server + + xorg-video-modesetting + glamor-egl + + app:console + + mesa + libdrm + pixman + libXfont + libunwind + libpciaccess + libxshmfence + libepoxy + + + /etc/X11/xorg.conf.d + /usr/bin/X + /usr/bin/Xorg + /usr/bin/cvt + /usr/bin/gtf + /usr/libexec + /usr/lib/xorg + /usr/share/X11/DriversDB + /usr/share/X11/pci + /usr/share/X11/xorg.conf.d + /usr/share/man/man1/Xorg.1 + /usr/share/man/man1/cvt.1 + /usr/share/man/man1/gtf.1 + /usr/share/man/man4/exa.4 + /usr/share/man/man4/modesetting.4 + /usr/share/man/man4/fbdevhw.4 + /usr/share/man/man5/xorg.conf.5 + /usr/share/man/man5/xorg.conf.d.5 + + + xorg-save-xkb-config.sh + DriversDB + fedora/10-quirks.conf + + + + + xorg-server-xdmx + app:console + Distributed Multihead X Server + + xorg-server-common + libXi + libXt + libXmu + libdmx + libXaw + pixman + libXext + libXfont + libXfixes + libXrender + libunwind + + + /usr/bin/*dmx* + /usr/share/man/man1/*dmx* + + + + + xorg-server-xwayland + app:console + Run X clients under wayland + + mesa + pixman + libdrm + libXfont + libepoxy + libxshmfence + wayland-client + xorg-server-common + + + /usr/bin/Xwayland + + + + + xorg-server-xephyr + app:console + Nested X Server + + xorg-server-common + mesa + xcb-util + libunwind + pixman + libXext + libXfont + libepoxy + xcb-util-wm + libxshmfence + xcb-util-image + xcb-util-keysyms + xcb-util-renderutil + + + /usr/bin/Xephyr + /usr/share/man/man1/Xephyr.1 + + + + + xorg-server-xvfb + + GPLv2 + app:console + Virtual Framebuffer X Server + + xorg-server-common + libXfont + pixman + mesa + libunwind + + + /usr/bin/[Xx]vfb* + /usr/share/man/man1/Xvfb.1 + + + + xvfb-run.sh + + + + + xorg-server-xnest + A nested X server that runs as an X application + + libXfont + libXext + libunwind + pixman + + + /usr/bin/Xnest + /usr/share/man/man1/Xnest.1 + + + + + xorg-server-devel + data + library + Headers and libraries for X server driver development + + xorg-server + libpciaccess-devel + pixman-devel + mesa-devel + + + /usr/include/xorg + /usr/lib/libxf86config.a + /usr/lib/pkgconfig + /usr/share/aclocal + + + + + + 2015-05-17 + 1.17.1 + Version bump. + Ergün Salman + poyraz76@pisilinux.org + + + 2015-02-06 + 1.16.3 + Release xorg-server-xnest + Ergün Salman + poyraz76@pisilinux.org + + + 2015-01-20 + 1.16.3 + Version bump. + Ergün Salman + poyraz76@pisilinux.org + + + 2014-08-31 + 1.16.0 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-06-27 + 1.15.2 + Version bump. + Vedat Demir + vedat@pisilinux.org + + + 2014-05-16 + 1.15.1 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-04-15 + 1.15.1 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2014-04-13 + 1.15.0 + Release bump,update driversdb + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2014-03-07 + 1.15.0 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2014-02-02 + 1.14.2 + Rebuild Unused + Varol Maksutoğlu + waroi@pisilinux.org + + + 2013-11-06 + 1.14.2 + Fix deps. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-09-11 + 1.14.2 + Update driversDB + Marcin Bojara + marcin@pisilinux.org + + + 2013-08-25 + 1.14.2 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-07-28 + 1.14.2 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-07-27 + 1.14.1 + Dep Fixed, rebuild + Osman Erkan + osman.erkan@pisilinux.org + + + 2013-06-21 + 1.14.1 + Rebuild. + Marcin Bojara + marcin@pisilinux.org + + + 2013-05-29 + 1.14.1 + build for xorg 1.14 + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2013-04-18 + 1.14.1 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-02-05 + 1.13.2 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2012-09-25 + 1.13.0 + First release + Erdem Artan + admins@pisilinux.org + + + \ No newline at end of file diff --git a/x11/sever/xorg-server/translations.xml b/x11/sever/xorg-server/translations.xml new file mode 100755 index 0000000000..012fd55a4a --- /dev/null +++ b/x11/sever/xorg-server/translations.xml @@ -0,0 +1,47 @@ + + + + xorg-server + X.Org X Sunucu + Serveur X X.Org + X.Org X Server + X.Org X Serwer + X sunucu, grafiksel arayüz için gerekli ana uygulamadır. + X serwer to główna aplikacja, która umożliwia interfejs graficzny. + + + + xorg-server-common + X sunucuları için ortak dosyalar + + + + xorg-server-xdmx + Dağıtık, çok başlı X sunucusu + + + + xorg-server-xephyr + Başka bir X ekranında çalışabilen X sunucusu + + + + xorg-server-xvfb + Sanal framebuffer X sunucusu + + + + xorg-server-xvnc + X pencere sistemi için VNC sunucusu + + + + xorg-server-Xwayland + X pencere sistemini wayland altında çalıştırın + + + + xorg-server-devel + X sunucusu için sürücü geliştirmede kullanılan başlık ve kitaplık dosyaları + + \ No newline at end of file