gentoo auto-resync : 27:02:2024 - 23:40:33

7 files changed, 85 insertions, 10 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 63fce891a148..ed5ac4199c70 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/glm/Manifest b/media-libs/glm/Manifest
index a50ed8b4c57e..adc560514612 100644
--- a/media-libs/glm/Manifest
+++ b/media-libs/glm/Manifest
@@ -5,7 +5,9 @@ AUX glm-1.0.0-clang.patch 908 BLAKE2B 7f61e1c357a21e7da455e0e8d8ebb6ee151c8bb680
 AUX glm.pc.in 149 BLAKE2B 9a34ca2590ef006315e004fa6ba0b08469c9da348d8354d0ab6a7e602da1d49126cffbd28c2aab2e2dbe711d047d482b4aead45d1e8770ab571e23e895201b4d SHA512 c875971c208bac82c1a326ebcd327ec9dd92a5b86981d26bf759516107204876a401ac9c57ca6c9965021364678ebbffcaaca6a3b4ee0e532d468d7b03b3ab9b
 DIST glm-0.9.9.8.tar.gz 4368032 BLAKE2B 41e4d4a9fbd75c6c6717e43b6a6ae09bb7da3b4b2ee7c5b04308f3aa875b306638b638aca3e457c039845c489fcf0716a080ec2166bf5e9db93c25944f4ba81a SHA512 9484b0c12175414237c5b9486a2990099b1cb727e442f25ecda18b081aa661f7e92a44481f642989553cd3da7992a773441ee5688991bd539ce19fb66a5ce9e8
 DIST glm-1.0.0.tar.gz 4523789 BLAKE2B 66c26067085bd5878dc1f6e473c1c8449d2a609351ababd8f893010983b9e20dae8e7cb2c9a4469b7e46592b7d350fda75e2975676b8696288065a7b776a21a5 SHA512 62e22002a6369a54e1f0ee2885a65f2780af7d2a446573e5387b81518f5dc7e8076053837cb99ae850a0166ce8b0f077bed009e8986d9884d01c456ce467553f
+DIST glm-1.0.1.tar.gz 4567161 BLAKE2B 2a6f399710f5812d4060b994df454e0c0e4fc7fcaccdfa62de6de2886987349b266944313539a398733708043c887f1324fe33eef8aa2205ef77e7c0dff28fec SHA512 c6c6fa1ea7a7e97820e36ee042a78be248ae828c99c1b1111080d9bf334a5160c9993a70312351c92a867cd49907c95f9f357c8dfe2bc29946da6e83e27ba20c
 EBUILD glm-0.9.9.8-r1.ebuild 1597 BLAKE2B fc44edeb119342ada690a31fe3e7f627b0ed61f9deba507dcdf7e1484a252da5d2bd9a59526683bfbe5678f58b916b86595211ca531fef18247f8f12eff558a9 SHA512 6e78dbd03da031c414ed0bcde42041a662fdd25764d41afc33d7b323b88d55abfdabf657c9d4ee7212f2ecdb87afdb0f8d2202d6858b39746df982038e9f697b
 EBUILD glm-1.0.0-r1.ebuild 1678 BLAKE2B b7f190ac3a3259d4a1e6c2b2641a98672c73a483fd5c34d719747aa6b941b61aab9649e2b0aaa98c3739ab62fcda3e92d6f1f796082c5f245edf31aaacb6d1c6 SHA512 ad7e8ded6ab3a536d90e2ed435bb7669a77471625fdf9e96066652c8f49b59f43ae89cf237099a8ada5589cf40a6d9ba198b1bcc0c708af8af974fc3f9512834
 EBUILD glm-1.0.0.ebuild 1604 BLAKE2B aed7c52cc7febd2ce83cb053db385c1971808c21493f1e62ef0480634a112b9744eb09f4c5286538705ffabc261120b1de2c4540d24f2e15bb728e94d2b48c84 SHA512 05e62696467b88bba905bc7f486247b2835b72800ec5026127c0f8884563f60b8437dd5305114d59fcedbe71a3ec13ef020210d97a50b568da279261cbb73dde
