13 files changed, 367 insertions, 5 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 62885172a285..350d10c68b33 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/alsa-ucm-conf/Manifest b/media-libs/alsa-ucm-conf/Manifest
index 09e9ddf12d92..658cadbae47d 100644
--- a/media-libs/alsa-ucm-conf/Manifest
+++ b/media-libs/alsa-ucm-conf/Manifest
@@ -1,7 +1,9 @@
+AUX alsa-ucm-conf-1.2.10-fix-splitpcm.patch 734 BLAKE2B 66264d2cf2e479d530233708c92964c931dd5fd6e9e9ff3fca4d2253fea5261c55ed675b283b54ac60bbd0a444eaed8b421a3a7c7babd6c95537c8f6551a44e8 SHA512 6492b18cfe1a14ed7b2306ca3b0221060144ecc7cbfd9da4d5b397c0cce243383f4c91ccf554127d63b42ccf39c2db47e42150e2c3d35eccd4b5691182f1a209
 AUX alsa-ucm-conf-1.2.9-fix-sof-essx8336.patch 653 BLAKE2B 0b985d5767f5e6f842a16da92af4d3b5c3461d7d201e1469dd1d15c47bd7f053579d8aa949c53c39246c8007ea15626a0aa5731cb84d319a29ad78956cb1276e SHA512 889b374a66a8f373c74ec5e2fa1dc40b78f4b6f7c9f3c2edb15ddc896ae3f61b403dfe4ed777d1e5ea167411b6eee4302342ba6a55b0305cd7bea7c70744112f
 DIST alsa-ucm-conf-1.2.10.tar.bz2 44749 BLAKE2B 215842f1f59c2dea5e3f3fe880dc49d6263998746a50c2591b8a9786ead3afae2c713e179ff6e8caa518b3a8516a1b031872c1fad2a17fbd3afbb0390a803693 SHA512 172956a2c127e9afa5be9c6ada43bfa9fda825823f8f6acbe252edef3381afe3adfa3299c1419f04375599be7721a551c6800be99db44b091611aeb824ffcd72
 DIST alsa-ucm-conf-1.2.8.tar.bz2 37843 BLAKE2B f2281a3a5d8b4fcbc4c75ce99a911a4ce3230abfa6f6d0aff8e175fe1b870750f43c087339490ed9f4d5ab314fda391e06e41cbed79239a16326a8f2d02ac262 SHA512 a15a9ca52c108ee95a421b91f3fad4329f1e9fb1c004a40d5ff1a57d6701bad19a31d5a296426d26439be9b87d2d543ce51588a98402d24c17f0f92aaf1096ca
 DIST alsa-ucm-conf-1.2.9.tar.bz2 42802 BLAKE2B fe71790aa8658ab12378baa55f95a03aaebd3eb0aef2535b65b89884de6cb404a75b44fd238d2089e0a005ca81720f3c44d1912452908e97aa75fcda513908cf SHA512 3aced4d4df76044a5525f1217851e05f7ad177389d2008e3e3dd0fb4d2cf72cd0897b140659a7729cc37d5b737c2d0cf5b607df4f576647044accd560d8cb87b
+EBUILD alsa-ucm-conf-1.2.10-r1.ebuild 569 BLAKE2B 4a4aa5377346f6a58fe03e22b2ee5ab39ba0f2791d958b05b4779ba19f1b0303f24fb1c159abde1039794289da53881fd31611914cead71c119d7bb8a00d13f0 SHA512 d52a824364e059cbd0fa197b8db97494de09cbc8ed5d7be27dcb143807f7291c942b7af3a88a29d9836e649bcf4ac300cd0734f77162a8167be75ae40901a218
 EBUILD alsa-ucm-conf-1.2.10.ebuild 517 BLAKE2B 4ea775cacec644c89a60ce552b4de539b67a1f735743b28ee9ca21d8db8e769a5259b5f1bae8fee42ca41f3c71de79bfb2bcdda6175a64e2b398522625579a47 SHA512 0294299c46a27c7eb09a53f2d91176c5b2d62493842f48328e0f423a289f5f255f563ee387f531f37798834e79245fa95cd7a0160d1582b8030261f1469f6e7f
 EBUILD alsa-ucm-conf-1.2.8.ebuild 517 BLAKE2B 86309cde65282c8d01ea47e2bf1d7e12e0e141bc7289b9af6deee856267175e907db7b40d111b891982f0457ad60d7e1f24b5528c9b003da46b677627939d4b4 SHA512 6b8e3406d1eaeb6a5dc3361ed1a4ec8e22ec039eb3236d6c10370e2323441db025dd4993b897051c021d6eecc4643b68d152c58558202d32214a8336ea03feb3
 EBUILD alsa-ucm-conf-1.2.9.ebuild 565 BLAKE2B 9bebd76bfc410f61aea5ee7474a114e83fa5f6d5712aec297a48272755a87ce54bd5d43a86c17c804c194abf480978ea9e6700d32495eb12c36024ff2320161e SHA512 f7382f60831faabeb2b9fc6360f057bc6310e0c5a8dcbce9b3ad41a938c61a4a9ccab89ff4c8b4ca6dc3ac310704425ed058055fe707e9a3c66e33224216063e
