media-gfx/krita: Fix build with >=libraw-0.19

Reverting 88d14e3.

Closes: https://bugs.gentoo.org/659904
Package-Manager: Portage-2.3.48, Repoman-2.3.10

diff --git a/media-gfx/krita/files/krita-4.0.3-libraw-0.19.patch b/media-gfx/krita/files/krita-4.0.3-libraw-0.19.patch
new file mode 100644 (file)
index 0000000..03dd3c6
--- /dev/null
+++ b/media-gfx/krita/files/krita-4.0.3-libraw-0.19.patch
@@ -0,0 +1,77 @@
+From 9fd6b44701e674058b0eaa5d3f98a99e410a1e03 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Wed, 29 Aug 2018 17:50:28 +0200
+Subject: [PATCH] Fix build with libraw 0.19
+
+Summary:
+Patch taken from arojas in https://phabricator.kde.org/D15132 applied
+with little offset.
+
+Test Plan: Built fine against libraw-0.19 with krita.git master.
+
+Reviewers: rempt, #krita
+
+Subscribers: lbeltrame, rdieter, pino, arojas
+
+Tags: #krita
+
+Differential Revision: https://phabricator.kde.org/D15148
+---
+ plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw_p.cpp | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw_p.cpp b/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw_p.cpp
+index 1c761f8563..adc26d2662 100644
+--- a/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw_p.cpp
++++ b/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw_p.cpp
+@@ -375,6 +375,7 @@ bool KDcraw::Private::loadFromLibraw(const QString& filePath, QByteArray& imageD
+             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.
+@@ -391,23 +392,28 @@ bool KDcraw::Private::loadFromLibraw(const QString& filePath, QByteArray& imageD
+             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;
+@@ -461,8 +467,10 @@ 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;
++#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
+ 
+     //-------------------------------------------------------------------------------------------
+ 
+-- 
+2.18.0
+

diff --git a/media-gfx/krita/krita-4.0.3.ebuild b/media-gfx/krita/krita-4.0.3.ebuild
index ef2f33ef24848f5ec48178f189c2517db089447c..fd16ae054383f92eabad1f916451318d8ebe61ee 100644 (file)
--- a/media-gfx/krita/krita-4.0.3.ebuild
+++ b/media-gfx/krita/krita-4.0.3.ebuild
@@ -69,7 +69,7 @@ COMMON_DEPEND="
                dev-python/sip[${PYTHON_USEDEP}]
        )
        qtmedia? ( $(add_qt_dep qtmultimedia) )
-       raw? ( <media-libs/libraw-0.19:= )
+       raw? ( media-libs/libraw:= )
        tiff? ( media-libs/tiff:0 )
 "
 DEPEND="${COMMON_DEPEND}
@@ -86,6 +86,8 @@ RDEPEND="${COMMON_DEPEND}
 # bug 630508
 RESTRICT+=" test"
 
+PATCHES=( "${FILESDIR}/${P}-libraw-0.19.patch" )
+
 pkg_setup() {
        use python && python-single-r1_pkg_setup
 }