Date: Tuesday, September 18, 2018 @ 02:58:13 Author: foutrelis Revision: 334840
archrelease: copy trunk to staging-x86_64 Added: krita/repos/staging-x86_64/ krita/repos/staging-x86_64/PKGBUILD (from rev 334839, krita/trunk/PKGBUILD) krita/repos/staging-x86_64/krita-libraw-0.19.patch (from rev 334839, krita/trunk/krita-libraw-0.19.patch) -------------------------+ PKGBUILD | 42 +++++++++++++++++++++++++++++++++++ krita-libraw-0.19.patch | 54 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 96 insertions(+) Copied: krita/repos/staging-x86_64/PKGBUILD (from rev 334839, krita/trunk/PKGBUILD) =================================================================== --- staging-x86_64/PKGBUILD (rev 0) +++ staging-x86_64/PKGBUILD 2018-09-18 02:58:13 UTC (rev 334840) @@ -0,0 +1,42 @@ +# Maintainer: Antonio Rojas <arojas@archlinux,org> + +pkgname=krita +pkgver=4.1.1 +pkgrel=5 +pkgdesc="Edit and paint images" +arch=(x86_64) +url="https://krita.org" +license=(GPL3) +depends=(kio kitemmodels gsl libraw exiv2 openexr fftw curl boost-libs giflib qt5-declarative hicolor-icon-theme) +makedepends=(extra-cmake-modules kdoctools boost eigen vc poppler-qt5 opencolorio python-pyqt5 libheif sip python-sip) +optdepends=('poppler-qt5: PDF filter' 'ffmpeg: to save animations' 'opencolorio: for the LUT docker' + "krita-plugin-gmic: G'MIC plugin" 'python-pyqt5: for the Python plugins' 'libheif: HEIF filter') +conflicts=(calligra-krita krita-l10n) +replaces=(calligra-krita krita-l10n) +source=("https://download.kde.org/stable/krita/$pkgver/$pkgname-$pkgver.tar.gz"{,.sig} + krita-libraw-0.19.patch) +sha256sums=('5cab10343f97a9944a1ab2e137cd0ade6029ce157118009660af286eb75ce9e3' + 'SKIP' + '975b33492764f80f3b462a2bc589996f97ab1d7e667139023345e7eec40762ab') +validpgpkeys=('05D00A8B73A686789E0A156858B9596C722EA3BD') # Boudewijn Rempt <foundat...@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 +} + +build() { + cd build + cmake ../$pkgname-$pkgver \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_TESTING=OFF + make +} + +package() { + cd build + make DESTDIR="$pkgdir" install +} Copied: krita/repos/staging-x86_64/krita-libraw-0.19.patch (from rev 334839, krita/trunk/krita-libraw-0.19.patch) =================================================================== --- staging-x86_64/krita-libraw-0.19.patch (rev 0) +++ staging-x86_64/krita-libraw-0.19.patch 2018-09-18 02:58:13 UTC (rev 334840) @@ -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; + + //------------------------------------------------------------------------------------------- +