gentoo auto-resync : 02:12:2022 - 08:55:37

3 files changed, 0 insertions, 204 deletions

diff --git a/games-emulation/mgba/Manifest b/games-emulation/mgba/Manifest
index 199b4b1c77a6..4b8db6d1956b 100644
--- a/games-emulation/mgba/Manifest
+++ b/games-emulation/mgba/Manifest
@@ -1,8 +1,5 @@
 AUX mgba-0.10.0-optional-updater.patch 206 BLAKE2B 199a4305212e1974aa79ee728ab7b685b4b52602fe6447dd1b29513b526e101a306558b9a912bbb3c1438ea6a70df1c9e6368e2ca2ba5b50e6a59200b2a11daf SHA512 3227908dca7a2973ae5c7ec311b683362adf16ae5d5c801943322962d181ad046f43383bdf86441d81284f4f567a8d8ae387f4c15bf25b3d4189882fecd79d6b
-AUX mgba-0.9.3-ffmpeg5.patch 4576 BLAKE2B ffce6592f2ff469a97831dd9ed8ede27bbe070ba0434545b4ff477f0f8652a15d320b205d227d3b21043127e60a4f7f326ea6c062d8bc04645b87d9af71cebdd SHA512 cce9ddd1d5bed70f1b996948afb31b5c827ccb0e2878fb032a65543551925e4a6d6a7f72a0380156b1f8a6e3720d3479d5e5e45026f7860c29fba022fd4df3d5
 DIST mgba-0.10.0.tar.gz 14302653 BLAKE2B 0ebfa8a3de5db61452f070116fcf2d6312ce96f5d08b1b1e70ba8f7e50235fecff2a0f6a5a32860b7e95e55a6ab5bbf2227d483bad7eb25d6c7e471424bcf0dd SHA512 05939f94bc00906d999b955091e8e8059cc13a5b822048f6e002062c2e74069337d947d2cde2f8c1be96e3353a361743d752811c214fa9da31ed6a4893b4d7e8
-DIST mgba-0.9.3.tar.gz 12763090 BLAKE2B 7d9ff6fc7bdff5d734540b74893a888d400b4bb6e1ce5b3b2a856239db8798ac76b8535dc770330d0451e2568a6d402558eeef27d643c0d5d3454441f45cf09b SHA512 da65b3c7ec32d732163f129c4fd38949ae2da2980beb3257bf6def5e35534a27b6d30309bb3c9a8d651642f99e1a45db7a8577c8dbf5472153d4551167471b3a
 EBUILD mgba-0.10.0.ebuild 2616 BLAKE2B 057e0e72f7bbacc6d9f4e37dbd5b60aef55527ab8bd0e44f1a16f117093f3657640be6139fa042a1f15cfbf9cfa991a6de02a4320d1cfb6d2ca409598a5c7e98 SHA512 514108085ecdf38a0ef5e9199d68a1db72b5e9f7137093249580b1e3cc492332271509d91150c6f855ccce1937120aa957ec6b452baecda7c49da8bf864394d8
-EBUILD mgba-0.9.3-r2.ebuild 2198 BLAKE2B 34575ef09aa8e06018aceb19670be2a18fe7a38ec64d52c86125e87ffc47473d47d21cc9fcf7e1cedc9fb7bdebb23a343096ffb13afb7c83be4d4930dfce57d0 SHA512 4988e0a060421a4f201a90ffc877c02252f45220ed9d8ba166bef8439cb6e10aa438ac1850bfe3927dc2b16ec9a5468e860206d7f6234dc4c08bc9518bb846c9
 EBUILD mgba-9999.ebuild 2618 BLAKE2B 2a3cd7d8f3627e9bbc55d2b9cbb2311ff1110a0ec65a56b1d205577cf17fae84d494a8e8670fc58a2f6a6ef1a9485338a027c3427d34b94c6416e0790929f4c9 SHA512 1ae1336a426f6a3158143a1e73d143320fb3ec7873e9874819da697b7594b3fc17b67c8c1d43bd6a25660ade451cebc8035342aefdfa5558fdabcef322af72fb
 MISC metadata.xml 686 BLAKE2B 14edb52fcb9e889ba151f05141d2f0b866a27ddb87943ee99a71223c747ae72423cbda0a8646b32ea175c13a67305bbba01c5062e3f73efba636f2d4a744de55 SHA512 3d671e43a9c0991131cce93bcc4b3c4da32fd67ebdbc57b404eafc4f235b3ad7af1417801bd84578d76553829b3ebfeb29d5a7f9871d11812e681759a2232698
