gentoo auto-resync : 27:08:2024 - 12:00:02

3 files changed, 41 insertions, 1 deletions

diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index c37af9f34046..6af71cad2b78 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -5,9 +5,10 @@ AUX krita-5.1.5-ocio-2.3.0.patch 1669 BLAKE2B 17ee793479946ca07788afb109ca338c3c
 AUX krita-5.1.5-sip-6.8.patch 770 BLAKE2B b63fb65ffc4ea733e8698b255b5531ff55299ec8f7cd6c153f50faaf938795618c675a7c6fbf33c1f7225c8dddaec806a9fbd6f88b621ebcff52eb13aacc0479 SHA512 5f21376508c603ca33447119ad9fa492e83992f74314cd59053f270d2020a540b4c6708b67028a7567b9db460a6fbc0aa842020b4fe5b7d4be4265d2dc78ceff
 AUX krita-5.2.2-fftw.patch 689 BLAKE2B a0b62a65d8de4c661a571f0f671387d0571982bbc0acdf4dc879c21711093e7a3d6ef17e6a24f04d066ecd1f861b98f8a37e626075d3fdd445f408e77484eb3f SHA512 6db10de30c0f47ea3d65490d82176685144af580a6581d0ff2fc0363e6b65166c154ad3dd05a0dadf967afc39417936275d71911e89fcf79ecfa84b1bb6b94fa
 AUX krita-5.2.3-tests-optional.patch 2807 BLAKE2B 7d0c0d26ce0cb1bf86f7933e8510bb5ea1e98986b811641874b4db6f622e5a31bf9b9c3b7e12267bf54f2d57d56459211df3e004dbc261e0d519f69d190e2149 SHA512 021d6d8fa1b976091088b317f54cf0be66f73b0dd9031497abc3101e4e43b69a0d4b5302e004b3ec81193bfecc0066cc4563a50b15e2c30109d3a57bafe23ca5
+AUX krita-5.2.3-znver4-xsimd.patch 1650 BLAKE2B a534c96c1fdbaf3aeb59499c88079d70574e0ac4eda170637d187fd66338b80c53e3d85fe003f75c59512eb484522403e785b0a9bdb6dca0e6a7bce8d7a0a936 SHA512 2aeb300d6230fa29c97f086aad98df16ed71d1199716739467b7c25014ba7e3a84b368cc9945042e2ce8fca0e42c03579b1e26048304498c194cff01d7d7d7cf
 DIST krita-5.1.5-exiv2-0.28.patch.xz 4664 BLAKE2B e364325be3d8e40e293a7d268136be3737ce5d2b9b5607f140b30ba3e687dc8d86545f4463348587711150f1652b521f87efc859a1bf2bc3b5ed704cf3236781 SHA512 130ba9cce7d6c0138f7ef6dab1445816c2e29752aa16643c32a7d9c00d7a156ac88f01afdb782ab03fc1e0822660a070f74c02e7cde4dfbcec30baaf3c3dba7f
 DIST krita-5.1.5.tar.xz 184981952 BLAKE2B 3d8d26849d8508dc040fb3ac5ab4d0ce724f670bf7d5782b37702b55afe5063543e6aa564a1c9326c90fb16f7905941e3f1ffd4296efd6f8a1c7cb34c0b41716 SHA512 b745eb9f51bb08df0948d6b97b85aee6a74b496df3e8423fb9107d79551daadb21960b4bb5c438348f662c67d0ec5b2fa6da18cfa5feb418659881cddd24d8f1
 DIST krita-5.2.3.tar.xz 186685456 BLAKE2B 42943e7ebffdb46b9da085b2069701895e37ad9c457273b9217a095f1dfdf15c715cde0b88d440abb2d73dee656730da38844f11f27022885f87bb9cc9adab26 SHA512 69a0477e3119765dd53e0502fe5a64fcdc921dfcba3ddc5dec5c1bc4342a77b172b38276f134cc56f79741e6c47b51ef51786aadf0d178ce3955e24a9fd27b74
 EBUILD krita-5.1.5.ebuild 3781 BLAKE2B ca13633df6861d9159cae079b667123280d3b4ed73e707e648b710782219999f67e8f7f806471f8eddb8c95c2e3f0a797434157a4fcc5db3cfb2a5430698ba05 SHA512 b12e60d70eb03c76c6a5dbb3df451d6666f37d07060fe90601b8c569d130ac1bb7d71ef95a6d87faa58a627b5a3823dd468eee8d0be7b370960e81957aec3316
