xorg-server: update to 1.13.1.

This commit is contained in:
Juan RP 2012-12-16 20:37:54 +01:00
parent a7aaa85792
commit d079241dc0
3 changed files with 20 additions and 38 deletions

View File

@ -1,9 +1,9 @@
# Create libglx-xorg.so libglx.so symlink for Mesa.
case ${ACTION} in
post)
if [ ! -e usr/lib/xorg/modules/extensions/libglx-nvidia.so* ]; then
if [ ! -e usr/lib/xorg/modules/extensions/libglx.so ]; then
cd usr/lib/xorg/modules/extensions
rm -f libglx.so && ln -sf libglx-xorg.so libglx.so
ln -sf libglx-xorg.so libglx.so
fi
;;
esac

View File

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

View File

@ -1,7 +1,7 @@
# Template build file for 'xorg-server'.
pkgname=xorg-server
version=1.12.4
revision=4
version=1.13.1
revision=1
build_style=gnu-configure
configure_args="--enable-ipv6 --enable-xcsecurity --enable-record
--enable-xnest --enable-xephyr --enable-composite --enable-xvfb
@ -11,33 +11,32 @@ configure_args="--enable-ipv6 --enable-xcsecurity --enable-record
--with-fontrootdir=/usr/share/fonts/X11 --with-sha1=libcrypto
--disable-dmx --disable-xfree86-utils --enable-dga
--enable-install-setuid"
conf_files="/etc/udev/rules.d/75-x11-input.rules"
subpackages="$pkgname-devel"
# Not a direct dependency, but it's required for DRI to work.
depends="MesaLib"
makedepends="pkg-config perl flex inputproto>=2.2 glproto>=1.4.15 xproto>=7.0.22
dri2proto>=2.1 xf86driproto randrproto videoproto compositeproto scrnsaverproto
resourceproto xineramaproto xcmiscproto bigreqsproto libudev-devel>=183
openssl-devel libX11-devel libXext-devel libdmx-devel libpciaccess-devel
libXfont-devel libXmu-devel libXrender-devel libXfixes-devel libXi-devel
libXaw-devel libdrm-devel libXtst-devel libXres-devel libxkbui-devel
libxkbfile-devel libXxf86dga-devel pixman-devel MesaLib-devel"
fulldepends="xkeyboard-config"
short_desc="X11 server from X.org"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://xorg.freedesktop.org"
license="MIT/X11, BSD"
distfiles="${XORG_SITE}/xserver/$pkgname-$version.tar.bz2"
checksum=8ac07c35306ba3fb3c0972722dd4e919303039eca1d40ac7862560e0b2c94cf7
distfiles="${XORG_SITE}/xserver/${pkgname}-${version}.tar.bz2"
checksum=c93540e2799df4655c6f1b67dc7d8d6db96df4f08ef1702fffbc5df843a43d00
long_desc="
The X11 server from the modularized source tree of X.org."
subpackages="${pkgname}-devel"
fulldepends="xkeyboard-config"
# See hw/xfree86/common/xf86Module.h. Only care for the major version.
provides="xserver-abi-extension-7 xserver-abi-input-18 xserver-abi-video-13"
makedepends="pkg-config perl flex inputproto>=2.2 glproto>=1.4.15 xproto>=7.0.22
dri2proto>=2.1 xf86driproto randrproto videoproto compositeproto scrnsaverproto
resourceproto>=1.2.0 xineramaproto xcmiscproto bigreqsproto libudev-devel>=183
openssl-devel libX11-devel libXext-devel libdmx-devel libpciaccess-devel
libXfont-devel libXmu-devel libXrender-devel libXfixes-devel libXi-devel
libXaw-devel libdrm-devel libXtst-devel libXres-devel libxkbui-devel
libxkbfile-devel libXxf86dga-devel pixman-devel MesaLib-devel"
post_install() {
vinstall ${FILESDIR}/x11-input.rules 644 \
etc/udev/rules.d 75-x11-input.rules
vinstall ${FILESDIR}/11-quirks.conf 644 etc/X11/xorg.conf.d
vinstall COPYING 644 usr/share/licenses/${pkgname}
# Support nvidia and amd binary blobs to provide their own
# implementation.
mv ${DESTDIR}/usr/lib/xorg/modules/extensions/libglx.so \