gentoo auto-resync : 26:09:2023 - 23:29:12

4 files changed, 4 insertions, 147 deletions

diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index fb4c030943fb..870279550189 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -1,8 +1,6 @@
-AUX makemkv-ffmpeg-6.patch 621 BLAKE2B 950465b9894a3d744ea56a81cb3dbdcb5763d7dc7d85343d6ed2ab1fd8a88b25381db76d7b7c52227841c7266d333b31dcbba686b4568624ec3007521eaf4606 SHA512 7adb18ec1e5a4707d81a14374c9b6be76cde4f0a0d2fc06c97b6ea5174b8ae8cce344717bcc941dab3533c06554cb52dcdad25130c70653f69c4ead3d09117a9
 AUX makemkv-path.patch 1579 BLAKE2B 6ca7ed6c854c0357fea864bedc3f65a1051a466a52db1380bf1904c97bfa2b455beeb7ff9852fe57f6d224ed659df63d02db96a281be7a14f0587bece9aff75b SHA512 9294d3645b953fdb7ca24e83066becfbf07e03cab01d0aaf4527cf2d54fb0990649da1f766836a0f3efea9c363c8f00116b4624c49fd7bcfa197cae2ef17e6ed
 AUX makemkvcon.1 6118 BLAKE2B bf8f7665d7b367e4dc5cfb12136cb91271087991d86bb0c2bfe6fe41def407539276114f95548cd867c49bc10bed25cec51ac00dbd6defe5df7fd82f2fe29b25 SHA512 a9334a96fcc90932a109c2d74b1769ab60e652a1e860399d8a486bd36ba02fbdabf55816059e0c51e3e4826824b7798f86b85cb5e22a4d13c2e18a2944522ac4
-DIST makemkv-bin-1.17.4.tar.gz 16402081 BLAKE2B 9be9fe1c2af35af7f5632857bccae45d9e6ba522fb8753eb40903a61ff73bc1ff40f2fade6d099059c5d7f716c0903ff16c3ff0849ff21728cc7eb8eafd19a95 SHA512 64251bfbbb3a5cad3a99e15a0a215ab8d3dd54fc267b1f22c9ab347fd744add78edd41d2cfd48086999f4e8912da4713974e36db96406fd18a7c930a61b2f6ec
-DIST makemkv-oss-1.17.4.tar.gz 6618658 BLAKE2B c64e209fc20e432c4befe794133fb06761f4fd2fb6eceb8ce4ce7292582768d10937850027aad0a02f31f920c647841427797b43ba6f1016ff0e5920ac466682 SHA512 6e69400ec3ce8df63e55d107a8f81ceab3f3182b5e02be2187eb2cac93c5002d3c614b96e1a3672562e32495c447fb1d7a018ac233d3a9e32f1d27957169283d
-EBUILD makemkv-1.17.4-r1.ebuild 3116 BLAKE2B ec65a9eb16dfe36af287b6406a73afa523f40614c557759daa6667de1ad8918941c52635de09bd7b1b400f349be10c7408fe1e76f647299698edc9cfc38211b8 SHA512 b19c4da3f0f55dd68ad247d39cf5119b822c147301aaae5dc79554010b63a69ae7d694c6f900ed09b63e5980fd190ed68603408c3dee9dd22a7f5ab004ff3c92
-EBUILD makemkv-1.17.4.ebuild 3080 BLAKE2B c76320a8eb959cb8c2e43256e0cd9bd07e74aa0f21d2d7bfe74e439a35f520116ebfa570d2b7db72b6254af83cb5f2ff4c12a1efa3fc398fa153a2a0dd13eacb SHA512 dad9e23112ecda6dcde6df5b9d6d3df3279e7a6ad82d9e97f04a4919e3df4c8fd6dc0967926ad4e43361a90339667aace6727069b7adb704ae9fd7e91ed0a4b3
+DIST makemkv-bin-1.17.5.tar.gz 16407150 BLAKE2B b224d82113ae03c3569933ac7838f5de2d6a9af9b720d2e11a508d141de8af7d50bb32bb5f65affa8dc8e0f8d6c6205352ad00cf30d8296b1c1413da519bd400 SHA512 fab00ede2c0133b750b03df0b0adf854de72734bc9f760aae1f1ba208e0da378e005000508edef209e6b9359a969e6c7df6ff21d32a17a55e3f42aa19815400b
+DIST makemkv-oss-1.17.5.tar.gz 6618061 BLAKE2B 128c8e093cb8b39c7bf98f6cf65ab841a9e36914a6ac746d46c2bf82f6f28b8a0a61f6f15206d76be4b0b4834fa3f500ca682b841cf7a6760b20c3e187fe4c40 SHA512 2bc49e079c06ddff3442c00766e3b5635c03ec928013a331bf5aa386efaf65b1c654db340716d9a31b805b5f96a61be8f96eab3949a1cd24cc3daa9fc90b5a28
+EBUILD makemkv-1.17.5.ebuild 3080 BLAKE2B 6e6b82f3bc73fcd388e440d72d90ed13ef9850e52ba4023c4cd98dc306aa94ea930d30722042110f1bb403eb9d46850369664eaf12979f341f392d4fe53f51ec SHA512 030e96af6d547fc761a17b7630100bf1a721207855ad329d948538db301537d4ae3120a8cad3ab36e513f1576e886f535438b13b973d7c4b828cb150d53603a5
 MISC metadata.xml 1272 BLAKE2B 7c02bfcb2638d2f33c6fbee2d0e79b6d7d270b8209f7ec82ec51d7cf0e19b94936ee599b618f9a6b9df280fc403b0890b2c8e2323525f6d50b79fc19d26c8756 SHA512 8de92a5802b26a98984be7b5e3c0868b249c14a77a690a186dc4361db1508b79c7ebccd261e7fe9251b2d4abbbe2b93aec8a91efeafc00baada2839020a9207f
diff --git a/media-video/makemkv/files/makemkv-ffmpeg-6.patch b/media-video/makemkv/files/makemkv-ffmpeg-6.patch
deleted file mode 100644
index 684d8186bab5..000000000000
--- a/media-video/makemkv/files/makemkv-ffmpeg-6.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/libffabi/src/ffabi.c b/libffabi/src/ffabi.c
-index 5dda9e1..2b29b87 100644
---- a/libffabi/src/ffabi.c
-+++ b/libffabi/src/ffabi.c
-@@ -478,7 +478,7 @@ FFM_AudioEncodeContext* __cdecl ffm_audio_encode_init(void* logctx,const char* n
- #else
-     ctx->frame = av_frame_alloc();
-     if (av_sample_fmt_is_planar(ctx->avctx->sample_fmt)) {
--        ctx->frame_extended_data = av_mallocz_array(ctx->avctx->channels,
-+        ctx->frame_extended_data = av_calloc(ctx->avctx->channels,
-             sizeof(*ctx->frame_extended_data));
-         if (!ctx->frame_extended_data) {
-             ffm_audio_encode_close(ctx);
diff --git a/media-video/makemkv/makemkv-1.17.4-r1.ebuild b/media-video/makemkv/makemkv-1.17.4-r1.ebuild
deleted file mode 100644
index 05a97bd1d4f3..000000000000
--- a/media-video/makemkv/makemkv-1.17.4-r1.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic linux-info xdg
-
-MY_P=makemkv-oss-${PV}
-MY_PB=makemkv-bin-${PV}
-
-DESCRIPTION="Tool for ripping and streaming Blu-ray, HD-DVD and DVD discs"
-HOMEPAGE="http://www.makemkv.com/"
-SRC_URI="http://www.makemkv.com/download/${MY_P}.tar.gz
-	http://www.makemkv.com/download/${MY_PB}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1 MPL-1.1 MakeMKV-EULA openssl"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="+gui +java"
-RESTRICT="bindist mirror"
-
-QA_PREBUILT="usr/bin/makemkvcon usr/bin/mmdtsdec"
-
-DEPEND="
-	dev-libs/expat
-	dev-libs/openssl:0=[-bindist(-)]
-	>=media-video/ffmpeg-1.0.0:0=
-	sys-libs/glibc
-	sys-libs/zlib
-	gui? (
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-"
-RDEPEND="
-	${DEPEND}
-	java? ( >=virtual/jre-1.8 )
-"
-BDEPEND="
-	virtual/pkgconfig
-	gui? ( dev-qt/qtcore:5 )
-"
-
-CONFIG_CHECK="~CHR_DEV_SG"
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-path.patch
-	"${FILESDIR}"/${PN}-ffmpeg-6.patch
-)
-
-src_prepare() {
-	default
-
-	if ! use java; then
-		rm -v "${WORKDIR}/${MY_PB}"/src/share/blues.* || die
-	fi
-}
-
-src_configure() {
-	# See bug #439380.
-	replace-flags -O* -Os
-
-	econf \
-		--enable-debug \
-		--disable-noec \
-		$(use_enable gui) \
-		$(use_enable gui qt5)
-}
-
-src_install() {
-	local myarch
-	case "${ARCH}" in
-		arm) myarch=armel ;;
-		x86) myarch=i386 ;;
-		*) myarch=${ARCH} ;;
-	esac
-
-	default
-
-	# add missing symlinks for QA
-	dosym libdriveio.so.0 /usr/$(get_libdir)/libdriveio.so.0.${PV}
-	dosym libdriveio.so.0 /usr/$(get_libdir)/libdriveio.so
-	dosym libmakemkv.so.1 /usr/$(get_libdir)/libmakemkv.so.1.${PV}
-	dosym libmakemkv.so.1 /usr/$(get_libdir)/libmakemkv.so
-	dosym libmmbd.so.0    /usr/$(get_libdir)/libmmbd.so
-	dosym libmmbd.so.0    /usr/$(get_libdir)/libmmbd.so.0.${PV}
-
-	cd "${WORKDIR}"/${MY_PB} || die
-
-	# install prebuilt bin
-	dobin bin/"${myarch}"/makemkvcon
-
-	# additional tool is actually part of makemkvcon
-	dosym makemkvcon /usr/bin/sdftool
-
-	# install profiles and locales
-	insinto /usr/share/MakeMKV
-	doins src/share/*
-
-	# install unofficial man page
-	doman "${FILESDIR}"/makemkvcon.1
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	elog "While MakeMKV is in beta mode, upstream has provided a license"
-	elog "to use if you do not want to purchase one."
-	elog ""
-	elog "See this forum thread for more information, including the key:"
-	elog "https://www.makemkv.com/forum/viewtopic.php?f=5&t=1053"
-	elog ""
-	elog "Note that beta license may have an expiration date and you will"
-	elog "need to check for newer licenses/releases. "
-	elog ""
-	elog "We previously said to copy default.mmcp.xml to ~/.MakeMKV/. This"
-	elog "is no longer necessary and you should delete it from there to"
-	elog "avoid warning messages."
-	elog ""
-	elog "MakeMKV can also act as a drop-in replacement for libaacs and"
-	elog "libbdplus, allowing transparent decryption of a wider range of"
-	elog "titles under players like VLC and mplayer. To enable this, set"
-	elog "the following variables when launching the player:"
-	elog "LIBAACS_PATH=libmmbd LIBBDPLUS_PATH=libmmbd"
-}
diff --git a/media-video/makemkv/makemkv-1.17.4.ebuild b/media-video/makemkv/makemkv-1.17.5.ebuild
index e99d889b48d6..8340ac2483e7 100644
--- a/media-video/makemkv/makemkv-1.17.4.ebuild
+++ b/media-video/makemkv/makemkv-1.17.5.ebuild
@@ -72,7 +72,7 @@ src_configure() {
 src_install() {
 	local myarch
 	case "${ARCH}" in
-		arm) myarch=armel ;;
+		arm) myarch=armhf ;;
 		x86) myarch=i386 ;;
 		*) myarch=${ARCH} ;;
 	esac