mirror of
https://gitdl.cn/https://github.com/chakralinux/core.git
synced 2025-02-03 09:07:14 +08:00
next in xorg update, xf86-input packages, including new dep mtdev
This commit is contained in:
parent
368bc913de
commit
b9cd3fc1ac
32
mtdev/PKGBUILD
Normal file
32
mtdev/PKGBUILD
Normal file
@ -0,0 +1,32 @@
|
||||
#
|
||||
# Platform Packages for Chakra, part of chakra-project.org
|
||||
#
|
||||
# maintainer abveritas[at]chakra-project[dot]org>
|
||||
|
||||
pkgname=mtdev
|
||||
pkgver=1.1.2
|
||||
pkgrel=1
|
||||
pkgdesc="A stand-alone library which transforms all variants of kernel MT events to the slotted type B protocol"
|
||||
arch=('i686' 'x86_64')
|
||||
url="http://bitmath.org/code/mtdev"
|
||||
license=('custom:MIT')
|
||||
depends=('glibc')
|
||||
options=('!libtool')
|
||||
source=("$url/$pkgname-$pkgver.tar.bz2")
|
||||
md5sums=('d9c7700918fc392e29da7477ae20c5c2')
|
||||
|
||||
build() {
|
||||
cd "$srcdir/$pkgname-$pkgver"
|
||||
./configure --prefix=/usr --disable-static
|
||||
make
|
||||
}
|
||||
|
||||
package() {
|
||||
cd "$srcdir/$pkgname-$pkgver"
|
||||
make DESTDIR="$pkgdir/" install
|
||||
|
||||
# license
|
||||
install -Dm644 COPYING \
|
||||
"$pkgdir/usr/share/licenses/$pkgname/LICENSE"
|
||||
}
|
||||
|
27
xf86-input-evdev/Fix_inverted_horizontal_scroll.diff
Normal file
27
xf86-input-evdev/Fix_inverted_horizontal_scroll.diff
Normal file
@ -0,0 +1,27 @@
|
||||
From 99340147b9092a5aaec997eca407282a51e1f063 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
Date: Thu, 15 Mar 2012 05:46:32 +0000
|
||||
Subject: Fix inverted horizontal scroll (#46205)
|
||||
|
||||
REL_HWHEEL has a positive increment, not a negative one like REL_WHEEL.
|
||||
|
||||
X.Org Bug 46205 <http://bugs.freedesktop.org/show_bug.cgi?id=46205>
|
||||
|
||||
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
|
||||
---
|
||||
diff --git a/src/evdev.c b/src/evdev.c
|
||||
index d540b87..8cf630c 100644
|
||||
--- a/src/evdev.c
|
||||
+++ b/src/evdev.c
|
||||
@@ -1600,7 +1600,7 @@ EvdevAddRelValuatorClass(DeviceIntPtr device)
|
||||
else if (axis == REL_DIAL)
|
||||
SetScrollValuator(device, axnum, SCROLL_TYPE_VERTICAL, -1.0, SCROLL_FLAG_NONE);
|
||||
else if (axis == REL_HWHEEL)
|
||||
- SetScrollValuator(device, axnum, SCROLL_TYPE_HORIZONTAL, -1.0, SCROLL_FLAG_NONE);
|
||||
+ SetScrollValuator(device, axnum, SCROLL_TYPE_HORIZONTAL, 1.0, SCROLL_FLAG_NONE);
|
||||
#endif
|
||||
}
|
||||
|
||||
--
|
||||
cgit v0.9.0.2-2-gbebe
|
@ -1,29 +1,37 @@
|
||||
#
|
||||
# Platform Packages for Chakra, part of chakra-project.org
|
||||
#
|
||||
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
|
||||
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
|
||||
# maintainer abveritas[at]chakra-project[dot]org>
|
||||
|
||||
pkgname=xf86-input-evdev
|
||||
pkgver=2.6.0
|
||||
pkgrel=3
|
||||
pkgver=2.7.0
|
||||
pkgrel=1
|
||||
pkgdesc="X.org evdev input driver"
|
||||
arch=(i686 x86_64)
|
||||
arch=('i686' 'x86_64')
|
||||
url="http://xorg.freedesktop.org/"
|
||||
license=('custom')
|
||||
depends=('glibc')
|
||||
makedepends=('pkgconfig' 'xorg-server>=1.10.1' 'inputproto>=2.0' 'randrproto>=1.3.1')
|
||||
conflicts=('xorg-server<1.10.1')
|
||||
makedepends=('pkgconfig' 'xorg-server>=1.12.3')
|
||||
conflicts=('xorg-server<1.12.3')
|
||||
options=('!libtool')
|
||||
groups=('xorg-input-drivers')
|
||||
source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
|
||||
sha1sums=('fb6f7a6f5168ae07efe890e4ace9fb8af1d4e1e0')
|
||||
source=("${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2"
|
||||
'Fix_inverted_horizontal_scroll.diff')
|
||||
sha1sums=('f0cb2d8400c33e8e83b538b53512e77ba73367fa'
|
||||
'2210aa4757aecfb4be50bec700b978e208f679ae')
|
||||
|
||||
build() {
|
||||
cd "${srcdir}/${pkgname}-${pkgver}"
|
||||
./configure --prefix=/usr || return 1
|
||||
make || return 1
|
||||
make DESTDIR="${pkgdir}" install || return 1
|
||||
install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
|
||||
install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1
|
||||
|
||||
patch -p1 -i ${srcdir}/Fix_inverted_horizontal_scroll.diff
|
||||
|
||||
./configure --prefix=/usr
|
||||
make
|
||||
}
|
||||
|
||||
package() {
|
||||
cd "${srcdir}/${pkgname}-${pkgver}"
|
||||
make DESTDIR="${pkgdir}" install
|
||||
install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
|
||||
install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
|
||||
}
|
||||
|
@ -1,31 +1,32 @@
|
||||
#
|
||||
# Platform Packages for Chakra, part of chakra-project.org
|
||||
#
|
||||
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
|
||||
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
|
||||
|
||||
# include global config
|
||||
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
|
||||
# maintainer abveritas@chakra-project.org
|
||||
|
||||
pkgname=xf86-input-keyboard
|
||||
pkgver=1.6.0
|
||||
pkgrel=2
|
||||
pkgver=1.6.1
|
||||
pkgrel=1
|
||||
pkgdesc="X.Org keyboard input driver"
|
||||
arch=(i686 x86_64)
|
||||
arch=('i686' 'x86_64')
|
||||
license=('custom')
|
||||
url="http://xorg.freedesktop.org/"
|
||||
depends=('glibc')
|
||||
makedepends=('xorg-server')
|
||||
conflicts=('xorg-server<1.10.1')
|
||||
conflicts=('xorg-server<1.12.3')
|
||||
options=('!libtool')
|
||||
groups=('xorg-input-drivers')
|
||||
source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
|
||||
sha1sums=('8e845086749f8c4b64fdfa852b4b26cf7bb62dc9')
|
||||
source=("${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2")
|
||||
sha1sums=('ef30fecb9e846a5268ae339846401489a785e413')
|
||||
|
||||
build() {
|
||||
cd "${srcdir}/${pkgname}-${pkgver}"
|
||||
./configure --prefix=/usr
|
||||
make
|
||||
}
|
||||
|
||||
package() {
|
||||
cd "${srcdir}/${pkgname}-${pkgver}"
|
||||
|
||||
make DESTDIR="${pkgdir}" install
|
||||
install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
|
||||
install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
|
||||
|
@ -1,23 +1,22 @@
|
||||
#
|
||||
# Platform Packages for Chakra, part of chakra-project.org
|
||||
#
|
||||
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
|
||||
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
|
||||
# maintainer abveritas[at]chakra-project[dot]org>
|
||||
|
||||
pkgname=xf86-input-mouse
|
||||
pkgver=1.7.1
|
||||
pkgver=1.7.2
|
||||
pkgrel=1
|
||||
pkgdesc="X.org mouse input driver"
|
||||
arch=(i686 x86_64)
|
||||
arch=('i686' 'x86_64')
|
||||
license=('custom')
|
||||
url="http://xorg.freedesktop.org/"
|
||||
depends=('glibc')
|
||||
makedepends=('xorg-server')
|
||||
conflicts=('xorg-server<1.10.0')
|
||||
conflicts=('xorg-server<1.12.3')
|
||||
options=('!libtool')
|
||||
groups=('xorg-drivers' 'xorg')
|
||||
source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
|
||||
sha1sums=('11a6402e82d65bda5fb559c5e9bc72f3fd7af2ed')
|
||||
source=("${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2")
|
||||
sha1sums=('0da6390c6f3d7d636110a52f08193739929ae4ae')
|
||||
|
||||
build() {
|
||||
cd "${srcdir}/${pkgname}-${pkgver}"
|
||||
|
@ -1,28 +1,27 @@
|
||||
#
|
||||
# Platform Packages for Chakra, part of chakra-project.org
|
||||
#
|
||||
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
|
||||
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
|
||||
# maintainer abveritas[at]chakra-project[dot]org>
|
||||
|
||||
pkgname=xf86-input-synaptics
|
||||
pkgver=1.5.0
|
||||
pkgver=1.6.2
|
||||
pkgrel=1
|
||||
pkgdesc="Synaptics driver for notebook touchpads"
|
||||
arch=('i686' 'x86_64')
|
||||
license=('custom')
|
||||
url="http://xorg.freedesktop.org/"
|
||||
depends=('libxtst')
|
||||
makedepends=('xorg-server>=1.10.4' 'libxi' 'libx11')
|
||||
conflicts=('xorg-server<1.10.4')
|
||||
depends=('libxtst' 'mtdev')
|
||||
makedepends=('xorg-server>=1.12.3' 'libxi' 'libx11')
|
||||
conflicts=('xorg-server<1.12.3')
|
||||
replaces=('synaptics')
|
||||
provides=('synaptics')
|
||||
conflicts=('synaptics')
|
||||
groups=('xorg-drivers' 'xorg')
|
||||
options=(!libtool)
|
||||
backup=('etc/X11/xorg.conf.d/10-synaptics.conf')
|
||||
source=(http://xorg.freedesktop.org/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
|
||||
10-synaptics.conf)
|
||||
sha1sums=('7373c1e3f02bf7e18f71b65762a982d907b4a053'
|
||||
source=("http://xorg.freedesktop.org/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2"
|
||||
'10-synaptics.conf')
|
||||
sha1sums=('6e59871c0cb683a1fa84731db73a662727a76976'
|
||||
'68e1f4ef5e1038231d210eb422fa4d18c5922f0f')
|
||||
|
||||
build() {
|
||||
|
@ -1,27 +1,23 @@
|
||||
#
|
||||
# Chakra Packages for Chakra, part of chakra-project.org
|
||||
#
|
||||
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
|
||||
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
|
||||
|
||||
# include global config
|
||||
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
|
||||
# maintainer abveritas@chakra-project.org
|
||||
|
||||
pkgname=xf86-input-wacom
|
||||
pkgver=0.11.1
|
||||
pkgrel=2
|
||||
pkgver=0.16.0
|
||||
pkgrel=1
|
||||
pkgdesc="X.Org Wacom tablet driver."
|
||||
arch=('i686' 'x86_64')
|
||||
url="http://linuxwacom.sourceforge.net/"
|
||||
license=('GPL')
|
||||
backup=('etc/X11/xorg.conf.d/50-wacom.conf')
|
||||
depends=('libxi' 'libxrandr')
|
||||
depends=('libxi' 'libxrandr' 'libxinerama')
|
||||
makedepends=('xorg-server' 'libxext' 'libxi')
|
||||
conflicts=('xorg-server<1.10.0')
|
||||
conflicts=('xorg-server<1.12.3')
|
||||
options=(!libtool)
|
||||
source=("http://downloads.sourceforge.net/project/linuxwacom/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
|
||||
'70-wacom.rules')
|
||||
md5sums=('0aec4a338cc583ed497b6af68d6d80ab'
|
||||
md5sums=('aeee2bd339c825a9b1215df6a2e5e50b'
|
||||
'10db4f8272286690255c1bcc18bfdd92')
|
||||
|
||||
build() {
|
||||
@ -34,8 +30,8 @@ package() {
|
||||
cd "${srcdir}/${pkgname}-${pkgver}"
|
||||
make DESTDIR="${pkgdir}" install
|
||||
|
||||
install -m755 -d "${pkgdir}/lib/udev/rules.d"
|
||||
install -m644 "${srcdir}/70-wacom.rules" "${pkgdir}/lib/udev/rules.d/"
|
||||
install -m755 -d "${pkgdir}/usr/lib/udev/rules.d"
|
||||
install -m644 "${srcdir}/70-wacom.rules" "${pkgdir}/usr/lib/udev/rules.d/"
|
||||
}
|
||||
|
||||
# vim:set ts=2 sw=2 et:
|
||||
|
@ -26,18 +26,23 @@ source=("${url}/releases/individual/xserver/${pkgname}-${pkgver}.tar.bz2"
|
||||
'autoconfig-nvidia.patch'
|
||||
'xvfb-run'
|
||||
'xvfb-run.1'
|
||||
'10-quirks.conf')
|
||||
'10-quirks.conf'
|
||||
'autoconfig-sis.patch')
|
||||
sha1sums=('f3f3d59f3c5e15459152987ffc644f06a0d1374f'
|
||||
'746f0204050ceca7caa111b52a87336b7356dcd2'
|
||||
'c94f742d3f9cabf958ae58e4015d9dd185aabedc'
|
||||
'6838fc00ef4618c924a77e0fb03c05346080908a'
|
||||
'993798f3d22ad672d769dae5f48d1fa068d5578f')
|
||||
'993798f3d22ad672d769dae5f48d1fa068d5578f'
|
||||
'175de5630b43dbc97778adfba5563b7fdd77f11f')
|
||||
|
||||
build() {
|
||||
cd "${srcdir}/${pkgname}-${pkgver}"
|
||||
|
||||
# Use nouveau/nv/nvidia drivers for nvidia devices
|
||||
patch -p1 -i "${srcdir}/autoconfig-nvidia.patch"
|
||||
|
||||
# Use unofficial imedia SiS driver for supported SiS devices
|
||||
patch -p0 -i "${srcdir}/autoconfig-sis.patch"
|
||||
|
||||
autoreconf -fiv
|
||||
./configure --prefix=/usr \
|
||||
|
21
xorg-server/autoconfig-sis.patch
Normal file
21
xorg-server/autoconfig-sis.patch
Normal file
@ -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;
|
Loading…
Reference in New Issue
Block a user