gentoo resync : 29.12.2022

4 files changed, 98 insertions, 6 deletions

diff --git a/games-arcade/oshu/Manifest b/games-arcade/oshu/Manifest
index eddc88b8ceb5..419273ab11b9 100644
--- a/games-arcade/oshu/Manifest
+++ b/games-arcade/oshu/Manifest
@@ -1,6 +1,9 @@
 AUX oshu-2.0.0-use_unpacked_osu-skin.patch 1233 BLAKE2B fb8a41b0fc8c8891e3d1dbe1cca6da320049c30a24b146612e2dcbf5490458b8c5db1ed410e9378552f4f048148b2770caf1f87ca60431b92f5d9f9b12885761 SHA512 4e5a0cfb995710c16f6acba7a02e4f0c25de9fc83b28de8c42279fe8e3dea01c33a2e22e9b43e05ab9996534710199315f36e836e24a41ea212e17b08c30e461
+AUX oshu-2.0.2-ffmpeg4-compat.patch 447 BLAKE2B 6c48bb4a0abd443db907ecc869ac51f27ae90cb536f78e5e7c7af3e39355686dd7b0d68a405c3c6f6ee79d965d9c8041913a23df2cf5cc4e6d64ae5203520c4f SHA512 d166690da71bbed8f48989fe3f7ce5d8dcb3bafb7677d79ff0ecd837ad40b41692937cfb492f0ebd1367c3a5de8bfb9e6a6b2bdde49fab975ed13f8d962d10a9
 DIST oshu-2.0.1.tar.gz 144900 BLAKE2B 47f1d0a11255459ae357142499aeffcf07fbcad961cb34ba98e9efa7cb4229cf8d61ec836a4c899f2ea0883f1252395bc0c6ff34c5d670d67091cf6483d135ff SHA512 65768b3d8e7733464f05a19bbee594c0be728267bbd0667bc0f34e0d01a39e52d4ecce89a9223f7c454d73b21bc735401e9d83eea8b0a2eaf1c7825a3bd6b1cf
+DIST oshu-2.0.2.tar.gz 146109 BLAKE2B 98dd49f972f1f1f820f654a2d358ceffdd2c54cd2daa0594914e6a1e29f1d1e757fe46d021afc75a33f4ef94bbb370213f20229843c173d7c55d876fe3db7e12 SHA512 e881e9429cebaf74337e55e7fa5445d992627d7616088f15abfafa2c125e1ff057a5b0f39ee4a1d1728c310728a8590e65286b9a0f81dca1f8963b2943fba596
 DIST oshu-skin-v1.tar.gz 2224947 BLAKE2B 0b463133dd7ab54421551627d12932f5257848b1130d57af8c2ff6b6836a49c9322b8f2f7e95de540909390d0139e547650a6bb321614cf92fac464b09075674 SHA512 d562294ac5e122a9d9971e3ab92f6168d848177cc5e22a94bbc450fde2b3b14007796a24d33722da9b6675467b109ce128ba94dca5dcc7c61c91c1e373032618
 EBUILD oshu-2.0.1.ebuild 1190 BLAKE2B ec734d13c35b0016b091910d722f7e08bce57700ed160eec78e4854553422995e2c1b4aba8cb202ae9a5d6e06df428dcc8e6b5064b76faaf82877baade5b730c SHA512 6028ae2e6463f87f9b5a7eae829e958cf6c1f9052d773b2714865dbc8bfde4fa17f783f2052bb66fccf80d5b9722e9352d523ff1245217f2ebca24c14345afbd
-EBUILD oshu-9999.ebuild 1190 BLAKE2B ec734d13c35b0016b091910d722f7e08bce57700ed160eec78e4854553422995e2c1b4aba8cb202ae9a5d6e06df428dcc8e6b5064b76faaf82877baade5b730c SHA512 6028ae2e6463f87f9b5a7eae829e958cf6c1f9052d773b2714865dbc8bfde4fa17f783f2052bb66fccf80d5b9722e9352d523ff1245217f2ebca24c14345afbd
+EBUILD oshu-2.0.2.ebuild 1320 BLAKE2B dc2031317c9191ca7f062fffb87eb37dceb85c79c2792727a8a62a240cb7004239ccfbfe747d3a1f00beee50557052d69d51bbc7cd190d04ed97d1359072c12b SHA512 bf52ed5ae27aeaa1bd976aaef7740b92c3a2663e5c53bc3af25c0c4ebd8457270c79f3d33d620f36f08802da9dcbf9b6c620862cb4993718ccf981fbfe9daafd
+EBUILD oshu-9999.ebuild 1264 BLAKE2B 60501c1543ef68331c5adbd31decec2c658026b5c9c62fbf688b0eff3c1dbe06e7d66976a25acc5239efdd3fd111eb15f914f4134b6f03b1c35188bd103da883 SHA512 158bae63f670a5cb2c93ef5ba93f4f150e8190b710cf3957c3119a5bf00c0f4461118d94702f0e44aa49a42916eb88893328347ec6f4a64c3f11ee2c745ae3d1
 MISC metadata.xml 454 BLAKE2B 0111215168ba84d5af192487499db1f201c103db7ae7d60f49af27b695701074324c367ba82bcdd5a8d3749f54a93712eb519ba7ee8af2d1b9e487d9742065dd SHA512 01e8aea4d15317ae5edc3cd1c658cc9bc26727c7cfaaa737b8d54286745b8edd0813c746e9c936282b17afab67582cbf7a5d5c72a0eed6d78dde5f9d761680dc
