From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D055B138335 for ; Wed, 29 Aug 2018 16:48:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AD17EE07EF; Wed, 29 Aug 2018 16:48:09 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 749FFE07EF for ; Wed, 29 Aug 2018 16:48:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BC202340CF6 for ; Wed, 29 Aug 2018 16:48:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 40A413AD for ; Wed, 29 Aug 2018 16:48:05 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1535561268.1073bbaf30c2a586930d2738f9ad958889c64416.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/, media-gfx/krita/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/krita/files/krita-4.0.3-libraw-0.19.patch media-gfx/krita/krita-4.0.3.ebuild X-VCS-Directories: media-gfx/krita/ media-gfx/krita/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 1073bbaf30c2a586930d2738f9ad958889c64416 X-VCS-Branch: master Date: Wed, 29 Aug 2018 16:48:05 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 6f98e547-24f9-4ea7-ae25-01cea5b9a134 X-Archives-Hash: 628f0da60f347214b1f92e0bf634465a commit: 1073bbaf30c2a586930d2738f9ad958889c64416 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Aug 29 16:17:02 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Aug 29 16:47:48 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1073bbaf 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 .../krita/files/krita-4.0.3-libraw-0.19.patch | 77 ++++++++++++++++++++++ media-gfx/krita/krita-4.0.3.ebuild | 4 +- 2 files changed, 80 insertions(+), 1 deletion(-) 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 index 00000000000..03dd3c6bc75 --- /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 +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 ef2f33ef248..fd16ae05438 100644 --- 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? (