+EBUILD glm-1.0.1.ebuild 1646 BLAKE2B 02c2d5e25f94454793338fbf7ef91c2308606f1c8de509ddf37cd03eea7f4e4f6872c4c8af1226001024566e7a1ce6b39e0ca7e9a80e9976e88be1e002daa8ee SHA512 cb5bbe21ea7fe58ead67651e0aa4a77b2dfd1d687d03deff17a8052c7437fbabc6852cd0fd4353eda81ca62ebf7468658ef981dcb650dbafe8de9e82b83a34a3
 MISC metadata.xml 545 BLAKE2B 90098d29455b2202bfce4c4ba4eb53499bbd348d477ad554d6c9561dad4ca9b3083f729dfe2f94224b5ce1b4f515ed0cd4121663c264d57bf8829e6e9c1b245f SHA512 2327ea232b899c7b8d2bf50ed3dba7cfc347c4aa9e31dfa2de50ce5815ef5105da921937081e4b1fb38b1406e65d585a50e3705d78fac39ec54e624bb27c617d
diff --git a/media-libs/glm/glm-1.0.1.ebuild b/media-libs/glm/glm-1.0.1.ebuild
new file mode 100644
index 000000000000..0d6729f7d564
--- /dev/null
+++ b/media-libs/glm/glm-1.0.1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic
+
+DESCRIPTION="OpenGL Mathematics"
+HOMEPAGE="http://glm.g-truc.net/"
+SRC_URI="https://github.com/g-truc/glm/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( HappyBunny MIT )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="test cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_avx cpu_flags_x86_avx2"
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.9.9.6-simd.patch
+	"${FILESDIR}"/${PN}-0.9.9.8-big-endian-tests.patch
+)
+
+DOCS=( manual.md readme.md )
+
+src_configure() {
+	# Header-only library
+	local mycmakeargs=(
+		-DGLM_BUILD_INSTALL=ON
+		-DGLM_BUILD_LIBRARY=OFF
+		-DGLM_BUILD_TESTS=$(usex test)
+	)
+
+	if use test; then
+		# See https://github.com/g-truc/glm/pull/1087
+		# https://bugs.gentoo.org/818235
+		test-flag-CXX -fno-ipa-modref && append-cxxflags -fno-ipa-modref
+
+		mycmakeargs+=(
+			-DGLM_TEST_ENABLE=ON
+			-DGLM_TEST_ENABLE_SIMD_SSE2="$(usex cpu_flags_x86_sse2 ON OFF)"
+			-DGLM_TEST_ENABLE_SIMD_SSE3="$(usex cpu_flags_x86_sse3 ON OFF)"
+			-DGLM_TEST_ENABLE_SIMD_AVX="$(usex cpu_flags_x86_avx ON OFF)"
+			-DGLM_TEST_ENABLE_SIMD_AVX2="$(usex cpu_flags_x86_avx2 ON OFF)"
+		)
+	fi
+
+	cmake_src_configure
+
+	sed \
+		-e "s:@CMAKE_INSTALL_PREFIX@:${EPREFIX}/usr:" \
+		-e "s:@GLM_VERSION@:$(ver_cut 1-3):" \
+		"${FILESDIR}"/glm.pc.in \
+		> "${BUILD_DIR}/glm.pc" || die
+}
+
+src_compile() {
+	# Header-only library
+	if use test; then
+		cmake_src_compile
+	fi
+}
+
+src_install() {
+	cmake_src_install
+
+	insinto /usr/share/pkgconfig
+	doins "${BUILD_DIR}/glm.pc"
+}
diff --git a/media-libs/kcolorpicker/Manifest b/media-libs/kcolorpicker/Manifest
index a27f3b0d18b2..b07ee22a4c35 100644
--- a/media-libs/kcolorpicker/Manifest
+++ b/media-libs/kcolorpicker/Manifest
@@ -1,5 +1,5 @@
 DIST kColorPicker-0.2.0.tar.gz 12735 BLAKE2B 39b0c80ec5b498800dd251901b0bd57c839693f071185afacefa8d5a715ff18f2297c50486d98871471c40e0904a07ff40198b548d9368937b120a1eef07929f SHA512 44f9f317ebe5dd3131a9e44071f9f5b397b0d5cceece566f3ecf19932c8e36dafe1a434e623239421bead9413f0859bc3380174d7f14843770691e4d15a956eb
 DIST kColorPicker-0.3.0.tar.gz 12998 BLAKE2B 18c8f36b3efe1fa3c4ae9fb0e9d7497393561d66287e7ce6b5139e0182ddc69866685a85f4794afb7c861fcb824bfebb4f3c4badf148b4c8aa8b88b7b3483db2 SHA512 9f370ad8de0f23116f513e14ca22cb368cb5eaea53484388ca5ca0b7abc81d5071379cb84f8128f806c9ffa051ad29a95e42d4c1d30ba93034c0ae9fd785bb8c
 EBUILD kcolorpicker-0.2.0.ebuild 753 BLAKE2B 64d7773a51e83780ef30f2200d3d11031778560313c808164eb9fec1d7e0dabf10a3f4ff7e4a1305f295a8c18d8e0701bb6362aed12914f555547690838e815a SHA512 2e446279704de70a27f5b7d75c25e70e4cfc70bffb06afcb9c70d6495a376020640ae941dc57fc860af33749c04e7894a74672b427986b7f04df8758d424a5d4
