diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-19 11:22:26 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-19 11:22:26 +0100 |
| commit | 56bf63be7060f55d0048fc1f2e37526723bf0dc7 (patch) | |
| tree | 5072df371092a3bfded8d6aadca1af5018523291 /extra/xf86-video-s3/PKGBUILD | |
| parent | d697117f3e2c400f8a7cae7bbbbf27166edc277a (diff) | |
| parent | b54c21859be3590a319ceade1f58d0b89ac5ef32 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/bitcoin/PKGBUILD
community/chmsee/PKGBUILD
community/projectm/PKGBUILD
extra/apache/PKGBUILD
extra/gv/PKGBUILD
extra/libdc1394/PKGBUILD
extra/libraw1394/PKGBUILD
extra/samba/PKGBUILD
extra/sg3_utils/PKGBUILD
extra/upower/PKGBUILD
extra/xf86-input-aiptek/PKGBUILD
extra/xf86-video-modesetting/PKGBUILD
extra/xorg-server/PKGBUILD
libre/rp-pppoe-libre/PKGBUILD
Diffstat (limited to 'extra/xf86-video-s3/PKGBUILD')
| -rw-r--r-- | extra/xf86-video-s3/PKGBUILD | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/extra/xf86-video-s3/PKGBUILD b/extra/xf86-video-s3/PKGBUILD index 1cc340295..238c7721a 100644 --- a/extra/xf86-video-s3/PKGBUILD +++ b/extra/xf86-video-s3/PKGBUILD @@ -1,22 +1,24 @@ -# $Id: PKGBUILD 168584 2012-10-13 11:45:35Z andyrtr $ +# $Id: PKGBUILD 180211 2013-03-18 16:09:17Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-s3 pkgver=0.6.5 -pkgrel=2 +pkgrel=3 pkgdesc="X.org S3 video driver" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" license=('custom') depends=('glibc') -makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto') -conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14') +makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto') +conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15') options=('!libtool') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('4778cd4f1d61490c3562f9be03664576f065fa3acf22fe0d0689212d7ea3ad39') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 build-fix.diff) +sha256sums=('4778cd4f1d61490c3562f9be03664576f065fa3acf22fe0d0689212d7ea3ad39' + 'ad5ce4569c16f28801f4f89d8271fccc5706ef8508a6051ca094854d92a19d1a') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i ${srcdir}/build-fix.diff ./configure --prefix=/usr make } |