From: "James Le Cuirot" <chewi@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: games-emulation/snes9x/files/
Date: Sat, 9 May 2020 20:08:09 +0000 (UTC) [thread overview]
Message-ID: <1589054840.1379466e9023e60bc8a2e9be43f52e53b901778c.chewi@gentoo> (raw)
commit: 1379466e9023e60bc8a2e9be43f52e53b901778c
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sat May 9 17:48:33 2020 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat May 9 20:07:20 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1379466e
games-emulation/snes9x: remove unused patches
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
.../snes9x/files/snes9x-1.58-build-system.patch | 53 ----------------------
.../snes9x-1.58-without-screenshot_build_fix.patch | 31 -------------
2 files changed, 84 deletions(-)
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 8a15e0aa4ee..00000000000
--- 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 7af1e9e2b90..00000000000
--- 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 <bearoso@gmail.com>
-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)
next reply other threads:[~2020-05-09 20:08 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-09 20:08 James Le Cuirot [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-05-21 22:14 [gentoo-commits] repo/gentoo:master commit in: games-emulation/snes9x/files/ David Seifert
2017-12-23 13:11 David Seifert
2016-11-11 17:30 Lars Wendler
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1589054840.1379466e9023e60bc8a2e9be43f52e53b901778c.chewi@gentoo \
--to=chewi@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox