[gentoo-commits] repo/gentoo:master commit in: media-video/makemkv/, media-video/makemkv/files/

["James Le Cuirot" <chewi@gentoo.org>]

commit:     4b18d9619165b800b5c271ac47dba01d14f64f1e
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 26 20:27:04 2023 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Tue Sep 26 20:27:04 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b18d961

media-video/makemkv: Bump to 1.17.5, drop old 1.17.4-r1

Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 media-video/makemkv/Manifest                                |  4 ++--
 media-video/makemkv/files/makemkv-ffmpeg-6.patch            | 13 -------------
 .../{makemkv-1.17.4-r1.ebuild => makemkv-1.17.5.ebuild}     |  3 +--
 3 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index 526bb1f52c94..345500b6e61e 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -1,2 +1,2 @@
-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
+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

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.5.ebuild
similarity index 98%
rename from media-video/makemkv/makemkv-1.17.4-r1.ebuild
rename to media-video/makemkv/makemkv-1.17.5.ebuild
index 05a97bd1d4f3..8340ac2483e7 100644
--- a/media-video/makemkv/makemkv-1.17.4-r1.ebuild
+++ b/media-video/makemkv/makemkv-1.17.5.ebuild
@@ -48,7 +48,6 @@ S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-path.patch
-	"${FILESDIR}"/${PN}-ffmpeg-6.patch
 )
 
 src_prepare() {
@@ -73,7 +72,7 @@ src_configure() {
 src_install() {
 	local myarch
 	case "${ARCH}" in
-		arm) myarch=armel ;;
+		arm) myarch=armhf ;;
 		x86) myarch=i386 ;;
 		*) myarch=${ARCH} ;;
 	esac