summaryrefslogtreecommitdiff
path: root/extra/xorg-server/PKGBUILD
diff options
context:
space:
mode:
Diffstat (limited to 'extra/xorg-server/PKGBUILD')
-rw-r--r--extra/xorg-server/PKGBUILD11
1 files changed, 9 insertions, 2 deletions
diff --git a/extra/xorg-server/PKGBUILD b/extra/xorg-server/PKGBUILD
index ebad4ce88..55db80a1f 100644
--- a/extra/xorg-server/PKGBUILD
+++ b/extra/xorg-server/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 156103 2012-04-14 07:35:46Z andyrtr $
+# $Id: PKGBUILD 158860 2012-05-12 13:09:37Z andyrtr $
# 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.12.1
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64' 'mips64el')
license=('custom')
url="http://xorg.freedesktop.org"
@@ -17,6 +17,7 @@ options=('!libtool')
source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2
autoconfig-nvidia.patch
autoconfig-sis.patch
+ EXA_Fall_back_earlier_and_more_thoroughly_from_exaGlyphsV2.diff
#git-fixes.patch
xvfb-run
xvfb-run.1
@@ -25,6 +26,7 @@ source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2
sha1sums=('922b963901f4711449b53fb32ce3e14f5b642766'
'63836e5cfb4ae7353fb2e31239a544409c7ead32'
'175de5630b43dbc97778adfba5563b7fdd77f11f'
+ '4acb39587f73bcbb9a331377d6ef99cb73eb95a8'
'c94f742d3f9cabf958ae58e4015d9dd185aabedc'
'6838fc00ef4618c924a77e0fb03c05346080908a'
'993798f3d22ad672d769dae5f48d1fa068d5578f'
@@ -39,6 +41,11 @@ build() {
# Use unofficial imedia SiS driver for supported SiS devices
patch -Np0 -i "${srcdir}/autoconfig-sis.patch"
+ # fix glitches and crashes with EXA and cairo 1.12
+ # taken from https://bugs.freedesktop.org/show_bug.cgi?id=47266
+ # and reworked for 1.12.1 changes
+ patch -Np1 -i ${srcdir}/EXA_Fall_back_earlier_and_more_thoroughly_from_exaGlyphsV2.diff
+
# Add post-release patches from 1.11 branch
# patch -Np1 -i "${srcdir}/git-fixes.patch"