From 26113d9ca6b97317329769cb8ac7d0c2fb7d4728 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= <zebob.m@gmail.com>
Date: Wed, 1 Jul 2020 16:14:20 +0200
Subject: [PATCH] Update to 2.0.0 (#1852847)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Robert-André Mauchin <zebob.m@gmail.com>
---
 .gitignore |  1 +
 aom.spec   | 53 ++++++++++++++++++++++++++++++++---------------------
 sources    |  2 +-
 3 files changed, 34 insertions(+), 22 deletions(-)

diff --git a/.gitignore b/.gitignore
index aeb4c9f..2b2bdf9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /aom-d0076f5.tar.gz
 /aom-cfd59e9.tar.gz
 /aom-9666276.tar.gz
+/aom-bb35ba9.tar.gz
diff --git a/aom.spec b/aom.spec
index 16651a4..da297c5 100644
--- a/aom.spec
+++ b/aom.spec
@@ -1,16 +1,16 @@
-%global sover           0
+%global sover           2
 # git describe
-%global aom_version     1.0.0-2227-gcfd59e96a
+%global aom_version     v2.0.0
 
 # Use commit with updated changelog for correct versioning
-%global commit          9666276accea505cd14cbcb9e3f7ff5033da9172
+%global commit          bb35ba9148543f22ba7d8642e4fbd29ae301f5dc
 %global shortcommit     %(c=%{commit}; echo ${c:0:7})
-%global snapshotdate    20190810
-%global prerelease      1
+%global snapshotdate    20200701
+# %%global prerelease      1
 
 Name:       aom
-Version:    1.0.0
-Release:    9.%{?prerelease:%{snapshotdate}git%{shortcommit}}%{?dist}
+Version:    2.0.0
+Release:    1%{?prerelease:.%{snapshotdate}git%{shortcommit}}%{?dist}
 Summary:    Royalty-free next-generation video format
 
 License:    BSD
@@ -27,6 +27,9 @@ BuildRequires:  perl-interpreter
 BuildRequires:  perl(Getopt::Long)
 BuildRequires:  python3-devel
 BuildRequires:  yasm
+%ifarch x86_64
+BuildRequires:  pkgconfig(libvmaf)
+%endif
 
 Provides:       av1 = %{version}-%{release}
 Requires:       libaom%{?_isa} = %{version}-%{release}
@@ -62,26 +65,31 @@ video format.
 
 %prep
 %autosetup -p1 -c %{name}-%{commit}
-# Set GIT revision in version
+# Set GIT revision in version
 sed -i 's@set(aom_version "")@set(aom_version "%{aom_version}")@' build/cmake/version.cmake
+# Fix VMAF detection
+sed -i 's@libvmaf\.a @@' CMakeLists.txt
 
 %build
-mkdir _build && cd _build
-%cmake3 ../ -DENABLE_CCACHE=1 \
-            -DCMAKE_SKIP_RPATH=1 \
-            -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+%cmake3 -B _build -DENABLE_CCACHE=1 \
+                  -DCMAKE_SKIP_RPATH=1 \
+                  -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+                  -DCONFIG_WEBM_IO=1 \
+                  -DENABLE_DOCS=1 \
+                  -DCONFIG_ANALYZER=0 \
+                  -DCONFIG_SHARED=1 \
 %ifarch %{arm}
-            -DAOM_NEON_INTRIN_FLAG=-mfpu=neon \
+                  -DAOM_NEON_INTRIN_FLAG=-mfpu=neon \
+%endif
+%ifarch x86_64
+                  -DCONFIG_TUNE_VMAF=1 \
 %endif
-            -DCONFIG_WEBM_IO=1 \
-            -DENABLE_DOCS=1 \
-            -DCONFIG_ANALYZER=0 \
-            -DCONFIG_LOWBITDEPTH=1
-%make_build
+                  %{nil}
+%make_build -C _build
 
 %install
-cd _build
-%make_install
+%make_install -C _build
+rm -rf %{buildroot}%{_libdir}/libaom.a
 
 %files
 %doc AUTHORS CHANGELOG README.md
@@ -91,7 +99,7 @@ cd _build
 
 %files -n libaom
 %license LICENSE PATENTS
-%{_libdir}/libaom.so.%{sover}
+%{_libdir}/libaom.so.%{sover}*
 
 %files -n libaom-devel
 %doc _build/docs/html/
@@ -100,6 +108,9 @@ cd _build
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Wed Jul 01 14:33:18 CEST 2020 Robert-André Mauchin <zebob.m@gmail.com> - 2.0.0-1
+- Update to 2.0.0 (#1852847)
+
 * Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.0-9.20190810git9666276
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 
diff --git a/sources b/sources
index 3c810c7..667f347 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (aom-9666276.tar.gz) = 2c979cd2d1229016e5a6336993144d7b5161fd2f2e8b3023177be3d954c2abade5bb17957e4aeeeedd6132fbaf5e2daf79f0cdddf3ad625213dc267761490d7c
+SHA512 (aom-bb35ba9.tar.gz) = 81a6a83f0238436d7673ccc12cb997b734b5b57092d2977b21321cb781ef0f1debe3ca650a95e6ed51d12e7733170b57056d8bd7dbbe9427378eaf7a7337683a