gentoo auto-resync : 10:01:2024 - 19:03:44

12 files changed, 223 insertions, 35 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index e172edaa32c2..33d3f7fddad2 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/jasper/Manifest b/media-libs/jasper/Manifest
index 388758f5acd8..6049e50121d8 100644
--- a/media-libs/jasper/Manifest
+++ b/media-libs/jasper/Manifest
@@ -1,4 +1,6 @@
 DIST jasper-4.0.0.tar.gz 1975127 BLAKE2B d4d8ae3324f3753e999adee57c215b89fa0ddeb3d945f10de15459a7d6566f1de9cbcd27a418bcc3c128bc138fff7e3f1cc157b6750d2d7dc1216f8e8cbc8bea SHA512 dc03434870e85b1fdbdf41a3e07ce5a8044c8d225717d3d7a5969d45e3bd716bfb2abc4b4e0b8cec2f4071a7520c5d3e48939dba0cabe6d192eacd593de0c563
+DIST jasper-4.1.1.tar.gz 1979438 BLAKE2B 7f72c7f5633b7b0b119733ea7cdaa51684d3593ea19de21ae45f036ac79245b418b4f72a90f4b7d458b38ea480f008a8b67a74a0c4f440c9d86f76419e04e712 SHA512 a15c196d7e448fb3c8b6512793d4b430e58ba6adf343b46392cac0880ae8c385cd75b43dd566c4a25baab983089cb95c00ae538dc0b84282cc98f2a9ce398d43
 EBUILD jasper-4.0.0.ebuild 1274 BLAKE2B 9eaa72962ac0bed19172c64363ed3e875c6899c6c6b68e83a6a1c448c12cf9bbf3958344f6fecf5444c255daee10814232c759ec4aec643e3c0126d76c83d47e SHA512 7987d3e79be0c2a97850b1cf37423785f5733e1c431e8d5bc7d81a11d82099779fdbf6aacf258e25abbd6fce0ecf58a7373817610d29c76310d820f419772554
+EBUILD jasper-4.1.1.ebuild 1274 BLAKE2B 9eaa72962ac0bed19172c64363ed3e875c6899c6c6b68e83a6a1c448c12cf9bbf3958344f6fecf5444c255daee10814232c759ec4aec643e3c0126d76c83d47e SHA512 7987d3e79be0c2a97850b1cf37423785f5733e1c431e8d5bc7d81a11d82099779fdbf6aacf258e25abbd6fce0ecf58a7373817610d29c76310d820f419772554
 EBUILD jasper-9999.ebuild 1274 BLAKE2B 9eaa72962ac0bed19172c64363ed3e875c6899c6c6b68e83a6a1c448c12cf9bbf3958344f6fecf5444c255daee10814232c759ec4aec643e3c0126d76c83d47e SHA512 7987d3e79be0c2a97850b1cf37423785f5733e1c431e8d5bc7d81a11d82099779fdbf6aacf258e25abbd6fce0ecf58a7373817610d29c76310d820f419772554
 MISC metadata.xml 705 BLAKE2B 1ec5282be2bb47e2aec8ff90ce6838c7d21675141450f9c4e1d7b00a61129c3dc01f987f4c31d442caed3121f4bae85a83078fa46f5a2dd05d41ab40e8c3adcd SHA512 69cf7881e582eb205283ad2ffdf6823f2dc6ce0200f88d8bb5cd31b983fb57c19b261e4f56fa95ae2aa1515d2eb34a805729d75585a671a36a782e37ea98c9d7
