v1.17.4

3 files changed, 10 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fce04e6ab991..8f71e67911a2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = makemkv
 	pkgdesc = DVD and Blu-ray to MKV converter
-	pkgver = 1.17.3
-	pkgrel = 2
+	pkgver = 1.17.4
+	pkgrel = 1
 	url = https://www.makemkv.com
 	install = makemkv.install
 	arch = x86_64
@@ -13,14 +13,14 @@ pkgbase = makemkv
 	depends = qt5-base
 	depends = ffmpeg
 	optdepends = java-runtime
-	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 = https://www.makemkv.com/download/makemkv-bin-1.17.4.tar.gz
+	source = https://www.makemkv.com/download/makemkv-oss-1.17.4.tar.gz
 	source = https://raw.githubusercontent.com/FabioLolix/AUR-artifacts/master/makemkv-fix-build-with-ffmpeg6.patch
 	source = makemkv.1
 	source = makemkvcon.1
 	source = mmdtsdec.1
-	sha256sums = 1cd633bfb381faa4f22ab57f6b75053c1b18997c223ed7988896c8c15cd1bee0
-	sha256sums = 16be3ee29c1dd3d5292f793e9f5efbcd30a59bf035de79586e9afbfa98a6a4cb
+	sha256sums = 68ebc6f9baba7be4429014b73bdf6da33516a399f011e9e535eb383aff97748b
+	sha256sums = 70e3599dd0a120ababa00d44c93ec8d2d001aea93e902355786ed90a7360cc99
 	sha256sums = c741d71532c5af61d2826c3699412c61858881f62dcd1531cb3db66e2e7be501
 	sha256sums = 5573b2e4bade10d8cd258a7c235eb46f66ef8c8c97e5d5eb090c38fa0f94389b
 	sha256sums = f12c0facf2f0071a9f728b138986f0a4c2b4ff6ace2dfb2e96364e215e9fda6f
diff --git a/PKGBUILD b/PKGBUILD
index 5235a8e3adf0..09ea4103d623 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,8 @@
 # Contributor: Olaf Bauer <hydro@freenet.de>
 
 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"
@@ -19,8 +19,8 @@ source=(${url}/download/${pkgname}-bin-${pkgver}.tar.gz
         makemkv.1
         makemkvcon.1
         mmdtsdec.1)
-sha256sums=('1cd633bfb381faa4f22ab57f6b75053c1b18997c223ed7988896c8c15cd1bee0'
-            '16be3ee29c1dd3d5292f793e9f5efbcd30a59bf035de79586e9afbfa98a6a4cb'
+sha256sums=('68ebc6f9baba7be4429014b73bdf6da33516a399f011e9e535eb383aff97748b'
+            '70e3599dd0a120ababa00d44c93ec8d2d001aea93e902355786ed90a7360cc99'
             'c741d71532c5af61d2826c3699412c61858881f62dcd1531cb3db66e2e7be501'
             '5573b2e4bade10d8cd258a7c235eb46f66ef8c8c97e5d5eb090c38fa0f94389b'
             'f12c0facf2f0071a9f728b138986f0a4c2b4ff6ace2dfb2e96364e215e9fda6f'
diff --git a/makemkv-ffmpeg.patch b/makemkv-ffmpeg.patch
deleted file mode 100644
index 83dafc1af4a3..000000000000
--- 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;