upgpkg: makemkv-cli 1.17.5-2

remove unneeded patch

3 files changed, 2 insertions, 36 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8d64408a6997..7c5c19672ac7 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.5
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.makemkv.com
 	install = makemkv.install
 	arch = i686
@@ -16,12 +16,10 @@ pkgbase = makemkv-cli
 	conflicts = makemkv
 	source = https://www.makemkv.com/download/makemkv-bin-1.17.5.tar.gz
 	source = https://www.makemkv.com/download/makemkv-oss-1.17.5.tar.gz
-	source = makemkv-fix-build-with-ffmpeg6.patch
 	source = makemkvcon.1
 	source = mmdtsdec.1
 	b2sums = b224d82113ae03c3569933ac7838f5de2d6a9af9b720d2e11a508d141de8af7d50bb32bb5f65affa8dc8e0f8d6c6205352ad00cf30d8296b1c1413da519bd400
 	b2sums = 128c8e093cb8b39c7bf98f6cf65ab841a9e36914a6ac746d46c2bf82f6f28b8a0a61f6f15206d76be4b0b4834fa3f500ca682b841cf7a6760b20c3e187fe4c40
-	b2sums = 32c1150bca0ffeea5e22585fa8cd9beaa1831d4d6e2bd4049822d1ced973c0e9ce00a7dc57bd22540028d0f8f81cc897a390979097a79460e59ca009f1071ebd
 	b2sums = a318361982271bee3db2fa6f3e2b51afd7fe35f3dcb821c24bc21f8189be74cf9093559dbf9689eedd458226b30ddf59333af10ef509dc850331639b9035be39
 	b2sums = 2402c0338cf3a5e28c46af98a72c76e8e22d54e812f1d1f0dc156590657af15a6264a05a5fbcbf288fea09b5f4eb6fd1bb3e8672e9afc1615170b7bd83ba69b1
 	optdepends_x86_64 = lib32-glibc: dts support
diff --git a/PKGBUILD b/PKGBUILD
index cef976c0eba7..1cf70a908dc3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=makemkv-cli
 pkgver=1.17.5
-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,20 +15,13 @@ 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=('b224d82113ae03c3569933ac7838f5de2d6a9af9b720d2e11a508d141de8af7d50bb32bb5f65affa8dc8e0f8d6c6205352ad00cf30d8296b1c1413da519bd400'
         '128c8e093cb8b39c7bf98f6cf65ab841a9e36914a6ac746d46c2bf82f6f28b8a0a61f6f15206d76be4b0b4834fa3f500ca682b841cf7a6760b20c3e187fe4c40'
-        '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
deleted file mode 100644
index 275aeef0bfc0..000000000000
--- 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
-