From 5def0cfc35f3a77d21590ed8d019ead8d8997fbd Mon Sep 17 00:00:00 2001
From: Samir <ram-z@chakra-project.org>
Date: Thu, 6 Dec 2012 21:32:11 +0000
Subject: [PATCH] update zsnes

---
 zsnes/PKGBUILD                      |  37 ++++++++++++++--------------
 zsnes/zsnes-1.51-libpng15.patch     |  12 +++++++++
 zsnes/zsnes.desktop                 |   2 +-
 zsnes/{zsnes_icon.png => zsnes.png} | Bin
 4 files changed, 32 insertions(+), 19 deletions(-)
 create mode 100644 zsnes/zsnes-1.51-libpng15.patch
 rename zsnes/{zsnes_icon.png => zsnes.png} (100%)

diff --git a/zsnes/PKGBUILD b/zsnes/PKGBUILD
index c98a26f..d003b79 100644
--- a/zsnes/PKGBUILD
+++ b/zsnes/PKGBUILD
@@ -5,54 +5,55 @@
 
 pkgname=zsnes
 pkgver=1.51
-pkgrel=3
+pkgrel=4
 pkgdesc="Super Nintendo emulator"
 url="http://www.zsnes.com/"
-arch=('i686' 'x86_64')
+arch=('x86_64')
 license=('GPL')
 
-if [ $CARCH == "x86_64" ]; then
-	depends=('gcc-libs-multilib' 'lib32-sdl' 'lib32-libpng>=1.4.0' 'lib32-libgl' 'lib32-ncurses' 'lib32-mesa')
-	makedepends=('nasm' 'gcc-multilib')
-else
-	depends=('gcc-libs' 'sdl' 'libpng>=1.4.0' 'libgl' 'ncurses' 'mesa')
-	makedepends=('nasm' 'gcc')
-fi
+depends=('gcc-libs-multilib' 'lib32-sdl' 'lib32-libpng>=1.5.0' 'lib32-libgl' 'lib32-ncurses' 'lib32-mesa')
+makedepends=('nasm' 'gcc-multilib')
 
 source=(http://downloads.sourceforge.net/${pkgname}/zsnes151src.tar.bz2
 	zsnes.patch
+	gcc47-fix.patch
 	zsnes.desktop
-	zsnes_icon.png
-	gcc47-fix.patch)
+	zsnes-1.51-libpng15.patch
+	zsnes.png)
 md5sums=('7071186bf80632ae88a153239498d8c9'
-	'3af40c7d674ebfce1bb1ab6b7e9a8fe4'
-	'b100b2aa342c551167d7c5dcdcde9dd4'
-	'b5260c02adfc3b7ff725041214b00bfd'
-	'951a54e05e4436fe1114308e4466ad74')
+         '3af40c7d674ebfce1bb1ab6b7e9a8fe4'
+         '951a54e05e4436fe1114308e4466ad74'
+         'f28707c568cec5c9a4440ec70f2b123e'
+         'b2df7ab745719e86c44f2e95b93874b9'
+         'b5260c02adfc3b7ff725041214b00bfd')
 
 build() {
   cd ${srcdir}/${pkgname}_1_51/
   patch -p1 -i ../zsnes.patch
   patch -p1 -i ../gcc47-fix.patch
+  patch -p0 -i ../zsnes-1.51-libpng15.patch
 
   cd ${srcdir}/${pkgname}_1_51/src
-if [ $CARCH == "x86_64" ]; then
   export CC="gcc -m32"
   export CXX="g++ -m32"
-fi
+
   ./autogen.sh --prefix=/usr \
     x_libraries=/usr/lib \
     force_arch=i686 \
     --enable-release
 
   make
+}
+
+package() {
+  cd "$srcdir/${pkgname}_1_51/src"
   make DESTDIR=${pkgdir} install
 
   # adding --mandir= to autoconf line fails
   install -dm755 ${pkgdir}/usr/share
 
   install -Dm644 ${srcdir}/zsnes.desktop ${pkgdir}/usr/share/applications/zsnes.desktop
-  install -Dm644 ${srcdir}/zsnes_icon.png ${pkgdir}/usr/share/pixmaps/zsnes_icon.png
+  install -Dm644 ${srcdir}/zsnes.png ${pkgdir}/usr/share/pixmaps/zsnes.png
 
   mv ${pkgdir}/usr/man ${pkgdir}/usr/share
 }
diff --git a/zsnes/zsnes-1.51-libpng15.patch b/zsnes/zsnes-1.51-libpng15.patch
new file mode 100644
index 0000000..94e905c
--- /dev/null
+++ b/zsnes/zsnes-1.51-libpng15.patch
@@ -0,0 +1,12 @@
+Use existing png_set_IHDR() and stop accessing PNG structure members directly
+
+--- src/zip/zpng.c
++++ 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));
diff --git a/zsnes/zsnes.desktop b/zsnes/zsnes.desktop
index db13ada..81a3a70 100644
--- a/zsnes/zsnes.desktop
+++ b/zsnes/zsnes.desktop
@@ -2,7 +2,7 @@
 Name=Zsnes
 Comment=Super Nintendo emulator
 Exec=/usr/bin/zsnes
-Icon=/usr/share/pixmaps/zsnes_icon.png
+Icon=/usr/share/pixmaps/zsnes.png
 Terminal=false
 Type=Application
 Categories=Application;Game
diff --git a/zsnes/zsnes_icon.png b/zsnes/zsnes.png
similarity index 100%
rename from zsnes/zsnes_icon.png
rename to zsnes/zsnes.png