diff --git a/multimedia/graphics/imlib2/actions.py b/multimedia/graphics/imlib2/actions.py index 6d02891c2e..0fb8d9fbe9 100644 --- a/multimedia/graphics/imlib2/actions.py +++ b/multimedia/graphics/imlib2/actions.py @@ -26,6 +26,8 @@ def setup(): #--with-id3 \ shelltools.system("sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool") shelltools.system("sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool") + + pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ") def build(): autotools.make() diff --git a/multimedia/graphics/imlib2/pspec.xml b/multimedia/graphics/imlib2/pspec.xml index b33719a67d..28e205529d 100644 --- a/multimedia/graphics/imlib2/pspec.xml +++ b/multimedia/graphics/imlib2/pspec.xml @@ -19,6 +19,7 @@ libXext-devel libjpeg-turbo-devel tiff-devel + freetype-devel imlib2-1.4.5-no-my-libs.patch diff --git a/multimedia/misc/libid3tag/pspec.xml b/multimedia/misc/libid3tag/pspec.xml index bf87431683..59a525d4e9 100644 --- a/multimedia/misc/libid3tag/pspec.xml +++ b/multimedia/misc/libid3tag/pspec.xml @@ -13,6 +13,9 @@ The MAD id3tag library libid3tag is a library for reading and (eventually) writing ID3 tags, both ID3v1 and the various versions of ID3v2. mirrors://sourceforge/mad/libid3tag-0.15.1b.tar.gz + + zlib-devel + libid3tag-0.15.1b-fix_overflow.patch libid3tag-0.15.1b-unknown-encoding.patch diff --git a/x11/library/libXres/actions.py b/x11/library/libXres/actions.py new file mode 100644 index 0000000000..8230c2214c --- /dev/null +++ b/x11/library/libXres/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/libXres/pspec.xml b/x11/library/libXres/pspec.xml new file mode 100644 index 0000000000..cea504221d --- /dev/null +++ b/x11/library/libXres/pspec.xml @@ -0,0 +1,86 @@ + + + + + libXres + http://www.x.org/ + + PisiLinux Community + admins@pisilinux.org + + MIT + library + X.Org Xres library + X-Resource is an extension that allows a client to query the X server about its usage of various resources. + mirrors://xorg/individual/lib/libXres-1.0.7.tar.bz2 + + libX11-devel + libXext-devel + util-macros + + + + + libXres + + libX11 + libXext + + + /usr/lib + /usr/share/doc + + + + + libXres-devel + Development files for libXres + + libXres + libXext-devel + + + /usr/include/X11 + /usr/lib/pkgconfig + /usr/share/man + + + + + + 2014-05-16 + 1.0.7 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-10-07 + 1.0.7 + Rebuild. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-08-25 + 1.0.7 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-06-21 + 1.0.7 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2012-06-01 + 1.0.6 + First release + Erdem Artan + admins@pisilinux.org + + + diff --git a/x11/library/libXres/translations.xml b/x11/library/libXres/translations.xml new file mode 100644 index 0000000000..956d64fdc9 --- /dev/null +++ b/x11/library/libXres/translations.xml @@ -0,0 +1,14 @@ + + + + libXres + X.Org Xres kitaplığı + Librairie Xres de X.Org + X.Org Xres Bibliothek + + + + libXres-devel + libXres için geliştirme dosyaları + + diff --git a/x11/library/libXxf86misc/actions.py b/x11/library/libXxf86misc/actions.py new file mode 100644 index 0000000000..712e8aa89b --- /dev/null +++ b/x11/library/libXxf86misc/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("COPYING", "README") diff --git a/x11/library/libXxf86misc/pspec.xml b/x11/library/libXxf86misc/pspec.xml new file mode 100644 index 0000000000..e08ab80ccd --- /dev/null +++ b/x11/library/libXxf86misc/pspec.xml @@ -0,0 +1,107 @@ + + + + + libXxf86misc + http://www.x.org/ + + PisiLinux Community + admins@pisilinux.org + + MIT + library + X.Org Xxf86misc library + LibXxf86misc is the client library for the XFree86-misc extension. + http://source.pisilinux.org/1.0/libXxf86misc-1.0.3.tar.gz + + libXext-devel + libXxf86miscproto-devel + xorg-proto + util-macros + + + + + libXxf86misc + + libXext + libXxf86miscproto + + + /usr/lib + /usr/share/doc + + + + + libXxf86misc-devel + Development files for libXxf86misc + + libXxf86misc + libXext-devel + libXxf86miscproto-devel + + + /usr/include/X11 + /usr/lib/pkgconfig + /usr/lib32/pkgconfig + /usr/share/man + + + + + libXxf86misc-32bit + emul32 + 32-bit shared libraries for libXxf86misc + emul32 + + libXext-32bit + + + libXxf86misc + libXext-32bit + libX11-32bit + + + /usr/lib32 + + + + + + 2014-05-16 + 1.0.3 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-10-07 + 1.0.3 + Release bump. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-08-25 + 1.0.3 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-07-30 + 1.0.3 + Rebuild + PisiLinux Community + admins@pisilinux.org + + + 2012-10-23 + 1.0.3 + First release + PisiLinux Community + admins@pisilinux.org + + + diff --git a/x11/library/libXxf86misc/translations.xml b/x11/library/libXxf86misc/translations.xml new file mode 100644 index 0000000000..e541917400 --- /dev/null +++ b/x11/library/libXxf86misc/translations.xml @@ -0,0 +1,19 @@ + + + + libXxf86misc + X.Org libXxf86misc kitaplığı + Librairie libXxf86misc de X.Org + X.Org libXxf86misc Bibliothek + + + + libXxf86misc-devel + libXxf86misc için geliştirme dosyaları + + + + libXxf86misc-32bit + libXxf86misc için 32-bit paylaşımlı kitaplıklar + + diff --git a/x11/library/libXxf86miscproto/actions.py b/x11/library/libXxf86miscproto/actions.py new file mode 100644 index 0000000000..9c6caa32a3 --- /dev/null +++ b/x11/library/libXxf86miscproto/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("ChangeLog", "COPYING") diff --git a/x11/library/libXxf86miscproto/pspec.xml b/x11/library/libXxf86miscproto/pspec.xml new file mode 100644 index 0000000000..465b3570e2 --- /dev/null +++ b/x11/library/libXxf86miscproto/pspec.xml @@ -0,0 +1,89 @@ + + + + + libXxf86miscproto + http://www.x.org/ + + PisiLinux Community + admins@pisilinux.org + + MIT + library + X.Org Xxf86miscproto library + LibXxf86miscproto is the client library for the XFree86-miscproto extension. + mirrors://xorg/individual/proto/xf86miscproto-0.9.3.tar.bz2 + + util-macros + libXext-devel + xorg-proto + + + + + libXxf86miscproto + + /usr/lib + /usr/share/doc + + + + + libXxf86miscproto-devel + Development files for libXxf86miscproto + + libXxf86miscproto + + + /usr/include/X11 + /usr/lib/pkgconfig + /usr/lib32/pkgconfig + /usr/share/man + + + + + + 2014-05-16 + 0.9.3 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-11-06 + 0.9.3 + Fix deps. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-10-07 + 0.9.3 + Rebuild. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-08-25 + 0.9.3 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-02-17 + 0.9.3 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2012-10-23 + 0.9.2 + First release + PisiLinux Community + admins@pisilinux.org + + + diff --git a/x11/library/libXxf86miscproto/translations.xml b/x11/library/libXxf86miscproto/translations.xml new file mode 100644 index 0000000000..73b6f8b243 --- /dev/null +++ b/x11/library/libXxf86miscproto/translations.xml @@ -0,0 +1,14 @@ + + + + libXxf86miscproto + X.Org libXxf86miscproto kitaplığı + Librairie libXxf86miscproto de X.Org + X.Org libXxf86miscproto Bibliothek + + + + libXxf86miscproto-devel + libXxf86miscproto için geliştirme dosyaları + + diff --git a/x11/misc/component.xml b/x11/misc/component.xml new file mode 100644 index 0000000000..4c3931477e --- /dev/null +++ b/x11/misc/component.xml @@ -0,0 +1,3 @@ + + x11.misc + diff --git a/x11/misc/xbitmaps/actions.py b/x11/misc/xbitmaps/actions.py new file mode 100644 index 0000000000..3d79014a9c --- /dev/null +++ b/x11/misc/xbitmaps/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 + +def setup(): + autotools.configure() + +def build(): + autotools.make() + +def install(): + autotools.install() + + # Fix conflict with xorg-app + pisitools.remove("/usr/include/X11/bitmaps/black6") + pisitools.remove("/usr/include/X11/bitmaps/box6") diff --git a/x11/misc/xbitmaps/pspec.xml b/x11/misc/xbitmaps/pspec.xml new file mode 100755 index 0000000000..d5be864d0b --- /dev/null +++ b/x11/misc/xbitmaps/pspec.xml @@ -0,0 +1,50 @@ + + + + + xbitmaps + http://www.x.org/ + + PisiLinux Community + admins@pisilinux.org + + MIT + library + X.Org static graphics + xbitmaps provides static graphics needed by Xorg applications to draw screen elements. + mirrors://xorg/individual/data/xbitmaps-1.1.1.tar.bz2 + + + + xbitmaps + + /usr/include/X11/bitmaps + /usr/lib/pkgconfig + /usr/share/pkgconfig + + + + + + 2014-05-15 + 1.1.1 + Rebuild. + Alihan Öztürk + alihan@pisilinux.org + + + 2013-08-25 + 1.1.0 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2010-12-14 + 1.1.0 + First release + Pisi Linux Admins + admins@pisilinux.org + + + diff --git a/x11/misc/xbitmaps/translations.xml b/x11/misc/xbitmaps/translations.xml new file mode 100644 index 0000000000..27a454c5e7 --- /dev/null +++ b/x11/misc/xbitmaps/translations.xml @@ -0,0 +1,10 @@ + + + + xbitmaps + X.Org statik grafikleri + Utilitaire Xbitmaps de X.Org + X.Org xbitmaps Werkzeug + xbitmaps, ekran öğeleri çizmek için Xorg uygulamaları tarafından ihtiyaç duyulan statik grafikleri içerir. + + diff --git a/x11/misc/xorg-app/actions.py b/x11/misc/xorg-app/actions.py new file mode 100644 index 0000000000..972eae91ab --- /dev/null +++ b/x11/misc/xorg-app/actions.py @@ -0,0 +1,56 @@ +# -*- 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 = "." +SkipList = (".", "filelist", "patches", "pisiBuildState", "tmp") + + +def setup(): + # Speed up xkbcomp + shelltools.export("CFLAGS","%s -DHAVE_STRCASECMP" % get.CFLAGS()) + + for package in shelltools.ls("."): + if package.startswith(SkipList): + continue + + print "\nConfiguring %s..." % package + print "-" * (len(package) + 15) + shelltools.cd(package) + + if package.startswith(("xcursorgen", "xsm")) or \ + not shelltools.isFile("configure"): + autotools.autoreconf("-vif") + elif package.startswith("luit"): + pisitools.dosed("configure.ac", "(-D_XOPEN_SOURCE)=500", "\\1=600") + autotools.autoreconf("-vif") + + autotools.configure("--disable-dependency-tracking \ + --disable-devel-docs \ + --with-cpp=/usr/bin/mcpp") + shelltools.cd("../") + +def build(): + for package in shelltools.ls("."): + if package.startswith(SkipList): + continue + + shelltools.cd(package) + if package.startswith("xfwp"): pisitools.dosed("io.c", "^(#include )", r"#define __USE_XOPEN\n\1") + autotools.make() + shelltools.cd("../") + +def install(): + for package in shelltools.ls("."): + if package.startswith(SkipList): + continue + + shelltools.cd(package) + autotools.rawInstall("DESTDIR=%s" % get.installDIR()) + shelltools.cd("../") diff --git a/x11/misc/xorg-app/comar/pakhandler.py b/x11/misc/xorg-app/comar/pakhandler.py new file mode 100644 index 0000000000..9587b508b6 --- /dev/null +++ b/x11/misc/xorg-app/comar/pakhandler.py @@ -0,0 +1,54 @@ +# -*- coding: utf-8 -*- + +import piksemel + +def updateIndex(): + import os + import subprocess + + join = os.path.join + fontsPath = "/usr/share/fonts" + encodingsPath = join(fontsPath, "encodings") + fontsScale = "fonts.scale" + fontsDir = "fonts.dir" + + for root, dirs, files in os.walk(fontsPath): + if root.startswith(encodingsPath): + continue + + fonts = files[:] + + if fontsScale in fonts: + fonts.remove(fontsScale) + os.unlink(join(root, fontsScale)) + + if fontsDir in fonts: + fonts.remove(fontsDir) + os.unlink(join(root, fontsDir)) + + if not fonts: + continue + + print "Creating %s ..." % join(root, fontsScale) + subprocess.call(["/usr/bin/mkfontscale", "-u", root]) + + print "Creating %s ..." % join(root, fontsDir) + subprocess.call(["/usr/bin/mkfontdir", root]) + +def checkPaths(filepath): + doc = piksemel.parse(filepath) + + for item in doc.tags("File"): + path = item.getTagData("Path") + if path.startswith("usr/share/fonts/"): + updateIndex() + break + +def setupPackage(metapath, filepath): + checkPaths(filepath) + +def cleanupPackage(metapath, filepath): + pass + +def postCleanupPackage(metapath, filepath): + checkPaths(filepath) diff --git a/x11/misc/xorg-app/pspec.xml b/x11/misc/xorg-app/pspec.xml new file mode 100644 index 0000000000..e0dfb2db18 --- /dev/null +++ b/x11/misc/xorg-app/pspec.xml @@ -0,0 +1,303 @@ + + + + + xorg-app + http://www.x.org/ + + PisiLinux Community + admins@pisilinux.org + + MIT + app:console + app:gui + X.Org applications + xorg-app contains base Xorg applications. + mirrors://xorg/individual/app/appres-1.0.4.tar.bz2 + mirrors://xorg/individual/app/bdftopcf-1.0.5.tar.bz2 + mirrors://xorg/individual/app/beforelight-1.0.5.tar.bz2 + mirrors://xorg/individual/app/bitmap-1.0.8.tar.bz2 + mirrors://xorg/individual/app/editres-1.0.6.tar.bz2 + mirrors://xorg/individual/app/fonttosfnt-1.0.4.tar.bz2 + mirrors://xorg/individual/app/fslsfonts-1.0.5.tar.bz2 + mirrors://xorg/individual/app/fstobdf-1.0.6.tar.bz2 + mirrors://xorg/individual/app/iceauth-1.0.7.tar.bz2 + mirrors://xorg/individual/app/ico-1.0.4.tar.bz2 + mirrors://xorg/individual/app/listres-1.0.3.tar.bz2 + mirrors://xorg/individual/app/luit-1.1.1.tar.bz2 + mirrors://xorg/individual/app/mkcomposecache-1.2.1.tar.bz2 + mirrors://xorg/individual/app/mkfontdir-1.0.7.tar.bz2 + mirrors://xorg/individual/app/mkfontscale-1.1.2.tar.bz2 + mirrors://xorg/individual/app/oclock-1.0.3.tar.bz2 + mirrors://xorg/individual/app/rendercheck-1.4.tar.bz2 + mirrors://xorg/individual/app/rgb-1.0.6.tar.bz2 + mirrors://xorg/individual/app/rstart-1.0.5.tar.bz2 + mirrors://xorg/individual/app/scripts-1.0.1.tar.bz2 + mirrors://xorg/individual/app/sessreg-1.1.0.tar.bz2 + mirrors://xorg/individual/app/setxkbmap-1.3.0.tar.bz2 + mirrors://xorg/individual/app/showfont-1.0.5.tar.bz2 + mirrors://xorg/individual/app/smproxy-1.0.5.tar.bz2 + mirrors://xorg/individual/app/twm-1.0.8.tar.bz2 + mirrors://xorg/individual/app/viewres-1.0.4.tar.bz2 + mirrors://xorg/individual/app/x11perf-1.5.4.tar.bz2 + mirrors://xorg/individual/app/xauth-1.0.9.tar.bz2 + mirrors://xorg/individual/app/xbacklight-1.2.1.tar.bz2 + mirrors://xorg/individual/app/xbiff-1.0.3.tar.bz2 + mirrors://xorg/individual/app/xcalc-1.0.6.tar.bz2 + mirrors://xorg/individual/app/xclipboard-1.1.3.tar.bz2 + mirrors://xorg/individual/app/xclock-1.0.7.tar.bz2 + mirrors://xorg/individual/app/xcmsdb-1.0.4.tar.bz2 + mirrors://xorg/individual/app/xcompmgr-1.1.6.tar.bz2 + mirrors://xorg/individual/app/xconsole-1.0.6.tar.bz2 + mirrors://xorg/individual/app/xcursorgen-1.0.6.tar.bz2 + mirrors://xorg/individual/app/xdbedizzy-1.1.0.tar.bz2 + mirrors://xorg/individual/app/xditview-1.0.3.tar.bz2 + mirrors://xorg/individual/app/xdpyinfo-1.3.1.tar.bz2 + mirrors://xorg/individual/app/xedit-1.2.2.tar.bz2 + mirrors://xorg/individual/app/xev-1.2.2.tar.bz2 + mirrors://xorg/individual/app/xeyes-1.1.1.tar.bz2 + mirrors://xorg/individual/app/xf86dga-1.0.3.tar.bz2 + mirrors://xorg/individual/app/xfd-1.1.2.tar.bz2 + mirrors://xorg/individual/app/xfindproxy-1.0.4.tar.bz2 + mirrors://xorg/individual/app/xfontsel-1.0.5.tar.bz2 + mirrors://xorg/individual/app/xfs-1.1.4.tar.bz2 + mirrors://xorg/individual/app/xfsinfo-1.0.5.tar.bz2 + mirrors://xorg/individual/app/xfwp-1.0.3.tar.bz2 + mirrors://xorg/individual/app/xgamma-1.0.6.tar.bz2 + mirrors://xorg/individual/app/xgc-1.0.5.tar.bz2 + mirrors://xorg/individual/app/xhost-1.0.7.tar.bz2 + mirrors://xorg/individual/app/xinput-1.6.1.tar.bz2 + mirrors://xorg/individual/app/xkbcomp-1.3.0.tar.bz2 + mirrors://xorg/individual/app/xkbevd-1.1.4.tar.bz2 + mirrors://xorg/individual/app/xkbprint-1.0.4.tar.bz2 + mirrors://xorg/individual/app/xkbutils-1.0.4.tar.bz2 + mirrors://xorg/individual/app/xkill-1.0.4.tar.bz2 + mirrors://xorg/individual/app/xload-1.1.2.tar.bz2 + mirrors://xorg/individual/app/xlogo-1.0.4.tar.bz2 + mirrors://xorg/individual/app/xlsatoms-1.1.2.tar.bz2 + mirrors://xorg/individual/app/xlsclients-1.1.3.tar.bz2 + mirrors://xorg/individual/app/xlsfonts-1.0.5.tar.bz2 + mirrors://xorg/individual/app/xmag-1.0.5.tar.bz2 + mirrors://xorg/individual/app/xman-1.1.3.tar.bz2 + mirrors://xorg/individual/app/xmessage-1.0.4.tar.bz2 + mirrors://xorg/individual/app/xmh-1.0.3.tar.bz2 + mirrors://xorg/individual/app/xmodmap-1.0.9.tar.bz2 + mirrors://xorg/individual/app/xmore-1.0.2.tar.bz2 + mirrors://xorg/individual/app/xpr-1.0.4.tar.bz2 + mirrors://xorg/individual/app/xprop-1.2.2.tar.bz2 + mirrors://xorg/individual/app/xrandr-1.4.3.tar.bz2 + mirrors://xorg/individual/app/xrdb-1.1.0.tar.bz2 + mirrors://xorg/individual/app/xrefresh-1.0.5.tar.bz2 + mirrors://xorg/individual/app/xset-1.2.3.tar.bz2 + mirrors://xorg/individual/app/xsetmode-1.0.0.tar.bz2 + mirrors://xorg/individual/app/xsetpointer-1.0.1.tar.bz2 + mirrors://xorg/individual/app/xsetroot-1.1.1.tar.bz2 + mirrors://xorg/individual/app/xsm-1.0.3.tar.bz2 + mirrors://xorg/individual/app/xstdcmap-1.0.3.tar.bz2 + mirrors://xorg/individual/app/xvidtune-1.0.3.tar.bz2 + mirrors://xorg/individual/app/xvinfo-1.1.3.tar.bz2 + mirrors://xorg/individual/app/xwd-1.0.6.tar.bz2 + mirrors://xorg/individual/app/xwininfo-1.1.3.tar.bz2 + mirrors://xorg/individual/app/xwud-1.0.4.tar.bz2 + + fontconfig-devel + libdmx-devel + libfontenc-devel + libFS-devel + libICE-devel + libpng-devel + libSM-devel + libXaw-devel + libXcomposite-devel + libXcursor-devel + libXdamage-devel + libXext-devel + libXfixes-devel + libXfont-devel + libXft-devel + libXi-devel + libXinerama-devel + libxkbfile-devel + libXmu-devel + libXrandr-devel + libXrender-devel + libXScrnSaver-devel + libXt-devel + libXtst-devel + libXv-devel + libXxf86dga-devel + libXxf86vm-devel + xbitmaps + xcb-util-devel + libXxf86misc-devel + xorg-proto + util-macros + xtrans + + + + + + + xorg-app + + zlib + libX11 + libXau + libpng + libxcb + freetype + libFS + libSM + libXi + libXt + libXv + libdmx + libXmu + libXaw + libICE + libXft + libXtst + libXext + xcb-util + libXfont + libXrandr + libXfixes + libXrender + fontconfig + libfontenc + libXxf86vm + libXcursor + libXdamage + libxkbfile + libXxf86dga + libXinerama + libXxf86misc + libXcomposite + libXScrnSaver + + + /etc + /usr/bin + /usr/include + /usr/lib + /usr/sbin + /usr/share/X11 + /usr/share/man + + + System.PackageHandler + + + + xorg-app-devel + + libxkbfile-devel + xorg-app + + + /usr/lib/pkgconfig + + + + + + 2015-05-10 + 7.6 + Update. + Burak Ertürk + burakerturk@pisilinux.org + + + 2014-08-31 + 7.6 + Update. + Marcin Bojara + marcin@pisilinux.org + + + 2014-05-16 + 7.6 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-03-07 + 7.6 + Release bump + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-11-06 + 7.6 + Split devel package to prevent lots of devel pack installation. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-09-12 + 7.6 + Update: xfwp, xload, xprop, xset, xwd, xclipboard, twm, xman, xclock, xfindproxy, xkill, xlsclients, xmodmap, xrdb + Marcin Bojara + marcin@pisilinux.org + + + 2013-09-05 + 7.6 + Add missing method to pakhandler.py + Marcin Bojara + marcin@pisilinux.org + + + 2013-08-25 + 7.6 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-08-17 + 7.6 + Dep Fixed + PisiLinux Community + admins@pisilinux.org + + + 2013-07-31 + 7.6 + Update some apps, fix build luit + Marcin Bojara + marcin@pisilinux.org + + + 2013-07-30 + 7.6 + Rebuild + PisiLinux Community + admins@pisilinux.org + + + 2013-06-21 + 7.6 + Update + Marcin Bojara + marcin@pisilinux.org + + + 2013-02-13 + 7.6 + Update + Marcin Bojara + marcin@pisilinux.org + + + 2012-09-25 + 7.6 + First release + Erdem Artan + admins@pisilinux.org + + + diff --git a/x11/misc/xorg-app/translations.xml b/x11/misc/xorg-app/translations.xml new file mode 100644 index 0000000000..050c38b090 --- /dev/null +++ b/x11/misc/xorg-app/translations.xml @@ -0,0 +1,9 @@ + + + + xorg-app + X.Org uygulamaları + Applications de X.Org + X.Org Anwendungen + + diff --git a/x11/server/xorg-server/actions.py b/x11/server/xorg-server/actions.py index 61d7540511..d1ca8858d1 100755 --- a/x11/server/xorg-server/actions.py +++ b/x11/server/xorg-server/actions.py @@ -10,9 +10,8 @@ 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 \ @@ -28,7 +27,7 @@ def setup(): --disable-config-hal \ --enable-xfree86-utils \ --enable-xorg \ - --enable-dmx \ + --disable-dmx \ --enable-xvfb \ --enable-xnest \ --enable-kdrive \ diff --git a/x11/server/xorg-server/files/0001-configure.ac-error-while-checking-for-XDMXCONFIG_DE.patch b/x11/server/xorg-server/files/0001-configure.ac-error-while-checking-for-XDMXCONFIG_DE.patch new file mode 100644 index 0000000000..64c5436ed4 --- /dev/null +++ b/x11/server/xorg-server/files/0001-configure.ac-error-while-checking-for-XDMXCONFIG_DE.patch @@ -0,0 +1,44 @@ +From cd1962b7f9c14bc67e22c07cb9a9cd3a4a119506 Mon Sep 17 00:00:00 2001 +From: Gaetan Nadon +Date: Sat, 28 Nov 2009 21:32:47 -0500 +Subject: [PATCH] configure.ac: error while checking for XDMXCONFIG_DEP + +Introduced in commit 9998105a387e0294054502331a56e1e020cd93e4 +The replacement third parameters to PKG_CHECK_MODULES([DMXMODULES] +was not quoted. + +Signed-off-by: Gaetan Nadon +Reviewed-by: Dan Nicholson +Tested-by: Julien Cristau +--- + configure.ac | 14 +++++++++----- + 1 files changed, 9 insertions(+), 5 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 8500db4..1038734 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1808,11 +1808,15 @@ AM_CONDITIONAL(XQUARTZ_SPARKLE, [test "x$XQUARTZ_SPARKLE" != "xno"]) + AM_CONDITIONAL(STANDALONE_XPBPROXY, [test "x$STANDALONE_XPBPROXY" = xyes]) + + dnl DMX DDX +-PKG_CHECK_MODULES([DMXMODULES], +- [xmuu $LIBXEXT x11 xrender xfixes xfont $LIBXI $DMXPROTO xau $XDMCP_MODULES], +- PKG_CHECK_MODULES([XDMXCONFIG_DEP], [xaw7 xmu xt xpm x11], [have_dmx=yes], +- [have_dmx=no]), +- [have_dmx=no]) ++PKG_CHECK_MODULES( ++ [DMXMODULES], ++ [xmuu $LIBXEXT x11 xrender xfixes xfont $LIBXI $DMXPROTO xau $XDMCP_MODULES], ++ [PKG_CHECK_MODULES( ++ [XDMXCONFIG_DEP], ++ [xaw7 xmu xt xpm x11], ++ [have_dmx=yes], ++ [have_dmx=no])], ++ [have_dmx=no]) + AC_MSG_CHECKING([whether to build Xdmx DDX]) + if test "x$DMX" = xauto; then + DMX="$have_dmx" +-- +1.6.0.4 + diff --git a/x11/server/xorg-server/files/0001-dix-Add-unaccelerated-valuators-to-the-ValuatorMask.patch b/x11/server/xorg-server/files/0001-dix-Add-unaccelerated-valuators-to-the-ValuatorMask.patch new file mode 100644 index 0000000000..86744f1402 --- /dev/null +++ b/x11/server/xorg-server/files/0001-dix-Add-unaccelerated-valuators-to-the-ValuatorMask.patch @@ -0,0 +1,210 @@ +From e1a7f4bb5333b0271d29f785eb55f1c3273e626a Mon Sep 17 00:00:00 2001 +From: Peter Hutterer +Date: Tue, 5 May 2015 14:18:54 +1000 +Subject: [PATCH] dix: Add unaccelerated valuators to the ValuatorMask + +Allows a mask to carry both accelerated and unaccelerated motion at the same +time. + +This is required for xf86-input-libinput where the pointer acceleration +happens in libinput already, but parts of the server, specifically raw events +and DGA rely on device-specific unaccelerated data. + +To ease integration add this as a second set to the ValuatorMask rather than +extending all APIs to carry a second, possibly NULL set of valuators. + +Note that a valuator mask should only be used in either accel/unaccel or +standard mode at any time. Switching requires either a valuator_mask_zero() +call or unsetting all valuators one-by-one. Trying to mix the two will produce +a warning. + +The server has a shortcut for changing a mask with the +valuator_mask_drop_unaccelerated() call. This saves us from having to loop +through all valuators on every event, we can just drop the bits we know we +don't want. + +Signed-off-by: Peter Hutterer +Reviewed-by: Hans de Goede +--- + dix/inpututils.c | 82 +++++++++++++++++++++++++++++++++++++++--- + hw/xfree86/common/xf86Module.h | 2 +- + include/input.h | 15 ++++++++ + include/inpututils.h | 2 ++ + 4 files changed, 95 insertions(+), 6 deletions(-) + +diff --git a/dix/inpututils.c b/dix/inpututils.c +index 5c2a32d..1363988 100644 +--- a/dix/inpututils.c ++++ b/dix/inpututils.c +@@ -505,11 +505,8 @@ valuator_mask_isset(const ValuatorMask *mask, int valuator) + return mask->last_bit >= valuator && BitIsOn(mask->mask, valuator); + } + +-/** +- * Set the valuator to the given floating-point data. +- */ +-void +-valuator_mask_set_double(ValuatorMask *mask, int valuator, double data) ++static inline void ++_valuator_mask_set_double(ValuatorMask *mask, int valuator, double data) + { + mask->last_bit = max(valuator, mask->last_bit); + SetBit(mask->mask, valuator); +@@ -517,6 +514,17 @@ valuator_mask_set_double(ValuatorMask *mask, int valuator, double data) + } + + /** ++ * Set the valuator to the given floating-point data. ++ */ ++void ++valuator_mask_set_double(ValuatorMask *mask, int valuator, double data) ++{ ++ BUG_WARN_MSG(mask->has_unaccelerated, ++ "Do not mix valuator types, zero mask first\n"); ++ _valuator_mask_set_double(mask, valuator, data); ++} ++ ++/** + * Set the valuator to the given integer data. + */ + void +@@ -594,11 +602,15 @@ valuator_mask_unset(ValuatorMask *mask, int valuator) + + ClearBit(mask->mask, valuator); + mask->valuators[valuator] = 0.0; ++ mask->unaccelerated[valuator] = 0.0; + + for (i = 0; i <= mask->last_bit; i++) + if (valuator_mask_isset(mask, i)) + lastbit = max(lastbit, i); + mask->last_bit = lastbit; ++ ++ if (mask->last_bit == -1) ++ mask->has_unaccelerated = FALSE; + } + } + +@@ -611,6 +623,66 @@ valuator_mask_copy(ValuatorMask *dest, const ValuatorMask *src) + valuator_mask_zero(dest); + } + ++Bool ++valuator_mask_has_unaccelerated(const ValuatorMask *mask) ++{ ++ return mask->has_unaccelerated; ++} ++ ++void ++valuator_mask_drop_unaccelerated(ValuatorMask *mask) ++{ ++ memset(mask->unaccelerated, 0, sizeof(mask->unaccelerated)); ++ mask->has_unaccelerated = FALSE; ++} ++ ++/** ++ * Set both accelerated and unaccelerated value for this mask. ++ */ ++void ++valuator_mask_set_unaccelerated(ValuatorMask *mask, ++ int valuator, ++ double accel, ++ double unaccel) ++{ ++ BUG_WARN_MSG(mask->last_bit != -1 && !mask->has_unaccelerated, ++ "Do not mix valuator types, zero mask first\n"); ++ _valuator_mask_set_double(mask, valuator, accel); ++ mask->has_unaccelerated = TRUE; ++ mask->unaccelerated[valuator] = unaccel; ++} ++ ++double ++valuator_mask_get_accelerated(const ValuatorMask *mask, ++ int valuator) ++{ ++ return valuator_mask_get_double(mask, valuator); ++} ++ ++double ++valuator_mask_get_unaccelerated(const ValuatorMask *mask, ++ int valuator) ++{ ++ return mask->unaccelerated[valuator]; ++} ++ ++Bool ++valuator_mask_fetch_unaccelerated(const ValuatorMask *mask, ++ int valuator, ++ double *accel, ++ double *unaccel) ++{ ++ if (valuator_mask_isset(mask, valuator)) { ++ if (accel) ++ *accel = valuator_mask_get_accelerated(mask, valuator); ++ if (unaccel) ++ *unaccel = valuator_mask_get_unaccelerated(mask, valuator); ++ return TRUE; ++ } ++ else ++ return FALSE; ++} ++ + int + CountBits(const uint8_t * mask, int len) + { +diff --git a/hw/xfree86/common/xf86Module.h b/hw/xfree86/common/xf86Module.h +index e68fe9c..6133641 100644 +--- a/hw/xfree86/common/xf86Module.h ++++ b/hw/xfree86/common/xf86Module.h +@@ -81,7 +81,7 @@ typedef enum { + */ + #define ABI_ANSIC_VERSION SET_ABI_VERSION(0, 4) + #define ABI_VIDEODRV_VERSION SET_ABI_VERSION(19, 0) +-#define ABI_XINPUT_VERSION SET_ABI_VERSION(21, 0) ++#define ABI_XINPUT_VERSION SET_ABI_VERSION(21, 1) + #define ABI_EXTENSION_VERSION SET_ABI_VERSION(9, 0) + #define ABI_FONT_VERSION SET_ABI_VERSION(0, 6) + +diff --git a/include/input.h b/include/input.h +index bf22dc7..0a4c4f7 100644 +--- a/include/input.h ++++ b/include/input.h +@@ -674,6 +674,21 @@ extern _X_EXPORT Bool valuator_mask_fetch(const ValuatorMask *mask, + extern _X_EXPORT Bool valuator_mask_fetch_double(const ValuatorMask *mask, + int valnum, double *val); + ++extern _X_EXPORT Bool valuator_mask_has_unaccelerated(const ValuatorMask *mask); ++extern _X_EXPORT void valuator_mask_set_unaccelerated(ValuatorMask *mask, ++ int valuator, ++ double accel, ++ double unaccel); ++extern _X_EXPORT double valuator_mask_get_accelerated(const ValuatorMask *mask, ++ int valuator); ++extern _X_EXPORT double valuator_mask_get_unaccelerated(const ValuatorMask *mask, ++ int valuator); ++extern _X_EXPORT Bool valuator_mask_fetch_unaccelerated(const ValuatorMask *mask, ++ int valuator, ++ double *accel, ++ double *unaccel); ++extern _X_HIDDEN void valuator_mask_drop_unaccelerated(ValuatorMask *mask); ++ + /* InputOption handling interface */ + extern _X_EXPORT InputOption *input_option_new(InputOption *list, + const char *key, +diff --git a/include/inpututils.h b/include/inpututils.h +index 53c96ba..4e90815 100644 +--- a/include/inpututils.h ++++ b/include/inpututils.h +@@ -36,8 +36,10 @@ extern Mask event_filters[MAXDEVICES][MAXEVENTS]; + + struct _ValuatorMask { + int8_t last_bit; /* highest bit set in mask */ ++ int8_t has_unaccelerated; + uint8_t mask[(MAX_VALUATORS + 7) / 8]; + double valuators[MAX_VALUATORS]; /* valuator data */ ++ double unaccelerated[MAX_VALUATORS]; /* valuator data */ + }; + + extern void verify_internal_event(const InternalEvent *ev); +-- +2.4.1 + diff --git a/x11/server/xorg-server/files/0002-dix-hook-up-the-unaccelerated-valuator-masks.patch b/x11/server/xorg-server/files/0002-dix-hook-up-the-unaccelerated-valuator-masks.patch new file mode 100644 index 0000000000..6b8b1e5b5d --- /dev/null +++ b/x11/server/xorg-server/files/0002-dix-hook-up-the-unaccelerated-valuator-masks.patch @@ -0,0 +1,134 @@ +From 7504fbd2239257f1a00a1a15d02862eea81f167c Mon Sep 17 00:00:00 2001 +From: Peter Hutterer +Date: Tue, 5 May 2015 14:48:41 +1000 +Subject: [PATCH] dix: hook up the unaccelerated valuator masks + +If present, access the unaccelerated valuator mask values for DGA and XI2 raw +events. + +Signed-off-by: Peter Hutterer +Reviewed-by: Hans de Goede +--- + dix/getevents.c | 31 ++++++++++++++++++++++--------- + hw/xfree86/common/xf86Xinput.c | 4 ++++ + 2 files changed, 26 insertions(+), 9 deletions(-) + +diff --git a/dix/getevents.c b/dix/getevents.c +index 6fb12c5..64bf76e 100644 +--- a/dix/getevents.c ++++ b/dix/getevents.c +@@ -213,14 +213,25 @@ init_raw(DeviceIntPtr dev, RawDeviceEvent *event, Time ms, int type, int detail) + } + + static void +-set_raw_valuators(RawDeviceEvent *event, ValuatorMask *mask, double *data) ++set_raw_valuators(RawDeviceEvent *event, ValuatorMask *mask, ++ BOOL use_unaccel, double *data) + { + int i; + ++ use_unaccel = use_unaccel && valuator_mask_has_unaccelerated(mask); ++ + for (i = 0; i < valuator_mask_size(mask); i++) { + if (valuator_mask_isset(mask, i)) { ++ double v; ++ + SetBit(event->valuators.mask, i); +- data[i] = valuator_mask_get_double(mask, i); ++ ++ if (use_unaccel) ++ v = valuator_mask_get_unaccelerated(mask, i); ++ else ++ v = valuator_mask_get_double(mask, i); ++ ++ data[i] = v; + } + } + } +@@ -1138,11 +1149,11 @@ GetKeyboardEvents(InternalEvent *events, DeviceIntPtr pDev, int type, + valuator_mask_copy(&mask, mask_in); + + init_raw(pDev, raw, ms, type, key_code); +- set_raw_valuators(raw, &mask, raw->valuators.data_raw); ++ set_raw_valuators(raw, &mask, TRUE, raw->valuators.data_raw); + + clipValuators(pDev, &mask); + +- set_raw_valuators(raw, &mask, raw->valuators.data); ++ set_raw_valuators(raw, &mask, FALSE, raw->valuators.data); + + event = &events->device_event; + init_device_event(event, pDev, ms); +@@ -1423,9 +1434,11 @@ fill_pointer_events(InternalEvent *events, DeviceIntPtr pDev, int type, + num_events++; + + init_raw(pDev, raw, ms, type, buttons); +- set_raw_valuators(raw, &mask, raw->valuators.data_raw); ++ set_raw_valuators(raw, &mask, TRUE, raw->valuators.data_raw); + } + ++ valuator_mask_drop_unaccelerated(&mask); ++ + /* valuators are in driver-native format (rel or abs) */ + + if (flags & POINTER_ABSOLUTE) { +@@ -1438,7 +1451,7 @@ fill_pointer_events(InternalEvent *events, DeviceIntPtr pDev, int type, + transformAbsolute(pDev, &mask); + clipAbsolute(pDev, &mask); + if ((flags & POINTER_NORAW) == 0 && raw) +- set_raw_valuators(raw, &mask, raw->valuators.data); ++ set_raw_valuators(raw, &mask, FALSE, raw->valuators.data); + } + else { + transformRelative(pDev, &mask); +@@ -1446,7 +1459,7 @@ fill_pointer_events(InternalEvent *events, DeviceIntPtr pDev, int type, + if (flags & POINTER_ACCELERATE) + accelPointer(pDev, &mask, ms); + if ((flags & POINTER_NORAW) == 0 && raw) +- set_raw_valuators(raw, &mask, raw->valuators.data); ++ set_raw_valuators(raw, &mask, FALSE, raw->valuators.data); + + moveRelative(pDev, flags, &mask); + } +@@ -1951,7 +1964,7 @@ GetTouchEvents(InternalEvent *events, DeviceIntPtr dev, uint32_t ddx_touchid, + events++; + num_events++; + init_raw(dev, raw, ms, type, client_id); +- set_raw_valuators(raw, &mask, raw->valuators.data_raw); ++ set_raw_valuators(raw, &mask, TRUE, raw->valuators.data_raw); + } + + event = &events->device_event; +@@ -2013,7 +2026,7 @@ GetTouchEvents(InternalEvent *events, DeviceIntPtr dev, uint32_t ddx_touchid, + screeny = dev->spriteInfo->sprite->hotPhys.y; + } + if (need_rawevent) +- set_raw_valuators(raw, &mask, raw->valuators.data); ++ set_raw_valuators(raw, &mask, FALSE, raw->valuators.data); + + /* Indirect device touch coordinates are not used for cursor positioning. + * They are merely informational, and are provided in device coordinates. +diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c +index 1fb5b16..5ce4c71 100644 +--- a/hw/xfree86/common/xf86Xinput.c ++++ b/hw/xfree86/common/xf86Xinput.c +@@ -1137,12 +1137,16 @@ xf86CheckMotionEvent4DGA(DeviceIntPtr device, int is_absolute, + dx = valuator_mask_get(mask, 0); + if (is_absolute) + dx -= device->last.valuators[0]; ++ else if (valuator_mask_has_unaccelerated(mask)) ++ dx = valuator_mask_get_unaccelerated(mask, 0); + } + + if (valuator_mask_isset(mask, 1)) { + dy = valuator_mask_get(mask, 1); + if (is_absolute) + dy -= device->last.valuators[1]; ++ else if (valuator_mask_has_unaccelerated(mask)) ++ dy = valuator_mask_get_unaccelerated(mask, 1); + } + + if (DGAStealMotionEvent(device, idx, dx, dy)) +-- +2.4.1 + diff --git a/x11/server/xorg-server/files/autoconfig-sis.patch b/x11/server/xorg-server/files/autoconfig-sis.patch new file mode 100644 index 0000000000..0b50049db5 --- /dev/null +++ b/x11/server/xorg-server/files/autoconfig-sis.patch @@ -0,0 +1,21 @@ +--- hw/xfree86/common/xf86pciBus.c.orig 2011-09-24 10:53:45.421697668 +0000 ++++ hw/xfree86/common/xf86pciBus.c 2011-09-24 10:55:56.416250708 +0000 +@@ -1200,9 +1200,15 @@ + break; + } + break; +- case 0x1039: +- driverList[0] = "sis"; +- break; ++ case 0x1039: ++ switch (dev->device_id) ++ { ++ case 0x6350: case 0x6351: ++ driverList[0] = "sisimedia"; driverList[1] = "sis"; break; ++ default: ++ driverList[0] = "sis"; break; ++ } ++ break; + case 0x126f: + driverList[0] = "siliconmotion"; + break; diff --git a/x11/server/xorg-server/pspec.xml b/x11/server/xorg-server/pspec.xml index 0270ceb3bf..e308e41507 100755 --- a/x11/server/xorg-server/pspec.xml +++ b/x11/server/xorg-server/pspec.xml @@ -11,7 +11,7 @@ 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 + mirrors://xorg/individual/xserver/xorg-server-1.17.2.tar.bz2 font-util libjpeg-turbo-devel @@ -43,8 +43,17 @@ xcb-util-wm-devel xcb-util-keysyms-devel xcb-util-renderutil-devel + util-macros + xtrans + eudev-devel + freetype-devel + libunwind-devel + libXau-devel + 0001-dix-Add-unaccelerated-valuators-to-the-ValuatorMask.patch + 0002-dix-hook-up-the-unaccelerated-valuator-masks.patch + autoconfig-sis.patch xorg-server-1.17.1-add_prime_support-1.patch default-module-path.patch ubuntu/001_fedora_extramodes.patch @@ -84,6 +93,9 @@ app:console + libXau + eudev + libXdmcp mesa libdrm pixman @@ -149,6 +161,9 @@ app:console Run X clients under wayland + libXau + libXdmcp + libunwind mesa pixman libdrm @@ -168,6 +183,10 @@ app:console Nested X Server + libX11 + libXau + libxcb + libXdmcp xorg-server-common mesa xcb-util @@ -195,6 +214,8 @@ app:console Virtual Framebuffer X Server + libXau + libXdmcp xorg-server-common libXfont pixman @@ -215,6 +236,9 @@ xorg-server-xnest A nested X server that runs as an X application + libX11 + libXau + libXdmcp libXfont libXext libunwind @@ -246,6 +270,13 @@ + + 2015-07-14 + 1.17.2 + Version bump. + Ertuğrul Erata + ertugrulerata@gmail.com + 2015-05-17 1.17.1 @@ -387,4 +418,4 @@ admins@pisilinux.org - \ No newline at end of file +