diff options
| author | root <root@rshg054.dnsready.net> | 2012-03-14 00:01:30 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2012-03-14 00:01:30 +0000 |
| commit | 01a0c4bc740842efa3bf1a7e1d6c8be5656e4e2a (patch) | |
| tree | c9cf79fb6311cbb2a890419e0a382aa211fb3010 /extra/xorg-server/PKGBUILD | |
| parent | ca06c41d7d8e5d38284de9048372ab45dcd8b2fb (diff) | |
Wed Mar 14 00:01:29 UTC 2012
Diffstat (limited to 'extra/xorg-server/PKGBUILD')
| -rw-r--r-- | extra/xorg-server/PKGBUILD | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/extra/xorg-server/PKGBUILD b/extra/xorg-server/PKGBUILD index 5d284ff3d..426450446 100644 --- a/extra/xorg-server/PKGBUILD +++ b/extra/xorg-server/PKGBUILD @@ -1,30 +1,31 @@ -# $Id: PKGBUILD 147993 2012-01-29 15:45:06Z andyrtr $ +# $Id: PKGBUILD 153390 2012-03-12 20:55:40Z 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.11.4 +pkgver=1.12.0 pkgrel=1 arch=('i686' 'x86_64') license=('custom') url="http://xorg.freedesktop.org" -makedepends=('pixman' 'libx11' 'mesa' 'libgl' 'xf86driproto' 'xcmiscproto' 'xtrans' 'bigreqsproto' 'randrproto' 'inputproto' 'fontsproto' 'videoproto' 'compositeproto' 'recordproto' 'scrnsaverproto' 'resourceproto' 'xineramaproto' 'libxkbfile' 'libxfont' 'renderproto' 'libpciaccess' 'libxv' 'xf86dgaproto' 'libxmu' 'libxrender' 'libxi' 'dmxproto' 'libxaw' 'libdmx' 'libxtst' 'libxres' 'xorg-xkbcomp' 'xorg-util-macros' 'xorg-font-util' 'glproto' 'dri2proto' 'udev' 'libgcrypt') +makedepends=('pixman' 'libx11' 'mesa' 'libgl' 'xf86driproto' 'xcmiscproto' 'xtrans' 'bigreqsproto' 'randrproto' 'inputproto' 'fontsproto' 'videoproto' + 'compositeproto' 'recordproto' 'scrnsaverproto' 'resourceproto' 'xineramaproto' 'libxkbfile' 'libxfont' 'renderproto' 'libpciaccess' + 'libxv' 'xf86dgaproto' 'libxmu' 'libxrender' 'libxi' 'dmxproto' 'libxaw' 'libdmx' 'libxtst' 'libxres' 'xorg-xkbcomp' 'xorg-util-macros' + 'xorg-font-util' 'glproto' 'dri2proto' 'udev' 'libgcrypt') options=('!libtool') source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2 autoconfig-nvidia.patch autoconfig-sis.patch - revert-trapezoids.patch #git-fixes.patch xvfb-run xvfb-run.1 10-quirks.conf) -md5sums=('256325e9b17dff479d92bed97f6b0adb' - '6c7e87d63ac4b535e19a80c89d0cf091' - 'f8194638ca4872c2b0a67862a70bcebf' - 'f6c84f4936f8e00abdfbd9fb4eda83fb' - '52fd3effd80d7bc6c1660d4ecf23d31c' - '376c70308715cd2643f7bff936d9934b' - 'd4f7dfc6be4ef4e2c6dd7632a9d88abe') +sha1sums=('5f48db767f71e9f58ded6ff356f3b8340820e524' + 'f19658773d3fa4dc468bb28f9f01866acce71540' + '962fecc159c128728f14e8ba231c5b00391ff4ac' + 'c94f742d3f9cabf958ae58e4015d9dd185aabedc' + '6838fc00ef4618c924a77e0fb03c05346080908a' + '993798f3d22ad672d769dae5f48d1fa068d5578f') build() { cd "${srcdir}/${pkgbase}-${pkgver}" @@ -35,9 +36,6 @@ build() { # Use unofficial imedia SiS driver for supported SiS devices patch -Np0 -i "${srcdir}/autoconfig-sis.patch" - # Revert commit that causes huge slowdowns with binary nVidia driver - patch -Np1 -i "${srcdir}/revert-trapezoids.patch" - # Add post-release patches from 1.11 branch # patch -Np1 -i "${srcdir}/git-fixes.patch" @@ -54,6 +52,9 @@ build() { --enable-xephyr \ --enable-glx-tls \ --enable-kdrive \ + --enable-kdrive-evdev \ + --enable-kdrive-kbd \ + --enable-kdrive-mouse \ --enable-install-setuid \ --enable-config-udev \ --disable-config-dbus \ @@ -99,6 +100,7 @@ package_xorg-server() { backup=('etc/X11/xorg.conf.d/10-evdev.conf' 'etc/X11/xorg.conf.d/10-quirks.conf') provides=('x-server') groups=('xorg') + conflicts=('nvidia-utils<=290.10') cd "${srcdir}/${pkgbase}-${pkgver}" make DESTDIR="${pkgdir}" install |