From 8b7a0548f917d92fe6484908b29d9f45d72b4370 Mon Sep 17 00:00:00 2001 From: Mohammed Anas Date: Tue, 28 Nov 2023 00:07:42 +0000 Subject: [PATCH] libvpx: update to 1.13.1. --- srcpkgs/libvpx/patches/CVE-2023-5217.patch | 27 ---------------------- srcpkgs/libvpx/template | 12 ++++++---- 2 files changed, 8 insertions(+), 31 deletions(-) delete mode 100644 srcpkgs/libvpx/patches/CVE-2023-5217.patch diff --git a/srcpkgs/libvpx/patches/CVE-2023-5217.patch b/srcpkgs/libvpx/patches/CVE-2023-5217.patch deleted file mode 100644 index 92c7c67c89da2..0000000000000 --- a/srcpkgs/libvpx/patches/CVE-2023-5217.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 3fbd1dca6a4d2dad332a2110d646e4ffef36d590 Mon Sep 17 00:00:00 2001 -From: James Zern -Date: Mon, 25 Sep 2023 18:55:59 -0700 -Subject: [PATCH] VP8: disallow thread count changes - -Currently allocations are done at encoder creation time. Going from -threaded to non-threaded would cause a crash. - -Bug: chromium:1486441 -Change-Id: Ie301c2a70847dff2f0daae408fbef1e4d42e73d4 - -diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c -index c65afc643bf..c5e9970c3cc 100644 ---- a/vp8/encoder/onyx_if.c -+++ b/vp8/encoder/onyx_if.c -@@ -1447,6 +1447,11 @@ void vp8_change_config(VP8_COMP *cpi, VP8_CONFIG *oxcf) { - last_h = cpi->oxcf.Height; - prev_number_of_layers = cpi->oxcf.number_of_layers; - -+ if (cpi->initial_width) { -+ // TODO(https://crbug.com/1486441): Allow changing thread counts; the -+ // allocation is done once in vp8_create_compressor(). -+ oxcf->multi_threaded = cpi->oxcf.multi_threaded; -+ } - cpi->oxcf = *oxcf; - - switch (cpi->oxcf.Mode) { diff --git a/srcpkgs/libvpx/template b/srcpkgs/libvpx/template index 913d5aa526b21..5396304fb990e 100644 --- a/srcpkgs/libvpx/template +++ b/srcpkgs/libvpx/template @@ -2,15 +2,19 @@ # updates generally break abi, so if you update this, # have fun rebuilding everything pkgname=libvpx -version=1.13.0 +version=1.13.1 revision=1 -hostmakedepends="perl yasm" +hostmakedepends="perl" short_desc="VP8 and VP9 video codec" maintainer="Orphaned " license="BSD-3-Clause-Clear" homepage="http://www.webmproject.org" distfiles="https://github.com/webmproject/libvpx/archive/v${version}.tar.gz" -checksum=cb2a393c9c1fae7aba76b950bb0ad393ba105409fe1a147ccd61b0aaa1501066 +checksum=00dae80465567272abd077f59355f95ac91d7809a2d3006f9ace2637dd429d14 + +case "$XBPS_TARGET_MACHINE" in + x86_64* | i686*) hostmakedepends+=" yasm" ;; +esac do_configure() { export LD="$CC" @@ -26,7 +30,7 @@ do_configure() { CFLAGS+=" -fPIC" ./configure --enable-vp8 --enable-vp9 \ - --enable-experimental \ + --enable-experimental --disable-unit-tests \ --enable-runtime-cpu-detect --enable-shared \ --enable-postproc --enable-pic --disable-install-docs \ --disable-install-srcs --as=yasm ${args} --target=${target}