gentoo auto-resync : 28:12:2023 - 01:37:43

4 files changed, 0 insertions, 187 deletions

diff --git a/media-libs/libvpx/Manifest b/media-libs/libvpx/Manifest
index cb47752e72e1..b3a111397328 100644
--- a/media-libs/libvpx/Manifest
+++ b/media-libs/libvpx/Manifest
@@ -1,6 +1,3 @@
-AUX libvpx-1.12.0-configure-clang16.patch 1466 BLAKE2B e13ec892716dcd9c3940fe955a9e0feddca7ab2af5fbdfd1be6443f2d87b341e626de036244793a403e6ff18080413d2c728e5af88cdb44fb2deab95a422c70b SHA512 86180645d90be302253ac3285bb32764c783a42794f45294ece8647d77f677385afce7b633bad3b5d92c095fe607b8b566fbba960391cf3ed8157884bd5ef1c7
-AUX libvpx-1.13.0-VP8-disallow-thread-count-changes.patch 1888 BLAKE2B fde61e53d8e10a3868504177d2d501ed677ceb5a3d5dd8d8c3a0a3a1b3f3f2edb1b4c31feffa6ae10b28d87f30ff0970bec75d6526743913a930651ed158ac71 SHA512 82d5119cff69896bdf8179c35cef767f83b12f9912f7032ae8f1762ef35c92a318e37e70ad9f78a4e1566b473245fe6c93ac9fe0695ef451a3910fd28e9c81fb
-AUX libvpx-1.13.0-encode_api_test-add-ConfigResizeChangeThreadCount.patch 3352 BLAKE2B e20a9075c41da85f8dcdf94d3970198266ae8467c5f2742ed71d3c7b37660420cb7f37b9b4c28dc45fd5348de4ef7d1fd9ce826b6971c048f993cd8dd126a39e SHA512 bad341f03950142049645d7b0e27520edd11cf5dc944397df87049c2b55d0c708bbe42fd56c5f1a086a7fb4398663fc632730c77a1e0544d577453089c603758
 AUX libvpx-1.13.1-allow-fortify-source.patch 843 BLAKE2B 551b2dbb1805bdb17438be0b5b4720a5ad3aeb0d37b70ff338975e3ff83f433f1437f8a6a2eb2b1527c027fae0e0461a550ee0c8c3a3f68d57308baf4bc3de7f SHA512 55dfbd54ffe5fd81f720da046b7f78dce5323bcac18f6b1af552019ad53207b779298cf27c3728bdd725bf6271dc44cf8c452d9f02f80272c282a0f63d7b9712
 AUX libvpx-1.3.0-sparc-configure.patch 406 BLAKE2B 02b1f0484a9659fdc90eb567db517a8b63f679521ae9ab510bfaa88b9fd5e1430d0eceeb8e4a138b00cb43ac4a1db6451dd29a808367973dc885fe5b9eacd665 SHA512 159ba5577fc0eee3e958740d8607a7570f374a8f64a36f1e7832a126482ec0bb96ba2be451eefdf50d84a412a2be73ae75da3d69da78ec13dfe0e24a14685035
 DIST libvpx-1.13.1.tar.gz 5515662 BLAKE2B f7e2fa2880a11c7e40fed8ab5efe843346c351b8de8725aa6803cdebdf9c1253e26992fe3ffed3a68710674765b4d2aec2cce06d22885b722e728d03eaf916f7 SHA512 49706838563c92fab7334376848d0f374efcbc1729ef511e967c908fd2ecd40e8d197f1d85da6553b3a7026bdbc17e5a76595319858af26ce58cb9a4c3854897
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 bb815b887885..000000000000
--- 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 <sam@gentoo.org>
-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 <sam@gentoo.org>
---- 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 <<EOF && INLINE="inline"
--static inline function() {}
-+static inline int function(void) {}
- EOF
- 
-   # Almost every platform uses pthreads.
diff --git a/media-libs/libvpx/files/libvpx-1.13.0-VP8-disallow-thread-count-changes.patch b/media-libs/libvpx/files/libvpx-1.13.0-VP8-disallow-thread-count-changes.patch
deleted file mode 100644
index bdaea724f817..000000000000
--- a/media-libs/libvpx/files/libvpx-1.13.0-VP8-disallow-thread-count-changes.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-https://bugs.gentoo.org/914875
-
-From 4e4bbfbd414d738b7114194c5d06b45b415486b8 Mon Sep 17 00:00:00 2001
-From: James Zern <jzern@google.com>
-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 17aa33567cc3..000000000000
--- 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 <jzern@google.com>
-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
-