summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorkitsunyan2018-08-27 08:12:50 +0300
committerkitsunyan2018-08-27 08:12:50 +0300
commit5c8dd0c7501837626c16114f173805264284dbd9 (patch)
tree705b676c7581e25b8babbdd156e782b15d8d816f
parent46f0c740ef282002d39daae9e47b94fbc6ca73c5 (diff)
downloadaur-5c8dd0c7501837626c16114f173805264284dbd9.tar.gz
upgpkg: krita-minimal 4.1.1-2
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD5
-rw-r--r--krita-libraw-0.19.patch54
3 files changed, 61 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 0f122e9393f..a1ef10dc8b8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = krita-minimal
pkgdesc = Edit and paint images (less KDE dependencies)
pkgver = 4.1.1
- pkgrel = 1
+ pkgrel = 2
url = https://krita.org
arch = x86_64
license = GPL3
@@ -48,10 +48,12 @@ pkgbase = krita-minimal
conflicts = krita
source = https://download.kde.org/stable/krita/4.1.1/krita-4.1.1.tar.gz
source = https://download.kde.org/stable/krita/4.1.1/krita-4.1.1.tar.gz.sig
+ source = krita-libraw-0.19.patch
source = replace-code.patch
validpgpkeys = 05D00A8B73A686789E0A156858B9596C722EA3BD
sha256sums = 5cab10343f97a9944a1ab2e137cd0ade6029ce157118009660af286eb75ce9e3
sha256sums = SKIP
+ sha256sums = 975b33492764f80f3b462a2bc589996f97ab1d7e667139023345e7eec40762ab
sha256sums = 1e076c7de3ee1bd6622cd40d227d0c687170b410f0e297f78f97e0b7f7270d6d
pkgname = krita-minimal
diff --git a/PKGBUILD b/PKGBUILD
index 6c40e71b003..f354ab7598d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
_pkgname=krita
pkgname="${_pkgname}-minimal"
pkgver=4.1.1
-pkgrel=1
+pkgrel=2
pkgdesc='Edit and paint images (less KDE dependencies)'
arch=(x86_64)
url='https://krita.org'
@@ -22,15 +22,18 @@ optdepends=('poppler-qt5: PDF filter'
provides=("${_pkgname}=${pkgver}")
conflicts=(calligra-krita krita-l10n "${_pkgname}")
source=("https://download.kde.org/stable/krita/$pkgver/${_pkgname}-$pkgver.tar.gz"{,.sig}
+ 'krita-libraw-0.19.patch'
'replace-code.patch')
sha256sums=('5cab10343f97a9944a1ab2e137cd0ade6029ce157118009660af286eb75ce9e3'
'SKIP'
+ '975b33492764f80f3b462a2bc589996f97ab1d7e667139023345e7eec40762ab'
'1e076c7de3ee1bd6622cd40d227d0c687170b410f0e297f78f97e0b7f7270d6d')
validpgpkeys=('05D00A8B73A686789E0A156858B9596C722EA3BD') # Boudewijn Rempt <foundation@krita.org>
prepare() {
mkdir -p build
cd "${_pkgname}-$pkgver"
+ patch -p1 -i ../krita-libraw-0.19.patch # Remove features no longer available in libraw 0.19
patch -Np1 -i '../replace-code.patch'
}
diff --git a/krita-libraw-0.19.patch b/krita-libraw-0.19.patch
new file mode 100644
index 00000000000..4cca709f1d8
--- /dev/null
+++ b/krita-libraw-0.19.patch
@@ -0,0 +1,54 @@
+diff --git a/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw_p.cpp b/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw_p.cpp
+index 1c761f8563..cdf5b507ec 100644
+--- a/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw_p.cpp
++++ b/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw_p.cpp
+@@ -375,40 +375,14 @@ bool KDcraw::Private::loadFromLibraw(const QString& filePath, QByteArray& imageD
+ raw.imgdata.params.fbdd_noiserd = lround(m_parent->m_rawDecodingSettings.NRThreshold / 100.0);
+ break;
+ }
+- case RawDecodingSettings::LINENR:
+- {
+- // (100 - 1000) => (0.001 - 0.02) conversion.
+- raw.imgdata.params.linenoise = m_parent->m_rawDecodingSettings.NRThreshold * 2.11E-5 + 0.00111111;
+- raw.imgdata.params.cfaline = true;
+- break;
+- }
+-
+- case RawDecodingSettings::IMPULSENR:
+- {
+- // (100 - 1000) => (0.005 - 0.05) conversion.
+- raw.imgdata.params.lclean = m_parent->m_rawDecodingSettings.NRThreshold * 5E-5;
+- raw.imgdata.params.cclean = m_parent->m_rawDecodingSettings.NRChroThreshold * 5E-5;
+- raw.imgdata.params.cfa_clean = true;
+- break;
+- }
+ default: // No Noise Reduction
+ {
+ raw.imgdata.params.threshold = 0;
+ raw.imgdata.params.fbdd_noiserd = 0;
+- raw.imgdata.params.linenoise = 0;
+- raw.imgdata.params.cfaline = false;
+- raw.imgdata.params.lclean = 0;
+- raw.imgdata.params.cclean = 0;
+- raw.imgdata.params.cfa_clean = false;
+ break;
+ }
+ }
+
+- // Chromatic aberration correction.
+- raw.imgdata.params.ca_correc = m_parent->m_rawDecodingSettings.enableCACorrection;
+- raw.imgdata.params.cared = m_parent->m_rawDecodingSettings.caMultiplier[0];
+- raw.imgdata.params.cablue = m_parent->m_rawDecodingSettings.caMultiplier[1];
+-
+ // Exposure Correction before interpolation.
+ raw.imgdata.params.exp_correc = m_parent->m_rawDecodingSettings.expoCorrection;
+ raw.imgdata.params.exp_shift = m_parent->m_rawDecodingSettings.expoCorrectionShift;
+@@ -461,8 +435,6 @@ bool KDcraw::Private::loadFromLibraw(const QString& filePath, QByteArray& imageD
+
+ raw.imgdata.params.dcb_iterations = m_parent->m_rawDecodingSettings.dcbIterations;
+ raw.imgdata.params.dcb_enhance_fl = m_parent->m_rawDecodingSettings.dcbEnhanceFl;
+- raw.imgdata.params.eeci_refine = m_parent->m_rawDecodingSettings.eeciRefine;
+- raw.imgdata.params.es_med_passes = m_parent->m_rawDecodingSettings.esMedPasses;
+
+ //-------------------------------------------------------------------------------------------
+