diff --git a/aom-9666276.tar.gz b/aom-9666276.tar.gz deleted file mode 100644 index f82a078874bdc97026a75755a0d404dc85141396..0000000000000000000000000000000000000000 Binary files a/aom-9666276.tar.gz and /dev/null differ diff --git a/aom-b681eac.tar.gz b/aom-b681eac.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..07c2c4da8a36f115614b9ecc0b0b7820bdf8ce61 Binary files /dev/null and b/aom-b681eac.tar.gz differ diff --git a/aom.spec b/aom.spec index f55c86fa12faa9fe85a72ac1fb66e143dd52bebe..301c01d58e2fa547aa674542dc88d55852dab924 100644 --- a/aom.spec +++ b/aom.spec @@ -1,15 +1,23 @@ -%global sover 0 +%global sover 3 # git describe -%global aom_version 1.0.0-2227-gcfd59e96a +%global aom_version v3.8.0 + +# No libvmaf on openEuler +#ifarch x86_64 +#bcond_without vmaf +#endif + +# No highway & jpegxl on openEuler +#bcond_without jpegxl # Use commit with updated changelog for correct versioning -%global commit 9666276accea505cd14cbcb9e3f7ff5033da9172 +%global commit b681eac83963950afc7be55df56c22fa5210aaa2 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global snapshotdate 20190810 +%global snapshotdate 20231130 %global prerelease 1 Name: aom -Version: 1.0.0 +Version: 3.8.0 Release: 1 Summary: Royalty-free next-generation video format @@ -18,8 +26,15 @@ URL: http://aomedia.org/ Source0: https://aomedia.googlesource.com/%{name}/+archive/%{commit}.tar.gz#/%{name}-%{shortcommit}.tar.gz BuildRequires: gcc-c++ gcc cmake3 -BuildRequires: doxygen git-core graphviz +BuildRequires: doxygen git-core BuildRequires: perl-interpreter perl(Getopt::Long) perl-interpreter python3-devel yasm +%if %{with jpegxl} +BuildRequires: pkgconfig(libjxl) +BuildRequires: pkgconfig(libhwy) +%endif +%if %{with vmaf} +BuildRequires: pkgconfig(libvmaf) +%endif Provides: av1 = %{version}-%{release} Requires: libaom%{?_isa} = %{version}-%{release} @@ -57,24 +72,36 @@ 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 buggy PDF generation +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 + mkdir _build && cd _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 + -DENABLE_TESTS=0 \ + -DBUILD_SHARED_LIBS=1 \ +%if %{with jpegxl} + -DCONFIG_TUNE_BUTTERAUGLI=1 \ +%endif +%if %{with vmaf} + -DCONFIG_TUNE_VMAF=1 \ +%endif + %{nil} %make_build %install cd _build %make_install +rm -rvf %{buildroot}%{_libdir}/libaom.a %files %doc AUTHORS CHANGELOG README.md @@ -84,7 +111,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/ @@ -93,5 +120,8 @@ cd _build %{_libdir}/pkgconfig/%{name}.pc %changelog +* Wed Dec 20 2023 misaka00251 - 3.8.0-1 +- Upgrade package version to 3.8.0 + * Fri May 07 2021 weidong - 1.0.0-1 - Initial package.