[arch-commits] Commit in zsnes/repos (6 files)
Alexander Rødseth
arodseth at archlinux.org
Mon Jun 28 10:01:25 UTC 2021
Date: Monday, June 28, 2021 @ 10:01:25
Author: arodseth
Revision: 967678
archrelease: copy trunk to community-x86_64
Added:
zsnes/repos/community-x86_64/
zsnes/repos/community-x86_64/PKGBUILD
(from rev 967677, zsnes/trunk/PKGBUILD)
zsnes/repos/community-x86_64/zsnes-1.51-gamepad.patch
(from rev 967677, zsnes/trunk/zsnes-1.51-gamepad.patch)
zsnes/repos/community-x86_64/zsnes-1.51-libpng15.patch
(from rev 967677, zsnes/trunk/zsnes-1.51-libpng15.patch)
zsnes/repos/community-x86_64/zsnes.patch
(from rev 967677, zsnes/trunk/zsnes.patch)
zsnes/repos/community-x86_64/zsnes.png
(from rev 967677, zsnes/trunk/zsnes.png)
---------------------------+
PKGBUILD | 58 +++++++++++++++++++++++++++++++
zsnes-1.51-gamepad.patch | 38 ++++++++++++++++++++
zsnes-1.51-libpng15.patch | 12 ++++++
zsnes.patch | 80 ++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 188 insertions(+)
Copied: zsnes/repos/community-x86_64/PKGBUILD (from rev 967677, zsnes/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2021-06-28 10:01:25 UTC (rev 967678)
@@ -0,0 +1,58 @@
+# Maintainer: Levente Polyak <anthraxx at archlinux.org>
+# Maintainer: Alexander F. Rødseth <xyproto at archlinux.org>
+# Contributor: 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=23
+pkgdesc='Super Nintendo emulator'
+url='https://www.zsnes.com/'
+arch=(x86_64)
+license=(GPL)
+options=(!buildflags)
+makedepends=(gendesk mesa nasm)
+depends=(lib32-libpng lib32-opengl-driver lib32-sdl)
+optdepends=('lib32-alsa-lib: sound support for ALSA'
+ 'lib32-libpulse: sound support for Pulse Audio')
+source=("https://downloads.sourceforge.net/project/zsnes/zsnes/ZSNES%20v$pkgver/zsnes${pkgver/.}src.tar.bz2"
+ zsnes.patch
+ zsnes-1.51-libpng15.patch
+ zsnes-1.51-gamepad.patch
+ zsnes.png)
+sha512sums=('b10373cf81b201a33dc60c728431d4f69d36de31fcf6f137b623ea206a2998f722dcd6132daec1d0bf14a05ae52f3ee9ecee4334517039be554db85c9f7b8274'
+ 'a89bd37a800627f80e5385be83dde0db7da2570d1479a4d265c2493033bc57e46d220ee496eff9353e7c61b4b5e321b7db8199334227bfb9b7f65b25fec52012'
+ '4191987cad2f8dd7d7fd1d4f8f0c60de07059f18a60cb9bb94f1e5c35c06122032de9887762ebcf2d255f24c3e90aa5b4f6a7540a8e4dbdc4ce5f7d3b3e3b532'
+ '1eb97498441a112b8abb5db52e8608a81556eca9443e3bfe86a3ba9b479bf4bfcba30e7d43becda9c9888f8af8667530d56c7d38446430d9b2dd12675c7a5854'
+ '50a3392de384f3279ec2c8aa0d7e4cedca4b0ff0b8dc6b1b265a84d8e5d91589b23fa52ae0f083c93e638ee9a785b2f18636de6146145dc09d13174bef2511f6')
+_dir=${pkgname}_${pkgver/./_}
+
+prepare() {
+ cd $_dir
+ patch -p1 -i ../zsnes.patch
+ patch -p0 -i ../zsnes-1.51-libpng15.patch
+ patch -p1 -i ../zsnes-1.51-gamepad.patch
+}
+
+build() {
+ cd $_dir/src
+ export CC="gcc $CFLAGS -m32 -fcommon -w"
+ export CXX="g++ $CXXFLAGS -m32 -std=c++14 -w"
+ ./configure \
+ --enable-release \
+ --prefix=/usr \
+ force_arch=$CARCH \
+ x_libraries=/usr/lib
+ make
+}
+
+package() {
+ gendesk "$startdir/PKGBUILD"
+ install -Dm644 zsnes.desktop "$pkgdir/usr/share/applications/zsnes.desktop"
+ install -Dm644 zsnes.png "$pkgdir/usr/share/pixmaps/zsnes.png"
+ make -C $_dir/src DESTDIR="$pkgdir" install
+ install -dm755 "$pkgdir/usr/share"
+ mv "$pkgdir/usr/man" "$pkgdir/usr/share"
+}
Copied: zsnes/repos/community-x86_64/zsnes-1.51-gamepad.patch (from rev 967677, zsnes/trunk/zsnes-1.51-gamepad.patch)
===================================================================
--- community-x86_64/zsnes-1.51-gamepad.patch (rev 0)
+++ community-x86_64/zsnes-1.51-gamepad.patch 2021-06-28 10:01:25 UTC (rev 967678)
@@ -0,0 +1,38 @@
+--- zsnes_1_51/src/linux/sdllink.c.orig 2008-07-27 22:13:02.000000000 +0200
++++ zsnes_1_51/src/linux/sdllink.c 2009-02-10 00:50:17.000000000 +0100
+@@ -307,6 +307,8 @@
+ case SDL_HAT_UP:
+ pressed[offset + 3] = 1;
+ pressed[offset + 2] = 0;
++ pressed[offset + 1] = 0;
++ pressed[offset + 0] = 0;
+ break;
+ case SDL_HAT_RIGHTUP:
+ pressed[offset] = 1;
+@@ -317,6 +317,8 @@
+ case SDL_HAT_RIGHT:
+ pressed[offset] = 1;
+ pressed[offset + 1] = 0;
++ pressed[offset + 2] = 0;
++ pressed[offset + 3] = 0;
+ break;
+ case SDL_HAT_RIGHTDOWN:
+ pressed[offset] = 1;
+@@ -326,6 +326,8 @@
+ break;
+ case SDL_HAT_DOWN:
+ pressed[offset + 2] = 1;
++ pressed[offset + 0] = 0;
++ pressed[offset + 1] = 0;
+ pressed[offset + 3] = 0;
+ break;
+ case SDL_HAT_LEFTDOWN:
+@@ -337,6 +337,8 @@
+ case SDL_HAT_LEFT:
+ pressed[offset + 1] = 1;
+ pressed[offset] = 0;
++ pressed[offset + 2] = 0;
++ pressed[offset + 3] = 0;
+ break;
+ case SDL_HAT_LEFTUP:
+ pressed[offset + 1] = 1;
Copied: zsnes/repos/community-x86_64/zsnes-1.51-libpng15.patch (from rev 967677, zsnes/trunk/zsnes-1.51-libpng15.patch)
===================================================================
--- community-x86_64/zsnes-1.51-libpng15.patch (rev 0)
+++ community-x86_64/zsnes-1.51-libpng15.patch 2021-06-28 10:01:25 UTC (rev 967678)
@@ -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/community-x86_64/zsnes.patch (from rev 967677, zsnes/trunk/zsnes.patch)
===================================================================
--- community-x86_64/zsnes.patch (rev 0)
+++ community-x86_64/zsnes.patch 2021-06-28 10:01:25 UTC (rev 967678)
@@ -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/community-x86_64/zsnes.png (from rev 967677, zsnes/trunk/zsnes.png)
===================================================================
(Binary files differ)
More information about the arch-commits
mailing list