The package rpms/aom.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/aom.git/commit/?id=168ce73164ec37....
Change:
-%ifarch x86_64
Thanks.
Full change:
============
commit 168ce73164ec37466a0b67372e9f17de190dfb4d
Author: Robert-André Mauchin <zebob.m(a)gmail.com>
Date: Sun Jun 13 13:37:14 2021 +0200
Update to 3.1.1
Close: rhbz#1954337
Security fix for CVE-2021-30473
Fix: rhbz#1961375
Fix: rhbz#1961376
Security fix for CVE-2021-30475
Fix: rhbz#1968017
Fix: rhbz#1968018
diff --git a/.gitignore b/.gitignore
index b548f5b..bb83bb7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,5 @@
/aom-9666276.tar.gz
/aom-bb35ba9.tar.gz
/aom-b52ee6d.tar.gz
+/aom-c0f1414.tar.gz
+/aom-7fadc0e.tar.gz
diff --git a/aom.spec b/aom.spec
index f43cc6b..9fc6ef1 100644
--- a/aom.spec
+++ b/aom.spec
@@ -1,25 +1,23 @@
-# Force out of source build
-%undefine __cmake_in_source_build
-
-%global sover 2
+%global sover 3
# git describe
-%global aom_version v2.0.1
+%global aom_version v3.1.1
# Use commit with updated changelog for correct versioning
-%global commit b52ee6d44adaef8a08f6984390de050d64df9faa
+%global commit 7fadc0e77130efb05f52979b0deaba9b6a1bba6d
%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global snapshotdate 20201215
+%global snapshotdate 20210613
# %%global prerelease 1
-%if 0%{?rhel} >= 8
-%bcond_with vmaf
-%else
+%if 0%{?fedora}
+%ifarch x86_64
%bcond_without vmaf
%endif
+%bcond_without jpegxl
+%endif
Name: aom
-Version: 2.0.1
-Release: 5%{?prerelease:.%{snapshotdate}git%{shortcommit}}%{?dist}
+Version: 3.1.1
+Release: 1%{?prerelease:.%{snapshotdate}git%{shortcommit}}%{?dist}
Summary: Royalty-free next-generation video format
License: BSD
@@ -36,11 +34,13 @@ BuildRequires: perl-interpreter
BuildRequires: perl(Getopt::Long)
BuildRequires: python3-devel
BuildRequires: yasm
+%if %{with jpegxl}
+BuildRequires: pkgconfig(libjxl)
+BuildRequires: pkgconfig(libhwy)
+%endif
%if %{with vmaf}
-%ifarch x86_64
BuildRequires: pkgconfig(libvmaf)
%endif
-%endif
Provides: av1 = %{version}-%{release}
Requires: libaom%{?_isa} = %{version}-%{release}
@@ -78,8 +78,6 @@ video format.
%autosetup -p1 -c %{name}-%{commit}
# 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(a)libvmaf\.a @@' CMakeLists.txt
%build
%ifarch %{arm}
@@ -93,18 +91,19 @@ sed -i 's(a)libvmaf\.a @@' CMakeLists.txt
-DENABLE_DOCS=1 \
-DENABLE_TESTS=0 \
-DCONFIG_ANALYZER=0 \
- -DCONFIG_SHARED=1 \
+ -DBUILD_SHARED_LIBS=1 \
+%if %{with jpegxl}
+ -DCONFIG_TUNE_BUTTERAUGLI=1 \
+%endif
%if %{with vmaf}
-%ifarch x86_64
-DCONFIG_TUNE_VMAF=1 \
-%endif
%endif
%{nil}
%cmake3_build
%install
%cmake3_install
-rm -rf %{buildroot}%{_libdir}/libaom.a
+rm -rvf %{buildroot}%{_libdir}/libaom.a
%files
%doc AUTHORS CHANGELOG README.md
@@ -123,6 +122,16 @@ rm -rf %{buildroot}%{_libdir}/libaom.a
%{_libdir}/pkgconfig/%{name}.pc
%changelog
+* Sun Jun 13 12:47:37 CEST 2021 Robert-André Mauchin <zebob.m(a)gmail.com> - 3.1.1-1
+- Update to 3.1.1
+- Close: rhbz#1954337
+- Security fix for CVE-2021-30473
+- Fix: rhbz#1961375
+- Fix: rhbz#1961376
+- Security fix for CVE-2021-30475
+- Fix: rhbz#1968017
+- Fix: rhbz#1968018
+
* Wed Mar 10 2021 Leigh Scott <leigh123linux(a)gmail.com> - 2.0.1-5
- Rebuild for new libvmaf version
diff --git a/sources b/sources
index a6e6b7f..5ca5d8a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (aom-b52ee6d.tar.gz) =
5ea7042c34892bb6b2d5ea0e3ee3f4e903cbfb892677629e0ce1e1cf988dfd62b6526aaee4cff827271eaba3b370a8966b9237feb168a5d4f95e5f2efc82e718
+SHA512 (aom-7fadc0e.tar.gz) =
16c24e4b62fc3abb67b4f0f1e39bfb56d59a893a50fb3ab7b5689d0ca3ee745e6fe9bafa9672be0833186b46bd473b27997bb47a7ade73363bf28fd4c3c188b6
commit d2dfb8ec2039f335386cd1bc2f3e2d9d42fba578
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Wed Mar 10 20:55:37 2021 +0000
Rebuild for new libvmaf version
diff --git a/aom.spec b/aom.spec
index e3f9986..f43cc6b 100644
--- a/aom.spec
+++ b/aom.spec
@@ -19,7 +19,7 @@
Name: aom
Version: 2.0.1
-Release: 4%{?prerelease:.%{snapshotdate}git%{shortcommit}}%{?dist}
+Release: 5%{?prerelease:.%{snapshotdate}git%{shortcommit}}%{?dist}
Summary: Royalty-free next-generation video format
License: BSD
@@ -123,6 +123,9 @@ rm -rf %{buildroot}%{_libdir}/libaom.a
%{_libdir}/pkgconfig/%{name}.pc
%changelog
+* Wed Mar 10 2021 Leigh Scott <leigh123linux(a)gmail.com> - 2.0.1-5
+- Rebuild for new libvmaf version
+
* Tue Jan 26 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.0.1-4
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild