[arch-commits] Commit in xaos/trunk (PKGBUILD)
Date: Tuesday, September 8, 2020 @ 10:44:34
Author: arodseth
Revision: 700636
upgpkg: xaos 4.2-1
Modified:
xaos/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-09-08 09:30:05 UTC (rev 700635)
+++ PKGBUILD2020-09-08 10:44:34 UTC (rev 700636)
@@ -2,7 +2,7 @@
# Contributor: Eric Bélanger
pkgname=xaos
-pkgver=4.1
+pkgver=4.2
pkgrel=1
pkgdesc='Interactive fractal zoomer'
arch=(x86_64)
@@ -10,7 +10,7 @@
license=(GPL2)
makedepends=(gendesk git qt5-tools)
depends=(qt5-base)
-source=("git+https://github.com/xaos-project/XaoS#commit=56aca37f47d84ea6f92cc7f6a82195ca29bcecc3;)
# tag: release-4.1
+source=("git+https://github.com/xaos-project/XaoS#commit=4cbbb8611a0c5a6f1ca8ef3ddc0c3d37ee69c762;)
# tag: release-4.2
md5sums=('SKIP')
prepare() {
[arch-commits] Commit in xaos/trunk (PKGBUILD)
Date: Thursday, August 6, 2020 @ 11:56:23
Author: arodseth
Revision: 670896
upgpkg: xaos 4.1-1
Modified:
xaos/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-08-06 11:49:30 UTC (rev 670895)
+++ PKGBUILD2020-08-06 11:56:23 UTC (rev 670896)
@@ -2,7 +2,7 @@
# Contributor: Eric Bélanger
pkgname=xaos
-pkgver=4.0
+pkgver=4.1
pkgrel=1
pkgdesc='Interactive fractal zoomer'
arch=(x86_64)
@@ -10,7 +10,7 @@
license=(GPL2)
makedepends=(gendesk git qt5-tools)
depends=(qt5-base)
-source=("git+https://github.com/xaos-project/XaoS#commit=06c4b4c65cbe5515c3e40f541016a3b6b65d8ea8;)
# tag: release-4.0
+source=("git+https://github.com/xaos-project/XaoS#commit=56aca37f47d84ea6f92cc7f6a82195ca29bcecc3;)
# tag: release-4.1
md5sums=('SKIP')
prepare() {
[arch-commits] Commit in xaos/trunk (PKGBUILD)
Date: Saturday, June 20, 2020 @ 23:11:12
Author: arodseth
Revision: 648684
upgpkg: xaos 4.0-1
Modified:
xaos/trunk/PKGBUILD
--+
PKGBUILD | 54 +++---
1 file changed, 31 insertions(+), 23 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-06-20 22:55:16 UTC (rev 648683)
+++ PKGBUILD2020-06-20 23:11:12 UTC (rev 648684)
@@ -2,19 +2,22 @@
# Contributor: Eric Bélanger
pkgname=xaos
-pkgver=3.7
+pkgver=4.0
pkgrel=1
pkgdesc='Interactive fractal zoomer'
arch=(x86_64)
url='https://xaos-project.github.io/'
-license=(GPL)
-makedepends=(gendesk git)
-depends=(gsl gtk3)
-#options=(!makeflags)
-source=("git+https://github.com/xaos-project/XaoS#commit=1709b93d92eef541c66134db9776935a87b70f05;)
# tag: release-3.7
+license=(GPL2)
+makedepends=(gendesk git qt5-tools)
+depends=(qt5-base)
+source=("git+https://github.com/xaos-project/XaoS#commit=06c4b4c65cbe5515c3e40f541016a3b6b65d8ea8;)
# tag: release-4.0
md5sums=('SKIP')
prepare() {
+ # Add missing include
+ sed -i '30i#include ' XaoS/src/util/timers.cpp
+
+ # Desktop shortcut
gendesk -f -n \
--pkgname=XaoS \
--pkgdesc="$pkgdesc" \
@@ -25,27 +28,32 @@
build() {
cd XaoS
- autoreconf
- ./configure \
---prefix=/usr \
---with-long-double=yes \
---with-mitshm=no \
---with-pthread=yes \
---with-png=yes \
---with-gsl=yes \
---with-x11-driver=no \
---with-gtk-driver=yes \
---with-win32-driver=no \
---with-aa-driver=yes
- make
+ export DEFINES="USE_OPENGL USE_FLOAT128"
+ qmake && make
}
package() {
- make -C XaoS DESTDIR="$pkgdir" install
- install -Dm644 "XaoS/src/ui/ui-drv/qt/images/xaosbig.png" \
+ cd XaoS
+
+ # Executable
+ install -Dm755 bin/xaos "$pkgdir/usr/bin/xaos"
+
+ # Tutorial and catalogs
+ install -d "$pkgdir/usr/share/XaoS/"
+ cp -r tutorial catalogs "$pkgdir/usr/share/XaoS"
+
+ # Examples
+ install -d "$pkgdir/usr/share/XaoS/examples"
+ find examples -name "*.xpf" -exec install -Dm644 -t
"$pkgdir"/usr/share/XaoS/examples/ {} \;
+
+ # Desktop shortcut and icon
+ install -Dm644 ../XaoS.desktop \
+"$pkgdir/usr/share/applications/$pkgname.desktop"
+ install -Dm644 "src/ui/images/xaosbig.png" \
"$pkgdir/usr/share/pixmaps/$pkgname.png"
- install -Dm644 XaoS.desktop \
-"$pkgdir/usr/share/applications/$pkgname.desktop"
+
+ # Man page
+ install -Dm644 doc/xaos.6 "$pkgdir/usr/share/man/man6/xaos.6"
}
# vim: ts=2 sw=2 et:
[arch-commits] Commit in xaos/trunk (PKGBUILD)
Date: Monday, March 23, 2020 @ 18:12:00
Author: arodseth
Revision: 603760
upgpkg: xaos 3.7-1
Modified:
xaos/trunk/PKGBUILD
--+
PKGBUILD |7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-03-23 18:06:35 UTC (rev 603759)
+++ PKGBUILD2020-03-23 18:12:00 UTC (rev 603760)
@@ -9,10 +9,10 @@
url='https://xaos-project.github.io/'
license=(GPL)
makedepends=(gendesk git)
-depends=(gsl gtk3 libpng)
-options=(!makeflags)
+depends=(gsl gtk3)
+#options=(!makeflags)
source=("git+https://github.com/xaos-project/XaoS#commit=1709b93d92eef541c66134db9776935a87b70f05;)
# tag: release-3.7
-sha256sums=('SKIP')
+md5sums=('SKIP')
prepare() {
gendesk -f -n \
@@ -25,6 +25,7 @@
build() {
cd XaoS
+ autoreconf
./configure \
--prefix=/usr \
--with-long-double=yes \
[arch-commits] Commit in xaos/trunk (PKGBUILD)
Date: Monday, March 23, 2020 @ 18:06:29
Author: arodseth
Revision: 603758
upgpkg: xaos 3.7-1
Modified:
xaos/trunk/PKGBUILD
--+
PKGBUILD | 29 -
1 file changed, 16 insertions(+), 13 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-03-23 17:28:25 UTC (rev 603757)
+++ PKGBUILD2020-03-23 18:06:29 UTC (rev 603758)
@@ -2,26 +2,29 @@
# Contributor: Eric Bélanger
pkgname=xaos
-pkgver=3.6
-pkgrel=8
+pkgver=3.7
+pkgrel=1
pkgdesc='Interactive fractal zoomer'
arch=(x86_64)
-# https is not available
-url='http://matek.hu/xaos/'
+url='https://xaos-project.github.io/'
license=(GPL)
-makedepends=(gendesk)
-depends=(aalib gsl gtk2 libpng)
+makedepends=(gendesk git)
+depends=(gsl gtk3 libpng)
options=(!makeflags)
-source=("https://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz;)
-sha256sums=('989f3e38f7793810cbb1496d5291d44836a7d7c058422b9ee1cffb163a0b8d95')
+source=("git+https://github.com/xaos-project/XaoS#commit=1709b93d92eef541c66134db9776935a87b70f05;)
# tag: release-3.7
+sha256sums=('SKIP')
prepare() {
- gendesk -f -n --pkgname=$pkgname --pkgdesc="$pkgdesc" \
+ gendesk -f -n \
+--pkgname=XaoS \
+--pkgdesc="$pkgdesc" \
+--exec=xaos \
+--icon=xaos \
--categories='Application;Graphics'
}
build() {
- cd $pkgname-$pkgver
+ cd XaoS
./configure \
--prefix=/usr \
--with-long-double=yes \
@@ -37,10 +40,10 @@
}
package() {
- make -C $pkgname-$pkgver DESTDIR="$pkgdir" install
- install -Dm644 "$pkgname-$pkgver/src/ui/ui-drv/qt/images/xaosbig.png" \
+ make -C XaoS DESTDIR="$pkgdir" install
+ install -Dm644 "XaoS/src/ui/ui-drv/qt/images/xaosbig.png" \
"$pkgdir/usr/share/pixmaps/$pkgname.png"
- install -Dm644 $pkgname.desktop \
+ install -Dm644 XaoS.desktop \
"$pkgdir/usr/share/applications/$pkgname.desktop"
}
[arch-commits] Commit in xaos/trunk (PKGBUILD)
Date: Saturday, August 24, 2019 @ 22:21:41 Author: foutrelis Revision: 501605 gsl 2.6 rebuild Modified: xaos/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2019-08-24 22:18:04 UTC (rev 501604) +++ PKGBUILD2019-08-24 22:21:41 UTC (rev 501605) @@ -3,7 +3,7 @@ pkgname=xaos pkgver=3.6 -pkgrel=7 +pkgrel=8 pkgdesc='Interactive fractal zoomer' arch=(x86_64) # https is not available
[arch-commits] Commit in xaos/trunk (PKGBUILD)
Date: Saturday, June 24, 2017 @ 17:42:48
Author: arojas
Revision: 299195
gsl 2.4 rebuild
Modified:
xaos/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2017-06-24 16:48:02 UTC (rev 299194)
+++ PKGBUILD2017-06-24 17:42:48 UTC (rev 299195)
@@ -3,7 +3,7 @@
pkgname=xaos
pkgver=3.6
-pkgrel=3
+pkgrel=4
pkgdesc="A fast portable real-time interactive fractal zoomer"
arch=('i686' 'x86_64')
url="http://matek.hu/xaos/;
[arch-commits] Commit in xaos/trunk (PKGBUILD xaos.install)
Date: Friday, May 6, 2016 @ 20:50:06
Author: arojas
Revision: 267041
Hooks
Modified:
xaos/trunk/PKGBUILD
Deleted:
xaos/trunk/xaos.install
--+
PKGBUILD |3 +--
xaos.install | 20
2 files changed, 1 insertion(+), 22 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2016-05-06 18:47:12 UTC (rev 267040)
+++ PKGBUILD2016-05-06 18:50:06 UTC (rev 267041)
@@ -3,7 +3,7 @@
pkgname=xaos
pkgver=3.6
-pkgrel=2
+pkgrel=3
pkgdesc="A fast portable real-time interactive fractal zoomer"
arch=('i686' 'x86_64')
url="http://matek.hu/xaos/;
@@ -10,7 +10,6 @@
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'
Deleted: xaos.install
===
--- xaos.install2016-05-06 18:47:12 UTC (rev 267040)
+++ xaos.install2016-05-06 18:50:06 UTC (rev 267041)
@@ -1,20 +0,0 @@
-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
-}
[arch-commits] Commit in xaos/trunk (PKGBUILD)
Date: Saturday, February 20, 2016 @ 19:43:01
Author: arojas
Revision: 260089
GSL 2.1 rebuild
Modified:
xaos/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2016-02-20 18:32:57 UTC (rev 260088)
+++ PKGBUILD2016-02-20 18:43:01 UTC (rev 260089)
@@ -3,7 +3,7 @@
pkgname=xaos
pkgver=3.6
-pkgrel=1
+pkgrel=2
pkgdesc="A fast portable real-time interactive fractal zoomer"
arch=('i686' 'x86_64')
url="http://matek.hu/xaos/;
[arch-commits] Commit in xaos/trunk (PKGBUILD xaos-3.5-libpng15.patch)
Date: Sunday, November 17, 2013 @ 23:02:01
Author: eric
Revision: 199874
upgpkg: xaos 3.6-1
Upstream update, Update url, Remove old patch
Modified:
xaos/trunk/PKGBUILD
Deleted:
xaos/trunk/xaos-3.5-libpng15.patch
-+
PKGBUILD| 14 ++--
xaos-3.5-libpng15.patch | 131 --
2 files changed, 6 insertions(+), 139 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-11-17 20:47:22 UTC (rev 199873)
+++ PKGBUILD2013-11-17 22:02:01 UTC (rev 199874)
@@ -2,24 +2,22 @@
# Maintainer: Eric Bélanger e...@archlinux.org
pkgname=xaos
-pkgver=3.5
-pkgrel=6
+pkgver=3.6
+pkgrel=1
pkgdesc=A fast portable real-time interactive fractal zoomer
arch=('i686' 'x86_64')
-url=http://sourceforge.net/projects/xaos/;
+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-libpng15.patch xaos-3.5-build-fix-i686.patch)
-sha1sums=('6d16a58187fba7276e6bd0547cc2fd6bb073b801'
- '6c51cb2ee1c5f28973680ffc3a040c2cea65fd33'
+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}
- patch -p0 -i ../xaos-3.5-libpng15.patch
if [[ $CARCH == i686 ]]; then
patch -p1 -i ../xaos-3.5-build-fix-i686.patch
fi
Deleted: xaos-3.5-libpng15.patch
===
--- xaos-3.5-libpng15.patch 2013-11-17 20:47:22 UTC (rev 199873)
+++ xaos-3.5-libpng15.patch 2013-11-17 22:02:01 UTC (rev 199874)
@@ -1,131 +0,0 @@
-http://code.google.com/p/gnuxaos/issues/detail?id=55
-
src/util/png.c
-+++ src/util/png.c
-@@ -3,6 +3,7 @@
- #include aconfig.h
- #ifdef USE_PNG
- #include png.h
-+#include zlib.h
- #endif
- #include stdlib.h
- #include stdio.h
-@@ -31,6 +32,9 @@
- png_structp png_ptr;
- png_infop info_ptr;
- png_color palette[256];
-+png_color_8 sig_bit;
-+int color_type;
-+int bit_depth;
- volatile unsigned short a = 255;
- volatile unsigned char *b = (volatile unsigned char *) a;
- #ifdef _undefined_
-@@ -59,7 +63,7 @@
- png_destroy_write_struct(png_ptr, (png_infopp) NULL);
- return No memory to create png info structure;
- }
--if (setjmp(png_ptr-jmpbuf)) {
-+if (setjmp(png_jmpbuf(png_ptr))) {
- png_destroy_write_struct(png_ptr, info_ptr);
- fclose(file);
- return strerror(errno);
-@@ -78,57 +82,70 @@
- png_set_compression_window_bits(png_ptr, 15);
- png_set_compression_method(png_ptr, 8);
-
--info_ptr-width = image-width;
--info_ptr-height = image-height;
--/*info_ptr-gamma=1.0; */
--info_ptr-gamma = 0.5;
--info_ptr-valid |= PNG_INFO_gAMA | PNG_INFO_pHYs;
--info_ptr-x_pixels_per_unit = (png_uint_32) (100 / image-pixelwidth);
--info_ptr-y_pixels_per_unit = (png_uint_32) (100 / image-pixelheight);
-+switch (image-palette-type)
-+{
-+case C256:
-+ color_type = PNG_COLOR_TYPE_PALETTE;
-+ bit_depth = image-bytesperpixel * 8;
-+ break;
-+case SMALLITER:
-+case LARGEITER:
-+case GRAYSCALE:
-+ color_type = PNG_COLOR_TYPE_GRAY;
-+ bit_depth = image-bytesperpixel * 8;
-+ break;
-+case TRUECOLOR:
-+case TRUECOLOR24:
-+case TRUECOLOR16:
-+ color_type = PNG_COLOR_TYPE_RGB;
-+ bit_depth = 8;
-+ break;
-+}
-
-+png_set_IHDR (png_ptr, info_ptr, image-width, image-height, bit_depth,
-+color_type, PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_BASE,
-+PNG_FILTER_TYPE_BASE);
-
- switch (image-palette-type) {
- case C256:
- {
- int i;
-- info_ptr-color_type = PNG_COLOR_TYPE_PALETTE;
-- info_ptr-bit_depth = image-bytesperpixel * 8;
-- info_ptr-palette = palette;
-- info_ptr-valid |= PNG_INFO_PLTE;
-+ png_color png_palette[257];
-+ int png_num_palette;
- for (i = 0; i image-palette-end; i++)
-- info_ptr-palette[i].red = image-palette-rgb[i][0],
-- info_ptr-palette[i].green = image-palette-rgb[i][1],
-- info_ptr-palette[i].blue = image-palette-rgb[i][2],
-- info_ptr-num_palette = image-palette-end;
-+ png_palette[i].red = image-palette-rgb[i][0],
-+ png_palette[i].green = image-palette-rgb[i][1],
-+ png_palette[i].blue = image-palette-rgb[i][2],
-+ png_num_palette = image-palette-end;
-+ png_set_PLTE(png_ptr, info_ptr, png_palette, png_num_palette);
- }
- break;
--case SMALLITER:
--
[arch-commits] Commit in xaos/trunk (PKGBUILD xaos-3.5-build-fix-i686.patch)
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
===
--- PKGBUILD2013-04-28 03:20:27 UTC (rev 183815)
+++ PKGBUILD2013-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.0 +0100
xaos-3.5/src/engine/zoomd.c2012-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.0
+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,
[arch-commits] Commit in xaos/trunk (PKGBUILD xaos-3.5-libpng15.patch)
Date: Wednesday, January 18, 2012 @ 19:03:11
Author: eric
Revision: 146866
upgpkg: xaos 3.5-5
Rebuild against libpng 1.5 and libtiff 4.0
Added:
xaos/trunk/xaos-3.5-libpng15.patch
Modified:
xaos/trunk/PKGBUILD
-+
PKGBUILD|9 +--
xaos-3.5-libpng15.patch | 131 ++
2 files changed, 136 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-01-18 23:54:43 UTC (rev 146865)
+++ PKGBUILD2012-01-19 00:03:11 UTC (rev 146866)
@@ -3,7 +3,7 @@
pkgname=xaos
pkgver=3.5
-pkgrel=4
+pkgrel=5
pkgdesc=A fast portable real-time interactive fractal zoomer
arch=('i686' 'x86_64')
url=http://sourceforge.net/projects/xaos/;
@@ -11,12 +11,13 @@
depends=('gsl' 'libpng' 'aalib')
options=('!makeflags')
install=xaos.install
-source=(http://downloads.sourceforge.net/sourceforge/xaos/${pkgname}-${pkgver}.tar.gz)
-md5sums=('465d1469b276501a58bf325e493ea591')
-sha1sums=('6d16a58187fba7276e6bd0547cc2fd6bb073b801')
+source=(http://downloads.sourceforge.net/sourceforge/xaos/${pkgname}-${pkgver}.tar.gz
xaos-3.5-libpng15.patch)
+sha1sums=('6d16a58187fba7276e6bd0547cc2fd6bb073b801'
+ '6c51cb2ee1c5f28973680ffc3a040c2cea65fd33')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
+ patch -p0 -i ../xaos-3.5-libpng15.patch
./configure --prefix=/usr --with-gsl --with-aa-driver
make
}
Added: xaos-3.5-libpng15.patch
===
--- xaos-3.5-libpng15.patch (rev 0)
+++ xaos-3.5-libpng15.patch 2012-01-19 00:03:11 UTC (rev 146866)
@@ -0,0 +1,131 @@
+http://code.google.com/p/gnuxaos/issues/detail?id=55
+
+--- src/util/png.c
src/util/png.c
+@@ -3,6 +3,7 @@
+ #include aconfig.h
+ #ifdef USE_PNG
+ #include png.h
++#include zlib.h
+ #endif
+ #include stdlib.h
+ #include stdio.h
+@@ -31,6 +32,9 @@
+ png_structp png_ptr;
+ png_infop info_ptr;
+ png_color palette[256];
++png_color_8 sig_bit;
++int color_type;
++int bit_depth;
+ volatile unsigned short a = 255;
+ volatile unsigned char *b = (volatile unsigned char *) a;
+ #ifdef _undefined_
+@@ -59,7 +63,7 @@
+ png_destroy_write_struct(png_ptr, (png_infopp) NULL);
+ return No memory to create png info structure;
+ }
+-if (setjmp(png_ptr-jmpbuf)) {
++if (setjmp(png_jmpbuf(png_ptr))) {
+ png_destroy_write_struct(png_ptr, info_ptr);
+ fclose(file);
+ return strerror(errno);
+@@ -78,57 +82,70 @@
+ png_set_compression_window_bits(png_ptr, 15);
+ png_set_compression_method(png_ptr, 8);
+
+-info_ptr-width = image-width;
+-info_ptr-height = image-height;
+-/*info_ptr-gamma=1.0; */
+-info_ptr-gamma = 0.5;
+-info_ptr-valid |= PNG_INFO_gAMA | PNG_INFO_pHYs;
+-info_ptr-x_pixels_per_unit = (png_uint_32) (100 / image-pixelwidth);
+-info_ptr-y_pixels_per_unit = (png_uint_32) (100 / image-pixelheight);
++switch (image-palette-type)
++{
++case C256:
++ color_type = PNG_COLOR_TYPE_PALETTE;
++ bit_depth = image-bytesperpixel * 8;
++ break;
++case SMALLITER:
++case LARGEITER:
++case GRAYSCALE:
++ color_type = PNG_COLOR_TYPE_GRAY;
++ bit_depth = image-bytesperpixel * 8;
++ break;
++case TRUECOLOR:
++case TRUECOLOR24:
++case TRUECOLOR16:
++ color_type = PNG_COLOR_TYPE_RGB;
++ bit_depth = 8;
++ break;
++}
+
++png_set_IHDR (png_ptr, info_ptr, image-width, image-height, bit_depth,
++color_type, PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_BASE,
++PNG_FILTER_TYPE_BASE);
+
+ switch (image-palette-type) {
+ case C256:
+ {
+ int i;
+- info_ptr-color_type = PNG_COLOR_TYPE_PALETTE;
+- info_ptr-bit_depth = image-bytesperpixel * 8;
+- info_ptr-palette = palette;
+- info_ptr-valid |= PNG_INFO_PLTE;
++ png_color png_palette[257];
++ int png_num_palette;
+ for (i = 0; i image-palette-end; i++)
+- info_ptr-palette[i].red = image-palette-rgb[i][0],
+- info_ptr-palette[i].green = image-palette-rgb[i][1],
+- info_ptr-palette[i].blue = image-palette-rgb[i][2],
+- info_ptr-num_palette = image-palette-end;
++ png_palette[i].red = image-palette-rgb[i][0],
++ png_palette[i].green = image-palette-rgb[i][1],
++ png_palette[i].blue = image-palette-rgb[i][2],
++ png_num_palette = image-palette-end;
++ png_set_PLTE(png_ptr, info_ptr, png_palette, png_num_palette);
+ }
+ break;
+-case SMALLITER:
+-case LARGEITER:
+-case GRAYSCALE:
+- info_ptr-color_type = PNG_COLOR_TYPE_GRAY;
+- info_ptr-bit_depth = image-bytesperpixel * 8;
+- break;
+ case TRUECOLOR:
+ case
[arch-commits] Commit in xaos/trunk (PKGBUILD)
Date: Monday, September 12, 2011 @ 02:35:00
Author: eric
Revision: 137879
upgpkg: xaos 3.5-4
Rebuild against latest toolchain
Modified:
xaos/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-09-12 06:26:48 UTC (rev 137878)
+++ PKGBUILD2011-09-12 06:35:00 UTC (rev 137879)
@@ -3,7 +3,7 @@
pkgname=xaos
pkgver=3.5
-pkgrel=3
+pkgrel=4
pkgdesc=A fast portable real-time interactive fractal zoomer
arch=('i686' 'x86_64')
url=http://sourceforge.net/projects/xaos/;