diff --git a/games-arcade/oshu/files/oshu-2.0.2-ffmpeg4-compat.patch b/games-arcade/oshu/files/oshu-2.0.2-ffmpeg4-compat.patch
new file mode 100644
index 000000000000..c16e61ce1288
--- /dev/null
+++ b/games-arcade/oshu/files/oshu-2.0.2-ffmpeg4-compat.patch
@@ -0,0 +1,16 @@
+diff --git a/./lib/audio/stream.cc.old b/./lib/audio/stream.cc
+index 808851f..09eb4fb 100644
+--- a/./lib/audio/stream.cc.old
++++ b/./lib/audio/stream.cc
+@@ -193,7 +193,11 @@ static int open_demuxer(const char *url, oshu::stream *stream)
+ 		stream->demuxer,
+ 		AVMEDIA_TYPE_AUDIO,
+ 		-1, -1,
++#if LIBAVCODEC_VERSION_MAJOR < 59
++		&stream->codec,
++#else
+ 		(const AVCodec**)&stream->codec,
++#endif
+ 		0
+ 	);
+ 	if (rc < 0 || stream->codec == NULL) {
diff --git a/games-arcade/oshu/oshu-2.0.2.ebuild b/games-arcade/oshu/oshu-2.0.2.ebuild
new file mode 100644
index 000000000000..c1d02ab63c76
--- /dev/null
+++ b/games-arcade/oshu/oshu-2.0.2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg
+
+DESCRIPTION="Lightweight osu! port"
+HOMEPAGE="https://github.com/fmang/oshu"
+
+if [[ ${PV} = *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/fmang/oshu.git"
+	SRC_URI="osu-skin? ( https://www.mg0.fr/oshu/skins/osu-v1.tar.gz -> ${PN}-skin-v1.tar.gz )"
+else
+	SRC_URI="https://github.com/fmang/oshu/archive/${PV}.tar.gz -> oshu-${PV}.tar.gz
+		osu-skin? ( https://www.mg0.fr/oshu/skins/osu-v1.tar.gz -> ${PN}-skin-v1.tar.gz )"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3 CC-BY-NC-4.0"
+SLOT="0"
+IUSE="osu-skin"
+
+RDEPEND="
+	media-libs/libsdl2
+	media-libs/sdl2-image
+	x11-libs/cairo
+	x11-libs/pango
+	media-video/ffmpeg:=
+"
+
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/oshu-2.0.2-ffmpeg4-compat.patch" )
+
+src_unpack() {
+	default
+
+	if [[ ${PV} = *9999 ]]; then
+		git-r3_src_unpack
+	fi
+}
+
+src_prepare() {
+	if use osu-skin; then
+		eapply "${FILESDIR}/oshu-2.0.0-use_unpacked_osu-skin.patch"
+		mv "${WORKDIR}/osu" share/skins/ || die "Failed to move osu-skin"
+	fi
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DOSHU_DEFAULT_SKIN=$(usex osu-skin osu minimal)
+		-DOSHU_SKINS=minimal$(usev osu-skin ';osu')
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	cmake_build check
+}
diff --git a/games-arcade/oshu/oshu-9999.ebuild b/games-arcade/oshu/oshu-9999.ebuild
index 5ebae7bfdcd6..cf543ede25bd 100644
--- a/games-arcade/oshu/oshu-9999.ebuild
+++ b/games-arcade/oshu/oshu-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake xdg
 
@@ -27,11 +27,19 @@ RDEPEND="
 	media-libs/sdl2-image
 	x11-libs/cairo
 	x11-libs/pango
-	media-video/ffmpeg:=
+	>media-video/ffmpeg-5:=
 "
 
 DEPEND="${RDEPEND}"
 
+src_unpack() {
+	default
+
+	if [[ ${PV} = *9999 ]]; then
+		git-r3_src_unpack
+	fi
+}
+
 src_prepare() {
 	if use osu-skin; then
 		eapply "${FILESDIR}/oshu-2.0.0-use_unpacked_osu-skin.patch"
@@ -43,8 +51,8 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		'-DOSHU_DEFAULT_SKIN='$(usex osu-skin 'osu' 'minimal')
-		'-DOSHU_SKINS=minimal'$(usex osu-skin ';osu' '')
+		-DOSHU_DEFAULT_SKIN=$(usex osu-skin osu minimal)
+		-DOSHU_SKINS=minimal$(usev osu-skin ';osu')
 	)
 
 	cmake_src_configure