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

11 files changed, 4 insertions, 253 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index d57d01b159d9..a6148cee8a9a 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest
index ead7c4b689d4..b9d8c5d41e64 100644
--- a/media-libs/fontconfig/Manifest
+++ b/media-libs/fontconfig/Manifest
@@ -2,6 +2,7 @@ AUX fontconfig-2.14.0-latin-update.patch 1889 BLAKE2B 42a5faab884bb47e645a8ee6f0
 AUX fontconfig-2.14.0-skip-bubblewrap-tests.patch 408 BLAKE2B 911a87e91dcdf49088e9a684a9af753464211f18fd471989410a57363dd71b7cc0940c9a8e61095d901b4d7ee804536262ebc6afb1af3f470d8cd164d2fd2113 SHA512 8302a3ccf5918c8a4c3af3ab3601752c005c0361003281996eba469195127fab0e99c8d225dcb674a1bc198f2c15b982cce49c6bb3234307cf58e47c9206ff5a
 AUX fontconfig-2.14.2-fix-sysroot-fc-cache.patch 2007 BLAKE2B 91a43c8aec698a9733020031bfded6871d379b20535f6c1291d0d3fa38faaef9e367f0958f6df2b88003190184988dc99f7fa7f013f6837f24b617b83a0d5546 SHA512 73e41f2f19f61514a271141ddb4b640ed3b6060c4ccdcc79a4eefa6a6b4ece0e718012bee4b4b7312561e39ca02cd9663084298000d9cc9aa210c81a16945572
 DIST fontconfig-2.14.2.tar.xz 1440844 BLAKE2B 4efeeb7f9a6705d493128d00b60e681a20a47556f4c0d7787a5c7a6d2cbbc22f150cad7988a9836a9e72aeb61e2b6a196c00a071c7042c62283c7720cdbb743d SHA512 23483e0ae6aa7589fd37f9949a4cf951c5bff981739dbb446881e4cea86a208c0ab31e2358666eac724af1dc6a689a42733a7ce91cd3e76d8d91eacedb318085
-EBUILD fontconfig-2.14.2-r2.ebuild 7093 BLAKE2B 328e5726f312fdfe9404aab4873167ecaba7714f6867ee5d74ed585c1d31243fa72b7ed6fba4d7f353814f7dfb63ea05036ec76809e5f8eb46f31dbe3bf1589c SHA512 5a14e4b9481edda2f67f7dae3fbde51f75960706b68957aaaefe99e2053f14450093a3e23a895cc125b187464bc99219bcde888e0f8fc8057a2efbba5e5aac7c
+DIST fontconfig-2.15.0.tar.xz 1447820 BLAKE2B 17c85fddc4ab84111c4f50afb89ecd8792c3aeaa2690b38fd39fca6f6cece69e9ce0cd3af8a2e54968c79ad1f9bee1e444699a13c068d9dfd3dfe1212ff37533 SHA512 754cd5fffa198fc07a39cf7df683e9adfa7f54ab41fdff8c0eacc078fd35d3e01069ba343f2b045e0b40df88d9f1fc1ee0f7565799f9cb194a59cf95b64c4417
 EBUILD fontconfig-2.14.2-r3.ebuild 7154 BLAKE2B 81361cf13b4f9308935d15333f50883e68fc271562ca0ec6baa0e404e17ae5e89554bfed3541876fba772193dbf0f79417acb10ff64786e1f9006c57c891248f SHA512 a6d69ebbf761748c5443f5475e08b79dd71f907bdd5d9ebaadee2c1d13d5063bdf3641b5d8a94b9969aa8ba813fb3c63be3f24690fb8f25b638a26e677a14592
