gentoo auto-resync : 21:01:2023 - 18:24:18

3 files changed, 131 insertions, 0 deletions

diff --git a/games-arcade/performous/Manifest b/games-arcade/performous/Manifest
index cda2607bc52f..d2613d06c078 100644
--- a/games-arcade/performous/Manifest
+++ b/games-arcade/performous/Manifest
@@ -5,10 +5,14 @@ AUX performous-1.1-jpeg-9c.patch 591 BLAKE2B 72aac804251366cbaa97c34cdcf9c87d553
 AUX performous-1.1-linguas.patch 1033 BLAKE2B b7fd8f8560d9e9dd1fb6120f8d0e72c11529f226fecaf482dc3ae351d28977b196816e8c84db0c9ab1c724b78bc4a757d6b1f854dffbc9ebb3aaea1a05eaaf80 SHA512 d3ca1b7fb271618ea1866328aedb7a49a92ea08b4e3d1d4f3755e0868dc380b97462158cda19c8d1e2e2dd4afb59a6db533a12510699c2082f4e4ff31b069597
 AUX performous-1.1-nomancompress.patch 2368 BLAKE2B e75377ade59604f8dbf2bbe38493d511db8c3b2cae870883881c3108538accc42d42a91334a668b8ab0dd4aa21bf85b024799d4e2edb849cd13f3e21dc4cb460 SHA512 a116b25974426931b3099b502fc8713acac0a5a39f3c0ad12ce76e71d95062970bb05dbd1b01611cb16c3a912e857d668e96b709b4d61f95f38d364fc30d1ad9
 AUX performous-1.1-pango-use-pkgconfig.patch 3594 BLAKE2B 7944704c25c03ecc94c699dd37f202c5d015d80726fe8ac964bf35f7cee2d1c410d8ccbdcb83f3fba659ff4d742647d0c6cebafe466551d4fb00d5ed2a1455c7 SHA512 afe353247fbd8c58b7aa9b7a7bf24477c90470dd47db3c019421b91c1e3ba29c0620eb3bd4dc38206a6dd6067033109a42e1131eb50c7b55294e8ad4680b2771
+AUX performous-1.2.0-ffmpeg5.patch 1000 BLAKE2B 50eefb89771457ef5e8ec67487d179c6114ddcfdf2d33dd60c6577ccefb832222539e7e8eb733285aed3ac9071025cd72aab885252d02e96a40fadde9f434d81 SHA512 044202b1ae8461da1bc999449890aa81ea5235b5c6aa89dd902b9d5a44fc822deb083903239dbf874fe83d7ff0f74dd8f8dca74051e2e041135de7a1ec5fe662
 DIST performous-1.1.tar.gz 3965473 BLAKE2B 021660aa785d0535396a75e8c4cc5cc368ba5745b67fae527e7901ef6601d95887206aae7f74b52bf6b3da3e827bfbd3094e8a393917b9936af266b54766b0b2 SHA512 6659aa03960e68d7af65b072e179e42b122d2a39d25229c6daf765146379a115a52e51c1dc2bc69081ea17fe7a22f1d7007b7cf9e09bc32d134c3ad8e3444dd1
