13 files changed, 372 insertions, 12 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index a2b2d1c5df8f..f04b0430faac 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/openh264/Manifest b/media-libs/openh264/Manifest
index 14ba7dfa31f8..9041c7690b02 100644
--- a/media-libs/openh264/Manifest
+++ b/media-libs/openh264/Manifest
@@ -8,5 +8,5 @@ DIST openh264-2.4.0.tar.gz 60297968 BLAKE2B d725896979e8178277e304ac0d94e59f0971
 DIST openh264-2.4.1.tar.gz 60297304 BLAKE2B c66dbe8003072c406641b3f1453df6d8e574b5526d6748d5f4efa4921ca6a438df2e491143dc07c8f9297d253e97cd4ee2dada450845e7d9323cb31dddc6fff4 SHA512 eb99144addd2e9c352bb95e752366e104ac6b0ddc84311dc7c87dafb803f8e7fe4d1e726833d49f8cc6d3914508e19c3a25ef82637a4993e8af3f504aa005baf
 EBUILD openh264-2.3.1-r3.ebuild 3949 BLAKE2B 68b79ae51de85dc5c4c19fe2f1d5460ce8d0a076e3201d68cafbe0155d9c2d49f127919e30b1d16ce6dc8b0b2359bcdbf8d586c42c95cef2b77afc072fb4f91b SHA512 50aec0bab131871d007a1915c5305b76ea3e1c1f91741ab3596d05a6ac8b0269e57243e4b0ed2a56464c5ddce8a95916a4f8035a1bf5440c4dab75ea09e404fb
 EBUILD openh264-2.4.0-r1.ebuild 4075 BLAKE2B 13b56a985102aa4ae61278ec4105fa7f41898b4e69a617b569aa3b6217bc9f6db0da1ed2c199cd3e34892ce9f51d9ab4dcc4daeb57b54cff7f322f6b5a67ee6f SHA512 09d887692e0434fc324b8b76db18e2d7f3ee225d31ed757f188f4192863af7913a7e2884d3360fce636445f832e111e69705369d62efd9ea665b578218a72987
-EBUILD openh264-2.4.1.ebuild 3949 BLAKE2B 8cabac671c0ce0ae21fda65955ccf6cd63fc5ad92136ab0c4454e9b8bc03825584380746a8edad7fdeb654ea805bf918e8970d8656dc0aa89ef931e462c2a6c3 SHA512 1eb3a1453db5ebb645e3f1f664c0ea35bad318225ce8f81e0f3dfab257f5cdff0ee584275ef1e218e851287fe1905f72619c9ec877801ae3308549bcf73f7962
+EBUILD openh264-2.4.1.ebuild 3947 BLAKE2B 2e26102add4bd690b219c78e868c50062ce839c49be9659dbf80623bc2e97e9ec3014a700e1fe5f75a5c2c66386bb2b39682c144aafec6bf276a9ad2255b0b2c SHA512 c56f0491dd664f2ce8d26f557b07bad1bb7dd4b486660c91069aaa5a2e5ee0f19cbdb371064813c3ac1916e40ced1ff96a61f4f62a8c7b372475c2cfb8db8e39
 MISC metadata.xml 627 BLAKE2B aa6bcd394a1b792f8d0fc89030f34df7f0366f049f52ee11a90af301ca901a07acfc1d34a0d6d237a7d713db53b707b3b9f08d3c86574d6067f6ff7e8cf99c3a SHA512 55a7a5ee5f716e9eb1e5711d45a93fe27f057b54240511de72ade7f88c53eeac72f1bf1b524d22278c0fafbea70e1b5892262ee1b97370d70a0258bad7220e30
diff --git a/media-libs/openh264/openh264-2.4.1.ebuild b/media-libs/openh264/openh264-2.4.1.ebuild
index e3de53822e92..fde8c97fd971 100644
--- a/media-libs/openh264/openh264-2.4.1.ebuild
+++ b/media-libs/openh264/openh264-2.4.1.ebuild
@@ -18,7 +18,7 @@ LICENSE="BSD"
 # (2.2.0 needed a minor bump due to undocumented but breaking ABI changes, just to be sure.
 #  https://github.com/cisco/openh264/issues/3459 )
 SLOT="0/7"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc64 ~riscv ~sparc x86"
 IUSE="cpu_flags_arm_neon cpu_flags_x86_avx2 +plugin test utils"
 
 RESTRICT="bindist !test? ( test )"
