[arch-commits] Commit in zsnes/repos (5 files)

Thu Sep 10 02:51:03 UTC 2015

Date: Thursday, September 10, 2015 @ 04:51:03
  Author: foutrelis
Revision: 139720

archrelease: copy trunk to multilib-staging-x86_64

Added:
  zsnes/repos/multilib-staging-x86_64/
  zsnes/repos/multilib-staging-x86_64/PKGBUILD
    (from rev 139719, zsnes/trunk/PKGBUILD)
  zsnes/repos/multilib-staging-x86_64/zsnes-1.51-libpng15.patch
    (from rev 139719, zsnes/trunk/zsnes-1.51-libpng15.patch)
  zsnes/repos/multilib-staging-x86_64/zsnes.patch
    (from rev 139719, zsnes/trunk/zsnes.patch)
  zsnes/repos/multilib-staging-x86_64/zsnes.png
    (from rev 139719, zsnes/trunk/zsnes.png)

---------------------------+
 PKGBUILD                  |   77 ++++++++++++++++++++++++++++++++++++++++++
 zsnes-1.51-libpng15.patch |   12 ++++++
 zsnes.patch               |   80 ++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 169 insertions(+)

Copied: zsnes/repos/multilib-staging-x86_64/PKGBUILD (from rev 139719, zsnes/trunk/PKGBUILD)
===================================================================

--- multilib-staging-x86_64/PKGBUILD	                        (rev 0)
+++ multilib-staging-x86_64/PKGBUILD	2015-09-10 02:51:03 UTC (rev 139720)
@@ -0,0 +1,77 @@
+# $Id$
+# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
+# Contributor: Frank Tetzel <frank.tetzel at mailbox.tu-dresden.de>
+# Contributor: Hugo Doria <hugo at archlinux.org>
+# Contributor: Aurelien Foret <orelien at chez.com>
+
+pkgname=zsnes
+pkgver=1.51
+pkgrel=18
+pkgdesc="Super Nintendo emulator"
+url="http://www.zsnes.com/"
+arch=('i686' 'x86_64')
+license=('GPL')
+options=(!buildflags)
+
+if [[ $CARCH == "x86_64" ]]; then
+  depends=('lib32-gcc-libs' 'lib32-sdl' 'lib32-libpng>=1.5.0' 'lib32-libgl' 'lib32-ncurses')
+  optdepends=('lib32-alsa-lib: sound support')
+  makedepends=('nasm' 'gcc-multilib' 'gendesk' 'mesa')
+else
+  depends=('gcc-libs' 'sdl' 'libpng>=1.5.0' 'libgl' 'ncurses')
+  optdepends=('alsa-lib: sound support')
+  makedepends=('nasm' 'gcc' 'gendesk' 'mesa')
+fi
+
+source=(http://downloads.sourceforge.net/${pkgname}/zsnes151src.tar.bz2
+        zsnes.patch
+        zsnes-1.51-libpng15.patch
+        zsnes.png)
+md5sums=('7071186bf80632ae88a153239498d8c9'
+         'fd13769c13de49601a234b46fb802a75'
+         'ea82b4dbf31c87dbcc6c67d02ddfb299'
+         'b5260c02adfc3b7ff725041214b00bfd')
+
+prepare() {
+  cd "$srcdir/${pkgname}_1_51"
+
+  patch -p1 -i ../zsnes.patch
+  patch -p0 -i ../zsnes-1.51-libpng15.patch
+}
+
+build() {
+  cd "$srcdir/${pkgname}_1_51/src"
+
+  if [ $CARCH == "x86_64" ]; then
+    export CC="gcc -m32"
+    export CXX="g++ -m32"
+  fi
+
+  ./configure \
+    --prefix=/usr \
+    --enable-release \
+    x_libraries=/usr/lib \
+    force_arch=i686
+
+  make
+}
+
+package() {
+  cd "$srcdir"
+
+  gendesk "$startdir/PKGBUILD"
+
+  cd "${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.png ${pkgdir}/usr/share/pixmaps/zsnes.png
+
+  mv ${pkgdir}/usr/man ${pkgdir}/usr/share
+}
+
+# vim:set ts=2 sw=2 et:

Copied: zsnes/repos/multilib-staging-x86_64/zsnes-1.51-libpng15.patch (from rev 139719, zsnes/trunk/zsnes-1.51-libpng15.patch)
===================================================================
--- multilib-staging-x86_64/zsnes-1.51-libpng15.patch	                        (rev 0)
+++ multilib-staging-x86_64/zsnes-1.51-libpng15.patch	2015-09-10 02:51:03 UTC (rev 139720)
@@ -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));