+DIST performous-1.2.0.tar.gz 7240476 BLAKE2B c5c27fc02fe0a17261ad6549492ccc88c7ad213df08f6ec68d86bad9116a2f83eae8ab4b85fc19f63d260b28864fad84c19d55befa81dde7aabedb1c50fef89f SHA512 a8fbbe3768f46915eacb65adcc1592295e4c6a84775ca55def01ebcff2218b1860daee0d4d5fcccc407d8df71da1ac25da667b47dd4a17239041a3d5fbfa1c56
+DIST performous-ced-9ca1351fe0b1e85992a407b0fc54a63e9b3adc6e.tar.gz 221300 BLAKE2B 1aa7027c8543725c812e6a066a2a707fa19a79ae2f36c49bc8eaf0d3d6549ae11b365a76b47c1fc851a3c0d1bbafc3ff739fa32c1599a1f1853033de78b27d0c SHA512 6721ae5936a58b8298d175f3875675bfb8249208642eaf2766dc6a62c7db96454d4f95d8c39de0ca862aa3edc741de535af69242f0d2d0b8f7527408ab673089
 DIST ultrastar-songs-jc-1.zip 242698201 BLAKE2B 39c37160c1ce305252c7b94910aae4ed930d6762716b985f35d64b502bcb8c0310ff830384a652bb1b8a72dea5dd08eebbfd89ae047861bd88e2fc983a863d84 SHA512 2f1b8416990c39617269cd6bb7271abdd4ebae65a9bac3dbb3f37cca26876bb7c79460a37597943a10a2d8bfcb5d2d9e2bf24084fe517a418e69f5c6111f6aea
 DIST ultrastar-songs-libre-3.zip 5289866 BLAKE2B 2c3fc640ad808b12987e9b50510df644ab8dd1ae41a4b9e5056950c7aa1823678a4b568a60a260b93a4bdf06f199fac1b99bd22e4e39301bf34f337c08d68b69 SHA512 820e3637a7b778c92ed1a8b925802134fa2146879b3e03e88cd412de5414635c90fe256dfaf984cfa3e8b07b7da8531dc3061b7c4e1bb4422127b469b2345e66
 DIST ultrastar-songs-restricted-3.zip 10242651 BLAKE2B de923f72bdd3081f2870457fd734ae2f8c11a84a74344af165aa5c6cf7b812c98fd53b3ab18ac9ac51f488fbf3fe274289205724c9f8547a31245536bea3c6b1 SHA512 70b987fec3705d6610625c1f30a7ff683a51bb6b7ee3174609c80dc31c1bccdb23dcb2c6ae8154e1b1d9ef115b914e27e73925878a3c5460b997fdde813456b8
 DIST ultrastar-songs-shearer-1.zip 50411551 BLAKE2B b91896197b6750dce6998ad309a9aca42aaf11b48c92bd1c30a67befcaf4ac64b6c5207f492e0f8588b986033d297a37bc8c9e505baea809591aa3255034fed4 SHA512 add9df22b78967fd6f19699e8569f976423e931a32ea7a62cfec2f94470b9120f05832560215a000ecec8dd65508b057fac8ac90efd3a768ed74ddced186a73b
 EBUILD performous-1.1-r3.ebuild 2448 BLAKE2B 26e121e367340e5ab21705128a474a3e26eece244dbb2ca13a9ffbb43833418f5da00f1ede30bbfe658c7cbe76842668bc0dcdb6ebca0ea7bfe552cb423da372 SHA512 ad13a021eaba62d5f5e5425401d0548e7ea7490e75ef47ec06d2ab91fc781a0f0eeeb8c22b3b359dac9586c6f4926c0d690df424a6d11943df8060f2b365f852
+EBUILD performous-1.2.0.ebuild 2542 BLAKE2B de6478d3a078906e258dfdc34bc6bf95da197f58b263f00e8d1db54817aefaff669bf8d1c65262098273d26a25a8bb04cc68ee6612c83e575c3413f80ffb2398 SHA512 00233aa5b60869dca91ff5c3b20ec96cefde47c165424c9023e39cd38fcb8626cef30579267191c91e70d4e00b5a1b7159ae19248196cb287b2537d211923480
 MISC metadata.xml 857 BLAKE2B e7316ca1dcec3ae5e0bcc55434ea9a004dbdda2c9595cfa0645bbd505824155ee2383d1d3d53d72eb0facc90573330cc27a381e65eed56557076db6b647cca32 SHA512 aa2e6a0da467eeb23563983e177427a19fed5da772d637ec6882201d3a848517a8453fefd8eddadaf205dabe1fb44284ab3c0d229fb14eb1ae678cbb23236ca1
