summaryrefslogtreecommitdiffstats
path: root/main/zsnes
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2011-05-24 12:51:54 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2011-05-24 12:51:54 +0000
commitaeab26d98cd427c5b7effd561d230aae1515e3ea (patch)
treea9eff242254923d52a0ee0a86321d8f3fe233c0f /main/zsnes
parent17bf2543c197f8d77c5d752f0340d355d39d1e6c (diff)
downloadaports-aeab26d98cd427c5b7effd561d230aae1515e3ea.tar.bz2
aports-aeab26d98cd427c5b7effd561d230aae1515e3ea.tar.xz
main/zsnes: build fix for libpng15
the patch assues that png_set_IHDR() actually sets the color_type
Diffstat (limited to 'main/zsnes')
-rw-r--r--main/zsnes/APKBUILD13
-rw-r--r--main/zsnes/zsnes-libpng15.patch10
2 files changed, 19 insertions, 4 deletions
diff --git a/main/zsnes/APKBUILD b/main/zsnes/APKBUILD
index d8573750a..72c3d7a1d 100644
--- a/main/zsnes/APKBUILD
+++ b/main/zsnes/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=zsnes
pkgver=1.51
-pkgrel=3
+pkgrel=4
pkgdesc="Super Nintendo emulator"
url="http://www.zsnes.com/"
arch="x86"
@@ -13,14 +13,18 @@ source="http://downloads.sourceforge.net/sourceforge/$pkgname/${pkgname}151src.t
zsnes.patch
zsnes-1.51-CC-quotes.patch
zsnes-1.51-depbuild.patch
+ zsnes-libpng15.patch
zsnes_icon.png"
build ()
{
cd "$srcdir"/${pkgname}_${pkgver%.*}_${pkgver#*.}
- patch -p1 -i ../zsnes-1.51-CC-quotes.patch || return 1
- patch -p1 -i ../zsnes-1.51-depbuild.patch || return 1
- patch -p1 -i ../zsnes.patch || return 1
+ for i in $source; do
+ case $i in
+ *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+ esac
+ done
+
cd "$srcdir"/${pkgname}_${pkgver%.*}_${pkgver#*.}/src
aclocal && autoconf || return 1
export GCC_SPECS=/usr/share/gcc/hardenednopie.specs
@@ -47,4 +51,5 @@ b100b2aa342c551167d7c5dcdcde9dd4 zsnes.desktop
4df831b3d87a35949bcf3fd5547decb1 zsnes.patch
69ca17611c0d4a21529a95eb37e05c2f zsnes-1.51-CC-quotes.patch
994af091cbb8f17f82d78c0ca89ac549 zsnes-1.51-depbuild.patch
+c9962edc521df8876b714d061458b600 zsnes-libpng15.patch
b5260c02adfc3b7ff725041214b00bfd zsnes_icon.png"
diff --git a/main/zsnes/zsnes-libpng15.patch b/main/zsnes/zsnes-libpng15.patch
new file mode 100644
index 000000000..8f8317166
--- /dev/null
+++ b/main/zsnes/zsnes-libpng15.patch
@@ -0,0 +1,10 @@
+--- ./src/zip/zpng.c.orig
++++ ./src/zip/zpng.c
+@@ -129,7 +129,6 @@
+ png_set_IHDR(png_ptr, info_ptr, width, height, 8,
+ PNG_COLOR_TYPE_RGB, PNG_INTERLACE_NONE,
+ PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT);
+- info_ptr->color_type = PNG_COLOR_TYPE_RGB;
+
+ //Allocate an array of scanline pointers
+ row_pointers = (png_bytep*)malloc(height*sizeof(png_bytep));