[arch-commits] Commit in zsnes/trunk (PKGBUILD)
Date: Friday, July 1, 2022 @ 21:24:37 Author: arodseth Revision: 1243550 upgpkg: zsnes 2.0.10-1 Modified: zsnes/trunk/PKGBUILD --+ PKGBUILD | 13 + 1 file changed, 9 insertions(+), 4 deletions(-) Modified: PKGBUILD === --- PKGBUILD2022-07-01 21:09:00 UTC (rev 1243549) +++ PKGBUILD2022-07-01 21:24:37 UTC (rev 1243550) @@ -6,17 +6,17 @@ # Contributor: Aurelien Foret pkgname=zsnes -pkgver=2.0.9 -pkgrel=2 +pkgver=2.0.10 +pkgrel=1 pkgdesc='Super Nintendo emulator' url='https://github.com/xyproto/zsnes' arch=(x86_64) license=(GPL2) -makedepends=(gendesk git mesa nasm) +makedepends=(gendesk git mesa nasm setconf) depends=(lib32-libpng lib32-opengl-driver lib32-sdl) optdepends=('lib32-alsa-lib: sound support for ALSA' 'lib32-libpulse: sound support for Pulse Audio') -source=("git+$url#commit=09bc1b15e0b6ab8320e86a9399afc2984a9336f3") # tag: 2.0.9 +source=("git+$url#commit=97ec3f4d6d1f2b52ff03aa85fa64569efdd5668a") # tag: 2.0.10 b2sums=('SKIP') prepare() { @@ -26,6 +26,11 @@ build() { export CFLAGS=${CFLAGS/-fcf-protection/} export CXXFLAGS=${CXXFLAGS/-fcf-protection/} + + # Until zsnes is patched upstream + export CFLAGS=${CFLAGS/-Wp,-D_FORTIFY_SOURCE=2/} + export CXXFLAGS=${CXXFLAGS/-Wp,-D_FORTIFY_SOURCE=2/} + make -C $pkgname }
[arch-commits] Commit in zsnes/trunk (PKGBUILD)
Date: Monday, April 25, 2022 @ 21:38:55 Author: arojas Revision: 1190132 962855F072C7A01846405864FCF3C8CB5CF9C8D4 key rebuild Modified: zsnes/trunk/PKGBUILD --+ PKGBUILD |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2022-04-25 21:34:04 UTC (rev 1190131) +++ PKGBUILD2022-04-25 21:38:55 UTC (rev 1190132) @@ -7,7 +7,7 @@ pkgname=zsnes pkgver=2.0.9 -pkgrel=1 +pkgrel=2 pkgdesc='Super Nintendo emulator' url='https://github.com/xyproto/zsnes' arch=(x86_64) @@ -24,6 +24,8 @@ } build() { + export CFLAGS=${CFLAGS/-fcf-protection/} + export CXXFLAGS=${CXXFLAGS/-fcf-protection/} make -C $pkgname }
[arch-commits] Commit in zsnes/trunk (PKGBUILD)
Date: Wednesday, August 18, 2021 @ 19:36:49 Author: arodseth Revision: 1003680 New patch release Modified: zsnes/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2021-08-18 18:58:56 UTC (rev 1003679) +++ PKGBUILD2021-08-18 19:36:49 UTC (rev 1003680) @@ -6,7 +6,7 @@ # Contributor: Aurelien Foret pkgname=zsnes -pkgver=2.0.8 +pkgver=2.0.9 pkgrel=1 pkgdesc='Super Nintendo emulator' url='https://github.com/xyproto/zsnes' @@ -16,7 +16,7 @@ depends=(lib32-libpng lib32-opengl-driver lib32-sdl) optdepends=('lib32-alsa-lib: sound support for ALSA' 'lib32-libpulse: sound support for Pulse Audio') -source=("git+$url#commit=e129482217a991352cb4bb9891e010943ad41c3c") # tag: 2.0.8 +source=("git+$url#commit=09bc1b15e0b6ab8320e86a9399afc2984a9336f3") # tag: 2.0.9 b2sums=('SKIP') prepare() {
[arch-commits] Commit in zsnes/trunk (PKGBUILD)
Date: Sunday, July 11, 2021 @ 18:34:41 Author: arodseth Revision: 976577 upgpkg: zsnes 2.0.8-1 Modified: zsnes/trunk/PKGBUILD --+ PKGBUILD | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) Modified: PKGBUILD === --- PKGBUILD2021-07-11 18:05:04 UTC (rev 976576) +++ PKGBUILD2021-07-11 18:34:41 UTC (rev 976577) @@ -6,7 +6,7 @@ # Contributor: Aurelien Foret pkgname=zsnes -pkgver=2.0.2 +pkgver=2.0.8 pkgrel=1 pkgdesc='Super Nintendo emulator' url='https://github.com/xyproto/zsnes' @@ -16,11 +16,11 @@ depends=(lib32-libpng lib32-opengl-driver lib32-sdl) optdepends=('lib32-alsa-lib: sound support for ALSA' 'lib32-libpulse: sound support for Pulse Audio') -source=("git+$url#commit=944edea30050116115716035ca6f7df6b0efc16d") # tag: 2.0.2 -b2sums=(SKIP) +source=("git+$url#commit=e129482217a991352cb4bb9891e010943ad41c3c") # tag: 2.0.8 +b2sums=('SKIP') prepare() { - gendesk -f --pkgname $pkgname --pkgdesc "$pkgdesc" + gendesk -f -n --pkgname $pkgname --pkgdesc "$pkgdesc" } build() { @@ -29,6 +29,6 @@ package() { install -Dm644 zsnes.desktop "$pkgdir/usr/share/applications/zsnes.desktop" - install -Dm644 zsnes.png "$pkgdir/usr/share/pixmaps/zsnes.png" + install -Dm644 zsnes/icons/64x64x32.png "$pkgdir/usr/share/pixmaps/zsnes.png" DESTDIR="$pkgdir" make -C $pkgname install }
[arch-commits] Commit in zsnes/trunk (PKGBUILD)
Date: Thursday, July 8, 2021 @ 21:36:51 Author: arodseth Revision: 975861 upgpkg: zsnes 2.0.2-1 Modified: zsnes/trunk/PKGBUILD --+ PKGBUILD |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2021-07-08 21:24:44 UTC (rev 975860) +++ PKGBUILD2021-07-08 21:36:51 UTC (rev 975861) @@ -6,17 +6,17 @@ # Contributor: Aurelien Foret pkgname=zsnes -pkgver=2.0.1 +pkgver=2.0.2 pkgrel=1 pkgdesc='Super Nintendo emulator' url='https://github.com/xyproto/zsnes' arch=(x86_64) -license=(GPL) +license=(GPL2) makedepends=(gendesk git 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=("git+$url#commit=96af5fa7e2b4b60a7e861936ca340a724790bf6f") # tag: 2.0.1 +source=("git+$url#commit=944edea30050116115716035ca6f7df6b0efc16d") # tag: 2.0.2 b2sums=(SKIP) prepare() {
[arch-commits] Commit in zsnes/trunk (PKGBUILD)
Date: Thursday, July 8, 2021 @ 20:37:29 Author: arodseth Revision: 975857 Disable old X11-related screensaver-disabling code that sometimes segfaulted Modified: zsnes/trunk/PKGBUILD --+ PKGBUILD |9 - 1 file changed, 4 insertions(+), 5 deletions(-) Modified: PKGBUILD === --- PKGBUILD2021-07-08 20:00:05 UTC (rev 975856) +++ PKGBUILD2021-07-08 20:37:29 UTC (rev 975857) @@ -6,8 +6,8 @@ # Contributor: Aurelien Foret pkgname=zsnes -pkgver=2.0.0 -pkgrel=2 +pkgver=2.0.1 +pkgrel=1 pkgdesc='Super Nintendo emulator' url='https://github.com/xyproto/zsnes' arch=(x86_64) @@ -16,7 +16,7 @@ depends=(lib32-libpng lib32-opengl-driver lib32-sdl) optdepends=('lib32-alsa-lib: sound support for ALSA' 'lib32-libpulse: sound support for Pulse Audio') -source=("git+$url#commit=af4fcf97ca0892bb6b47d6e03a17ada3539ea55a") # tag: 2.0.0 +source=("git+$url#commit=96af5fa7e2b4b60a7e861936ca340a724790bf6f") # tag: 2.0.1 b2sums=(SKIP) prepare() { @@ -30,6 +30,5 @@ package() { install -Dm644 zsnes.desktop "$pkgdir/usr/share/applications/zsnes.desktop" install -Dm644 zsnes.png "$pkgdir/usr/share/pixmaps/zsnes.png" - install -Dm755 zsnes/zsnes "$pkgdir/usr/bin/zsnes" - install -Dm644 zsnes/linux/zsnes.1 "$pkgdir/usr/share/man/man1/zsnes.1" + DESTDIR="$pkgdir" make -C $pkgname install }
[arch-commits] Commit in zsnes/trunk (PKGBUILD)
Date: Thursday, July 8, 2021 @ 19:33:45 Author: arodseth Revision: 975853 upgpkg: zsnes 2.0.0-2 Modified: zsnes/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2021-07-08 19:32:43 UTC (rev 975852) +++ PKGBUILD2021-07-08 19:33:45 UTC (rev 975853) @@ -7,7 +7,7 @@ pkgname=zsnes pkgver=2.0.0 -pkgrel=1 +pkgrel=2 pkgdesc='Super Nintendo emulator' url='https://github.com/xyproto/zsnes' arch=(x86_64)
[arch-commits] Commit in zsnes/trunk (PKGBUILD)
Date: Monday, June 28, 2021 @ 10:01:17 Author: arodseth Revision: 967677 Add -std=c++14 to make the package build again + minor changes to the dependencies + ignore warnings when building Modified: zsnes/trunk/PKGBUILD --+ PKGBUILD | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) Modified: PKGBUILD === --- PKGBUILD2021-06-28 10:01:16 UTC (rev 967676) +++ PKGBUILD2021-06-28 10:01:17 UTC (rev 967677) @@ -7,7 +7,7 @@ pkgname=zsnes pkgver=1.51 -pkgrel=22 +pkgrel=23 pkgdesc='Super Nintendo emulator' url='https://www.zsnes.com/' arch=(x86_64) @@ -14,7 +14,7 @@ license=(GPL) options=(!buildflags) makedepends=(gendesk mesa nasm) -depends=(lib32-gcc-libs lib32-libgl lib32-libpng lib32-ncurses lib32-sdl) +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; @@ -38,12 +38,12 @@ build() { cd $_dir/src - export CC="gcc $CFLAGS -m32 -fcommon" - export CXX="g++ $CXXFLAGS -m32" + export CC="gcc $CFLAGS -m32 -fcommon -w" + export CXX="g++ $CXXFLAGS -m32 -std=c++14 -w" ./configure \ --enable-release \ --prefix=/usr \ -force_arch=i686 \ +force_arch=$CARCH \ x_libraries=/usr/lib make }
[arch-commits] Commit in zsnes/trunk (PKGBUILD)
Date: Wednesday, January 13, 2021 @ 15:15:10 Author: arodseth Revision: 820498 nicer build flags Modified: zsnes/trunk/PKGBUILD --+ PKGBUILD |9 - 1 file changed, 4 insertions(+), 5 deletions(-) Modified: PKGBUILD === --- PKGBUILD2021-01-13 15:05:46 UTC (rev 820497) +++ PKGBUILD2021-01-13 15:15:10 UTC (rev 820498) @@ -7,7 +7,7 @@ pkgname=zsnes pkgver=1.51 -pkgrel=21 +pkgrel=22 pkgdesc='Super Nintendo emulator' url='https://www.zsnes.com/' arch=(x86_64) @@ -14,7 +14,7 @@ license=(GPL) options=(!buildflags) makedepends=(gendesk mesa nasm) -depends=(lib32-gcc-libs lib32-libgl 'lib32-libpng>=1.5.0' lib32-ncurses lib32-sdl) +depends=(lib32-gcc-libs lib32-libgl lib32-libpng lib32-ncurses 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; @@ -38,8 +38,8 @@ build() { cd $_dir/src - export CC='gcc -m32' - export CXX='g++ -m32 -Wl,--allow-multiple-definition' + export CC="gcc $CFLAGS -m32 -fcommon" + export CXX="g++ $CXXFLAGS -m32" ./configure \ --enable-release \ --prefix=/usr \ @@ -53,7 +53,6 @@ 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 - # adding --mandir= to autoconf line fails install -dm755 "$pkgdir/usr/share" mv "$pkgdir/usr/man" "$pkgdir/usr/share" }
[arch-commits] Commit in zsnes/trunk (PKGBUILD zsnes-1.51-gamepad.patch)
Date: Wednesday, January 13, 2021 @ 14:50:56 Author: arodseth Revision: 820473 made zsnes build again + lib32-libpulse optdep + gamepad patch + tested it Added: zsnes/trunk/zsnes-1.51-gamepad.patch Modified: zsnes/trunk/PKGBUILD --+ PKGBUILD | 69 ++--- zsnes-1.51-gamepad.patch | 38 2 files changed, 67 insertions(+), 40 deletions(-) Modified: PKGBUILD === --- PKGBUILD2021-01-13 14:45:19 UTC (rev 820472) +++ PKGBUILD2021-01-13 14:50:56 UTC (rev 820473) @@ -1,4 +1,6 @@ -# Maintainer: Sven-Hendrik Haase +# Maintainer: Levente Polyak +# Maintainer: Alexander F. Rødseth +# Contributor: Sven-Hendrik Haase # Contributor: Frank Tetzel # Contributor: Hugo Doria # Contributor: Aurelien Foret @@ -5,66 +7,53 @@ pkgname=zsnes pkgver=1.51 -pkgrel=20 -pkgdesc="Super Nintendo emulator" -url="https://www.zsnes.com/; -arch=('x86_64') -license=('GPL') +pkgrel=21 +pkgdesc='Super Nintendo emulator' +url='https://www.zsnes.com/' +arch=(x86_64) +license=(GPL) options=(!buildflags) - -makedepends=('nasm' 'gendesk' 'mesa') -depends_x86_64=('lib32-gcc-libs' 'lib32-sdl' 'lib32-libpng>=1.5.0' 'lib32-libgl' 'lib32-ncurses') -optdepends_x86_64=('lib32-alsa-lib: sound support') - -source=(https://downloads.sourceforge.net/project/zsnes/zsnes/ZSNES%20v1.51/zsnes151src.tar.bz2 +makedepends=(gendesk mesa nasm) +depends=(lib32-gcc-libs lib32-libgl 'lib32-libpng>=1.5.0' lib32-ncurses 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 "$srcdir/${pkgname}_1_51" - + 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 "$srcdir/${pkgname}_1_51/src" - - if [ $CARCH == "x86_64" ]; then -export CC="gcc -m32" -export CXX="g++ -m32" - fi - + cd $_dir/src + export CC='gcc -m32' + export CXX='g++ -m32 -Wl,--allow-multiple-definition' ./configure \ +--enable-release \ --prefix=/usr \ ---enable-release \ -x_libraries=/usr/lib \ -force_arch=i686 - +force_arch=i686 \ +x_libraries=/usr/lib make } package() { - cd "$srcdir" - gendesk "$startdir/PKGBUILD" - - cd "${pkgname}_1_51/src" - - make DESTDIR="${pkgdir}" install - + 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 # 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" + install -dm755 "$pkgdir/usr/share" + mv "$pkgdir/usr/man" "$pkgdir/usr/share" } - -# vim:set ts=2 sw=2 et: Added: zsnes-1.51-gamepad.patch === --- zsnes-1.51-gamepad.patch(rev 0) +++ zsnes-1.51-gamepad.patch2021-01-13 14:50:56 UTC (rev 820473) @@ -0,0 +1,38 @@ +--- zsnes_1_51/src/linux/sdllink.c.orig 2008-07-27 22:13:02.0 +0200 zsnes_1_51/src/linux/sdllink.c 2009-02-10 00:50:17.0 +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; +