[arch-commits] Commit in xaos/repos (8 files)

Sat Feb 20 18:43:39 UTC 2016

Date: Saturday, February 20, 2016 @ 19:43:38
  Author: arojas
Revision: 260090

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  xaos/repos/staging-i686/
  xaos/repos/staging-i686/PKGBUILD
    (from rev 260089, xaos/trunk/PKGBUILD)
  xaos/repos/staging-i686/xaos-3.5-build-fix-i686.patch
    (from rev 260089, xaos/trunk/xaos-3.5-build-fix-i686.patch)
  xaos/repos/staging-i686/xaos.install
    (from rev 260089, xaos/trunk/xaos.install)
  xaos/repos/staging-x86_64/
  xaos/repos/staging-x86_64/PKGBUILD
    (from rev 260089, xaos/trunk/PKGBUILD)
  xaos/repos/staging-x86_64/xaos-3.5-build-fix-i686.patch
    (from rev 260089, xaos/trunk/xaos-3.5-build-fix-i686.patch)
  xaos/repos/staging-x86_64/xaos.install
    (from rev 260089, xaos/trunk/xaos.install)

----------------------------------------------+
 staging-i686/PKGBUILD                        |   35 +++++++++++++++++++++++++
 staging-i686/xaos-3.5-build-fix-i686.patch   |   20 ++++++++++++++
 staging-i686/xaos.install                    |   20 ++++++++++++++
 staging-x86_64/PKGBUILD                      |   35 +++++++++++++++++++++++++
 staging-x86_64/xaos-3.5-build-fix-i686.patch |   20 ++++++++++++++
 staging-x86_64/xaos.install                  |   20 ++++++++++++++
 6 files changed, 150 insertions(+)

Copied: xaos/repos/staging-i686/PKGBUILD (from rev 260089, xaos/trunk/PKGBUILD)
===================================================================

--- staging-i686/PKGBUILD	                        (rev 0)
+++ staging-i686/PKGBUILD	2016-02-20 18:43:38 UTC (rev 260090)
@@ -0,0 +1,35 @@
+# $Id$
+# Maintainer: Eric Bélanger <eric at archlinux.org>
+
+pkgname=xaos
+pkgver=3.6
+pkgrel=2
+pkgdesc="A fast portable real-time interactive fractal zoomer"
+arch=('i686' 'x86_64')
+url="http://matek.hu/xaos/"
+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-build-fix-i686.patch)
+sha1sums=('0c68d25c4f9c8eaf557e37d9e4586a04ab56d7a0'
+          'd2ea8f0460c79c47fb289a4c2f87fe5c44057f9d')
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+  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 ${pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}" install
+}

Copied: xaos/repos/staging-i686/xaos-3.5-build-fix-i686.patch (from rev 260089, xaos/trunk/xaos-3.5-build-fix-i686.patch)
===================================================================
--- staging-i686/xaos-3.5-build-fix-i686.patch	                        (rev 0)
+++ staging-i686/xaos-3.5-build-fix-i686.patch	2016-02-20 18:43:38 UTC (rev 260090)
@@ -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,

Copied: xaos/repos/staging-i686/xaos.install (from rev 260089, xaos/trunk/xaos.install)
===================================================================
--- staging-i686/xaos.install	                        (rev 0)
+++ staging-i686/xaos.install	2016-02-20 18:43:38 UTC (rev 260090)
@@ -0,0 +1,20 @@
+infodir=usr/share/info
+filelist=(xaos.info.gz)
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file $infodir/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file $infodir/dir 2> /dev/null
+  done
+}

Copied: xaos/repos/staging-x86_64/PKGBUILD (from rev 260089, xaos/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD	                        (rev 0)
+++ staging-x86_64/PKGBUILD	2016-02-20 18:43:38 UTC (rev 260090)
@@ -0,0 +1,35 @@
+# $Id$
+# Maintainer: Eric Bélanger <eric at archlinux.org>
+
+pkgname=xaos
+pkgver=3.6
+pkgrel=2
+pkgdesc="A fast portable real-time interactive fractal zoomer"
+arch=('i686' 'x86_64')
+url="http://matek.hu/xaos/"
+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-build-fix-i686.patch)
+sha1sums=('0c68d25c4f9c8eaf557e37d9e4586a04ab56d7a0'
+          'd2ea8f0460c79c47fb289a4c2f87fe5c44057f9d')
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+  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 ${pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}" install
+}

Copied: xaos/repos/staging-x86_64/xaos-3.5-build-fix-i686.patch (from rev 260089, xaos/trunk/xaos-3.5-build-fix-i686.patch)
===================================================================
--- staging-x86_64/xaos-3.5-build-fix-i686.patch	                        (rev 0)
+++ staging-x86_64/xaos-3.5-build-fix-i686.patch	2016-02-20 18:43:38 UTC (rev 260090)
@@ -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,

Copied: xaos/repos/staging-x86_64/xaos.install (from rev 260089, xaos/trunk/xaos.install)
===================================================================
--- staging-x86_64/xaos.install	                        (rev 0)
+++ staging-x86_64/xaos.install	2016-02-20 18:43:38 UTC (rev 260090)
@@ -0,0 +1,20 @@
+infodir=usr/share/info
+filelist=(xaos.info.gz)
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file $infodir/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file $infodir/dir 2> /dev/null
+  done
+}

