Hello community, here is the log from the commit of package libkdcraw for openSUSE:Factory checked in at 2018-09-04 22:49:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libkdcraw (Old) and /work/SRC/openSUSE:Factory/.libkdcraw.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libkdcraw" Tue Sep 4 22:49:15 2018 rev:97 rq:632465 version:18.08.0 Changes: -------- --- /work/SRC/openSUSE:Factory/libkdcraw/libkdcraw.changes 2018-08-22 14:17:33.373954174 +0200 +++ /work/SRC/openSUSE:Factory/.libkdcraw.new/libkdcraw.changes 2018-09-04 22:49:18.679590822 +0200 @@ -1,0 +2,6 @@ +Fri Aug 31 09:25:00 UTC 2018 - [email protected] + +- Add fix-build-with-libraw-0.19.patch to fix compilation with the + latest libraw (kde#397345) + +------------------------------------------------------------------- New: ---- fix-build-with-libraw-0.19.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libkdcraw.spec ++++++ --- /var/tmp/diff_new_pack.dwt087/_old 2018-09-04 22:49:19.067592156 +0200 +++ /var/tmp/diff_new_pack.dwt087/_new 2018-09-04 22:49:19.071592170 +0200 @@ -31,6 +31,8 @@ Source0: %{name}-%{version}.tar.xz # PATCH-FIX-OPENSUSE Patch: 0001-Revert-Bump-libraw-minimal-version-increase-supporte.patch +# PATCH-FIX-UPSTREAM +Patch1: fix-build-with-libraw-0.19.patch BuildRequires: extra-cmake-modules BuildRequires: kf5-filesystem BuildRequires: pkgconfig @@ -56,6 +58,7 @@ %if 0%{suse_version} < 1500 %patch -p1 %endif +%patch1 -p1 %build %cmake_kf5 -d build -- -DENABLE_LCMS2=true -DENABLE_RAWSPEED=true ++++++ fix-build-with-libraw-0.19.patch ++++++ >From f40ebe30dca1cfadc8171364ac325532e6c3f229 Mon Sep 17 00:00:00 2001 From: Antonio Rojas <[email protected]> Date: Fri, 31 Aug 2018 09:21:41 +0200 Subject: Fix build with libraw 0.19 Ifdef functionality that depends on code removed from libraw 0.19, and mark it as deprecated BUG: 397345 Differential Revision: https://phabricator.kde.org/D15132 --- src/kdcraw_p.cpp | 8 ++++++++ src/rawdecodingsettings.h | 28 ++++++++++++++++------------ 2 files changed, 24 insertions(+), 12 deletions(-) diff --git a/src/kdcraw_p.cpp b/src/kdcraw_p.cpp index d6f5d00..76a7d42 100644 --- a/src/kdcraw_p.cpp +++ b/src/kdcraw_p.cpp @@ -371,6 +371,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. @@ -387,23 +388,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; @@ -457,8 +463,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 //------------------------------------------------------------------------------------------- diff --git a/src/rawdecodingsettings.h b/src/rawdecodingsettings.h index 01cc01b..ad7a664 100644 --- a/src/rawdecodingsettings.h +++ b/src/rawdecodingsettings.h @@ -50,8 +50,6 @@ public: /** RAW decoding Interpolation methods * - * NOTE: from original dcraw demosaic - * * Bilinear: use high-speed but low-quality bilinear * interpolation (default - for slow computer). In this method, * the red value of a non-red pixel is computed as the average of @@ -67,37 +65,38 @@ public: * AHD: use Adaptive Homogeneity-Directed interpolation. * This method selects the direction of interpolation so as to * maximize a homogeneity metric, thus typically minimizing color artifacts. + * DCB: DCB interpolation (see http://www.linuxphoto.org/html/dcb.html for details) * - * NOTE: from GPL2 demosaic pack. + * NOTE: from GPL2/GPL3 demosaic packs - will not work with libraw>=0.19 * - * DCB: DCB interpolation (see http://www.linuxphoto.org/html/dcb.html for details) * PL_AHD: modified AHD interpolation (see http://sites.google.com/site/demosaicalgorithms/modified-dcraw * for details). * AFD: demosaicing through 5 pass median filter from PerfectRaw project. * VCD: VCD interpolation. * VCD_AHD: mixed demosaicing between VCD and AHD. * LMMSE: LMMSE interpolation from PerfectRaw. - * - * NOTE: from GPL3 demosaic pack. - * * AMAZE: AMaZE interpolation and color aberration removal from RawTherapee project. + * + * NOTE: for libraw>=0.19 only + * + * DHT: DHT interpolation. + * AAHD: Enhanced Adaptative AHD interpolation. */ enum DecodingQuality { - // from original dcraw demosaic BILINEAR = 0, VNG = 1, PPG = 2, AHD = 3, - // Extended demosaicing method from GPL2 demosaic pack DCB = 4, PL_AHD = 5, AFD = 6, VCD = 7, VCD_AHD = 8, LMMSE = 9, - // Extended demosaicing methods from GPL3 demosaic pack - AMAZE = 10 + AMAZE = 10, + DHT = 11, + AAHD = 12 }; /** White balances alternatives @@ -252,6 +251,7 @@ public: int NRThreshold; /** Turn on chromatic aberrations correction + * @deprecated does not work with libraw>=0.19 */ bool enableCACorrection; @@ -259,6 +259,7 @@ public: * - caMultiplier[0] = amount of correction on red-green axis. * - caMultiplier[1] = amount of correction on blue-yellow axis. * - Both values set to 0.0 = automatic CA correction. + * @deprecated does not work with libraw>=0.19 */ double caMultiplier[2]; @@ -325,17 +326,20 @@ public: /// For VCD_AHD interpolation. /** Turn on the EECI refine for VCD Demosaicing. + * @deprecated does not work with libraw>=0.19 */ bool eeciRefine; /** Use edge-sensitive median filtering for artifact supression after VCD demosaicing. * 0 : disable (default) * 1-10 : median filter passes. + * @deprecated does not work with libraw>=0.19 */ int esMedPasses; /** For IMPULSENR Noise reduction. Set the amount of Chrominance impulse denoise. - Null value disable NR. Range is between 100 and 1000. + * Null value disable NR. Range is between 100 and 1000. + * @deprecated does not work with libraw>=0.19 */ int NRChroThreshold; -- cgit v0.11.2