+EBUILD fontconfig-2.15.0.ebuild 7115 BLAKE2B 33f065c716d3e29e2f0be364b2bcab67b49e145b3071f3f4d4456ca1056ad121552927789ddc31e54bf4a213d945d3ae0d331d336db66f4797290718f58f6976 SHA512 449fc14b6fd366f98f1e2cd9e1d6584c1bd550fd00e2868da8ae3c45a0ab3c5e29739071afa4515f8727767232f4f725ae3703fb513cb91a533cad3685308943
 MISC metadata.xml 672 BLAKE2B d23112b5d408aed97ad68bc9a141a570c22fd6bbf0022e979b7006817ae27bcba21be43558cb42df06f3c280cbed5570c62805bb69be8a64b1f41bd90b200bc0 SHA512 1ff9c1f22b9766127692eec4824ce966f7a7305ddfae0dd1d8b0e5b432926508dd7a898eada6c182e02c985e11c2f9a22f13eac195333ed32952af0e89015e9a
diff --git a/media-libs/fontconfig/fontconfig-2.14.2-r2.ebuild b/media-libs/fontconfig/fontconfig-2.15.0.ebuild
index ddbb23ce8ebb..01f18ac3a8ab 100644
--- a/media-libs/fontconfig/fontconfig-2.14.2-r2.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.15.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 inherit multilib meson-multilib python-any-r1 readme.gentoo-r1
 
 DESCRIPTION="A library for configuring and customizing font access"
@@ -13,7 +13,7 @@ SRC_URI="https://fontconfig.org/release/${P}.tar.xz"
 LICENSE="MIT"
 SLOT="1.0"
 if ! [[ $(ver_cut 3) -ge 90 ]] ; then
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 IUSE="doc nls test"
 RESTRICT="!test? ( test )"
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
-
diff --git a/media-libs/libwebp/Manifest b/media-libs/libwebp/Manifest
index 8773607b8be7..0eaa780ce652 100644
--- a/media-libs/libwebp/Manifest
+++ b/media-libs/libwebp/Manifest
@@ -1,5 +1,4 @@
 AUX libwebp-1.2.3-libpng-pkg-config.patch 1894 BLAKE2B 80c19e65b1f913fdf0e9dd37ca603bcf89bd7dd71cf81ebd8beab6bcf671b76482b3d6d053f53558463c7f3e139897382c90aad5a5cebbd8c49ce4512e7f048c SHA512 3b80c89eb4643a315af594158ca370b71f38ab285cfaa3d1b8d90b09aa420750dccd46f1222b1b9a983af6e9dc501da2d6c732c05a2a3b097ba0437785cc80c7
-AUX libwebp-1.2.4-CVE-2023-1999.patch 1734 BLAKE2B 087b1bb4be5d3aceb7796ecbf497d6dc5396eab4b944d7c29bd15f939c9d891d5b0463770196cae87fa8bce2561e874e00fdaf1c05eada87258546956ca26c0a SHA512 6b108f30b2aa3326d1f4acf69bc7b01145e9a6922bcdaf01d5bd052418b9789706dd3757341a7eb5847e7ef42146fdd0ba7397b66e0003571008de7d88371d8f
 DIST libwebp-1.3.1-p20230908.tar.gz 3690666 BLAKE2B 895c9d384e0b40403940db093f8022fa81e67ce980711e3958d6614bf6aa9c9bd2cb01c1eba02b72028474f662f2ac996b14f0df5029690881053d55016dd9ab SHA512 4f93ef865dd653254089c9fdc8209a3add9a909002fbb56fc0784856dc50a6349c95ca6a06cb26601cd4233a09122009d61ad24e67258b069748ad9bb4da0c80
 DIST libwebp-1.3.1-p20230912.tar.gz 3690965 BLAKE2B f0d913d0b4516989f60345932e9259af1bfc1af85048a54c0aa25c6fdabd5948fcf59173253f9caa6c4b0ab96724b223ab65dabedd20bc9d6722fa4bfa712b38 SHA512 aa53084668cd5c345f4a73bd6c69c2eb411e73c735e5b6a2f76e935ab0f7519e9064bba9405df18c084686e8b95ba2335e2b534253b113c5a03aa63e259f07a8
 DIST libwebp-1.3.2.tar.gz 4162949 BLAKE2B 12b3ff3aa9952dd32ce13656146556d5efb6a66860249a8676721980aee10253a1b0335685a769d995e9954cd305190a8ed1878ba4fefce9dcaf41a3976f9e3d SHA512 2b624d2ecfbff6b4db2719e38f146722638ae262acd96327073a04451dd05fb27ef70c5681187821d251df728a6be7e89209c861c561a13bfb786495a830bc20
