From 7aa987b42f29cd492d2a6da32ab10bc25c492cb7 Mon Sep 17 00:00:00 2001
From: jc_gargma <jc_gargma@iserlohn-fortress.net>
Date: Tue, 26 Sep 2023 16:52:22 -0700
Subject: Updated to 1.17.5

---
 PKGBUILD                             | 17 +++++------------
 makemkv-fix-build-with-ffmpeg6.patch | 25 -------------------------
 2 files changed, 5 insertions(+), 37 deletions(-)
 delete mode 100644 makemkv-fix-build-with-ffmpeg6.patch

diff --git a/PKGBUILD b/PKGBUILD
index e166fb6..5333775 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
 # AUR version uses CFLAGS instead of CXXFLAGS
 
 pkgname=makemkv
-pkgver=1.17.4
+pkgver=1.17.5
 pkgrel=1
 pkgdesc="DVD and Blu-ray to MKV converter"
 arch=('x86_64' 'i686' 'aarch64')
@@ -19,26 +19,19 @@ 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=('68ebc6f9baba7be4429014b73bdf6da33516a399f011e9e535eb383aff97748b'
-            '70e3599dd0a120ababa00d44c93ec8d2d001aea93e902355786ed90a7360cc99'
-            'c741d71532c5af61d2826c3699412c61858881f62dcd1531cb3db66e2e7be501'
+sha256sums=('cb009c31f69601e2f66e315925a09ad175bad041f27c5096d7b06dd5004df04f'
+            'fc2f4b0dc53117ab49927d9a415fa73082d1a4ae47df0c4e30cc4710c4c2fc22'
             '5573b2e4bade10d8cd258a7c235eb46f66ef8c8c97e5d5eb090c38fa0f94389b'
             'f12c0facf2f0071a9f728b138986f0a4c2b4ff6ace2dfb2e96364e215e9fda6f'
             '2a6237d3d5ce073734c658c7ec5d2141ecd0047e6d3c45d1bd594135c928878f')
-b2sums=('9be9fe1c2af35af7f5632857bccae45d9e6ba522fb8753eb40903a61ff73bc1ff40f2fade6d099059c5d7f716c0903ff16c3ff0849ff21728cc7eb8eafd19a95'
-        'c64e209fc20e432c4befe794133fb06761f4fd2fb6eceb8ce4ce7292582768d10937850027aad0a02f31f920c647841427797b43ba6f1016ff0e5920ac466682'
-        '32c1150bca0ffeea5e22585fa8cd9beaa1831d4d6e2bd4049822d1ced973c0e9ce00a7dc57bd22540028d0f8f81cc897a390979097a79460e59ca009f1071ebd'
+b2sums=('b224d82113ae03c3569933ac7838f5de2d6a9af9b720d2e11a508d141de8af7d50bb32bb5f65affa8dc8e0f8d6c6205352ad00cf30d8296b1c1413da519bd400'
+        '128c8e093cb8b39c7bf98f6cf65ab841a9e36914a6ac746d46c2bf82f6f28b8a0a61f6f15206d76be4b0b4834fa3f500ca682b841cf7a6760b20c3e187fe4c40'
         '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
deleted file mode 100644
index 275aeef..0000000
--- a/makemkv-fix-build-with-ffmpeg6.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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