-EBUILD krita-5.2.3.ebuild 3726 BLAKE2B ee26a096e5f01020b23159e4707c8e022ad67588e09ccb31ba358fc189ad47052c98b1ace1bbe28687bcdcebbd8e1f6edede43de3275b644d066bf9768094a1c SHA512 a2d75c8c01ca7a6f1887f0106c6a6ccebc71574bcc02d3c3f96654c57394b128d3f27c63743f3f5b5bd60faddf40263c0b1eb7f47e25e0587e7d193dc83dffcf
+EBUILD krita-5.2.3.ebuild 3785 BLAKE2B f95553949d7a1a4411383445a43bfbebc5fd5d52e6ea3bfb751c8ba0ecd5814657fb572293e8c5c57d2e9157f21c6b2fa5d3e783e9678c2e27dccc459a841a6e SHA512 4f9c7d252ddadde395e039edc7745b3030e868110b7e2501886e1d43a43a89e217751ed676f605bfafba3d7774ac5d1222c18176c4a87023b97c35cb0d771911
 MISC metadata.xml 832 BLAKE2B 53e632c3407b42c5d0f165bdcf67dfdd3a30bf1ec3c19ea79b90323ccbe5415e7cd34fbc79ebbb0e513359f28f381e3dac5d2534daf9ae7696f83ea77acb8130 SHA512 6cb02292d63602c80451759f6b935f65c9dfc2f01b32ac540d8cd4422ab2a70e04261fabc67b570c60e116f03e34d0165c8db6dcf9595db6cfa10849d8066336
diff --git a/media-gfx/krita/files/krita-5.2.3-znver4-xsimd.patch b/media-gfx/krita/files/krita-5.2.3-znver4-xsimd.patch
new file mode 100644
index 000000000000..df5fffb41d47
--- /dev/null
+++ b/media-gfx/krita/files/krita-5.2.3-znver4-xsimd.patch
@@ -0,0 +1,38 @@
+https://bugs.gentoo.org/936296
+https://invent.kde.org/graphics/krita/-/commit/cf2c74220b7edfae53a0715346cb4e2c7dfc38ae
+
+From cf2c74220b7edfae53a0715346cb4e2c7dfc38ae Mon Sep 17 00:00:00 2001
+From: Dmitry Kazakov <dimula73@gmail.com>
+Date: Mon, 26 Aug 2024 14:38:03 +0200
+Subject: [PATCH] Don't use xsimd::default_arch in the pixel scaler code
+
+Gentoo seems to build Krita with a global -march=znver4 flag,
+which causes "scalar" version of the code to be compiled with
+AVX512. Even though it is not how the system is supposed to work
+(and this avx512-optimization will never be used in real runtime),
+we shouldn't fail compilation.
+
+https://bugs.gentoo.org/936296
+https://github.com/xtensor-stack/xsimd/issues/1044
+--- a/libs/pigment/KoOptimizedPixelDataScalerU8ToU16.h
++++ b/libs/pigment/KoOptimizedPixelDataScalerU8ToU16.h
+@@ -28,7 +28,7 @@ public:
+         const int numColorChannels = m_channelsPerPixel * numColumns;
+ 
+ #if defined(HAVE_XSIMD) && XSIMD_WITH_AVX2
+-        using uint16_avx_v = xsimd::batch<uint16_t, xsimd::default_arch>;
++        using uint16_avx_v = xsimd::batch<uint16_t, xsimd::avx2>;
+         using uint16_v = xsimd::batch<uint16_t, xsimd::sse4_1>;
+         using uint8_v = xsimd::batch<uint8_t, xsimd::sse4_1>;
+ 
+@@ -129,7 +129,7 @@ public:
+         const int numColorChannels = m_channelsPerPixel * numColumns;
+ 
+ #if defined(HAVE_XSIMD) && XSIMD_WITH_AVX2
+-        using uint16_avx_v = xsimd::batch<uint16_t, xsimd::default_arch>;
++        using uint16_avx_v = xsimd::batch<uint16_t, xsimd::avx2>;
+         using uint16_v = xsimd::batch<uint16_t, xsimd::sse4_1>;
+ 
+         const int channelsPerAvx2Block = 32;
+-- 
+GitLab
diff --git a/media-gfx/krita/krita-5.2.3.ebuild b/media-gfx/krita/krita-5.2.3.ebuild
index c95734e0ad9a..e6485a056c75 100644
--- a/media-gfx/krita/krita-5.2.3.ebuild
+++ b/media-gfx/krita/krita-5.2.3.ebuild
@@ -98,6 +98,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-5.2.2-fftw.patch # bug 913518
 	# git master
 	"${FILESDIR}"/${PN}-5.1.5-sip-6.8.patch # bug 919139
+	"${FILESDIR}"/${PN}-5.2.3-znver4-xsimd.patch # bug 936296
 )
 
 pkg_setup() {