gentoo auto-resync : 25:03:2024 - 19:01:08

4 files changed, 31 insertions, 48 deletions

diff --git a/dev-libs/simde/Manifest b/dev-libs/simde/Manifest
index 647fd7c7d14a..394a79ff797e 100644
--- a/dev-libs/simde/Manifest
+++ b/dev-libs/simde/Manifest
@@ -1,6 +1,5 @@
 AUX simde-0.7.6-musl.patch 894 BLAKE2B 5f3c06f7981a329ae7fb677d2b2c20d64d429c8dd5ac8312e3e3ffed08268ed5d8e47c6517c6a0a0132709dd7a180f4fa63b8545c05da0b947755df0303be3fc SHA512 d5da14f5918a52f0ca485ac5023c420628e8b2246b3a71f1539e4751edab74d99335d558defe7cb8348a0c784cb00e54cd3f70b7bf48546794f22734dd970c9d
-DIST simde-0.7.6.tar.gz 6125123 BLAKE2B 96378e81a2e2a2d797289d26b3d0c1ea72288b51094e8c5fde75ecbef34a0c1d4dc029d5974281e2f9f938b190b4a648225fcb486205cc496ba57b1ec528cee4 SHA512 de17fca563c4db6766881e1c73142ad129a57febe55fa8ea1ae780226e60a84891b13d387e75574f2722d77e4013176e3c7dfaf17bccd8682b7d3d3ec8e92a54
+AUX simde-0.8.0-xop.patch 1135 BLAKE2B d774c85d3415c16e72a8bdbc7618af7f215f9e937b24db6ba89d6a3f73c5852436f90a494a1695783bc367083c572c62edc38ac4bec8b74ce47b1746f3b62258 SHA512 36f3e9dc00d64bad60d7e943d6abda69a636fa4f101fb5387c407fd32758262d9d08d8c943ea4ed63ce57d7963eb42f46638d24eb329a817f6079b6b540c1fe6
 DIST simde-0.8.0.tar.gz 7455442 BLAKE2B 511f609e2588cc39b45a5a3e7f93648d9651e9e3f90220947b7f559ca6281a0db9f876d0692abf24d63528bb84e0ee49da1a165a16eeb91de84639a100a6527b SHA512 b0667583565ea9e59d18a07c7a3cb46710868c9572663e314278ca2004747e337e34f6b927c9c5d29e161caba8ec0428e5299b6e878e226b9f33597a1584b91d
-EBUILD simde-0.7.6-r1.ebuild 997 BLAKE2B 81bb44bb52c1e407076c86f7edd4c1a11cdc41db8830c3093d462aef883438eca35d0575765a96b09145852d7db1d7b5ffab96afac05fc4cd1fc046a1dc11f74 SHA512 477cbf250117f1e5edfb1d68167be75b0099514997c141ea1bb89a3aaf2f13499f0f1c826f4eae005f7438c275ceeff8d7b636a6afbd75d547c2ab72b9f63ff1
-EBUILD simde-0.8.0.ebuild 1034 BLAKE2B db0d362b2d37768358ff50abca63c1ab8f77256135759c4ad59ce0e950e6f7a0192aacc5d4f3faa0effd815d36743b9e9ef0452b843f70cfffb91d34c806fc76 SHA512 ca31ca017eb8ebb4e2d2eede692867211b89b177e59cbef573597e713140318d7fcd3c0107fa3f3c9025495c8eb7215ed5b7988c3fa770a35e3a4b59ee85c93f
+EBUILD simde-0.8.0-r1.ebuild 1064 BLAKE2B b125b5fd6678f486af3d0b7742176c6ee32630e5541dd53c6dbf4f233754faf089b688b9060b38903c5189cc73a0317e75f0af0f530fbb3cd854e7dbafc46bdb SHA512 853a26fab7d3c17817a41d0ed35ad928c7ae13ff6575a513a47632827d359a68f6871877f84ab91f41faee579f72f68ed3735a025581251bd6e9e9a36369ddd0
 MISC metadata.xml 332 BLAKE2B d617fc3761fcdd13bfb89430ff299ebfff73c7ddf292c6695256e2a9b20b20e91830ce968e10df506cafd6ec61d863ecaa9bb0aad54b48025ba5e0bcfb07b1f5 SHA512 47c6c2b56e6299057413cb698bf78cd566843507df12215d1b359fff33ee004efad2b9194f830c3ede2f88dcc1dbf8206fc833172cfc5e1db71560c709b2d5bb