Copied: zsnes/repos/multilib-staging-x86_64/zsnes.patch (from rev 139719, zsnes/trunk/zsnes.patch)
===================================================================
--- multilib-staging-x86_64/zsnes.patch	                        (rev 0)
+++ multilib-staging-x86_64/zsnes.patch	2015-09-10 02:51:03 UTC (rev 139720)
@@ -0,0 +1,80 @@
+diff -aur zsnes_1_51//src/Makefile.in zsnes_1_51_new//src/Makefile.in
+--- zsnes_1_51//src/Makefile.in	2007-01-24 21:54:12.000000000 +0100
++++ zsnes_1_51_new//src/Makefile.in	2010-09-06 00:03:04.715810431 +0200
+@@ -95,7 +95,7 @@
+ %.o: %.cpp
+ 	@CXX@ @CXXFLAGS@ -o $@ -c $<
+ %.o %.h: %.psr $(PSR)
+-	./$(PSR) @PSRFLAGS@ -gcc @CC@ -compile -flags "@CFLAGS@ -O1" -cheader $*.h -fname $* $*.o $<
++	./$(PSR) @PSRFLAGS@ -gcc "@CC@" -compile -flags "@CFLAGS@ -O1 -D_FORTIFY_SOURCE=0" -cheader $*.h -fname $* $*.o $<
+ 
+ default: main
+ all: main tools
+@@ -133,7 +133,7 @@
+ 
+ include makefile.dep
+ makefile.dep: $(TOOL_D)/depbuild Makefile
+-	$(TOOL_D)/depbuild @CC@ "@CFLAGS@" @NASMPATH@ "@NFLAGS@" $(Z_OBJS) > makefile.dep
++	$(TOOL_D)/depbuild "@CC@" "@CFLAGS@" "@NASMPATH@" "@NFLAGS@" $(Z_OBJS) > makefile.dep
+ 
+ Makefile: Makefile.in config.status
+ 	./config.status
+diff -aur zsnes_1_51//src/parsegen.cpp zsnes_1_51_new//src/parsegen.cpp
+--- zsnes_1_51//src/parsegen.cpp	2007-10-31 05:30:26.000000000 +0100
++++ zsnes_1_51_new//src/parsegen.cpp	2010-09-05 15:48:36.903333444 +0200
+@@ -19,6 +19,9 @@
+ Config file handler creator by Nach (C) 2005-2007
+ */
+ 
++#include <cstring>
++#include <cstdlib>
++
+ #if !defined(__GNUC__) && !defined(_MSC_VER)
+ #error You are using an unsupported compiler
+ #endif
+@@ -1822,7 +1825,7 @@
+   }
+ }
+ 
+-int main(size_t argc, const char *const *const argv)
++int main(int argc, const char *const *const argv)
+ {
+   const char *cheader_file = 0;
+   bool compile = false;
+diff -aur zsnes_1_51//src/tools/depbuild.cpp zsnes_1_51_new//src/tools/depbuild.cpp
+--- zsnes_1_51//src/tools/depbuild.cpp	2006-12-27 12:04:05.000000000 +0100
++++ zsnes_1_51_new//src/tools/depbuild.cpp	2010-09-05 15:48:36.903333444 +0200
+@@ -183,7 +183,7 @@
+   }
+ }
+ 
+-int main(size_t argc, const char *const *const argv)
++int main(int argc, const char *const *const argv)
+ {
+   if (argc < 5)
+   {
+diff -aur zsnes_1_51//src/tools/strutil.h zsnes_1_51_new//src/tools/strutil.h
+--- zsnes_1_51//src/tools/strutil.h	2006-12-27 12:04:05.000000000 +0100
++++ zsnes_1_51_new//src/tools/strutil.h	2010-09-05 15:48:36.903333444 +0200
+@@ -15,6 +15,9 @@
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+ 
++#include <cstring>
++#include <cstdlib>
++
+ /*
+ This is part of a toolkit used to assist in ZSNES development
+ */
+diff -u -r zsnes_1_51/src/tools/depbuild.cpp zsnes_1_51-fix/src/tools/depbuild.cpp
+--- zsnes_1_51/src/tools/depbuild.cpp	2006-12-27 12:04:05.000000000 +0100
++++ zsnes_1_51-fix/src/tools/depbuild.cpp	2012-07-14 16:20:17.759886250 +0200
+@@ -26,6 +26,8 @@
+ #include <cstdio>
+ using namespace std;
+ 
++#include <unistd.h>
++
+ #include "fileutil.h"
+ #include "strutil.h"
+ 

Copied: zsnes/repos/multilib-staging-x86_64/zsnes.png (from rev 139719, zsnes/trunk/zsnes.png)
===================================================================
(Binary files differ)

