From 5d5ffe52b8e41a2b864b91a5ab6c7cf71b958426 Mon Sep 17 00:00:00 2001
From: jc_gargma <jc_gargma@iserlohn-fortress.net>
Date: Tue, 4 Jul 2023 18:44:29 -0700
Subject: Updated to 1.17.4

---
 PKGBUILD             | 12 ++++++------
 makemkv-ffmpeg.patch | 25 -------------------------
 2 files changed, 6 insertions(+), 31 deletions(-)
 delete mode 100644 makemkv-ffmpeg.patch

diff --git a/PKGBUILD b/PKGBUILD
index b099870..e166fb6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,8 +7,8 @@
 # AUR version uses CFLAGS instead of CXXFLAGS
 
 pkgname=makemkv
-pkgver=1.17.3
-pkgrel=2
+pkgver=1.17.4
+pkgrel=1
 pkgdesc="DVD and Blu-ray to MKV converter"
 arch=('x86_64' 'i686' 'aarch64')
 url="https://www.makemkv.com"
@@ -23,14 +23,14 @@ source=(https://www.makemkv.com/download/${pkgname}-bin-${pkgver}.tar.gz
         makemkv.1
         makemkvcon.1
         mmdtsdec.1)
-sha256sums=('1cd633bfb381faa4f22ab57f6b75053c1b18997c223ed7988896c8c15cd1bee0'
-            '16be3ee29c1dd3d5292f793e9f5efbcd30a59bf035de79586e9afbfa98a6a4cb'
+sha256sums=('68ebc6f9baba7be4429014b73bdf6da33516a399f011e9e535eb383aff97748b'
+            '70e3599dd0a120ababa00d44c93ec8d2d001aea93e902355786ed90a7360cc99'
             'c741d71532c5af61d2826c3699412c61858881f62dcd1531cb3db66e2e7be501'
             '5573b2e4bade10d8cd258a7c235eb46f66ef8c8c97e5d5eb090c38fa0f94389b'
             'f12c0facf2f0071a9f728b138986f0a4c2b4ff6ace2dfb2e96364e215e9fda6f'
             '2a6237d3d5ce073734c658c7ec5d2141ecd0047e6d3c45d1bd594135c928878f')
-b2sums=('adc7bb6e093247d782c57de2f304b5715c0e21d0572927551fc3830fc15776c09d9593dee18d464f4d19e40a1e260facf750a494493048971b5f4cb1b40a372f'
-        '640948c378cd0c329b3278ec91efaa3632287edb8a8dc9b9b9dde619e8360d8e53e5af2f2c24e2091b69ea2d842afcd2043a2eef98cfff9c98e418bd418ee5b2'
+b2sums=('9be9fe1c2af35af7f5632857bccae45d9e6ba522fb8753eb40903a61ff73bc1ff40f2fade6d099059c5d7f716c0903ff16c3ff0849ff21728cc7eb8eafd19a95'
+        'c64e209fc20e432c4befe794133fb06761f4fd2fb6eceb8ce4ce7292582768d10937850027aad0a02f31f920c647841427797b43ba6f1016ff0e5920ac466682'
         '32c1150bca0ffeea5e22585fa8cd9beaa1831d4d6e2bd4049822d1ced973c0e9ce00a7dc57bd22540028d0f8f81cc897a390979097a79460e59ca009f1071ebd'
         '92bac30ca1ca062bb235389ac9e558649c7efc31b7690a4540cae6f9f032843ce4ed74eb091bcfba1e24ad0fbc904963c7aed2d6761883800ef319a3ed074cd0'
         'a318361982271bee3db2fa6f3e2b51afd7fe35f3dcb821c24bc21f8189be74cf9093559dbf9689eedd458226b30ddf59333af10ef509dc850331639b9035be39'
diff --git a/makemkv-ffmpeg.patch b/makemkv-ffmpeg.patch
deleted file mode 100644
index 83dafc1..0000000
--- a/makemkv-ffmpeg.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Taken from https://negativo17.org/repos/multimedia/epel-7/SRPMS/makemkv-1.12.2-2.el7.src.rpm
-See https://github.com/FFmpeg/FFmpeg/commit/7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615
-and https://github.com/FFmpeg/FFmpeg/commit/b79a7da36faa6bb5914b04800b548e99eb3b81ca
-diff --git a/libffabi/src/ffabi.c b/libffabi/src/ffabi.c
-index 20db4e9..f08d53c 100644
---- a/libffabi/src/ffabi.c
-+++ b/libffabi/src/ffabi.c
-@@ -517,7 +517,7 @@ FFM_AudioEncodeContext* __cdecl ffm_audio_encode_init(void* logctx,const char* n
-         info->profile : FF_PROFILE_UNKNOWN;
- 
-     if ((CodecFlags&FFM_CODEC_FLAG_GLOBAL_HEADER)!=0)
--        ctx->avctx->flags |= CODEC_FLAG_GLOBAL_HEADER;
-+        ctx->avctx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
- 
-     if (argp) {
-         for (i=0;argp[i];i+=2) {
-@@ -718,7 +718,7 @@ int __cdecl ffm_audio_encode_get_info(FFM_AudioEncodeContext* ctx,FFM_AudioEncod
-     info->delay = (int32_t)ctx->avctx->delay;
-     info->flags = 0;
- 
--    if ((ctx->avctx->flags&CODEC_FLAG_GLOBAL_HEADER)!=0)
-+    if ((ctx->avctx->flags&AV_CODEC_FLAG_GLOBAL_HEADER)!=0)
-         info->flags |= FFM_CODEC_FLAG_GLOBAL_HEADER;
- 
-     return 0;
-- 
cgit v1.2.1