diff options
Diffstat (limited to 'extra/xorg-server/PKGBUILD')
-rw-r--r-- | extra/xorg-server/PKGBUILD | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/extra/xorg-server/PKGBUILD b/extra/xorg-server/PKGBUILD index 5f5ca2c30..4a9e967e4 100644 --- a/extra/xorg-server/PKGBUILD +++ b/extra/xorg-server/PKGBUILD @@ -1,10 +1,11 @@ -# $Id: PKGBUILD 179653 2013-03-09 07:55:34Z andyrtr $ +# $Id: PKGBUILD 180178 2013-03-18 16:08:50Z andyrtr $ +# Maintainer: AndyRTR <andyrtr@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=xorg-server pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel') -pkgver=1.13.3 -pkgrel=1 +pkgver=1.14.0 +pkgrel=2 arch=('i686' 'x86_64') license=('custom') url="http://xorg.freedesktop.org" @@ -21,8 +22,8 @@ source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2 xvfb-run xvfb-run.1 10-quirks.conf - use-pixman-glyph-cache.patch) -sha256sums=('c9e38eb6404749cab9e3c4a4901d951d4d62958b11f002ce968225ef92902762' + git-fixes.patch) +sha256sums=('1f5107573252c26439fdd165481765a2c0964e02a2e9fab36e02414d08f30630' '66e25f76a7496c429e0aff4b0670f168719bb0ceaeb88c6f2272f2bf3ed21162' 'd027776fac1f7675b0a9ee817502290b1c45f9c09b0f0a6bb058c35f92361e84' 'e033f9bcc21980f7f0428e6ed6c362a3d55ad293b05fd6e6c6c1933b86f9e63a' @@ -30,7 +31,7 @@ sha256sums=('c9e38eb6404749cab9e3c4a4901d951d4d62958b11f002ce968225ef92902762' 'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9' '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776' '94612f5c0d34a3b7152915c2e285c7b462e9d8e38d3539bd551a339498eac166' - '7c1dacd30c46b01424c7c75974285cd348dafd0327eb3f211cbe446ad90dd308') + 'd0832cc16b5e6c1dee2959055a4b327f5c87e2a67b5f427d654663057207b2c1') build() { cd "${srcdir}/${pkgbase}-${pkgver}" @@ -47,6 +48,9 @@ build() { # From Fedora. Do not build acpid code, it is buggy and we do not need it patch -Np1 -i "${srcdir}/xserver-1.6.0-less-acpi-brokenness.patch" + # post release git fixes + patch -Np1 -i "${srcdir}/git-fixes.patch" + autoreconf -fi ./configure --prefix=/usr \ --enable-ipv6 \ @@ -106,8 +110,8 @@ package_xorg-server() { pkgdesc="Xorg X server" depends=(libxdmcp libxfont libpciaccess libdrm 'pixman>=0.28.0' libgcrypt libxau xorg-server-common xf86-input-evdev) backup=('etc/X11/xorg.conf.d/10-evdev.conf' 'etc/X11/xorg.conf.d/10-quirks.conf') - # see xorg-server-1.13.0/hw/xfree86/common/xf86Module.h for ABI versions - we provide major numbers that drivers can depend on - provides=('X-ABI-VIDEODRV_VERSION=13' 'X-ABI-XINPUT_VERSION=18' 'X-ABI-EXTENSION_VERSION=7.0' 'x-server') + # see xorg-server-*/hw/xfree86/common/xf86Module.h for ABI versions - we provide major numbers that drivers can depend on + provides=('X-ABI-VIDEODRV_VERSION=14' 'X-ABI-XINPUT_VERSION=19' 'X-ABI-EXTENSION_VERSION=7.0' 'x-server') groups=('xorg') conflicts=('nvidia-utils<=290.10') |