xorg-server: update to 1.8.0.

--HG--
extra : convert_revision : 47e12e193f7aebfecbbd4f8d1a6b0ca5dc510bd0
This commit is contained in:
Juan RP 2010-04-02 11:25:03 +02:00
parent 98aa13043b
commit 01fca87d18
4 changed files with 21 additions and 46 deletions

View file

@ -1,39 +0,0 @@
# 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

View file

@ -0,0 +1,13 @@
Do not append $(prefix) to xorgconfddir, we are using prefix=/usr.
--- config/Makefile.in.orig 2010-04-02 11:16:05.543826596 +0200
+++ config/Makefile.in 2010-04-02 11:16:30.854832565 +0200
@@ -451,7 +451,7 @@ libconfig_la_SOURCES = config.c config-b
@CONFIG_NEED_DBUS_TRUE@@CONFIG_UDEV_FALSE@ $(DBUS_LIBS) \
@CONFIG_NEED_DBUS_TRUE@@CONFIG_UDEV_FALSE@ $(am__append_8)
@CONFIG_UDEV_TRUE@libconfig_la_LIBADD = $(UDEV_LIBS) $(am__append_8)
-@CONFIG_UDEV_TRUE@xorgconfddir = $(prefix)/etc/X11/$(XF86CONFIGDIR)
+@CONFIG_UDEV_TRUE@xorgconfddir = /etc/X11/$(XF86CONFIGDIR)
@CONFIG_UDEV_TRUE@xorgconfd_DATA = 10-evdev.conf
@CONFIG_DBUS_API_TRUE@@CONFIG_NEED_DBUS_TRUE@@CONFIG_UDEV_FALSE@dbusconfigdir = $(sysconfdir)/dbus-1/system.d
@CONFIG_DBUS_API_TRUE@@CONFIG_NEED_DBUS_TRUE@@CONFIG_UDEV_FALSE@dbusconfig_DATA = xorg-server.conf

View file

@ -1,17 +1,18 @@
# Template build file for 'xorg-server'.
pkgname=xorg-server
version=1.7.99.902
version=1.8.0
distfiles="${XORG_SITE}/xserver/$pkgname-$version.tar.bz2"
build_style=gnu_configure
configure_args="--with-dri-driver-path=/usr/lib/dri
configure_args="--with-dri-driver-path=/usr/lib/dri --enable-ipv6
--enable-glx-tls --localstatedir=/var --disable-static
--disable-config-dbus --enable-config-udev --sysconfdir=/etc/X11
--disable-config-hal --enable-install-setuid
--disable-config-hal --enable-install-setuid --enable-secure-rpc
--with-xkb-path=/usr/share/X11/xkb --with-xkb-output=/var/lib/xkb
--with-fontrootdir=/usr/share/fonts/X11 --with-sha1=libcrypto"
--with-fontrootdir=/usr/share/fonts/X11 --with-sha1=libcrypto
--disable-dmx --disable-xfree86-utils"
short_desc="Modular X11 server from modular X.org"
maintainer="Juan RP <xtraeme@gmail.com>"
checksum=ef0b2e7bca72fcfad725526cc5c78bbff541fdd193e6c723de91004a41c16f36
checksum=423a8092e28affb83aa736695408e01fd4641040727f34ed6bcfae9c06018b77
long_desc="
The X.org X11 Server from the modularized source tree of X.org."
@ -80,7 +81,7 @@ 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
install -d ${DESTDIR}/etc/X11/xorg.conf.d
install -m644 ${FILESDIR}/*.conf ${DESTDIR}/etc/X11/xorg.conf.d
rm -rf ${DESTDIR}/var/log
}