-EBUILD kcolorpicker-0.3.0.ebuild 756 BLAKE2B 77c2ec2ec3f9be1bdfa6dde2f6e92bb7609ce7854fbbe34969c9d96690403e6c0ec04953bf62c20be3b23423beeee3a6be29a1fd8e0778f7ef1ec4c357eb1848 SHA512 33993b1f5d126d5fe54ae93c0c6b76c5f8fca599437c88220ec07862d094688a33b40108e7dbbc87f0da49c9a3b2fd90ac403fa3239157e1b69fb0701a054e5a
+EBUILD kcolorpicker-0.3.0.ebuild 773 BLAKE2B 9a80fc5604c13b2bef25d32523e211e11769279a98d42b524778416f13c179f5addfc94b49b0d83426065e9277b130cc1bfab56d49576baf4793349b8b6b7ef6 SHA512 c8835f7f63181566d239724ee6f4e1dddb30dd7175b4dbe11ffb1b36d52921e074a31ba6b0efe63629f2b03e1c031aee1b9a2f53afa712686676b899b4ed412e
 MISC metadata.xml 806 BLAKE2B 9ba16fcdf82d0b4880fd2c77fb9ac9050ba06ef923b54fa2583eb79a7703805334b5bd098c276005d443eeb27d534f9bc890a204f30cc5569e34ed90fa34eca9 SHA512 f31ccb93db41c34d4abd890e52845ff597df8062d7efed769866329f452cc542f8b0f0f9ce6fdd91d8e590255a5c08738d1ac9b984832691c3621412e4191f7b
diff --git a/media-libs/kcolorpicker/kcolorpicker-0.3.0.ebuild b/media-libs/kcolorpicker/kcolorpicker-0.3.0.ebuild
index 7910473385cc..ba108063e02c 100644
--- a/media-libs/kcolorpicker/kcolorpicker-0.3.0.ebuild
+++ b/media-libs/kcolorpicker/kcolorpicker-0.3.0.ebuild
@@ -3,8 +3,7 @@
 
 EAPI=8
 
-VIRTUALX_REQUIRED="test"
-inherit cmake virtualx
+inherit cmake
 
 MY_PN=kColorPicker
 MY_P="${MY_PN}-${PV}"
@@ -12,21 +11,22 @@ MY_P="${MY_PN}-${PV}"
 DESCRIPTION="Qt based color picker with popup menu"
 HOMEPAGE="https://github.com/ksnip/kColorPicker"
 SRC_URI="https://github.com/ksnip/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="LGPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="test"
 
+RESTRICT="!test? ( test )"
+
 RDEPEND="
 	dev-qt/qtbase:6[gui,widgets]
 "
 DEPEND="${RDEPEND}
-	test? ( dev-qt/qtbase:6[test] )
+	test? ( dev-qt/qtbase:6 )
 "
 
-S="${WORKDIR}/${MY_P}"
-
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_TESTS=$(usex test)
@@ -36,5 +36,6 @@ src_configure() {
 }
 
 src_test() {
-	virtx cmake_src_test
+	local -x QT_QPA_PLATFORM=offscreen
+	cmake_src_test
 }