diff --git a/media-libs/jasper/jasper-4.1.1.ebuild b/media-libs/jasper/jasper-4.1.1.ebuild
new file mode 100644
index 000000000000..c9b2cc7fa814
--- /dev/null
+++ b/media-libs/jasper/jasper-4.1.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Implementation of the codec specified in the JPEG-2000 Part-1 standard"
+HOMEPAGE="https://jasper-software.github.io/jasper"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/jasper-software/jasper.git"
+else
+	SRC_URI="https://github.com/jasper-software/${PN}/archive/version-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~x86"
+	S="${WORKDIR}/${PN}-version-${PV}"
+fi
+
+LICENSE="JasPer2.0"
+SLOT="0/7"
+IUSE="doc heif jpeg opengl"
+
+RDEPEND="
+	heif? ( media-libs/libheif:= )
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	opengl? (
+		media-libs/freeglut
+		virtual/opengl
+		virtual/glu
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-shells/bash
+	doc? (
+		app-doc/doxygen
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-plaingeneric
+		virtual/latex-base
+	)"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBASH_PROGRAM="${BROOT}"/bin/bash
+
+		# documentation
+		$(cmake_use_find_package doc Doxygen)
+		$(cmake_use_find_package doc LATEX)
+
+		# HEIF
+		-DJAS_ENABLE_LIBHEIF=$(usex heif)
+
+		# JPEG
+		-DJAS_ENABLE_LIBJPEG=$(usex jpeg)
+
+		# OpenGL
+		-DJAS_ENABLE_OPENGL=$(usex opengl)
+	)
+	cmake_src_configure
+}
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 7cf5d19a67ff..c510aeb1eeee 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -6,7 +6,6 @@ AUX opencv-4.5.0-link-with-cblas-for-lapack.patch 726 BLAKE2B adbffd961c88229bf8
 AUX opencv-4.8.0-arm64-fp16.patch 12222 BLAKE2B 18803d74cb57bbc303c8159ca69d24dcc47d00a314bfdababeadd3b85306d289c8b35a1106011086931396e0ab82d98964434d0c0eaa34c25451c766ca9b9199 SHA512 1d9d42a711a1ae0ec7f1f641a68271d4b36f6b8701997a05d65c633d3531cad75e4edbf71c4f80cc59a9a14baa8ddebf19081dc67b99898dce13da8e3746227e
 AUX opencv-4.8.0-fix-cuda-12.2.0.patch 1920 BLAKE2B c43157c4859666a962fa40ed435aeab6b17ac01b9b67dbba0955fb7c009504b1780f5de2a40ee63db245cadf0da41b40fda0d7e06ad719071b12ba385f693ea2 SHA512 5ab0c15811748307971e8939a40c08c2c9cf3e38d2acafff72a3890f6d7c7133d8c7a087cf1a05b2dbe1907dd88911872c61c10f7638edb46ee679f658b265c6
 AUX opencv-4.8.0-fix-flatbuffer.patch 1764 BLAKE2B 806f61bf7017fbcb5b5058686db9dd2272eb61d6a2952f0f029bc76d62172a18f9a21661426f13cfd5066fc60710b218bb9b2dfded61e33040469da0e0b72c94 SHA512 2679f52c3df16b7daac1fafa0b24796568a2555de03805ee6ee6b2e08a2be9f63fca44c1b472f5ffe2dfb7fe8b3d754b3ba39a71419974613a9b3de70a09cefb
-AUX opencv-4.8.0-fix-protobuf.patch 543 BLAKE2B 2c3ac7ddeda366cb117d5deddefe732dd6918bc54e468b1cc8d95e40bb9e5cde1776046a894e8f26416edffa39dc6c97547cbd688e0566587f9690e721b4c1e1 SHA512 799e3f3d019624476a285c2795d28f022bb126e9b9f511b153aef131a7cae2e3fb6361bd21b7ea34dfea984e3ef9e1a0a40d09a5a72a808a31e1eb15548b15a7
 AUX opencv-4.8.1-ade-0.1.2a.tar.gz.patch 652 BLAKE2B 91b933513485c5e4a33b3711328f01752ea8f77bf26701744ff9a7d56f899227c1f5899dd68ec7050929c2068e2d5dc805533173543ac0ab5a5db827a6d075c3 SHA512 61267dae88ca1e9f5d99e6d57101c0a0a2df2bc5fc9f646d14953707f8c1f4fc9f58e7861b007f5970603f267f797c43cbc35e29aa66e343fcfa6e568750934e
 AUX opencv-4.8.1-drop-python2-detection.patch 1041 BLAKE2B bd7c4f66b36d04b57a4493df1b00ee6700ed6f28464f2538bde62d2b2a3d29ebb82946a1765540e6977ce6ee111dc2f37c3419ee74536f9c55340ae2e550d48a SHA512 7e5e36fa1fc312a4c791c099618c73b2f4ed5810a66f4de4ead5d0f5917d60c191c55289538bf908bcfa45522939ddfac62505e79fbfb7c3ea046a2027b576ff
 AUX opencv-4.8.1-eliminate-lto-compiler-warnings.patch 1241 BLAKE2B eead5a16616fd9afcced21180e8e336e32ad387ff4010c55e5edcf2f81f09244c4914c98ab0439911f5ab8df1f61527a83ff5f09db65743fc5266748fc8bf969 SHA512 b3907b9d9f96f107fd27189961fe1a15b5706f66524cf21ea342ed04eedfa21c08d7572001d3afb70c54a7bfef56093fd7f8ac7a5dd9ea768f1b0412b5658eec
