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/PKGBUILD23
1 files changed, 13 insertions, 10 deletions
diff --git a/extra/xorg-server/PKGBUILD b/extra/xorg-server/PKGBUILD
index 9e283b69d..ee2a949f0 100644
--- a/extra/xorg-server/PKGBUILD
+++ b/extra/xorg-server/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 175947 2013-01-25 08:45:46Z andyrtr $
+# $Id: PKGBUILD 178463 2013-02-23 11:12:22Z 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.13.2
+pkgver=1.13.2.901
pkgrel=1
arch=('i686' 'x86_64')
license=('custom')
@@ -16,14 +16,17 @@ options=('!libtool')
source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2
autoconfig-nvidia.patch
autoconfig-sis.patch
+ xserver-1.6.0-less-acpi-brokenness.patch
+ bug59825.patch
xvfb-run
xvfb-run.1
10-quirks.conf
- #git-fixes.patch
use-pixman-glyph-cache.patch)
-sha256sums=('3850adb89e9170ad85aea39d240279494c07779e50cd3cd60126028681209408'
+sha256sums=('5351e2d18949f22c92350ffa037cfc49d3ac09f2ac4d3be6a3ea566d2052723c'
'66e25f76a7496c429e0aff4b0670f168719bb0ceaeb88c6f2272f2bf3ed21162'
'd027776fac1f7675b0a9ee817502290b1c45f9c09b0f0a6bb058c35f92361e84'
+ 'e033f9bcc21980f7f0428e6ed6c362a3d55ad293b05fd6e6c6c1933b86f9e63a'
+ '26ee6ff255a60d7c1e136c612925eb63c86e85a4a3a55d531852ad9275526588'
'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9'
'2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776'
'94612f5c0d34a3b7152915c2e285c7b462e9d8e38d3539bd551a339498eac166'
@@ -32,18 +35,18 @@ sha256sums=('3850adb89e9170ad85aea39d240279494c07779e50cd3cd60126028681209408'
build() {
cd "${srcdir}/${pkgbase}-${pkgver}"
- # Apply upstream fixes from server-1.13 branch
-# patch -Np1 -i "${srcdir}/git-fixes.patch"
-
- # Use pixman 0.28.0 glyph cache - backported from git master
-# patch -Np1 -i "${srcdir}/use-pixman-glyph-cache.patch"
-
# Use nouveau/nv/nvidia drivers for nvidia devices
patch -Np1 -i "${srcdir}/autoconfig-nvidia.patch"
# Use unofficial imedia SiS driver for supported SiS devices
patch -Np0 -i "${srcdir}/autoconfig-sis.patch"
+ # https://bugs.freedesktop.org/show_bug.cgi?id=59825 - fixes crash with vboxvideo
+ patch -Np1 -i "${srcdir}/bug59825.patch"
+
+ # 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"
+
autoreconf -fi
./configure --prefix=/usr \
--enable-ipv6 \