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 =================================================================== --- PKGBUILD 2021-01-13 14:45:19 UTC (rev 820472) +++ PKGBUILD 2021-01-13 14:50:56 UTC (rev 820473) @@ -1,4 +1,6 @@ -# Maintainer: Sven-Hendrik Haase <s...@lutzhaase.com> +# Maintainer: Levente Polyak <anthr...@archlinux.org> +# Maintainer: Alexander F. Rødseth <xypr...@archlinux.org> +# Contributor: Sven-Hendrik Haase <s...@lutzhaase.com> # Contributor: Frank Tetzel <frank.tet...@mailbox.tu-dresden.de> # Contributor: Hugo Doria <h...@archlinux.org> # Contributor: Aurelien Foret <orel...@chez.com> @@ -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.patch 2021-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.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;