From deba8115d2c2af26df42966b91ef04ff4dd79cde Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 14 May 2020 11:09:11 +0100 Subject: gentoo resync : 14.05.2020 --- games-emulation/snes9x/Manifest | 2 - .../snes9x/files/snes9x-1.58-build-system.patch | 53 ---------------------- .../snes9x-1.58-without-screenshot_build_fix.patch | 31 ------------- 3 files changed, 86 deletions(-) delete mode 100644 games-emulation/snes9x/files/snes9x-1.58-build-system.patch delete mode 100644 games-emulation/snes9x/files/snes9x-1.58-without-screenshot_build_fix.patch (limited to 'games-emulation/snes9x') diff --git a/games-emulation/snes9x/Manifest b/games-emulation/snes9x/Manifest index a15473db70b0..fcec1a8e1eb9 100644 --- a/games-emulation/snes9x/Manifest +++ b/games-emulation/snes9x/Manifest @@ -1,6 +1,4 @@ AUX snes9x-1.53-cross-compile.patch 892 BLAKE2B 9fb806ad16d48d5f07f1ab84feb5f7eafa52a1157eb25675650f08c8fbab8a42318d3277efbdd45f03250df2e9187c76df43312f7ffb2f226423e757b5f6e91c SHA512 4867b9a3e3f2a65684157b26e4b0b63971d37ad5abb16125567e89bc4116482488416ca51d30f639ef63886b05431c56b75978fe073a4755c48988f5ea9eaee5 -AUX snes9x-1.58-build-system.patch 1654 BLAKE2B e2264b61035a8a06b55a710fe9c5d2c689fccd9869af115706edbb28c8ab0a468482c1848e2fa81ee91e7708f0edcbb9c140d0d911442f570b837a48296982eb SHA512 8b898a96ff316d50e97f8d0a89842b57b22612c8e6e49b0ad4bfd203e462f48fd24647c568e602fdaeb99d6a8cc3674994659aea8d35bcce4071e0e7cac7a8f1 -AUX snes9x-1.58-without-screenshot_build_fix.patch 846 BLAKE2B a8afca89a9d5a85df688610e2e136f1e47c1558f3be1a02585f47c075587993b68fbc29de987b7e791517a4584aa9373c4985dbdaed979e0688ae6cb3e5c9d58 SHA512 4cb91935d39766c091fdc30a5eb7b01eb60e29ea365da75968b5302d1f44be6992f46c04ba91af412edc787ddd0738ac8455d7127fbfe79ba7782abc423bab32 AUX snes9x-1.59-build-system.patch 1303 BLAKE2B 48a349bc5d56fcf154faab76cf76fcbb98808ce7933ff5e6da2cbf2b22d62819367e2ac1224f66735108de44419375d6f6eb2c2a4a104a4d492148866b6e829e SHA512 abbd0bfea5ad23f652e8249adbdf1118a4efa2ed43301b1786bbd91a253e98fb7ff99f68ff62c128972fe0af47aee9fa48fa9e3218b0a33c9e68f468fbe2b9e8 DIST snes9x-1.59.2.tar.gz 2819803 BLAKE2B 3e077fe68dbc6ae9acf7625c1371971300cfb72143e0e98841dc8d75be5ccc45812d79d7810d28d1a5dc5c17a69cf0f9483e9c69e91437d864a4cbaf34852b35 SHA512 84d2dfc12a991b77b30ba9a591d285ecd4cc5fbb418282900209db9191d61611123ffa7d715b7abeed9b891e9af88ab4c46616502523a881127e2ede008236e4 DIST snes9x-1.60.tar.gz 2863228 BLAKE2B 0ac3bdd2403221f1013e2b5438aacc4e7d361e943ac7edc56f8ef22827d81484e0b162b84f739ce0f68fe58021124275fd908ccdde99e1e1d6d6c9c0a6e3d17b SHA512 840b006a8fbd479fd5ceb2d94af4ef6470c5e27a3e6c8ddb0dffc8d3e51f465669144cd428bfce28b2ed4f68e70d8f252f2d8a2cae602ba797791d7e483c14c9 diff --git a/games-emulation/snes9x/files/snes9x-1.58-build-system.patch b/games-emulation/snes9x/files/snes9x-1.58-build-system.patch deleted file mode 100644 index 8a15e0aa4ee3..000000000000 --- a/games-emulation/snes9x/files/snes9x-1.58-build-system.patch +++ /dev/null @@ -1,53 +0,0 @@ ---- snes9x-1.58/gtk/configure.ac -+++ snes9x-1.58/gtk/configure.ac -@@ -33,8 +33,8 @@ - AM_GNU_GETTEXT([external]) - AM_GNU_GETTEXT_VERSION([0.19.2]) - --snes9xlocaledir='${prefix}/share/locale' --snes9xdatadir='${prefix}/share/snes9x' -+snes9xlocaledir='$(localedir)' -+snes9xdatadir='$(datadir)/snes9x' - - AC_SUBST(snes9xlocaledir) - AC_SUBST(snes9xdatadir) ---- snes9x-1.58/unix/configure.ac -+++ snes9x-1.58/unix/configure.ac -@@ -56,37 +56,6 @@ - # *** Execution begins here *** - # ***************************** - --# Test what compiler flags we should use. -- --AC_ARG_ENABLE([debug], -- [AS_HELP_STRING([--enable-debug], -- [leave debug information in the final binary (default: no)])], -- [], [enable_debug="no"]) -- --if test "x$enable_debug" = "xyes"; then -- AC_S9X_COMPILER_FLAG([-g], [g]) -- AC_S9X_COMPILER_FLAG([-O0], [o0]) --else -- AC_S9X_COMPILER_FLAG([-O3], [o3], [ -- AC_S9X_COMPILER_FLAG([-O2], [o2], [ -- AC_S9X_COMPILER_FLAG([-O1], [o1])])]) -- AC_S9X_COMPILER_FLAG([-fomit-frame-pointer], [omit_frame_pointer]) --fi -- --AC_ARG_ENABLE([mtune], -- [AS_HELP_STRING([--enable-mtune], -- [use the specified value for the -mtune/-mcpu flag (default: no)])], -- [], [enable_mtune="no"]) -- --if test "x$enable_mtune" != "xno"; then -- AC_S9X_COMPILER_FLAG([-mtune="$enable_mtune"], [mtune], -- [ -- AC_MSG_WARN([-mtune failed, trying -mcpu...]) -- AC_S9X_COMPILER_FLAG([-mcpu="$enable_mtune"], [mcpu], -- [AC_MSG_ERROR([Please specify a working value for --enable-mtune.])]) -- ]) --fi -- - AC_S9X_COMPILER_FLAG([-fno-exceptions], [no_exceptions]) - AC_S9X_COMPILER_FLAG([-fno-rtti], [no_rtti]) - AC_S9X_COMPILER_FLAG([-pedantic], [pedantic]) diff --git a/games-emulation/snes9x/files/snes9x-1.58-without-screenshot_build_fix.patch b/games-emulation/snes9x/files/snes9x-1.58-without-screenshot_build_fix.patch deleted file mode 100644 index 7af1e9e2b902..000000000000 --- a/games-emulation/snes9x/files/snes9x-1.58-without-screenshot_build_fix.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 51909e0cb44ee8de346f3edfb2a6c4a8bb97ea1d Mon Sep 17 00:00:00 2001 -From: Brandon Wright -Date: Fri, 4 Jan 2019 10:52:11 -0600 -Subject: [PATCH] Fix PNG usage without preprocessor check. - ---- - shaders/shader_helpers.cpp | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/shaders/shader_helpers.cpp b/shaders/shader_helpers.cpp -index b84e6291..a589d39b 100644 ---- a/shaders/shader_helpers.cpp -+++ b/shaders/shader_helpers.cpp -@@ -93,6 +93,7 @@ bool loadPngImage(const char* name, - bool& outHasAlpha, - GLubyte** outData) - { -+#ifdef HAVE_LIBPNG - png_structp png_ptr; - png_infop info_ptr; - unsigned int sig_read = 0; -@@ -211,6 +212,9 @@ bool loadPngImage(const char* name, - - /* That's it */ - return true; -+#else -+ return false; -+#endif - } - - bool loadTGA(const char* filename, STGA& tgaFile) -- cgit v1.2.3