diff --git a/dev-libs/simde/files/simde-0.8.0-xop.patch b/dev-libs/simde/files/simde-0.8.0-xop.patch
new file mode 100644
index 000000000000..1fbfc4fd1ef3
--- /dev/null
+++ b/dev-libs/simde/files/simde-0.8.0-xop.patch
@@ -0,0 +1,28 @@
+https://bugs.gentoo.org/926959
+https://github.com/kovidgoyal/kitty/issues/7222
+https://github.com/simd-everywhere/simde/pull/1154
+From: "Michael R. Crusoe" <michael.crusoe@gmail.com>
+Date: Mon, 25 Mar 2024 10:33:22 +0100
+Subject: [PATCH 1/2] x86 xop: fix some native functions
+--- a/simde/arm/neon/paddl.h
++++ b/simde/arm/neon/paddl.h
+@@ -286,7 +286,7 @@ simde_vpaddlq_u16(simde_uint16x8_t a) {
+     simde_uint32x4_private r_;
+ 
+     #if defined(SIMDE_X86_XOP_NATIVE)
+-      r_.sse_m128i = _mm_haddd_epu16(a_.sse_m128i);
++      r_.m128i = _mm_haddd_epu16(a_.m128i);
+     #elif defined(SIMDE_X86_SSE2_NATIVE)
+       r_.m128i =
+         _mm_add_epi32(
+--- a/simde/x86/xop.h
++++ b/simde/x86/xop.h
+@@ -3727,7 +3727,7 @@ simde_mm256_permute2_pd (simde__m256d a, simde__m256d b, simde__m256i c, const i
+       SIMDE_LCC_REVERT_DEPRECATED_WARNINGS \
+     }))
+   #else
+-    #define simde_mm256_permute2_pd(a, b, c, imm8) simde_undeprecated_mm256_permute2_pd((a), (b), (c), (imm8))
++    #define simde_mm256_permute2_pd(a, b, c, imm8) _mm256_permute2_pd((a), (b), (c), (imm8))
+   #endif
+ #endif
+ #if defined(SIMDE_X86_XOP_ENABLE_NATIVE_ALIASES)
diff --git a/dev-libs/simde/simde-0.7.6-r1.ebuild b/dev-libs/simde/simde-0.7.6-r1.ebuild
deleted file mode 100644
index 39b4251763c9..000000000000
--- a/dev-libs/simde/simde-0.7.6-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson
-
-DESCRIPTION="Header-only library providing implementations of SIMD instruction sets"
-HOMEPAGE="https://simd-everywhere.github.io/blog/"
-SRC_URI="
-	https://github.com/simd-everywhere/simde/archive/refs/tags/v${PV/_/-}.tar.gz
-		-> ${P}.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.7.6-musl.patch
-)
-
-src_configure() {
-	# *FLAGS are only used for tests (nothing that is installed), and
-	# upstream tests with specific *FLAGS and is otherwise flaky with
-	# -march=native, -mno-*, and such -- unset to be spared headaches.
-	unset {C,CPP,CXX,LD}FLAGS
-
-	local emesonargs=(
-		$(meson_use test tests)
-	)
-
-	meson_src_configure
-}
-
-src_test() {
-	if use x86; then
-		# some --skip option for meson when
-		meson_src_test $(meson_src_test --list | grep -v dbsad) #926706
-	else
-		meson_src_test
-	fi
-}
diff --git a/dev-libs/simde/simde-0.8.0.ebuild b/dev-libs/simde/simde-0.8.0-r1.ebuild
index 6859a640590a..faa2b4cedb06 100644
--- a/dev-libs/simde/simde-0.8.0.ebuild
+++ b/dev-libs/simde/simde-0.8.0-r1.ebuild
@@ -20,6 +20,7 @@ RESTRICT="!test? ( test )"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.7.6-musl.patch
+	"${FILESDIR}"/${P}-xop.patch
 )
 
 src_configure() {