diff --git a/README.md b/README.md deleted file mode 100644 index 7342728d557c602f51c6d278bba9f3dd9faaf356..0000000000000000000000000000000000000000 --- a/README.md +++ /dev/null @@ -1,11 +0,0 @@ -Anolis OS -======================================= -# 代码仓库说明 -## 分支说明 ->进行代码开发工作时，请注意选择当前版本对应的分支 -* aX分支为对应大版本的主分支,如a8分支对应当前最新版本 -* aX.Y分支为对应小版本的维护分支，如a8.2分支对应8.2版本 -## 开发流程 -1. 首先fork目标分支到自己的namespace -2. 在自己的fork分支上做出修改 -3. 向对应的仓库中提交merge request，源分支为fork分支 diff --git a/libvpx-1.7.0-leave-fortify-source-on.patch b/libvpx-1.7.0-leave-fortify-source-on.patch new file mode 100644 index 0000000000000000000000000000000000000000..23099da6454c8d673f78811144d555d580dad29a --- /dev/null +++ b/libvpx-1.7.0-leave-fortify-source-on.patch @@ -0,0 +1,12 @@ +diff -up libvpx-1.7.0/build/make/configure.sh.leave-fs-on libvpx-1.7.0/build/make/configure.sh +--- libvpx-1.7.0/build/make/configure.sh.leave-fs-on 2018-01-26 15:02:18.767645332 -0500 ++++ libvpx-1.7.0/build/make/configure.sh 2018-01-26 15:02:28.594420775 -0500 +@@ -1440,7 +1440,7 @@ EOF + + # Work around longjmp interception on glibc >= 2.11, to improve binary + # compatibility. See http://code.google.com/p/webm/issues/detail?id=166 +- enabled linux && check_add_cflags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0 ++ # enabled linux && check_add_cflags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0 + + # Check for strip utility variant + ${STRIP} -V 2>/dev/null | grep GNU >/dev/null && enable_feature gnu_strip diff --git a/libvpx.spec b/libvpx.spec index 7629f55e11775b6e9d4169f20a55536d19235924..5eee2536546ac6e26abfb355bcdcf96bad770210 100644 --- a/libvpx.spec +++ b/libvpx.spec @@ -1,45 +1,38 @@ -%define anolis_release 4 -%global somajor 7 +%define anolis_release 1 +%global somajor 9 %global sominor 0 %global sotiny 0 %global soversion %{somajor}.%{sominor}.%{sotiny} -%ifarch x86_64 -%global vpxtarget x86_64-linux-gcc -%else -%ifarch aarch64 -%global vpxtarget arm64-linux-gcc -%else -%global vpxtarget generic-gnu -%endif -%endif - Name: libvpx Summary: VP8/VP9 Video Codec SDK -Version: 1.12.0 +Version: 1.14.1 Release: %{anolis_release}%{?dist} -License: BSD +License: BSD-3-Clause URL: http://www.webmproject.org/code/ Source0: https://github.com/webmproject/libvpx/archive/v%{version}.tar.gz Source1: vpx_config.h Source2: libvpx.ver -Patch0: CVE-2023-5217.patch -Patch1: CVE-2023-44488.patch -Patch2: CVE-2024-5197.patch - -BuildRequires: make gcc gcc-c++ yasm doxygen php-cli perl(Getopt::Long) +Patch0: libvpx-1.7.0-leave-fortify-source-on.patch +BuildRequires: gcc +BuildRequires: gcc-c++ +BuildRequires: make +%ifarch x86_64 +BuildRequires: nasm +%endif +BuildRequires: doxygen, php-cli, perl(Getopt::Long) %description -libvpx provides the VP8/VP9 SDK, which allows you to integrate your applications -with the VP8 and VP9 video codecs, high quality, royalty free, open source codecs -deployed on millions of computers and devices worldwide. +libvpx provides the VP8/VP9 SDK, which allows you to integrate your applications +with the VP8 and VP9 video codecs, high quality, royalty free, open source codecs +deployed on millions of computers and devices worldwide. %package devel Summary: Development files for libvpx Requires: %{name} = %{EVR} %description devel -Development libraries and headers for developing software against +Development libraries and headers for developing software against libvpx. %package utils @@ -62,6 +55,17 @@ The %{name}-doc package contains documentation files for %{name}. %autosetup -p1 -n libvpx-%{version} %build + +%ifarch x86_64 +%global vpxtarget x86_64-linux-gcc +%else +%ifarch aarch64 +%global vpxtarget arm64-linux-gcc +%else +%global vpxtarget generic-gnu +%endif +%endif + %set_build_flags ./configure --target=%{vpxtarget} \ @@ -71,6 +75,9 @@ The %{name}-doc package contains documentation files for %{name}. --enable-vp9-highbitdepth \ --enable-debug \ --enable-shared \ +%ifarch x86_64 +--as=nasm \ +%endif --enable-install-srcs \ --prefix=%{_prefix} --libdir=%{_libdir} --size-limit=16384x16384 @@ -107,6 +114,8 @@ mv %{buildroot}%{_prefix}/src/vpx_scale %{buildroot}%{_includedir}/ rm -rf %{buildroot}%{_prefix}/src +%ldconfig_scriptlets + %files %license LICENSE %{_libdir}/libvpx.so.%{somajor}* @@ -128,6 +137,9 @@ rm -rf %{buildroot}%{_prefix}/src %doc AUTHORS CHANGELOG README %changelog +* Mon Feb 24 2025 wangzhe - 1.14.1-1 +- Refer to CentOS Stream libvpx-1.14.1-2 (tdawson@redhat.com) + * Fri Sep 20 2024 pangqing - 1.12.0-4 - Fix CVE-2024-5197 diff --git a/v1.12.0.tar.gz b/v1.14.1.tar.gz similarity index 48% rename from v1.12.0.tar.gz rename to v1.14.1.tar.gz index 16213f83b4f75a020a12ef55c823584b42607a10..8fe06221ddb8d36e5e6082c914fdfc76e6359e93 100644 Binary files a/v1.12.0.tar.gz and b/v1.14.1.tar.gz differ