package/libvpx: bump version to 1.13.1

Removed patch which was backported from upstream and is now included
in this release.

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
[Peter: drop CVE ignore for patch]
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Bernd Kuhls 2023-10-03 14:34:30 +02:00 committed by Peter Korsgaard
parent 5d2f4004d2
commit 07a03a8549
3 changed files with 2 additions and 43 deletions

View File

@ -1,38 +0,0 @@
From 3fbd1dca6a4d2dad332a2110d646e4ffef36d590 Mon Sep 17 00:00:00 2001
From: James Zern <jzern@google.com>
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
Fixes CVE-2023-5217: https://www.cve.org/CVERecord?id=CVE-2023-5217
Upstream: https://github.com/webmproject/libvpx/commit/3fbd1dca6a4d2dad332a2110d646e4ffef36d590
Upstream: https://chromium.googlesource.com/webm/libvpx/+/3fbd1dca6a4d2dad332a2110d646e4ffef36d590
[Bernd: Removed patch for test/encode_api_test.cc]
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
vp8/encoder/onyx_if.c | 5 +++++
1 file changed, 5 insertions(+)
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) {

View File

@ -1,4 +1,4 @@
# Locally computed:
sha256 cb2a393c9c1fae7aba76b950bb0ad393ba105409fe1a147ccd61b0aaa1501066 libvpx-1.13.0.tar.gz
sha256 00dae80465567272abd077f59355f95ac91d7809a2d3006f9ace2637dd429d14 libvpx-1.13.1.tar.gz
sha256 8267348d5af1262c11d1a08de2f5afc77457755f1ac658627dd9acf71011d615 LICENSE
sha256 cc3273e0694ea5896145e0677699b53471b03ea43021ddc50e7923fbb9f5023c PATENTS

View File

@ -4,16 +4,13 @@
#
################################################################################
LIBVPX_VERSION = 1.13.0
LIBVPX_VERSION = 1.13.1
LIBVPX_SITE = $(call github,webmproject,libvpx,v$(LIBVPX_VERSION))
LIBVPX_LICENSE = BSD-3-Clause
LIBVPX_LICENSE_FILES = LICENSE PATENTS
LIBVPX_CPE_ID_VENDOR = webmproject
LIBVPX_INSTALL_STAGING = YES
# 0002-VP8-disallow-thread-count-changes.patch
LIBVPX_IGNORE_CVES += CVE-2023-5217
# ld is being used with cc options. therefore, pretend ld is cc.
LIBVPX_CONF_ENV = \
LD="$(TARGET_CC)" \