From bf2b96e85d0b71ad8671705567c0060bc9800a13 Mon Sep 17 00:00:00 2001
From: Leigh Scott <leigh123linux@gmail.com>
Date: Wed, 24 Jun 2020 07:59:29 +0100
Subject: [PATCH] Add upstream commit to mark ABI as C

---
 mark_abi_c.patch | 30 ++++++++++++++++++++++++++++++
 vmaf.spec        |  6 +++++-
 2 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 mark_abi_c.patch

diff --git a/mark_abi_c.patch b/mark_abi_c.patch
new file mode 100644
index 0000000..d63d327
--- /dev/null
+++ b/mark_abi_c.patch
@@ -0,0 +1,30 @@
+From ea25229433f7f8ff087c63db9509156c01a8e291 Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Sat, 29 Feb 2020 15:12:09 +0000
+Subject: [PATCH] libvmaf: mark ABI as C after 82a86e040371
+
+---
+ libvmaf/include/libvmaf/libvmaf.h | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/libvmaf/include/libvmaf/libvmaf.h b/libvmaf/include/libvmaf/libvmaf.h
+index ef32e069..2fbb3599 100644
+--- a/libvmaf/include/libvmaf/libvmaf.h
++++ b/libvmaf/include/libvmaf/libvmaf.h
+@@ -19,8 +19,16 @@
+ #ifndef LIBVMAF_H_
+ #define LIBVMAF_H_
+ 
++#ifdef __cplusplus
++extern "C" {
++#endif
++
+ int compute_vmaf(double* vmaf_score, char* fmt, int width, int height, int (*read_frame)(float *ref_data, float *main_data, float *temp_data, int stride_byte, void *user_data),
+ 				 void *user_data, char *model_path, char *log_path, char *log_fmt, int disable_clip, int disable_avx, int enable_transform, int phone_model, int do_psnr,
+ 				 int do_ssim, int do_ms_ssim, char *pool_method, int n_thread, int n_subsample, int enable_conf_interval);
+ 
++#ifdef __cplusplus
++}
++#endif
++
+ #endif /* _LIBVMAF_H */
diff --git a/vmaf.spec b/vmaf.spec
index 3f29473..33f3bfd 100644
--- a/vmaf.spec
+++ b/vmaf.spec
@@ -1,6 +1,6 @@
 Name:           vmaf
 Version:        1.5.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Video Multi-Method Assessment Fusion
 
 License:        BSD-2-Clause-Patent
@@ -11,6 +11,7 @@ Patch1:         0002-Unbundle-pugixml.patch
 Patch3:         0003-Fix-soname.patch
 Patch4:         0004-Avoid-x86cpudetection-code-when-not-relevant.patch
 Patch5:         0005-Use-shared-for-vmafossexec.patch
+Patch6:         %{url}/commit/ea25229433f7f8ff087c63db9509156c01a8e291.patch#/mark_abi_c.patch
 
 # This project relies on AVX
 ExclusiveArch:  x86_64
@@ -113,6 +114,9 @@ touch -r LICENSE %{buildroot}%{rpmmacrodir}/macros.%{name}
 
 
 %changelog
+* Wed Jun 24 2020 Leigh Scott <leigh123linux@gmail.com> - 1.5.1-4
+- Add upstream commit to mark ABI as C
+
 * Sat May 23 2020 Leigh Scott <leigh123linux@gmail.com> - 1.5.1-3
 - Fix pkconfig version