[arch-commits] Commit in xaos/trunk (PKGBUILD xaos-3.5-build-fix-i686.patch)

[Eric Bélanger]

    Date: Sunday, April 28, 2013 @ 06:17:44
  Author: eric
Revision: 183816

upgpkg: xaos 3.5-6

Rebuild against libpng 1.6, Add build fix for i686

Added:
  xaos/trunk/xaos-3.5-build-fix-i686.patch
Modified:
  xaos/trunk/PKGBUILD

-------------------------------+
 PKGBUILD                      |   21 +++++++++++++++------
 xaos-3.5-build-fix-i686.patch |   20 ++++++++++++++++++++
 2 files changed, 35 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-04-28 03:20:27 UTC (rev 183815)
+++ PKGBUILD	2013-04-28 04:17:44 UTC (rev 183816)
@@ -3,7 +3,7 @@
 
 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 @@
 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')
 
+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 "${srcdir}/${pkgname}-${pkgver}"
-  patch -p0 -i ../xaos-3.5-libpng15.patch
+  cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr --with-gsl --with-aa-driver
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
 }

Added: xaos-3.5-build-fix-i686.patch
===================================================================
--- xaos-3.5-build-fix-i686.patch	                        (rev 0)
+++ xaos-3.5-build-fix-i686.patch	2013-04-28 04:17:44 UTC (rev 183816)
@@ -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,