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=038d7b2164e15c....
Change:
-%ifarch x86_64
Thanks.
Full change:
============
commit 038d7b2164e15c9067af3d2d2e0b50a4d890b218
Author: Robert-Andr Mauchin <zebob.m(a)gmail.com>
Date: Fri Aug 9 19:14:23 2019 +0200
Update to commit 9666276accea505cd14cbcb9e3f7ff5033da9172
Signed-off-by: Robert-Andr Mauchin <zebob.m(a)gmail.com>
diff --git a/.gitignore b/.gitignore
index bd22157..aeb4c9f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
/aom-1.0.0.tar.gz
/aom-d0076f5.tar.gz
+/aom-cfd59e9.tar.gz
+/aom-9666276.tar.gz
diff --git a/0001-Add-symbol-exports-needed-by-examples-analyzer-and-e.patch
b/0001-Add-symbol-exports-needed-by-examples-analyzer-and-e.patch
deleted file mode 100644
index e04fa56..0000000
--- a/0001-Add-symbol-exports-needed-by-examples-analyzer-and-e.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 4b90cc60118f0aed08853ae102c560762fb74627 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= <zebob.m(a)gmail.com>
-Date: Fri, 14 Sep 2018 23:17:10 +0200
-Subject: [PATCH] Add symbol exports needed by examples/analyzer and
- examples/inspect
-
-Added to aom/exports_com:
-aom_free
-
-Added to av1/exports_com:
-ifd_init
-ifd_inspect
-
-BUG= aomedia:2161
-
-Change-Id: Ide307b949c886fa8a0398e200980c80b58e3e74e
----
- aom/exports_com | 1 +
- av1/exports_com | 2 ++
- 2 files changed, 3 insertions(+)
-
-diff --git a/aom/exports_com b/aom/exports_com
-index 2798bd51a..cf99bc5d9 100644
---- a/aom/exports_com
-+++ b/aom/exports_com
-@@ -9,6 +9,7 @@ text aom_codec_iface_name
- text aom_codec_version
- text aom_codec_version_extra_str
- text aom_codec_version_str
-+text aom_free
- text aom_img_alloc
- text aom_img_alloc_with_border
- text aom_img_flip
-diff --git a/av1/exports_com b/av1/exports_com
-index 5c8e0e09d..e49e0dc5f 100644
---- a/av1/exports_com
-+++ b/av1/exports_com
-@@ -1,2 +1,4 @@
- text aom_read_obu_header_and_size
- text av1_resize_frame420
-+text ifd_init
-+text ifd_inspect
---
-2.17.1
-
diff --git a/aom.spec b/aom.spec
index cade6d9..2dfabaa 100644
--- a/aom.spec
+++ b/aom.spec
@@ -1,25 +1,21 @@
%global sover 0
+# git describe
+%global aom_version 1.0.0-2227-gcfd59e96a
# Use commit with updated changelog for correct versioning
-%global commit d0076f507a6027455540e2e4f25f84ca38803e07
+%global commit 9666276accea505cd14cbcb9e3f7ff5033da9172
%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global snapshotdate 20180925
+%global snapshotdate 20190810
%global prerelease 1
Name: aom
Version: 1.0.0
-Release: 7.%{?prerelease:%{snapshotdate}git%{shortcommit}}%{?dist}
+Release: 8.%{?prerelease:%{snapshotdate}git%{shortcommit}}%{?dist}
Summary: Royalty-free next-generation video format
License: BSD
URL:
http://aomedia.org/
-# We want to keep the git data for versioning aom.pc correctly
-# so we can't download the archive directly from the repo.
-Source0: %{name}-%{shortcommit}.tar.gz
-Source1: makesrc.sh
-
-#
https://bugs.chromium.org/p/aomedia/issues/detail?id=2161
-Patch0: 0001-Add-symbol-exports-needed-by-examples-analyzer-and-e.patch
+Source0:
https://aomedia.googlesource.com/%{name}/+archive/%{commit}.tar.gz#/%{nam...
BuildRequires: gcc-c++
BuildRequires: gcc
@@ -29,14 +25,14 @@ BuildRequires: git-core
BuildRequires: graphviz
BuildRequires: perl-interpreter
BuildRequires: perl(Getopt::Long)
-BuildRequires: wxGTK3-devel
+BuildRequires: python3-devel
BuildRequires: yasm
Provides: av1 = %{version}-%{release}
Requires: libaom%{?_isa} = %{version}-%{release}
%description
-The Alliance for Open Medias focus is to deliver a next-generation
+The Alliance for Open Medias focus is to deliver a next-generation
video format that is:
- Interoperable and open;
@@ -44,76 +40,48 @@ video format that is:
- Scalable to any modern device at any bandwidth;
- Designed with a low computational footprint and optimized for hardware;
- Capable of consistent, highest-quality, real-time video delivery; and
- - Flexible for both commercial and non-commercial content, including
+ - Flexible for both commercial and non-commercial content, including
user-generated content.
-
-This package contains the reference encoder and decoder.
-
-
-%package extra-tools
-Summary: Extra tools for aom
-Requires: aom%{?_isa} = %{version}-%{release}
-%description extra-tools
-This package contains the aom analyzer.
+This package contains the reference encoder and decoder.
-
%package -n libaom
Summary: Library files for aom
%description -n libaom
-Library files for aom, the royalty-free next-generation
+Library files for aom, the royalty-free next-generation
video format.
-
%package -n libaom-devel
Summary: Development files for aom
Requires: libaom%{?_isa} = %{version}-%{release}
%description -n libaom-devel
-Development files for aom, the royalty-free next-generation
+Development files for aom, the royalty-free next-generation
video format.
-
%prep
-%autosetup -p1 -n %{name}-%{commit}
-
+%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
%build
mkdir _build && cd _build
%cmake3 ../ -DENABLE_CCACHE=1 \
-DCMAKE_SKIP_RPATH=1 \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-%ifnarch aarch64 %{arm} %{ix86} x86_64
- -DAOM_TARGET_CPU=generic \
-%endif
%ifarch %{arm}
- -DAOM_TARGET_CPU=arm \
-%endif
-%ifarch aarch64
- -DAOM_TARGET_CPU=arm64 \
-%endif
-%ifarch %{ix86}
- -DAOM_TARGET_CPU=x86 \
-%endif
-%ifarch x86_64
- -DAOM_TARGET_CPU=x86_64 \
+ -DAOM_NEON_INTRIN_FLAG=-mfpu=neon \
%endif
-DCONFIG_WEBM_IO=1 \
-DENABLE_DOCS=1 \
- -DCONFIG_ANALYZER=1 \
+ -DCONFIG_ANALYZER=0 \
-DCONFIG_LOWBITDEPTH=1
%make_build
-
%install
cd _build
%make_install
-install -pm 0755 examples/analyzer %{buildroot}%{_bindir}/aomanalyzer
-
-
-%ldconfig_scriptlets
-
%files
%doc AUTHORS CHANGELOG README.md
@@ -121,24 +89,20 @@ install -pm 0755 examples/analyzer
%{buildroot}%{_bindir}/aomanalyzer
%{_bindir}/aomdec
%{_bindir}/aomenc
-
-%files extra-tools
-%{_bindir}/aomanalyzer
-
-
%files -n libaom
%license LICENSE PATENTS
%{_libdir}/libaom.so.%{sover}
-
%files -n libaom-devel
%doc _build/docs/html/
%{_includedir}/%{name}
%{_libdir}/libaom.so
%{_libdir}/pkgconfig/%{name}.pc
-
%changelog
+* Fri Aug 09 17:45:23 CEST 2019 Robert-Andr Mauchin <zebob.m(a)gmail.com> -
1.0.0-8.20190810git9666276
+- Update to commit 9666276accea505cd14cbcb9e3f7ff5033da9172
+
* Wed Jul 24 2019 Fedora Release Engineering <releng(a)fedoraproject.org> -
1.0.0-7.20180925gitd0076f5
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
diff --git a/makesrc.sh b/makesrc.sh
deleted file mode 100755
index b382b6e..0000000
--- a/makesrc.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-
-NAME=$(basename $PWD)
-VERSION=$(sed -n '/^Version:/{s/.* //;p}' $NAME.spec)
-COMMIT=$(sed -n '/^%global commit/{s/.* //;p}' $NAME.spec)
-SHORT=${COMMIT:0:7}
-
-echo -e "\nCreate git snapshot\n"
-
-echo "Cloning..."
-rm -rf $NAME-$COMMIT
-git clone
https://aomedia.googlesource.com/aom $NAME-$COMMIT
-
-echo "Getting commit..."
-pushd $NAME-$COMMIT
-git checkout $COMMIT
-popd
-
-echo "Archiving..."
-tar czf $NAME-$SHORT.tar.gz $NAME-$COMMIT/
-
-echo "Cleaning..."
-rm -rf $NAME-$COMMIT
-
-echo "Done."
diff --git a/sources b/sources
index ee5b599..3c810c7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (aom-d0076f5.tar.gz) =
6fcbe7d76788544f59e1338084d4245077a986308e2405199531ca9b4d24c9b81d5a51e012118d9cedb4e3b813b7a608f8c000e746941c5886a95462f2438369
+SHA512 (aom-9666276.tar.gz) =
2c979cd2d1229016e5a6336993144d7b5161fd2f2e8b3023177be3d954c2abade5bb17957e4aeeeedd6132fbaf5e2daf79f0cdddf3ad625213dc267761490d7c