Date: Tuesday, February 10, 2015 @ 22:19:58 Author: lcarlier Revision: 231243
Initial import of xf86-input-libinput driver Added: xf86-input-libinput/ xf86-input-libinput/repos/ xf86-input-libinput/trunk/ xf86-input-libinput/trunk/90-libinput.conf xf86-input-libinput/trunk/PKGBUILD Modified: xf86-video-ast/trunk/PKGBUILD xf86-video-ast/trunk/git-fix.diff xf86-video-geode/trunk/PKGBUILD xf86-video-sisimedia/trunk/PKGBUILD xf86-video-v4l/trunk/PKGBUILD --------------------------------------------+ xf86-input-libinput/trunk/90-libinput.conf | 30 ++++ xf86-input-libinput/trunk/PKGBUILD | 39 ++++++ xf86-video-ast/trunk/PKGBUILD | 8 - xf86-video-ast/trunk/git-fix.diff | 174 +++++++++++++++++++++++++++ xf86-video-geode/trunk/PKGBUILD | 6 xf86-video-sisimedia/trunk/PKGBUILD | 6 xf86-video-v4l/trunk/PKGBUILD | 6 7 files changed, 256 insertions(+), 13 deletions(-) Added: xf86-input-libinput/trunk/90-libinput.conf =================================================================== --- xf86-input-libinput/trunk/90-libinput.conf (rev 0) +++ xf86-input-libinput/trunk/90-libinput.conf 2015-02-10 21:19:58 UTC (rev 231243) @@ -0,0 +1,30 @@ +# Match on all types of devices but tablet devices and joysticks + +Section "InputClass" + Identifier "libinput pointer catchall" + MatchIsPointer "on" + MatchDevicePath "/dev/input/event*" + Driver "libinput" +EndSection + +Section "InputClass" + Identifier "libinput keyboard catchall" + MatchIsKeyboard "on" + MatchDevicePath "/dev/input/event*" + Driver "libinput" +EndSection + +Section "InputClass" + Identifier "libinput touchpad catchall" + MatchIsTouchpad "on" + MatchDevicePath "/dev/input/event*" + Driver "libinput" +EndSection + +Section "InputClass" + Identifier "libinput touchscreen catchall" + MatchIsTouchscreen "on" + MatchDevicePath "/dev/input/event*" + Driver "libinput" +EndSection + Added: xf86-input-libinput/trunk/PKGBUILD =================================================================== --- xf86-input-libinput/trunk/PKGBUILD (rev 0) +++ xf86-input-libinput/trunk/PKGBUILD 2015-02-10 21:19:58 UTC (rev 231243) @@ -0,0 +1,39 @@ +# $Id$ +# Maintainer: Laurent Carlier <[email protected]> + +pkgname=xf86-input-libinput +pkgver=0.6.0 +pkgrel=1 +pkgdesc="Generic input driver for the X.Org server based on libinput" +arch=('i686' 'x86_64') +license=('custom') +url="http://xorg.freedesktop.org/"; +depends=('libinput') +makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=21' 'libxi' 'libx11' 'resourceproto' 'scrnsaverproto') +conflicts=('xorg-server<1.16' 'X-ABI-XINPUT_VERSION<21' 'X-ABI-XINPUT_VERSION>=22') +groups=('xorg-drivers' 'xorg') +source=(http://xorg.freedesktop.org/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2{,.sig} + 90-libinput.conf) +sha256sums=('2f29be1ed7f9b9c597b6f5c6ef24c37a244a0ba87ccd1c2586ffa4d08452ad79' + 'SKIP' + 'd4a728caadb7924852dcdc0da4de950c6fb9ebd8999d4e3af3d0baaa51cd0e75') +validpgpkeys=('3C2C43D9447D5938EF4551EBE23B7E70B467F0BF') # Peter Hutterer (Who-T) <[email protected]> + +build() { + cd ${pkgname}-${pkgver} + + ./configure --prefix=/usr --disable-static + make +} + +package() { + cd ${pkgname}-${pkgver} + + make DESTDIR="${pkgdir}" install + + install -m755 -d "${pkgdir}/usr/share/X11/xorg.conf.d" + install -m644 ../90-libinput.conf "${pkgdir}/usr/share/X11/xorg.conf.d/" + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" +} + Property changes on: xf86-input-libinput/trunk/PKGBUILD ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Modified: xf86-video-ast/trunk/PKGBUILD =================================================================== --- xf86-video-ast/trunk/PKGBUILD 2015-02-10 21:09:27 UTC (rev 231242) +++ xf86-video-ast/trunk/PKGBUILD 2015-02-10 21:19:58 UTC (rev 231243) @@ -3,18 +3,18 @@ pkgname=xf86-video-ast pkgver=0.97.0 -pkgrel=5 +pkgrel=6 pkgdesc="X.org ASPEED AST Graphics video driver" arch=(i686 x86_64) url="http://xorg.freedesktop.org/"; license=('custom') depends=('glibc') -makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=18') -conflicts=('xorg-server<1.16' 'X-ABI-VIDEODRV_VERSION<18' 'X-ABI-VIDEODRV_VERSION>=19') +makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=19') +conflicts=('xorg-server<1.16' 'X-ABI-VIDEODRV_VERSION<19' 'X-ABI-VIDEODRV_VERSION>=20') groups=('xorg-drivers' 'xorg') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fix.diff) sha256sums=('28fcd4781676485293f6dcd46e0797866f6219e22e1851c9796b037589998e76' - '8f032dd9f1441e2af4e443166f0e3d3a6ce4ef7f351af8789158d2dec18a52fa') + '523911aacaf60a583ad3c306ba9e91ea6ea080d8285edccfc20e0cdd807b75a0') prepare() { cd ${pkgname}-${pkgver} Modified: xf86-video-ast/trunk/git-fix.diff =================================================================== --- xf86-video-ast/trunk/git-fix.diff 2015-02-10 21:09:27 UTC (rev 231242) +++ xf86-video-ast/trunk/git-fix.diff 2015-02-10 21:19:58 UTC (rev 231243) @@ -194,3 +194,177 @@ #include "micmap.h" -- cgit v0.9.0.2-2-gbebe +From: Egbert Eich <[email protected]> + +xf86PciInfo.h is not needed in the ASpeed driver at all. + +Signed-off-by: Egbert Eich <[email protected]> +--- + src/ast_2dtool.c | 1 - + src/ast_accel.c | 1 - + src/ast_cursor.c | 1 - + src/ast_driver.c | 1 - + src/ast_mode.c | 1 - + src/ast_tool.c | 1 - + src/ast_vgatool.c | 1 - + 7 files changed, 7 deletions(-) + +diff --git a/src/ast_2dtool.c b/src/ast_2dtool.c +index 210d75c..47f0d64 100644 +--- a/src/ast_2dtool.c ++++ b/src/ast_2dtool.c +@@ -36,7 +36,6 @@ + #include "xf86xv.h" + #include <X11/extensions/Xv.h> + +-#include "xf86PciInfo.h" + #include "xf86Pci.h" + + /* framebuffer offscreen manager */ +diff --git a/src/ast_accel.c b/src/ast_accel.c +index 71eeb79..3bfe7ee 100644 +--- a/src/ast_accel.c ++++ b/src/ast_accel.c +@@ -36,7 +36,6 @@ + #include "xf86xv.h" + #include <X11/extensions/Xv.h> + +-#include "xf86PciInfo.h" + #include "xf86Pci.h" + + /* framebuffer offscreen manager */ +diff --git a/src/ast_cursor.c b/src/ast_cursor.c +index 80d787a..7bfa15f 100644 +--- a/src/ast_cursor.c ++++ b/src/ast_cursor.c +@@ -36,7 +36,6 @@ + #include "xf86xv.h" + #include <X11/extensions/Xv.h> + +-#include "xf86PciInfo.h" + #include "xf86Pci.h" + + /* framebuffer offscreen manager */ +diff --git a/src/ast_driver.c b/src/ast_driver.c +index 5f7fa8e..c2ba129 100644 +--- a/src/ast_driver.c ++++ b/src/ast_driver.c +@@ -40,7 +40,6 @@ + #include "xf86xv.h" + #include <X11/extensions/Xv.h> + +-#include "xf86PciInfo.h" + #include "xf86Pci.h" + + /* framebuffer offscreen manager */ +diff --git a/src/ast_mode.c b/src/ast_mode.c +index 964fe7a..8c3d828 100644 +--- a/src/ast_mode.c ++++ b/src/ast_mode.c +@@ -36,7 +36,6 @@ + #include "xf86xv.h" + #include <X11/extensions/Xv.h> + +-#include "xf86PciInfo.h" + #include "xf86Pci.h" + + /* framebuffer offscreen manager */ +diff --git a/src/ast_tool.c b/src/ast_tool.c +index 7f1362e..1e1cb6b 100644 +--- a/src/ast_tool.c ++++ b/src/ast_tool.c +@@ -36,7 +36,6 @@ + #include "xf86xv.h" + #include <X11/extensions/Xv.h> + +-#include "xf86PciInfo.h" + #include "xf86Pci.h" + + /* framebuffer offscreen manager */ +diff --git a/src/ast_vgatool.c b/src/ast_vgatool.c +index 73d379c..8522a6f 100644 +--- a/src/ast_vgatool.c ++++ b/src/ast_vgatool.c +@@ -36,7 +36,6 @@ + #include "xf86xv.h" + #include <X11/extensions/Xv.h> + +-#include "xf86PciInfo.h" + #include "xf86Pci.h" + + /* framebuffer offscreen manager */ +-- +1.8.4.5 +From: [email protected] Egbert Eich +To: +Date: Thu, 24 Apr 2014 19:36:50 +0200 +Subject: [PATCH driver/ast 02/15] Fix compiler warnings: get rid of deprecated IOADDRESS + +From: Egbert Eich <[email protected]> + +For newer ABI versions IOADDRESS can be replaced by int +which is big enough to hold an PIO offset. + +Signed-off-by: Egbert Eich <[email protected]> +--- + src/ast.h | 6 ++++-- + src/ast_driver.c | 18 ++++++++---------- + 2 files changed, 12 insertions(+), 12 deletions(-) + +diff --git a/src/ast.h b/src/ast.h +index cbe62fb..3b56a6c 100644 +--- a/src/ast.h ++++ b/src/ast.h +@@ -261,9 +261,11 @@ typedef struct _ASTRec { + unsigned long FbMapSize; + unsigned long MMIOMapSize; + +- IOADDRESS IODBase; /* Base of PIO memory area */ +- IOADDRESS PIOOffset; ++#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 + IOADDRESS RelocateIO; ++#else ++ int RelocateIO; ++#endif + + VIDEOMODE VideoModeInfo; + ASTRegRec SavedReg; +diff --git a/src/ast_driver.c b/src/ast_driver.c +index c2ba129..639562d 100644 +--- a/src/ast_driver.c ++++ b/src/ast_driver.c +@@ -570,23 +570,21 @@ ASTPreInit(ScrnInfoPtr pScrn, int flags) + xf86DrvMsg(pScrn->scrnIndex, from, "Chipset: \"%s\"\n", + (pScrn->chipset != NULL) ? pScrn->chipset : "Unknown ast"); + +- /* Resource Allocation */ ++ + #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 +- pAST->IODBase = pScrn->domainIOBase; +-#else +- pAST->IODBase = 0; +-#endif + /* "Patch" the PIOOffset inside vgaHW in order to force + * the vgaHW module to use our relocated i/o ports. + */ ++ VGAHWPTR(pScrn)->PIOOffset = ++ pScrn->domainIOBase + PCI_REGION_BASE(pAST->PciInfo, 2, REGION_IO) - 0x380; ++ ++ pAST->RelocateIO = pScrn->domainIOBase + ++ PCI_REGION_BASE(pAST->PciInfo, 2, REGION_IO); ++#else ++ pAST->RelocateIO = (PCI_REGION_BASE(pAST->PciInfo, 2, REGION_IO)); + +-#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 +- VGAHWPTR(pScrn)->PIOOffset = /* ... */ + #endif +- pAST->PIOOffset = +- pAST->IODBase + PCI_REGION_BASE(pAST->PciInfo, 2, REGION_IO) - 0x380; + +- pAST->RelocateIO = (IOADDRESS)(PCI_REGION_BASE(pAST->PciInfo, 2, REGION_IO) + pAST->IODBase); + + if (pAST->pEnt->device->MemBase != 0) { + pAST->FBPhysAddr = pAST->pEnt->device->MemBase; +-- +1.8.4.5 + Modified: xf86-video-geode/trunk/PKGBUILD =================================================================== --- xf86-video-geode/trunk/PKGBUILD 2015-02-10 21:09:27 UTC (rev 231242) +++ xf86-video-geode/trunk/PKGBUILD 2015-02-10 21:19:58 UTC (rev 231243) @@ -4,7 +4,7 @@ pkgname=xf86-video-geode pkgver=2.11.16 -pkgrel=1 +pkgrel=2 pkgdesc="X.org AMD/Geode LX & NX video driver" # there is no 64bit geode arch=(i686) @@ -11,8 +11,8 @@ license=('custom') url="http://xorg.freedesktop.org/"; depends=('glibc') -makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=18') -conflicts=('xorg-server<1.16' 'X-ABI-VIDEODRV_VERSION<18' 'X-ABI-VIDEODRV_VERSION>=19') +makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=19') +conflicts=('xorg-server<1.16' 'X-ABI-VIDEODRV_VERSION<19' 'X-ABI-VIDEODRV_VERSION>=20') options=('!libtool') conflicts=('xf86-video-amd') replaces=('xf86-video-amd') Modified: xf86-video-sisimedia/trunk/PKGBUILD =================================================================== --- xf86-video-sisimedia/trunk/PKGBUILD 2015-02-10 21:09:27 UTC (rev 231242) +++ xf86-video-sisimedia/trunk/PKGBUILD 2015-02-10 21:19:58 UTC (rev 231243) @@ -3,14 +3,14 @@ pkgname=xf86-video-sisimedia pkgver=0.9.1 -pkgrel=9 +pkgrel=10 pkgdesc="X.org SiS 671 video driver" arch=(i686 x86_64) url="http://www.linuxconsulting.ro/xorg-drivers/"; license=('custom') depends=('glibc') -makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=18' 'xf86dgaproto') -conflicts=('xorg-server<1.16' 'X-ABI-VIDEODRV_VERSION<18' 'X-ABI-VIDEODRV_VERSION>=19') +makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=19' 'xf86dgaproto') +conflicts=('xorg-server<1.16' 'X-ABI-VIDEODRV_VERSION<19' 'X-ABI-VIDEODRV_VERSION>=20') source=(https://sources.archlinux.org/other/xf86-video-sisimedia/xf86-video-sisimedia-0.9.1_20091203.tar.bz2 xf86-video-sis-0.9.1-20102701.patch 0002-Remove-XFree86-Misc-PassMessage-support.patch Modified: xf86-video-v4l/trunk/PKGBUILD =================================================================== --- xf86-video-v4l/trunk/PKGBUILD 2015-02-10 21:09:27 UTC (rev 231242) +++ xf86-video-v4l/trunk/PKGBUILD 2015-02-10 21:19:58 UTC (rev 231243) @@ -3,14 +3,14 @@ pkgname=xf86-video-v4l pkgver=0.2.0 -pkgrel=14 +pkgrel=15 pkgdesc="X.org v4l video driver" arch=(i686 x86_64) url="http://xorg.freedesktop.org/"; license=('custom') depends=('glibc') -makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=18') -conflicts=('xorg-server<1.16' 'X-ABI-VIDEODRV_VERSION<18' 'X-ABI-VIDEODRV_VERSION>=19') +makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=19') +conflicts=('xorg-server<1.16' 'X-ABI-VIDEODRV_VERSION<19' 'X-ABI-VIDEODRV_VERSION>=20') groups=('xorg-drivers' 'xorg') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fixes.patch