diff --git a/games-emulation/mgba/files/mgba-0.9.3-ffmpeg5.patch b/games-emulation/mgba/files/mgba-0.9.3-ffmpeg5.patch
deleted file mode 100644
index 6b8d55c377ea..000000000000
--- a/games-emulation/mgba/files/mgba-0.9.3-ffmpeg5.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-https://bugs.gentoo.org/834374
-
-https://github.com/mgba-emu/mgba/commit/cdc753516798882a805db1d2042dbce8313382bf
-From: Ryan Tandy <ryan@nardis.ca>
-Date: Thu, 3 Feb 2022 19:02:52 -0800
-Subject: [PATCH] FFmpeg: Support FFmpeg 5.0
---- a/src/feature/ffmpeg/ffmpeg-decoder.c
-+++ b/src/feature/ffmpeg/ffmpeg-decoder.c
-@@ -5,6 +5,7 @@
-  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
- #include "ffmpeg-decoder.h"
- 
-+#include <libavcodec/avcodec.h>
- #include <libswscale/swscale.h>
- 
- void FFmpegDecoderInit(struct FFmpegDecoder* decoder) {
-@@ -38,7 +39,7 @@ bool FFmpegDecoderOpen(struct FFmpegDecoder* decoder, const char* infile) {
- #else
- 		enum AVMediaType type = decoder->context->streams[i]->codec->codec_type;
- #endif
--		struct AVCodec* codec;
-+		const struct AVCodec* codec;
- 		struct AVCodecContext* context = NULL;
- 		if (type == AVMEDIA_TYPE_VIDEO && decoder->videoStream < 0) {
- 			decoder->video = avcodec_alloc_context3(NULL);
---- a/src/feature/ffmpeg/ffmpeg-encoder.c
-+++ b/src/feature/ffmpeg/ffmpeg-encoder.c
-@@ -12,6 +12,9 @@
- 
- #include <libavcodec/version.h>
- #include <libavcodec/avcodec.h>
-+#if LIBAVCODEC_VERSION_MAJOR >= 58
-+#include <libavcodec/bsf.h>
-+#endif
- 
- #include <libavfilter/buffersink.h>
- #include <libavfilter/buffersrc.h>
-@@ -121,7 +124,7 @@ bool FFmpegEncoderSetAudio(struct FFmpegEncoder* encoder, const char* acodec, un
- 		return true;
- 	}
- 
--	AVCodec* codec = avcodec_find_encoder_by_name(acodec);
-+	const AVCodec* codec = avcodec_find_encoder_by_name(acodec);
- 	if (!codec) {
- 		return false;
- 	}
-@@ -193,7 +196,7 @@ bool FFmpegEncoderSetVideo(struct FFmpegEncoder* encoder, const char* vcodec, in
- 		return true;
- 	}
- 
--	AVCodec* codec = avcodec_find_encoder_by_name(vcodec);
-+	const AVCodec* codec = avcodec_find_encoder_by_name(vcodec);
- 	if (!codec) {
- 		return false;
- 	}
-@@ -213,7 +216,7 @@ bool FFmpegEncoderSetVideo(struct FFmpegEncoder* encoder, const char* vcodec, in
- 	if (encoder->pixFormat == AV_PIX_FMT_NONE) {
- 		return false;
- 	}
--	if (vbr < 0 && !av_opt_find(&codec->priv_class, "crf", NULL, 0, 0)) {
-+	if (vbr < 0 && !av_opt_find((void*) &codec->priv_class, "crf", NULL, 0, 0)) {
- 		return false;
- 	}
- 	encoder->videoCodec = vcodec;
-@@ -223,7 +226,7 @@ bool FFmpegEncoderSetVideo(struct FFmpegEncoder* encoder, const char* vcodec, in
- }
- 
- bool FFmpegEncoderSetContainer(struct FFmpegEncoder* encoder, const char* container) {
--	AVOutputFormat* oformat = av_guess_format(container, 0, 0);
-+	const AVOutputFormat* oformat = av_guess_format(container, 0, 0);
- 	if (!oformat) {
- 		return false;
- 	}
-@@ -241,9 +244,9 @@ void FFmpegEncoderSetLooping(struct FFmpegEncoder* encoder, bool loop) {
- }
- 
- bool FFmpegEncoderVerifyContainer(struct FFmpegEncoder* encoder) {
--	AVOutputFormat* oformat = av_guess_format(encoder->containerFormat, 0, 0);
--	AVCodec* acodec = avcodec_find_encoder_by_name(encoder->audioCodec);
--	AVCodec* vcodec = avcodec_find_encoder_by_name(encoder->videoCodec);
-+	const AVOutputFormat* oformat = av_guess_format(encoder->containerFormat, 0, 0);
-+	const AVCodec* acodec = avcodec_find_encoder_by_name(encoder->audioCodec);
-+	const AVCodec* vcodec = avcodec_find_encoder_by_name(encoder->videoCodec);
- 	if ((encoder->audioCodec && !acodec) || (encoder->videoCodec && !vcodec) || !oformat || (!acodec && !vcodec)) {
- 		return false;
- 	}
-@@ -257,8 +260,8 @@ bool FFmpegEncoderVerifyContainer(struct FFmpegEncoder* encoder) {
- }
- 
- bool FFmpegEncoderOpen(struct FFmpegEncoder* encoder, const char* outfile) {
--	AVCodec* acodec = avcodec_find_encoder_by_name(encoder->audioCodec);
--	AVCodec* vcodec = avcodec_find_encoder_by_name(encoder->videoCodec);
-+	const AVCodec* acodec = avcodec_find_encoder_by_name(encoder->audioCodec);
-+	const AVCodec* vcodec = avcodec_find_encoder_by_name(encoder->videoCodec);
- 	if ((encoder->audioCodec && !acodec) || (encoder->videoCodec && !vcodec) || !FFmpegEncoderVerifyContainer(encoder)) {
- 		return false;
- 	}
-@@ -272,9 +275,9 @@ bool FFmpegEncoderOpen(struct FFmpegEncoder* encoder, const char* outfile) {
- 	encoder->currentVideoFrame = 0;
- 	encoder->skipResidue = 0;
- 
--	AVOutputFormat* oformat = av_guess_format(encoder->containerFormat, 0, 0);
-+	const AVOutputFormat* oformat = av_guess_format(encoder->containerFormat, 0, 0);
- #ifndef USE_LIBAV
--	avformat_alloc_output_context2(&encoder->context, oformat, 0, outfile);
-+	avformat_alloc_output_context2(&encoder->context, (AVOutputFormat*) oformat, 0, outfile);
- #else
- 	encoder->context = avformat_alloc_context();
- 	strncpy(encoder->context->filename, outfile, sizeof(encoder->context->filename) - 1);
diff --git a/games-emulation/mgba/mgba-0.9.3-r2.ebuild b/games-emulation/mgba/mgba-0.9.3-r2.ebuild
deleted file mode 100644
index 82caf353a7fa..000000000000
--- a/games-emulation/mgba/mgba-0.9.3-r2.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake xdg
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/mgba-emu/mgba.git"
-else
-	SRC_URI="https://github.com/mgba-emu/mgba/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-fi
-
-DESCRIPTION="Game Boy Advance Emulator"
-HOMEPAGE="https://mgba.io/"
-
-LICENSE="MPL-2.0 BSD LGPL-2.1+ public-domain discord? ( MIT )"
-SLOT="0/9"
-IUSE="debug discord elf ffmpeg gles2 gles3 gui libretro opengl +sdl sqlite test"
-# gles2/gles3 opengl require can be lifted in next version (bug #835039)
-REQUIRED_USE="
-	|| ( gui sdl )
-	gles2? ( opengl )
-	gles3? ( opengl )
-	gui? ( || ( gles2 opengl ) )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	media-libs/libpng:=
-	sys-libs/zlib:=[minizip]
-	debug? ( dev-libs/libedit )
-	elf? ( dev-libs/elfutils )
-	ffmpeg? ( media-video/ffmpeg:= )
-	gles2? ( media-libs/libglvnd )
-	gles3? ( media-libs/libglvnd )
-	opengl? ( media-libs/libglvnd )
-	gui? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtmultimedia:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtwidgets:5
-	)
-	sdl? ( media-libs/libsdl2[sound,joystick,opengl?,video] )
-	sqlite? ( dev-db/sqlite:3 )"
-DEPEND="
-	${RDEPEND}
-	test? ( dev-util/cmocka )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-ffmpeg5.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_CINEMA=$(usex test)
-		-DBUILD_GL=$(usex opengl)
-		-DBUILD_GLES2=$(usex gles2)
-		-DBUILD_GLES3=$(usex gles3)
-		-DBUILD_LIBRETRO=$(usex libretro)
-		-DBUILD_QT=$(usex gui)
-		-DBUILD_SDL=$(usex sdl)
-		-DBUILD_SUITE=$(usex test)
-		-DMARKDOWN=OFF #752048
-		-DUSE_DEBUGGERS=$(usex debug)
-		-DUSE_DISCORD_RPC=$(usex discord)
-		-DUSE_EDITLINE=$(usex debug)
-		-DUSE_ELF=$(usex elf)
-		-DUSE_EPOXY=OFF
-		-DUSE_FFMPEG=$(usex ffmpeg)
-		-DUSE_GDB_STUB=$(usex debug)
-		-DUSE_LIBZIP=OFF
-		-DUSE_LZMA=ON
-		-DUSE_MINIZIP=ON
-		-DUSE_PNG=ON
-		-DUSE_SQLITE3=$(usex sqlite)
-		-DUSE_ZLIB=ON
-		$(usev libretro -DLIBRETRO_LIBDIR="${EPREFIX}"/usr/$(get_libdir)/libretro)
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	use !test || rm "${ED}"/usr/bin/mgba-cinema || die
-
-	rm -r "${ED}"/usr/share/doc/${PF}/{LICENSE,licenses} || die
-}