Gentoo Archives: gentoo-commits

From: Pacho Ramos <pacho@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-emulation/sdlmame/, games-emulation/sdlmame/files/
Date: Sun, 29 Apr 2018 13:07:10
Message-Id: 1525007212.1391afa6a2e870fd035808bbe23f382853e03788.pacho@gentoo
1 commit: 1391afa6a2e870fd035808bbe23f382853e03788
2 Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
3 AuthorDate: Sun Apr 29 13:06:10 2018 +0000
4 Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
5 CommitDate: Sun Apr 29 13:06:52 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1391afa6
7
8 Remove masked for removal package
9
10 games-emulation/sdlmame/Manifest | 1 -
11 .../sdlmame/files/sdlmame-0.174-cxx14.patch | 28 ---
12 .../sdlmame/files/sdlmame-0.174-qt.patch | 29 ---
13 games-emulation/sdlmame/files/vector.ini | 9 -
14 games-emulation/sdlmame/metadata.xml | 34 ---
15 games-emulation/sdlmame/sdlmame-0.174.ebuild | 234 ---------------------
16 6 files changed, 335 deletions(-)
17
18 diff --git a/games-emulation/sdlmame/Manifest b/games-emulation/sdlmame/Manifest
19 deleted file mode 100644
20 index 8b36828499a..00000000000
21 --- a/games-emulation/sdlmame/Manifest
22 +++ /dev/null
23 @@ -1 +0,0 @@
24 -DIST mame-0.174.zip 95944685 BLAKE2B e97027edf7be293e599499bd428c663c1fc13498e2fe10ee356aa56ef8ba85d6ea003ba65a8cbc41d1159246eed354585fc18bf9507b47dc1774b87f5737b48d SHA512 9db4d98fb5f5373529808f3bc41fddefa65ebbf7c26d946ebf886cab25e5abf7c4d539d96dfd6af5e62f4366b2bb0b0b59d40fe7a722698f3707eb8ea4c12a0b
25
26 diff --git a/games-emulation/sdlmame/files/sdlmame-0.174-cxx14.patch b/games-emulation/sdlmame/files/sdlmame-0.174-cxx14.patch
27 deleted file mode 100644
28 index bd88cb476e8..00000000000
29 --- a/games-emulation/sdlmame/files/sdlmame-0.174-cxx14.patch
30 +++ /dev/null
31 @@ -1,28 +0,0 @@
32 -# work around gcc-4.9.3's implementation of cxx14
33 -# bug 582576 with patch from Alexander Miller
34 -# https://bugs.gentoo.org/show_bug.cgi?id=582576
35 -
36 ---- a/src/lib/util/strformat.h
37 -+++ b/src/lib/util/strformat.h
38 -@@ -185,9 +185,8 @@
39 - #include <type_traits>
40 - #include <utility>
41 -
42 --#if defined(__GLIBCXX__) && (__GLIBCXX__ < 20150413)
43 --namespace std
44 --{
45 -+namespace std {
46 -+namespace mame_cxx14_compat {
47 - template<class _Container>
48 - inline constexpr auto
49 - cbegin(const _Container& __cont) noexcept(noexcept(std::begin(__cont)))-> decltype(std::begin(__cont))
50 -@@ -198,7 +197,8 @@
51 - cend(const _Container& __cont) noexcept(noexcept(std::end(__cont)))-> decltype(std::end(__cont))
52 - { return std::end(__cont); }
53 - }
54 --#endif
55 -+using namespace mame_cxx14_compat;
56 -+}
57 -
58 - namespace util {
59 - namespace detail {
60
61 diff --git a/games-emulation/sdlmame/files/sdlmame-0.174-qt.patch b/games-emulation/sdlmame/files/sdlmame-0.174-qt.patch
62 deleted file mode 100644
63 index f9c384d91cf..00000000000
64 --- a/games-emulation/sdlmame/files/sdlmame-0.174-qt.patch
65 +++ /dev/null
66 @@ -1,29 +0,0 @@
67 -No point in adding qt-related things to the compile line unless the qt debugger is wanted
68 -
69 ---- scripts/src/osd/sdl_cfg.lua.orig
70 -+++ scripts/src/osd/sdl_cfg.lua
71 -@@ -115,14 +115,16 @@
72 - configuration { }
73 -
74 - elseif _OPTIONS["targetos"]=="linux" then
75 -- if _OPTIONS["QT_HOME"]~=nil then
76 -- buildoptions {
77 -- "-I" .. backtick(_OPTIONS["QT_HOME"] .. "/bin/qmake -query QT_INSTALL_HEADERS"),
78 -- }
79 -- else
80 -- buildoptions {
81 -- backtick("pkg-config --cflags Qt5Widgets"),
82 -- }
83 -+ if _OPTIONS["USE_QTDEBUG"]=="1" then
84 -+ if _OPTIONS["QT_HOME"]~=nil then
85 -+ buildoptions {
86 -+ "-I" .. backtick(_OPTIONS["QT_HOME"] .. "/bin/qmake -query QT_INSTALL_HEADERS"),
87 -+ }
88 -+ else
89 -+ buildoptions {
90 -+ backtick("pkg-config --cflags Qt5Widgets"),
91 -+ }
92 -+ end
93 - end
94 - elseif _OPTIONS["targetos"]=="macosx" then
95 - defines {
96
97 diff --git a/games-emulation/sdlmame/files/vector.ini b/games-emulation/sdlmame/files/vector.ini
98 deleted file mode 100644
99 index d4906e34ccd..00000000000
100 --- a/games-emulation/sdlmame/files/vector.ini
101 +++ /dev/null
102 @@ -1,9 +0,0 @@
103 -#
104 -# Specific options file for vector games
105 -#
106 -
107 -#
108 -# VIDEO OPTIONS
109 -#
110 -video soft
111 -yuvmode yv12
112
113 diff --git a/games-emulation/sdlmame/metadata.xml b/games-emulation/sdlmame/metadata.xml
114 deleted file mode 100644
115 index d94f41033e1..00000000000
116 --- a/games-emulation/sdlmame/metadata.xml
117 +++ /dev/null
118 @@ -1,34 +0,0 @@
119 -<?xml version="1.0" encoding="UTF-8"?>
120 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
121 -<pkgmetadata>
122 - <maintainer type="project">
123 - <email>games@g.o</email>
124 - <name>Gentoo Games Project</name>
125 - </maintainer>
126 - <longdescription>
127 -SDLMAME is a port of the popular MAME[tm].
128 -
129 -There are a few principles that guide its development:
130 -
131 -1) run on Linux/Unix, Mac OS X, and other SDL supported operating systems with
132 -as few changes as possible to the base Win32 code. This means we can track
133 -changes faster than larger more conventional ports such as MacMAME, and we also
134 -maintain what I call "Firefox compatibility" where learning a major app only
135 -needs to be done once per application, and it then applies across many
136 -operating systems. If you can use the command-line Win32 MAME, you already know
137 -how to use SDLMAME on any platform you may encounter it on.
138 -
139 -2) MAME developers are important. By keeping quickly up to date, we make it
140 -easy for people on non-Windows platforms to make and submit changes to the core
141 -MAME code, and we offer native implementations of MAME's multi-window GUI
142 -debugger on both Linux/Unix and Mac OS X.
143 - </longdescription>
144 - <use>
145 - <flag name="arcade">Enable the Multiple Arcade Machine Emulator for arcade games support</flag>
146 - <flag name="tools">Build development tools shared between sdlmame and sdlmess</flag>
147 - <flag name="mess">Enable the Multi Emulator Super System for game system support</flag>
148 - </use>
149 - <upstream>
150 - <remote-id type="github">mamedev/mame</remote-id>
151 - </upstream>
152 -</pkgmetadata>
153
154 diff --git a/games-emulation/sdlmame/sdlmame-0.174.ebuild b/games-emulation/sdlmame/sdlmame-0.174.ebuild
155 deleted file mode 100644
156 index d1f61aaf4ed..00000000000
157 --- a/games-emulation/sdlmame/sdlmame-0.174.ebuild
158 +++ /dev/null
159 @@ -1,234 +0,0 @@
160 -# Copyright 1999-2016 Gentoo Foundation
161 -# Distributed under the terms of the GNU General Public License v2
162 -
163 -EAPI=5
164 -PYTHON_COMPAT=( python2_7 )
165 -inherit eutils python-any-r1 toolchain-funcs qmake-utils games
166 -
167 -MY_PV="${PV/.}"
168 -
169 -DESCRIPTION="Multiple Arcade Machine Emulator + Multi Emulator Super System (MESS)"
170 -HOMEPAGE="http://mamedev.org/"
171 -SRC_URI="https://github.com/mamedev/mame/releases/download/mame${MY_PV}/mame${MY_PV}s.zip -> mame-${PV}.zip"
172 -
173 -LICENSE="GPL-2+ BSD-2 MIT CC0-1.0"
174 -SLOT="0"
175 -KEYWORDS="~amd64 ~x86"
176 -IUSE="alsa +arcade debug +mess opengl openmp tools"
177 -REQUIRED_USE="|| ( arcade mess )"
178 -
179 -# MESS (games-emulation/sdlmess) has been merged into MAME upstream since mame-0.162 (see below)
180 -# MAME/MESS build combined (default) +arcade +mess (mame)
181 -# MAME build only +arcade -mess (mamearcade)
182 -# MESS build only -arcade +mess (mess)
183 -# games-emulation/sdlmametools is dropped and enabled instead by the 'tools' useflag
184 -RDEPEND="!games-emulation/sdlmametools
185 - !games-emulation/sdlmess
186 - dev-db/sqlite:3
187 - dev-libs/expat
188 - media-libs/fontconfig
189 - media-libs/flac
190 - media-libs/libsdl2[joystick,opengl?,sound,video,X]
191 - media-libs/portaudio
192 - media-libs/sdl2-ttf
193 - sys-libs/zlib
194 - virtual/jpeg:0
195 - virtual/opengl
196 - alsa? ( media-libs/alsa-lib
197 - media-libs/portmidi )
198 - debug? ( dev-qt/qtcore:5
199 - dev-qt/qtgui:5
200 - dev-qt/qtwidgets:5 )
201 - x11-libs/libX11
202 - x11-libs/libXinerama
203 - ${PYTHON_DEPS}"
204 -DEPEND="${RDEPEND}
205 - ${PYTHON_DEPS}
206 - app-arch/unzip
207 - virtual/pkgconfig
208 - x11-proto/xineramaproto"
209 -
210 -S=${WORKDIR}
211 -
212 -# Function to disable a makefile option
213 -disable_feature() {
214 - sed -i -e "/^[ ]*$1.*=/s:^:# :" makefile || die
215 -}
216 -
217 -# Function to enable a makefile option
218 -enable_feature() {
219 - sed -i -e "/^#.*$1.*=/s:^#[ ]*::" makefile || die
220 -}
221 -
222 -pkg_setup() {
223 - games_pkg_setup
224 - python-any-r1_pkg_setup
225 -}
226 -
227 -src_unpack() {
228 - default
229 - unpack ./mame.zip
230 - rm -f mame.zip || die
231 -}
232 -
233 -src_prepare() {
234 - epatch \
235 - "${FILESDIR}"/${P}-qt.patch \
236 - "${FILESDIR}"/${P}-cxx14.patch
237 - # Disable using bundled libraries
238 - enable_feature USE_SYSTEM_LIB_EXPAT
239 - enable_feature USE_SYSTEM_LIB_FLAC
240 - enable_feature USE_SYSTEM_LIB_JPEG
241 -# Use bundled lua for now to ensure correct compilation (ref. b.g.o #407091)
242 -# enable_feature USE_SYSTEM_LIB_LUA
243 - enable_feature USE_SYSTEM_LIB_PORTAUDIO
244 - enable_feature USE_SYSTEM_LIB_SQLITE3
245 - enable_feature USE_SYSTEM_LIB_ZLIB
246 -
247 - # Disable warnings being treated as errors and enable verbose build output
248 - enable_feature NOWERROR
249 - enable_feature VERBOSE
250 -
251 - use amd64 && enable_feature PTR64
252 - use debug && enable_feature DEBUG
253 - use tools && enable_feature TOOLS
254 - disable_feature NO_X11 # bgfx needs X
255 - use openmp && enable_feature OPENMP
256 -
257 - if use alsa ; then
258 - enable_feature USE_SYSTEM_LIB_PORTMIDI
259 - else
260 - enable_feature NO_USE_MIDI
261 - fi
262 -
263 - sed -i \
264 - -e 's/-Os//' \
265 - -e '/^\(CC\|CXX\|AR\) /s/=/?=/' \
266 - 3rdparty/genie/build/gmake.linux/genie.make || die
267 -}
268 -
269 -src_compile() {
270 - local targetargs
271 - local qtdebug=$(usex debug 1 0)
272 -
273 - use arcade && ! use mess && targetargs="SUBTARGET=arcade"
274 - ! use arcade && use mess && targetargs="SUBTARGET=mess"
275 -
276 - function my_emake() {
277 - # Workaround conflicting $ARCH variable used by both Gentoo's
278 - # portage and by Mame's build scripts
279 - PYTHON_EXECUTABLE=${PYTHON} \
280 - OVERRIDE_CC=$(tc-getCC) \
281 - OVERRIDE_CXX=$(tc-getCXX) \
282 - OVERRIDE_LD=$(tc-getCXX) \
283 - QT_HOME="$(qt5_get_libdir)/qt5" \
284 - ARCH= \
285 - emake "$@" \
286 - AR=$(tc-getAR)
287 - }
288 - my_emake -j1 generate
289 -
290 - my_emake ${targetargs} \
291 - SDL_INI_PATH="\$\$\$\$HOME/.sdlmame;${GAMES_SYSCONFDIR}/${PN}" \
292 - USE_QTDEBUG=${qtdebug}
293 -
294 - if use tools ; then
295 - my_emake -j1 TARGET=ldplayer USE_QTDEBUG=${qtdebug}
296 - fi
297 -}
298 -
299 -src_install() {
300 - local MAMEBIN
301 - local suffix="$(use amd64 && echo 64)$(use debug && echo d)"
302 - local f
303 -
304 - function mess_install() {
305 - dosym ${MAMEBIN} "${GAMES_BINDIR}"/mess${suffix}
306 - dosym ${MAMEBIN} "${GAMES_BINDIR}"/sdlmess
307 - newman docs/man/mess.6 sdlmess.6
308 - doman docs/man/mess.6
309 - }
310 - if use arcade ; then
311 - if use mess ; then
312 - MAMEBIN="mame${suffix}"
313 - mess_install
314 - else
315 - MAMEBIN="mamearcade${suffix}"
316 - fi
317 - doman docs/man/mame.6
318 - newman docs/man/mame.6 ${PN}.6
319 - elif use mess ; then
320 - MAMEBIN="mess${suffix}"
321 - mess_install
322 - fi
323 - dogamesbin ${MAMEBIN}
324 - dosym ${MAMEBIN} "${GAMES_BINDIR}/${PN}"
325 -
326 - insinto "${GAMES_DATADIR}/${PN}"
327 - doins -r keymaps $(use mess && echo hash)
328 -
329 - # Create default mame.ini and inject Gentoo settings into it
330 - # Note that '~' does not work and '$HOME' must be used
331 - ./${MAMEBIN} -noreadconfig -showconfig > "${T}/mame.ini" || die
332 - # -- Paths --
333 - for f in {rom,hash,sample,art,font,crosshair} ; do
334 - sed -i \
335 - -e "s:\(${f}path\)[ \t]*\(.*\):\1 \t\t\$HOME/.${PN}/\2;${GAMES_DATADIR}/${PN}/\2:" \
336 - "${T}/mame.ini" || die
337 - done
338 - for f in {ctrlr,cheat} ; do
339 - sed -i \
340 - -e "s:\(${f}path\)[ \t]*\(.*\):\1 \t\t\$HOME/.${PN}/\2;${GAMES_SYSCONFDIR}/${PN}/\2;${GAMES_DATADIR}/${PN}/\2:" \
341 - "${T}/mame.ini" || die
342 - done
343 - # -- Directories
344 - for f in {cfg,nvram,memcard,input,state,snapshot,diff,comment} ; do
345 - sed -i \
346 - -e "s:\(${f}_directory\)[ \t]*\(.*\):\1 \t\t\$HOME/.${PN}/\2:" \
347 - "${T}/mame.ini" || die
348 - done
349 - # -- Keymaps --
350 - sed -i \
351 - -e "s:\(keymap_file\)[ \t]*\(.*\):\1 \t\t\$HOME/.${PN}/\2:" \
352 - "${T}/mame.ini" || die
353 - for f in keymaps/km*.map ; do
354 - sed -i \
355 - -e "/^keymap_file/a \#keymap_file \t\t${GAMES_DATADIR}/${PN}/keymaps/${f##*/}" \
356 - "${T}/mame.ini" || die
357 - done
358 - insinto "${GAMES_SYSCONFDIR}/${PN}"
359 - doins "${T}/mame.ini"
360 -
361 - insinto "${GAMES_SYSCONFDIR}/${PN}"
362 - doins "${FILESDIR}/vector.ini"
363 -
364 - dodoc docs/{config,mame,newvideo}.txt
365 - keepdir \
366 - "${GAMES_DATADIR}/${PN}"/{ctrlr,cheat,roms,samples,artwork,crosshair} \
367 - "${GAMES_SYSCONFDIR}/${PN}"/{ctrlr,cheat}
368 -
369 - if use tools ; then
370 - for f in castool chdman floptool imgtool jedutil ldresample ldverify romcmp ; do
371 - newgamesbin ${f} ${PN}-${f}
372 - newman docs/man/${f}.1 ${PN}-${f}.1
373 - done
374 - newgamesbin ldplayer${suffix} ${PN}-ldplayer
375 - newman docs/man/ldplayer.1 ${PN}-ldplayer.1
376 - fi
377 -
378 - prepgamesdirs
379 -}
380 -
381 -pkg_postinst() {
382 - games_pkg_postinst
383 -
384 - elog "It is strongly recommended to change either the system-wide"
385 - elog " ${GAMES_SYSCONFDIR}/${PN}/mame.ini or use a per-user setup at ~/.${PN}/mame.ini"
386 - elog
387 - if use opengl ; then
388 - elog "You built ${PN} with opengl support and should set"
389 - elog "\"video\" to \"opengl\" in mame.ini to take advantage of that"
390 - elog
391 - elog "For more info see http://wiki.mamedev.org"
392 - fi
393 -}