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

[Antonio Rojas]

    Date: Saturday, August 18, 2018 @ 09:23:43
  Author: arojas
Revision: 332234

libraw 0.19 rebuild

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-08-18 09:10:03 UTC (rev 332233)
+++ PKGBUILD	2018-08-18 09:23:43 UTC (rev 332234)
@@ -5,7 +5,7 @@
 
 pkgname=libkdcraw
 pkgver=18.08.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A C++ interface used to decode RAW picture"
 url="https://www.kde.org/applications/graphics/"
 arch=(x86_64)
@@ -12,14 +12,19 @@
 license=(GPL LGPL FDL)
 depends=(qt5-base libraw)
 makedepends=(extra-cmake-modules)
-source=("https://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig})
+source=("https://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig}
+        libkdcraw-libraw-0.19.patch)
 sha256sums=('dd146eebd1e0eea7e6a20ebd66b7d9ac2c79cc573de39faf6d34efaafb9bf376'
-            'SKIP')
+            'SKIP'
+            '48570c819c98010598b289f9918a13d69bdae03013c806ca6229b8a12451245c')
 validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7  # Albert Astals Cid <aacid at kde.org>
               F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck <cfeck at kde.org>
 
 prepare() {
   mkdir -p build
+
+  cd $pkgname-$pkgver
+  patch -p1 -i ../libkdcraw-libraw-0.19.patch # Remove support for features no longer available in libraw 0.19
 }
 
 build() {

Added: libkdcraw-libraw-0.19.patch
===================================================================
--- libkdcraw-libraw-0.19.patch	                        (rev 0)
+++ libkdcraw-libraw-0.19.patch	2018-08-18 09:23:43 UTC (rev 332234)
@@ -0,0 +1,54 @@
+diff --git a/src/kdcraw_p.cpp b/src/kdcraw_p.cpp
+index d6f5d00..2b1b9d4 100644
+--- a/src/kdcraw_p.cpp
++++ b/src/kdcraw_p.cpp
+@@ -371,40 +371,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;
+@@ -457,8 +431,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;
+ 
+     //-------------------------------------------------------------------------------------------
+