diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2011-05-24 12:51:54 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2011-05-24 12:51:54 +0000 |
commit | aeab26d98cd427c5b7effd561d230aae1515e3ea (patch) | |
tree | a9eff242254923d52a0ee0a86321d8f3fe233c0f | |
parent | 17bf2543c197f8d77c5d752f0340d355d39d1e6c (diff) | |
download | alpine_aports-aeab26d98cd427c5b7effd561d230aae1515e3ea.tar.bz2 alpine_aports-aeab26d98cd427c5b7effd561d230aae1515e3ea.tar.xz alpine_aports-aeab26d98cd427c5b7effd561d230aae1515e3ea.zip |
main/zsnes: build fix for libpng15
the patch assues that png_set_IHDR() actually sets the color_type
-rw-r--r-- | main/zsnes/APKBUILD | 13 | ||||
-rw-r--r-- | main/zsnes/zsnes-libpng15.patch | 10 |
2 files changed, 19 insertions, 4 deletions
diff --git a/main/zsnes/APKBUILD b/main/zsnes/APKBUILD index d8573750a3..72c3d7a1d5 100644 --- a/main/zsnes/APKBUILD +++ b/main/zsnes/APKBUILD | |||
@@ -1,7 +1,7 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=zsnes | 2 | pkgname=zsnes |
3 | pkgver=1.51 | 3 | pkgver=1.51 |
4 | pkgrel=3 | 4 | pkgrel=4 |
5 | pkgdesc="Super Nintendo emulator" | 5 | pkgdesc="Super Nintendo emulator" |
6 | url="http://www.zsnes.com/" | 6 | url="http://www.zsnes.com/" |
7 | arch="x86" | 7 | arch="x86" |
@@ -13,14 +13,18 @@ source="http://downloads.sourceforge.net/sourceforge/$pkgname/${pkgname}151src.t | |||
13 | zsnes.patch | 13 | zsnes.patch |
14 | zsnes-1.51-CC-quotes.patch | 14 | zsnes-1.51-CC-quotes.patch |
15 | zsnes-1.51-depbuild.patch | 15 | zsnes-1.51-depbuild.patch |
16 | zsnes-libpng15.patch | ||
16 | zsnes_icon.png" | 17 | zsnes_icon.png" |
17 | 18 | ||
18 | build () | 19 | build () |
19 | { | 20 | { |
20 | cd "$srcdir"/${pkgname}_${pkgver%.*}_${pkgver#*.} | 21 | cd "$srcdir"/${pkgname}_${pkgver%.*}_${pkgver#*.} |
21 | patch -p1 -i ../zsnes-1.51-CC-quotes.patch || return 1 | 22 | for i in $source; do |
22 | patch -p1 -i ../zsnes-1.51-depbuild.patch || return 1 | 23 | case $i in |
23 | patch -p1 -i ../zsnes.patch || return 1 | 24 | *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; |
25 | esac | ||
26 | done | ||
27 | |||
24 | cd "$srcdir"/${pkgname}_${pkgver%.*}_${pkgver#*.}/src | 28 | cd "$srcdir"/${pkgname}_${pkgver%.*}_${pkgver#*.}/src |
25 | aclocal && autoconf || return 1 | 29 | aclocal && autoconf || return 1 |
26 | export GCC_SPECS=/usr/share/gcc/hardenednopie.specs | 30 | export GCC_SPECS=/usr/share/gcc/hardenednopie.specs |
@@ -47,4 +51,5 @@ b100b2aa342c551167d7c5dcdcde9dd4 zsnes.desktop | |||
47 | 4df831b3d87a35949bcf3fd5547decb1 zsnes.patch | 51 | 4df831b3d87a35949bcf3fd5547decb1 zsnes.patch |
48 | 69ca17611c0d4a21529a95eb37e05c2f zsnes-1.51-CC-quotes.patch | 52 | 69ca17611c0d4a21529a95eb37e05c2f zsnes-1.51-CC-quotes.patch |
49 | 994af091cbb8f17f82d78c0ca89ac549 zsnes-1.51-depbuild.patch | 53 | 994af091cbb8f17f82d78c0ca89ac549 zsnes-1.51-depbuild.patch |
54 | c9962edc521df8876b714d061458b600 zsnes-libpng15.patch | ||
50 | b5260c02adfc3b7ff725041214b00bfd zsnes_icon.png" | 55 | b5260c02adfc3b7ff725041214b00bfd zsnes_icon.png" |
diff --git a/main/zsnes/zsnes-libpng15.patch b/main/zsnes/zsnes-libpng15.patch new file mode 100644 index 0000000000..8f83171668 --- /dev/null +++ b/main/zsnes/zsnes-libpng15.patch | |||
@@ -0,0 +1,10 @@ | |||
1 | --- ./src/zip/zpng.c.orig | ||
2 | +++ ./src/zip/zpng.c | ||
3 | @@ -129,7 +129,6 @@ | ||
4 | png_set_IHDR(png_ptr, info_ptr, width, height, 8, | ||
5 | PNG_COLOR_TYPE_RGB, PNG_INTERLACE_NONE, | ||
6 | PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT); | ||
7 | - info_ptr->color_type = PNG_COLOR_TYPE_RGB; | ||
8 | |||
9 | //Allocate an array of scanline pointers | ||
10 | row_pointers = (png_bytep*)malloc(height*sizeof(png_bytep)); | ||