gentoo auto-resync : 26:07:2023 - 10:30:48

9 files changed, 145 insertions, 43 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 8fc29b63d662..0b2121f06cc9 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/amf-headers/Manifest b/media-libs/amf-headers/Manifest
index 43182cc86650..706891e616ad 100644
--- a/media-libs/amf-headers/Manifest
+++ b/media-libs/amf-headers/Manifest
@@ -1,7 +1,5 @@
-DIST amf-headers-1.4.23.tar.gz 14971091 BLAKE2B d569851ccb5b3cd57bfff3e6475207e9f01681c2215add160a83165653efce2f0c8acc41a49c227952a649f0cfe92e7e713fbee8bd45b0489844c19e83fa5c74 SHA512 98b2b7d634ac24be5c5234fad99d58c9668b2dab83e89162a0508f9b06efec5de29b307534dc1dd677f9586be2c4fa58c8f04a535d5e66fa0be3b233a117a5d7
-DIST amf-headers-1.4.24.tar.gz 180663559 BLAKE2B 68d5da7a3398393f30c8dcea8d2398cb8140e29f1ed92e6a0e801531ece9af614ddb4e8ea647665352da8f2f107a574dd5d016f3244527f85e6867339c5e4901 SHA512 6183ca9ebf430b444b0754400566c8f84f6957d652c1f288ac181f308e34f418f2f138c34b2f2840079cc04c8a17ba757996650783c7e40482a36c9949667995
 DIST amf-headers-1.4.26.tar.gz 178442976 BLAKE2B a6ef9e69a2d8caab94e5d17d6bd777b3b01683e6bcdd6872df0148f742fb7bc5c4927143239320a01c3f74f033e9a3665bbcd3698949c6f66fcaf31e1edbe3f2 SHA512 2c931ef7d38ade88a96041e0012605a5d25ec484bb2134f58310cf1a2c7212a869797cef99e2e751c8a6b3c473ba1f8762d4a5d41466d38cb5e31bf664a25f55
-EBUILD amf-headers-1.4.23.ebuild 694 BLAKE2B ba44b78cd69804530554bea8c710fb7f00789ad42d3612144d633d16930d9ba2aa09e77b0ed70a4d1ead0dfc04d02d4411f041633cd03ee521922a7c29f4d464 SHA512 f5fe23c9a18fc573b9b15da064f8c67a4339e3e6c8d9af7d2c3071c48f3b1b3240224009025ae5b8be5d68a7382ea57842b50392b45d6a143104e6757aa3d21d
-EBUILD amf-headers-1.4.24.ebuild 694 BLAKE2B ba44b78cd69804530554bea8c710fb7f00789ad42d3612144d633d16930d9ba2aa09e77b0ed70a4d1ead0dfc04d02d4411f041633cd03ee521922a7c29f4d464 SHA512 f5fe23c9a18fc573b9b15da064f8c67a4339e3e6c8d9af7d2c3071c48f3b1b3240224009025ae5b8be5d68a7382ea57842b50392b45d6a143104e6757aa3d21d
+DIST amf-headers-1.4.30.tar.gz 147376939 BLAKE2B 5d2f6b3d2d2bed675896dc629baed117b986320bedd8a680c8aa19b3f46c0e6af4e51925573da95cb8c2032727f0f96806c3bffcb3130020b3ade608e467859e SHA512 b9412105ebafc578178259d06f6da25f6b21593d65aea389a34f980c6efe14820895122cc8dee5d2e505ba35cad0f7d4f2e6cd79071f32ccb0272ff804d53109
 EBUILD amf-headers-1.4.26.ebuild 694 BLAKE2B ba44b78cd69804530554bea8c710fb7f00789ad42d3612144d633d16930d9ba2aa09e77b0ed70a4d1ead0dfc04d02d4411f041633cd03ee521922a7c29f4d464 SHA512 f5fe23c9a18fc573b9b15da064f8c67a4339e3e6c8d9af7d2c3071c48f3b1b3240224009025ae5b8be5d68a7382ea57842b50392b45d6a143104e6757aa3d21d
