Sat Nov 2 17:09:55 2019 UTC ()
libkdcraw: fix build with libraw 0.19. Backport upstream commit.
(maya)
diff -r1.21 -r1.22 pkgsrc/graphics/libkdcraw/distinfo
diff -r0 -r1.1 pkgsrc/graphics/libkdcraw/patches/patch-libkdcraw_kdcraw__p.cpp
--- pkgsrc/graphics/libkdcraw/distinfo 2016/01/10 19:43:46 1.21
+++ pkgsrc/graphics/libkdcraw/distinfo 2019/11/02 17:09:54 1.22
| @@ -1,6 +1,7 @@ | | | @@ -1,6 +1,7 @@ |
| 1 | $NetBSD: distinfo,v 1.21 2016/01/10 19:43:46 markd Exp $ | | 1 | $NetBSD: distinfo,v 1.22 2019/11/02 17:09:54 maya Exp $ |
| 2 | | | 2 | |
| 3 | SHA1 (libkdcraw-15.08.3.tar.xz) = faf93404a36162a381abcafd289e3de811774a25 | | 3 | SHA1 (libkdcraw-15.08.3.tar.xz) = faf93404a36162a381abcafd289e3de811774a25 |
| 4 | RMD160 (libkdcraw-15.08.3.tar.xz) = a70f999dc10b4ed473ecec8ea0548a1f5c969e29 | | 4 | RMD160 (libkdcraw-15.08.3.tar.xz) = a70f999dc10b4ed473ecec8ea0548a1f5c969e29 |
| 5 | SHA512 (libkdcraw-15.08.3.tar.xz) = f77902a768df26368a67f680cb1e5c54eec5f44b5598ff9966c30abdfd977ea683a738cf01749557f144d58a85121afea61a8e5f7ec80d1c2d55a3bdf9549c39 | | 5 | SHA512 (libkdcraw-15.08.3.tar.xz) = f77902a768df26368a67f680cb1e5c54eec5f44b5598ff9966c30abdfd977ea683a738cf01749557f144d58a85121afea61a8e5f7ec80d1c2d55a3bdf9549c39 |
| 6 | Size (libkdcraw-15.08.3.tar.xz) = 102308 bytes | | 6 | Size (libkdcraw-15.08.3.tar.xz) = 102308 bytes |
| | | 7 | SHA1 (patch-libkdcraw_kdcraw__p.cpp) = 96ecd8cdb7ee0258a23e07fb33b9f1a3697deb0f |
$NetBSD: patch-libkdcraw_kdcraw__p.cpp,v 1.1 2019/11/02 17:09:55 maya Exp $
Fix with libraw 0.19
from https://github.com/KDE/libkdcraw/commit/f40ebe30dca1cfadc8171364ac325532e6c3f229
--- libkdcraw/kdcraw_p.cpp.orig 2015-05-14 20:54:16.000000000 +0000
+++ libkdcraw/kdcraw_p.cpp
@@ -367,6 +367,7 @@ bool KDcraw::Private::loadFromLibraw(con
raw.imgdata.params.fbdd_noiserd = lround(m_parent->m_rawDecodingSettings.NRThreshold / 100.0);
break;
}
+#if !LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 19)
case RawDecodingSettings::LINENR:
{
// (100 - 1000) => (0.001 - 0.02) conversion.
@@ -374,7 +375,6 @@ bool KDcraw::Private::loadFromLibraw(con
raw.imgdata.params.cfaline = true;
break;
}
-
case RawDecodingSettings::IMPULSENR:
{
// (100 - 1000) => (0.005 - 0.05) conversion.
@@ -383,23 +383,28 @@ bool KDcraw::Private::loadFromLibraw(con
raw.imgdata.params.cfa_clean = true;
break;
}
+#endif
default: // No Noise Reduction
{
raw.imgdata.params.threshold = 0;
raw.imgdata.params.fbdd_noiserd = 0;
+#if !LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 19)
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;
+#endif
break;
}
}
+#if !LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 19)
// 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];
+#endif
// Exposure Correction before interpolation.
raw.imgdata.params.exp_correc = m_parent->m_rawDecodingSettings.expoCorrection;
@@ -453,9 +458,10 @@ bool KDcraw::Private::loadFromLibraw(con
raw.imgdata.params.dcb_iterations = m_parent->m_rawDecodingSettings.dcbIterations;
raw.imgdata.params.dcb_enhance_fl = m_parent->m_rawDecodingSettings.dcbEnhanceFl;
+#if !LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 19)
raw.imgdata.params.eeci_refine = m_parent->m_rawDecodingSettings.eeciRefine;
raw.imgdata.params.es_med_passes = m_parent->m_rawDecodingSettings.esMedPasses;
-
+#endif
//-------------------------------------------------------------------------------------------
setProgress(0.1);