diff --git a/media-libs/sdl-ttf/Manifest b/media-libs/sdl-ttf/Manifest
index ac6aba0d29ce..f65413c2e7a4 100644
--- a/media-libs/sdl-ttf/Manifest
+++ b/media-libs/sdl-ttf/Manifest
@@ -1,3 +1,3 @@
 DIST sdl-ttf-2.0.11_p20220525.tar.gz 5421461 BLAKE2B 93422fdc912369a503ef0bc2f474a7afd749396176a295484b9ff8b1c0b5a06c2a5a21b93c91b616816f7c1c5f3ff35c611618251e8ae7f2b2d337109a3cab56 SHA512 a371488b59b8d1d2b067ee8bb67912d11875ac202912ffd31d5fee4630dac205e2e757505ab4dba3267e4d2700c043873c3b37aa6813ece8333f1b25fa096346
-EBUILD sdl-ttf-2.0.11_p20220525.ebuild 1225 BLAKE2B 2f731e48c1678dd004c13017859167d46e0ed3848826590b8614ee5ee23c713cd2c4b2b34016365ef74035059b0041ef3969fb73ac43929bd47c2a75d94d8404 SHA512 cb5cfd903f045e96751cacb8f1a33b15daa15caf00b093d2e55cda1ef75b871ae8e5c28cd02a5f12ac44b505bbdcbc18622d4f22d74ff370b50ee9dba070f2b9
+EBUILD sdl-ttf-2.0.11_p20220525.ebuild 1276 BLAKE2B 7d94f602bce49e3b2da97eec64b5988f5a2e11797d69b3ffaa35d2bf7f50ab9fee069878a7cd2f0a61cbb7d40fdd15672ffc9b6dc3d99e9c83991ddd10497942 SHA512 bb40d2d3e4ffbb09bf177cbed59e3926affc9fc1644d83140d58abe4ea5d2d19c0b502c26fa142017e6e3b946b2a7b82e35c81ed0a30d230387ea1772e9d8653
 MISC metadata.xml 604 BLAKE2B 28ad2d239df5d6096bbc586e3842b9b41739a76a740995955e08e7a324cca40566fed84a4050447cb9cb8edfbe14562f62bdfe7aa6b5b1c407104a0912dfc013 SHA512 07e5dc681f113e2657bb37307e4a28b1630e142d42685403f04af8505f9eb52dc6bae513710ca0b94170174d75455d0315dd75c784d99ae0cd1ac79fde3cf793
diff --git a/media-libs/sdl-ttf/sdl-ttf-2.0.11_p20220525.ebuild b/media-libs/sdl-ttf/sdl-ttf-2.0.11_p20220525.ebuild
index e8e9238c0a86..6b7b276efe6a 100644
--- a/media-libs/sdl-ttf/sdl-ttf-2.0.11_p20220525.ebuild
+++ b/media-libs/sdl-ttf/sdl-ttf-2.0.11_p20220525.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 # Check SDL-1.2 branch for possible backports/new snapshots
 
-inherit multilib-minimal
+inherit autotools multilib-minimal
 
 SDL_TTF_COMMIT="2648c22c4f9e32d05a11b32f636b1c225a1502ac"
 
