Date: Sunday, December 18, 2022 @ 15:30:59
Author: arojas
Revision: 464569
archrelease: copy trunk to staging-x86_64
Added:
krita/repos/staging-x86_64/
krita/repos/staging-x86_64/PKGBUILD
(from rev 464568, krita/trunk/PKGBUILD)
krita/repos/staging-x86_64/find-xsimd.patch
(from rev 464568, krita/trunk/find-xsimd.patch)
krita/repos/staging-x86_64/keys/
krita/repos/staging-x86_64/krita-libraw-0.21.patch
(from rev 464568, krita/trunk/krita-libraw-0.21.patch)
-------------------------+
PKGBUILD | 44 ++++++++++++++++++++++++++++++++++++++++++++
find-xsimd.patch | 21 +++++++++++++++++++++
krita-libraw-0.21.patch | 16 ++++++++++++++++
3 files changed, 81 insertions(+)
Copied: krita/repos/staging-x86_64/PKGBUILD (from rev 464568,
krita/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2022-12-18 15:30:59 UTC (rev 464569)
@@ -0,0 +1,44 @@
+# Maintainer: Antonio Rojas <arojas@archlinux,org>
+
+pkgname=krita
+_pkgver=5.1.4
+pkgver=${_pkgver/-/}
+pkgrel=2
+pkgdesc='Edit and paint images'
+arch=(x86_64)
+url='https://krita.org'
+license=(GPL3)
+depends=(kitemviews kitemmodels ki18n kcompletion kguiaddons kcrash qt5-svg
qt5-multimedia quazip
+ gsl libraw exiv2 openexr fftw openjpeg2 opencolorio libwebp
hicolor-icon-theme)
+makedepends=(extra-cmake-modules kdoctools boost eigen poppler-qt5
python-pyqt5 libheif
+ qt5-tools sip kseexpr libmypaint libjxl xsimd)
+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}
+ find-xsimd.patch
+ krita-libraw-0.21.patch)
+sha256sums=('c22b020862596eb2fdd911e1b179dbbce7b081be111457a2eacaf6ae1cca2dcb'
+ 'SKIP'
+ '622c9ffbbfef72dd024b391b879c79ae34da11d52b2f3488dfd8ee42bf7b453b'
+ '583559875b48d099f120703663e229bd7df8d55b2de45b4d3ce1ca36d3572baa')
+validpgpkeys=('05D00A8B73A686789E0A156858B9596C722EA3BD' # Boudewijn Rempt
<[email protected]>
+ 'E9FB29E74ADEACC5E3035B8AB69EB4CF7468332F' # Dmitry Kazakov
(main key) <[email protected]>
+ '064182440C674D9F8D0F6F8B4DA79EDA231C852B') # Stichting Krita
Foundation <[email protected]>
+options=(debug)
+
+prepare() {
+ patch -d $pkgname-$_pkgver -p1 < find-xsimd.patch
+ patch -d $pkgname-$_pkgver -p1 < krita-libraw-0.21.patch # Fix build with
libraw 0.21
+}
+
+build() {
+ cmake -B build -S $pkgname-$_pkgver \
+ -DBUILD_KRITA_QT_DESIGNER_PLUGINS=ON
+ cmake --build build
+}
+
+package() {
+ DESTDIR="$pkgdir" cmake --install build
+}
Copied: krita/repos/staging-x86_64/find-xsimd.patch (from rev 464568,
krita/trunk/find-xsimd.patch)
===================================================================
--- staging-x86_64/find-xsimd.patch (rev 0)
+++ staging-x86_64/find-xsimd.patch 2022-12-18 15:30:59 UTC (rev 464569)
@@ -0,0 +1,21 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 7d075a7223..6dc88e243a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1052,10 +1052,12 @@ 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()
++foreach(xsimd_version 8.1.0 9 10)
++ if(NOT xsimd_FOUND)
++ find_package(xsimd ${xsimd_version})
++ endif()
++endforeach()
++
+ set_package_properties(xsimd PROPERTIES
+ DESCRIPTION "C++ wrappers for SIMD intrinsics"
+ URL "https://github.com/xtensor-stack/xsimd";
Copied: krita/repos/staging-x86_64/krita-libraw-0.21.patch (from rev 464568,
krita/trunk/krita-libraw-0.21.patch)
===================================================================
--- staging-x86_64/krita-libraw-0.21.patch (rev 0)
+++ staging-x86_64/krita-libraw-0.21.patch 2022-12-18 15:30:59 UTC (rev
464569)
@@ -0,0 +1,16 @@
+diff --git a/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw.cpp
b/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw.cpp
+index dcaecc6fa7..71425f909c 100644
+--- a/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw.cpp
++++ b/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw.cpp
+@@ -383,7 +383,11 @@ bool KDcraw::extractRAWData(const QString& filePath,
QByteArray& rawData, DcrawI
+ d->setProgress(0.3);
+
+ raw.imgdata.params.output_bps = 16;
++#if LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 21)
++ raw.imgdata.rawparams.shot_select = shotSelect;
++#else
+ raw.imgdata.params.shot_select = shotSelect;
++#endif
+ ret = raw.unpack();
+
+ if (ret != LIBRAW_SUCCESS)
