gentoo resync : 25.10.2021

6 files changed, 73 insertions, 4 deletions

diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index 21c0276667c4..20186b5e2734 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/dosbox-staging/Manifest b/games-emulation/dosbox-staging/Manifest
index 0666749d9ddd..1e85e3621833 100644
--- a/games-emulation/dosbox-staging/Manifest
+++ b/games-emulation/dosbox-staging/Manifest
@@ -3,5 +3,5 @@ DIST dosbox-staging-0.77.0.tar.gz 2579927 BLAKE2B 2a8381451ec110ca5350afc70c45f1
 DIST dosbox-staging-0.77.1.tar.gz 2622418 BLAKE2B c56020d263ceac199266a5c458c192441f836ea2e71e1564da175b7ae522286ca1b6a07062498ccea795bbf330beecb5ef99a0130637b1df26603315d48ea6ff SHA512 fe5d6150a88f5c276aee5672f98c15b5ffee702fe9934919d3e78068efd1a85f08a8f04352bc6a8fe850324e33f3227340c59242db6cbae0475b12a58b749cac
 EBUILD dosbox-staging-0.76.0.ebuild 1431 BLAKE2B d6fefe9c171bd48de4246e239d95ebc78bbc02cf1aa138712cc3a2ed76fa9a5a5a181770e8d3f2173079770ef56b4adb83f8843d2fbfcfa6996c8806936912c6 SHA512 3fa322c2f91c97d0f86befc97c93d0e4dd4dcdba56055a97a8dd0fe85907e7319353cf85790dfc790fe811a9ba8990eaece8d86040255cf55f99ea8b502b5ea5
 EBUILD dosbox-staging-0.77.0-r1.ebuild 1458 BLAKE2B 0e0f6a28fe7851bded45749a2322b9b9225335c14923ed4ce1aeeb915f0a5a2eb21daba8b7862d8fdffc267210354053c10b0e038a7c5e41beb0020490c05c7b SHA512 88e4b4aa99fd3c25475aca2e522a23300b9af2628c7f64b9a8832105a350d99f451d6634b5336b11fdee173374d34975f41f46df25840c09178fb3286bf1f4a5
-EBUILD dosbox-staging-0.77.1.ebuild 1465 BLAKE2B e554e0c27ed574b521cb610cfa8767af31bd9e3a1d1932c16116d72c6a96113a7745adc24b946d367a7e46578083ee37ee80d93d56ad24e97816460b615660a7 SHA512 79a9e5b949ce5ef28b15bfa0867711673a09cd6b5ffda4f477c457205e3ab120f6e7ca7306dbeb8405b2690be48bce0c72d1e3f4d0829b76e3c1f19d3a1c3810
+EBUILD dosbox-staging-0.77.1.ebuild 1722 BLAKE2B 63c27133262364cb9426b73da0773cfb58b63ccb5d4880539b3cc0e26571e103d66bdbd01a9c86ab34a414024cf3df6ba1f3a1622cce58dc9564896a24be6690 SHA512 abb8a53167211cebe2fdc60e38bfe7d528e0ad5af41db8a2c7a98c79bd90db1b7801fe468b1172a4d8d90143435c5224b588c847296d5d3e016373fd697ea494
 MISC metadata.xml 798 BLAKE2B e8e6368cfb116669c3359a665d5709c9bdc0eb778275599946e208a16909901ed23d852e7d45feaf6fd3897f786e1400d7eb46b19dcca45886df4872055b4577 SHA512 f513b215767cb39d8b92e8ece09110075d3c81ecb5d293b225e85d3e9368c2f10075435db6e31c758db89635ef9d99008d15430a0f7b891c0ae9278b7d97475e
diff --git a/games-emulation/dosbox-staging/dosbox-staging-0.77.1.ebuild b/games-emulation/dosbox-staging/dosbox-staging-0.77.1.ebuild
index 1cb6c2e10ce3..21a9a75fb1a9 100644
--- a/games-emulation/dosbox-staging/dosbox-staging-0.77.1.ebuild
+++ b/games-emulation/dosbox-staging/dosbox-staging-0.77.1.ebuild
@@ -11,7 +11,9 @@ SRC_URI="https://github.com/dosbox-staging/dosbox-staging/archive/v${PV}.tar.gz
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="+alsa debug dynrec +fluidsynth mt-32 network opengl"
+IUSE="+alsa debug dynrec +fluidsynth mt-32 network opengl test"
+
+RESTRICT="!test? ( test )"
 
 RDEPEND="alsa? ( media-libs/alsa-lib )
 	debug? ( sys-libs/ncurses:0= )
