diff options
| author | root <root@rshg054.dnsready.net> | 2013-05-07 00:36:35 -0700 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2013-05-07 00:36:35 -0700 |
| commit | da0a0d88caa1bf934ebf314ef86e15928dbb027b (patch) | |
| tree | b7c57ac9667de10c72390e0d81654fffbe47c42d /extra/xaos | |
| parent | ffb692bf2696e7ebedd19bcd55ba253e21cb732d (diff) | |
Tue May 7 00:36:35 PDT 2013
Diffstat (limited to 'extra/xaos')
| -rw-r--r-- | extra/xaos/PKGBUILD | 23 | ||||
| -rw-r--r-- | extra/xaos/xaos-3.5-build-fix-i686.patch | 20 |
2 files changed, 36 insertions, 7 deletions
diff --git a/extra/xaos/PKGBUILD b/extra/xaos/PKGBUILD index 0daa23321..32e9c40a3 100644 --- a/extra/xaos/PKGBUILD +++ b/extra/xaos/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 148968 2012-02-05 11:58:17Z ibiru $ +# $Id: PKGBUILD 184451 2013-05-06 19:40:17Z foutrelis $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=xaos pkgver=3.5 -pkgrel=5 +pkgrel=6 pkgdesc="A fast portable real-time interactive fractal zoomer" arch=('i686' 'x86_64') url="http://sourceforge.net/projects/xaos/" @@ -11,18 +11,27 @@ license=('GPL') depends=('gsl' 'libpng' 'aalib') options=('!makeflags') install=xaos.install -source=(http://downloads.sourceforge.net/sourceforge/xaos/${pkgname}-${pkgver}.tar.gz xaos-3.5-libpng15.patch) +source=(http://downloads.sourceforge.net/sourceforge/xaos/${pkgname}-${pkgver}.tar.gz \ + xaos-3.5-libpng15.patch xaos-3.5-build-fix-i686.patch) sha1sums=('6d16a58187fba7276e6bd0547cc2fd6bb073b801' - '6c51cb2ee1c5f28973680ffc3a040c2cea65fd33') + '6c51cb2ee1c5f28973680ffc3a040c2cea65fd33' + 'd2ea8f0460c79c47fb289a4c2f87fe5c44057f9d') -build() { - cd "${srcdir}/${pkgname}-${pkgver}" +prepare() { + cd ${pkgname}-${pkgver} patch -p0 -i ../xaos-3.5-libpng15.patch + if [[ $CARCH == "i686" ]]; then + patch -p1 -i ../xaos-3.5-build-fix-i686.patch + fi +} + +build() { + cd ${pkgname}-${pkgver} ./configure --prefix=/usr --with-gsl --with-aa-driver make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install } diff --git a/extra/xaos/xaos-3.5-build-fix-i686.patch b/extra/xaos/xaos-3.5-build-fix-i686.patch new file mode 100644 index 000000000..4736dd389 --- /dev/null +++ b/extra/xaos/xaos-3.5-build-fix-i686.patch @@ -0,0 +1,20 @@ +--- xaos-3.5/src/engine/zoomd.c.orig 2009-07-18 00:50:31.000000000 +0100 ++++ xaos-3.5/src/engine/zoomd.c 2012-05-20 19:04:55.891065437 +0100 +@@ -280,6 +280,7 @@ dosymetry2(void /*@unused@ */ *data, str + #endif + #undef bpp1 + ++REGISTERS(0) + static INLINE void fillline(int line) + { + register unsigned char *RESTRICT vbuff = cimage.currlines[line]; +--- xaos-3.5/src/engine/zoom.c.fix-build 2009-07-18 00:50:31.000000000 +0100 ++++ xaos-3.5/src/engine/zoom.c 2012-05-20 19:11:53.625083113 +0100 +@@ -933,6 +933,7 @@ static /*INLINE */ void preparemoveoldpo + } + + #ifndef USE_i386ASM ++REGISTERS(0) + static /*INLINE */ void + moveoldpoints(void /*@unused@ */ *data1, + struct taskinfo /*@unused@ */ *task, |