+EBUILD amf-headers-1.4.30.ebuild 694 BLAKE2B ff31529e193c0c211d0b0f97f9c8f9a1caf68ca969d2648f4298cf67b9ab01b2818652053eada95caa68f0a33423d7b7b1fa69724b6fc4bfb343ab9a820a56ac SHA512 373a03f1f9bbc7a19abf524b7a43bcc09b25c3cbd53bb019984955aec80f5aa42c8603ec2b39f080c01a882eb9047dccc57755be2d12980e3aeee28c7bef9a80
 MISC metadata.xml 571 BLAKE2B 921f83bae051789cf587663b4168174eab058dc2866b4d9e24dcb9f3ff5f3b64ea85c7e45282c2eeea42716f7f79a971171333ece1dd72d7d2e49e84efe2ef57 SHA512 ed0a057d7f1c738308eed226c562b5a83bf6ae421f1487f98a1c8361afa65276c5ea2f83f3d8187229d88fe0fe02a41178d37347d28ddc5b22695ae3f4740368
diff --git a/media-libs/amf-headers/amf-headers-1.4.24.ebuild b/media-libs/amf-headers/amf-headers-1.4.24.ebuild
deleted file mode 100644
index f96ac72bc0e6..000000000000
--- a/media-libs/amf-headers/amf-headers-1.4.24.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/GPUOpen-LibrariesAndSDKs/AMF"
-else
-	SRC_URI="https://github.com/GPUOpen-LibrariesAndSDKs/AMF/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="The Advanced Media Framework (AMF) SDK"
-HOMEPAGE="https://github.com/GPUOpen-LibrariesAndSDKs/AMF"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-S="${WORKDIR}/AMF-${PV}"
-
-src_unpack() {
-	default
-
-	if [[ ${PV} == 9999 ]]; then
-		git-r3_src_unpack
-	fi
-}
-
-src_install() {
-	insinto "/usr/include/AMF"
-	doins -r "${S}/amf/public/include/"*
-}
diff --git a/media-libs/amf-headers/amf-headers-1.4.23.ebuild b/media-libs/amf-headers/amf-headers-1.4.30.ebuild
index f96ac72bc0e6..37174ce94183 100644
--- a/media-libs/amf-headers/amf-headers-1.4.23.ebuild
+++ b/media-libs/amf-headers/amf-headers-1.4.30.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/media-libs/embree/Manifest b/media-libs/embree/Manifest
index 8a24f99cf5a9..14b09ae06d84 100644
--- a/media-libs/embree/Manifest
+++ b/media-libs/embree/Manifest
@@ -3,6 +3,6 @@ AUX embree-3.13.5-fix-arm64.patch 2739 BLAKE2B 9e636bc3f4e49564f156cc977c98466bb
 AUX embree-3.13.5-fix-openimageio-test.patch 4526 BLAKE2B c1560a8122df45ad860ac9d19108cdc4920ab2e4d06c6ba968d6c43e88e4c6d47c26a463abf0f21db8290572172b6448b4ec579b6df9875b4e55688191cfed13 SHA512 f40d3cbcd62f16aea89e3d1873dccf020a2aa07679f5f99ae47f3fcc9e66dab9f2422c713a8cbc39dd1c09a2a838e3dbb4b859c785f503a154eee4cc244a3cc8
 DIST embree-3.13.4.tar.gz 13733908 BLAKE2B 4c6c24f62ee88a09149bd930716c71e91d54563eea5cc103c0346d3808c693e8470fc7ea98651e0df9e4423bda565d7ab1a23e16c9d0441c79e9ec9c8571b0fa SHA512 685c3935fabe1bfa7260ef148df26b686b085b75011d72011461471cbcef786a5ce7a0e85c57b2df05798489a2d4e80a8d3ee5df986029edad7df7511d99c0ca
 DIST embree-3.13.5.tar.gz 13739115 BLAKE2B 52ad8e3520aa789f7987467c6979be06f883803757e842316ecf708deeed11214dd60570eda5708e701047b1a14ea37710d158df544817dc536bfda444a68218 SHA512 13ae19b1750197fb4887ba601c75d1b54b3c388224672b6561dd922bc9b9747139cf46ce554727e3afa13dcf152ce4d703935cb9105ced792b011f2d05fa3e95
