diff --git a/aom.spec b/aom.spec index 7e22576a6683f83db39cd409f1faed229305e2a7..387295625c6416c4ab9afd9a3b260cfb1ae16089 100644 --- a/aom.spec +++ b/aom.spec @@ -1,8 +1,7 @@ -%define anolis_release 3 +%define anolis_release 1 %global sover 3 -# git describe -%global aom_version v3.6.0 +%global aom_version v3.7.1 %ifarch x86_64 %bcond_without vmaf @@ -10,13 +9,13 @@ %bcond_without jpegxl Name: aom -Version: 3.6.0 +Version: 3.7.1 Release: %{anolis_release}%{?dist} Summary: Royalty-free next-generation video format License: BSD-3-Clause URL: http://aomedia.org/ -Source0: https://aomedia.googlesource.com/%{name}/+archive/v%{version}.tar.gz +Source0: v3.7.1.tar.gz BuildRequires: gcc-c++ BuildRequires: gcc @@ -67,14 +66,6 @@ Requires: libaom = %{version}-%{release} Development files for aom, the royalty-free next-generation video format. -%package doc -Summary: Documentation files for %{name} -Requires: %{name} = %{EVR} -BuildArch: noarch - -%description doc -The %{name}-doc package contains documentation files for %{name}. - %prep %autosetup -p1 -c %{name}-%{version} # Set GIT revision in version @@ -83,6 +74,10 @@ sed -i 's@set(aom_version "")@set(aom_version "%{aom_version}")@' build/cmake/ve sed -i "s@GENERATE_LATEX = YES@GENERATE_LATEX = NO@" libs.doxy_template %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 \ @@ -97,26 +92,22 @@ sed -i "s@GENERATE_LATEX = YES@GENERATE_LATEX = NO@" libs.doxy_t %if %{with vmaf} -DCONFIG_TUNE_VMAF=1 \ %endif + %{nil} %cmake3_build %install %cmake3_install rm -rvf %{buildroot}%{_libdir}/libaom.a -%generate_compatibility_deps - %files +%doc AUTHORS CHANGELOG README.md %license LICENSE PATENTS %{_bindir}/aomdec %{_bindir}/aomenc -%{abidir}/aomdec-option.list -%{abidir}/aomenc-option.list %files -n libaom %license LICENSE PATENTS %{_libdir}/libaom.so.%{sover}* -%dir %{abidir} -%{abidir}/libaom.dump %files -n libaom-devel %doc %{_vpath_builddir}/docs/html/ @@ -124,10 +115,10 @@ rm -rvf %{buildroot}%{_libdir}/libaom.a %{_libdir}/libaom.so %{_libdir}/pkgconfig/%{name}.pc -%files doc -%doc AUTHORS CHANGELOG README.md - %changelog +* Thu May 9 2024 Cui lichen - 3.7.1-3 +- Fix for CVE-2023-6879 + * Wed Dec 27 2023 happy_orange - 3.6.0-3 - fix the source error diff --git a/v3.6.0.tar.gz b/v3.7.1.tar.gz similarity index 41% rename from v3.6.0.tar.gz rename to v3.7.1.tar.gz index e653b6ad3345e51535854f974e019acc08e65f45..a94c31cbea8cb97a13250a5b6ecad6ac45742c7b 100644 Binary files a/v3.6.0.tar.gz and b/v3.7.1.tar.gz differ