diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-08-13 16:07:04 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-08-13 16:07:04 -0300 |
| commit | e6b487980c858023cb4a3678f2d27f52c2a32596 (patch) | |
| tree | 3a348db541d1a1ae1f356dd3970fff4910529558 /extra/xorg-server | |
| parent | f08b6a2decf228473f030cfd49116c9fd0b05c37 (diff) | |
| parent | 07a52495b8a64f14843878d6116151fbdb6deefb (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/bird/PKGBUILD
community/ecryptfs-utils/PKGBUILD
community/linux-tools/PKGBUILD
community/qtcurve-kde4/PKGBUILD
extra/audacity/PKGBUILD
extra/cups/PKGBUILD
extra/imagemagick/PKGBUILD
extra/kdeadmin/PKGBUILD
extra/kdepim/PKGBUILD
extra/kradio/PKGBUILD
extra/libimobiledevice/PKGBUILD
extra/libmowgli/PKGBUILD
extra/llvm/PKGBUILD
extra/phonon-vlc/PKGBUILD
extra/pycrypto/PKGBUILD
extra/xorg-server/PKGBUILD
libre/linux-libre/PKGBUILD
libre/syslinux/PKGBUILD
multilib-staging/gcc-multilib/PKGBUILD
multilib/lib32-libldap/PKGBUILD
staging/binutils/PKGBUILD
staging/gcc/PKGBUILD
staging/glibc/PKGBUILD
testing/cronie/PKGBUILD
testing/cryptsetup/PKGBUILD
testing/krb5/PKGBUILD
testing/lvm2/PKGBUILD
testing/net-tools/PKGBUILD
testing/systemd/PKGBUILD
Diffstat (limited to 'extra/xorg-server')
| -rw-r--r-- | extra/xorg-server/PKGBUILD | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/extra/xorg-server/PKGBUILD b/extra/xorg-server/PKGBUILD index b480c74ca..3861a4c49 100644 --- a/extra/xorg-server/PKGBUILD +++ b/extra/xorg-server/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 163203 2012-07-09 16:05:50Z andyrtr $ +# $Id: PKGBUILD 165118 2012-08-11 08:22:01Z 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.3 +pkgver=1.12.3.901 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('custom') @@ -17,13 +17,11 @@ 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 10-quirks.conf - loongson.patch) -sha256sums=('3654b613393734ce0c7c23e81ca4ceb6e8afefb5f0649233ffd105c1220544fe' + loongson.patch) +sha256sums=('5265cfe935e2ad54a287dd3026917c6bfe6191a4f943ca893d1477fdfbe94b2b' '66e25f76a7496c429e0aff4b0670f168719bb0ceaeb88c6f2272f2bf3ed21162' 'd027776fac1f7675b0a9ee817502290b1c45f9c09b0f0a6bb058c35f92361e84' 'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9' @@ -40,14 +38,6 @@ 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.12 branch -# patch -Np1 -i ${srcdir}/git-fixes.patch - # Based on http://lists.freedesktop.org/archives/xorg-devel/2011-October/026249.html patch -Np1 -i "${srcdir}/loongson.patch" |