-EBUILD embree-3.13.4.ebuild 3734 BLAKE2B 9f55f1de1ff0b637be9a3c98fcea68dc77bcd060dc0dac355b3dff86fe57c53a91e81cbbd3505aaa76c4097baa60c170bbd6c4523e0dfda9c798fe562fed5f18 SHA512 2de934bcebbbefe5664f6a94c25e13595f968967b6e9a23d44330100ad8ea24b77988a14d39733cf03d0974ad52faccd33b47adf94cb4fddfe9a0866b7a780e6
-EBUILD embree-3.13.5.ebuild 3677 BLAKE2B 81ed2229a9f0a210a2c3ff60f1f18f2a26b16e06736a3e2c0bd3c6065d143c1bcb35be389f8f682feabe91bdba38233c0a97df22ac6bc1721c499b815ad659d8 SHA512 651135bc0c89ca7a7aede6c39854fd2ad650097a98a85094e3b3344ddff5a91c20895909ef78c1cebc4f2d60488322cacb27fb7d644af98483dd8ed62111166e
+EBUILD embree-3.13.4.ebuild 3812 BLAKE2B b4883a7c9b8b1653eb4e77e8533114ec2d927a92003dad843bba00850be77ea03bb4be633a62aaf5e73c115d893c69e8e39ca6299770f5e8ec541c3c6ea9ecf8 SHA512 86434eb8b53e197dca0d76368c73dd8a29260d0870ee50c0865c2b634db3728f08dabd500fbd2eefa9f8273a55df0970bfe4ab03038f5ce26617f3d262d1c830
+EBUILD embree-3.13.5.ebuild 3755 BLAKE2B 47134a80dc9e0d1b534d2ec2d78efd8e34ee440928152f6d2b74b349da32d81bf7475c4312b9561439141e09583bc242a07d74c11f3153c5430a527438cbeaa3 SHA512 1b189d467b05c7bc9a4ca80be0be7b59576df9655b3fe5d68c68f16e39bb6a5e158518f31413e3733570717cdbf20d56f1e122a37ac98757cf6b27db819b2235
 MISC metadata.xml 1705 BLAKE2B 2785c8b8752e5730e014ce6edfdd1702a20565ab12c9ebee14c3cf603e267a63360eaa0428afb9e178091edad40fe82ea55e2a872339da744113e480b4eda6c2 SHA512 ebfa1a6d3f8a8fe6acc0cc06f54ad62efb86942b55e985542a049fde421663adddcffe2a78c7309774df9bbc714a2bb11dad73c94b89bf2d1cdf56b69d334f59
diff --git a/media-libs/embree/embree-3.13.4.ebuild b/media-libs/embree/embree-3.13.4.ebuild
index 247a69b0fb6c..1925f9f320b4 100644
--- a/media-libs/embree/embree-3.13.4.ebuild
+++ b/media-libs/embree/embree-3.13.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake flag-o-matic linux-info
+inherit cmake flag-o-matic linux-info toolchain-funcs
 
 DESCRIPTION="Collection of high-performance ray tracing kernels"
 HOMEPAGE="https://github.com/embree/embree"
