1 |
commit: 1379466e9023e60bc8a2e9be43f52e53b901778c |
2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
3 |
AuthorDate: Sat May 9 17:48:33 2020 +0000 |
4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat May 9 20:07:20 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1379466e |
7 |
|
8 |
games-emulation/snes9x: remove unused patches |
9 |
|
10 |
Package-Manager: Portage-2.3.99, Repoman-2.3.22 |
11 |
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> |
12 |
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> |
13 |
|
14 |
.../snes9x/files/snes9x-1.58-build-system.patch | 53 ---------------------- |
15 |
.../snes9x-1.58-without-screenshot_build_fix.patch | 31 ------------- |
16 |
2 files changed, 84 deletions(-) |
17 |
|
18 |
diff --git a/games-emulation/snes9x/files/snes9x-1.58-build-system.patch b/games-emulation/snes9x/files/snes9x-1.58-build-system.patch |
19 |
deleted file mode 100644 |
20 |
index 8a15e0aa4ee..00000000000 |
21 |
--- a/games-emulation/snes9x/files/snes9x-1.58-build-system.patch |
22 |
+++ /dev/null |
23 |
@@ -1,53 +0,0 @@ |
24 |
---- snes9x-1.58/gtk/configure.ac |
25 |
-+++ snes9x-1.58/gtk/configure.ac |
26 |
-@@ -33,8 +33,8 @@ |
27 |
- AM_GNU_GETTEXT([external]) |
28 |
- AM_GNU_GETTEXT_VERSION([0.19.2]) |
29 |
- |
30 |
--snes9xlocaledir='${prefix}/share/locale' |
31 |
--snes9xdatadir='${prefix}/share/snes9x' |
32 |
-+snes9xlocaledir='$(localedir)' |
33 |
-+snes9xdatadir='$(datadir)/snes9x' |
34 |
- |
35 |
- AC_SUBST(snes9xlocaledir) |
36 |
- AC_SUBST(snes9xdatadir) |
37 |
---- snes9x-1.58/unix/configure.ac |
38 |
-+++ snes9x-1.58/unix/configure.ac |
39 |
-@@ -56,37 +56,6 @@ |
40 |
- # *** Execution begins here *** |
41 |
- # ***************************** |
42 |
- |
43 |
--# Test what compiler flags we should use. |
44 |
-- |
45 |
--AC_ARG_ENABLE([debug], |
46 |
-- [AS_HELP_STRING([--enable-debug], |
47 |
-- [leave debug information in the final binary (default: no)])], |
48 |
-- [], [enable_debug="no"]) |
49 |
-- |
50 |
--if test "x$enable_debug" = "xyes"; then |
51 |
-- AC_S9X_COMPILER_FLAG([-g], [g]) |
52 |
-- AC_S9X_COMPILER_FLAG([-O0], [o0]) |
53 |
--else |
54 |
-- AC_S9X_COMPILER_FLAG([-O3], [o3], [ |
55 |
-- AC_S9X_COMPILER_FLAG([-O2], [o2], [ |
56 |
-- AC_S9X_COMPILER_FLAG([-O1], [o1])])]) |
57 |
-- AC_S9X_COMPILER_FLAG([-fomit-frame-pointer], [omit_frame_pointer]) |
58 |
--fi |
59 |
-- |
60 |
--AC_ARG_ENABLE([mtune], |
61 |
-- [AS_HELP_STRING([--enable-mtune], |
62 |
-- [use the specified value for the -mtune/-mcpu flag (default: no)])], |
63 |
-- [], [enable_mtune="no"]) |
64 |
-- |
65 |
--if test "x$enable_mtune" != "xno"; then |
66 |
-- AC_S9X_COMPILER_FLAG([-mtune="$enable_mtune"], [mtune], |
67 |
-- [ |
68 |
-- AC_MSG_WARN([-mtune failed, trying -mcpu...]) |
69 |
-- AC_S9X_COMPILER_FLAG([-mcpu="$enable_mtune"], [mcpu], |
70 |
-- [AC_MSG_ERROR([Please specify a working value for --enable-mtune.])]) |
71 |
-- ]) |
72 |
--fi |
73 |
-- |
74 |
- AC_S9X_COMPILER_FLAG([-fno-exceptions], [no_exceptions]) |
75 |
- AC_S9X_COMPILER_FLAG([-fno-rtti], [no_rtti]) |
76 |
- AC_S9X_COMPILER_FLAG([-pedantic], [pedantic]) |
77 |
|
78 |
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 |
79 |
deleted file mode 100644 |
80 |
index 7af1e9e2b90..00000000000 |
81 |
--- a/games-emulation/snes9x/files/snes9x-1.58-without-screenshot_build_fix.patch |
82 |
+++ /dev/null |
83 |
@@ -1,31 +0,0 @@ |
84 |
-From 51909e0cb44ee8de346f3edfb2a6c4a8bb97ea1d Mon Sep 17 00:00:00 2001 |
85 |
-From: Brandon Wright <bearoso@×××××.com> |
86 |
-Date: Fri, 4 Jan 2019 10:52:11 -0600 |
87 |
-Subject: [PATCH] Fix PNG usage without preprocessor check. |
88 |
- |
89 |
---- |
90 |
- shaders/shader_helpers.cpp | 4 ++++ |
91 |
- 1 file changed, 4 insertions(+) |
92 |
- |
93 |
-diff --git a/shaders/shader_helpers.cpp b/shaders/shader_helpers.cpp |
94 |
-index b84e6291..a589d39b 100644 |
95 |
---- a/shaders/shader_helpers.cpp |
96 |
-+++ b/shaders/shader_helpers.cpp |
97 |
-@@ -93,6 +93,7 @@ bool loadPngImage(const char* name, |
98 |
- bool& outHasAlpha, |
99 |
- GLubyte** outData) |
100 |
- { |
101 |
-+#ifdef HAVE_LIBPNG |
102 |
- png_structp png_ptr; |
103 |
- png_infop info_ptr; |
104 |
- unsigned int sig_read = 0; |
105 |
-@@ -211,6 +212,9 @@ bool loadPngImage(const char* name, |
106 |
- |
107 |
- /* That's it */ |
108 |
- return true; |
109 |
-+#else |
110 |
-+ return false; |
111 |
-+#endif |
112 |
- } |
113 |
- |
114 |
- bool loadTGA(const char* filename, STGA& tgaFile) |