[arch-commits] Commit in xorg-server/trunk (10-evdev.conf 10-quirks.conf PKGBUILD)
Jan de Groot
jgc at archlinux.org
Sun Apr 4 17:25:57 UTC 2010
Date: Sunday, April 4, 2010 @ 13:25:56
Author: jgc
Revision: 75842
upgpkg: xorg-server 1.8.0-1
Update to 1.8.0:
- depend on libgcrypt instead of OpenSSL
- use config-udev instead of hal for hotplugging
- add default configuration from Fedora, those are more sane
- Remove patches
- Requires rebuild of all drivers.
Added:
xorg-server/trunk/10-evdev.conf
xorg-server/trunk/10-quirks.conf
Modified:
xorg-server/trunk/PKGBUILD
----------------+
10-evdev.conf | 39 +++++++++++++++++++++++++++++++++++++++
10-quirks.conf | 10 ++++++++++
PKGBUILD | 41 ++++++++++++++++-------------------------
3 files changed, 65 insertions(+), 25 deletions(-)
Added: 10-evdev.conf
===================================================================
--- 10-evdev.conf (rev 0)
+++ 10-evdev.conf 2010-04-04 17:25:56 UTC (rev 75842)
@@ -0,0 +1,39 @@
+# Catchall classes for input devices
+# We don't simply match on any device since that also adds accelerometers
+# and other devices that we don't really want to use. The list below
+# matches everything but joysticks.
+
+Section "InputClass"
+ Identifier "evdev pointer catchall"
+ MatchIsPointer "on"
+ MatchDevicePath "/dev/input/event*"
+ Driver "evdev"
+EndSection
+
+Section "InputClass"
+ Identifier "evdev keyboard catchall"
+ MatchIsKeyboard "on"
+ MatchDevicePath "/dev/input/event*"
+ Driver "evdev"
+EndSection
+
+Section "InputClass"
+ Identifier "evdev touchpad catchall"
+ MatchIsTouchpad "on"
+ MatchDevicePath "/dev/input/event*"
+ Driver "evdev"
+EndSection
+
+Section "InputClass"
+ Identifier "evdev tablet catchall"
+ MatchIsTablet "on"
+ MatchDevicePath "/dev/input/event*"
+ Driver "evdev"
+EndSection
+
+Section "InputClass"
+ Identifier "evdev touchscreen catchall"
+ MatchIsTouchscreen "on"
+ MatchDevicePath "/dev/input/event*"
+ Driver "evdev"
+EndSection
Added: 10-quirks.conf
===================================================================
--- 10-quirks.conf (rev 0)
+++ 10-quirks.conf 2010-04-04 17:25:56 UTC (rev 75842)
@@ -0,0 +1,10 @@
+# Collection of quirks and blacklist/whitelists for specific devices.
+
+
+# Accelerometer device, posts data through ABS_X/ABS_Y, making X unusable
+# http://bugs.freedesktop.org/show_bug.cgi?id=22442
+Section "InputClass"
+ Identifier "ThinkPad HDAPS accelerometer blacklist"
+ MatchProduct "ThinkPad HDAPS accelerometer data"
+ Option "Ignore" "on"
+EndSection
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2010-04-04 14:51:07 UTC (rev 75841)
+++ PKGBUILD 2010-04-04 17:25:56 UTC (rev 75842)
@@ -2,33 +2,33 @@
# Maintainer: Jan de Groot <jgc at archlinux.org>
pkgname=xorg-server
-pkgver=1.7.6
-pkgrel=3
+pkgver=1.8.0
+pkgrel=1
pkgdesc="X.Org X servers"
arch=('i686' 'x86_64')
license=('custom')
url="http://xorg.freedesktop.org"
-depends=('hal>=0.5.14' 'libgl' 'libxfont>=1.4.1' 'openssl>=1.0.0' 'libpciaccess>=0.10.9' 'libxv>=1.0.5' 'pixman>=0.16.6' 'xcursor-themes>=1.0.2'
-'xkeyboard-config>=1.8' 'xorg-server-utils' 'xorg-fonts-misc' 'xbitmaps' 'diffutils' 'xf86-input-evdev>=2.2.5' 'inputproto>=2.0')
-makedepends=('libx11>=1.3' 'mesa>=7.7.0.901' 'xf86driproto>=2.1.0' 'xtrans>=1.2.4' 'libxkbfile>=1.0.6' 'randrproto>=1.3.1' 'renderproto>=0.11' 'xcmiscproto>=1.2.0' 'bigreqsproto>=1.1.0' 'resourceproto>=1.1.0' 'videoproto>=2.3.0' 'compositeproto>=0.4.1' 'scrnsaverproto>=1.2.0' 'xf86dgaproto>=2.1' 'libgl>=7.7' 'glproto>=1.4.10' 'xorg-util-macros>=1.3.0' 'xineramaproto>=1.2' 'recordproto')
+depends=('libgl' 'libxfont>=1.4.1' 'libgcrypt>=1.4.5' 'udev>=151' 'libpciaccess>=0.10.9' 'libxv>=1.0.5' 'pixman>=0.18.0' 'xcursor-themes>=1.0.2' 'xkeyboard-config>=1.8' 'xorg-server-utils' 'xorg-fonts-misc' 'xbitmaps' 'diffutils' 'xf86-input-evdev>=2.2.5' 'inputproto>=2.0')
+makedepends=('libx11>=1.3.3' 'mesa>=7.8' 'xf86driproto>=2.1.0' 'xtrans>=1.2.5' 'libxkbfile>=1.0.6' 'randrproto>=1.3.1' 'renderproto>=0.11' 'xcmiscproto>=1.2.0' 'bigreqsproto>=1.1.0' 'resourceproto>=1.1.0' 'videoproto>=2.3.0' 'compositeproto>=0.4.1' 'scrnsaverproto>=1.2.0' 'xf86dgaproto>=2.1' 'libgl>=7.8' 'glproto>=1.4.11' 'xorg-util-macros>=1.6.1' 'xineramaproto>=1.2' 'recordproto')
conflicts=('catalyst-utils<=9.2' 'xf86-input-calcomp' 'xf86-input-citron' 'xf86-input-digitaledge' 'xf86-input-dmc' 'xf86-input-dynapro' 'xf86-input-elo2300'
'xf86-input-jamstudio' 'xf86-input-magellan' 'xf86-input-magictouch' 'xf86-input-microtouch' 'xf86-input-palmax' 'xf86-input-spaceorb' 'xf86-input-summa' 'xf86-input-tek4957' 'xf86-input-ur98' 'xf86-video-vga' 'xf86-video-intel-legacy' 'nvidia-96xx-utils<96.43.14' 'nvidia-173xx-utils<173.14.21')
options=('!libtool')
provides=('x-server')
groups=('xorg')
install=xorg-server.install
+backup=('etc/X11/xorg.conf.d/10-evdev.conf' 'etc/X11/xorg.conf.d/10-quirks.conf')
source=(${url}/releases/individual/xserver/${pkgname}-${pkgver}.tar.bz2
xorg-redhat-die-ugly-pattern-die-die-die.patch
- xserver-1.7.1-libcrypto.patch
- xserver-1.7.1-gamma-kdm-fix.patch
xvfb-run
- xvfb-run.1)
-md5sums=('178225f499ec10fa9d312d1c339e6a39'
+ xvfb-run.1
+ 10-evdev.conf
+ 10-quirks.conf)
+md5sums=('7cec3a11890bb53f4a07854319360348'
'1a336eb22e27cbf443ec5a2ecddfa93c'
- '4168867c4666a039d6367ee09e3208cb'
- '8eae23916552e609c36ecae1827c2e9d'
'52fd3effd80d7bc6c1660d4ecf23d31c'
- '376c70308715cd2643f7bff936d9934b')
+ '376c70308715cd2643f7bff936d9934b'
+ 'e930e153d69968a795fe4e2ef5d9a5dc'
+ 'd4f7dfc6be4ef4e2c6dd7632a9d88abe')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
@@ -36,17 +36,8 @@
# Get rid of the ugly pattern
patch -Np3 -i "${srcdir}/xorg-redhat-die-ugly-pattern-die-die-die.patch" || return 1
- # http://cvs.fedora.redhat.com/viewvc/rpms/xorg-x11-server/F-12/xserver-1.7.1-libcrypto.patch?view=log
- patch -Np1 -i "${srcdir}/xserver-1.7.1-libcrypto.patch" || return 1
+ sed -i -e 's/\$(prefix)\/etc/\/etc/g' config/Makefile.* || return 1
- # http://cvs.fedora.redhat.com/viewvc/rpms/xorg-x11-server/F-12/xserver-1.7.1-gamma-kdm-fix.patch?view=log
- patch -Np1 -i "${srcdir}/xserver-1.7.1-gamma-kdm-fix.patch" || return 1
-
- # Fix dbus config path
- sed -i -e 's/\$(sysconfdir)/\/etc/' config/Makefile.* || return 1
-
- autoconf || return 1
-
./configure --prefix=/usr \
--enable-ipv6 \
--enable-dri \
@@ -60,12 +51,11 @@
--enable-glx-tls \
--enable-kdrive \
--enable-install-setuid \
- --enable-config-hal \
+ --enable-config-udev \
--disable-config-dbus \
--enable-record \
--disable-xfbdev \
--disable-xfake \
- --disable-xsdl \
--disable-static \
--sysconfdir=/etc/X11 \
--localstatedir=/var \
@@ -82,9 +72,10 @@
rm -rf "${pkgdir}/var/log" || return 1
- install -m755 -d "${pkgdir}/etc/X11" || return 1
install -m755 -d "${pkgdir}/var/lib/xkb" || return 1
+ install -m644 "${srcdir}/10-evdev.conf" "${srcdir}/10-quirks.conf" "${pkgdir}/etc/X11/xorg.conf.d/" || return 1
+
# Needed for non-mesa drivers, libgl will restore it
mv "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so" \
"${pkgdir}/usr/lib/xorg/modules/extensions/libglx.xorg" || return 1
More information about the arch-commits
mailing list