diff --git a/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.10-r1.ebuild b/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.10-r1.ebuild
new file mode 100644
index 000000000000..0cbde8c51eee
--- /dev/null
+++ b/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.10-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="ALSA ucm configuration files"
+HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
+SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="!<media-libs/alsa-lib-1.2.1"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-splitpcm.patch
+)
+
+src_install() {
+	insinto /usr/share/alsa
+	doins -r ucm{,2}
+}
diff --git a/media-libs/alsa-ucm-conf/files/alsa-ucm-conf-1.2.10-fix-splitpcm.patch b/media-libs/alsa-ucm-conf/files/alsa-ucm-conf-1.2.10-fix-splitpcm.patch
new file mode 100644
index 000000000000..35202a4454b3
--- /dev/null
+++ b/media-libs/alsa-ucm-conf/files/alsa-ucm-conf-1.2.10-fix-splitpcm.patch
@@ -0,0 +1,21 @@
+https://github.com/alsa-project/alsa-ucm-conf/commit/b68aa52acdd2763fedad5eec0f435fbf43e5ccc6
+
+From b68aa52acdd2763fedad5eec0f435fbf43e5ccc6 Mon Sep 17 00:00:00 2001
+From: Jaroslav Kysela <perex@perex.cz>
+Date: Mon, 4 Sep 2023 16:39:52 +0200
+Subject: [PATCH] SplitPCM: Device argument may not be set
+
+Link: https://github.com/alsa-project/alsa-ucm-conf/issues/346
+Fixes: 10967ea ("SplitPCM: Fix Device variable in SplitPCMDevice macro")
+Signed-off-by: Jaroslav Kysela <perex@perex.cz>
+--- a/ucm2/common/pcm/split.conf
++++ b/ucm2/common/pcm/split.conf
+@@ -326,7 +326,7 @@ DefineMacro.SplitPCMDevice {
+ 	If.0 {
+ 		Condition {
+ 			Type String
+-			Empty "${var:__Device}"
++			Empty "${var:-__Device}"
+ 		}
+ 		True.Define.__Device "0"
+ 	}
diff --git a/media-libs/libaom/Manifest b/media-libs/libaom/Manifest
index b6a72b943d9b..3b53fd60d78e 100644
--- a/media-libs/libaom/Manifest
+++ b/media-libs/libaom/Manifest
@@ -1,5 +1,7 @@
 AUX libaom-3.4.0-posix-c-source-ftello.patch 429 BLAKE2B 3e6ff2b95dbf39d2d90a46c9189abf160d3460e247446db4ad0e534bde7f382aeaa4e1457c0a4ddb7cf3c9666fd173efa1955a22fc4d3708a93dcd6b7c160f07 SHA512 30cc17c38219e81f92f1f034786d5d4096a0e657c86dfe581f84d18fc201a0e34bd331e98271f92c07e5dc49740e164a983b3316fc57599b98aea2615f7cf107
 AUX libaom-3.7.0-allow-fortify-source.patch 467 BLAKE2B 405f87a6467daae59823eedc9fd7cac959909d5c07df6b4930b55af129750bfd0ed2749b41c6a4fbdb2a8dd49a6881e9de0af526972d27c8c731ce29ab34d1af SHA512 ab69882b8652cb61bdfa14b5fbf5e5cef3344df3aee852f42192af1e935299be1029947a3cb80527362b2db57c93197b889fb45dc562123353b7a3871feaa811
+AUX libaom-3.7.0-big-endian-tests.patch 1611 BLAKE2B 9c0ab0a6a5788fdbc87f30ef5f2a6524521dcf1ec1911544827acb912551c08fcf370c369abfde1567d691a8b814ec897d90819431d7ad091dc247dc7e7396e0 SHA512 299f511b45ba9f1511ab508159f7341ff6ca433118feefd66e96266131588203fc651b4b88be79487b1cbb688c7946dddeeba1b07d88c471da95465e6782fb87
+AUX libaom-3.7.0-big-endian.patch 4168 BLAKE2B 6c9a9ac0933b29b3ee8111d8068dfff144385ae68ebf693a335672c3138cc31ef346486af44b0b0fff9bad58ad72d2335962b78bc82e40b1a7f4a4c9b5d3ca28 SHA512 aebd3f9d16f0cc6a6a0b7a240d5d8cb55d28fc8fe4a00444b26c4b54fed0536ff3577aab5aa624cd9900858770dfdad50f9429d91ee0638058d4be34873e8be6
 DIST libaom-3.4.0.tar.gz 5175838 BLAKE2B 7a38cc1a1871f044018a8ebf5022810b753b099ad61e0c6e2625a0480946e8b5e066fd1e1abc5523e817025c8a59d6f1092c12d632c5b602cf3a80f6ef8daa0e SHA512 8de5e7eae96b182ceb33ce2c66fde784349a7a117371177102c358cc9b2cad75bebe2849fdf8ce57ae149a38b43419b51e54e5475cb781ed3d5953081127b478
 DIST libaom-3.5.0.tar.gz 5206715 BLAKE2B d47ddb864c909c972f692667177417daef0350124a096547eacc83ab3630227fe7a23e95f3988a2109c580f9a87ba30a58bcc58be1a2e24fe694eb01655a4861 SHA512 370c529a84d54c95f05c5a3b3edadd1cca95eeccd5a6b5454e574211c6dd9bf5bd33ab67b43587c6de37688fe546ea9e16de0ab2d721e965143b7e8c85db6fd4
 DIST libaom-3.6.0-testdata.tar.gz 498554450 BLAKE2B bbc84e9d3fd91272fa6e30a19f625fb5b71b1ff6c622982202c298e45c7a331338ed316942d7c0ab00f5ef37d442e1a45a62a30be70f8c1315caac9e7742903e SHA512 a86303a2486fca9a85cdb9275c1715a3862df92021967a5a0d97f8aa6862dd6cad1d65e1377fbee3f1b21d73c770e10ece4041a13bf57e6f2a1bb39357b00316
@@ -13,6 +15,7 @@ EBUILD libaom-3.5.0.ebuild 3314 BLAKE2B 60443b958e7edf5345af61c71bfff8c8614ae51e
 EBUILD libaom-3.6.0.ebuild 4001 BLAKE2B 0f6af46ea95f891dc9ae55fb2fd276c304977dd9d0ce51ed72a3ba11ccec51e6f815e0f3466a10289e102b161a41440c71c0f3b78e4253ede4f7f17b3aa07147 SHA512 80c392f5721c6f913d7fc403f83354eb067f3d8d753b76d1905f82aee6fa430a87a0875070ffae7c6edda3e2529413c6577c8c0144ff38e98cc1973d1df44886
 EBUILD libaom-3.6.1.ebuild 4018 BLAKE2B d58bb60d356880b9f0f6d9d9262a05de51a4fe0ac563f92219219c0554d2de1d61fc24eba5fd55cc5fb7fc1a2d003a72ae375be4494964013bcacf865fe6edcc SHA512 ceb6ca17366b1b14c6b6cfa9d5caa0eb229c19bf43aca9c23c8637d1d156a286891ef851b00a1d0208680d240bb2ca1cbd9fcd1743ab9384c1ea09f4f12fabbb
 EBUILD libaom-3.7.0-r1.ebuild 4077 BLAKE2B 90d69ac4b74320819a390734af21bd1118455028aa300b92e42a524714f7be00f1561e694dfb62070c819974ae166387d111ba0eb4756cb6f70ac5e1c045759d SHA512 354d28904c1a4fe1ee70bfd8a48266556ac654dbe14c0fff1d72c81281246f94bf27957bf9c2481e9fcede85447626dd87e44f1be6bb4972a03162fe44e2132f
+EBUILD libaom-3.7.0-r2.ebuild 4343 BLAKE2B 20a64538bddaa926e9f54139a6f47f61fa29d6d05a6910d0527980621357560f5e57eb0c8598b8fe10086e956a9616563bd9b137e9b193f5764bd8b5e8640c8f SHA512 8fc026560907dfe488115f9ffa2465f98afa2bbcf86edb9b75e6b835da73140839b71a3db6cf299ff7713bcb21e54186112ddcbe19fd9327733be14efed02a44
 EBUILD libaom-3.7.0.ebuild 4023 BLAKE2B aea1f5e374ba3075baa8e72e135fecf063743909f5aa972a1a9b1503be1868e0dad9ae10809a7905f87151f6cd3634104b4493fddf86ddc174b0581d5c971218 SHA512 9d8f6e81729c4c875b4d7d7b986547c68f1024ad01e21d2b16e95572b146c159b4f32196c9e5c8008f64079d03d8216e393c70ffefd9f2a121e918e1c39dd996
-EBUILD libaom-9999.ebuild 4023 BLAKE2B aea1f5e374ba3075baa8e72e135fecf063743909f5aa972a1a9b1503be1868e0dad9ae10809a7905f87151f6cd3634104b4493fddf86ddc174b0581d5c971218 SHA512 9d8f6e81729c4c875b4d7d7b986547c68f1024ad01e21d2b16e95572b146c159b4f32196c9e5c8008f64079d03d8216e393c70ffefd9f2a121e918e1c39dd996
+EBUILD libaom-9999.ebuild 4262 BLAKE2B ff64524d8c291c8e8671be54748c6a3e82d7354631fc4cb6b0effb219da06d2c595345707016f09e50d362966923419fc7978ec4bcaa35a0be8c4874af2fb17c SHA512 f188a326fb4d4e5ae28c0c626896024c2765d8e93e0cb40cf95fd73605a1021f463b8f66268b58ccbeca00c8361312cf6f696d6dd64c250af78d6b89df2b0975
 MISC metadata.xml 224 BLAKE2B a8fa831654345ddf74b54f53fdc27d128ff6896378c8aa2dcb27139a4382f63efd0cac17f94ee420932e2855042c94e32fe534c99a977698953aaab4c51c31d0 SHA512 0b59f17151d352f25e3b073a3ee388d0189e1caddf0d97142851a19df433d082e3eead9f5aae07f4beb247861d90f02ae217514d02445703b95ee6ff62d967b8
diff --git a/media-libs/libaom/files/libaom-3.7.0-big-endian-tests.patch b/media-libs/libaom/files/libaom-3.7.0-big-endian-tests.patch
new file mode 100644
index 000000000000..38559c564726
--- /dev/null
+++ b/media-libs/libaom/files/libaom-3.7.0-big-endian-tests.patch
@@ -0,0 +1,43 @@
+https://bugs.chromium.org/p/aomedia/issues/detail?id=3487
+https://aomedia.googlesource.com/aom/+/7029529477e1473e6eb7417538cea18edc5e3bd0
+
+From 7029529477e1473e6eb7417538cea18edc5e3bd0 Mon Sep 17 00:00:00 2001
+From: Wan-Teh Chang <wtc@google.com>
+Date: Wed, 13 Sep 2023 10:55:05 -0700
+Subject: [PATCH] Fix big-endian bugs in CodingPathSync tests
+
+Change Serialize() to read uint16_t samples correctly. Although only the
+least significant byte of each sample is nonzero, we cannot assume the
+least significant byte of the c-th sample in `row` is row[c * 2]. That
+is correct only on little-endian systems.
+
+Bug: aomedia:3487
+Change-Id: I9919ce6e3c877608ca7488fe4cc6957bcfe8c4cc
+---
+ test/coding_path_sync.cc | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/test/coding_path_sync.cc b/test/coding_path_sync.cc
+index c3e51fd565..31bc2d56b0 100644
+--- a/test/coding_path_sync.cc
++++ b/test/coding_path_sync.cc
+@@ -130,11 +130,13 @@ std::vector<int16_t> Serialize(const aom_image_t *img) {
+ 
+     for (int r = 0; r < h; ++r) {
+       for (int c = 0; c < w; ++c) {
+-        unsigned char *row = img->planes[plane] + r * img->stride[plane];
+-        if (img->fmt & AOM_IMG_FMT_HIGHBITDEPTH)
+-          bytes.push_back(row[c * 2]);
+-        else
++        const unsigned char *row = img->planes[plane] + r * img->stride[plane];
++        if (img->fmt & AOM_IMG_FMT_HIGHBITDEPTH) {
++          const uint16_t *row16 = reinterpret_cast<const uint16_t *>(row);
++          bytes.push_back(row16[c]);
++        } else {
+           bytes.push_back(row[c]);
++        }
+       }
+     }
+   }
+-- 
+2.42.0
diff --git a/media-libs/libaom/files/libaom-3.7.0-big-endian.patch b/media-libs/libaom/files/libaom-3.7.0-big-endian.patch
new file mode 100644
index 000000000000..907e5fd1110e
--- /dev/null
+++ b/media-libs/libaom/files/libaom-3.7.0-big-endian.patch
@@ -0,0 +1,130 @@
+https://bugs.chromium.org/p/aomedia/issues/detail?id=3487
+https://aomedia.googlesource.com/aom/+/8b65d76f2f95b1bfdc82b8f135246cb367d444e6%5E%21/
+
+From 8b65d76f2f95b1bfdc82b8f135246cb367d444e6 Mon Sep 17 00:00:00 2001
+From: Wan-Teh Chang <wtc@google.com>
+Date: Tue, 12 Sep 2023 16:38:47 -0700
+Subject: [PATCH] Fix byte order issue in write_enc_data_to_out_buf
+
+Fix the byte order issue for big-endian systems introduced in
+https://aomedia-review.googlesource.com/c/aom/+/167581.
+
+Use the existing HToBE64 macro defined in aom_util/endian_inl.h and
+delete the new get_byteswap64 function from aom_ports/bitops.h.
+
+Based on the patch in bug aomedia:3487.
+
+Bug: aomedia:3487
+Change-Id: I56183e062a9f2b18c4c6158fd8e47c5062de85ee
+---
+ aom_dsp/entenc.h   |  7 ++++---
+ aom_ports/bitops.h | 35 +----------------------------------
+ 2 files changed, 5 insertions(+), 37 deletions(-)
+
+diff --git a/aom_dsp/entenc.h b/aom_dsp/entenc.h
+index 467e47bf56..d26f027ed0 100644
+--- a/aom_dsp/entenc.h
++++ b/aom_dsp/entenc.h
+@@ -13,7 +13,7 @@
+ #define AOM_AOM_DSP_ENTENC_H_
+ #include <stddef.h>
+ #include "aom_dsp/entcode.h"
+-#include "aom_ports/bitops.h"
++#include "aom_util/endian_inl.h"
+ 
+ #ifdef __cplusplus
+ extern "C" {
+@@ -87,13 +87,14 @@ static AOM_INLINE void propagate_carry_bwd(unsigned char *buf, uint32_t offs) {
+   } while (carry);
+ }
+ 
+-// Reverse byte order and write data to buffer adding the carry-bit
++// Convert to big-endian byte order and write data to buffer adding the
++// carry-bit
+ static AOM_INLINE void write_enc_data_to_out_buf(unsigned char *out,
+                                                  uint32_t offs, uint64_t output,
+                                                  uint64_t carry,
+                                                  uint32_t *enc_offs,
+                                                  uint8_t num_bytes_ready) {
+-  const uint64_t reg = get_byteswap64(output) >> ((8 - num_bytes_ready) << 3);
++  const uint64_t reg = HToBE64(output << ((8 - num_bytes_ready) << 3));
+   memcpy(&out[offs], &reg, 8);
+   // Propagate carry backwards if exists
+   if (carry) {
+diff --git a/aom_ports/bitops.h b/aom_ports/bitops.h
+index 3c5b992bde..7f4c165f5a 100644
+--- a/aom_ports/bitops.h
++++ b/aom_ports/bitops.h
+@@ -13,7 +13,6 @@
+ #define AOM_AOM_PORTS_BITOPS_H_
+ 
+ #include <assert.h>
+-#include <stdint.h>
+ 
+ #include "aom_ports/msvc.h"
+ #include "config/aom_config.h"
+@@ -34,12 +33,8 @@ extern "C" {
+ // These versions of get_msb() are only valid when n != 0 because all
+ // of the optimized versions are undefined when n == 0:
+ 
+-// get_byteswap64:
+-// Returns the number (uint64_t) with byte-positions reversed
+-// e.g. input 0x123456789ABCDEF0 returns 0xF0DEBC9A78563412
+-
+ // GCC compiler: https://gcc.gnu.org/onlinedocs/gcc/Other-Builtins.html
+-// MSVC: https://learn.microsoft.com/en-us/cpp/c-runtime-library/
++// MSVC: https://learn.microsoft.com/en-us/cpp/intrinsics/compiler-intrinsics
+ 
+ // use GNU builtins where available.
+ #if defined(__GNUC__) && \
+@@ -48,10 +43,6 @@ static INLINE int get_msb(unsigned int n) {
+   assert(n != 0);
+   return 31 ^ __builtin_clz(n);
+ }
+-
+-static INLINE uint64_t get_byteswap64(uint64_t num) {
+-  return __builtin_bswap64(num);
+-}
+ #elif defined(USE_MSC_INTRINSICS)
+ #pragma intrinsic(_BitScanReverse)
+ 
+@@ -61,10 +52,6 @@ static INLINE int get_msb(unsigned int n) {
+   _BitScanReverse(&first_set_bit, n);
+   return first_set_bit;
+ }
+-
+-static INLINE uint64_t get_byteswap64(uint64_t num) {
+-  return _byteswap_uint64(num);
+-}
+ #undef USE_MSC_INTRINSICS
+ #else
+ static INLINE int get_msb(unsigned int n) {
+@@ -82,26 +69,6 @@ static INLINE int get_msb(unsigned int n) {
+   }
+   return log;
+ }
+-
+-static INLINE uint64_t get_byteswap64(uint64_t num) {
+-  uint64_t out = 0x00;
+-  uint64_t mask = 0xFF00000000000000;
+-  int bit_shift = 56;  // 7 bytes
+-  // 4 ms bytes
+-  do {
+-    out |= (num & mask) >> bit_shift;
+-    mask >>= 8;
+-    bit_shift -= 16;
+-  } while (bit_shift >= 0);
+-  // 4 ls bytes
+-  bit_shift = 8;  // 1 byte
+-  do {
+-    out |= (num & mask) << bit_shift;
+-    mask >>= 8;
+-    bit_shift += 16;
+-  } while (bit_shift <= 56);
+-  return out;
+-}
+ #endif
+ 
+ #ifdef __cplusplus
+-- 
+2.42.0
diff --git a/media-libs/libaom/libaom-3.7.0-r2.ebuild b/media-libs/libaom/libaom-3.7.0-r2.ebuild
new file mode 100644
index 000000000000..3fbef9beb31c
--- /dev/null
+++ b/media-libs/libaom/libaom-3.7.0-r2.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+inherit cmake-multilib python-any-r1
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://aomedia.googlesource.com/aom"
+else
+	# To update test data tarball, follow these steps:
+	# 1.  Clone the upstream repo and check out the relevant tag,
+	#	  or download the release tarball
+	# 2.  Regular cmake configure (options don't matter here):
+	#     cd build && cmake ..
+	# 3.  Set LIBAOM_TEST_DATA_PATH to the directory you want and
+	#     run the "make testdata" target:
+	#     LIBAOM_TEST_DATA_PATH=../libaom-3.7.0-testdata make testdata
+	#     This will download the test data from the internet.
+	# 4.  Create a tarball out of that directory.
+	#     cd .. && tar cvaf libaom-3.7.0-testdata.tar.xz libaom-3.7.0-testdata
+	SRC_URI="
+		https://storage.googleapis.com/aom-releases/${P}.tar.gz
+		test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-testdata.tar.xz )
+	"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+DESCRIPTION="Alliance for Open Media AV1 Codec SDK"
+HOMEPAGE="https://aomedia.org https://aomedia.googlesource.com/aom/"
+
+LICENSE="BSD-2"
+SLOT="0/3"
+IUSE="big-endian doc +examples test"
+IUSE="${IUSE} cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3"
+IUSE="${IUSE} cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2"
+IUSE="${IUSE} cpu_flags_arm_neon"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	cpu_flags_x86_sse2? ( cpu_flags_x86_mmx )
+	cpu_flags_x86_ssse3? ( cpu_flags_x86_sse2 )
+"
+
+BDEPEND="${PYTHON_DEPS}
+	dev-lang/perl
+	abi_x86_32? ( dev-lang/yasm )
+	abi_x86_64? ( dev-lang/yasm )
+	abi_x86_x32? ( dev-lang/yasm )
+	doc? ( app-doc/doxygen )
+"
+
+# The PATENTS file is required to be distributed with this package, bug #682214
+DOCS=( PATENTS )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.4.0-posix-c-source-ftello.patch
+	"${FILESDIR}"/${PN}-3.7.0-allow-fortify-source.patch
+
+	"${FILESDIR}"/${P}-big-endian.patch
+	"${FILESDIR}"/${P}-big-endian-tests.patch
+)
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DENABLE_CCACHE=OFF
+		-DENABLE_DOCS=$(multilib_native_usex doc ON OFF)
+		-DENABLE_EXAMPLES=$(multilib_native_usex examples ON OFF)
+		-DENABLE_NASM=OFF
+		-DENABLE_TESTS=$(usex test)
+		-DENABLE_TOOLS=ON
+		-DENABLE_WERROR=OFF
+		# https://bugs.chromium.org/p/aomedia/issues/detail?id=3487 shows
+		# that big endian detection doesn't really work otherwise.
+		-DCONFIG_BIG_ENDIAN=$(usex big-endian 1 0)
+
+		# Needs libjxl, currently unpackaged.
+		-DCONFIG_TUNE_BUTTERAUGLI=0
+
+		# neon support is assumed to be always enabled on arm64
+		-DENABLE_NEON=$(usex cpu_flags_arm_neon ON $(usex arm64 ON OFF))
+		# ENABLE_DSPR2 / ENABLE_MSA for mips
+		-DENABLE_MMX=$(usex cpu_flags_x86_mmx ON OFF)
+		-DENABLE_SSE=$(usex cpu_flags_x86_sse ON OFF)
+		-DENABLE_SSE2=$(usex cpu_flags_x86_sse2 ON OFF)
+		-DENABLE_SSE3=$(usex cpu_flags_x86_sse3 ON OFF)
+		-DENABLE_SSSE3=$(usex cpu_flags_x86_ssse3 ON OFF)
+		-DENABLE_SSE4_1=$(usex cpu_flags_x86_sse4_1 ON OFF)
+		-DENABLE_SSE4_2=$(usex cpu_flags_x86_sse4_2 ON OFF)
+		-DENABLE_AVX=$(usex cpu_flags_x86_avx ON OFF)
+		-DENABLE_AVX2=$(usex cpu_flags_x86_avx2 ON OFF)
+	)
+
+	# For 32-bit multilib builds, force some intrinsics on to work around
+	# bug #816027. libaom seems to do runtime detection for some targets
+	# at least, so this isn't an issue.
+	if ! multilib_is_native_abi && use amd64 ; then
+		mycmakeargs+=(
+			-DENABLE_SSE3=ON
+			-DENABLE_SSSE3=ON
+		)
+	fi
+
+	# On ARM32-on-ARM64, things end up failing if NEON is off, bug #835456
+	# Just force generic, given it's a niche situation.
+	# TODO: could try forcing armv7 or similar?
+	if use arm && ! use cpu_flags_arm_neon && [[ $(uname -p) == "aarch64" ]] ; then
+		ewarn "Forcing generic for arm32-on-arm64 build (bug #835456)"
+		mycmakeargs+=(
+			-DAOM_TARGET_CPU=generic
+		)
+	fi
+
+	cmake_src_configure
+}
+
+multilib_src_test() {
+	LIBAOM_TEST_DATA_PATH="${WORKDIR}/${P}-testdata" "${BUILD_DIR}"/test_libaom || die
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi && use doc ; then
+		local HTML_DOCS=( "${BUILD_DIR}"/docs/html/. )
+	fi
+
+	cmake_src_install
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die
+}
diff --git a/media-libs/libaom/libaom-9999.ebuild b/media-libs/libaom/libaom-9999.ebuild
index 76a2b4d37365..80b545dbde32 100644
--- a/media-libs/libaom/libaom-9999.ebuild
+++ b/media-libs/libaom/libaom-9999.ebuild
@@ -33,7 +33,7 @@ HOMEPAGE="https://aomedia.org https://aomedia.googlesource.com/aom/"
 
 LICENSE="BSD-2"
 SLOT="0/3"
