git » krita.git » commit c05b2f4

Enable jxl filter, fix xsimd 9 detection

author Antonio Rojas
2022-09-21 20:28:18 UTC
committer Antonio Rojas
2022-09-21 20:28:18 UTC
parent f3950ac601b5381721853c0607fee5463b89aad1

Enable jxl filter, fix xsimd 9 detection

PKGBUILD +10 -4
krita-xsimd-9.patch +14 -0

diff --git a/PKGBUILD b/PKGBUILD
index df51fed..9600479 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 pkgname=krita
 _pkgver=5.1.1
 pkgver=${_pkgver/-/}
-pkgrel=1
+pkgrel=2
 pkgdesc='Edit and paint images'
 arch=(x86_64)
 url='https://krita.org'
@@ -15,15 +15,21 @@ makedepends=(extra-cmake-modules kdoctools boost eigen poppler-qt5 python-pyqt5
 optdepends=('poppler-qt5: PDF filter' 'ffmpeg: to save animations'
             'python-pyqt5: for the Python plugins' 'libheif: HEIF filter'
             'kseexpr: SeExpr generator layer' 'kimageformats: PSD support' 'libmypaint: support for MyPaint brushes'
-            'krita-plugin-gmic: GMic plugin') # 'libjxl: JPEG-XL filter'
-source=(https://download.kde.org/stable/krita/$_pkgver/$pkgname-$_pkgver.tar.gz{,.sig})
+            'krita-plugin-gmic: GMic plugin' 'libjxl: JPEG-XL filter')
+source=(https://download.kde.org/stable/krita/$_pkgver/$pkgname-$_pkgver.tar.gz{,.sig}
+        krita-xsimd-9.patch)
 sha256sums=('4ddbf897afa7b187131697d12a23ba39894638068b2eae12b3b434fe42ad8e24'
-            'SKIP')
+            'SKIP'
+            '84767e7da9ad861b5a95550f3cd06f45768f8f39eb4a9ce8cdb674163e763234')
 validpgpkeys=('05D00A8B73A686789E0A156858B9596C722EA3BD'  # Boudewijn Rempt <foundation@krita.org>
               'E9FB29E74ADEACC5E3035B8AB69EB4CF7468332F'  # Dmitry Kazakov (main key) <dimula73@gmail.com>
               '064182440C674D9F8D0F6F8B4DA79EDA231C852B') # Stichting Krita Foundation <foundation@krita.org>
 options=(debug)
 
+prepare() {
+  patch -d $pkgname-$pkgver -p1 < krita-xsimd-9.patch # Support xsimd 9
+}
+
 build() {
   cmake -B build -S $pkgname-$_pkgver \
     -DBUILD_KRITA_QT_DESIGNER_PLUGINS=ON
diff --git a/krita-xsimd-9.patch b/krita-xsimd-9.patch
new file mode 100644
index 0000000..068186a
--- /dev/null
+++ b/krita-xsimd-9.patch
@@ -0,0 +1,14 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index adc513cbe6..947a041ab2 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1053,6 +1053,9 @@ list (APPEND ANDROID_EXTRA_LIBS ${LCMS2_LIBRARIES})
+ ## Test for xsimd
+ ##
+ find_package(xsimd 8.1.0)
++if(NOT xsimd_FOUND)
++    find_package(xsimd 9)
++endif()
+ set_package_properties(xsimd PROPERTIES
+     DESCRIPTION "C++ wrappers for SIMD intrinsics"
+     URL "https://github.com/xtensor-stack/xsimd"