1 |
commit: a9ecc542726215f484d1ae7b6a668041744223e5 |
2 |
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jun 2 09:25:01 2021 +0000 |
4 |
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jun 2 10:53:46 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9ecc542 |
7 |
|
8 |
games-emulation/fceux: drop 2.2.3-r100 |
9 |
|
10 |
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> |
11 |
|
12 |
games-emulation/fceux/Manifest | 1 - |
13 |
games-emulation/fceux/fceux-2.2.3-r100.ebuild | 69 ------------- |
14 |
.../fceux/files/fceux-2.2.3-python3.patch | 115 --------------------- |
15 |
games-emulation/fceux/metadata.xml | 3 - |
16 |
4 files changed, 188 deletions(-) |
17 |
|
18 |
diff --git a/games-emulation/fceux/Manifest b/games-emulation/fceux/Manifest |
19 |
index f816c7e3e35..61c17d5f22c 100644 |
20 |
--- a/games-emulation/fceux/Manifest |
21 |
+++ b/games-emulation/fceux/Manifest |
22 |
@@ -1,2 +1 @@ |
23 |
-DIST fceux-2.2.3.src.tar.gz 9292792 BLAKE2B 44412934a50f2cab581cb194932a079071e8c7c1cb4cb4d173e9d7cf4898806fe1b0948d6e86fd70d1265eb596c47f77f751e3a113f03aba9b95e1f5def9c2a8 SHA512 6deb83e9e773694f4040f5f325b0b5b4f45d58bb3481db67b4659c940d90c4c87e3ffeac712b72ddb3f5d089cd9fc7b55b497db61f708c23a7c43c17eda55c7b |
24 |
DIST fceux-2.3.0.src.tar.gz 20779030 BLAKE2B 0d9a0e1f326bdcde4e360a03755c9d807a59e3f3826017e2923527f3ec214bec4c9737f98a8abc4e4971098d127ce8e95eb4142fa8d0bd71109190e6d2c93861 SHA512 46b53f0c4c790ae4f7d5e800adf81cce3c7ccf4b06f972d46e29c0170485e291516709a8c28b26c762d535453e280a6c6de935869c7674bb135c3dca2e266407 |
25 |
|
26 |
diff --git a/games-emulation/fceux/fceux-2.2.3-r100.ebuild b/games-emulation/fceux/fceux-2.2.3-r100.ebuild |
27 |
deleted file mode 100644 |
28 |
index 710e02367ea..00000000000 |
29 |
--- a/games-emulation/fceux/fceux-2.2.3-r100.ebuild |
30 |
+++ /dev/null |
31 |
@@ -1,69 +0,0 @@ |
32 |
-# Copyright 1999-2020 Gentoo Authors |
33 |
-# Distributed under the terms of the GNU General Public License v2 |
34 |
- |
35 |
-EAPI=7 |
36 |
- |
37 |
-LUA_COMPAT=( lua5-1 ) |
38 |
-PYTHON_COMPAT=( python3_{7..9} ) |
39 |
- |
40 |
-inherit python-any-r1 desktop lua-single scons-utils toolchain-funcs |
41 |
- |
42 |
-DESCRIPTION="A portable Famicom/NES emulator, an evolution of the original FCE Ultra" |
43 |
-HOMEPAGE="https://fceux.com/" |
44 |
-SRC_URI="mirror://sourceforge/fceultra/${P}.src.tar.gz" |
45 |
- |
46 |
-LICENSE="GPL-2" |
47 |
-SLOT="0" |
48 |
-KEYWORDS="~amd64 ~x86" |
49 |
-IUSE="gtk logo +lua +opengl" |
50 |
- |
51 |
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )" |
52 |
- |
53 |
-RDEPEND=" |
54 |
- lua? ( ${LUA_DEPS} ) |
55 |
- media-libs/libsdl[opengl?,video] |
56 |
- logo? ( media-libs/gd[png] ) |
57 |
- opengl? ( virtual/opengl ) |
58 |
- gtk? ( x11-libs/gtk+:3 ) |
59 |
- sys-libs/zlib[minizip] |
60 |
-" |
61 |
-DEPEND="${RDEPEND}" |
62 |
- |
63 |
-PATCHES=( |
64 |
- "${FILESDIR}"/${PN}-2.2.2-warnings.patch |
65 |
- "${FILESDIR}/${P}-python3.patch" |
66 |
-) |
67 |
- |
68 |
-pkg_setup() { |
69 |
- python-any-r1_pkg_setup |
70 |
- use lua && lua-single_pkg_setup |
71 |
-} |
72 |
- |
73 |
-src_prepare() { |
74 |
- default |
75 |
- |
76 |
- tc-export CC CXX |
77 |
-} |
78 |
- |
79 |
-src_compile() { |
80 |
- escons \ |
81 |
- GTK=0 \ |
82 |
- CREATE_AVI=1 \ |
83 |
- SYSTEM_LUA=1 \ |
84 |
- SYSTEM_MINIZIP=1 \ |
85 |
- GTK3=$(usex gtk 1 0) \ |
86 |
- LOGO=$(usex logo 1 0) \ |
87 |
- OPENGL=$(usex opengl 1 0) \ |
88 |
- LUA=$(usex lua 1 0) |
89 |
-} |
90 |
- |
91 |
-src_install() { |
92 |
- dobin bin/fceux |
93 |
- |
94 |
- doman documentation/fceux.6 |
95 |
- docompress -x /usr/share/doc/${PF}/documentation /usr/share/doc/${PF}/fceux.chm |
96 |
- dodoc -r Authors changelog.txt TODO-SDL bin/fceux.chm documentation |
97 |
- rm -f "${D}/usr/share/doc/${PF}/documentation/fceux.6" |
98 |
- make_desktop_entry fceux FCEUX |
99 |
- doicon fceux.png |
100 |
-} |
101 |
|
102 |
diff --git a/games-emulation/fceux/files/fceux-2.2.3-python3.patch b/games-emulation/fceux/files/fceux-2.2.3-python3.patch |
103 |
deleted file mode 100644 |
104 |
index c08c67058d2..00000000000 |
105 |
--- a/games-emulation/fceux/files/fceux-2.2.3-python3.patch |
106 |
+++ /dev/null |
107 |
@@ -1,115 +0,0 @@ |
108 |
-This is upstream's patch to fix Python 3 building, modified to apply against 2.2.3. |
109 |
- |
110 |
-https://github.com/TASVideos/fceux/commit/878245fedf028f8c9373be128dbea01f65d4a8b7 |
111 |
- |
112 |
-diff --git a/SConstruct b/SConstruct |
113 |
-index be84421..4b60484 100644 |
114 |
---- a/SConstruct |
115 |
-+++ b/SConstruct |
116 |
-@@ -46,30 +46,30 @@ if platform.system == "ppc": |
117 |
- # Default compiler flags: |
118 |
- env.Append(CCFLAGS = ['-Wall', '-Wno-write-strings', '-Wno-sign-compare']) |
119 |
- |
120 |
--if os.environ.has_key('PLATFORM'): |
121 |
-+if 'PLATFORM' in os.environ: |
122 |
- env.Replace(PLATFORM = os.environ['PLATFORM']) |
123 |
--if os.environ.has_key('CC'): |
124 |
-+if 'CC' in os.environ: |
125 |
- env.Replace(CC = os.environ['CC']) |
126 |
--if os.environ.has_key('CXX'): |
127 |
-+if 'CXX' in os.environ: |
128 |
- env.Replace(CXX = os.environ['CXX']) |
129 |
--if os.environ.has_key('WINDRES'): |
130 |
-+if 'WINDRES' in os.environ: |
131 |
- env.Replace(WINDRES = os.environ['WINDRES']) |
132 |
--if os.environ.has_key('CFLAGS'): |
133 |
-+if 'CFLAGS' in os.environ: |
134 |
- env.Append(CCFLAGS = os.environ['CFLAGS'].split()) |
135 |
--if os.environ.has_key('CXXFLAGS'): |
136 |
-+if 'CXXFLAGS' in os.environ: |
137 |
- env.Append(CXXFLAGS = os.environ['CXXFLAGS'].split()) |
138 |
--if os.environ.has_key('CPPFLAGS'): |
139 |
-+if 'CPPFLAGS' in os.environ: |
140 |
- env.Append(CPPFLAGS = os.environ['CPPFLAGS'].split()) |
141 |
--if os.environ.has_key('LDFLAGS'): |
142 |
-+if 'LDFLAGS' in os.environ: |
143 |
- env.Append(LINKFLAGS = os.environ['LDFLAGS'].split()) |
144 |
--if os.environ.has_key('PKG_CONFIG_PATH'): |
145 |
-+if 'PKG_CONFIG_PATH' in os.environ: |
146 |
- env['ENV']['PKG_CONFIG_PATH'] = os.environ['PKG_CONFIG_PATH'] |
147 |
--if not os.environ.has_key('PKG_CONFIG_PATH') and env['PLATFORM'] == 'darwin': |
148 |
-+if 'PKG_CONFIG_PATH' not in os.environ and env['PLATFORM'] == 'darwin': |
149 |
- env['ENV']['PKG_CONFIG_PATH'] = "/usr/local/lib/pkgconfig:/opt/X11/lib/pkgconfig" |
150 |
--if os.environ.has_key('PKG_CONFIG_LIBDIR'): |
151 |
-+if 'PKG_CONFIG_LIBDIR' in os.environ: |
152 |
- env['ENV']['PKG_CONFIG_LIBDIR'] = os.environ['PKG_CONFIG_LIBDIR'] |
153 |
- |
154 |
--print "platform: ", env['PLATFORM'] |
155 |
-+print("platform: ", env['PLATFORM']) |
156 |
- |
157 |
- # compile with clang |
158 |
- if env['CLANG']: |
159 |
-@@ -103,18 +103,18 @@ else: |
160 |
- assert conf.CheckLibWithHeader('z', 'zlib.h', 'c', 'inflate;', 1), "please install: zlib" |
161 |
- if env['SDL2']: |
162 |
- if not conf.CheckLib('SDL2'): |
163 |
-- print 'Did not find libSDL2 or SDL2.lib, exiting!' |
164 |
-+ print('Did not find libSDL2 or SDL2.lib, exiting!') |
165 |
- Exit(1) |
166 |
- env.Append(CPPDEFINES=["_SDL2"]) |
167 |
- env.ParseConfig('pkg-config sdl2 --cflags --libs') |
168 |
- else: |
169 |
- if not conf.CheckLib('SDL'): |
170 |
-- print 'Did not find libSDL or SDL.lib, exiting!' |
171 |
-+ print('Did not find libSDL or SDL.lib, exiting!') |
172 |
- Exit(1) |
173 |
- env.ParseConfig('sdl-config --cflags --libs') |
174 |
- if env['GTK']: |
175 |
- if not conf.CheckLib('gtk-x11-2.0'): |
176 |
-- print 'Could not find libgtk-2.0, exiting!' |
177 |
-+ print('Could not find libgtk-2.0, exiting!') |
178 |
- Exit(1) |
179 |
- # Add compiler and linker flags from pkg-config |
180 |
- config_string = 'pkg-config --cflags --libs gtk+-2.0' |
181 |
-@@ -153,7 +153,7 @@ else: |
182 |
- env.Append(CCFLAGS = ["-I/usr/include/lua"]) |
183 |
- lua_available = True |
184 |
- if lua_available == False: |
185 |
-- print 'Could not find liblua, exiting!' |
186 |
-+ print('Could not find liblua, exiting!') |
187 |
- Exit(1) |
188 |
- else: |
189 |
- env.Append(CCFLAGS = ["-Isrc/lua/src"]) |
190 |
-@@ -167,7 +167,7 @@ else: |
191 |
- gd = conf.CheckLib('gd', autoadd=1) |
192 |
- if gd == 0: |
193 |
- env['LOGO'] = 0 |
194 |
-- print 'Did not find libgd, you won\'t be able to create a logo screen for your avis.' |
195 |
-+ print('Did not find libgd, you won\'t be able to create a logo screen for your avis.') |
196 |
- |
197 |
- if env['OPENGL'] and conf.CheckLibWithHeader('GL', 'GL/gl.h', 'c', autoadd=1): |
198 |
- conf.env.Append(CCFLAGS = "-DOPENGL") |
199 |
-@@ -181,8 +181,8 @@ if sys.byteorder == 'little' or env['PLATFORM'] == 'win32': |
200 |
- if env['FRAMESKIP']: |
201 |
- env.Append(CPPDEFINES = ['FRAMESKIP']) |
202 |
- |
203 |
--print "base CPPDEFINES:",env['CPPDEFINES'] |
204 |
--print "base CCFLAGS:",env['CCFLAGS'] |
205 |
-+print("base CPPDEFINES:",env['CPPDEFINES']) |
206 |
-+print("base CCFLAGS:",env['CCFLAGS']) |
207 |
- |
208 |
- if env['DEBUG']: |
209 |
- env.Append(CPPDEFINES=["_DEBUG"], CCFLAGS = ['-g', '-O0']) |
210 |
-diff --git a/src/SConscript b/src/SConscript |
211 |
-index 4713e15..2001146 100644 |
212 |
---- a/src/SConscript |
213 |
-+++ b/src/SConscript |
214 |
-@@ -33,7 +33,7 @@ else: |
215 |
- platform_files = SConscript('drivers/sdl/SConscript') |
216 |
- file_list.append(platform_files) |
217 |
- |
218 |
--print env['LINKFLAGS'] |
219 |
-+print(env['LINKFLAGS']) |
220 |
- |
221 |
- if env['PLATFORM'] == 'win32': |
222 |
- fceux = env.Program('fceux.exe', file_list) |
223 |
|
224 |
diff --git a/games-emulation/fceux/metadata.xml b/games-emulation/fceux/metadata.xml |
225 |
index 4c416fd6a7a..87755bab0ad 100644 |
226 |
--- a/games-emulation/fceux/metadata.xml |
227 |
+++ b/games-emulation/fceux/metadata.xml |
228 |
@@ -5,9 +5,6 @@ |
229 |
<email>games@g.o</email> |
230 |
<name>Gentoo Games Project</name> |
231 |
</maintainer> |
232 |
- <use> |
233 |
- <flag name="logo">Enable the ability to add a logo screen when creating AVIs</flag> |
234 |
- </use> |
235 |
<upstream> |
236 |
<remote-id type="github">TASVideos/fceux</remote-id> |
237 |
<remote-id type="sourceforge">fceultra</remote-id> |