summaryrefslogtreecommitdiff
path: root/extra/xorg-server/PKGBUILD
diff options
context:
space:
mode:
authorroot <root@rshg054.dnsready.net>2011-08-09 23:14:31 +0000
committerroot <root@rshg054.dnsready.net>2011-08-09 23:14:31 +0000
commita306c2530354c1c02351c4cc02eefa53c8d23eac (patch)
tree85f473f0abb92a80a4a400a7c07eed79d83880bd /extra/xorg-server/PKGBUILD
parent5135b52f901206bbb365152084e82e92c120e0be (diff)
Tue Aug 9 23:14:31 UTC 2011
Diffstat (limited to 'extra/xorg-server/PKGBUILD')
-rw-r--r--extra/xorg-server/PKGBUILD24
1 files changed, 10 insertions, 14 deletions
diff --git a/extra/xorg-server/PKGBUILD b/extra/xorg-server/PKGBUILD
index 7045d4ed8..7550063d1 100644
--- a/extra/xorg-server/PKGBUILD
+++ b/extra/xorg-server/PKGBUILD
@@ -1,29 +1,27 @@
-# $Id: PKGBUILD 130953 2011-07-09 08:01:22Z andyrtr $
+# $Id: PKGBUILD 134875 2011-08-08 08:40:10Z jgc $
# 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.10.3
-pkgrel=2
+pkgver=1.10.3.901
+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')
+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')
options=('!libtool')
source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2
- #git-fixes.patch
+ randr-compare-all-the-bytes-in-rrpostpendingproperties.patch
bg-none-revert.patch
xserver-1.10-pointer-barriers.patch
- xorg-redhat-die-ugly-pattern-die-die-die.patch
autoconfig-nvidia.patch
xvfb-run
xvfb-run.1
10-quirks.conf)
-sha1sums=('1699be5c0edeca553cfa3ee6caa228483465136b'
- # '6dd2bcd9d8b17d1a50ed8c15eb1cba480558e695'
+sha1sums=('c7b0d4a29adf91baeae4783841303ccf8ba285e2'
+ '571f2925f2f3d1b5cdbb2e5a676205fcea256198'
'629c6d8d52126eab81ee1b72a9e4209535f8cb81'
'1b95e91384a57d966428c7db98ed06f4cc562f91'
- '0efcdf61bde3c0cd813072b94e2b30ab922775b9'
'f9328fd7bc931bb02c8909ecfcef35403de33782'
'c94f742d3f9cabf958ae58e4015d9dd185aabedc'
'6838fc00ef4618c924a77e0fb03c05346080908a'
@@ -31,8 +29,8 @@ sha1sums=('1699be5c0edeca553cfa3ee6caa228483465136b'
build() {
cd "${srcdir}/${pkgbase}-${pkgver}"
- # Get rid of the ugly pattern
- patch -Np3 -i "${srcdir}/xorg-redhat-die-ugly-pattern-die-die-die.patch"
+ # Upstream post-release commit
+ patch -Np1 -i "${srcdir}/randr-compare-all-the-bytes-in-rrpostpendingproperties.patch"
# Add pointer barrier support, patch from Fedora
patch -Np1 -i "${srcdir}/xserver-1.10-pointer-barriers.patch"
@@ -40,9 +38,6 @@ build() {
# Patches from ~ajax/xserver xserver-next branch
patch -Np1 -i "${srcdir}/bg-none-revert.patch"
- # Upstream fixes from 1.10 branch
- #patch -Np1 -i "${srcdir}/git-fixes.patch"
-
# Use nouveau/nv/nvidia drivers for nvidia devices
patch -Np1 -i "${srcdir}/autoconfig-nvidia.patch"
@@ -73,6 +68,7 @@ build() {
--with-fontrootdir=/usr/share/fonts
make
+ # Disable subdirs for make install rule to make splitting easier
sed -e 's/^DMX_SUBDIRS =.*/DMX_SUBDIRS =/' \
-e 's/^XVFB_SUBDIRS =.*/XVFB_SUBDIRS =/' \
-e 's/^XNEST_SUBDIRS =.*/XNEST_SUBDIRS = /' \