From 884f2ac6347e86e9efcbfba1c867ddeafb9a5b3e Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Tue, 20 Mar 2018 20:41:17 +0000 Subject: [PATCH 01/43] Added the README --- README.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..85cab1a --- /dev/null +++ b/README.md @@ -0,0 +1,3 @@ +# aom + +The aom package \ No newline at end of file From 9cc47c917de38df630537935a4c2f42677340505 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Tue, 26 Jun 2018 02:51:20 +0200 Subject: [PATCH 02/43] Initial import (#1558224) --- .gitignore | 1 + README.md | 3 -- aom.spec | 105 +++++++++++++++++++++++++++++++++++++++++++++++++++++ sources | 1 + 4 files changed, 107 insertions(+), 3 deletions(-) create mode 100644 .gitignore delete mode 100644 README.md create mode 100644 aom.spec create mode 100644 sources diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..5794953 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/aom-1.0.0.tar.gz diff --git a/README.md b/README.md deleted file mode 100644 index 85cab1a..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# aom - -The aom package \ No newline at end of file diff --git a/aom.spec b/aom.spec new file mode 100644 index 0000000..8501374 --- /dev/null +++ b/aom.spec @@ -0,0 +1,105 @@ +%global sover 0 + +Name: aom +Version: 1.0.0 +Release: 1%{?dist} +Summary: Royalty-free next-generation video format + +License: BSD +URL: http://aomedia.org/ +Source0: https://aomedia.googlesource.com/aom/+archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz + +BuildRequires: gcc +BuildRequires: cmake3 +BuildRequires: doxygen +BuildRequires: git-core +BuildRequires: graphviz +BuildRequires: perl-interpreter +BuildRequires: perl(Getopt::Long) +BuildRequires: wxGTK3-devel +BuildRequires: yasm + +Provides: av1 = %{version}-%{release} + + +%description +The Alliance for Open Media’s focus is to deliver a next-generation +video format that is: + + - Interoperable and open; + - Optimized for the Internet; + - 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 + user-generated content. + + +%package devel +Summary: Development files for aom +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description devel +Development files for aom the royalty-free next-generation +video format. + + +%prep +%autosetup -p1 -c %{name}-%{version} + + +%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 \ +%endif + -DCONFIG_WEBM_IO=1 \ + -DENABLE_DOCS=1 \ + -DCONFIG_ANALYZER=1 +%make_build + + +%install +cd build +%make_install +install -pm 0755 examples/analyzer %{buildroot}%{_bindir}/aomanalyzer + + +%ldconfig_scriptlets + + +%files +%doc AUTHORS CHANGELOG README.md +%license LICENSE PATENTS +%{_bindir}/aomanalyzer +%{_bindir}/aomdec +%{_bindir}/aomenc +%{_libdir}/libaom.so.%{sover} + + +%files devel +%doc build/docs/html/ +%{_includedir}/%{name} +%{_libdir}/libaom.so +%{_libdir}/pkgconfig/%{name}.pc + + +%changelog +* Wed Mar 07 2018 Robert-André Mauchin - 1.0.0-1 +- First RPM release + diff --git a/sources b/sources new file mode 100644 index 0000000..4a5a564 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (aom-1.0.0.tar.gz) = 85bca7eff7a247efd0772bcbbba2e8d1bc10390c64551b4a63ecf95b89bca3ad899e4aa04b8cb5d3ed3aaa42ab5e0b7f5612b085106375088062b38a2121d203 From 809ec9f07ed50473081d6136f56fe3776c5e6bc0 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 9 Jul 2018 19:06:42 +0200 Subject: [PATCH 03/43] add BuildRequires: gcc-c++ Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot --- aom.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/aom.spec b/aom.spec index 8501374..c229d89 100644 --- a/aom.spec +++ b/aom.spec @@ -9,6 +9,7 @@ License: BSD URL: http://aomedia.org/ Source0: https://aomedia.googlesource.com/aom/+archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz +BuildRequires: gcc-c++ BuildRequires: gcc BuildRequires: cmake3 BuildRequires: doxygen From 05c2237ec2e8f5441efe6afd305eef3dde14bbd6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 12 Jul 2018 20:17:11 +0000 Subject: [PATCH 04/43] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- aom.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/aom.spec b/aom.spec index c229d89..f7265d4 100644 --- a/aom.spec +++ b/aom.spec @@ -2,7 +2,7 @@ Name: aom Version: 1.0.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Royalty-free next-generation video format License: BSD @@ -101,6 +101,9 @@ install -pm 0755 examples/analyzer %{buildroot}%{_bindir}/aomanalyzer %changelog +* Thu Jul 12 2018 Fedora Release Engineering - 1.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Mar 07 2018 Robert-André Mauchin - 1.0.0-1 - First RPM release From e6e3f6b798b75c48e8cf8b4ec139082eec436bc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Tue, 11 Sep 2018 20:24:23 +0200 Subject: [PATCH 05/43] Update the archive in order to detect the correct version from the changelog --- aom.spec | 23 +++++++++++++++++------ makesrc.sh | 25 +++++++++++++++++++++++++ sources | 2 +- 3 files changed, 43 insertions(+), 7 deletions(-) create mode 100755 makesrc.sh diff --git a/aom.spec b/aom.spec index f7265d4..26c8c9b 100644 --- a/aom.spec +++ b/aom.spec @@ -1,13 +1,21 @@ %global sover 0 +# Use commit with updated changelog for correct versioning +%global commit 0ddc150516b7672101265eac032a11a9aae4cb53 +%global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global snapshotdate 20180911 + Name: aom Version: 1.0.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Royalty-free next-generation video format License: BSD URL: http://aomedia.org/ -Source0: https://aomedia.googlesource.com/aom/+archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz +# 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}-%{version}.tar.gz +Source1: makesrc.sh BuildRequires: gcc-c++ BuildRequires: gcc @@ -46,11 +54,11 @@ video format. %prep -%autosetup -p1 -c %{name}-%{version} +%autosetup -p1 -n %{name}-%{version} %build -cd build +mkdir _build && cd _build %cmake3 ../ -DENABLE_CCACHE=1 \ -DCMAKE_SKIP_RPATH=1 \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ @@ -76,7 +84,7 @@ cd build %install -cd build +cd _build %make_install install -pm 0755 examples/analyzer %{buildroot}%{_bindir}/aomanalyzer @@ -94,13 +102,16 @@ install -pm 0755 examples/analyzer %{buildroot}%{_bindir}/aomanalyzer %files devel -%doc build/docs/html/ +%doc _build/docs/html/ %{_includedir}/%{name} %{_libdir}/libaom.so %{_libdir}/pkgconfig/%{name}.pc %changelog +* Tue Sep 11 2018 Robert-André Mauchin - 1.0.0-3 +- Update the archive in order to detect the correct version from the changelog + * Thu Jul 12 2018 Fedora Release Engineering - 1.0.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/makesrc.sh b/makesrc.sh new file mode 100755 index 0000000..79a7a3a --- /dev/null +++ b/makesrc.sh @@ -0,0 +1,25 @@ +#!/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-$VERSION +git clone https://aomedia.googlesource.com/aom $NAME-$VERSION + +echo "Getting commit..." +pushd $NAME-$VERSION +git checkout $COMMIT +popd + +echo "Archiving..." +tar czf $NAME-$VERSION.tar.gz $NAME-$VERSION/ + +echo "Cleaning..." +rm -rf $NAME-$VERSION + +echo "Done." diff --git a/sources b/sources index 4a5a564..42a6063 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (aom-1.0.0.tar.gz) = 85bca7eff7a247efd0772bcbbba2e8d1bc10390c64551b4a63ecf95b89bca3ad899e4aa04b8cb5d3ed3aaa42ab5e0b7f5612b085106375088062b38a2121d203 +SHA512 (aom-1.0.0.tar.gz) = 467aeaa02dee485a7f8d87abe1ab3ee3c847f355db8897250f300e47c35e678d8aa0e34e1a1faeeda57c0faabb5b2c6f99f0a82e6177dbda51d4d90de6c26d0f From a4a108da3e1f93f0acd2d3d999ac34cfe96e5028 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Thu, 13 Sep 2018 23:29:39 +0200 Subject: [PATCH 06/43] Split the package into libs/tools --- aom.spec | 44 ++++++++++++++++++++++++++++++++++++-------- 1 file changed, 36 insertions(+), 8 deletions(-) diff --git a/aom.spec b/aom.spec index 26c8c9b..1836d56 100644 --- a/aom.spec +++ b/aom.spec @@ -7,7 +7,7 @@ Name: aom Version: 1.0.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Royalty-free next-generation video format License: BSD @@ -29,7 +29,7 @@ BuildRequires: wxGTK3-devel BuildRequires: yasm Provides: av1 = %{version}-%{release} - +Requires: libaom%{?_isa} = %{version}-%{release} %description The Alliance for Open Media’s focus is to deliver a next-generation @@ -42,14 +42,32 @@ video format that is: - Capable of consistent, highest-quality, real-time video delivery; and - 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. -%package devel + +%package -n libaom +Summary: Library files for aom + +%description -n libaom +Library files for aom, the royalty-free next-generation +video format. + + +%package -n libaom-devel Summary: Development files for aom -Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: libaom%{?_isa} = %{version}-%{release} -%description devel -Development files for aom the royalty-free next-generation +%description -n libaom-devel +Development files for aom, the royalty-free next-generation video format. @@ -95,13 +113,20 @@ install -pm 0755 examples/analyzer %{buildroot}%{_bindir}/aomanalyzer %files %doc AUTHORS CHANGELOG README.md %license LICENSE PATENTS -%{_bindir}/aomanalyzer %{_bindir}/aomdec %{_bindir}/aomenc + + +%files extra-tools +%{_bindir}/aomanalyzer + + +%files -n libaom +%license LICENSE PATENTS %{_libdir}/libaom.so.%{sover} -%files devel +%files -n libaom-devel %doc _build/docs/html/ %{_includedir}/%{name} %{_libdir}/libaom.so @@ -109,6 +134,9 @@ install -pm 0755 examples/analyzer %{buildroot}%{_bindir}/aomanalyzer %changelog +* Thu Sep 13 2018 Robert-André Mauchin - 1.0.0-4 +- Split the package into libs/tools + * Tue Sep 11 2018 Robert-André Mauchin - 1.0.0-3 - Update the archive in order to detect the correct version from the changelog From 0f568ab02ea2776958173630d6b4302253bbec96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Tue, 25 Sep 2018 18:00:38 +0200 Subject: [PATCH 07/43] Update to commit d0076f507a6027455540e2e4f25f84ca38803e07 Set CONFIG_LOWBITDEPTH to 1 Fix #1632658 --- .gitignore | 1 + ...ts-needed-by-examples-analyzer-and-e.patch | 45 +++++++++++++++++++ aom.spec | 22 ++++++--- makesrc.sh | 10 ++--- sources | 2 +- 5 files changed, 68 insertions(+), 12 deletions(-) create mode 100644 0001-Add-symbol-exports-needed-by-examples-analyzer-and-e.patch diff --git a/.gitignore b/.gitignore index 5794953..bd22157 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /aom-1.0.0.tar.gz +/aom-d0076f5.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 new file mode 100644 index 0000000..e04fa56 --- /dev/null +++ b/0001-Add-symbol-exports-needed-by-examples-analyzer-and-e.patch @@ -0,0 +1,45 @@ +From 4b90cc60118f0aed08853ae102c560762fb74627 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= +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 1836d56..5ebd1a1 100644 --- a/aom.spec +++ b/aom.spec @@ -1,22 +1,26 @@ %global sover 0 # Use commit with updated changelog for correct versioning -%global commit 0ddc150516b7672101265eac032a11a9aae4cb53 +%global commit d0076f507a6027455540e2e4f25f84ca38803e07 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global snapshotdate 20180911 +%global snapshotdate 20180925 +%global prerelease 1 Name: aom Version: 1.0.0 -Release: 4%{?dist} +Release: 5.%{?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}-%{version}.tar.gz +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 + BuildRequires: gcc-c++ BuildRequires: gcc BuildRequires: cmake3 @@ -72,7 +76,7 @@ video format. %prep -%autosetup -p1 -n %{name}-%{version} +%autosetup -p1 -n %{name}-%{commit} %build @@ -97,7 +101,8 @@ mkdir _build && cd _build %endif -DCONFIG_WEBM_IO=1 \ -DENABLE_DOCS=1 \ - -DCONFIG_ANALYZER=1 + -DCONFIG_ANALYZER=1 \ + -DCONFIG_LOWBITDEPTH=1 %make_build @@ -134,6 +139,11 @@ install -pm 0755 examples/analyzer %{buildroot}%{_bindir}/aomanalyzer %changelog +* Tue Sep 25 2018 Robert-André Mauchin - 1.0.0-5.20180925gitd0076f5 +- Update to commit d0076f507a6027455540e2e4f25f84ca38803e07 +- Set CONFIG_LOWBITDEPTH to 1 +- Fix #1632658 + * Thu Sep 13 2018 Robert-André Mauchin - 1.0.0-4 - Split the package into libs/tools diff --git a/makesrc.sh b/makesrc.sh index 79a7a3a..b382b6e 100755 --- a/makesrc.sh +++ b/makesrc.sh @@ -8,18 +8,18 @@ SHORT=${COMMIT:0:7} echo -e "\nCreate git snapshot\n" echo "Cloning..." -rm -rf $NAME-$VERSION -git clone https://aomedia.googlesource.com/aom $NAME-$VERSION +rm -rf $NAME-$COMMIT +git clone https://aomedia.googlesource.com/aom $NAME-$COMMIT echo "Getting commit..." -pushd $NAME-$VERSION +pushd $NAME-$COMMIT git checkout $COMMIT popd echo "Archiving..." -tar czf $NAME-$VERSION.tar.gz $NAME-$VERSION/ +tar czf $NAME-$SHORT.tar.gz $NAME-$COMMIT/ echo "Cleaning..." -rm -rf $NAME-$VERSION +rm -rf $NAME-$COMMIT echo "Done." diff --git a/sources b/sources index 42a6063..ee5b599 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (aom-1.0.0.tar.gz) = 467aeaa02dee485a7f8d87abe1ab3ee3c847f355db8897250f300e47c35e678d8aa0e34e1a1faeeda57c0faabb5b2c6f99f0a82e6177dbda51d4d90de6c26d0f +SHA512 (aom-d0076f5.tar.gz) = 6fcbe7d76788544f59e1338084d4245077a986308e2405199531ca9b4d24c9b81d5a51e012118d9cedb4e3b813b7a608f8c000e746941c5886a95462f2438369 From 71820f29a6feeb19b4401d5c5d58258f85e3cfb8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 13:24:39 +0000 Subject: [PATCH 08/43] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- aom.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/aom.spec b/aom.spec index 5ebd1a1..ddba547 100644 --- a/aom.spec +++ b/aom.spec @@ -8,7 +8,7 @@ Name: aom Version: 1.0.0 -Release: 5.%{?prerelease:%{snapshotdate}git%{shortcommit}}%{?dist} +Release: 6.%{?prerelease:%{snapshotdate}git%{shortcommit}}%{?dist} Summary: Royalty-free next-generation video format License: BSD @@ -139,6 +139,9 @@ install -pm 0755 examples/analyzer %{buildroot}%{_bindir}/aomanalyzer %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 1.0.0-6.20180925gitd0076f5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Tue Sep 25 2018 Robert-André Mauchin - 1.0.0-5.20180925gitd0076f5 - Update to commit d0076f507a6027455540e2e4f25f84ca38803e07 - Set CONFIG_LOWBITDEPTH to 1 From 7aec743e4540a72b4e15c19201fa9ac412d4850b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jul 2019 18:00:21 +0000 Subject: [PATCH 09/43] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- aom.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/aom.spec b/aom.spec index ddba547..cade6d9 100644 --- a/aom.spec +++ b/aom.spec @@ -8,7 +8,7 @@ Name: aom Version: 1.0.0 -Release: 6.%{?prerelease:%{snapshotdate}git%{shortcommit}}%{?dist} +Release: 7.%{?prerelease:%{snapshotdate}git%{shortcommit}}%{?dist} Summary: Royalty-free next-generation video format License: BSD @@ -139,6 +139,9 @@ install -pm 0755 examples/analyzer %{buildroot}%{_bindir}/aomanalyzer %changelog +* Wed Jul 24 2019 Fedora Release Engineering - 1.0.0-7.20180925gitd0076f5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Thu Jan 31 2019 Fedora Release Engineering - 1.0.0-6.20180925gitd0076f5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 038d7b2164e15c9067af3d2d2e0b50a4d890b218 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Fri, 9 Aug 2019 19:14:23 +0200 Subject: [PATCH 10/43] Update to commit 9666276accea505cd14cbcb9e3f7ff5033da9172 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Robert-André Mauchin --- .gitignore | 2 + ...ts-needed-by-examples-analyzer-and-e.patch | 45 ----------- aom.spec | 76 +++++-------------- makesrc.sh | 25 ------ sources | 2 +- 5 files changed, 23 insertions(+), 127 deletions(-) delete mode 100644 0001-Add-symbol-exports-needed-by-examples-analyzer-and-e.patch delete mode 100755 makesrc.sh 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?= -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#/%{name}-%{shortcommit}.tar.gz 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 Media’s focus is to deliver a next-generation +The Alliance for Open Media’s 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 - 1.0.0-8.20190810git9666276 +- Update to commit 9666276accea505cd14cbcb9e3f7ff5033da9172 + * Wed Jul 24 2019 Fedora Release Engineering - 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 From 7daacb94e9e0aca69a858f203d70fe8f985bf11f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 11:41:25 +0000 Subject: [PATCH 11/43] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- aom.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/aom.spec b/aom.spec index 2dfabaa..16651a4 100644 --- a/aom.spec +++ b/aom.spec @@ -10,7 +10,7 @@ Name: aom Version: 1.0.0 -Release: 8.%{?prerelease:%{snapshotdate}git%{shortcommit}}%{?dist} +Release: 9.%{?prerelease:%{snapshotdate}git%{shortcommit}}%{?dist} Summary: Royalty-free next-generation video format License: BSD @@ -100,6 +100,9 @@ cd _build %{_libdir}/pkgconfig/%{name}.pc %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 1.0.0-9.20190810git9666276 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Fri Aug 09 17:45:23 CEST 2019 Robert-André Mauchin - 1.0.0-8.20190810git9666276 - Update to commit 9666276accea505cd14cbcb9e3f7ff5033da9172 From 26113d9ca6b97317329769cb8ac7d0c2fb7d4728 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Wed, 1 Jul 2020 16:14:20 +0200 Subject: [PATCH 12/43] 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 --- .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 - 2.0.0-1 +- Update to 2.0.0 (#1852847) + * Tue Jan 28 2020 Fedora Release Engineering - 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 From 1cbaf115a6af14fa09dd91358630b9da009eb8ee Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Sat, 18 Jul 2020 16:03:50 -0400 Subject: [PATCH 13/43] Update to new out-of-source build mechanism --- aom.spec | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/aom.spec b/aom.spec index da297c5..3c2cfa4 100644 --- a/aom.spec +++ b/aom.spec @@ -1,3 +1,6 @@ +# Force out of source build +%undefine __cmake_in_source_build + %global sover 2 # git describe %global aom_version v2.0.0 @@ -71,24 +74,24 @@ sed -i 's@set(aom_version "")@set(aom_version "%{aom_version}")@' build/cmake/ve sed -i 's@libvmaf\.a @@' CMakeLists.txt %build -%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 \ +%cmake3 -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 \ + -DCONFIG_TUNE_VMAF=1 \ %endif - %{nil} -%make_build -C _build + %{nil} +%cmake3_build %install -%make_install -C _build +%cmake3_install rm -rf %{buildroot}%{_libdir}/libaom.a %files From 443a9e2e5ef38cc789d0a9150e093069f9d38228 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 12:08:25 +0000 Subject: [PATCH 14/43] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- aom.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/aom.spec b/aom.spec index 3c2cfa4..1e43c37 100644 --- a/aom.spec +++ b/aom.spec @@ -13,7 +13,7 @@ Name: aom Version: 2.0.0 -Release: 1%{?prerelease:.%{snapshotdate}git%{shortcommit}}%{?dist} +Release: 2%{?prerelease:.%{snapshotdate}git%{shortcommit}}%{?dist} Summary: Royalty-free next-generation video format License: BSD @@ -111,6 +111,9 @@ rm -rf %{buildroot}%{_libdir}/libaom.a %{_libdir}/pkgconfig/%{name}.pc %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 2.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Wed Jul 01 14:33:18 CEST 2020 Robert-André Mauchin - 2.0.0-1 - Update to 2.0.0 (#1852847) From 2d629aafc72e78e243869829067d1afdd7dcf964 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Tue, 28 Jul 2020 18:06:40 +0200 Subject: [PATCH 15/43] Fix FTBFS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Robert-André Mauchin --- aom.spec | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/aom.spec b/aom.spec index 1e43c37..78fe9b7 100644 --- a/aom.spec +++ b/aom.spec @@ -13,7 +13,7 @@ Name: aom Version: 2.0.0 -Release: 2%{?prerelease:.%{snapshotdate}git%{shortcommit}}%{?dist} +Release: 3%{?prerelease:.%{snapshotdate}git%{shortcommit}}%{?dist} Summary: Royalty-free next-generation video format License: BSD @@ -74,6 +74,10 @@ sed -i 's@set(aom_version "")@set(aom_version "%{aom_version}")@' build/cmake/ve sed -i 's@libvmaf\.a @@' CMakeLists.txt %build +%ifarch %{arm} +%global optflags %{__global_compiler_flags} -march=armv7-a -mfpu=neon -mtune=cortex-a8 -mabi=aapcs-linux -mfloat-abi=hard +%endif + %cmake3 -DENABLE_CCACHE=1 \ -DCMAKE_SKIP_RPATH=1 \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ @@ -81,9 +85,6 @@ sed -i 's@libvmaf\.a @@' CMakeLists.txt -DENABLE_DOCS=1 \ -DCONFIG_ANALYZER=0 \ -DCONFIG_SHARED=1 \ -%ifarch %{arm} - -DAOM_NEON_INTRIN_FLAG=-mfpu=neon \ -%endif %ifarch x86_64 -DCONFIG_TUNE_VMAF=1 \ %endif @@ -105,12 +106,15 @@ rm -rf %{buildroot}%{_libdir}/libaom.a %{_libdir}/libaom.so.%{sover}* %files -n libaom-devel -%doc _build/docs/html/ +%doc %{_vpath_builddir}/docs/html/ %{_includedir}/%{name} %{_libdir}/libaom.so %{_libdir}/pkgconfig/%{name}.pc %changelog +* Tue Jul 28 16:30:33 CEST 2020 Robert-André Mauchin - 2.0.0-3 +- Fix FTBFS + * Mon Jul 27 2020 Fedora Release Engineering - 2.0.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 4cddc9cd42788114dbdce4b49cc56d5928fb52d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Sat, 5 Dec 2020 21:41:53 +0100 Subject: [PATCH 16/43] Update to 2.0.1 Close rhbz#1852847 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Robert-André Mauchin --- .aom.spec.kate-swp | Bin 0 -> 81 bytes .gitignore | 1 + aom.spec | 12 ++++++++---- sources | 2 +- 4 files changed, 10 insertions(+), 5 deletions(-) create mode 100644 .aom.spec.kate-swp diff --git a/.aom.spec.kate-swp b/.aom.spec.kate-swp new file mode 100644 index 0000000000000000000000000000000000000000..04362ef52e9dfae69fc81f65531223beb00a7617 GIT binary patch literal 81 zcmZQzU=Z?7EJ;-eE>A2_aLdd|RWQ;sU|?Vn3I6?@r{;!2zQvm09jE0@wk(|=&>0*A XlqmsXUXTh;Bo4cwg{hH+iMcBPk~|Z9 literal 0 HcmV?d00001 diff --git a/.gitignore b/.gitignore index 2b2bdf9..b548f5b 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /aom-cfd59e9.tar.gz /aom-9666276.tar.gz /aom-bb35ba9.tar.gz +/aom-b52ee6d.tar.gz diff --git a/aom.spec b/aom.spec index 78fe9b7..53fbe70 100644 --- a/aom.spec +++ b/aom.spec @@ -6,14 +6,14 @@ %global aom_version v2.0.0 # Use commit with updated changelog for correct versioning -%global commit bb35ba9148543f22ba7d8642e4fbd29ae301f5dc +%global commit b52ee6d44adaef8a08f6984390de050d64df9faa %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global snapshotdate 20200701 +%global snapshotdate 20201205 # %%global prerelease 1 Name: aom -Version: 2.0.0 -Release: 3%{?prerelease:.%{snapshotdate}git%{shortcommit}}%{?dist} +Version: 2.0.1 +Release: 1%{?prerelease:.%{snapshotdate}git%{shortcommit}}%{?dist} Summary: Royalty-free next-generation video format License: BSD @@ -112,6 +112,10 @@ rm -rf %{buildroot}%{_libdir}/libaom.a %{_libdir}/pkgconfig/%{name}.pc %changelog +* Sat Dec 05 21:18:20 CET 2020 Robert-André Mauchin - 2.0.1-1 +- Update to 2.0.1 +- Close rhbz#1852847 + * Tue Jul 28 16:30:33 CEST 2020 Robert-André Mauchin - 2.0.0-3 - Fix FTBFS diff --git a/sources b/sources index 667f347..956cebf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (aom-bb35ba9.tar.gz) = 81a6a83f0238436d7673ccc12cb997b734b5b57092d2977b21321cb781ef0f1debe3ca650a95e6ed51d12e7733170b57056d8bd7dbbe9427378eaf7a7337683a +SHA512 (aom-b52ee6d.tar.gz) = ba935b3dd7068ac1cbce35ff16bddbb7b479c4487e5c3f69908c0721f5aa4a7bc97350606d14bc47a1ce0470b8f2325b46aa6b54c8be6dcd2d836e683ebe5084 From 2be5637706938835de44f84a6faca740df427edd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Sat, 5 Dec 2020 21:55:08 +0100 Subject: [PATCH 17/43] Remove temp file MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Robert-André Mauchin --- .aom.spec.kate-swp | Bin 81 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 .aom.spec.kate-swp diff --git a/.aom.spec.kate-swp b/.aom.spec.kate-swp deleted file mode 100644 index 04362ef52e9dfae69fc81f65531223beb00a7617..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 81 zcmZQzU=Z?7EJ;-eE>A2_aLdd|RWQ;sU|?Vn3I6?@r{;!2zQvm09jE0@wk(|=&>0*A XlqmsXUXTh;Bo4cwg{hH+iMcBPk~|Z9 From 863a87071f8c57fa9c53ca02d0d52c423ff3ef6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Tue, 15 Dec 2020 02:13:42 +0100 Subject: [PATCH 18/43] Disable tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Robert-André Mauchin --- aom.spec | 10 +++++++--- sources | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/aom.spec b/aom.spec index 53fbe70..e2f584f 100644 --- a/aom.spec +++ b/aom.spec @@ -3,17 +3,17 @@ %global sover 2 # git describe -%global aom_version v2.0.0 +%global aom_version v2.0.1 # Use commit with updated changelog for correct versioning %global commit b52ee6d44adaef8a08f6984390de050d64df9faa %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global snapshotdate 20201205 +%global snapshotdate 20201215 # %%global prerelease 1 Name: aom Version: 2.0.1 -Release: 1%{?prerelease:.%{snapshotdate}git%{shortcommit}}%{?dist} +Release: 2%{?prerelease:.%{snapshotdate}git%{shortcommit}}%{?dist} Summary: Royalty-free next-generation video format License: BSD @@ -83,6 +83,7 @@ sed -i 's@libvmaf\.a @@' CMakeLists.txt -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCONFIG_WEBM_IO=1 \ -DENABLE_DOCS=1 \ + -DENABLE_TESTS=0 \ -DCONFIG_ANALYZER=0 \ -DCONFIG_SHARED=1 \ %ifarch x86_64 @@ -112,6 +113,9 @@ rm -rf %{buildroot}%{_libdir}/libaom.a %{_libdir}/pkgconfig/%{name}.pc %changelog +* Tue Dec 15 01:26:44 CET 2020 Robert-André Mauchin - 2.0.1-2 +- Disable tests + * Sat Dec 05 21:18:20 CET 2020 Robert-André Mauchin - 2.0.1-1 - Update to 2.0.1 - Close rhbz#1852847 diff --git a/sources b/sources index 956cebf..a6e6b7f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (aom-b52ee6d.tar.gz) = ba935b3dd7068ac1cbce35ff16bddbb7b479c4487e5c3f69908c0721f5aa4a7bc97350606d14bc47a1ce0470b8f2325b46aa6b54c8be6dcd2d836e683ebe5084 +SHA512 (aom-b52ee6d.tar.gz) = 5ea7042c34892bb6b2d5ea0e3ee3f4e903cbfb892677629e0ce1e1cf988dfd62b6526aaee4cff827271eaba3b370a8966b9237feb168a5d4f95e5f2efc82e718 From 2f4211025363e8a1f509b3726ece5b29f94bff6b Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Wed, 20 Jan 2021 12:59:58 +0100 Subject: [PATCH 19/43] Disable vmaf on rhel MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Robert-André Mauchin --- aom.spec | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/aom.spec b/aom.spec index e2f584f..fa13b5d 100644 --- a/aom.spec +++ b/aom.spec @@ -11,9 +11,15 @@ %global snapshotdate 20201215 # %%global prerelease 1 +%if 0%{?rhel} >= 8 +%bcond_with vmaf +%else +%bcond_without vmaf +%endif + Name: aom Version: 2.0.1 -Release: 2%{?prerelease:.%{snapshotdate}git%{shortcommit}}%{?dist} +Release: 3%{?prerelease:.%{snapshotdate}git%{shortcommit}}%{?dist} Summary: Royalty-free next-generation video format License: BSD @@ -30,9 +36,11 @@ BuildRequires: perl-interpreter BuildRequires: perl(Getopt::Long) BuildRequires: python3-devel BuildRequires: yasm +%if %{with vmaf} %ifarch x86_64 BuildRequires: pkgconfig(libvmaf) %endif +%endif Provides: av1 = %{version}-%{release} Requires: libaom%{?_isa} = %{version}-%{release} @@ -86,8 +94,10 @@ sed -i 's@libvmaf\.a @@' CMakeLists.txt -DENABLE_TESTS=0 \ -DCONFIG_ANALYZER=0 \ -DCONFIG_SHARED=1 \ +%if %{with vmaf} %ifarch x86_64 -DCONFIG_TUNE_VMAF=1 \ +%endif %endif %{nil} %cmake3_build @@ -113,6 +123,9 @@ rm -rf %{buildroot}%{_libdir}/libaom.a %{_libdir}/pkgconfig/%{name}.pc %changelog +* Wed Jan 20 2021 Wim Taymans - 2.0.1-3 +- Disable vmaf on rhel + * Tue Dec 15 01:26:44 CET 2020 Robert-André Mauchin - 2.0.1-2 - Disable tests From 2adcb191d9b920f37f673b7b3da1212c8ccc369d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 00:12:22 +0000 Subject: [PATCH 20/43] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- aom.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/aom.spec b/aom.spec index fa13b5d..e3f9986 100644 --- a/aom.spec +++ b/aom.spec @@ -19,7 +19,7 @@ Name: aom Version: 2.0.1 -Release: 3%{?prerelease:.%{snapshotdate}git%{shortcommit}}%{?dist} +Release: 4%{?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 +* Tue Jan 26 2021 Fedora Release Engineering - 2.0.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Jan 20 2021 Wim Taymans - 2.0.1-3 - Disable vmaf on rhel From d2dfb8ec2039f335386cd1bc2f3e2d9d42fba578 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Wed, 10 Mar 2021 20:55:37 +0000 Subject: [PATCH 21/43] Rebuild for new libvmaf version --- aom.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 - 2.0.1-5 +- Rebuild for new libvmaf version + * Tue Jan 26 2021 Fedora Release Engineering - 2.0.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 168ce73164ec37466a0b67372e9f17de190dfb4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Sun, 13 Jun 2021 13:37:14 +0200 Subject: [PATCH 22/43] 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 --- .gitignore | 2 ++ aom.spec | 49 +++++++++++++++++++++++++++++-------------------- sources | 2 +- 3 files changed, 32 insertions(+), 21 deletions(-) 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@libvmaf\.a @@' CMakeLists.txt %build %ifarch %{arm} @@ -93,18 +91,19 @@ sed -i 's@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 - 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 - 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 From d455bac1e01c00fca046becf24e84a1d84f54dfb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 17:41:06 +0000 Subject: [PATCH 24/43] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- aom.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/aom.spec b/aom.spec index 9fc6ef1..8a9d857 100644 --- a/aom.spec +++ b/aom.spec @@ -17,7 +17,7 @@ Name: aom Version: 3.1.1 -Release: 1%{?prerelease:.%{snapshotdate}git%{shortcommit}}%{?dist} +Release: 2%{?prerelease:.%{snapshotdate}git%{shortcommit}}%{?dist} Summary: Royalty-free next-generation video format License: BSD @@ -122,6 +122,9 @@ rm -rvf %{buildroot}%{_libdir}/libaom.a %{_libdir}/pkgconfig/%{name}.pc %changelog +* Wed Jul 21 2021 Fedora Release Engineering - 3.1.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Sun Jun 13 12:47:37 CEST 2021 Robert-André Mauchin - 3.1.1-1 - Update to 3.1.1 - Close: rhbz#1954337 From 0b972c95655ba08fd875d214a42571201a4604c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Sat, 24 Jul 2021 15:54:21 +0200 Subject: [PATCH 25/43] Update to 3.1.2 Close: rhbz#1985106 --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index bb83bb7..29a5c5e 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /aom-b52ee6d.tar.gz /aom-c0f1414.tar.gz /aom-7fadc0e.tar.gz +/aom-ae2be80.tar.gz diff --git a/sources b/sources index 5ca5d8a..5c4c7e5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (aom-7fadc0e.tar.gz) = 16c24e4b62fc3abb67b4f0f1e39bfb56d59a893a50fb3ab7b5689d0ca3ee745e6fe9bafa9672be0833186b46bd473b27997bb47a7ade73363bf28fd4c3c188b6 +SHA512 (aom-ae2be80.tar.gz) = f8bebe9e23bee99c2c76093bd6ee2c0eb2d99420aa768bb87820051fa6990ee392a29e36c837252bfa2811c21d6e97a72245820bc182ca9398e23a2316d9d682 From 2f8237470385f11f5ceb963f0da08ce4388a30b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Sat, 24 Jul 2021 15:56:39 +0200 Subject: [PATCH 26/43] Update to 3.1.2 Close: rhbz#1985106 --- aom.spec | 79 +++++-------------------------------------------------- changelog | 66 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 72 insertions(+), 73 deletions(-) create mode 100644 changelog diff --git a/aom.spec b/aom.spec index 8a9d857..bbeaf5f 100644 --- a/aom.spec +++ b/aom.spec @@ -1,12 +1,11 @@ %global sover 3 # git describe -%global aom_version v3.1.1 +%global aom_version v3.1.2 # Use commit with updated changelog for correct versioning -%global commit 7fadc0e77130efb05f52979b0deaba9b6a1bba6d +%global commit ae2be8030200925895fa6e98bd274ffdb595cbf6 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global snapshotdate 20210613 -# %%global prerelease 1 +%global snapshotdate 20210724 %if 0%{?fedora} %ifarch x86_64 @@ -16,8 +15,8 @@ %endif Name: aom -Version: 3.1.1 -Release: 2%{?prerelease:.%{snapshotdate}git%{shortcommit}}%{?dist} +Version: 3.1.2 +Release: %autorelease Summary: Royalty-free next-generation video format License: BSD @@ -122,70 +121,4 @@ rm -rvf %{buildroot}%{_libdir}/libaom.a %{_libdir}/pkgconfig/%{name}.pc %changelog -* Wed Jul 21 2021 Fedora Release Engineering - 3.1.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Sun Jun 13 12:47:37 CEST 2021 Robert-André Mauchin - 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 - 2.0.1-5 -- Rebuild for new libvmaf version - -* Tue Jan 26 2021 Fedora Release Engineering - 2.0.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Jan 20 2021 Wim Taymans - 2.0.1-3 -- Disable vmaf on rhel - -* Tue Dec 15 01:26:44 CET 2020 Robert-André Mauchin - 2.0.1-2 -- Disable tests - -* Sat Dec 05 21:18:20 CET 2020 Robert-André Mauchin - 2.0.1-1 -- Update to 2.0.1 -- Close rhbz#1852847 - -* Tue Jul 28 16:30:33 CEST 2020 Robert-André Mauchin - 2.0.0-3 -- Fix FTBFS - -* Mon Jul 27 2020 Fedora Release Engineering - 2.0.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Wed Jul 01 14:33:18 CEST 2020 Robert-André Mauchin - 2.0.0-1 -- Update to 2.0.0 (#1852847) - -* Tue Jan 28 2020 Fedora Release Engineering - 1.0.0-9.20190810git9666276 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Fri Aug 09 17:45:23 CEST 2019 Robert-André Mauchin - 1.0.0-8.20190810git9666276 -- Update to commit 9666276accea505cd14cbcb9e3f7ff5033da9172 - -* Wed Jul 24 2019 Fedora Release Engineering - 1.0.0-7.20180925gitd0076f5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Thu Jan 31 2019 Fedora Release Engineering - 1.0.0-6.20180925gitd0076f5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Tue Sep 25 2018 Robert-André Mauchin - 1.0.0-5.20180925gitd0076f5 -- Update to commit d0076f507a6027455540e2e4f25f84ca38803e07 -- Set CONFIG_LOWBITDEPTH to 1 -- Fix #1632658 - -* Thu Sep 13 2018 Robert-André Mauchin - 1.0.0-4 -- Split the package into libs/tools - -* Tue Sep 11 2018 Robert-André Mauchin - 1.0.0-3 -- Update the archive in order to detect the correct version from the changelog - -* Thu Jul 12 2018 Fedora Release Engineering - 1.0.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Mar 07 2018 Robert-André Mauchin - 1.0.0-1 -- First RPM release - +%autochangelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..5b124c9 --- /dev/null +++ b/changelog @@ -0,0 +1,66 @@ +* Wed Jul 21 2021 Fedora Release Engineering - 3.1.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Sun Jun 13 12:47:37 CEST 2021 Robert-André Mauchin - 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 - 2.0.1-5 +- Rebuild for new libvmaf version + +* Tue Jan 26 2021 Fedora Release Engineering - 2.0.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jan 20 2021 Wim Taymans - 2.0.1-3 +- Disable vmaf on rhel + +* Tue Dec 15 01:26:44 CET 2020 Robert-André Mauchin - 2.0.1-2 +- Disable tests + +* Sat Dec 05 21:18:20 CET 2020 Robert-André Mauchin - 2.0.1-1 +- Update to 2.0.1 +- Close rhbz#1852847 + +* Tue Jul 28 16:30:33 CEST 2020 Robert-André Mauchin - 2.0.0-3 +- Fix FTBFS + +* Mon Jul 27 2020 Fedora Release Engineering - 2.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Jul 01 14:33:18 CEST 2020 Robert-André Mauchin - 2.0.0-1 +- Update to 2.0.0 (#1852847) + +* Tue Jan 28 2020 Fedora Release Engineering - 1.0.0-9.20190810git9666276 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Fri Aug 09 17:45:23 CEST 2019 Robert-André Mauchin - 1.0.0-8.20190810git9666276 +- Update to commit 9666276accea505cd14cbcb9e3f7ff5033da9172 + +* Wed Jul 24 2019 Fedora Release Engineering - 1.0.0-7.20180925gitd0076f5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Thu Jan 31 2019 Fedora Release Engineering - 1.0.0-6.20180925gitd0076f5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Tue Sep 25 2018 Robert-André Mauchin - 1.0.0-5.20180925gitd0076f5 +- Update to commit d0076f507a6027455540e2e4f25f84ca38803e07 +- Set CONFIG_LOWBITDEPTH to 1 +- Fix #1632658 + +* Thu Sep 13 2018 Robert-André Mauchin - 1.0.0-4 +- Split the package into libs/tools + +* Tue Sep 11 2018 Robert-André Mauchin - 1.0.0-3 +- Update the archive in order to detect the correct version from the changelog + +* Thu Jul 12 2018 Fedora Release Engineering - 1.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed Mar 07 2018 Robert-André Mauchin - 1.0.0-1 +- First RPM release From f36bb9f3f8d8ebcabd8221ebfe42f3e223a87fe4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Mon, 22 Nov 2021 00:50:22 +0100 Subject: [PATCH 28/43] Update to 3.2.0 Close: rhbz#2009099 --- .gitignore | 1 + aom.spec | 10 +++++----- sources | 1 + 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 29a5c5e..e03deae 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /aom-c0f1414.tar.gz /aom-7fadc0e.tar.gz /aom-ae2be80.tar.gz +/aom-287164d.tar.gz diff --git a/aom.spec b/aom.spec index bbeaf5f..bddab7b 100644 --- a/aom.spec +++ b/aom.spec @@ -1,11 +1,11 @@ %global sover 3 # git describe -%global aom_version v3.1.2 +%global aom_version v3.2.0 # Use commit with updated changelog for correct versioning -%global commit ae2be8030200925895fa6e98bd274ffdb595cbf6 +%global commit 287164de79516c25c8c84fd544f67752c170082a %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global snapshotdate 20210724 +%global snapshotdate 20211013 %if 0%{?fedora} %ifarch x86_64 @@ -15,7 +15,7 @@ %endif Name: aom -Version: 3.1.2 +Version: 3.2.0 Release: %autorelease Summary: Royalty-free next-generation video format @@ -28,7 +28,7 @@ BuildRequires: gcc BuildRequires: cmake3 BuildRequires: doxygen BuildRequires: git-core -BuildRequires: graphviz +# BuildRequires: graphviz BuildRequires: perl-interpreter BuildRequires: perl(Getopt::Long) BuildRequires: python3-devel diff --git a/sources b/sources index 5c4c7e5..d7a96e7 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ +SHA512 (aom-287164d.tar.gz) = f4681f2ec0292baa8862992c9dd875e17189de3880275745fdd2a6bc8ec3130701beb60036c3f7f23d0241cb89dec04af791b220c032a2d23a397e0854e47d39 SHA512 (aom-ae2be80.tar.gz) = f8bebe9e23bee99c2c76093bd6ee2c0eb2d99420aa768bb87820051fa6990ee392a29e36c837252bfa2811c21d6e97a72245820bc182ca9398e23a2316d9d682 From eec59769aaff5a35582fce54259905cadbf39be6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Fri, 17 Dec 2021 15:31:13 +0100 Subject: [PATCH 30/43] Remove old source archive --- sources | 1 - 1 file changed, 1 deletion(-) diff --git a/sources b/sources index d7a96e7..22ed1c8 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ SHA512 (aom-287164d.tar.gz) = f4681f2ec0292baa8862992c9dd875e17189de3880275745fdd2a6bc8ec3130701beb60036c3f7f23d0241cb89dec04af791b220c032a2d23a397e0854e47d39 -SHA512 (aom-ae2be80.tar.gz) = f8bebe9e23bee99c2c76093bd6ee2c0eb2d99420aa768bb87820051fa6990ee392a29e36c837252bfa2811c21d6e97a72245820bc182ca9398e23a2316d9d682 From 2319ca1c90ea2d2db23dd1d0166659f9e1fd38d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Fri, 17 Dec 2021 18:45:33 +0100 Subject: [PATCH 31/43] Adapt for EPEL9 --- aom.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aom.spec b/aom.spec index bddab7b..929b400 100644 --- a/aom.spec +++ b/aom.spec @@ -7,7 +7,7 @@ %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global snapshotdate 20211013 -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} >= 9 %ifarch x86_64 %bcond_without vmaf %endif From 9ef1e07ce9531fdcf80829d2fd2f873af4fecf75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Sun, 19 Jun 2022 18:56:28 +0200 Subject: [PATCH 33/43] Update to 3.4.0 Close: rhbz#2049182, rhbz#2083009 --- .gitignore | 3 +++ aom.spec | 12 +++++++----- sources | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index e03deae..f56ef0a 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,6 @@ /aom-7fadc0e.tar.gz /aom-ae2be80.tar.gz /aom-287164d.tar.gz +/aom-f9babb6.tar.gz +/aom-87460ce.tar.gz +/aom-fc430c5.tar.gz diff --git a/aom.spec b/aom.spec index 929b400..2f1e09b 100644 --- a/aom.spec +++ b/aom.spec @@ -1,21 +1,21 @@ %global sover 3 # git describe -%global aom_version v3.2.0 +%global aom_version v3.3.0 # Use commit with updated changelog for correct versioning -%global commit 287164de79516c25c8c84fd544f67752c170082a +%global commit fc430c57c7b0307b4c5ffb686cd90b3c010d08d2 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global snapshotdate 20211013 +%global snapshotdate 20220619 %if 0%{?fedora} || 0%{?rhel} >= 9 %ifarch x86_64 %bcond_without vmaf %endif -%bcond_without jpegxl +%bcond_with jpegxl %endif Name: aom -Version: 3.2.0 +Version: 3.4.0 Release: %autorelease Summary: Royalty-free next-generation video format @@ -77,6 +77,8 @@ 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 +# Disable PDF generation which is buggy +sed -i "s@GENERATE_LATEX = YES@GENERATE_LATEX = NO@" libs.doxy_template %build %ifarch %{arm} diff --git a/sources b/sources index 22ed1c8..265d501 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (aom-287164d.tar.gz) = f4681f2ec0292baa8862992c9dd875e17189de3880275745fdd2a6bc8ec3130701beb60036c3f7f23d0241cb89dec04af791b220c032a2d23a397e0854e47d39 +SHA512 (aom-fc430c5.tar.gz) = 993a74dfd2d8ecc99bceb0222fbcdb462e4c3e02f01f4327d7b3d28c1d0a24e93b0f6525d715e3767eb4fff8a1fb30a8c8c3f9245b6978b99540871ab2387fcb From 06ebe4eb56208f2e8530d69af297d8ee69990586 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Sun, 19 Jun 2022 22:37:13 +0200 Subject: [PATCH 34/43] Fix aom_version variable --- aom.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aom.spec b/aom.spec index 2f1e09b..ecafc6f 100644 --- a/aom.spec +++ b/aom.spec @@ -1,6 +1,6 @@ %global sover 3 # git describe -%global aom_version v3.3.0 +%global aom_version v3.4.0 # Use commit with updated changelog for correct versioning %global commit fc430c57c7b0307b4c5ffb686cd90b3c010d08d2 From bcfaeddf2f1004143a25d62eb880402529abf088 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Sun, 9 Oct 2022 21:19:27 +0200 Subject: [PATCH 36/43] Update to 3.5.0 Close: rhbz#2132949 --- .gitignore | 1 + aom.spec | 8 ++++---- sources | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index f56ef0a..b603c1f 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /aom-f9babb6.tar.gz /aom-87460ce.tar.gz /aom-fc430c5.tar.gz +/aom-3.5.0.tar.gz diff --git a/aom.spec b/aom.spec index ecafc6f..12ceb38 100644 --- a/aom.spec +++ b/aom.spec @@ -1,6 +1,6 @@ %global sover 3 # git describe -%global aom_version v3.4.0 +%global aom_version v3.5.0 # Use commit with updated changelog for correct versioning %global commit fc430c57c7b0307b4c5ffb686cd90b3c010d08d2 @@ -15,13 +15,13 @@ %endif Name: aom -Version: 3.4.0 +Version: 3.5.0 Release: %autorelease Summary: Royalty-free next-generation video format License: BSD URL: http://aomedia.org/ -Source0: https://aomedia.googlesource.com/%{name}/+archive/%{commit}.tar.gz#/%{name}-%{shortcommit}.tar.gz +Source0: https://aomedia.googlesource.com/%{name}/+archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz BuildRequires: gcc-c++ BuildRequires: gcc @@ -74,7 +74,7 @@ Development files for aom, the royalty-free next-generation video format. %prep -%autosetup -p1 -c %{name}-%{commit} +%autosetup -p1 -c %{name}-%{version} # Set GIT revision in version sed -i 's@set(aom_version "")@set(aom_version "%{aom_version}")@' build/cmake/version.cmake # Disable PDF generation which is buggy diff --git a/sources b/sources index 265d501..1a3e0b0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (aom-fc430c5.tar.gz) = 993a74dfd2d8ecc99bceb0222fbcdb462e4c3e02f01f4327d7b3d28c1d0a24e93b0f6525d715e3767eb4fff8a1fb30a8c8c3f9245b6978b99540871ab2387fcb +SHA512 (aom-3.5.0.tar.gz) = 4a772351a51f2758695e54c1cddbed95ff2f815f367b3f347b0f3b6c14e87890bd624d507e8091f9475943c4ca61f8dfeb95ec3f11ca225307f3c83873edbf34 From a1960ad98bde6cc4d2a7746ef794fb485f99f1da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Sat, 19 Nov 2022 22:24:06 +0100 Subject: [PATCH 37/43] Enable JPEGXL dependency --- aom.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/aom.spec b/aom.spec index 12ceb38..1407470 100644 --- a/aom.spec +++ b/aom.spec @@ -11,7 +11,7 @@ %ifarch x86_64 %bcond_without vmaf %endif -%bcond_with jpegxl +%bcond_without jpegxl %endif Name: aom @@ -19,7 +19,7 @@ Version: 3.5.0 Release: %autorelease Summary: Royalty-free next-generation video format -License: BSD +License: BSD-3-Clause URL: http://aomedia.org/ Source0: https://aomedia.googlesource.com/%{name}/+archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz From c26ee404fc6c7787689a7263103dcb9aabab9196 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Sat, 18 Mar 2023 18:53:09 +0100 Subject: [PATCH 39/43] Update to 3.6.0 Close: rhbz#2162146 --- .gitignore | 1 + aom.spec | 4 ++-- sources | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index b603c1f..5322611 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /aom-87460ce.tar.gz /aom-fc430c5.tar.gz /aom-3.5.0.tar.gz +/aom-3.6.0.tar.gz diff --git a/aom.spec b/aom.spec index 1407470..3a96d61 100644 --- a/aom.spec +++ b/aom.spec @@ -1,6 +1,6 @@ %global sover 3 # git describe -%global aom_version v3.5.0 +%global aom_version v3.6.0 # Use commit with updated changelog for correct versioning %global commit fc430c57c7b0307b4c5ffb686cd90b3c010d08d2 @@ -15,7 +15,7 @@ %endif Name: aom -Version: 3.5.0 +Version: 3.6.0 Release: %autorelease Summary: Royalty-free next-generation video format diff --git a/sources b/sources index 1a3e0b0..1491848 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (aom-3.5.0.tar.gz) = 4a772351a51f2758695e54c1cddbed95ff2f815f367b3f347b0f3b6c14e87890bd624d507e8091f9475943c4ca61f8dfeb95ec3f11ca225307f3c83873edbf34 +SHA512 (aom-3.6.0.tar.gz) = d90e661d0f5ecf14c1b474ad83a5d283922db0a2afdee4f0996ca1611be036fd1d220932bb025049d6e6a19f10d546d4fe9895e6b63701a51f215040712a87d1 From 40f771cc93a3bc814098d13371677f662e504dd0 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Thu, 15 Jun 2023 22:22:22 +0200 Subject: [PATCH 41/43] Update to version 3.6.1; Fixes RHBZ#2193518 --- .gitignore | 1 + aom.spec | 4 ++-- sources | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 5322611..6f7b465 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /aom-fc430c5.tar.gz /aom-3.5.0.tar.gz /aom-3.6.0.tar.gz +/aom-3.6.1.tar.gz diff --git a/aom.spec b/aom.spec index 3a96d61..d9e0f13 100644 --- a/aom.spec +++ b/aom.spec @@ -1,6 +1,6 @@ %global sover 3 # git describe -%global aom_version v3.6.0 +%global aom_version v3.6.1 # Use commit with updated changelog for correct versioning %global commit fc430c57c7b0307b4c5ffb686cd90b3c010d08d2 @@ -15,7 +15,7 @@ %endif Name: aom -Version: 3.6.0 +Version: 3.6.1 Release: %autorelease Summary: Royalty-free next-generation video format diff --git a/sources b/sources index 1491848..7fe82bc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (aom-3.6.0.tar.gz) = d90e661d0f5ecf14c1b474ad83a5d283922db0a2afdee4f0996ca1611be036fd1d220932bb025049d6e6a19f10d546d4fe9895e6b63701a51f215040712a87d1 +SHA512 (aom-3.6.1.tar.gz) = e69e3734452be56857cc903000ca7d7c4bfd1110030fb58902ebda127ba04024fd60b209a2323d0945c0c4335c2dbb61a2d7dc57c7b6c6ec44280b2f215699bf From fe0a0f7b93a03e4cce78f826eb559c1d073fd895 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Fri, 1 Sep 2023 21:26:03 +0200 Subject: [PATCH 43/43] Update to version 3.7.0; Fixes RHBZ#2236624 --- .gitignore | 1 + aom.spec | 10 ++-------- sources | 2 +- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 6f7b465..49543fc 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /aom-3.5.0.tar.gz /aom-3.6.0.tar.gz /aom-3.6.1.tar.gz +/aom-3.7.0.tar.gz diff --git a/aom.spec b/aom.spec index d9e0f13..ecfbe16 100644 --- a/aom.spec +++ b/aom.spec @@ -1,11 +1,5 @@ %global sover 3 -# git describe -%global aom_version v3.6.1 - -# Use commit with updated changelog for correct versioning -%global commit fc430c57c7b0307b4c5ffb686cd90b3c010d08d2 -%global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global snapshotdate 20220619 +%global aom_version v3.7.0 %if 0%{?fedora} || 0%{?rhel} >= 9 %ifarch x86_64 @@ -15,7 +9,7 @@ %endif Name: aom -Version: 3.6.1 +Version: 3.7.0 Release: %autorelease Summary: Royalty-free next-generation video format diff --git a/sources b/sources index 7fe82bc..3d4a2b7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (aom-3.6.1.tar.gz) = e69e3734452be56857cc903000ca7d7c4bfd1110030fb58902ebda127ba04024fd60b209a2323d0945c0c4335c2dbb61a2d7dc57c7b6c6ec44280b2f215699bf +SHA512 (aom-3.7.0.tar.gz) = b142c03fb6ab1792f32e18dacc394d67308546f1c41379cd7e4c7afc80cc8f5bd562a6ec5e2733774e27891258df89e9c9e706e578baaee7c7e83071fe4d629f