@@ -28,7 +30,7 @@ RDEPEND="alsa? ( media-libs/alsa-lib )
 	sys-libs/zlib
 	!games-emulation/dosbox"
 DEPEND="${RDEPEND}"
-BDEPEND=""
+BDEPEND="test? ( dev-cpp/gtest )"
 
 DOCS=( AUTHORS README THANKS )
 
@@ -41,6 +43,10 @@ src_prepare() {
 
 	# Disable license and docs install (handled by ebuild)
 	sed -e "/licenses_dir\|doc_dir/d" -i meson.build || die
+
+	# Test failing on some platforms, bug #817908
+	# https://github.com/dosbox-staging/dosbox-staging/issues/1230
+	sed -i 's/.*soft_limit.*//' tests/meson.build || die
 }
 
 src_configure() {
@@ -52,6 +58,7 @@ src_configure() {
 		$(meson_use mt-32 use_mt32emu)
 		$(meson_use network use_sdl2_net)
 		$(meson_use opengl use_opengl)
+		$(meson_feature test unit_tests)
 	)
 	meson_src_configure
 }
diff --git a/games-emulation/fceux/Manifest b/games-emulation/fceux/Manifest
index 8620b8e50e37..d30ce6a5a355 100644
--- a/games-emulation/fceux/Manifest
+++ b/games-emulation/fceux/Manifest
@@ -2,5 +2,7 @@ AUX fceux-2.2.2-warnings.patch 1174 BLAKE2B 5b2076015d005a75ab97b586bb2af022b53a
 AUX fceux-2.4.0-desktop.patch 447 BLAKE2B c9dc55fc34d990de50a1897cc9d1fe8abb5060336ae7b227ac1b07e28ef89d15e202be790ec3f8ff0f8280a64b81ae28c98ce1a22e54f57d93b2e3bb04a24b59 SHA512 00a2af80e5dc6f5ddff8e5fc28b94bc2e249798ec44f5f0b9ed414dc8438e1937058f9bab65cbb5b2c9c6dec85af1a51e58f68405dd758db4ec293efbdaf5398
 AUX fceux-2.4.0-no-git.patch 377 BLAKE2B 8b0be40a0eba5249f73942ea774dc0a37e73ac71fe1684d01551cd96876878d53219c0744ba0e6789c3663c56e58fccc2a2a450b03207219c76e2c10b04ea679 SHA512 6c67d5b823a2b70d6982d9f911edab65c0bcf2cf5faf1ae00004201aefe99d5feae4592204c2586eaa43affff6d05f2e6e3b9274add4713073c0e1cfb519465d
 DIST fceux-2.4.0.tar.gz 21807471 BLAKE2B 5b4d5e9438cfc974cb5ed1838b0845a1d125366fcfbe4ad72c1a5da7caed7bb763a7c66933933f61223abb9dc4c25f0ac7875a0751d122bf75e8567ca5de6cc4 SHA512 3f53db1091e28c91bff90a2d6c77bd3c022a7c20a29b07e6cb88e9ae4795ce7f9e68d15ac0f90721472f8c262907a2564e0be7adc8df2eb3ef252215717f30a0
+DIST fceux-2.5.0.tar.gz 21992303 BLAKE2B 2c467a92eaa53c846fdfc7c32c68bec75fdf45d5166f5fa7f1141c48f159c8dc6619f40861373ccb83718dd2d0b857c630f5101a1d29c2699adf128d4711a929 SHA512 bbff55b6f3efda8918b7dab21582d93f8c2a6396bf64a93e33f2f5f6cd345f95bcde7b958f0a663967e47e83110733c4a732dbf538afb7dbecb3147bc3090f01
 EBUILD fceux-2.4.0.ebuild 1195 BLAKE2B 21cebd383bfadd592292137a98cf8fe9f1c31365c8d6a4da8692210caae5f8e3866ec34e8644383ad8f5b4b55e6ec213a618069b9dc11d526111e3ce5213805a SHA512 012fc6975d98f402fbb109818caef9f655d56d993471c05f033c6edf41cc65a135cb5c5e09b1ffc9863354a4ae62bb3f8b8a7090b99ea90d7479dba32a56d7cf