@@ -28,6 +28,11 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
+src_prepare() {
+	default
+	eautoreconf
+}
+
 multilib_src_configure() {
 	local myeconfargs=(
 		$(use_enable static-libs static)
diff --git a/media-libs/sdl2-image/Manifest b/media-libs/sdl2-image/Manifest
index 6d3a5972935d..1a182bc44708 100644
--- a/media-libs/sdl2-image/Manifest
+++ b/media-libs/sdl2-image/Manifest
@@ -1,6 +1,8 @@
 DIST SDL2_image-2.0.5_p20210328.tar.gz 12397062 BLAKE2B ae4fe8c30b21bc7dca87e2e78cab43c83e891630962eb020c29ba84c2b206bb749491dccddd8bcc212f2fd07da651691151baf41212fb5ea954427543e3bf994 SHA512 9ba0b671dedfb7bde072424cebfa7d65e79d2d58416833d84548777aff6bf0edda8dbe30c3e423bbb724f794b4b191e609b148f38573b4166eef31203ab0005d
 DIST SDL2_image-2.6.3.tar.gz 9816720 BLAKE2B 24662637e4f621af83d9a66d1cca954549030be97fa47f4b8fc711b2a941eaa409cf99ede137eb91d25999af253791dcfb2d9229080d30ede84cc32d5c5ae997 SHA512 11f1d041a052829708560b6211a2a00b3a1ce26a6f23cb389f57fa5254372027e97d3a6ffe551134a77bc33718c3acea3df21fe8426e93a2b1955176c47c7647
+DIST SDL2_image-2.8.2.tar.gz 11362515 BLAKE2B 8bc8967eed7203ddbd23062e257ae8768eeb28e8efa57bac86db0224a7cdc94dfbb10c6da77dab9c1847f216ec761fae5b7bd5d8ed25c6b3c69ad972dc93ddf5 SHA512 0ff345824f95158dfa72f83f9d4a540601c178cd759334bf849c14a2920b5330d0763413b58c08b3deba8d3a4ccb6ea2a8159f87efe4cbb0e8ea850f63d09454
 EBUILD sdl2-image-2.0.5_p20210328-r1.ebuild 1765 BLAKE2B 7cc2a469c347c6aa9f2ff1306ea69ff27341f5e1de6d971dd1e03ef26cab01f247637d7cbeaf305bab2083efd2a31264fdb8c73bda56ce904f0543aa2f5a9675 SHA512 7fffbaed0ada9b2698d1a1e68eb0c116a5fbf58f4fd6ab39460d637ccc313d9e00cfdf067c414c8c1a1da9e654c11389e1e7c9b02902e57739e518b5e8ef70d2
 EBUILD sdl2-image-2.6.3-r1.ebuild 1947 BLAKE2B 887e5ba614b01bc64fbdea03ad304e53271eea75cafd8da2741c75e6a3d8c53e0108f8d2d1e051d4a71d04b13bef71373479125650b1d5fa44c89fb6d9759e3d SHA512 856e942ecd379b5a135944b3e2c490a2ed767d4e43f4c6d446ca8aabd9b9d385badc56ca311ab4b1fc6f9022be40853cdfab11bf532d9b6222d360d49b683e92
 EBUILD sdl2-image-2.6.3.ebuild 1820 BLAKE2B 78f65f22fd67483a319277e85ccd07f8778386fad8aace49aaa29dc2f20e44839568f70775b6787ed5488f45abf75ad4323c70a1daf04f1287fbbbec69368d5a SHA512 67f86ab42c6ee7f686ecc883c423797f7f319adef25310b7238130f6fefc60c1485a159093823c46606e38781b0c291d5c88a6cac8fb788ae01fa136583e3a14
+EBUILD sdl2-image-2.8.2.ebuild 2020 BLAKE2B d096d41ffc46fbd9ef0760dce05926414f16dc6c31f960bedbe5e6893d6144837fc9289fe281b95190670470e2dea5c19934c393349aebf12a28e3727fc9d377 SHA512 48c44a23efb600b8bde8f60c883e1340cf5fdec62838c0d7b7723b2d49c9e6b0051bb08582de0eb4e809cbdc17cae8a00ba4d1893a62122c07b4969d32e56d64
 MISC metadata.xml 407 BLAKE2B 122a2c297d075149603d7459f0e871213c975e19ddbcf4769cbba637c1de3b6758723e0e251c3f40b11b6d9cbc479cd3f6af6825d4f04ee35f7322d52ab187e9 SHA512 ee9a456a63a91542e2a9c635bc1c69e2a93c1f80eb525b898359e8b735b79e1e927f6a8b23ed55a99497e2459480b746252dd5dc295a4e6c421becaf9ebe62eb
diff --git a/media-libs/sdl2-image/sdl2-image-2.8.2.ebuild b/media-libs/sdl2-image/sdl2-image-2.8.2.ebuild
new file mode 100644
index 000000000000..630c584acce1
--- /dev/null
+++ b/media-libs/sdl2-image/sdl2-image-2.8.2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib multilib-minimal toolchain-funcs
+
+MY_P="SDL2_image-${PV}"
+DESCRIPTION="Image file loading library"
+HOMEPAGE="https://www.libsdl.org/projects/SDL_image/"
+SRC_URI="https://github.com/libsdl-org/SDL_image/releases/download/release-${PV}/${MY_P}.tar.gz"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc64 ~riscv ~sparc ~x86"
+IUSE="avif gif jpeg jpegxl png static-libs test tiff webp"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=media-libs/libsdl2-2.0.9[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	avif? ( >=media-libs/libavif-0.9.3:=[${MULTILIB_USEDEP}] )
+	png? ( >=media-libs/libpng-1.6.10:0[${MULTILIB_USEDEP}] )
+	jpeg? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] )
+	jpegxl? ( media-libs/libjxl:=[${MULTILIB_USEDEP}] )
+	tiff? ( >=media-libs/tiff-3.9.7-r1:=[${MULTILIB_USEDEP}] )
+	webp? ( >=media-libs/libwebp-0.3.0:=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(use_enable avif)
+		--disable-avif-shared
+		--disable-sdltest
+		--disable-stb-image
+		--enable-bmp
+		$(use_enable gif)
+		$(use_enable jpeg jpg)
+		--disable-jpg-shared
+		$(use_enable jpegxl jxl)
+		--disable-jxl-shared
+		--enable-lbm
+		--enable-pcx
+		$(use_enable png)
+		--disable-png-shared
+		--enable-pnm
+		$(use_enable test tests)
+		--enable-tga
+		$(use_enable tiff tif)
+		--disable-tif-shared
+		--enable-qoi
+		--enable-xcf
+		--enable-xpm
+		--enable-xv
+		$(use_enable webp)
+		--disable-webp-shared
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	emake OBJC="$(tc-getCC)"
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+	multilib_is_native_abi && newbin .libs/showimage$(get_exeext) showimage2$(get_exeext)
+}
+
+multilib_src_install_all() {
+	dodoc {CHANGES,README}.txt
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/media-libs/sdl2-ttf/Manifest b/media-libs/sdl2-ttf/Manifest
index 2a55b90a4a09..ca0f802632aa 100644
--- a/media-libs/sdl2-ttf/Manifest
+++ b/media-libs/sdl2-ttf/Manifest
@@ -1,5 +1,7 @@
 DIST SDL2_ttf-2.20.0.tar.gz 13156472 BLAKE2B f31b1193beaaab0e2aaab6f56c82f4931db79ab81526398e20176c9fb121409d4f9f56109aa721d645496f6c228450cb95bda48c40037f1a3f904154e0e21fee SHA512 14c78cfa04b938f0bd141d841a9473a1678bb04d01a96391cfa37ae3e7e316c90f175aff7d052499f7d982f59b823813e4cfdd367631a44b08b85f9b60d09c8c
 DIST SDL2_ttf-2.20.2.tar.gz 13161592 BLAKE2B d94a68d817c0824d7292f51ec3e20148a87235cb72daa68015af16cef7434bdc095c68a9c6efd130fc50f58996c2801cf29e4b90545b47ad2f90d7c77e238474 SHA512 b54e93b100712e3764cd80d4e4b16cd4c2a6853620f675941a4214320b0ee29a583d57ad56cd5fdb5c7a32d7615cbf43bc3fa55337b01623cee7219ebb43667c
+DIST SDL2_ttf-2.22.0.tar.gz 14314901 BLAKE2B b1d6505f316f1289f7ef95466da8f4a085898072c3eeb84084aa1f82ed8033bbc1931a11b74d54db18a8424541864a6e35b02dbc514f447e7e1582742e78f9a7 SHA512 34a1d210d8f1b1e802139d65ba47e36033bb7881e75a8862c1b1c515565bef85e3d81ee42e952aa664de043debef387ba60088a9cf3ba3297413db39a13af912
 EBUILD sdl2-ttf-2.20.0.ebuild 1076 BLAKE2B fd14cb726b64f81a946be027cebe1c12916374ad6920cc6e423aa7b9f7156a24e890528530f467ccd78c0fc839e830138e3f7e37dbc3ec2db9848be6d151f2b3 SHA512 b9ca4431ebafc924c248f4b51ad460f6c36523e52190070fab956d520e8d74ace8393bbc32e2f699314bbfd3bfb8a070c505548a3917f09c5f98bb297e0fc265
 EBUILD sdl2-ttf-2.20.2.ebuild 1127 BLAKE2B aacba7d7617fbe4cb320a6da83a6a371e17905aafb3fda2c4578ed3d5d9789fb8fdfd3bcc2d51d6895c8e30c4a1528b7229682376de03056a7596b765bf9c1f1 SHA512 39460971e6d64e2d5316f10852fc6dbcdcac3a4ccd624b102bdf152409c4537936e488d4b8ecb9a112f53f6d3360cdf8ea21517001ed12a1c5564d29f402b40b
+EBUILD sdl2-ttf-2.22.0.ebuild 1137 BLAKE2B d918caa41c672f64072ae8aff08115a21a4d631d94e1e318526dd3dbd3a4a48c94ddccd3742884042ec5ccd52b40c6f98cfa5e8a9f25645092bbbe729eed91c2 SHA512 a88a1ebb8ffcd2da017a09b768e9d321691dcd61de2c0fe458514b95b02138e802538c67aceedc8ba973a63f442508532fbe324884c36c0538a3ba80dbe13b14
 MISC metadata.xml 694 BLAKE2B def65e69533279b6f10d380901d78f004e3524413598d9ecd2661262eb2ae5f6331f1a0fa2729084b2b5fea05e0811057098686a4fa4f65d6a92a0cdb667310a SHA512 f5d6cb83fe8ff6db7f3c6c171a435e7682470299738cbe4a90a7132dc5bd0083f0abd052754c037e10b23a94dc57e57a938bf489334191ed9c144e4493d28232
diff --git a/media-libs/sdl2-ttf/sdl2-ttf-2.22.0.ebuild b/media-libs/sdl2-ttf/sdl2-ttf-2.22.0.ebuild
new file mode 100644
index 000000000000..30270f37f2cf
--- /dev/null
+++ b/media-libs/sdl2-ttf/sdl2-ttf-2.22.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib
+
+MY_P="SDL2_ttf-${PV}"
+DESCRIPTION="Library that allows you to use TrueType fonts in SDL applications"
+HOMEPAGE="https://github.com/libsdl-org/SDL_ttf"
+SRC_URI="https://github.com/libsdl-org/SDL_ttf/releases/download/release-${PV}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="+harfbuzz static-libs X"
+
+# On bumps, check external/ for versions of bundled freetype + harfbuzz
+# to crank up the dep bounds.
+RDEPEND="
+	>=media-libs/libsdl2-2.0.12[${MULTILIB_USEDEP}]
+	>=media-libs/freetype-2.13.2[harfbuzz?,${MULTILIB_USEDEP}]
+	virtual/opengl[${MULTILIB_USEDEP}]
+	harfbuzz? ( >=media-libs/harfbuzz-8.1.1:=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DSDL2TTF_VENDORED=OFF
+		-DSDL2TTF_HARFBUZZ=$(usex harfbuzz)
+	)
+
+	cmake_src_configure
+}
+
+multilib_src_install_all() {
+	dodoc {CHANGES,README}.txt
+
+	rm -rf "${ED}"/usr/share/licenses/ || die
+}
diff --git a/media-libs/x265/Manifest b/media-libs/x265/Manifest
index 36744f8056f1..2e754649e763 100644
--- a/media-libs/x265/Manifest
+++ b/media-libs/x265/Manifest
@@ -7,6 +7,7 @@ AUX x265-9999-arm.patch 2115 BLAKE2B 92f2225fd23030220531e6bfda7a3d4ce197090a7b1
 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
-EBUILD x265-3.5-r3.ebuild 6123 BLAKE2B c944d6f5a5a28822d6ec8c7de3f82bfb138db27706df5de9f80511449bfef08d0831a95c69694c4e22566aa3fc81889d22f1667fb48231ad1e0b1d76f3fda621 SHA512 6fd17e59b5136d02f5b65a6b8d3b10bcfacdb79a6a3075f45846a133420001526970c4ad8b512045f9a53077b57dd1a88145a1a756eeeb6f38b0f96b53fdd91c
-EBUILD x265-9999.ebuild 6112 BLAKE2B 852aa11b7fa1edfea6a2036e9c1b5122095c394becec564c6f7d10bd15350178b3de8ed3204d370047036f0fb135b6fa47ddb6366f7d8aed65b7bcc90dc776a7 SHA512 e7c3aa595223570954c6b40032aab381ea997568cf9d8fad8139f5e1b87e348f24b650d6b47b0d73041cabb12b1358bee9eb8d2c8706acff6eb2954d8e8c94ed
+EBUILD x265-3.5-r3.ebuild 6278 BLAKE2B eed60ccfe4d08c4b50fea28409ec6542b4641d312042cd9ea6d4d982483be4013202d7cbd5f2f8b4e70f307f69e597ccc4f7b27bf0285b4f9bfe5e93a2d1a0cd SHA512 45d787b42c2d8ca8f082b0b46137608ada716a011d1a83fe99a1f7a27fb39d3f1bb58e8b8f4d8bbd912b58191907ef8b04d3b0a7879ad1268568f962e38e4ee7
+EBUILD x265-3.5-r4.ebuild 6284 BLAKE2B 711ba48141c743309234a82643f786515a6f3455724175164a990cd51066925afb941255407f615e0090d9d8f8488a3c25ac7768c6d80459195d1b391c8fec17 SHA512 aa54eccb1c21a9c414d232731cbba199acaa39e6030a31f42cb4990fd4ac624b6e792f588bc73f68af880adf028f2eec612aab255bd93cf42d1ab42b17094746
+EBUILD x265-9999.ebuild 6267 BLAKE2B 8c72626a97d64b7f1470625d932f7294ca17d503a0a89a81e567f4f13a1cc04fd41275e4a5ddc9e6e4f4d3ed9b1e7edd56092d10bb57d4e219776a4b8c26fd9c SHA512 0eb5ec91ed93440ebd8cf79724591fc4a8f03405cf42d33b7f9d3d0dad2cc1a018e23c301ec659a2dacc7c97eff199569bb60cfcb90999a3a785f964cf3481a1
 MISC metadata.xml 626 BLAKE2B 59840316bac42695fd0c76baad143fcbdf810d80b48aa0260633b7dd70cd24a064ac0e3284772368bffd05415befd99fc4f224d2c2c7fc44e27ec56759f04b07 SHA512 97ba150042a2f4558c828af03bb489faa4385af6a2c72ed3f7489091e011a94e40330117a3f2edddea8fc73652396fb53e9190bdd00cb2b3d1c8b553ed2d0d7e
diff --git a/media-libs/x265/x265-3.5-r3.ebuild b/media-libs/x265/x265-3.5-r3.ebuild
index 83e490d78ecf..f3d6c8cbd76a 100644
--- a/media-libs/x265/x265-3.5-r3.ebuild
+++ b/media-libs/x265/x265-3.5-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake multilib-minimal multibuild
+inherit cmake flag-o-matic multilib-minimal multibuild
 
 if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
@@ -157,6 +157,11 @@ x265_variant_src_configure() {
 }
 
 multilib_src_configure() {
+	# -Werror=odr
+	# https://bugs.gentoo.org/875854
+	# https://bitbucket.org/multicoreware/x265_git/issues/937/build-fails-with-lto
+	filter-lto
+
 	local myabicmakeargs=(
 		-DENABLE_TESTS=$(usex test ON OFF)
 		$(multilib_is_native_abi || echo "-DENABLE_CLI=OFF")
diff --git a/media-libs/x265/x265-3.5-r4.ebuild b/media-libs/x265/x265-3.5-r4.ebuild
new file mode 100644
index 000000000000..11fbb36fc212
--- /dev/null
+++ b/media-libs/x265/x265-3.5-r4.ebuild
@@ -0,0 +1,222 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic multilib-minimal multibuild
+
+if [[ ${PV} = 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://bitbucket.org/multicoreware/x265_git/"
+	S=${WORKDIR}/${P}/source
+else
+	SRC_URI="https://bitbucket.org/multicoreware/x265_git/downloads/${PN}_${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86"
+fi
+
+DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
+HOMEPAGE="http://x265.org/ https://bitbucket.org/multicoreware/x265_git/"
+
+LICENSE="GPL-2"
+# subslot = libx265 soname
+SLOT="0/199"
+IUSE="+10bit +12bit cpu_flags_ppc_vsx2 numa test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+ASM_DEPEND=">=dev-lang/nasm-2.13"
+BDEPEND="
+	abi_x86_32? ( ${ASM_DEPEND} )
+	abi_x86_64? ( ${ASM_DEPEND} )"
+
+PATCHES=(
+	"${FILESDIR}/arm-r1.patch"
+	"${FILESDIR}/neon.patch"
+	"${FILESDIR}/x265-3.3-ppc64.patch"
+	"${FILESDIR}/tests.patch"
+	"${FILESDIR}/test-ns.patch"
+)
+
+src_unpack() {
+	if [[ ${PV} = 9999* ]]; then
+		git-r3_src_unpack
+	else
+		unpack ${A}
+		export S="$(echo "${WORKDIR}/${PN}_"*"/source")"
+	fi
+}
+
+# By default, the library and the encoder is configured for only one output bit
+# depth. Meaning, one has to rebuild libx265 if (s)he wants to produce HEVC
+# files with a different bit depth, which is annoying. However, upstream
+# supports proper namespacing for 8bits, 10bits & 12bits HEVC and linking all
+# that together so that the resulting library can produce all three of them
+# instead of only one.
+# The API requires the bit depth parameter, so that libx265 can then chose which
+# variant of the encoder to use.
+# To achieve this, we have to build one (static) library for each non-main
+# variant, and link it into the main library.
+# Upstream documents using the 8bit variant as main library, hence we do not
+# allow disabling it: "main" *MUST* come last in the following list.
+
+x265_get_variants() {
+	local variants=""
+	use 12bit && variants+="main12 "
+	use 10bit && variants+="main10 "
+	variants+="main"
+	echo "${variants}"
+}
+
+x265_variant_src_configure() {
+	mkdir -p "${BUILD_DIR}" || die
+	pushd "${BUILD_DIR}" >/dev/null || die
+
+	einfo "Configuring variant: ${MULTIBUILD_VARIANT} for ABI: ${ABI}"
+
+	local mycmakeargs=( "${myabicmakeargs[@]}" )
+	case "${MULTIBUILD_VARIANT}" in
+		"main12")
+			mycmakeargs+=(
+				-DHIGH_BIT_DEPTH=ON
+				-DEXPORT_C_API=OFF
+				-DENABLE_SHARED=OFF
+				-DENABLE_CLI=OFF
+				-DMAIN12=ON
+			)
+			if [[ ${ABI} = x86 ]] ; then
+				mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+			fi
+			if [[ ${ABI} = arm* ]] ; then
+				# 589674
+				mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+			fi
+			# disable altivec for 12bit build #607802#c5
+			if [[ ${ABI} = ppc* ]] ; then
+				mycmakeargs+=(
+					-DENABLE_ALTIVEC=OFF
+					-DCPU_POWER8=$(usex cpu_flags_ppc_vsx2 ON OFF)
+				)
+			fi
+			;;
+		"main10")
+			mycmakeargs+=(
+				-DHIGH_BIT_DEPTH=ON
+				-DEXPORT_C_API=OFF
+				-DENABLE_SHARED=OFF
+				-DENABLE_CLI=OFF
+				-DENABLE_HDR10_PLUS=ON
+			)
+			if [[ ${ABI} = x86 ]] ; then
+				mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+			fi
+			if [[ ${ABI} = arm* ]] ; then
+				# 589674
+				mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+			fi
+			# disable altivec for 10bit build #607802#c5
+			if [[ ${ABI} = ppc* ]] ; then
+				mycmakeargs+=(
+					-DENABLE_ALTIVEC=OFF
+					-DCPU_POWER8=$(usex cpu_flags_ppc_vsx2 ON OFF)
+				)
+			fi
+			;;
+		"main")
+			if (( "${#MULTIBUILD_VARIANTS[@]}" > 1 )) ; then
+				local myvariants=( "${MULTIBUILD_VARIANTS[@]}" )
+				unset myvariants[${#MULTIBUILD_VARIANTS[@]}-1]
+				local liblist="" v=
+				for v in "${myvariants[@]}" ; do
+					ln -s "${BUILD_DIR%-*}-${v}/libx265.a" "libx265_${v}.a" ||	die
+					liblist+="libx265_${v}.a;"
+				done
+				mycmakeargs+=(
+					-DEXTRA_LIB="${liblist}"
+					-DEXTRA_LINK_FLAGS=-L.
+					-DLINKED_10BIT=$(usex 10bit)
+					-DLINKED_12BIT=$(usex 12bit)
+				)
+				if [[ ${ABI} = ppc* ]] ; then
+					# upstream uses mix of altivec + power8 vectors
+					# it's impossible to enable altivec without CPU_POWER8
+					# and it does not work on ppc32
+					# so we toggle both variables together
+					mycmakeargs+=(
+						-DCPU_POWER8=$(usex cpu_flags_ppc_vsx2 ON OFF)
+						-DENABLE_ALTIVEC=$(usex cpu_flags_ppc_vsx2 ON OFF)
+					)
+				fi
+			fi
+			;;
+		*)
+			die "Unknown variant: ${MULTIBUILD_VARIANT}";;
+	esac
+	cmake_src_configure
+	popd >/dev/null || die
+}
+
+multilib_src_configure() {
+	# -Werror=odr
+	# https://bugs.gentoo.org/875854
+	# https://bitbucket.org/multicoreware/x265_git/issues/937/build-fails-with-lto
+	filter-lto
+
+	local myabicmakeargs=(
+		-DENABLE_TESTS=$(usex test ON OFF)
+		$(multilib_is_native_abi || echo "-DENABLE_CLI=OFF")
+		-DENABLE_PIC=ON
+		-DENABLE_LIBNUMA=$(usex numa ON OFF)
+		-DGIT_ARCHETYPE=1 #814116
+		-DLIB_INSTALL_DIR="$(get_libdir)"
+	)
+
+	# Unfortunately, the asm for x86/x32/arm isn't PIC-safe.
+	if [[ ${ABI} = x86 ]] ; then
+		# Bug #528202, bug #913412
+		myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+	elif [[ ${ABI} = x32 ]] ; then
+		# bug #510890
+		myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+	elif [[ ${ABI} = arm ]] ; then
+		myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+	fi
+
+	local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
+	multibuild_foreach_variant x265_variant_src_configure
+}
+
+multilib_src_compile() {
+	local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
+	multibuild_foreach_variant cmake_src_compile
+}
+
+x265_variant_src_test() {
+	if [ -x "${BUILD_DIR}/test/TestBench" ] ; then
+		"${BUILD_DIR}/test/TestBench" || die
+	else
+		einfo "Unit tests check only assembly."
+		einfo "You do not seem to have any for ABI=${ABI}, x265 variant=${MULTIBUILD_VARIANT}"
+		einfo "Skipping tests."
+	fi
+}
+
+multilib_src_test() {
+	local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
+	multibuild_foreach_variant x265_variant_src_test
+}
+
+multilib_src_install() {
+	# Install only "main" variant since the others are already linked into it.
+	local MULTIBUILD_VARIANTS=( "main" )
+	multibuild_foreach_variant cmake_src_install
+}
+
+multilib_src_install_all() {
+	dodoc -r "${S}/../doc/"*
+
+	# we don't install *.a files for all variants,
+	# so just delete these files instead of pretending
+	# real USE=static-libs support
+	find "${ED}" -name "*.a" -delete || die
+}
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-9999.ebuild
index 7503475200d5..8be9f4a93e84 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit cmake multilib-minimal multibuild
+inherit cmake flag-o-matic multilib-minimal multibuild
 
 if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
@@ -156,6 +156,11 @@ x265_variant_src_configure() {
 }
 
 multilib_src_configure() {
+	# -Werror=odr
+	# https://bugs.gentoo.org/875854
+	# https://bitbucket.org/multicoreware/x265_git/issues/937/build-fails-with-lto
+	filter-lto
+
 	local myabicmakeargs=(
 		-DENABLE_TESTS=$(usex test ON OFF)
 		$(multilib_is_native_abi || echo "-DENABLE_CLI=OFF")