From 183edfd73cf0fac4068c80247b3542f21a325810 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 1/3] 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 | 4 ++ aom.spec | 135 +++++++++++++++++++++++++++++++++++++++++++++++++++++ sources | 1 + 3 files changed, 140 insertions(+) create mode 100644 .gitignore create mode 100644 aom.spec create mode 100644 sources diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..aeb4c9f --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +/aom-1.0.0.tar.gz +/aom-d0076f5.tar.gz +/aom-cfd59e9.tar.gz +/aom-9666276.tar.gz diff --git a/aom.spec b/aom.spec new file mode 100644 index 0000000..9c8faa8 --- /dev/null +++ b/aom.spec @@ -0,0 +1,135 @@ +%global sover 0 +# git describe +%global aom_version 1.0.0-2227-gcfd59e96a + +# Use commit with updated changelog for correct versioning +%global commit 9666276accea505cd14cbcb9e3f7ff5033da9172 +%global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global snapshotdate 20190810 +%global prerelease 1 + +Name: aom +Version: 1.0.0 +Release: 8.%{?prerelease:%{snapshotdate}git%{shortcommit}}%{?dist} +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 + +BuildRequires: gcc-c++ +BuildRequires: gcc +BuildRequires: cmake3 +BuildRequires: doxygen +BuildRequires: git-core +BuildRequires: graphviz +BuildRequires: perl-interpreter +BuildRequires: perl(Getopt::Long) +BuildRequires: python3-devel +BuildRequires: yasm + +# EPEL7 GCC 8 +BuildRequires: devtoolset-8-toolchain +BuildRequires: scl-utils + +Provides: av1 = %{version}-%{release} +Requires: libaom%{?_isa} = %{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. + +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 +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 +video format. + +%prep +%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 +do_build () { +%cmake3 ../ -DENABLE_CCACHE=1 \ + -DCMAKE_SKIP_RPATH=1 \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ +%ifarch %{arm} + -DAOM_NEON_INTRIN_FLAG=-mfpu=neon \ +%endif + -DCONFIG_WEBM_IO=1 \ + -DENABLE_DOCS=1 \ + -DCONFIG_ANALYZER=0 \ + -DCONFIG_LOWBITDEPTH=1 +%make_build +} +export -f do_build +scl enable devtoolset-8 do_build + +%install +cd _build +%make_install + +%files +%doc AUTHORS CHANGELOG README.md +%license LICENSE PATENTS +%{_bindir}/aomdec +%{_bindir}/aomenc + +%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 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 diff --git a/sources b/sources new file mode 100644 index 0000000..3c810c7 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (aom-9666276.tar.gz) = 2c979cd2d1229016e5a6336993144d7b5161fd2f2e8b3023177be3d954c2abade5bb17957e4aeeeedd6132fbaf5e2daf79f0cdddf3ad625213dc267761490d7c From 9e8f55fa4505950d5f79bc5adc237857e26d9cd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Tue, 10 Sep 2019 22:43:58 +0200 Subject: [PATCH 2/3] Fix python3 version for EPEL7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Robert-André Mauchin --- aom.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aom.spec b/aom.spec index 9c8faa8..2df6423 100644 --- a/aom.spec +++ b/aom.spec @@ -25,7 +25,7 @@ BuildRequires: git-core BuildRequires: graphviz BuildRequires: perl-interpreter BuildRequires: perl(Getopt::Long) -BuildRequires: python3-devel +BuildRequires: python%{python3_pkgversion}-devel BuildRequires: yasm # EPEL7 GCC 8 From edb4a42d85b80cef210f0da84609ee9ceb90c9a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Sun, 13 Jun 2021 18:36:09 +0200 Subject: [PATCH 3/3] 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 | 1 + aom.spec | 83 +++++++++++++++++++++++++++++++++++++----------------- sources | 2 +- 3 files changed, 59 insertions(+), 27 deletions(-) diff --git a/.gitignore b/.gitignore index aeb4c9f..3b2b0d1 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /aom-d0076f5.tar.gz /aom-cfd59e9.tar.gz /aom-9666276.tar.gz +/aom-7fadc0e.tar.gz diff --git a/aom.spec b/aom.spec index 2df6423..d23d29d 100644 --- a/aom.spec +++ b/aom.spec @@ -1,16 +1,25 @@ -%global sover 0 +%undefine __cmake3_in_source_build + +%global sover 3 # git describe -%global aom_version 1.0.0-2227-gcfd59e96a +%global aom_version v3.1.1 # Use commit with updated changelog for correct versioning -%global commit 9666276accea505cd14cbcb9e3f7ff5033da9172 +%global commit 7fadc0e77130efb05f52979b0deaba9b6a1bba6d %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global snapshotdate 20190810 -%global prerelease 1 +%global snapshotdate 20210613 +# %%global prerelease 1 + +%if 0%{?fedora} +%ifarch x86_64 +%bcond_without vmaf +%endif +%bcond_without jpegxl +%endif Name: aom -Version: 1.0.0 -Release: 8.%{?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 @@ -20,13 +29,18 @@ Source0: https://aomedia.googlesource.com/%{name}/+archive/%{commit}.tar.gz#/ BuildRequires: gcc-c++ BuildRequires: gcc BuildRequires: cmake3 -BuildRequires: doxygen BuildRequires: git-core -BuildRequires: graphviz BuildRequires: perl-interpreter BuildRequires: perl(Getopt::Long) -BuildRequires: python%{python3_pkgversion}-devel +BuildRequires: python3-devel BuildRequires: yasm +%if %{with jpegxl} +BuildRequires: pkgconfig(libjxl) +BuildRequires: pkgconfig(libhwy) +%endif +%if %{with vmaf} +BuildRequires: pkgconfig(libvmaf) +%endif # EPEL7 GCC 8 BuildRequires: devtoolset-8-toolchain @@ -66,30 +80,38 @@ 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 %build -mkdir _build && cd _build -do_build () { -%cmake3 ../ -DENABLE_CCACHE=1 \ - -DCMAKE_SKIP_RPATH=1 \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo \ %ifarch %{arm} - -DAOM_NEON_INTRIN_FLAG=-mfpu=neon \ +%global optflags %{__global_compiler_flags} -march=armv7-a -mfpu=neon -mtune=cortex-a8 -mabi=aapcs-linux -mfloat-abi=hard %endif - -DCONFIG_WEBM_IO=1 \ - -DENABLE_DOCS=1 \ - -DCONFIG_ANALYZER=0 \ - -DCONFIG_LOWBITDEPTH=1 -%make_build + +do_build () { +%cmake3 -DENABLE_CCACHE=1 \ + -DCMAKE_SKIP_RPATH=1 \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCONFIG_WEBM_IO=1 \ + -DENABLE_DOCS=1 \ + -DENABLE_TESTS=0 \ + -DCONFIG_ANALYZER=0 \ + -DBUILD_SHARED_LIBS=1 \ +%if %{with jpegxl} + -DCONFIG_TUNE_BUTTERAUGLI=1 \ +%endif +%if %{with vmaf} + -DCONFIG_TUNE_VMAF=1 \ +%endif + %{nil} +%cmake3_build } export -f do_build scl enable devtoolset-8 do_build %install -cd _build -%make_install +%cmake3_install +rm -rvf %{buildroot}%{_libdir}/libaom.a %files %doc AUTHORS CHANGELOG README.md @@ -99,15 +121,24 @@ cd _build %files -n libaom %license LICENSE PATENTS -%{_libdir}/libaom.so.%{sover} +%{_libdir}/libaom.so.%{sover}* %files -n libaom-devel -%doc _build/docs/html/ %{_includedir}/%{name} %{_libdir}/libaom.so %{_libdir}/pkgconfig/%{name}.pc %changelog +* Sun Jun 13 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 + * Fri Aug 09 2019 Robert-André Mauchin - 1.0.0-8.20190810git9666276 - Update to commit 9666276accea505cd14cbcb9e3f7ff5033da9172 diff --git a/sources b/sources index 3c810c7..5ca5d8a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (aom-9666276.tar.gz) = 2c979cd2d1229016e5a6336993144d7b5161fd2f2e8b3023177be3d954c2abade5bb17957e4aeeeedd6132fbaf5e2daf79f0cdddf3ad625213dc267761490d7c +SHA512 (aom-7fadc0e.tar.gz) = 16c24e4b62fc3abb67b4f0f1e39bfb56d59a893a50fb3ab7b5689d0ca3ee745e6fe9bafa9672be0833186b46bd473b27997bb47a7ade73363bf28fd4c3c188b6