diff --git a/media-libs/libwebp/files/libwebp-1.2.4-CVE-2023-1999.patch b/media-libs/libwebp/files/libwebp-1.2.4-CVE-2023-1999.patch
deleted file mode 100644
index 9c023712a5aa..000000000000
--- a/media-libs/libwebp/files/libwebp-1.2.4-CVE-2023-1999.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-commit a486d800b60d0af4cc0836bf7ed8f21e12974129
-Author: James Zern <jzern@google.com>
-Date:   Wed Feb 22 22:15:47 2023 -0800
-
-    EncodeAlphaInternal: clear result->bw on error
-    
-    This avoids a double free should the function fail prior to
-    VP8BitWriterInit() and a previous trial result's buffer carried over.
-    Previously in ApplyFiltersAndEncode() trial.bw (with a previous
-    iteration's buffer) would be freed, followed by best.bw pointing to the
-    same buffer.
-    
-    Since:
-    187d379d add a fallback to ALPHA_NO_COMPRESSION
-    
-    In addition, check the return value of VP8BitWriterInit() in this
-    function.
-    
-    Bug: webp:603
-    Change-Id: Ic258381ee26c8c16bc211d157c8153831c8c6910
-
-diff --git a/src/enc/alpha_enc.c b/src/enc/alpha_enc.c
-index f7c02690..7d205586 100644
---- a/src/enc/alpha_enc.c
-+++ b/src/enc/alpha_enc.c
-@@ -13,6 +13,7 @@
- 
- #include <assert.h>
- #include <stdlib.h>
-+#include <string.h>
- 
- #include "src/enc/vp8i_enc.h"
- #include "src/dsp/dsp.h"
-@@ -148,6 +149,7 @@ static int EncodeAlphaInternal(const uint8_t* const data, int width, int height,
-       }
-     } else {
-       VP8LBitWriterWipeOut(&tmp_bw);
-+      memset(&result->bw, 0, sizeof(result->bw));
-       return 0;
-     }
-   }
-@@ -162,7 +164,7 @@ static int EncodeAlphaInternal(const uint8_t* const data, int width, int height,
-   header = method | (filter << 2);
-   if (reduce_levels) header |= ALPHA_PREPROCESSED_LEVELS << 4;
- 
--  VP8BitWriterInit(&result->bw, ALPHA_HEADER_LEN + output_size);
-+  if (!VP8BitWriterInit(&result->bw, ALPHA_HEADER_LEN + output_size)) ok = 0;
-   ok = ok && VP8BitWriterAppend(&result->bw, &header, ALPHA_HEADER_LEN);
-   ok = ok && VP8BitWriterAppend(&result->bw, output, output_size);
- 
diff --git a/media-libs/x265/Manifest b/media-libs/x265/Manifest
index a1b3d80cea75..36744f8056f1 100644
--- a/media-libs/x265/Manifest
+++ b/media-libs/x265/Manifest
@@ -4,7 +4,6 @@ AUX test-ns.patch 14677 BLAKE2B fa48d03bca5d72b7b3eac7f6ac98c93bde12ec845f9eecdd
 AUX tests.patch 650 BLAKE2B 21759b11966e12df1a72a1ed00935ff781ad8b912e734de65cf0872cf92400aef71d4aebbe067dd1059a1d445cd9819cef4dc4b1c7df63ca7b8e97b8e578045e SHA512 a4a3b69fa86e6910ff4f963b9667c8deaea4ff88f3396e8e426e61d036b12cbf550bff7867657da1ba98417f1ccae88db1887b94ea6271604060e01fb8698d79
 AUX x265-3.3-ppc64.patch 590 BLAKE2B bbc6f18b8f192424450d2860e33ea6dbba14b46876f05cf9c499412d491127c877c342b1900bb9d06d66126aca2f383da1a4986ce69670ebc392fec0fe9b59a9 SHA512 bb4ace2c4bc899a0ccdd17fb78e63980354f41ff0f201812d47c5df16b23fea6fcdbde086e737d0efd5d8cb8fa571a131c03433bec31999c71ff51bccd754950
 AUX x265-9999-arm.patch 2115 BLAKE2B 92f2225fd23030220531e6bfda7a3d4ce197090a7b1d996fe5995885fe332352e3628ca3fe307d2ae7af2d0342b183c5bbe4337201c51fb4092e273eae2f1308 SHA512 602725dc487397466c48d4d0aa09d8d63b3519fc72cd9538e732c2c82f6f3fa9c959f6f29ff3f810fec82dbdf609d9fd37fe05dd67496fc4c8bbda5f87c9f165
-AUX x265-9999-ppc64.patch 385 BLAKE2B c75bd6e0e7c1ded2b4858f4cbacc337d6015a0387a0fa8dab87964f1995e8e39cdce3f69dc2bb0bb338f5df5fff2051ef5dbcd065e59bd4905282349850e92f6 SHA512 5601b0f29136d5b36f237841b4d4ed6ad0d7cdaed559b8b450352d9fb406b1e0c91ccde11b32d7e32b9ebf6622c85aa2ed44c63bf6ebe5a08550a1b24ebe0eb8
 AUX x265-9999-test-ns.patch 14971 BLAKE2B 8750a3a94eefd78dfe082c46634606a1abe4ae1b9cf89971e5532a1fc8d42e8b406ca71ab2dfd3e77bdc589e553e190c423a12b5c1007eae9fe12d86e7603ef7 SHA512 55baf712622acfb0d76eee3b283ba38905327eacb0ce52f202563e7e6c1c8593bcae84acc876c91f36ac22fcc06950ffa181515b58d199821c8d265f309594e7
 DIST x265_3.5.tar.gz 1537044 BLAKE2B 4fe15b762eda08a4379f69df622bef603fed784a237381d5c95876412020c113d053af829fa1eb66468462a6edc0de32dc597b1a98a63e9aa0250a47f4e76d05 SHA512 230e683239c3e262096ba96246c6f67229a1625d163f86647a411733bb1cf349685858aee3017bce818bb6992448d0abaa9241615a5b620561ce47ecb164f997
 EBUILD x265-3.5-r2.ebuild 6342 BLAKE2B 3a5bf8ebedc877d8d69c3021f925fb77559ea682a423438d734953e9960518d9d96672955bf56d7d11409ba734c38edd43f60f25b1f5b666f68de11591fe4370 SHA512 55e41cc836b62aab1c64da0e2b1d5ea35a204bcee5408b47fc732237af394daf419e965fb963c4cba4814b00f2d40ea9ce707aa14f5695b18f5f8dadb43272c6
diff --git a/media-libs/x265/files/x265-9999-ppc64.patch b/media-libs/x265/files/x265-9999-ppc64.patch
deleted file mode 100644
index 8219dabf7c4f..000000000000
--- a/media-libs/x265/files/x265-9999-ppc64.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -49,7 +49,7 @@
- list(FIND X86_ALIASES "${SYSPROC}" X86MATCH)
- list(FIND ARM_ALIASES "${SYSPROC}" ARMMATCH)
- list(FIND ARM64_ALIASES "${SYSPROC}" ARM64MATCH)
--set(POWER_ALIASES ppc64 ppc64le)
-+set(POWER_ALIASES ppc64 ppc64le powerpc64 powerpc64le)
- list(FIND POWER_ALIASES "${SYSPROC}" POWERMATCH)
- if(X86MATCH GREATER "-1")
-     set(X86 1)