makemkv: add patch for av_mallocz_array

6 files changed, 33 insertions, 3 deletions

diff --git a/makemkv-bin/debian/changelog b/makemkv-bin/debian/changelog
index 1b3692f..8d17b33 100644
--- a/makemkv-bin/debian/changelog
+++ b/makemkv-bin/debian/changelog
@@ -1,3 +1,9 @@
+makemkv-bin (1.17.4-2+stackrpms) obs; urgency=low
+
+  * Rebuild for -oss bump
+
+ -- B. Stack <bgstack15@gmail.com>  Thu, 14 Sep 2023 10:46:47 -0400
+
 makemkv-bin (1.17.4-1+stackrpms) obs; urgency=low
 
   * Upstream updates
diff --git a/makemkv-bin/debian/makemkv-bin+stackrpms.dsc b/makemkv-bin/debian/makemkv-bin+stackrpms.dsc
index 27f362f..bbed030 100644
--- a/makemkv-bin/debian/makemkv-bin+stackrpms.dsc
+++ b/makemkv-bin/debian/makemkv-bin+stackrpms.dsc
@@ -2,7 +2,7 @@ Format: 3.0 (quilt)
 Source: makemkv-bin
 Binary: makemkv-bin
 Architecture: any
-Version: 1.17.4-1+stackrpms
+Version: 1.17.4-2+stackrpms
 Maintainer: B. Stack <bgstack15@gmail.com>
 Homepage: https://www.makemkv.com
 Standards-Version: 4.1.4
diff --git a/makemkv-oss/debian/changelog b/makemkv-oss/debian/changelog
index 46e7e30..d0bd10a 100644
--- a/makemkv-oss/debian/changelog
+++ b/makemkv-oss/debian/changelog
@@ -1,3 +1,9 @@
+makemkv-oss (1.17.4-2+stackrpms) obs; urgency=low
+
+  * Add av_mallocz_array patch
+
+ -- B. Stack <bgstack15@gmail.com>  Thu, 14 Sep 2023 10:46:47 -0400
+
 makemkv-oss (1.17.4-1+stackrpms) obs; urgency=low
 
   * Upstream updates
diff --git a/makemkv-oss/debian/makemkv-oss+stackrpms.dsc b/makemkv-oss/debian/makemkv-oss+stackrpms.dsc
index 05f76a8..8ceaa0c 100644
--- a/makemkv-oss/debian/makemkv-oss+stackrpms.dsc
+++ b/makemkv-oss/debian/makemkv-oss+stackrpms.dsc
@@ -2,7 +2,7 @@ Format: 3.0 (quilt)
 Source: makemkv-oss
 Binary: makemkv-oss
 Architecture: any
-Version: 1.17.4-1+stackrpms
+Version: 1.17.4-2+stackrpms
 Maintainer: B. Stack <bgstack15@gmail.com>
 Homepage: https://www.makemkv.com
 Standards-Version: 4.1.4
diff --git a/makemkv-oss/debian/patches/missing-av_mallocz_array.patch b/makemkv-oss/debian/patches/missing-av_mallocz_array.patch
new file mode 100644
index 0000000..86a56f0
--- /dev/null
+++ b/makemkv-oss/debian/patches/missing-av_mallocz_array.patch
@@ -0,0 +1,18 @@
+Author: junknot
+Origin: https://build.opensuse.org/package/show/home:junknot/makemkv
+Reference: https://forum.makemkv.com/forum/viewtopic.php?f=3&p=132993
+Version: 1.17.4
+Message: FFmpeg deprecated a function call name.
+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/makemkv-oss/debian/patches/series b/makemkv-oss/debian/patches/series
index 4a97dfa..ce8f4e2 100644
--- a/makemkv-oss/debian/patches/series
+++ b/makemkv-oss/debian/patches/series
@@ -1 +1 @@
-# You must remove unused comment lines for the released package.
+missing-av_mallocz_array.patch -p1