Patch for compatibility with ffmpeg4

3 files changed, 39 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0b563379b332..9e7d8412dced 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = makemkv
 	pkgdesc = DVD and Blu-ray to MKV converter and network streamer
 	pkgver = 1.12.2
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.makemkv.com
 	install = makemkv.install
 	arch = i686
@@ -20,11 +20,13 @@ pkgbase = makemkv
 	source = makemkv.1
 	source = makemkvcon.1
 	source = mmdtsdec.1
+	source = makemkv-ffmpeg.patch
 	md5sums = 5d2832b02a939c52d02600d910f27a7f
 	md5sums = 2f9b765106aea740ddd51a69939d98a6
 	md5sums = 1f9b3a91427a2015434e501542443f4c
 	md5sums = 7f4b112c5178860cc2eb25059ae1af2a
 	md5sums = 9476154228bf1b1f983178ba8565ac44
+	md5sums = edcbb4314e28cb35329ae6c7a13c82dd
 
 pkgname = makemkv
 
diff --git a/PKGBUILD b/PKGBUILD
index 539eed961d12..f955e564033d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=makemkv
 pkgver=1.12.2
-pkgrel=1
+pkgrel=2
 pkgdesc="DVD and Blu-ray to MKV converter and network streamer"
 arch=('i686' 'x86_64')
 url="http://www.makemkv.com"
@@ -16,12 +16,20 @@ source=(${url}/download/${pkgname}-bin-${pkgver}.tar.gz
         ${url}/download/${pkgname}-oss-${pkgver}.tar.gz
         makemkv.1
         makemkvcon.1
-        mmdtsdec.1)
+        mmdtsdec.1
+        makemkv-ffmpeg.patch)
 md5sums=('5d2832b02a939c52d02600d910f27a7f'
          '2f9b765106aea740ddd51a69939d98a6'
          '1f9b3a91427a2015434e501542443f4c'
          '7f4b112c5178860cc2eb25059ae1af2a'
-         '9476154228bf1b1f983178ba8565ac44')
+         '9476154228bf1b1f983178ba8565ac44'
+         'edcbb4314e28cb35329ae6c7a13c82dd')
+
+prepare() {
+  cd "${srcdir}/${pkgname}-oss-${pkgver}"
+  patch -Np1 -i ${srcdir}/makemkv-ffmpeg.patch
+}
+
 
 build() {
   cd "${srcdir}/${pkgname}-oss-${pkgver}"
diff --git a/makemkv-ffmpeg.patch b/makemkv-ffmpeg.patch
new file mode 100644
index 000000000000..83dafc1af4a3
--- /dev/null
+++ b/makemkv-ffmpeg.patch
@@ -0,0 +1,25 @@
+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;