@@ -67,6 +67,9 @@ src_configure() {
 
 	filter-flags -m*
 
+	# https://bugs.gentoo.org/910164
+	tc-is-clang && filter-lto
+
 	local mycmakeargs=(
 		# Currently Intel only host their test files on their internal network.
 		# So it seems like users can't easily get a hold of these and do
diff --git a/media-libs/embree/embree-3.13.5.ebuild b/media-libs/embree/embree-3.13.5.ebuild
index 1f94e528f380..7a4464c22033 100644
--- a/media-libs/embree/embree-3.13.5.ebuild
+++ b/media-libs/embree/embree-3.13.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake flag-o-matic linux-info
+inherit cmake flag-o-matic linux-info toolchain-funcs
 
 DESCRIPTION="Collection of high-performance ray tracing kernels"
 HOMEPAGE="https://github.com/embree/embree"
@@ -66,6 +66,9 @@ src_configure() {
 
 	filter-flags -m*
 
+	# https://bugs.gentoo.org/910164
+	tc-is-clang && filter-lto
+
 	local mycmakeargs=(
 		# Currently Intel only host their test files on their internal network.
 		# So it seems like users can't easily get a hold of these and do
diff --git a/media-libs/freeimage/Manifest b/media-libs/freeimage/Manifest
index c6ff4738889c..7095d839d7b6 100644
--- a/media-libs/freeimage/Manifest
+++ b/media-libs/freeimage/Manifest
@@ -13,4 +13,5 @@ DIST FreeImage3180.pdf 1665541 BLAKE2B 5d40ee6fa0a1e73df0cc961edbd70a2835ef88fb5
 DIST FreeImage3180.zip 7415716 BLAKE2B b695271f4e80eb304eccde66e38b5095eceae51fbe0dd97df69c55f364f8440d8c97139b8edc2f01c400f5c53a7336fdfab1e28aa3ea04f485901d5def443d25 SHA512 9d9cc7e2d57552c3115e277aeb036e0455204d389026b17a3f513da5be1fd595421655488bb1ec2f76faebed66049119ca55e26e2a6d37024b3fb7ef36ad4818
 DIST freeimage-3.18.0-unbundling.patch 20960 BLAKE2B 61ee63e7be0d5db7bf4a3bc053bb67f5a6ce6949ed252b1729e7542addd432d1105b7e70d834f05210be3c5c81a5378a2cb00d5b9d8e21590672a1ac6e1135fa SHA512 c56062099e17e8a16447fccc4bdf3089e7992273f1a09a2ff7f591b3bd68a8d1e80842400aaffdc8394ed64273e26a4f01e12fc8c55bb40d346db96eb5dcbe30
 EBUILD freeimage-3.18.0-r10.ebuild 3433 BLAKE2B 733f4af807476237cf4d79361b18da579b61bd62a0cc7e75ecee6da81f05249bf0bc5e0458890c7b9bd2cd30fac0835a9059ee4bdeb8ddff1546d1995008aeb7 SHA512 e0ce9af89f287d7fe03e325effc8240b6d4274552561c065b551dc0d77bb36f38a40874ad7a34115b3fcc3ce7d216566a1c324fa07081ceead11747b21e3fa6c
+EBUILD freeimage-3.18.0-r11.ebuild 3542 BLAKE2B 4893dc0db3b1dd189b33735513a8d60f596162d2693c24930c97e0c43a74d2b0152c58538246c90c9fe4199f3a29552795fd5f02b23e464c4326c8d58626a3e5 SHA512 197f8e3bd88c6bd2e3c94739e6f63a7de4db3e04b925fee45c65e98d433687b2b82ad6ed8c76f315fbf5d51c47e608cff3522822441d7b6639a1db202753082b
 MISC metadata.xml 404 BLAKE2B 09c1635a36f53e8e3a48bd43d03d6cafaf9d511caf5bc3174fea2434970e1372eb1dbb979eb093e88078960c968cd578fcc4b74b67a34f55bf078f074ee97ab3 SHA512 d271f95c2295b4370c5434a172e838467daeab733399c26a1a730771ffae5a46bef879fd7e424b182177a2dd14f9abcc903cfa1c35052f84a2517f8803856836
diff --git a/media-libs/freeimage/freeimage-3.18.0-r11.ebuild b/media-libs/freeimage/freeimage-3.18.0-r11.ebuild
new file mode 100644
index 000000000000..1a10247f8be9
--- /dev/null
+++ b/media-libs/freeimage/freeimage-3.18.0-r11.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edos2unix toolchain-funcs flag-o-matic
+
+MY_PN=FreeImage
+MY_PV=${PV//.}
+MY_P=${MY_PN}${MY_PV}
+
+DESCRIPTION="Image library supporting many formats"
+HOMEPAGE="https://freeimage.sourceforge.io/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip
+	mirror://sourceforge/${PN}/${MY_P}.pdf
+	https://dev.gentoo.org/~juippis/distfiles/tmp/freeimage-3.18.0-unbundling.patch"
+
+LICENSE="|| ( GPL-2 FIPL-1.0 )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+IUSE="jpeg jpeg2k mng openexr png raw static-libs tiff webp"
+
+# The tiff/imath+openexr isn't a typo. The TIFF plugin cheats and
+# uses code from it to handle 16bit<->float conversions.
+RDEPEND="
+	sys-libs/zlib
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	mng? ( media-libs/libmng:= )
+	openexr? ( media-libs/openexr:= )
+	png? ( media-libs/libpng:0= )
+	raw? ( media-libs/libraw:= )
+	tiff? (
+		>=dev-libs/imath-3.1.4-r2:=
+		>=media-libs/openexr-3:0=
+		>=media-libs/tiff-4.4.0:=
+	)
+	webp? ( media-libs/libwebp:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-arch/unzip
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_PN}
+
+DOCS=( "${DISTDIR}"/${MY_P}.pdf README.linux Whatsnew.txt )
+
+PATCHES=(
+	"${DISTDIR}"/${PN}-3.18.0-unbundling.patch
+	"${FILESDIR}"/${PN}-3.18.0-remove-jpeg-transform.patch
+	"${FILESDIR}"/${PN}-3.18.0-rename-jpeg_read_icc_profile.patch
+	"${FILESDIR}"/${PN}-3.18.0-disable-plugin-G3.patch
+	"${FILESDIR}"/${PN}-3.18.0-raw.patch
+	"${FILESDIR}"/${PN}-3.18.0-libjpeg9.patch
+	"${FILESDIR}"/${PN}-3.18.0-CVE-2019-12211-CVE-2019-12213.patch
+	"${FILESDIR}"/${PN}-3.18.0-openexr-3-imath.patch
+	"${FILESDIR}"/${PN}-3.18.0-libraw-0.20.0.patch
+	"${FILESDIR}"/${PN}-3.18.0-tiff-4.4.0.patch
+	"${FILESDIR}"/${PN}-3.18.0-null-to-false.patch
+	"${FILESDIR}"/${PN}-3.18.0-libraw-0.21.0.patch
+)
+
+src_prepare() {
+	pushd Source >/dev/null || die
+	cp LibJPEG/{transupp.c,transupp.h,jinclude.h} . || die
+	cp LibTIFF4/{tiffiop,tif_dir}.h . || die
+	rm -rf LibPNG LibMNG LibOpenJPEG ZLib OpenEXR LibRawLite LibTIFF4 LibJPEG LibWebP LibJXR || die
+	popd >/dev/null || die
+
+	edos2unix Makefile.{gnu,fip,srcs} fipMakefile.srcs */*.h */*/*.cpp
+	sed -i \
+		-e "s:/./:/:g" \
+		-e "s: ./: :g" \
+		-e 's: Source: \\\n\tSource:g' \
+		-e 's: Wrapper: \\\n\tWrapper:g' \
+		-e 's: Examples: \\\n\tExamples:g' \
+		-e 's: TestAPI: \\\n\tTestAPI:g' \
+		-e 's: -ISource: \\\n\t-ISource:g' \
+		-e 's: -IWrapper: \\\n\t-IWrapper:g' \
+		-e 's:INCLS:\nINCLS:g' \
+		Makefile.srcs fipMakefile.srcs || die
+	sed -i \
+		-e "/LibJPEG/d" \
+		-e "/LibJXR/d" \
+		-e "/LibPNG/d" \
+		-e "/LibTIFF/d" \
+		-e "/Source\/ZLib/d" \
+		-e "/LibOpenJPEG/d" \
+		-e "/OpenEXR/d" \
+		-e "/LibRawLite/d" \
+		-e "/LibMNG/d" \
+		-e "/LibWebP/d" \
+		-e "/LibJXR/d" \
+		Makefile.srcs fipMakefile.srcs || die
+
+	default
+}
+
+foreach_make() {
+	local m
+	for m in Makefile.{gnu,fip} ; do
+		emake -f ${m} \
+			USE_EXR=$(usex openexr) \
+			USE_JPEG=$(usex jpeg) \
+			USE_JPEG2K=$(usex jpeg2k) \
+			USE_MNG=$(usex mng) \
+			USE_PNG=$(usex png) \
+			USE_TIFF=$(usex tiff) \
+			USE_RAW=$(usex raw) \
+			USE_WEBP=$(usex webp) \
+			$(usex static-libs '' STATICLIB=) \
+			"$@"
+	done
+}
+
+src_compile() {
+	tc-export AR PKG_CONFIG
+
+	# Uses std::auto_ptr (deprecated in c++11, removed in c++17)
+	append-cxxflags '-std=c++14'
+
+	foreach_make \
+		CXX="$(tc-getCXX) -fPIC" \
+		CC="$(tc-getCC) -fPIC" \
+		${MY_PN}
+}
+
+src_install() {
+	foreach_make install DESTDIR="${ED}" INSTALLDIR="${ED}"/usr/$(get_libdir)
+	einstalldocs
+}