From 46b9fab4b1cd9982b40d61da7b44dc42fb444252 Mon Sep 17 00:00:00 2001
From: Ionen Wolkens <ionen@gentoo.org>
Date: Mon, 25 Mar 2024 08:50:45 -0400
Subject: [PATCH] dev-libs/simde: fix usage with -mxop

Bug: https://bugs.gentoo.org/926959
Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
---
 dev-libs/simde/files/simde-0.8.0-xop.patch    | 28 +++++++++++++++++++
 ...mde-0.8.0.ebuild => simde-0.8.0-r1.ebuild} |  1 +
 2 files changed, 29 insertions(+)
 create mode 100644 dev-libs/simde/files/simde-0.8.0-xop.patch
 rename dev-libs/simde/{simde-0.8.0.ebuild => simde-0.8.0-r1.ebuild} (97%)

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 0000000000000..1fbfc4fd1ef32
--- /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.8.0.ebuild b/dev-libs/simde/simde-0.8.0-r1.ebuild
similarity index 97%
rename from dev-libs/simde/simde-0.8.0.ebuild
rename to dev-libs/simde/simde-0.8.0-r1.ebuild
index 6859a640590ab..faa2b4cedb06b 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() {