-IUSE="doc +examples test"
+IUSE="big-endian doc +examples test"
 IUSE="${IUSE} cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3"
 IUSE="${IUSE} cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2"
 IUSE="${IUSE} cpu_flags_arm_neon"
@@ -57,6 +57,7 @@ DOCS=( PATENTS )
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.4.0-posix-c-source-ftello.patch
+	"${FILESDIR}"/${PN}-3.7.0-allow-fortify-source.patch
 )
 
 multilib_src_configure() {
@@ -68,6 +69,9 @@ multilib_src_configure() {
 		-DENABLE_TESTS=$(usex test)
 		-DENABLE_TOOLS=ON
 		-DENABLE_WERROR=OFF
+		# https://bugs.chromium.org/p/aomedia/issues/detail?id=3487 shows
+		# that big endian detection doesn't really work otherwise.
+		-DCONFIG_BIG_ENDIAN=$(usex big-endian 1 0)
 
 		# Needs libjxl, currently unpackaged.
 		-DCONFIG_TUNE_BUTTERAUGLI=0
diff --git a/media-libs/libvpx/Manifest b/media-libs/libvpx/Manifest
index e488153c62fe..e83397646d3a 100644
--- a/media-libs/libvpx/Manifest
+++ b/media-libs/libvpx/Manifest
@@ -1,7 +1,7 @@
 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 787 BLAKE2B d2e9d0eb8058632ddbc3261593ae5f035566115b7f2f049b7850447673e0ac56631e7a3c091975383c0b4d68efa8a85b862550e0508246a45409f683e742eaa8 SHA512 cb95a16c6de15081f3236fd45acd7ea17d68721b20a02d01ea6f905300ef7429d23b723bc0c5669fef00b13adaf7d09ccf4b68e45ff31e66df64e0c2db9289d3
+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.12.0.tar.gz 5465627 BLAKE2B 92e61ef91ef3bb7e09f359acdef6469843921345b1008a7a24042587fbcfc72c4671fc9eb4e1bf8c1e9de0fa5506ed751dcd6934a9164a6e0fe528cfe8c23154 SHA512 dc059bc3102b75524ae29989372334b3e0f2acf1520e5a4daa4073831bb55949d82897c498fb9d2d38b59f1a66bb0ad24407d0d086b1e3a8394a4933f04f2ed0
 DIST libvpx-1.13.0.tar.gz 5515327 BLAKE2B 410be36bf10011171bf15f1219066cf559c8b11e66493f9f722af7217896a467b63934a7e6819144ff697ae90e3ebbac3e5fe93e961d6a68310881c646582f11 SHA512 686cb526b46d5a054d35263b24f54e977149a244e97c95bcdd9aba2d75e045b2d51be2b7f9754302826b4c5450ee2f177f440b41c04c83b8b1661f1c14301c60
diff --git a/media-libs/libvpx/files/libvpx-1.13.1-allow-fortify-source.patch b/media-libs/libvpx/files/libvpx-1.13.1-allow-fortify-source.patch
index 5928c4e46723..45a86b926092 100644
--- a/media-libs/libvpx/files/libvpx-1.13.1-allow-fortify-source.patch
+++ b/media-libs/libvpx/files/libvpx-1.13.1-allow-fortify-source.patch
@@ -1,3 +1,5 @@
+https://bugs.chromium.org/p/webm/issues/detail?id=1822
+
 This was originally added for ABI reasons in a case which barely works / doesn't
 work at all for glibc anyway, see https://github.com/webmproject/libvpx/commit/b73a3693e581583e9ec676f4396d0c3d173e2462.
 
diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index 2de98ec1c4b8..cf23ba733422 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -4,8 +4,8 @@ AUX netpbm-11.0.0-misc-deps.patch 1446 BLAKE2B 721e926a83d50d04d4a407051ee077db5
 AUX netpbm-11.1.0-fix-clang-O2.patch 773 BLAKE2B a8d2bef659d384b0f94560fec847d37731315f5cdb67e5474efb596672d146446c6d545caa816d74f9d4c32fe486ce49f8cb55f38e9706bae6b0ba79c0dbbb5e SHA512 0a0049415d5c252603c47325d69ae582bec76ac15f442682ef0a2ff8c5a8cd19e28543644883bde891f2a376a401f43ed923b184112f49c67d295b9215d519de
 DIST netpbm-11.2.0.tar.xz 3777372 BLAKE2B d9a2de49db61f642df75fe1c1fcda752f837535ac7cc698fb50e7c2c93dacfe3894fc46b402af30d07e3617f0f421a36d8d6a3d846c07d6b3526724dce93283b SHA512 70bde6e6112ae595e18be588ea95d2b2acb08e42bb36d0fc93b9584c4b2adf72e35f80ff87823a8e3d98a8ffd0ff907401d351533b9170d7a11a28515c10fdbd
 DIST netpbm-11.2.4.tar.xz 3791116 BLAKE2B bc3c4c7dd1c473cf6a0511c1a756dc11ddac693bd288daa8cac5d997d75f48ea9f039552decaff601a46fcdc1b08bba55596fc116547eee5a0ab78cf9a0ea55c SHA512 41219fcf8c02eb1f9bb8619d972312d63f0781e071f1c494ba5b2e1f2b614c37d78097259bcf39cb85feac783c811fcc24f088ec2cd406786296ae055ee10318
-DIST netpbm-11.4.2.tar.xz 3792928 BLAKE2B 2742f27f04ce4c2a7f6189ae572583e9e96b7a6ba1f32bfd4f4fed7b193cf37191512178e901f64e06e13a51450541254637141054fbe7c41bad76e921537487 SHA512 9feea2a5e586e78dd07c9493cc69370c24007f80a1e0215c2d1f7b5a76228463da8dd49e94f5759faba7d91fb30bdb378dd3974dbc72218b68afeaa15bd163c6
+DIST netpbm-11.4.3.tar.xz 3792792 BLAKE2B 64d9c239ae98f1cdd521a73958a372f027bbdd9f8926dc3dcff48b7a630064e0f7b2aa4f526469580b7048a3dd2b94ba059d46a58e33402362c203c7bb348cea SHA512 2059c450276640e7ef510ba6cfe79395cc88da0250e9c94881fda94c54b6a8d8d0dbc8c9b14d5503b5dfccd52beb9c1108e12b57ca3c667c72dd89b5adf0d298
 EBUILD netpbm-11.2.0.ebuild 6830 BLAKE2B c07e114dd61e0aef2f08f93bd722f72fac8021bbe9d369b111084a706e64f93e76913074e74758bc37780abd13eff479e58f00b524daf1a6ba2171b57272d825 SHA512 9cc1e468d04a7e8538e4ed1964e5a34834c8b3e637c4db7c79dde6c0290500d713ed09f3d746a07f0c6bce9fbf812f5be497050d79c6360a65aaadb1e793c83e
 EBUILD netpbm-11.2.4.ebuild 6838 BLAKE2B dbae0fa94f43bf2b7f0dc6a0797448a5b776730c9ae03277bddafca0d95e6e47769bdd0220772ccc65a3aaf54b0c8c22b1818a128cc62e92411b2aa75dd8f862 SHA512 1e0cfdde5a2e5856402edc684aa1dbc21a3141f288cb78ee1905efada4a7c0ba84f4b1a6cf4557777cf16be2c7754f0e2668c9544aa0b2bb5605ce63c889cdd2
-EBUILD netpbm-11.4.2.ebuild 6722 BLAKE2B 65b486aaba5a3a219f484290ff4d22dd0e01781b9d441339dec183bd0f36f9430f7fa3ef1dd087b2b11dc858349c3a28e813fa63220bed4dc54bded4c5165c53 SHA512 b4eb0fcae2a166dcddd03b607d2ac90d91045e02189b249818ab4ffb55adc48f940b91aaa247fc1d930a29b0e14cfd63a1300aee4eebb8617ce51808954c2834
+EBUILD netpbm-11.4.3.ebuild 6722 BLAKE2B 65b486aaba5a3a219f484290ff4d22dd0e01781b9d441339dec183bd0f36f9430f7fa3ef1dd087b2b11dc858349c3a28e813fa63220bed4dc54bded4c5165c53 SHA512 b4eb0fcae2a166dcddd03b607d2ac90d91045e02189b249818ab4ffb55adc48f940b91aaa247fc1d930a29b0e14cfd63a1300aee4eebb8617ce51808954c2834
 MISC metadata.xml 424 BLAKE2B 9ccc907d6c15cb1a7d6cfe4679d6fa9f488642948897ca34958a06b439ebcfb912cfb18fa9d93f15f19573aed4bd7083d277151c477410a59cd64b4c9c0446d4 SHA512 a987be2134a44cc916d5a026068219b8ccaa149e577eaf2a53a7802321793129777cc79b069df95ec9320f15279249a5f9d8a61509452ef02effcb6c66cf9e80
diff --git a/media-libs/netpbm/netpbm-11.4.2.ebuild b/media-libs/netpbm/netpbm-11.4.3.ebuild
index 1b6604b4e321..1b6604b4e321 100644
--- a/media-libs/netpbm/netpbm-11.4.2.ebuild
+++ b/media-libs/netpbm/netpbm-11.4.3.ebuild