From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Tue, 12 Jan 2021 18:04:06 +0000 (+0100)
Subject: - updated to 1.5.3
X-Git-Tag: auto/th/vmaf-1.5.3-1
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=84e16803299f567a5663cecab4be80d5e4133b9f;p=packages%2Fvmaf.git

- updated to 1.5.3
- added x86-nosimd patch (fix x86 build without SIMD enabled)
---

diff --git a/vmaf-x86-nosimd.patch b/vmaf-x86-nosimd.patch
new file mode 100644
index 0000000..b9a1f0a
--- /dev/null
+++ b/vmaf-x86-nosimd.patch
@@ -0,0 +1,20 @@
+--- vmaf-1.5.3/libvmaf/src/feature/adm_tools.c.orig	2020-08-25 01:35:41.000000000 +0200
++++ vmaf-1.5.3/libvmaf/src/feature/adm_tools.c	2021-01-12 18:58:18.525832313 +0100
+@@ -35,8 +35,7 @@
+ #define MIN(x, y) (((x) < (y)) ? (x) : (y))
+ #define MAX(x, y) (((x) > (y)) ? (x) : (y))
+ 
+-#if ARCH_X86
+-#ifdef ADM_OPT_RECIP_DIVISION
++#if ARCH_X86 && defined(ADM_OPT_RECIP_DIVISION)
+ 
+ #include <emmintrin.h>
+ 
+@@ -47,7 +46,6 @@
+ }
+ 
+ #define DIVS(n, d) ((n) * rcp_s(d))
+-#endif //ADM_OPT_RECIP_DIVISION
+ #else
+ #define DIVS(n, d) ((n) / (d))
+ #endif //ARCH_X86
diff --git a/vmaf.spec b/vmaf.spec
index d447a13..907609f 100644
--- a/vmaf.spec
+++ b/vmaf.spec
@@ -15,13 +15,14 @@
 Summary:	Netflix's VMAF library
 Summary(pl.UTF-8):	Biblioteka Netflix VMAF
 Name:		vmaf
-Version:	1.5.2
+Version:	1.5.3
 Release:	1
 License:	BSD+patent
 Group:		Libraries
 #Source0Download: https://github.com/Netflix/vmaf/releases
 Source0:	https://github.com/Netflix/vmaf/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5:	0bffac819d2f65c8efaf90c9ab43d27d
+# Source0-md5:	73914f1bc2e15a82162549f1eba735fa
+Patch0:		%{name}-x86-nosimd.patch
 URL:		https://github.com/Netflix/vmaf
 BuildRequires:	libstdc++-devel >= 6:4.8
 BuildRequires:	meson >= 0.47.0
@@ -79,6 +80,7 @@ Statyczna biblioteka Netflix VMAF.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %if %{without sse2}
 %{__sed} -i -e 's,#define ADM_OPT_RECIP_DIVISION,/* & */,' libvmaf/src/feature/adm_options.h