upgpkg: makemkv-cli 1.17.3-2

3 files changed, 36 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4d30a312617c..1af6d3c7bac9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = makemkv-cli
 	pkgdesc = DVD and Blu-ray to MKV converter and network streamer - CLI only
 	pkgver = 1.17.3
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.makemkv.com
 	install = makemkv.install
 	arch = i686
@@ -16,10 +16,12 @@ pkgbase = makemkv-cli
 	conflicts = makemkv
 	source = https://www.makemkv.com/download/makemkv-bin-1.17.3.tar.gz
 	source = https://www.makemkv.com/download/makemkv-oss-1.17.3.tar.gz
+	source = makemkv-fix-build-with-ffmpeg6.patch
 	source = makemkvcon.1
 	source = mmdtsdec.1
 	b2sums = adc7bb6e093247d782c57de2f304b5715c0e21d0572927551fc3830fc15776c09d9593dee18d464f4d19e40a1e260facf750a494493048971b5f4cb1b40a372f
 	b2sums = 640948c378cd0c329b3278ec91efaa3632287edb8a8dc9b9b9dde619e8360d8e53e5af2f2c24e2091b69ea2d842afcd2043a2eef98cfff9c98e418bd418ee5b2
+	b2sums = 32c1150bca0ffeea5e22585fa8cd9beaa1831d4d6e2bd4049822d1ced973c0e9ce00a7dc57bd22540028d0f8f81cc897a390979097a79460e59ca009f1071ebd
 	b2sums = a318361982271bee3db2fa6f3e2b51afd7fe35f3dcb821c24bc21f8189be74cf9093559dbf9689eedd458226b30ddf59333af10ef509dc850331639b9035be39
 	b2sums = 2402c0338cf3a5e28c46af98a72c76e8e22d54e812f1d1f0dc156590657af15a6264a05a5fbcbf288fea09b5f4eb6fd1bb3e8672e9afc1615170b7bd83ba69b1
 	optdepends_x86_64 = lib32-glibc: dts support
diff --git a/PKGBUILD b/PKGBUILD
index 1d7bef922760..c40f23ccb298 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=makemkv-cli
 pkgver=1.17.3
-pkgrel=1
+pkgrel=2
 pkgdesc='DVD and Blu-ray to MKV converter and network streamer - CLI only'
 arch=('i686' 'x86_64')
 url='https://www.makemkv.com'
@@ -15,13 +15,20 @@ conflicts=('makemkv')
 install=makemkv.install
 source=("${url}/download/makemkv-bin-${pkgver}.tar.gz"
         "${url}/download/makemkv-oss-${pkgver}.tar.gz"
+        makemkv-fix-build-with-ffmpeg6.patch
         makemkvcon.1
         mmdtsdec.1)
 b2sums=('adc7bb6e093247d782c57de2f304b5715c0e21d0572927551fc3830fc15776c09d9593dee18d464f4d19e40a1e260facf750a494493048971b5f4cb1b40a372f'
         '640948c378cd0c329b3278ec91efaa3632287edb8a8dc9b9b9dde619e8360d8e53e5af2f2c24e2091b69ea2d842afcd2043a2eef98cfff9c98e418bd418ee5b2'
+        '32c1150bca0ffeea5e22585fa8cd9beaa1831d4d6e2bd4049822d1ced973c0e9ce00a7dc57bd22540028d0f8f81cc897a390979097a79460e59ca009f1071ebd'
         'a318361982271bee3db2fa6f3e2b51afd7fe35f3dcb821c24bc21f8189be74cf9093559dbf9689eedd458226b30ddf59333af10ef509dc850331639b9035be39'
         '2402c0338cf3a5e28c46af98a72c76e8e22d54e812f1d1f0dc156590657af15a6264a05a5fbcbf288fea09b5f4eb6fd1bb3e8672e9afc1615170b7bd83ba69b1')
 
+prepare() {
+  cd makemkv-oss-${pkgver}
+  patch -Np1 -i ../makemkv-fix-build-with-ffmpeg6.patch
+}
+
 build() {
   cd makemkv-oss-${pkgver}
   CFLAGS="$CFLAGS -std=c++11" CC=gcc CXX=g++ ./configure --prefix=/usr --disable-gui
diff --git a/makemkv-fix-build-with-ffmpeg6.patch b/makemkv-fix-build-with-ffmpeg6.patch
new file mode 100644
index 000000000000..275aeef0bfc0
--- /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
+