diff --git a/media-libs/libvpx/files/libvpx-1.12.0-configure-clang16.patch b/media-libs/libvpx/files/libvpx-1.12.0-configure-clang16.patch deleted file mode 100644 index bb815b8878854..0000000000000 --- a/media-libs/libvpx/files/libvpx-1.12.0-configure-clang16.patch +++ /dev/null @@ -1,37 +0,0 @@ -https://chromium-review.googlesource.com/c/webm/libvpx/+/4004627 - -From 62dee8012ea70a9f0628471609c5768f98a1e726 Mon Sep 17 00:00:00 2001 -From: Sam James -Date: Sun, 6 Nov 2022 04:11:59 +0000 -Subject: [PATCH] build: fix -Wimplicit-int (Clang 16) - -Clang 16 will make -Wimplicit-int error by default which can, in addition to -other things, lead to some configure tests silently failing/returning the wrong result. - -Fixes this error: -``` -+/var/tmp/portage/media-libs/libvpx-1.12.0/temp/vpx-conf-1802-30624.c:1:15: error: type specifier missing, defaults to 'int'; ISO C99 and later do not support implicit int [-Wimplicit-int] -``` - -For more information, see LWN.net [0] or LLVM's Discourse [1], gentoo-dev@ [2], -or the (new) c-std-porting mailing list [3]. - -[0] https://lwn.net/Articles/913505/ -[1] https://discourse.llvm.org/t/configure-script-breakage-with-the-new-werror-implicit-function-declaration/65213 -[2] https://archives.gentoo.org/gentoo-dev/message/dd9f2d3082b8b6f8dfbccb0639e6e240 -[3] hosted at lists.linux.dev. - -Bug: https://bugs.gentoo.org/879705 -Change-Id: Id73a98944ab3c99a368b9da7a5e902ddff9d937f -Signed-off-by: Sam James ---- a/build/make/configure.sh -+++ b/build/make/configure.sh -@@ -1511,7 +1511,7 @@ EOF - - # Try to find which inline keywords are supported - check_cc < -Date: Mon, 25 Sep 2023 18:55:59 -0700 -Subject: [PATCH 2/2] 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 -(cherry picked from commit 3fbd1dca6a4d2dad332a2110d646e4ffef36d590) -(cherry picked from commit 7aaffe2df4c9426ab204a272ca5ca52286ca86d4) ---- - test/encode_api_test.cc | 4 ---- - vp8/encoder/onyx_if.c | 5 +++++ - 2 files changed, 5 insertions(+), 4 deletions(-) - -diff --git a/test/encode_api_test.cc b/test/encode_api_test.cc -index 02aedc057..e0e793b15 100644 ---- a/test/encode_api_test.cc -+++ b/test/encode_api_test.cc -@@ -366,10 +366,6 @@ TEST(EncodeAPI, ConfigResizeChangeThreadCount) { - - for (const auto *iface : kCodecIfaces) { - SCOPED_TRACE(vpx_codec_iface_name(iface)); -- if (!IsVP9(iface)) { -- GTEST_SKIP() << "TODO(https://crbug.com/1486441) remove this condition " -- "after VP8 is fixed."; -- } - for (int i = 0; i < (IsVP9(iface) ? 2 : 1); ++i) { - vpx_codec_enc_cfg_t cfg = {}; - struct Encoder { -diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c -index 4bbeadef0..148a16cc4 100644 ---- a/vp8/encoder/onyx_if.c -+++ b/vp8/encoder/onyx_if.c -@@ -1443,6 +1443,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) { --- -2.42.0 - diff --git a/media-libs/libvpx/files/libvpx-1.13.0-encode_api_test-add-ConfigResizeChangeThreadCount.patch b/media-libs/libvpx/files/libvpx-1.13.0-encode_api_test-add-ConfigResizeChangeThreadCount.patch deleted file mode 100644 index 17aa33567cc37..0000000000000 --- a/media-libs/libvpx/files/libvpx-1.13.0-encode_api_test-add-ConfigResizeChangeThreadCount.patch +++ /dev/null @@ -1,94 +0,0 @@ -https://bugs.gentoo.org/914875 - -From 2f6c3a33e89e504ab3bef0aa847dc053f3355093 Mon Sep 17 00:00:00 2001 -From: James Zern -Date: Mon, 25 Sep 2023 18:53:41 -0700 -Subject: [PATCH 1/2] encode_api_test: add ConfigResizeChangeThreadCount - -Update thread counts and resolution to ensure allocations are updated -correctly. VP8 is disabled to avoid a crash. - -Bug: chromium:1486441 -Change-Id: Ie89776d9818d27dc351eff298a44c699e850761b -(cherry picked from commit af6dedd715f4307669366944cca6e0417b290282) -(cherry picked from commit 972691e9af302f0bc14998e78a6d54f7861c92e5) ---- - test/encode_api_test.cc | 50 ++++++++++++++++++++++++++++++++++++++++- - 1 file changed, 49 insertions(+), 1 deletion(-) - -diff --git a/test/encode_api_test.cc b/test/encode_api_test.cc -index ecdf92834..02aedc057 100644 ---- a/test/encode_api_test.cc -+++ b/test/encode_api_test.cc -@@ -304,7 +304,6 @@ TEST(EncodeAPI, SetRoi) { - - void InitCodec(const vpx_codec_iface_t &iface, int width, int height, - vpx_codec_ctx_t *enc, vpx_codec_enc_cfg_t *cfg) { -- ASSERT_EQ(vpx_codec_enc_config_default(&iface, cfg, 0), VPX_CODEC_OK); - cfg->g_w = width; - cfg->g_h = height; - cfg->g_lag_in_frames = 0; -@@ -342,6 +341,7 @@ TEST(EncodeAPI, ConfigChangeThreadCount) { - vpx_codec_ctx_t ctx = {}; - } enc; - -+ ASSERT_EQ(vpx_codec_enc_config_default(iface, &cfg, 0), VPX_CODEC_OK); - EXPECT_NO_FATAL_FAILURE( - InitCodec(*iface, kWidth, kHeight, &enc.ctx, &cfg)); - if (IsVP9(iface)) { -@@ -360,4 +360,52 @@ TEST(EncodeAPI, ConfigChangeThreadCount) { - } - } - -+TEST(EncodeAPI, ConfigResizeChangeThreadCount) { -+ constexpr int kInitWidth = 1024; -+ constexpr int kInitHeight = 1024; -+ -+ for (const auto *iface : kCodecIfaces) { -+ SCOPED_TRACE(vpx_codec_iface_name(iface)); -+ if (!IsVP9(iface)) { -+ GTEST_SKIP() << "TODO(https://crbug.com/1486441) remove this condition " -+ "after VP8 is fixed."; -+ } -+ for (int i = 0; i < (IsVP9(iface) ? 2 : 1); ++i) { -+ vpx_codec_enc_cfg_t cfg = {}; -+ struct Encoder { -+ ~Encoder() { EXPECT_EQ(vpx_codec_destroy(&ctx), VPX_CODEC_OK); } -+ vpx_codec_ctx_t ctx = {}; -+ } enc; -+ -+ ASSERT_EQ(vpx_codec_enc_config_default(iface, &cfg, 0), VPX_CODEC_OK); -+ // Start in threaded mode to ensure resolution and thread related -+ // allocations are updated correctly across changes in resolution and -+ // thread counts. See https://crbug.com/1486441. -+ cfg.g_threads = 4; -+ EXPECT_NO_FATAL_FAILURE( -+ InitCodec(*iface, kInitWidth, kInitHeight, &enc.ctx, &cfg)); -+ if (IsVP9(iface)) { -+ EXPECT_EQ(vpx_codec_control_(&enc.ctx, VP9E_SET_TILE_COLUMNS, 6), -+ VPX_CODEC_OK); -+ EXPECT_EQ(vpx_codec_control_(&enc.ctx, VP9E_SET_ROW_MT, i), -+ VPX_CODEC_OK); -+ } -+ -+ cfg.g_w = 1000; -+ cfg.g_h = 608; -+ EXPECT_EQ(vpx_codec_enc_config_set(&enc.ctx, &cfg), VPX_CODEC_OK) -+ << vpx_codec_error_detail(&enc.ctx); -+ -+ cfg.g_w = 16; -+ cfg.g_h = 720; -+ -+ for (const auto threads : { 1, 4, 8, 6, 2, 1 }) { -+ cfg.g_threads = threads; -+ EXPECT_NO_FATAL_FAILURE(EncodeWithConfig(cfg, &enc.ctx)) -+ << "iteration: " << i << " threads: " << threads; -+ } -+ } -+ } -+} -+ - } // namespace --- -2.42.0 -