diff --git a/aom-bb64304.tar.gz b/aom-3.8.3.tar.gz similarity index 43% rename from aom-bb64304.tar.gz rename to aom-3.8.3.tar.gz index 76a26d67c15ec732165f3a669174d38d760d65c2..3541fd6a7d1fb71cda509e4c1b9fbc8be57d4182 100644 Binary files a/aom-bb64304.tar.gz and b/aom-3.8.3.tar.gz differ diff --git a/aom.spec b/aom.spec index 4ca3c242f936b899f1400b5e4ed58d2a779660ed..b196c94acf57f021c04efca08009b3c11af24e4d 100644 --- a/aom.spec +++ b/aom.spec @@ -1,6 +1,6 @@ +%undefine __cmake_in_source_build + %global sover 3 -# git describe -%global aom_version v3.8.1 # No libvmaf on openEuler #ifarch x86_64 @@ -10,25 +10,19 @@ # No highway & jpegxl on openEuler #bcond_without jpegxl -# Use commit with updated changelog for correct versioning -%global commit bb6430482199eaefbeaaa396600935082bc43f66 -%global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global snapshotdate 20231130 -%global prerelease 1 - Name: aom -Version: 3.8.1 -Release: 2 +Version: 3.8.3 +Release: 1 Summary: Royalty-free next-generation video format -License: BSD +License: BSD-3-Clause 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 Patch01: Fix-integer-overflows-in-calc-of-stride_in_bytes.patch Patch02: Avoid-integer-overflows-in-align_image_dimension.patch -BuildRequires: gcc-c++ gcc cmake3 +BuildRequires: gcc-c++ gcc cmake BuildRequires: doxygen git-core BuildRequires: perl-interpreter perl(Getopt::Long) perl-interpreter python3-devel yasm %if %{with jpegxl} @@ -72,9 +66,9 @@ 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 +sed -i 's@set(aom_version "")@set(aom_version "v%{version}")@' build/cmake/version.cmake # Disable buggy PDF generation sed -i "s@GENERATE_LATEX = YES@GENERATE_LATEX = NO@" libs.doxy_template @@ -83,8 +77,7 @@ sed -i "s@GENERATE_LATEX = YES@GENERATE_LATEX = NO@" libs.doxy_t %global optflags %{__global_compiler_flags} -march=armv7-a -mfpu=neon -mtune=cortex-a8 -mabi=aapcs-linux -mfloat-abi=hard %endif -mkdir _build && cd _build -%cmake3 ../ -DENABLE_CCACHE=1 \ +%cmake -DENABLE_CCACHE=1 \ -DCMAKE_SKIP_RPATH=1 \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCONFIG_WEBM_IO=1 \ @@ -99,11 +92,10 @@ mkdir _build && cd _build -DCONFIG_TUNE_VMAF=1 \ %endif %{nil} -%make_build +%cmake_build %install -cd _build -%make_install +%cmake_install rm -rvf %{buildroot}%{_libdir}/libaom.a %files @@ -117,12 +109,16 @@ rm -rvf %{buildroot}%{_libdir}/libaom.a %{_libdir}/libaom.so.%{sover}* %files -n libaom-devel -%doc _build/docs/html/ +%doc %{__cmake_builddir}/docs/html/ %{_includedir}/%{name} %{_libdir}/libaom.so %{_libdir}/pkgconfig/%{name}.pc %changelog +* Wed Aug 07 2024 Funda Wang - 3.8.3-1 +- update to 3.8.3 +- force out-of-source build + * Thu Jun 06 2024 yinyongkang - 3.8.1-2 - fix CVE-2024-5171