xorg-server works 3

This commit is contained in:
Ertuğrul Erata
2015-07-14 16:02:02 +03:00
parent 5e961bf0bd
commit b8af4bc0fa
24 changed files with 1281 additions and 2 deletions
+2
View File
@@ -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()
+1
View File
@@ -19,6 +19,7 @@
<Dependency>libXext-devel</Dependency>
<Dependency>libjpeg-turbo-devel</Dependency>
<Dependency>tiff-devel</Dependency>
<Dependency>freetype-devel</Dependency>
</BuildDependencies>
<Patches>
<Patch level="1">imlib2-1.4.5-no-my-libs.patch</Patch>
+3
View File
@@ -13,6 +13,9 @@
<Summary>The MAD id3tag library</Summary>
<Description>libid3tag is a library for reading and (eventually) writing ID3 tags, both ID3v1 and the various versions of ID3v2.</Description>
<Archive sha1sum="4d867e8a8436e73cd7762fe0e85958e35f1e4306" type="targz">mirrors://sourceforge/mad/libid3tag-0.15.1b.tar.gz</Archive>
<BuildDependencies>
<Dependency>zlib-devel</Dependency>
</BuildDependencies>
<Patches>
<Patch>libid3tag-0.15.1b-fix_overflow.patch</Patch>
<Patch level="1">libid3tag-0.15.1b-unknown-encoding.patch</Patch>
+20
View File
@@ -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")
+86
View File
@@ -0,0 +1,86 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>libXres</Name>
<Homepage>http://www.x.org/</Homepage>
<Packager>
<Name>PisiLinux Community</Name>
<Email>admins@pisilinux.org</Email>
</Packager>
<License>MIT</License>
<IsA>library</IsA>
<Summary>X.Org Xres library</Summary>
<Description>X-Resource is an extension that allows a client to query the X server about its usage of various resources.</Description>
<Archive sha1sum="45e09c6b771af5d8c448ce31de65d15bf83b7579" type="tarbz2">mirrors://xorg/individual/lib/libXres-1.0.7.tar.bz2</Archive>
<BuildDependencies>
<Dependency>libX11-devel</Dependency>
<Dependency>libXext-devel</Dependency>
<Dependency>util-macros</Dependency>
</BuildDependencies>
</Source>
<Package>
<Name>libXres</Name>
<RuntimeDependencies>
<Dependency>libX11</Dependency>
<Dependency>libXext</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="library">/usr/lib</Path>
<Path fileType="doc">/usr/share/doc</Path>
</Files>
</Package>
<Package>
<Name>libXres-devel</Name>
<Summary>Development files for libXres</Summary>
<RuntimeDependencies>
<Dependency release="current">libXres</Dependency>
<Dependency>libXext-devel</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include/X11</Path>
<Path fileType="data">/usr/lib/pkgconfig</Path>
<Path fileType="man">/usr/share/man</Path>
</Files>
</Package>
<History>
<Update release="5">
<Date>2014-05-16</Date>
<Version>1.0.7</Version>
<Comment>Release bump.</Comment>
<Name>Marcin Bojara</Name>
<Email>marcin@pisilinux.org</Email>
</Update>
<Update release="4">
<Date>2013-10-07</Date>
<Version>1.0.7</Version>
<Comment>Rebuild.</Comment>
<Name>Serdar Soytetir</Name>
<Email>kaptan@pisilinux.org</Email>
</Update>
<Update release="3">
<Date>2013-08-25</Date>
<Version>1.0.7</Version>
<Comment>Release bump.</Comment>
<Name>Marcin Bojara</Name>
<Email>marcin@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2013-06-21</Date>
<Version>1.0.7</Version>
<Comment>Version bump.</Comment>
<Name>Marcin Bojara</Name>
<Email>marcin@pisilinux.org</Email>
</Update>
<Update release="1">
<Date>2012-06-01</Date>
<Version>1.0.6</Version>
<Comment>First release</Comment>
<Name>Erdem Artan</Name>
<Email>admins@pisilinux.org</Email>
</Update>
</History>
</PISI>
+14
View File
@@ -0,0 +1,14 @@
<?xml version="1.0" ?>
<PISI>
<Source>
<Name>libXres</Name>
<Summary xml:lang="tr">X.Org Xres kitaplığı</Summary>
<Summary xml:lang="fr">Librairie Xres de X.Org</Summary>
<Summary xml:lang="de">X.Org Xres Bibliothek</Summary>
</Source>
<Package>
<Name>libXres-devel</Name>
<Summary xml:lang="tr">libXres için geliştirme dosyaları</Summary>
</Package>
</PISI>
+20
View File
@@ -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")
+107
View File
@@ -0,0 +1,107 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>libXxf86misc</Name>
<Homepage>http://www.x.org/</Homepage>
<Packager>
<Name>PisiLinux Community</Name>
<Email>admins@pisilinux.org</Email>
</Packager>
<License>MIT</License>
<IsA>library</IsA>
<Summary>X.Org Xxf86misc library</Summary>
<Description>LibXxf86misc is the client library for the XFree86-misc extension.</Description>
<Archive sha1sum="8bed53f728e646e8c216dd0840a9e41a66c44845" type="targz">http://source.pisilinux.org/1.0/libXxf86misc-1.0.3.tar.gz</Archive>
<BuildDependencies>
<Dependency>libXext-devel</Dependency>
<Dependency>libXxf86miscproto-devel</Dependency>
<Dependency>xorg-proto</Dependency>
<Dependency>util-macros</Dependency>
</BuildDependencies>
</Source>
<Package>
<Name>libXxf86misc</Name>
<RuntimeDependencies>
<Dependency>libXext</Dependency>
<Dependency>libXxf86miscproto</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="library">/usr/lib</Path>
<Path fileType="doc">/usr/share/doc</Path>
</Files>
</Package>
<Package>
<Name>libXxf86misc-devel</Name>
<Summary>Development files for libXxf86misc</Summary>
<RuntimeDependencies>
<Dependency release="current">libXxf86misc</Dependency>
<Dependency>libXext-devel</Dependency>
<Dependency>libXxf86miscproto-devel</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include/X11</Path>
<Path fileType="data">/usr/lib/pkgconfig</Path>
<Path fileType="data">/usr/lib32/pkgconfig</Path>
<Path fileType="man">/usr/share/man</Path>
</Files>
</Package>
<Package>
<Name>libXxf86misc-32bit</Name>
<PartOf>emul32</PartOf>
<Summary>32-bit shared libraries for libXxf86misc</Summary>
<BuildType>emul32</BuildType>
<BuildDependencies>
<Dependency>libXext-32bit</Dependency>
</BuildDependencies>
<RuntimeDependencies>
<Dependency release="current">libXxf86misc</Dependency>
<Dependency>libXext-32bit</Dependency>
<Dependency>libX11-32bit</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="library">/usr/lib32</Path>
</Files>
</Package>
<History>
<Update release="5">
<Date>2014-05-16</Date>
<Version>1.0.3</Version>
<Comment>Release bump.</Comment>
<Name>Marcin Bojara</Name>
<Email>marcin@pisilinux.org</Email>
</Update>
<Update release="4">
<Date>2013-10-07</Date>
<Version>1.0.3</Version>
<Comment>Release bump.</Comment>
<Name>Serdar Soytetir</Name>
<Email>kaptan@pisilinux.org</Email>
</Update>
<Update release="3">
<Date>2013-08-25</Date>
<Version>1.0.3</Version>
<Comment>Release bump.</Comment>
<Name>Marcin Bojara</Name>
<Email>marcin@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2013-07-30</Date>
<Version>1.0.3</Version>
<Comment>Rebuild</Comment>
<Name>PisiLinux Community</Name>
<Email>admins@pisilinux.org</Email>
</Update>
<Update release="1">
<Date>2012-10-23</Date>
<Version>1.0.3</Version>
<Comment>First release</Comment>
<Name>PisiLinux Community</Name>
<Email>admins@pisilinux.org</Email>
</Update>
</History>
</PISI>
+19
View File
@@ -0,0 +1,19 @@
<?xml version="1.0" ?>
<PISI>
<Source>
<Name>libXxf86misc</Name>
<Summary xml:lang="tr">X.Org libXxf86misc kitaplığı</Summary>
<Summary xml:lang="fr">Librairie libXxf86misc de X.Org</Summary>
<Summary xml:lang="de">X.Org libXxf86misc Bibliothek</Summary>
</Source>
<Package>
<Name>libXxf86misc-devel</Name>
<Summary xml:lang="tr">libXxf86misc için geliştirme dosyaları</Summary>
</Package>
<Package>
<Name>libXxf86misc-32bit</Name>
<Summary xml:lang="tr">libXxf86misc için 32-bit paylaşımlı kitaplıklar</Summary>
</Package>
</PISI>
+20
View File
@@ -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")
+89
View File
@@ -0,0 +1,89 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>libXxf86miscproto</Name>
<Homepage>http://www.x.org/</Homepage>
<Packager>
<Name>PisiLinux Community</Name>
<Email>admins@pisilinux.org</Email>
</Packager>
<License>MIT</License>
<IsA>library</IsA>
<Summary>X.Org Xxf86miscproto library</Summary>
<Description>LibXxf86miscproto is the client library for the XFree86-miscproto extension.</Description>
<Archive sha1sum="52c54ed17e55f26b26654ff16d61da97f9fd36bc" type="tarbz2">mirrors://xorg/individual/proto/xf86miscproto-0.9.3.tar.bz2</Archive>
<BuildDependencies>
<Dependency>util-macros</Dependency>
<Dependency>libXext-devel</Dependency>
<Dependency>xorg-proto</Dependency>
</BuildDependencies>
</Source>
<Package>
<Name>libXxf86miscproto</Name>
<Files>
<Path fileType="library">/usr/lib</Path>
<Path fileType="doc">/usr/share/doc</Path>
</Files>
</Package>
<Package>
<Name>libXxf86miscproto-devel</Name>
<Summary>Development files for libXxf86miscproto</Summary>
<RuntimeDependencies>
<Dependency release="current">libXxf86miscproto</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include/X11</Path>
<Path fileType="data">/usr/lib/pkgconfig</Path>
<Path fileType="data">/usr/lib32/pkgconfig</Path>
<Path fileType="man">/usr/share/man</Path>
</Files>
</Package>
<History>
<Update release="6">
<Date>2014-05-16</Date>
<Version>0.9.3</Version>
<Comment>Release bump.</Comment>
<Name>Marcin Bojara</Name>
<Email>marcin@pisilinux.org</Email>
</Update>
<Update release="5">
<Date>2013-11-06</Date>
<Version>0.9.3</Version>
<Comment>Fix deps.</Comment>
<Name>Serdar Soytetir</Name>
<Email>kaptan@pisilinux.org</Email>
</Update>
<Update release="4">
<Date>2013-10-07</Date>
<Version>0.9.3</Version>
<Comment>Rebuild.</Comment>
<Name>Serdar Soytetir</Name>
<Email>kaptan@pisilinux.org</Email>
</Update>
<Update release="3">
<Date>2013-08-25</Date>
<Version>0.9.3</Version>
<Comment>Release bump.</Comment>
<Name>Marcin Bojara</Name>
<Email>marcin@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2013-02-17</Date>
<Version>0.9.3</Version>
<Comment>Version bump.</Comment>
<Name>Marcin Bojara</Name>
<Email>marcin@pisilinux.org</Email>
</Update>
<Update release="1">
<Date>2012-10-23</Date>
<Version>0.9.2</Version>
<Comment>First release</Comment>
<Name>PisiLinux Community</Name>
<Email>admins@pisilinux.org</Email>
</Update>
</History>
</PISI>
@@ -0,0 +1,14 @@
<?xml version="1.0" ?>
<PISI>
<Source>
<Name>libXxf86miscproto</Name>
<Summary xml:lang="tr">X.Org libXxf86miscproto kitaplığı</Summary>
<Summary xml:lang="fr">Librairie libXxf86miscproto de X.Org</Summary>
<Summary xml:lang="de">X.Org libXxf86miscproto Bibliothek</Summary>
</Source>
<Package>
<Name>libXxf86miscproto-devel</Name>
<Summary xml:lang="tr">libXxf86miscproto için geliştirme dosyaları</Summary>
</Package>
</PISI>
+3
View File
@@ -0,0 +1,3 @@
<PISI>
<Name>x11.misc</Name>
</PISI>
+20
View File
@@ -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")
+50
View File
@@ -0,0 +1,50 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>xbitmaps</Name>
<Homepage>http://www.x.org/</Homepage>
<Packager>
<Name>PisiLinux Community</Name>
<Email>admins@pisilinux.org</Email>
</Packager>
<License>MIT</License>
<IsA>library</IsA>
<Summary>X.Org static graphics</Summary>
<Description>xbitmaps provides static graphics needed by Xorg applications to draw screen elements.</Description>
<Archive sha1sum="578afff7e4912192b524c25254cf7f54c16e57d8" type="tarbz2">mirrors://xorg/individual/data/xbitmaps-1.1.1.tar.bz2</Archive>
</Source>
<Package>
<Name>xbitmaps</Name>
<Files>
<Path fileType="header">/usr/include/X11/bitmaps</Path>
<Path fileType="data">/usr/lib/pkgconfig</Path>
<Path fileType="data">/usr/share/pkgconfig</Path>
</Files>
</Package>
<History>
<Update release="3">
<Date>2014-05-15</Date>
<Version>1.1.1</Version>
<Comment>Rebuild.</Comment>
<Name>Alihan Öztürk</Name>
<Email>alihan@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2013-08-25</Date>
<Version>1.1.0</Version>
<Comment>Release bump.</Comment>
<Name>Marcin Bojara</Name>
<Email>marcin@pisilinux.org</Email>
</Update>
<Update release="1">
<Date>2010-12-14</Date>
<Version>1.1.0</Version>
<Comment>First release</Comment>
<Name>Pisi Linux Admins</Name>
<Email>admins@pisilinux.org</Email>
</Update>
</History>
</PISI>
+10
View File
@@ -0,0 +1,10 @@
<?xml version="1.0" ?>
<PISI>
<Source>
<Name>xbitmaps</Name>
<Summary xml:lang="tr">X.Org statik grafikleri</Summary>
<Summary xml:lang="fr">Utilitaire Xbitmaps de X.Org</Summary>
<Summary xml:lang="de">X.Org xbitmaps Werkzeug</Summary>
<Description xml:lang="tr">xbitmaps, ekran öğeleri çizmek için Xorg uygulamaları tarafından ihtiyaç duyulan statik grafikleri içerir.</Description>
</Source>
</PISI>
+56
View File
@@ -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 <unistd.h>)", 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("../")
+54
View File
@@ -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)
+303
View File
@@ -0,0 +1,303 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>xorg-app</Name>
<Homepage>http://www.x.org/</Homepage>
<Packager>
<Name>PisiLinux Community</Name>
<Email>admins@pisilinux.org</Email>
</Packager>
<License>MIT</License>
<IsA>app:console</IsA>
<IsA>app:gui</IsA>
<Summary>X.Org applications</Summary>
<Description>xorg-app contains base Xorg applications.</Description>
<Archive sha1sum="f89d6fff84d838c0b8b4adeca46185b6d4812a27" type="tarbz2">mirrors://xorg/individual/app/appres-1.0.4.tar.bz2</Archive>
<Archive sha1sum="93fca9876367b0950b57680237a7dfc1a520ffac" type="tarbz2">mirrors://xorg/individual/app/bdftopcf-1.0.5.tar.bz2</Archive>
<Archive sha1sum="c019342dd3e7071d944b6efae5b3e058d77f46be" type="tarbz2">mirrors://xorg/individual/app/beforelight-1.0.5.tar.bz2</Archive>
<Archive sha1sum="84fc49daa5411677d05a134ee2f7e76301fa89d8" type="tarbz2">mirrors://xorg/individual/app/bitmap-1.0.8.tar.bz2</Archive>
<Archive sha1sum="dfaecb0b038d5c8d7244c518cf8c0c48d10455f9" type="tarbz2">mirrors://xorg/individual/app/editres-1.0.6.tar.bz2</Archive>
<Archive sha1sum="a609fba513947e5267c924f85774c0e44a076a7d" type="tarbz2">mirrors://xorg/individual/app/fonttosfnt-1.0.4.tar.bz2</Archive>
<Archive sha1sum="0a0d37c65a8cdd3aff22d633b5ed164e864929d4" type="tarbz2">mirrors://xorg/individual/app/fslsfonts-1.0.5.tar.bz2</Archive>
<Archive sha1sum="aeafc2cd82092168d0bc4b94c5a27d7e070598fd" type="tarbz2">mirrors://xorg/individual/app/fstobdf-1.0.6.tar.bz2</Archive>
<Archive sha1sum="83d67e47167de52192c679a0f0a41f4ba51a5b94" type="tarbz2">mirrors://xorg/individual/app/iceauth-1.0.7.tar.bz2</Archive>
<Archive sha1sum="53e7bb52227f2458bf20c7f95f34b19c26cf8885" type="tarbz2">mirrors://xorg/individual/app/ico-1.0.4.tar.bz2</Archive>
<Archive sha1sum="ff226b0e565c337ac1ae60027487131920b8d86b" type="tarbz2">mirrors://xorg/individual/app/listres-1.0.3.tar.bz2</Archive>
<Archive sha1sum="3130c14d7267cecce0ba2280643844b48cca49b0" type="tarbz2">mirrors://xorg/individual/app/luit-1.1.1.tar.bz2</Archive>
<Archive sha1sum="a0daa928b449998a2374c0472fd715792075f8b3" type="tarbz2">mirrors://xorg/individual/app/mkcomposecache-1.2.1.tar.bz2</Archive>
<Archive sha1sum="3c06dad8a5fbf7362b51fb7d6b1ab805eba40336" type="tarbz2">mirrors://xorg/individual/app/mkfontdir-1.0.7.tar.bz2</Archive>
<Archive sha1sum="da32fe297732355eea71d4a94ed003be93d1eae7" type="tarbz2">mirrors://xorg/individual/app/mkfontscale-1.1.2.tar.bz2</Archive>
<Archive sha1sum="1aa05864019a55610aca5471c5206858dde9a34a" type="tarbz2">mirrors://xorg/individual/app/oclock-1.0.3.tar.bz2</Archive>
<Archive sha1sum="31da797a325afac7d892f0409ef0fc7df5b6adbb" type="tarbz2">mirrors://xorg/individual/app/rendercheck-1.4.tar.bz2</Archive>
<Archive sha1sum="542fade81a74f8a6beaea8cb517bdf1033fc6b71" type="tarbz2">mirrors://xorg/individual/app/rgb-1.0.6.tar.bz2</Archive>
<Archive sha1sum="97fad3686b4687104a58b3f2b7b387d316b26b92" type="tarbz2">mirrors://xorg/individual/app/rstart-1.0.5.tar.bz2</Archive>
<Archive sha1sum="e5785e243cea56c48a6492f6ec329c5cf7dbbca6" type="tarbz2">mirrors://xorg/individual/app/scripts-1.0.1.tar.bz2</Archive>
<Archive sha1sum="a27a476f7f39ae30a16dfa25ca07c12378cff7f0" type="tarbz2">mirrors://xorg/individual/app/sessreg-1.1.0.tar.bz2</Archive>
<Archive sha1sum="d10885d6215b06789961c67557df46406f99c2b7" type="tarbz2">mirrors://xorg/individual/app/setxkbmap-1.3.0.tar.bz2</Archive>
<Archive sha1sum="203f4e655333723af7b2c47a85dfba8258f22ebc" type="tarbz2">mirrors://xorg/individual/app/showfont-1.0.5.tar.bz2</Archive>
<Archive sha1sum="59e19def9a351896cb3101cb580ae424e9e48a3e" type="tarbz2">mirrors://xorg/individual/app/smproxy-1.0.5.tar.bz2</Archive>
<Archive sha1sum="b568e6242c5a2b9a05d0a198b96f3d43cf792931" type="tarbz2">mirrors://xorg/individual/app/twm-1.0.8.tar.bz2</Archive>
<Archive sha1sum="02d251213b18b1f2588f20663e89052df58bcb8a" type="tarbz2">mirrors://xorg/individual/app/viewres-1.0.4.tar.bz2</Archive>
<Archive sha1sum="d820e95ee6698e7036d4823f5ac5669b79acea86" type="tarbz2">mirrors://xorg/individual/app/x11perf-1.5.4.tar.bz2</Archive>
<Archive sha1sum="5d1f9f59aea271af8fc098cedef469f7a9337747" type="tarbz2">mirrors://xorg/individual/app/xauth-1.0.9.tar.bz2</Archive>
<Archive sha1sum="861c2ce6a9ff44e93dece8c69508af9d826c032a" type="tarbz2">mirrors://xorg/individual/app/xbacklight-1.2.1.tar.bz2</Archive>
<Archive sha1sum="17337a951264f0f96f6d03893f9dfd9cf8f12a5a" type="tarbz2">mirrors://xorg/individual/app/xbiff-1.0.3.tar.bz2</Archive>
<Archive sha1sum="4f9e14b9ff91e3976b702bdad92f639df80cf406" type="tarbz2">mirrors://xorg/individual/app/xcalc-1.0.6.tar.bz2</Archive>
<Archive sha1sum="971ac3900b4eb5ad54f3c3d9527e96ccdcb9e504" type="tarbz2">mirrors://xorg/individual/app/xclipboard-1.1.3.tar.bz2</Archive>
<Archive sha1sum="1b54b96e057469f90a00a9f1ca79ed056cbde271" type="tarbz2">mirrors://xorg/individual/app/xclock-1.0.7.tar.bz2</Archive>
<Archive sha1sum="a633f76af38ea40b33d55c3ac820fd19f17f9428" type="tarbz2">mirrors://xorg/individual/app/xcmsdb-1.0.4.tar.bz2</Archive>
<Archive sha1sum="a9cf78ea32bac51ff584115381f195566b164fe3" type="tarbz2">mirrors://xorg/individual/app/xcompmgr-1.1.6.tar.bz2</Archive>
<Archive sha1sum="1b3b3a2342bb94fecc70d7401da10ef7bbcc98a0" type="tarbz2">mirrors://xorg/individual/app/xconsole-1.0.6.tar.bz2</Archive>
<Archive sha1sum="e6d5cc03ce1829cc7eea39526ca7b8688aac468b" type="tarbz2">mirrors://xorg/individual/app/xcursorgen-1.0.6.tar.bz2</Archive>
<Archive sha1sum="281bee72116311e2d8393ae53ea832e9d267eded" type="tarbz2">mirrors://xorg/individual/app/xdbedizzy-1.1.0.tar.bz2</Archive>
<Archive sha1sum="38eb96a186d9e0507291be30a9b9b65de667635b" type="tarbz2">mirrors://xorg/individual/app/xditview-1.0.3.tar.bz2</Archive>
<Archive sha1sum="8b208d16754bb1ad8daa958e6e57ead363fb82ea" type="tarbz2">mirrors://xorg/individual/app/xdpyinfo-1.3.1.tar.bz2</Archive>
<Archive sha1sum="f37b5d0f8ec461955f0419dbb1890d8cf63d179d" type="tarbz2">mirrors://xorg/individual/app/xedit-1.2.2.tar.bz2</Archive>
<Archive sha1sum="e737bc46c58b9bb10f0af9883dce203bbed708aa" type="tarbz2">mirrors://xorg/individual/app/xev-1.2.2.tar.bz2</Archive>
<Archive sha1sum="efe6116d31a7f69e4fb6038613e52b0960b9b61c" type="tarbz2">mirrors://xorg/individual/app/xeyes-1.1.1.tar.bz2</Archive>
<Archive sha1sum="030659e3728f5f7142e1cf727f147aceeabe4b9e" type="tarbz2">mirrors://xorg/individual/app/xf86dga-1.0.3.tar.bz2</Archive>
<Archive sha1sum="cac5ca0f5fb6044840b15cf6fb9c541bd4fbce4a" type="tarbz2">mirrors://xorg/individual/app/xfd-1.1.2.tar.bz2</Archive>
<Archive sha1sum="9fb43a73ff805bfe2d4b7d49831dd1cf26d6f3f0" type="tarbz2">mirrors://xorg/individual/app/xfindproxy-1.0.4.tar.bz2</Archive>
<Archive sha1sum="fbd8fa8a1c87d8da2e71def964e97bca1d4c4adf" type="tarbz2">mirrors://xorg/individual/app/xfontsel-1.0.5.tar.bz2</Archive>
<Archive sha1sum="5b8c653476a09e65d93eb7e40da99794366699f5" type="tarbz2">mirrors://xorg/individual/app/xfs-1.1.4.tar.bz2</Archive>
<Archive sha1sum="7513e16ba5c8fef31aeaff4a42bf131859e75ee0" type="tarbz2">mirrors://xorg/individual/app/xfsinfo-1.0.5.tar.bz2</Archive>
<Archive sha1sum="ee1b47d2525e2132be628304577e43727077fa3b" type="tarbz2">mirrors://xorg/individual/app/xfwp-1.0.3.tar.bz2</Archive>
<Archive sha1sum="af1484d0d70bc71dc9d3b7b95645881b7165c41b" type="tarbz2">mirrors://xorg/individual/app/xgamma-1.0.6.tar.bz2</Archive>
<Archive sha1sum="642f9a286bac77ccb20ee42d03920028f6f5894b" type="tarbz2">mirrors://xorg/individual/app/xgc-1.0.5.tar.bz2</Archive>
<Archive sha1sum="8abfb0554e14a074f0dbfdda4919880e088545cb" type="tarbz2">mirrors://xorg/individual/app/xhost-1.0.7.tar.bz2</Archive>
<Archive sha1sum="859d98b428c4b343f40fd93dd6c63bec1f546ae4" type="tarbz2">mirrors://xorg/individual/app/xinput-1.6.1.tar.bz2</Archive>
<Archive sha1sum="113c93679c9245141b5899240f59fcc8227d8dc1" type="tarbz2">mirrors://xorg/individual/app/xkbcomp-1.3.0.tar.bz2</Archive>
<Archive sha1sum="629fea940692f9d971dfae36cd697b13337caaba" type="tarbz2">mirrors://xorg/individual/app/xkbevd-1.1.4.tar.bz2</Archive>
<Archive sha1sum="c0c1e71a32f7d8bfc40539e7f315ca7e02d99205" type="tarbz2">mirrors://xorg/individual/app/xkbprint-1.0.4.tar.bz2</Archive>
<Archive sha1sum="b09aef7cc3853eb12dbda332f55adec3add4447b" type="tarbz2">mirrors://xorg/individual/app/xkbutils-1.0.4.tar.bz2</Archive>
<Archive sha1sum="3a9c253ed698ae2e6c176a6f4a5a7d43497818f6" type="tarbz2">mirrors://xorg/individual/app/xkill-1.0.4.tar.bz2</Archive>
<Archive sha1sum="4a34135ff51c3bc4029d6644e60e03f17ccf8c81" type="tarbz2">mirrors://xorg/individual/app/xload-1.1.2.tar.bz2</Archive>
<Archive sha1sum="8087ca621c48506b26bb2cf3219a957b31537267" type="tarbz2">mirrors://xorg/individual/app/xlogo-1.0.4.tar.bz2</Archive>
<Archive sha1sum="0946410a2cd02b0dee7809fd75be090fb3961e9c" type="tarbz2">mirrors://xorg/individual/app/xlsatoms-1.1.2.tar.bz2</Archive>
<Archive sha1sum="a980aa006c0ca180e4c79be2bd6514205dd218a3" type="tarbz2">mirrors://xorg/individual/app/xlsclients-1.1.3.tar.bz2</Archive>
<Archive sha1sum="4631ad287cecd4c8c3301fc10f6001d00d2e06ef" type="tarbz2">mirrors://xorg/individual/app/xlsfonts-1.0.5.tar.bz2</Archive>
<Archive sha1sum="a5055999e61bd03d7741e534a776d9e1388a8cc8" type="tarbz2">mirrors://xorg/individual/app/xmag-1.0.5.tar.bz2</Archive>
<Archive sha1sum="9d83b14869ffadfda3407a2ab3b5fee13f667366" type="tarbz2">mirrors://xorg/individual/app/xman-1.1.3.tar.bz2</Archive>
<Archive sha1sum="cc04934fa71167505a027fbe202b574deeac38d7" type="tarbz2">mirrors://xorg/individual/app/xmessage-1.0.4.tar.bz2</Archive>
<Archive sha1sum="09f7b3f683b0fe93da62e4dc8ed023fcacca078a" type="tarbz2">mirrors://xorg/individual/app/xmh-1.0.3.tar.bz2</Archive>
<Archive sha1sum="fe735c8bbba68d7eb50f82d4e092fdcadf161314" type="tarbz2">mirrors://xorg/individual/app/xmodmap-1.0.9.tar.bz2</Archive>
<Archive sha1sum="7db4e5feb82d5d05038722d3af00d28e103bed18" type="tarbz2">mirrors://xorg/individual/app/xmore-1.0.2.tar.bz2</Archive>
<Archive sha1sum="0645404e9aa2c9f979e4d006c483633bf6cfc2d9" type="tarbz2">mirrors://xorg/individual/app/xpr-1.0.4.tar.bz2</Archive>
<Archive sha1sum="f62e85e333132ea746fee7d99ca20a9e5b24e77b" type="tarbz2">mirrors://xorg/individual/app/xprop-1.2.2.tar.bz2</Archive>
<Archive sha1sum="30fde46b9ed9f3fa8a9c05837723306299f62a37" type="tarbz2">mirrors://xorg/individual/app/xrandr-1.4.3.tar.bz2</Archive>
<Archive sha1sum="b95ae53b767ee7b56baa55fc78eb9c0b9e5ccd29" type="tarbz2">mirrors://xorg/individual/app/xrdb-1.1.0.tar.bz2</Archive>
<Archive sha1sum="f0372afb62f75ad29343abc96dbf80be12050b72" type="tarbz2">mirrors://xorg/individual/app/xrefresh-1.0.5.tar.bz2</Archive>
<Archive sha1sum="62a5e7ec91e6900b798a88ca3b30d25bd5ef3047" type="tarbz2">mirrors://xorg/individual/app/xset-1.2.3.tar.bz2</Archive>
<Archive sha1sum="add4e6a91c9d0e7d1a80b3534c64d6b7bf633ea0" type="tarbz2">mirrors://xorg/individual/app/xsetmode-1.0.0.tar.bz2</Archive>
<Archive sha1sum="a8b01c6f27625a6f6943f9be17b1e5511f69d710" type="tarbz2">mirrors://xorg/individual/app/xsetpointer-1.0.1.tar.bz2</Archive>
<Archive sha1sum="63bfcf55e95553df1e28f538bf009883568115d1" type="tarbz2">mirrors://xorg/individual/app/xsetroot-1.1.1.tar.bz2</Archive>
<Archive sha1sum="3bb51cdea219729cbdaa491afe90f1d33fe64c40" type="tarbz2">mirrors://xorg/individual/app/xsm-1.0.3.tar.bz2</Archive>
<Archive sha1sum="b7fcc50ae6100d2ba91d6847969fd9d2b6784a90" type="tarbz2">mirrors://xorg/individual/app/xstdcmap-1.0.3.tar.bz2</Archive>
<Archive sha1sum="5ed9967f61cb7f6698fc6da6a2ca7afc5305468d" type="tarbz2">mirrors://xorg/individual/app/xvidtune-1.0.3.tar.bz2</Archive>
<Archive sha1sum="08ff744f7735317fd2fe1b0d2feba8c34cc2e5eb" type="tarbz2">mirrors://xorg/individual/app/xvinfo-1.1.3.tar.bz2</Archive>
<Archive sha1sum="d1573340d67ce4a2dae31477a8e5459e36dda967" type="tarbz2">mirrors://xorg/individual/app/xwd-1.0.6.tar.bz2</Archive>
<Archive sha1sum="179253e6b8266bc3e3b6496964077c9cdcb2dcba" type="tarbz2">mirrors://xorg/individual/app/xwininfo-1.1.3.tar.bz2</Archive>
<Archive sha1sum="786cd4b18bf576fae3ffd417545b1394b27c7f06" type="tarbz2">mirrors://xorg/individual/app/xwud-1.0.4.tar.bz2</Archive>
<BuildDependencies>
<Dependency>fontconfig-devel</Dependency>
<Dependency>libdmx-devel</Dependency>
<Dependency>libfontenc-devel</Dependency>
<Dependency>libFS-devel</Dependency>
<Dependency>libICE-devel</Dependency>
<Dependency>libpng-devel</Dependency>
<Dependency>libSM-devel</Dependency>
<Dependency>libXaw-devel</Dependency>
<Dependency>libXcomposite-devel</Dependency>
<Dependency>libXcursor-devel</Dependency>
<Dependency>libXdamage-devel</Dependency>
<Dependency>libXext-devel</Dependency>
<Dependency>libXfixes-devel</Dependency>
<Dependency>libXfont-devel</Dependency>
<Dependency>libXft-devel</Dependency>
<Dependency>libXi-devel</Dependency>
<Dependency>libXinerama-devel</Dependency>
<Dependency>libxkbfile-devel</Dependency>
<Dependency>libXmu-devel</Dependency>
<Dependency>libXrandr-devel</Dependency>
<Dependency>libXrender-devel</Dependency>
<Dependency>libXScrnSaver-devel</Dependency>
<Dependency>libXt-devel</Dependency>
<Dependency>libXtst-devel</Dependency>
<Dependency>libXv-devel</Dependency>
<Dependency>libXxf86dga-devel</Dependency>
<Dependency>libXxf86vm-devel</Dependency>
<Dependency>xbitmaps</Dependency>
<Dependency>xcb-util-devel</Dependency>
<Dependency>libXxf86misc-devel</Dependency>
<Dependency>xorg-proto</Dependency>
<Dependency>util-macros</Dependency>
<Dependency>xtrans</Dependency>
</BuildDependencies>
<Patches>
</Patches>
</Source>
<Package>
<Name>xorg-app</Name>
<RuntimeDependencies>
<Dependency>zlib</Dependency>
<Dependency>libX11</Dependency>
<Dependency>libXau</Dependency>
<Dependency>libpng</Dependency>
<Dependency>libxcb</Dependency>
<Dependency>freetype</Dependency>
<Dependency>libFS</Dependency>
<Dependency>libSM</Dependency>
<Dependency>libXi</Dependency>
<Dependency>libXt</Dependency>
<Dependency>libXv</Dependency>
<Dependency>libdmx</Dependency>
<Dependency>libXmu</Dependency>
<Dependency>libXaw</Dependency>
<Dependency>libICE</Dependency>
<Dependency>libXft</Dependency>
<Dependency>libXtst</Dependency>
<Dependency>libXext</Dependency>
<Dependency>xcb-util</Dependency>
<Dependency>libXfont</Dependency>
<Dependency>libXrandr</Dependency>
<Dependency>libXfixes</Dependency>
<Dependency>libXrender</Dependency>
<Dependency>fontconfig</Dependency>
<Dependency>libfontenc</Dependency>
<Dependency>libXxf86vm</Dependency>
<Dependency>libXcursor</Dependency>
<Dependency>libXdamage</Dependency>
<Dependency>libxkbfile</Dependency>
<Dependency>libXxf86dga</Dependency>
<Dependency>libXinerama</Dependency>
<Dependency>libXxf86misc</Dependency>
<Dependency>libXcomposite</Dependency>
<Dependency>libXScrnSaver</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="config">/etc</Path>
<Path fileType="executable">/usr/bin</Path>
<Path fileType="header">/usr/include</Path>
<Path fileType="library">/usr/lib</Path>
<Path fileType="executable">/usr/sbin</Path>
<Path fileType="data">/usr/share/X11</Path>
<Path fileType="man">/usr/share/man</Path>
</Files>
<Provides>
<COMAR script="pakhandler.py">System.PackageHandler</COMAR>
</Provides>
</Package>
<Package>
<Name>xorg-app-devel</Name>
<RuntimeDependencies>
<Dependency>libxkbfile-devel</Dependency>
<Dependency relase="current">xorg-app</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="data">/usr/lib/pkgconfig</Path>
</Files>
</Package>
<History>
<Update release="14">
<Date>2015-05-10</Date>
<Version>7.6</Version>
<Comment>Update.</Comment>
<Name>Burak Ertürk</Name>
<Email>burakerturk@pisilinux.org</Email>
</Update>
<Update release="13">
<Date>2014-08-31</Date>
<Version>7.6</Version>
<Comment>Update.</Comment>
<Name>Marcin Bojara</Name>
<Email>marcin@pisilinux.org</Email>
</Update>
<Update release="12">
<Date>2014-05-16</Date>
<Version>7.6</Version>
<Comment>Release bump.</Comment>
<Name>Marcin Bojara</Name>
<Email>marcin@pisilinux.org</Email>
</Update>
<Update release="11">
<Date>2014-03-07</Date>
<Version>7.6</Version>
<Comment>Release bump</Comment>
<Name>Serdar Soytetir</Name>
<Email>kaptan@pisilinux.org</Email>
</Update>
<Update release="10">
<Date>2013-11-06</Date>
<Version>7.6</Version>
<Comment>Split devel package to prevent lots of devel pack installation.</Comment>
<Name>Serdar Soytetir</Name>
<Email>kaptan@pisilinux.org</Email>
</Update>
<Update release="9">
<Date>2013-09-12</Date>
<Version>7.6</Version>
<Comment>Update: xfwp, xload, xprop, xset, xwd, xclipboard, twm, xman, xclock, xfindproxy, xkill, xlsclients, xmodmap, xrdb</Comment>
<Name>Marcin Bojara</Name>
<Email>marcin@pisilinux.org</Email>
</Update>
<Update release="8">
<Date>2013-09-05</Date>
<Version>7.6</Version>
<Comment>Add missing method to pakhandler.py</Comment>
<Name>Marcin Bojara</Name>
<Email>marcin@pisilinux.org</Email>
</Update>
<Update release="7">
<Date>2013-08-25</Date>
<Version>7.6</Version>
<Comment>Release bump.</Comment>
<Name>Marcin Bojara</Name>
<Email>marcin@pisilinux.org</Email>
</Update>
<Update release="6">
<Date>2013-08-17</Date>
<Version>7.6</Version>
<Comment>Dep Fixed</Comment>
<Name>PisiLinux Community</Name>
<Email>admins@pisilinux.org</Email>
</Update>
<Update release="5">
<Date>2013-07-31</Date>
<Version>7.6</Version>
<Comment>Update some apps, fix build luit</Comment>
<Name>Marcin Bojara</Name>
<Email>marcin@pisilinux.org</Email>
</Update>
<Update release="4">
<Date>2013-07-30</Date>
<Version>7.6</Version>
<Comment>Rebuild</Comment>
<Name>PisiLinux Community</Name>
<Email>admins@pisilinux.org</Email>
</Update>
<Update release="3">
<Date>2013-06-21</Date>
<Version>7.6</Version>
<Comment>Update</Comment>
<Name>Marcin Bojara</Name>
<Email>marcin@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2013-02-13</Date>
<Version>7.6</Version>
<Comment>Update</Comment>
<Name>Marcin Bojara</Name>
<Email>marcin@pisilinux.org</Email>
</Update>
<Update release="1">
<Date>2012-09-25</Date>
<Version>7.6</Version>
<Comment>First release</Comment>
<Name>Erdem Artan</Name>
<Email>admins@pisilinux.org</Email>
</Update>
</History>
</PISI>
+9
View File
@@ -0,0 +1,9 @@
<?xml version="1.0" ?>
<PISI>
<Source>
<Name>xorg-app</Name>
<Summary xml:lang="tr">X.Org uygulamaları</Summary>
<Summary xml:lang="fr">Applications de X.Org</Summary>
<Summary xml:lang="de">X.Org Anwendungen</Summary>
</Source>
</PISI>
@@ -0,0 +1,210 @@
From e1a7f4bb5333b0271d29f785eb55f1c3273e626a Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
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 <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
---
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
@@ -0,0 +1,134 @@
From 7504fbd2239257f1a00a1a15d02862eea81f167c Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
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 <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
---
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
@@ -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;
+16 -2
View File
@@ -11,7 +11,7 @@
<License>MIT</License>
<Summary>X.Org X Server</Summary>
<Description>X server is the main application that allows a graphical interface.</Description>
<Archive sha1sum="490118810a54e91c8814245c99d6285caf4985dd" type="tarbz2">mirrors://xorg/individual/xserver/xorg-server-1.17.1.tar.bz2</Archive>
<Archive sha1sum="56ac29a82b99bcf4c7ba2fca41a44cfa18748262" type="tarbz2">mirrors://xorg/individual/xserver/xorg-server-1.17.2.tar.bz2</Archive>
<BuildDependencies>
<Dependency>font-util</Dependency>
<Dependency>libjpeg-turbo-devel</Dependency>
@@ -43,8 +43,15 @@
<Dependency>xcb-util-wm-devel</Dependency>
<Dependency>xcb-util-keysyms-devel</Dependency>
<Dependency>xcb-util-renderutil-devel</Dependency>
<Dependency>util-macros</Dependency>
<Dependency>xtrans</Dependency>
<Dependency>eudev-devel</Dependency>
<Dependency>freetype-devel</Dependency>
</BuildDependencies>
<Patches>
<Patch level="1">0001-dix-Add-unaccelerated-valuators-to-the-ValuatorMask.patch</Patch>
<Patch level="1">0002-dix-hook-up-the-unaccelerated-valuator-masks.patch</Patch>
<Patch>autoconfig-sis.patch</Patch>
<Patch level="1">xorg-server-1.17.1-add_prime_support-1.patch</Patch>
<Patch level="1">default-module-path.patch</Patch>
<Patch level="1">ubuntu/001_fedora_extramodes.patch</Patch>
@@ -246,6 +253,13 @@
</Package>
<History>
<Update release="21">
<Date>2015-07-14</Date>
<Version>1.17.2</Version>
<Comment>Version bump.</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
<Update release="20">
<Date>2015-05-17</Date>
<Version>1.17.1</Version>
@@ -387,4 +401,4 @@
<Email>admins@pisilinux.org</Email>
</Update>
</History>
</PISI>
</PISI>