diff --git a/media-libs/kimageannotator/Manifest b/media-libs/kimageannotator/Manifest
index 46978cabef0e..2c153dd66d5e 100644
--- a/media-libs/kimageannotator/Manifest
+++ b/media-libs/kimageannotator/Manifest
@@ -4,5 +4,5 @@ DIST kImageAnnotator-0.6.1.tar.gz 264176 BLAKE2B dfbfb50d2187572b0e68f1a699e9139
 DIST kImageAnnotator-0.7.0.tar.gz 266849 BLAKE2B eda6428caf37dedc24f613e513c970a94a0b25f37ea62953a9cf4b7afe3abd01b487f5a19f1c7baa34d9f31dfa0aaefed192f23ca2e3e1f06964cc6e4a951888 SHA512 e2a6d3014476fcb6e8838c0d0aa72e4bf5ccf6fbe1314ee6c1f44bb4299c6bd1b04be305e1039628f55e5e5e1626899329d9b93314c1f1fd2870bafaf0a8e2ff
 EBUILD kimageannotator-0.6.0.ebuild 934 BLAKE2B 177c801eddc96c8e0bf53a132a2f15cc6294715575a82c269c5ec3638f19ba5b8fbd93184d1936550d12840c8b15b6d800cf1f30472a5555743b3bf636ba08a0 SHA512 54bffdda93f6b5bb52f2faa3bd8dcd73102dbebc672ce20f0fe655504e29fa717215471c76c801f456dc6fba09bdeb801632a2d0e810a909e8b53cbb52ddd4e6
 EBUILD kimageannotator-0.6.1.ebuild 958 BLAKE2B ace9810abbb9c94a2d20d16f0fc2047e2a4321d4ff30051ee8399bd0a6f43df5b93dc7d616cba15ddaecc2aaeef5fc4a87ac25c2ca12c9b834f7d01539f41362 SHA512 0a33678e48a85ed5775afb28fd7face9d1fbbb96580ee32beafe998cd128f68f7fe6f2772f3a2170c488a5b405d086e9d9ccc46410ca15714076a9588be04aee
-EBUILD kimageannotator-0.7.0.ebuild 987 BLAKE2B f64afbd34e24910d4d83caa46431fa1685aff18be2e028dbb538637376a87ee1f08129e91e2af52c46a2d73ff53089f488781937e6221cf1434f9d36c8bcd58d SHA512 c47903cb506ead073ffa88c59133e056225ea8a318526ea6781a61b9603725bf26a229347ab1b0f9a879a16de193df244f797aa4e9c15a87cb2df36e2fbe4d79
+EBUILD kimageannotator-0.7.0-r1.ebuild 1103 BLAKE2B ccfbe416e57e6deca3fa40dd44898f78368ed638119e7e7be029dce4162c4dd58f5ff4e6663702b282cae1188bb51e7b5ac697476111f2a07a11589ae1490297 SHA512 73742fbdb247cbbc539fac9e82c139f893260fdb244c550bf1ae6cc9415660a765bc256a4a0c97b432fc972c1adbc62f5431c107e974894f826339df01a62eba
 MISC metadata.xml 594 BLAKE2B d54c8385b90271cf917c61e72900f9080dd03f83b46d0f15730af188f3965705742608cd1b54f24deba32e72416e457e86ed5d38996bb4517222808d850e9993 SHA512 680038e96337f6f8b1cd66268947431f49d1c04e71988b453f6557e1a6da2d9861b36e3c59f643a03460dc67bdd5564218a97769302b789cf040f12f619a8586
diff --git a/media-libs/kimageannotator/kimageannotator-0.7.0.ebuild b/media-libs/kimageannotator/kimageannotator-0.7.0-r1.ebuild
index b912dadc508a..1093de12ccd1 100644
--- a/media-libs/kimageannotator/kimageannotator-0.7.0.ebuild
+++ b/media-libs/kimageannotator/kimageannotator-0.7.0-r1.ebuild
@@ -3,7 +3,6 @@
 
 EAPI=8
 
-VIRTUALX_REQUIRED="test"
 inherit cmake
 
 MY_PN=kImageAnnotator
@@ -25,11 +24,13 @@ RDEPEND="
 	dev-qt/qtbase:6[gui,widgets]
 	dev-qt/qtsvg:6
 	>=media-libs/kcolorpicker-0.3.0
+	x11-libs/libX11
 "
 DEPEND="${RDEPEND}
+	x11-base/xorg-proto
 	test? (
 		dev-cpp/gtest
-		dev-qt/qtbase:6[test]
+		dev-qt/qtbase:6
 	)
 "
 BDEPEND="dev-qt/qttools:6[linguist]"
@@ -44,6 +45,9 @@ src_configure() {
 	cmake_src_configure
 }
 
+# one test is failing KeyInputHelperTest
+# upstream bug https://github.com/ksnip/kImageAnnotator/issues/335
+
 src_test() {
 	local -x QT_QPA_PLATFORM=offscreen
 	BUILD_DIR="${BUILD_DIR}/tests" cmake_src_test