diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-03-26 20:30:00 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-03-26 20:30:00 +0200 |
| commit | a9a4a92d8375d35e09a3cf9d50921d8839d7c79a (patch) | |
| tree | 1217e2a328639b657e0093610164110a3f65a7d5 /extra/xf86-video-sis | |
| parent | 61594aa2e82bf07473dce9134553b757b618d9ae (diff) | |
| parent | cf507a0dbf5ee8258e49256049b420ac8e191387 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
extra/xf86-video-siliconmotion/PKGBUILD
libre/kdenetwork-libre/PKGBUILD
libre/mesa-demos-libre/PKGBUILD
multilib-testing/gcc-multilib/PKGBUILD
multilib-testing/gcc-multilib/gcc_pure64-multilib.patch
multilib-testing/lib32-glibc/PKGBUILD
multilib-testing/lib32-glibc/glibc-2.15-vfprintf-nargs.patch
multilib-testing/libtool-multilib/PKGBUILD
testing/gcc/PKGBUILD
testing/gcc/gcc_pure64.patch
testing/glibc/PKGBUILD
testing/glibc/glibc-2.15-vfprintf-nargs.patch
testing/krb5/PKGBUILD
testing/libtool/PKGBUILD
Diffstat (limited to 'extra/xf86-video-sis')
| -rw-r--r-- | extra/xf86-video-sis/PKGBUILD | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/extra/xf86-video-sis/PKGBUILD b/extra/xf86-video-sis/PKGBUILD index 34a6a7120..fcf4c1393 100644 --- a/extra/xf86-video-sis/PKGBUILD +++ b/extra/xf86-video-sis/PKGBUILD @@ -1,31 +1,23 @@ -# $Id: PKGBUILD 153368 2012-03-12 20:54:25Z andyrtr $ +# $Id: PKGBUILD 154202 2012-03-24 10:11:20Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-sis -pkgver=0.10.3 -pkgrel=7 +pkgver=0.10.4 +pkgrel=1 pkgdesc="X.org SiS video driver" arch=(i686 x86_64 'mips64el') url="http://xorg.freedesktop.org/" license=('custom') depends=('glibc') -makedepends=('xorg-server-devel>=1.11.99.903' 'xf86dgaproto') -conflicts=('xorg-server<1.11.99.903') +makedepends=('xorg-server-devel>=1.12.0' 'xf86dgaproto') +conflicts=('xorg-server<1.12.0') options=('!libtool') groups=('xorg-drivers' 'xorg') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - git-f5dafa24.patch) -sha1sums=('158673747e240b0c33499685a32d46bdaead7cd5' - 'b61c6a78723aa59f8c82152fec42475b611cd1e7') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('4e841080ea524f37d887ef4ee50df5b9f7f5b417abddc9eb8ddad19128c0b10d') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/git-f5dafa24.patch" - libtoolize --force --copy - aclocal - autoconf - automake - ./configure --prefix=/usr --disable-dri make } |