Received: by mail.netbsd.org (Postfix, from userid 605) id 5B1E584D6D; Sat, 2 Nov 2019 17:09:56 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id D40B684D67 for ; Sat, 2 Nov 2019 17:09:55 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id 3pAkVBn0MvZf for ; Sat, 2 Nov 2019 17:09:55 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 3B7C084CD8 for ; Sat, 2 Nov 2019 17:09:55 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 30B7BFA92; Sat, 2 Nov 2019 17:09:55 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_157271459575960" MIME-Version: 1.0 Date: Sat, 2 Nov 2019 17:09:55 +0000 From: "Maya Rashish" Subject: CVS commit: pkgsrc/graphics/libkdcraw To: pkgsrc-changes@NetBSD.org Reply-To: maya@netbsd.org X-Mailer: log_accum Message-Id: <20191102170955.30B7BFA92@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_157271459575960 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: maya Date: Sat Nov 2 17:09:55 UTC 2019 Modified Files: pkgsrc/graphics/libkdcraw: distinfo Added Files: pkgsrc/graphics/libkdcraw/patches: patch-libkdcraw_kdcraw__p.cpp Log Message: libkdcraw: fix build with libraw 0.19. Backport upstream commit. To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 pkgsrc/graphics/libkdcraw/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/graphics/libkdcraw/patches/patch-libkdcraw_kdcraw__p.cpp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_157271459575960 Content-Disposition: inline Content-Length: 3909 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/graphics/libkdcraw/distinfo diff -u pkgsrc/graphics/libkdcraw/distinfo:1.21 pkgsrc/graphics/libkdcraw/distinfo:1.22 --- pkgsrc/graphics/libkdcraw/distinfo:1.21 Sun Jan 10 19:43:46 2016 +++ pkgsrc/graphics/libkdcraw/distinfo Sat Nov 2 17:09:54 2019 @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.21 2016/01/10 19:43:46 markd Exp $ +$NetBSD: distinfo,v 1.22 2019/11/02 17:09:54 maya Exp $ SHA1 (libkdcraw-15.08.3.tar.xz) = faf93404a36162a381abcafd289e3de811774a25 RMD160 (libkdcraw-15.08.3.tar.xz) = a70f999dc10b4ed473ecec8ea0548a1f5c969e29 SHA512 (libkdcraw-15.08.3.tar.xz) = f77902a768df26368a67f680cb1e5c54eec5f44b5598ff9966c30abdfd977ea683a738cf01749557f144d58a85121afea61a8e5f7ec80d1c2d55a3bdf9549c39 Size (libkdcraw-15.08.3.tar.xz) = 102308 bytes +SHA1 (patch-libkdcraw_kdcraw__p.cpp) = 96ecd8cdb7ee0258a23e07fb33b9f1a3697deb0f Added files: Index: pkgsrc/graphics/libkdcraw/patches/patch-libkdcraw_kdcraw__p.cpp diff -u /dev/null pkgsrc/graphics/libkdcraw/patches/patch-libkdcraw_kdcraw__p.cpp:1.1 --- /dev/null Sat Nov 2 17:09:55 2019 +++ pkgsrc/graphics/libkdcraw/patches/patch-libkdcraw_kdcraw__p.cpp Sat Nov 2 17:09:55 2019 @@ -0,0 +1,64 @@ +$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); --_----------=_157271459575960--