@@ -32,6 +31,6 @@ DIST opencv_3rdparty-a8b69ccc738421293254aec5ddb38bd523503252.tar.gz 920403 BLAK
 DIST opencv_3rdparty-b2bfc75f6aea5b1f834ff0f0b865a7c18ff1459f.tar.gz 10036903 BLAKE2B c13559569808db24105049e2081bc466c0e8b6dab58bcc69001e49ff82e03ec4701e25648b5e542b7df2c8e522abfbd82c9825e66c37d6a673847b41bf6effae SHA512 3fc44f12802aa1dad0b12372d53242ae2134a2d74ca0b6d8e4639551623426106781a41d77ebfce79ac625a49aec26b0d7425e0d31f09bab6a15e3d43caef8bc
 DIST opencv_3rdparty-fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d.tar.gz 1470898 BLAKE2B f1794cc8f8684501f670db3d720c02f35c57ebe91f276cc21dea1f1c1426740d03569143fec74380e941703b5086db5f013ca913fb296eda99559115fd53ca30 SHA512 07118b9d688bf0ff34a6e4ca1548006124d80d11e7b48f08c9e1910b64249b1dad0ace460f50adda0ecb69b90871fc59cc25f451570c63f7c6d6ba2b92d8801c
 DIST vgg_boostdesc-3.2.0.tar.gz 1867770 BLAKE2B 1fa5b58e73b6fa56ecf8d19af22298f729942ee1369082e173445d09d3de767bf844bad3d2b462efc1199c392f37c88ba49a9996ba8bfd84b4abeba7de94db63 SHA512 4a046aedd639c8eb4b295b0f499e756deb66210ca083f0124c75531e540663367cb58f6d175f66c4713324177036cd89a8869bdab2de8d1736dafc7f00ef9f44
-EBUILD opencv-4.8.0-r1.ebuild 21546 BLAKE2B 188f2883b59013f491619ef99bce3a7baedaf63876f6a1783cc7216b850dbf16196779dca3cc1928c634a1fbacd20b99efe438bd831373f05486bfcd10b52805 SHA512 67a521b21c3126826377fd9d8f1b179860d1e030022931bd0bc9f6965ee0b2de2e3fc6aeaf33d670e9b5dd8e718396624be9b8a22538279aea27e21f0f79a358
+EBUILD opencv-4.8.0-r3.ebuild 21551 BLAKE2B dc795690c4d8672c82ce44ba3e7fb67c32206155cc18624109da4106b0eee16d03fd3591d843af6bd1b5caf0c5050c4ee75201758e8a0d764ffdb4195844f301 SHA512 f9d927735bdd34d41b0dcc9a2a7ce5944c7f40f75934b0e93574ce2619d06a0d01527a20c1320a9cfd907ce11f51dddb3de2e413796ddf9f2f90d3932db5bbac
 EBUILD opencv-4.8.1-r1.ebuild 21641 BLAKE2B 066ba03a545f0952f15b2061e183beb8ab6fafebbd8ae9c6d13f687189889abcb5158e8baffc106dd5e2ee2971ad2b658aa3699cf64c8f5adead3a266d6553ec SHA512 453233aa0c6075722810ba736c5f04bfb0eefdb852c51185aeea19f62d254a667e4b46757cbcb393024114cb9bbd16bbd0fe172241156a53dfc1a7cca9d49b8f