-MISC metadata.xml 387 BLAKE2B f778cbd0ae8453864810985de9d403674e7367c7e8da78d7e78a4227b61a47098afbb3bb1585c629930997f74e1196c2bbc252a6ba2eb82cc0a77322aded7e34 SHA512 005561f59507213b9f364a74b61ceb060855648cf98e551a075533ee9989778cce5288937640249acdd4f40158b69aabb92cd79c46261d96ebcabffc1e63cd33
+EBUILD fceux-2.5.0.ebuild 1550 BLAKE2B 9fcb095e65c133f2738faca6d2bfa762cf44ab1c0c78612a7715b0af08b16bd403c8ae7472ccf1c70414d037c5f9af6b28f8cf7be8b53eaf4faa75aff31b88e2 SHA512 b0a1b333dcb88189d78841a96b8a8d91e7016f124cdda12468c16902280b9f962c04f2bb07a7ea473c974634cd39798cc777298340473dbaf8ddc05148744351
+MISC metadata.xml 570 BLAKE2B 2a0e6410b932f5445cfcbf2878212b022310e9e059c2a05da52ab55dc1c24f52fc31a51b70c63a2c8226989dad08afcbc0002255753c757d93cf0235c6f94ec0 SHA512 db6acd8c7c1beea1c86e56fd5e2caa7489848be6513c798e186739edf7fc47dd78a126037734dad255966e80e2d257f73915fdd7e7085472b775ad98a5b3e336
diff --git a/games-emulation/fceux/fceux-2.5.0.ebuild b/games-emulation/fceux/fceux-2.5.0.ebuild
new file mode 100644
index 000000000000..3b064ef44c9d
--- /dev/null
+++ b/games-emulation/fceux/fceux-2.5.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-1 )
+inherit cmake lua-single xdg
+
+DESCRIPTION="Portable Famicom/NES emulator, an evolution of the original FCE Ultra"
+HOMEPAGE="https://fceux.com/"
+SRC_URI="mirror://sourceforge/fceultra/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ffmpeg x264 x265"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+# TODO: QT6 support (disabled by default) when available in Gentoo
+RDEPEND="
+	${LUA_DEPS}
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtopengl:5[-gles2-only]
+	dev-qt/qtwidgets:5
+	media-libs/libglvnd
+	media-libs/libsdl2[joystick,sound,threads,video]
+	sys-libs/zlib:=[minizip]
+	ffmpeg? ( media-video/ffmpeg:= )
+	x264? ( media-libs/x264:= )
+	x265? ( media-libs/x265:= )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.2.2-warnings.patch
+	"${FILESDIR}"/${PN}-2.4.0-desktop.patch
+	"${FILESDIR}"/${PN}-2.4.0-no-git.patch
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	use x264 || sed -i '/pkg_check_modules.*X264/d' src/CMakeLists.txt || die
+	use x265 || sed -i '/pkg_check_modules.*X265/d' src/CMakeLists.txt || die
+	use ffmpeg || sed -i '/pkg_check_modules.*LIBAV/d' src/CMakeLists.txt || die
+}
+
+src_install() {
+	local DOCS=( README TODO-SDL changelog.txt documentation/. readme.md )
+	cmake_src_install
+
+	# remove unused/duplicate files
+	rm "${ED}"/usr/share/fceux/{lua5{1,.1}.dll,{fceux,taseditor}.chm} \
+		"${ED}"/usr/share/doc/${PF}/fceux{,-net-server}.6 \
+		"${ED}"/usr/share/man/man6/fceux-net-server.6 || die
+}
diff --git a/games-emulation/fceux/metadata.xml b/games-emulation/fceux/metadata.xml
index 07c7588b64d8..50bab0164131 100644
--- a/games-emulation/fceux/metadata.xml
+++ b/games-emulation/fceux/metadata.xml
@@ -5,6 +5,10 @@
 		<email>games@gentoo.org</email>
 		<name>Gentoo Games Project</name>
 	</maintainer>
+	<use>
+		<flag name="ffmpeg">Use <pkg>media-video/ffmpeg</pkg> for video recording</flag>
+		<flag name="x265">Use <pkg>media-libs/x265</pkg> for video recording (HEVC)</flag>
+	</use>
 	<upstream>
 		<remote-id type="github">TASVideos/fceux</remote-id>
 		<remote-id type="sourceforge">fceultra</remote-id>