xorg-server: update to 1.7.99.902 (1.8.0-RC2).

This update brings udev support, replacing dbus and hal.

--HG--
extra : convert_revision : d09b044c83d9737a69ccf27b617771782139ecbf

srcpkgs/xorg-server/depends

@@ -1,2 +1,2 @@
-abi_depends=">=1.6.0"
+abi_depends=">=1.7.99.902"
 api_depends="${abi_depends}"

srcpkgs/xorg-server/files/00-evdev.conf

@@ -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

srcpkgs/xorg-server/files/10-quirks.conf

@@ -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

srcpkgs/xorg-server/files/x11-input.rules

@@ -0,0 +1,17 @@
+# Udev rules for xorg-server, copy it to /etc/udev/rules.d and
+# modify it if you need.
+
+SUBSYSTEM!="input", GOTO="x11_input_end"
+ACTION!="change|add", GOTO="x11_input_end"
+KERNEL!="event*", GOTO="x11_input_end"
+
+# use the evdev driver by default
+ENV{x11_driver}="evdev"
+
+# set xkb layout if we have keys
+ENV{ID_INPUT_KEY}=="?*", ENV{xkblayout}="us"
+
+# use synaptics for touchpads
+ENV{ID_INPUT_TOUCHPAD}=="?*", ENV{x11_driver}="synaptics"
+
+LABEL="x11_input_end"

srcpkgs/xorg-server/template

@@ -1,23 +1,25 @@
 # Template build file for 'xorg-server'.
 pkgname=xorg-server
-version=1.7.5
+version=1.7.99.902
 distfiles="${XORG_SITE}/xserver/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 configure_args="--with-dri-driver-path=/usr/lib/dri
- --enable-glx-tls --localstatedir=/var --disable-static
+--enable-glx-tls --localstatedir=/var --disable-static
- --enable-config-dbus --sysconfdir=/etc/X11 --enable-config-hal
+--disable-config-dbus --enable-config-udev --sysconfdir=/etc/X11
- --enable-install-setuid --with-xkb-path=/usr/share/X11/xkb
+--disable-config-hal --enable-install-setuid
- --with-xkb-output=/var/lib/xkb"
+--with-xkb-path=/usr/share/X11/xkb --with-xkb-output=/var/lib/xkb
+--with-fontrootdir=/usr/share/fonts/X11 --with-sha1=libcrypto"
 short_desc="Modular X11 server from modular X.org"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=91e5f3d05c3e7270f4122235b6ab071210cc79579dcb842ffd4e71199b6bb7aa
+checksum=ef0b2e7bca72fcfad725526cc5c78bbff541fdd193e6c723de91004a41c16f36
 long_desc="
- The X.org X11 Server from the modularized source tree of X.org X11."
+ The X.org X11 Server from the modularized source tree of X.org."
 
-conf_files="/etc/dbus-1/system.d/xorg-server.conf"
 subpackages="$pkgname-devel"
 
 Add_dependency run glibc
+Add_dependency run libudev
+Add_dependency run openssl
 Add_dependency run libdmx
 Add_dependency run libXext
 Add_dependency run libX11
@@ -25,9 +27,7 @@ Add_dependency run libpciaccess
 Add_dependency run libXfont
 Add_dependency run libXau
 Add_dependency run pixman
-Add_dependency run dbus-libs
 Add_dependency run libXdmcp
-Add_dependency run openssl
 Add_dependency run libXmu
 Add_dependency run libXrender
 Add_dependency run libXfixes
@@ -38,6 +38,9 @@ Add_dependency run libSM
 Add_dependency run libICE
 Add_dependency run libXpm
 Add_dependency run libdrm
+Add_dependency build pkg-config
+Add_dependency build perl
+Add_dependency build flex
 Add_dependency build dri2proto	">=2.1"
 Add_dependency build xf86driproto
 Add_dependency build randrproto
@@ -46,20 +49,16 @@ Add_dependency build compositeproto
 Add_dependency build scrnsaverproto
 Add_dependency build resourceproto
 Add_dependency build xineramaproto
-Add_dependency build perl
+Add_dependency build libudev-devel
-Add_dependency build pkg-config
+Add_dependency build openssl-devel
-Add_dependency build flex
 Add_dependency build libdmx-devel
 Add_dependency build libXext-devel
 Add_dependency build libX11-devel
-Add_dependency build glibc-devel
 Add_dependency build libpciaccess-devel
 Add_dependency build libXfont-devel
 Add_dependency build libXau-devel
 Add_dependency build pixman-devel
-Add_dependency build dbus-devel
 Add_dependency build libXdmcp-devel
-Add_dependency build openssl-devel
 Add_dependency build libXmu-devel
 Add_dependency build libXrender-devel
 Add_dependency build libXfixes-devel
@@ -73,18 +72,15 @@ Add_dependency build libdrm-devel
 Add_dependency build libXtst-devel
 Add_dependency build libXres-devel
 Add_dependency build MesaLib-devel
-Add_dependency full hal
 Add_dependency full libxkbui
 Add_dependency full libxkbfile
 Add_dependency full xkeyboard-config
 
-pre_configure()
-{
-	# Fix dbus config path
-	sed -i -e 's/\$(sysconfdir)/\/etc/' $wrksrc/config/Makefile.*
-}
-
 post_install()
 {
+	install -m644 -D ${FILESDIR}/x11-input.rules \
+		${DESTDIR}/lib/udev/rules.d/75-x11-input.rules
+	install -d ${DESTDIR}/etc/xorg.conf.d
+	install -m644 ${FILESDIR}/*.conf ${DESTDIR}/etc/xorg.conf.d
 	rm -rf ${DESTDIR}/var/log
 }

srcpkgs/xorg-server/xorg-server-devel.template

@@ -5,9 +5,10 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-revision=1
-
 Add_dependency run pkg-config
+Add_dependency run perl
+Add_dependency run flex
+Add_dependency run libudev-devel
 Add_dependency run dri2proto  ">=2.1"
 Add_dependency run xf86driproto
 Add_dependency run randrproto
@@ -19,12 +20,10 @@ Add_dependency run xineramaproto
 Add_dependency run libdmx-devel
 Add_dependency run libXext-devel
 Add_dependency run libX11-devel
-Add_dependency run glibc-devel
 Add_dependency run libpciaccess-devel
 Add_dependency run libXfont-devel
 Add_dependency run libXau-devel
 Add_dependency run pixman-devel
-Add_dependency run dbus-devel
 Add_dependency run libXdmcp-devel
 Add_dependency run openssl-devel
 Add_dependency run libXmu-devel