-MISC metadata.xml 3496 BLAKE2B 8b592d16ed3235c2bcd5f199a7a59c2c33c8d2d4cf5e7c894b09a82134c0b2a9339e79da7bb55be15a038142f9396be38265d5c8a8a28d347d2b4db86b550aed SHA512 58d09b8dfa586c9d7abb4d0eedbff2e079233627d7748c2c0504b5596227590e0bd5c77aae699b3f12bd33e298dde585ac9bd73f746cb19affe6dbe483ef5ea6
+MISC metadata.xml 3428 BLAKE2B 17df3db9dc912981f85b6dd7e500b593504fe6d17c85d1ebc07afa8ab04266489550b03aa20ee80615f52f8e2a206c77b00d9bfc9096bf77239378fa0874a0db SHA512 15e6dc56efd85d9b6d173979ef5edc38978cf31f0b2700674ffda5fb53923df77453234b431c21ff61943c57218f8fe4fe611701abb630c9867ed990cf953d49
diff --git a/media-libs/opencv/files/opencv-4.8.0-fix-protobuf.patch b/media-libs/opencv/files/opencv-4.8.0-fix-protobuf.patch
deleted file mode 100644
index 937e00e0c024..000000000000
--- a/media-libs/opencv/files/opencv-4.8.0-fix-protobuf.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/cmake/OpenCVFindProtobuf.cmake
-+++ b/cmake/OpenCVFindProtobuf.cmake
-@@ -31,7 +31,7 @@ if(BUILD_PROTOBUF)
-   set(HAVE_PROTOBUF TRUE)
- else()
-   unset(Protobuf_VERSION CACHE)
--  find_package(Protobuf QUIET)
-+  find_package(protobuf)
- 
-   # Backwards compatibility
-   # Define camel case versions of input variables
-@@ -50,7 +50,7 @@ else()
-   endforeach()
-   # end of compatibility block
- 
--  if(Protobuf_FOUND)
-+  if(protobuf_FOUND)
-     if(TARGET protobuf::libprotobuf)
-       set(Protobuf_LIBRARIES "protobuf::libprotobuf")
-     else()
diff --git a/media-libs/opencv/metadata.xml b/media-libs/opencv/metadata.xml
index 80f1912bd4fd..fc1efa988e96 100644
--- a/media-libs/opencv/metadata.xml
+++ b/media-libs/opencv/metadata.xml
@@ -34,7 +34,6 @@
 		<flag name="gflags">Use Google's C++ argument parsing library (<pkg>dev-cpp/gflags</pkg>)</flag>
 		<flag name="glog">Use Google's C++ logging library (<pkg>dev-cpp/glog</pkg>)</flag>
 		<flag name="gtk3">Enable <pkg>x11-libs/gtk+</pkg>:3 support</flag>
-		<flag name="lto">Build using Link Time Optimizations (LTO)</flag>
 		<flag name="non-free">Enable non-free components</flag>
 		<flag name="opencvapps">Enable compilation with opencvapps</flag>
 		<flag name="tbb">Enable multithreading with the Intel Threads Building Block (<pkg>dev-cpp/tbb</pkg>)</flag>
diff --git a/media-libs/opencv/opencv-4.8.0-r1.ebuild b/media-libs/opencv/opencv-4.8.0-r3.ebuild
index e5f917168501..99a65fe7d7c7 100644
--- a/media-libs/opencv/opencv-4.8.0-r1.ebuild
+++ b/media-libs/opencv/opencv-4.8.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="Apache-2.0"
 SLOT="0/${PV}" # subslot = libopencv* soname version
 KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86"
