commit: 2a3b6c5198adfcce7199f63efd346e665ec3a076 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Wed Aug 29 09:00:29 2018 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Wed Aug 29 10:51:23 2018 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=2a3b6c51
kde-apps/libkdcraw: Fix build with >=libraw-0.19 Bug: https://bugs.gentoo.org/659860 Package-Manager: Portage-2.3.48, Repoman-2.3.10 .../files/libkdcraw-18.08.0-libraw-0.19.patch | 54 ++++++++++++++++++++++ kde-apps/libkdcraw/libkdcraw-18.08.0.ebuild | 2 + kde-apps/libkdcraw/libkdcraw-18.08.49.9999.ebuild | 2 + 3 files changed, 58 insertions(+) diff --git a/kde-apps/libkdcraw/files/libkdcraw-18.08.0-libraw-0.19.patch b/kde-apps/libkdcraw/files/libkdcraw-18.08.0-libraw-0.19.patch new file mode 100644 index 0000000000..fe40357620 --- /dev/null +++ b/kde-apps/libkdcraw/files/libkdcraw-18.08.0-libraw-0.19.patch @@ -0,0 +1,54 @@ +Patch taken from: https://phabricator.kde.org/D15132 +KDE-bug: https://bugs.kde.org/show_bug.cgi?id=397345 + +diff --git a/src/kdcraw_p.cpp b/src/kdcraw_p.cpp +--- a/src/kdcraw_p.cpp ++++ b/src/kdcraw_p.cpp +@@ -371,6 +371,7 @@ + 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. +@@ -387,23 +388,28 @@ + 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; +@@ -457,8 +463,10 @@ + + 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 + + //------------------------------------------------------------------------------------------- + diff --git a/kde-apps/libkdcraw/libkdcraw-18.08.0.ebuild b/kde-apps/libkdcraw/libkdcraw-18.08.0.ebuild index 88aa251600..1c07a36708 100644 --- a/kde-apps/libkdcraw/libkdcraw-18.08.0.ebuild +++ b/kde-apps/libkdcraw/libkdcraw-18.08.0.ebuild @@ -16,3 +16,5 @@ DEPEND=" >=media-libs/libraw-0.16:= " RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}/${P}-libraw-0.19.patch" ) diff --git a/kde-apps/libkdcraw/libkdcraw-18.08.49.9999.ebuild b/kde-apps/libkdcraw/libkdcraw-18.08.49.9999.ebuild index f36ab4a9e1..7f1046fa17 100644 --- a/kde-apps/libkdcraw/libkdcraw-18.08.49.9999.ebuild +++ b/kde-apps/libkdcraw/libkdcraw-18.08.49.9999.ebuild @@ -16,3 +16,5 @@ DEPEND=" >=media-libs/libraw-0.16:= " RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}/${PN}-18.08.0-libraw-0.19.patch" )
