[arch-commits] Commit in krita/trunk (PKGBUILD krita-libraw-0.19.patch)

[Antonio Rojas]

    Date: Saturday, August 18, 2018 @ 10:50:30
  Author: arojas
Revision: 332244

libraw 0.19 rebuild

Added:
  krita/trunk/krita-libraw-0.19.patch
Modified:
  krita/trunk/PKGBUILD

-------------------------+
 PKGBUILD                |   11 ++++++---
 krita-libraw-0.19.patch |   54 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 62 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-08-18 10:35:34 UTC (rev 332243)
+++ PKGBUILD	2018-08-18 10:50:30 UTC (rev 332244)
@@ -3,7 +3,7 @@
 
 pkgname=krita
 pkgver=4.1.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Edit and paint images"
 arch=(x86_64)
 url="https://krita.org"
@@ -14,13 +14,18 @@
             "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})
+source=("https://download.kde.org/stable/krita/$pkgver/$pkgname-$pkgver.tar.gz"{,.sig}
+        krita-libraw-0.19.patch)
 sha256sums=('5cab10343f97a9944a1ab2e137cd0ade6029ce157118009660af286eb75ce9e3'
-            'SKIP')
+            'SKIP'
+            '975b33492764f80f3b462a2bc589996f97ab1d7e667139023345e7eec40762ab')
 validpgpkeys=('05D00A8B73A686789E0A156858B9596C722EA3BD') # Boudewijn Rempt <foundation at 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() {

Added: krita-libraw-0.19.patch
===================================================================
--- krita-libraw-0.19.patch	                        (rev 0)
+++ krita-libraw-0.19.patch	2018-08-18 10:50:30 UTC (rev 332244)
@@ -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;
+ 
+     //-------------------------------------------------------------------------------------------
+