diff --git a/games-arcade/performous/files/performous-1.2.0-ffmpeg5.patch b/games-arcade/performous/files/performous-1.2.0-ffmpeg5.patch
new file mode 100644
index 000000000000..63f573d53ffe
--- /dev/null
+++ b/games-arcade/performous/files/performous-1.2.0-ffmpeg5.patch
@@ -0,0 +1,25 @@
+https://bugs.gentoo.org/834371
+https://github.com/performous/performous/commit/c3c0d2b7172
+From: Sébastien Gonzalve <sebastien.gonzalve@aliceadsl.fr>
+Date: Tue, 3 May 2022 20:26:25 +0200
+Subject: [PATCH] Fix ffmpeg compilation on FC36
+
+The new version stats:
+
+2021-04-27 - 46dac8cf3d - lavf 59.0.100 - avformat.h
+  av_find_best_stream now uses a const AVCodec ** parameter
+  for the returned decoder.
+
+So performous needs a patch to add const when needed.
+--- a/game/ffmpeg.cc
++++ b/game/ffmpeg.cc
+@@ -251,6 +251,9 @@ FFmpeg::FFmpeg(fs::path const& _filename, int mediaType) : m_filename(_filename)
+ 	if (err < 0) throw Error(*this, err);
+ 	m_formatContext->flags |= AVFMT_FLAG_GENPTS;
+ 	// Find a track and open the codec
++#if (LIBAVFORMAT_VERSION_INT) >= (AV_VERSION_INT(59, 0, 100))
++	const
++#endif
+ 	AVCodec* codec = nullptr;
+ 	m_streamId = av_find_best_stream(m_formatContext.get(), static_cast<AVMediaType>(mediaType), -1, -1, &codec, 0);
+ 	if (m_streamId < 0) throw Error(*this, m_streamId);
diff --git a/games-arcade/performous/performous-1.2.0.ebuild b/games-arcade/performous/performous-1.2.0.ebuild
new file mode 100644
index 000000000000..67c54ea34069
--- /dev/null
+++ b/games-arcade/performous/performous-1.2.0.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+# CED is only used in 1.2.0 and can be dropped on bump, no LICENSE
+# changes needed given Apache-2.0 is also used by installed fonts
+HASH_CED=9ca1351fe0b1e85992a407b0fc54a63e9b3adc6e
+
+DESCRIPTION="SingStar GPL clone"
+HOMEPAGE="https://performous.org/"
+SRC_URI="
+	https://github.com/performous/performous/archive/refs/tags/${PV}.tar.gz
+		-> ${P}.tar.gz
+	https://github.com/performous/compact_enc_det/archive/${HASH_CED}.tar.gz
+		-> ${PN}-ced-${HASH_CED}.tar.gz
+	songs? (
+		mirror://sourceforge/performous/ultrastar-songs-jc-1.zip
+		mirror://sourceforge/performous/ultrastar-songs-libre-3.zip
+		mirror://sourceforge/performous/ultrastar-songs-restricted-3.zip
+		mirror://sourceforge/performous/ultrastar-songs-shearer-1.zip
+	)"
+
+LICENSE="
+	GPL-2
+	Apache-2.0 OFL-1.1
+	songs? ( CC-BY-NC-SA-2.5 CC-BY-NC-ND-2.5 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="midi songs webcam"
+
+RDEPEND="
+	dev-cpp/libxmlpp:5.0
+	dev-libs/boost:=[nls]
+	dev-libs/glib:2
+	dev-libs/icu:=
+	gnome-base/librsvg:2
+	media-libs/aubio:=[fftw]
+	media-libs/fontconfig:1.0
+	media-libs/glm
+	media-libs/libepoxy
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
+	media-libs/libsdl2[joystick,opengl,video]
+	media-libs/portaudio
+	media-video/ffmpeg:=
+	virtual/libintl
+	x11-libs/cairo
+	x11-libs/pango
+	midi? ( media-libs/portmidi )
+	webcam? ( media-libs/opencv:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-apps/help2man
+	sys-devel/gettext
+	songs? ( app-arch/unzip )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-ffmpeg5.patch
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	if [[ -v LINGUAS ]]; then
+		local po
+		for po in lang/*.po; do
+			: "${po#*/}"
+			has "${_%.*}" ${LINGUAS} || rm "${po}" || die
+		done
+	fi
+
+	# glibmm is only needed if libxmlpp:2.6, but :5.0 is used if available
+	sed -i '/Glibmm/d' cmake/Modules/FindLibXML++.cmake || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_MIDI=$(usex midi)
+		-DENABLE_WEBCAM=$(usex webcam)
+		-DFETCHCONTENT_SOURCE_DIR_CED-SOURCES="${WORKDIR}"/compact_enc_det-${HASH_CED}
+		-DSHARE_INSTALL="${EPREFIX}"/usr/share/${PN}
+
+		# webserver needs unpackaged cpprestsdk which is not recommended for
+		# use by its upstream (dead), may consider adding only if requested
+		-DENABLE_WEBSERVER=no
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	local DOCS=( README.md docs/{Authors,instruments}.txt )
+	cmake_src_install
+
+	insinto /usr/share/${PN}
+	use songs && doins -r "${WORKDIR}"/songs
+
+	gzip -d "${ED}"/usr/share/man/man6/${PN}.6.gz || die
+}