-IUSE="contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda debug dnnsamples download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack lto opencl openexr opengl openmp opencvapps png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
+IUSE="contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda debug dnnsamples download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack opencl openexr opengl openmp opencvapps png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
 
 # The following lines are shamelessly stolen from ffmpeg-9999.ebuild with modifications
 ARM_CPU_FEATURES=(
@@ -87,7 +87,7 @@ REQUIRED_USE="
 
 RDEPEND="
 	app-arch/bzip2[${MULTILIB_USEDEP}]
-	dev-libs/protobuf:=[${MULTILIB_USEDEP}]
+	<dev-libs/protobuf-23:=[${MULTILIB_USEDEP}]
 	sys-libs/zlib[${MULTILIB_USEDEP}]
 	cuda? ( dev-util/nvidia-cuda-toolkit:0= )
 	contribdnn? ( dev-libs/flatbuffers:= )
@@ -292,7 +292,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-4.1.2-opencl-license.patch
 	"${FILESDIR}"/${PN}-4.4.0-disable-native-cpuflag-detect.patch
 	"${FILESDIR}"/${PN}-4.5.0-link-with-cblas-for-lapack.patch
-	"${FILESDIR}"/${PN}-4.8.0-fix-protobuf.patch
 	"${FILESDIR}"/${PN}-4.8.0-fix-flatbuffer.patch
 	"${FILESDIR}"/${PN}-4.8.0-arm64-fp16.patch
 	"${FILESDIR}"/${PN}-4.8.0-fix-cuda-12.2.0.patch
@@ -343,6 +342,9 @@ src_prepare() {
 }
 
 multilib_src_configure() {
+	# bug #919101 and https://github.com/opencv/opencv/issues/19020
+	filter-lto
+
 	# please dont sort here, order is the same as in CMakeLists.txt
 	GLOBALCMAKEARGS=(
 		# for protobuf
@@ -469,7 +471,6 @@ multilib_src_configure() {
 		-DENABLE_INSTRUMENTATION=OFF
 		-DGENERATE_ABI_DESCRIPTOR=OFF
 		-DDOWNLOAD_EXTERNAL_TEST_DATA=OFF
-		-DENABLE_LTO=$(usex lto)
 	# ===================================================
 	# things we want to be hard off or not yet figured out
 	# ===================================================
diff --git a/media-libs/osl/Manifest b/media-libs/osl/Manifest
index 55a2a4c68b4c..051fdf1f1c52 100644
--- a/media-libs/osl/Manifest
+++ b/media-libs/osl/Manifest
@@ -1,7 +1,9 @@
 DIST osl-1.12.11.0.tar.gz 20287156 BLAKE2B 178db816980929cc61a0deea63f715a9f10adc41c6dd264bca8df451ef9531c4ee9477f6374f160b2a7d6fb72289a3edcbe5a3e8050ff2fdcc6bfe57fda58626 SHA512 9cf7b08f43e66d280cb90bf8c579f3a7d949934ac8e7a9289113a4a34158a43e32c9b73863f2a94a628ebc1a988923c3a7d32f0944745ae7c74dc164fdd5125e
 DIST osl-1.12.13.0.tar.gz 20286745 BLAKE2B 75a2a5d10000ba26cd11463dde710d5be3b8b2d227de45263d8bd39fd87ca064f7c6d2b2f9cea2fdb8f29ccaa94d3ef60e2ff2e0e6d867385e2298dd10ef61b6 SHA512 d7e6ab79f77f2854cbb4fa2fbe5fc92659bb015b1bbffcee2ef86185cf20235990fa3b20308601aa298fedc85d3fcd4451b7b7ff0df7def97027efe4fb8a02bc
+DIST osl-1.12.14.0.tar.gz 20555853 BLAKE2B 4f6bc2084e4c1b25e707a37830961f20926e6ab5cb915c763cbd8126127e70f6368832077729ab5e044f573e8c38c4afb413eff8adccee5ea1ae96cb9be43b6e SHA512 51641e58fb0bba042853e3976c104decc788f1b1d3ec2e33a3f5504b11b05950dc38766ffb066b0f76edc4e0a8829d6b7dd408d9288b74d69380395b1d991bd5
 DIST osl-1.12.7.0.tar.gz 20250356 BLAKE2B a9398243546b1bfc1e3f9602f6112a72a8e7cb6ace54e93d0e5f30d943474e82c3317596597d6a09e0f2cf04b1b21f05c31a2357e3d667d710cd2aa340f5fd63 SHA512 ec0391dfc95140fee4fa8332991cdcb0978dafc436f3e07d0293e2baa2014b8765e6b60631ae5a8bbd6e16dbcf37f04c076d7d6b2d8bfa58b78471f0d92c433f
 EBUILD osl-1.12.11.0.ebuild 2654 BLAKE2B 03dbc702cf4ee912aaa9c8e6fc367c1d329e4197c921b83530ef067655bc5d9707709ff1faabccec73afc5cdca1c35e13b332f27c1753e995d15e175be27faa2 SHA512 eb64532b37668c315ece45468dff7de849a80cd4a4d977e9ec3fe248d844deb431eeefeb54e6cfdc886cdae8db25573cd6345e7df0ab09c8dd8a0844f5bc17bc
 EBUILD osl-1.12.13.0.ebuild 2937 BLAKE2B d0cc000f15b02c06109d3bfeec16423da744b8b3aa4eae200cc2e34edc92d5aa9dc63652e6291e4deb37e96dc0c2815a936e920cbb560c72936543e63b977876 SHA512 d0293f173cbaff89eef8c7d00bf4a1c23b10af4cfe4091d9cf0dbda9a4321ebc8f8954e1fca40c59ca2f539583dfced2ac61f634a9d3a5579fdffde97a3defc9
+EBUILD osl-1.12.14.0.ebuild 3696 BLAKE2B 73bf112684b06c5c75521a8df1e7963551a21caabb53754cc8455d949417079bca07afbf092f7c173490a5ed0003aa163a2731ce8a5b7be4bf4fbfaf36688024 SHA512 fe1b2b7bb061eeba5dbee874e9fa4a429430c8b9aadc473aaa6736ac824bd84389a0365154ad06e4ebb92ede7198c6611310772bc787b2c553683eb542f52a3c
 EBUILD osl-1.12.7.0.ebuild 2761 BLAKE2B b70f2c5c5d7a8cd3d5031f35562e3266d21e5212a53ca5ea2ea4c8d2476651095e6140c6490648ab0fcc2c629e81d4ec628155bbea8d78899446e906596d065d SHA512 daede9ce4d5d366bcba462adfad893fe19d9d41b05adc807632b9d67422b452170a2cb453fefba826877f4bbafc4639311aab457f16ffc324b66f8688c0e517c
-MISC metadata.xml 841 BLAKE2B a2574fca1885067bed78159a9feee75f1118b1d335568a2cbdba347bf62a0b3f75a510bca271c4ee94ca5ce0bb15dcf9bb699cfe7a385f404047da9fef2dcdc3 SHA512 19afc8e4b777384b3421a1a82ff8ae34a05074e5c55010a500b17cfab4b4ae930cfb633c3bdb8013a8dcb9b82bad8fc7d684ef3e4a85352ce0c49bfb26079dce
+MISC metadata.xml 928 BLAKE2B 83ad1e0e7bcbed3f4c279b1da4683b8413a30c9b85d97de88b61c2941749a34183016c5f024a486801e7c4e78c4e4286d3f88a11a935763dd3e91056b6e5a93d SHA512 b171f20751545e25e27e9fc85161d0de1d6290c36b712004b4068fb2cfa223935662c88f6804f905ca0843407fac02dd1aeb4e80a603ad7f5f89acdfaabb83c8
diff --git a/media-libs/osl/metadata.xml b/media-libs/osl/metadata.xml
index a300ead37dfa..bd83cdb5a001 100644
--- a/media-libs/osl/metadata.xml
+++ b/media-libs/osl/metadata.xml
@@ -16,9 +16,10 @@
 	</longdescription>
 	<use>
 		<flag name="partio">Use <pkg>media-libs/partio</pkg></flag>
-		<flag name="qt5">Build the osltoy binary</flag>
+		<flag name="gui">Build the osltoy binary (with Qt5)</flag>
+		<flag name="qt6">Build the osltoy binary (with Qt6)</flag>
 	</use>
 	<upstream>
-		<remote-id type="github">imageworks/OpenShadingLanguage</remote-id>
+		<remote-id type="github">AcademySoftwareFoundation/OpenShadingLanguage</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-libs/osl/osl-1.12.14.0.ebuild b/media-libs/osl/osl-1.12.14.0.ebuild
new file mode 100644
index 000000000000..9cfb9be255ac
--- /dev/null
+++ b/media-libs/osl/osl-1.12.14.0.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+# Check this on updates
+LLVM_MAX_SLOT=15
+
+inherit cmake flag-o-matic llvm toolchain-funcs python-single-r1
+
+DESCRIPTION="Advanced shading language for production GI renderers"
+HOMEPAGE="https://www.imageworks.com/technology/opensource https://github.com/AcademySoftwareFoundation/OpenShadingLanguage"
+# If a development release, please don't keyword!
+SRC_URI="https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/OpenShadingLanguage-${PV}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+
+X86_CPU_FEATURES=(
+	sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
+	avx:avx avx2:avx2 avx512f:avx512f f16c:f16c
+)
+CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
+
+IUSE="doc gui partio qt6 test ${CPU_FEATURES[@]%:*} python"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	dev-libs/boost:=
+	dev-libs/pugixml
+	>=media-libs/openexr-3:0=
+	>=media-libs/openimageio-2.3.12.0:=
+	<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):=
+	sys-libs/zlib:=
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/pybind11[${PYTHON_USEDEP}]
+		')
+	)
+	partio? ( media-libs/partio )
+	gui? (
+		!qt6? (
+			dev-qt/qtcore:5
+			dev-qt/qtgui:5
+			dev-qt/qtwidgets:5
+		)
+		qt6? (
+			dev-qt/qtbase:6[gui,widgets]
+		)
+	)
+"
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+"
+
+llvm_check_deps() {
+	has_version -r "sys-devel/clang:${LLVM_SLOT}"
+}
+
+pkg_setup() {
+	llvm_pkg_setup
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local cpufeature
+	local mysimd=()
+	for cpufeature in "${CPU_FEATURES[@]}"; do
+		use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
+	done
+
+	local mybatched=()
+	use cpu_flags_x86_avx && mybatched+=(
+		"b8_AVX"
+	)
+	use cpu_flags_x86_avx2 && mybatched+=(
+		"b8_AVX2"
+		"b8_AVX2_noFMA"
+	)
+	use cpu_flags_x86_avx512f && mybatched+=(
+		"b8_AVX512"
+		"b8_AVX512_noFMA"
+		"b16_AVX512"
+		"b16_AVX512_noFMA"
+	)
+
+	# If no CPU SIMDs were used, completely disable them
+	[[ -z ${mysimd} ]] && mysimd=("0")
+	[[ -z ${mybatched} ]] && mybatched=("0")
+
+	# This is currently needed on arm64 to get the NEON SIMD wrapper to compile the code successfully
+	# Even if there are no SIMD features selected, it seems like the code will turn on NEON support if it is available.
+	use arm64 && append-flags -flax-vector-conversions
+
+	local gcc="$(tc-getCC)"
+	local mycmakeargs=(
+		# std::tuple_size_v is c++17
+		-DCMAKE_CXX_STANDARD=17
+		-DDOWNSTREAM_CXX_STANDARD=17
+		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
+		-DINSTALL_DOCS=$(usex doc)
+		-DUSE_CCACHE=OFF
+		-DLLVM_STATIC=OFF
+		-DOSL_BUILD_TESTS=$(usex test)
+		-DSTOP_ON_WARNING=OFF
+		-DUSE_PARTIO=$(usex partio)
+		-DUSE_PYTHON=$(usex python)
+		-DPYTHON_VERSION="${EPYTHON/python}"
+		-DUSE_SIMD="$(IFS=","; echo "${mysimd[*]}")"
+		-DUSE_BATCHED="$(IFS=","; echo "${mybatched[*]}")"
+		-DVEC_REPORT=yes
+	)
+
+	if use gui; then
+		mycmakeargs+=( -DUSE_QT=yes )
+		if ! use qt6; then
+			mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt6=ON )
+		fi
+	else
+		mycmakeargs+=( -DUSE_QT=no )
+	fi
+
+	cmake_src_configure
+}
+
+src_test() {
+	# TODO: investigate failures
+	local myctestargs=(
+		-E "(osl-imageio|osl-imageio.opt|render-background|render-bumptest|render-mx-furnace-burley-diffuse|render-mx-furnace-sheen|render-mx-burley-diffuse|render-mx-conductor|render-mx-generalized-schlick|render-mx-generalized-schlick-glass|render-microfacet|render-oren-nayar|render-uv|render-veachmis|render-ward|render-raytypes.opt|color|color.opt|example-deformer)"
+	)
+
+	cmake_src_test
+}
diff --git a/media-libs/tiff/Manifest b/media-libs/tiff/Manifest
index adb82765f0d9..a4de5f3c61b9 100644
--- a/media-libs/tiff/Manifest
+++ b/media-libs/tiff/Manifest
@@ -10,5 +10,5 @@ DIST tiff-4.6.0.tar.xz 2124388 BLAKE2B 3b508b02b0a536c5bc8e67fe4c1b09ae9c8302527
 DIST tiff-4.6.0.tar.xz.sig 310 BLAKE2B 9f159a5839dd41bda34eceeed6e451455fbcfec5d51ebb097038e3977a391a751e91a9f683375593f45af0f9c8f0dbe55a0cc437fe4512537b30d513adfdb2c0 SHA512 da87b4294e17d49cf60e81ec5285f503291532423330552e41dddfb672c0636e95b8a80d603c3095abbee469cb7dce63c2df0c22b751a3bf8541550f97f78b49
 EBUILD tiff-4.5.0-r2.ebuild 2864 BLAKE2B 86c265644953029f369ef4ea8a75ac463f2e7792c129b05d71eb7711e58ec14323bbde65500b123119cde3241eccb30a226d39c7ce188af0f005ea6fecda4ace SHA512 f841c9e5df12cac12a3b6c594317cee5eac92631c1df434f7ddfe33bbf7666b05a1cc20b725c87e52677f1729ceabe9078b9abf7cf8b4ee0a63b4aa6b5f7edad
 EBUILD tiff-4.5.1.ebuild 2481 BLAKE2B 1de6d42ea0adb8b49571c2c77cebd651fbd733cdf11e06d63dac12ca2c3f325249bb74bbb238192ed5e6453c3e96dd02cd326e1a7e12eecaa090d531c9a1411c SHA512 8040959ab28166f077d3f5e45cd42c749cc957e249891e139dcbee1e6b0e08e319df27f84ada066f717c7cff53e077b993c37eb52f7e6941d6ee5747ea26701e
-EBUILD tiff-4.6.0.ebuild 2430 BLAKE2B 237051f69e3b2c9737fe31f92770b58c2731700412db282f15ed70524d140a0ba80ec5b94e85bc94bc4ac74915d5ec44bbc725fed5c3f11264588d6ffdf75adf SHA512 a9b9d7083bb4399f88495dd459849806ad7f96a6e5a3b4f22a19b77d5db374058388e1996b7740f3cb91e575957e358b49cc26aa46e13a8ecb90d8ca7ce58373
+EBUILD tiff-4.6.0.ebuild 2429 BLAKE2B 0505a7b890d0b7e707630ba1cc9eb092f9a091f593fb53ad7de8e59f431e4fc46d4f9c1d15b00a171919c34bb1e00485ba67eeaae58ac3363cff10341f9bd9b6 SHA512 a7a2ee7172377005bb47691b6637e690cb8138e30b734257e2984a313fc6c64f9ee241cfa3b65e54ec5adcb97028cd2aef9932dff7e9e398e172ca488655bd99
 MISC metadata.xml 615 BLAKE2B b76f8c2714111fe539c2d15b56361bc3b2bc7469b3cd74cf933a9dad4ac8577b7bb1a2bc010ceb3623640778d1dbc912433988e938db7df8f8fca67c51003c2c SHA512 81b22e0e2763fbcd573d2c1fee362785c15c7c33cc00d0f7ce89eb9f95f55e64aee78eefc51de6d7270aa966102b744f070620828becbbb03012cc22e3e99469
diff --git a/media-libs/tiff/tiff-4.6.0.ebuild b/media-libs/tiff/tiff-4.6.0.ebuild
index 9750431e4c7d..bde46d79d945 100644
--- a/media-libs/tiff/tiff-4.6.0.ebuild
+++ b/media-libs/tiff/tiff-4.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -21,7 +21,7 @@ S="${WORKDIR}/${PN}-$(ver_cut 1-3)"
 LICENSE="libtiff"
 SLOT="0/6"
 if [[ ${PV} != *_rc* ]] ; then
-	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"
+	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="+cxx jbig jpeg lzma static-libs test webp zlib zstd"
 RESTRICT="!test? ( test )"