From 29aabba0ea759c6a2864ff5631735b67ee38e5e0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 5 Feb 2020 18:44:56 +0000 Subject: gentoo resync : 05.02.2020 --- games-emulation/zsnes/Manifest | 6 +- .../zsnes/files/zsnes-1.51-gcc-10.patch | 11 ++ .../zsnes/files/zsnes-1.51-gcc43-20071031.patch | 39 +++++++ games-emulation/zsnes/zsnes-1.51-r7.ebuild | 4 +- games-emulation/zsnes/zsnes-1.51-r8.ebuild | 124 +++++++++++++++++++++ 5 files changed, 182 insertions(+), 2 deletions(-) create mode 100644 games-emulation/zsnes/files/zsnes-1.51-gcc-10.patch create mode 100644 games-emulation/zsnes/files/zsnes-1.51-gcc43-20071031.patch create mode 100644 games-emulation/zsnes/zsnes-1.51-r8.ebuild (limited to 'games-emulation/zsnes') diff --git a/games-emulation/zsnes/Manifest b/games-emulation/zsnes/Manifest index f7dd960cc0f5..bd3f3b3bb8ba 100644 --- a/games-emulation/zsnes/Manifest +++ b/games-emulation/zsnes/Manifest @@ -4,12 +4,16 @@ AUX zsnes-1.51-archopt-july-23-update.patch 12672 BLAKE2B d12246a4913d2355a7c2c2 AUX zsnes-1.51-buffer.patch 3091 BLAKE2B a87e0b6547aeaa9f585d76a8ee080895573015fe42b0df2161268754ff01c046fd234997000ef484f66710dfd30e145d9d4db2f373a568e99deec2a8637db285 SHA512 0faf34338ff3fd85985dc16d2a58aa9e2ac1887db8d26bc210fc6965f6cc743c6c56b8b58bea72341d8ee1fed59c438db801000be5ae6bf4e26789e9bed89d25 AUX zsnes-1.51-cross-compile.patch 934 BLAKE2B be18829454407c99aba00cb8126573f5f3e3ed8e18b2bb50811b855ba81137a16b90601c28cab9fce8d865e522cb66bb797d46a22090dd994c71aef672be99f2 SHA512 ece4a9f51314c7318babaf689fb44c1502ec5bc32808613211865daf1368cc1069b70ad4c1c4ec7b127cf707a0b093c356a8b50e5357099894656c78cf28738f AUX zsnes-1.51-depbuild.patch 559 BLAKE2B 38309177599aee8dafcbded6a027d66b991e85aac4c77fda0485b7777467c056386797041223a556b3cfff4b926e5a0b4004baae4264a765354a6dc2cb39ac75 SHA512 46955153ec6d2ecd5a295117c3ecc911a566de69f29f4d29decc98867d03e4a53a980a3c75d8ff19bbd1655eb291069fbbd598e002a73ebdbdc94c135f852c6e +AUX zsnes-1.51-gcc-10.patch 409 BLAKE2B 4508e17379148a504a171110ddb121df3666dc9430a477d67b33fbd3544dff6799b159c9fe1f8c51fe2ffdf6d5c3fd1d809181942b774639cb7aad03fdaa2929 SHA512 28f1e215c0b85ffaae8f5128a79778532119bb51a89f7e4a6ee655aee0bcf520086f25c60ff303a5a3f8ea0b976aa4c29a3f68db0d320109ecd4349311bfedfe +AUX zsnes-1.51-gcc43-20071031.patch 739 BLAKE2B 798bb1b45bd82a7e25c5923a2653aa61e2f2b197e26ca1e6cecdf5d55ecd83263c5aae17aee18419d0a14f58c6a24b02d0c31212189561d4a355d9f3e2fc386e SHA512 0ab19c1fadaf0ac07a7641366a56c5a2f7227e2fc39fe904e27954596ebee64174242b98a873abf6ee52b8e8335ce277189606e7a376ae02d4a95498cce24a40 AUX zsnes-1.51-gcc43.patch 913 BLAKE2B 7ac3d5b8f556d577c1a1065bbe4e275742fdde0486411cc82f2dc552e8d90b82eb7dceefcdd87252633154b8249213f9dfe6724f4f0ee4eef3f8f691081355c7 SHA512 8684b9b8c01d2d9f27bf27a86e4705b3408a2891347045266040397b649eb162962e8384746930c9837ac9b21bfd626d6e241d8a6c73b46a0e348274dd8688d3 AUX zsnes-1.51-gcc47.patch 312 BLAKE2B 927c6179fbbcd3fb161b5b18e025090acce178eae0586b7c20e48cdba091572d30c224aa80bb8a49c16d29fb9045c0207b26692651a15a53c2b4b90780c3f0c2 SHA512 aa9f111359e96118729e684562618d72231c5c475e736c53862cfe9d21b8c4db29056ec0476dcc7e50dd501a77619671fb8834be093086c7e752100c917060fc AUX zsnes-1.51-libao-thread.patch 667 BLAKE2B 76bc0abf16f68c9752a727817cff209daa2c0c29f31e6045441e202083f47559cb50c1a6a998c12621a298fa3901bc1d52701b176b8fd594ca116f990d3c5208 SHA512 43c28d4539df5c8ea4d3d0415c65afec3eb9215971a5ff0532b3b147b2fa3f870aadf07eb1e643e986c39d56760c0292447d467418865826ddc8c7aea64cc005 AUX zsnes-1.51-libpng.patch 858 BLAKE2B f0ad46176cf5729d0a5be9e4307a28628e38c3d18043f0ff897dfd1cf901f0f9fb7ff80d25095fdaa9b6b1be52fe3c95f4e28b65042b4c4aad33a27125c7eb02 SHA512 2c25fb3294357a38ed8e119d4b4d60f7bd6f28724b2274a620465962e96e008f2a29273f46d4813e91b9128879218f401bb91b1a6df4c156b9ff7856b26657b0 AUX zsnes-1.51-libpng15.patch 510 BLAKE2B 6281a27c6029ee94947b282fe5c06a67e7670d3168d5f4ae90573d12e8e6d5c467a9691cdd161158f117e341466bc7a3e99d516b95624534773027279aba4f7a SHA512 4191987cad2f8dd7d7fd1d4f8f0c60de07059f18a60cb9bb94f1e5c35c06122032de9887762ebcf2d255f24c3e90aa5b4f6a7540a8e4dbdc4ce5f7d3b3e3b532 AUX zsnes-1.51-stack-align-v2.patch 1451 BLAKE2B b4570fa9d614d516375f1b7d2a9b3b7c9bf432f453425d2ee3035e78d8d946355551044d712528907c3a1f29b3531034b5949224398801e04270df85ada5ab00 SHA512 c3be01f36973615c55c643d1d916742f8e3a34e9957b42d1d7224a99790713025bb154e5e8c2833fd1e8d26240c6251a70c8a9f36fefe661480077b1b06871c8 +DIST zsnes-1.51-20071031.tar.bz2 1072340 BLAKE2B d67c92e382ca130d4138d21fbb2effc06539d1c7e3aabf0339c9b7e773521daf2d3cb0bcef75991e1a4453fcc86903d3dead48d90806489c8b4bf7677f8ebf3b SHA512 b10373cf81b201a33dc60c728431d4f69d36de31fcf6f137b623ea206a2998f722dcd6132daec1d0bf14a05ae52f3ee9ecee4334517039be554db85c9f7b8274 DIST zsnes151src.tar.bz2 1071712 BLAKE2B e942c699bd227942563deb23b105339aa9ffd8a5623200ca142a777508b4ebaf47859170016490f53a3af2bfb15293c17a99a7658e1f3f0afd7df8cd63200b9a SHA512 2cec9ad7762fc7a257c6b1d3e190b0ed53565dbafe42e1dee9eb182644392b7dd2c57faa846f63cd30ac079e5c05354d26ce0612d20481a1f54d760d62d95353 -EBUILD zsnes-1.51-r7.ebuild 3191 BLAKE2B 0e8ede6c07b0713cf10a37437c241aad7871ea9ab28316be957cfdc6839a0b7965f3f56c23e31ea9b824444a10fcab3486fd1c713ddc9622c382c6b0b86e0c83 SHA512 cc28feb77f700077f676b40ff595cb4cd43fc91b508f250fa746a4e48cb99e642fb2c68ba6774d4128564309d0f7148ff69764c442e1b8fce1ea9f5eaa97b706 +EBUILD zsnes-1.51-r7.ebuild 3225 BLAKE2B a76878c51ec13cca0183b61603a8f522e0e2ae91efec00e13bbecf65a41e5e632ea6de3c44320e886c5734279da75d801d0cf3d171c9d260b5da614ed6e10a78 SHA512 586a0d7b4b9884571510b8ed838f2bf4fb6bbb666de0fb2e53a8cd1ff7f8c9217d22b96c3f0c242323fd3d0399db80b815e4f5607d2c1f55b2aa309a4d8171cd +EBUILD zsnes-1.51-r8.ebuild 3210 BLAKE2B ddac13b724161f5b7498610344841d9ad1bdc5ba9998410c6e2d94bcb1994e65d4a94b79663b62a2f5121b64e31926632394782625f592139fedd6842db44565 SHA512 fe54c3dcb02a3610e9f04c03a4ec9c45c247cfef1329ab7375c6114fbccb8113a54e883353d2c8fab6c54b36308b8bbd6b70288610c83039a49790db482eee83 MISC metadata.xml 413 BLAKE2B 4e4199d8263368534eb4e2971fd30f0ef32af1537a7131ff150c6aee178c6a804083536c3ec249547f0826064ffe476e6c777b8c0aa519fc99d9d3d6284052c0 SHA512 235a3739eb5641eb444fb9ae47c661f05140c3b348173b65b342971850c2e0e7e32c416315904e48fcd8fa9241c93b0e0cc030851b61074c78566d3603f41973 diff --git a/games-emulation/zsnes/files/zsnes-1.51-gcc-10.patch b/games-emulation/zsnes/files/zsnes-1.51-gcc-10.patch new file mode 100644 index 000000000000..71a1392e6a4e --- /dev/null +++ b/games-emulation/zsnes/files/zsnes-1.51-gcc-10.patch @@ -0,0 +1,11 @@ +--- a/initc.c ++++ b/initc.c +@@ -1495,7 +1495,7 @@ Would be nice to trash this section in the future + extern unsigned char ENVDisable, cycpb268, cycpb358, cycpbl2, cycpblt2, cycpbl; + extern unsigned char cycpblt, opexec268, opexec358, opexec268b, opexec358b; + extern unsigned char opexec268cph, opexec358cph, opexec268cphb, opexec358cphb; +-bool HacksDisable; ++extern bool HacksDisable; + + void headerhack() + { diff --git a/games-emulation/zsnes/files/zsnes-1.51-gcc43-20071031.patch b/games-emulation/zsnes/files/zsnes-1.51-gcc43-20071031.patch new file mode 100644 index 000000000000..59fbb8fdbf19 --- /dev/null +++ b/games-emulation/zsnes/files/zsnes-1.51-gcc43-20071031.patch @@ -0,0 +1,39 @@ +--- src/parsegen.cpp ++++ src/parsegen.cpp +@@ -31,6 +31,7 @@ + #include + #include + #include ++#include + using namespace std; + + #include +--- src/tools/depbuild.cpp ++++ src/tools/depbuild.cpp +@@ -24,6 +24,7 @@ + #include + #include + #include ++#include + using namespace std; + + #include "fileutil.h" +@@ -183,7 +184,7 @@ + } + } + +-int main(size_t argc, const char *const *const argv) ++int main(int argc, const char *const *const argv) + { + if (argc < 5) + { +--- src/tools/strutil.h ++++ src/tools/strutil.h +@@ -25,6 +25,7 @@ + #include + #include + #include ++#include + + struct ci_char_traits : public std::char_traits + { diff --git a/games-emulation/zsnes/zsnes-1.51-r7.ebuild b/games-emulation/zsnes/zsnes-1.51-r7.ebuild index 6a452751e0e7..1d2c43f55fa4 100644 --- a/games-emulation/zsnes/zsnes-1.51-r7.ebuild +++ b/games-emulation/zsnes/zsnes-1.51-r7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -54,6 +54,8 @@ PATCHES=( "${FILESDIR}"/${P}-cross-compile.patch "${FILESDIR}"/${P}-arch.patch + + "${FILESDIR}"/${P}-gcc-10.patch ) src_prepare() { diff --git a/games-emulation/zsnes/zsnes-1.51-r8.ebuild b/games-emulation/zsnes/zsnes-1.51-r8.ebuild new file mode 100644 index 000000000000..1139717f6e2d --- /dev/null +++ b/games-emulation/zsnes/zsnes-1.51-r8.ebuild @@ -0,0 +1,124 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit autotools desktop flag-o-matic toolchain-funcs pax-utils + +DESCRIPTION="SNES (Super Nintendo) emulator that uses x86 assembly" +HOMEPAGE="http://www.zsnes.com/ http://ipherswipsite.com/zsnes/" +SRC_URI="mirror://sourceforge/zsnes/${PN}${PV//./}src.tar.bz2 -> ${P}-20071031.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="ao custom-cflags +debug opengl png" + +RDEPEND=" + media-libs/libsdl[sound,video,abi_x86_32(-)] + >=sys-libs/zlib-1.2.3-r1[abi_x86_32(-)] + ao? ( media-libs/libao[abi_x86_32(-)] ) + debug? ( sys-libs/ncurses:0=[abi_x86_32(-)] ) + opengl? ( virtual/opengl[abi_x86_32(-)] ) + png? ( media-libs/libpng:0=[abi_x86_32(-)] ) +" +DEPEND="${RDEPEND} + dev-lang/nasm + debug? ( virtual/pkgconfig ) +" + +S="${WORKDIR}/${PN}_${PV//./_}/src" + +PATCHES=( + # Fixing compilation without libpng installed + "${FILESDIR}"/${P}-libpng.patch + + # Fix bug #186111 + # Fix bug #214697 + # Fix bug #170108 + # Fix bug #260247 + "${FILESDIR}"/${P}-gcc43-20071031.patch + "${FILESDIR}"/${P}-libao-thread.patch + "${FILESDIR}"/${P}-depbuild.patch + "${FILESDIR}"/${P}-CC-quotes.patch + + # Fix compability with libpng15 wrt #378735 + "${FILESDIR}"/${P}-libpng15.patch + + # Fix buffer overwrite #257963 + "${FILESDIR}"/${P}-buffer.patch + # Fix gcc47 compile #419635 + "${FILESDIR}"/${P}-gcc47.patch + # Fix stack alignment issue #503138 + "${FILESDIR}"/${P}-stack-align-v2.patch + + "${FILESDIR}"/${P}-cross-compile.patch + "${FILESDIR}"/${P}-arch.patch + + "${FILESDIR}"/${P}-gcc-10.patch +) + +src_prepare() { + default + + # The sdl detection logic uses AC_PROG_PATH instead of + # AC_PROG_TOOL, so force the var to get set the way we + # need for things to work correctly. + tc-is-cross-compiler && export ac_cv_path_SDL_CONFIG=${CHOST}-sdl-config + + sed -i -e '67i#define OF(x) x' zip/zunzip.h || die + + # Remove hardcoded CFLAGS and LDFLAGS + sed -i \ + -e '/^CFLAGS=.*local/s:-pipe.*:-Wall -I.":' \ + -e '/^LDFLAGS=.*local/d' \ + -e '/\w*CFLAGS=.*fomit/s:-O3.*$STRIP::' \ + -e '/lncurses/s:-lncurses:`pkg-config ncurses --libs`:' \ + -e '/lcurses/s:-lcurses:`pkg-config ncurses --libs`:' \ + configure.in || die + sed -i \ + -e 's/configure.in/configure.ac/' \ + Makefile.in || die + mv configure.in configure.ac || die + eautoreconf +} + +src_configure() { + tc-export CC + export BUILD_CXX=$(tc-getBUILD_CXX) + export NFLAGS=-O1 + use amd64 && multilib_toolchain_setup x86 + use custom-cflags || strip-flags + + append-cppflags -U_FORTIFY_SOURCE #257963 + + econf \ + $(use_enable ao libao) \ + $(use_enable debug debugger) \ + $(use_enable png libpng) \ + $(use_enable opengl) \ + --disable-debug \ + --disable-cpucheck +} + +src_compile() { + emake makefile.dep + emake +} + +src_install() { + # Uses pic-unfriendly assembly code, bug #427104 + QA_TEXTRELS="usr/bin/zsnes" + + dobin zsnes + pax-mark m "${ED}${GAMES_BINDIR}"/zsnes + + newman linux/zsnes.1 zsnes.6 + + dodoc \ + ../docs/{readme.1st,authors.txt,srcinfo.txt,stdards.txt,support.txt,thanks.txt,todo.txt,README.LINUX} \ + ../docs/readme.txt/* + HTML_DOCS="../docs/readme.htm/*" einstalldocs + + make_desktop_entry zsnes ZSNES + newicon icons/48x48x32.png ${PN}.png +} -- cgit v1.2.3