From 58e36600df22960dfb83ec7b44021a9cbe5feaad Mon Sep 17 00:00:00 2001
From: jc_gargma <jc_gargma@iserlohn-fortress.net>
Date: Sat, 8 Apr 2023 13:46:10 -0700
Subject: Rebuild against ffmpeg6

---
 PKGBUILD                             |  9 ++++++++-
 makemkv-fix-build-with-ffmpeg6.patch | 25 +++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 makemkv-fix-build-with-ffmpeg6.patch

diff --git a/PKGBUILD b/PKGBUILD
index 21c00d1..b099870 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@
 
 pkgname=makemkv
 pkgver=1.17.3
-pkgrel=1
+pkgrel=2
 pkgdesc="DVD and Blu-ray to MKV converter"
 arch=('x86_64' 'i686' 'aarch64')
 url="https://www.makemkv.com"
@@ -19,19 +19,26 @@ optdepends_x86_64=('lib32-glibc: dts support')
 install=makemkv.install
 source=(https://www.makemkv.com/download/${pkgname}-bin-${pkgver}.tar.gz
         https://www.makemkv.com/download/${pkgname}-oss-${pkgver}.tar.gz
+        makemkv-fix-build-with-ffmpeg6.patch
         makemkv.1
         makemkvcon.1
         mmdtsdec.1)
 sha256sums=('1cd633bfb381faa4f22ab57f6b75053c1b18997c223ed7988896c8c15cd1bee0'
             '16be3ee29c1dd3d5292f793e9f5efbcd30a59bf035de79586e9afbfa98a6a4cb'
+            'c741d71532c5af61d2826c3699412c61858881f62dcd1531cb3db66e2e7be501'
             '5573b2e4bade10d8cd258a7c235eb46f66ef8c8c97e5d5eb090c38fa0f94389b'
             'f12c0facf2f0071a9f728b138986f0a4c2b4ff6ace2dfb2e96364e215e9fda6f'
             '2a6237d3d5ce073734c658c7ec5d2141ecd0047e6d3c45d1bd594135c928878f')
 b2sums=('adc7bb6e093247d782c57de2f304b5715c0e21d0572927551fc3830fc15776c09d9593dee18d464f4d19e40a1e260facf750a494493048971b5f4cb1b40a372f'
         '640948c378cd0c329b3278ec91efaa3632287edb8a8dc9b9b9dde619e8360d8e53e5af2f2c24e2091b69ea2d842afcd2043a2eef98cfff9c98e418bd418ee5b2'
+        '32c1150bca0ffeea5e22585fa8cd9beaa1831d4d6e2bd4049822d1ced973c0e9ce00a7dc57bd22540028d0f8f81cc897a390979097a79460e59ca009f1071ebd'
         '92bac30ca1ca062bb235389ac9e558649c7efc31b7690a4540cae6f9f032843ce4ed74eb091bcfba1e24ad0fbc904963c7aed2d6761883800ef319a3ed074cd0'
         'a318361982271bee3db2fa6f3e2b51afd7fe35f3dcb821c24bc21f8189be74cf9093559dbf9689eedd458226b30ddf59333af10ef509dc850331639b9035be39'
         '2402c0338cf3a5e28c46af98a72c76e8e22d54e812f1d1f0dc156590657af15a6264a05a5fbcbf288fea09b5f4eb6fd1bb3e8672e9afc1615170b7bd83ba69b1')
+prepare() {
+  cd "${srcdir}/${pkgname}-oss-${pkgver}"
+  patch -Np1 -i ../makemkv-fix-build-with-ffmpeg6.patch
+}
 
 build() {
   cd "${srcdir}/${pkgname}-oss-${pkgver}"
diff --git a/makemkv-fix-build-with-ffmpeg6.patch b/makemkv-fix-build-with-ffmpeg6.patch
new file mode 100644
index 0000000..275aeef
--- /dev/null
+++ b/makemkv-fix-build-with-ffmpeg6.patch
@@ -0,0 +1,25 @@
+From e07e7800ed622a9bb3d3ad03af0342d5caec3905 Mon Sep 17 00:00:00 2001
+From: FabioLolix <fabio.loli@disroot.org>
+Date: Fri, 10 Mar 2023 23:17:20 +0100
+Subject: [PATCH] fix build with ffmpeg6
+
+---
+ libffabi/src/ffabi.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+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);
+-- 
+2.39.2
+
-- 
cgit v1.2.1