| 1 |
commit: 1073bbaf30c2a586930d2738f9ad958889c64416 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Aug 29 16:17:02 2018 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Aug 29 16:47:48 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1073bbaf |
| 7 |
|
| 8 |
media-gfx/krita: Fix build with >=libraw-0.19 |
| 9 |
|
| 10 |
Reverting 88d14e3. |
| 11 |
|
| 12 |
Closes: https://bugs.gentoo.org/659904 |
| 13 |
Package-Manager: Portage-2.3.48, Repoman-2.3.10 |
| 14 |
|
| 15 |
.../krita/files/krita-4.0.3-libraw-0.19.patch | 77 ++++++++++++++++++++++ |
| 16 |
media-gfx/krita/krita-4.0.3.ebuild | 4 +- |
| 17 |
2 files changed, 80 insertions(+), 1 deletion(-) |
| 18 |
|
| 19 |
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 |
| 20 |
new file mode 100644 |
| 21 |
index 00000000000..03dd3c6bc75 |
| 22 |
--- /dev/null |
| 23 |
+++ b/media-gfx/krita/files/krita-4.0.3-libraw-0.19.patch |
| 24 |
@@ -0,0 +1,77 @@ |
| 25 |
+From 9fd6b44701e674058b0eaa5d3f98a99e410a1e03 Mon Sep 17 00:00:00 2001 |
| 26 |
+From: Andreas Sturmlechner <asturm@g.o> |
| 27 |
+Date: Wed, 29 Aug 2018 17:50:28 +0200 |
| 28 |
+Subject: [PATCH] Fix build with libraw 0.19 |
| 29 |
+ |
| 30 |
+Summary: |
| 31 |
+Patch taken from arojas in https://phabricator.kde.org/D15132 applied |
| 32 |
+with little offset. |
| 33 |
+ |
| 34 |
+Test Plan: Built fine against libraw-0.19 with krita.git master. |
| 35 |
+ |
| 36 |
+Reviewers: rempt, #krita |
| 37 |
+ |
| 38 |
+Subscribers: lbeltrame, rdieter, pino, arojas |
| 39 |
+ |
| 40 |
+Tags: #krita |
| 41 |
+ |
| 42 |
+Differential Revision: https://phabricator.kde.org/D15148 |
| 43 |
+--- |
| 44 |
+ plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw_p.cpp | 8 ++++++++ |
| 45 |
+ 1 file changed, 8 insertions(+) |
| 46 |
+ |
| 47 |
+diff --git a/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw_p.cpp b/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw_p.cpp |
| 48 |
+index 1c761f8563..adc26d2662 100644 |
| 49 |
+--- a/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw_p.cpp |
| 50 |
++++ b/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw_p.cpp |
| 51 |
+@@ -375,6 +375,7 @@ bool KDcraw::Private::loadFromLibraw(const QString& filePath, QByteArray& imageD |
| 52 |
+ raw.imgdata.params.fbdd_noiserd = lround(m_parent->m_rawDecodingSettings.NRThreshold / 100.0); |
| 53 |
+ break; |
| 54 |
+ } |
| 55 |
++#if !LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 19) |
| 56 |
+ case RawDecodingSettings::LINENR: |
| 57 |
+ { |
| 58 |
+ // (100 - 1000) => (0.001 - 0.02) conversion. |
| 59 |
+@@ -391,23 +392,28 @@ bool KDcraw::Private::loadFromLibraw(const QString& filePath, QByteArray& imageD |
| 60 |
+ raw.imgdata.params.cfa_clean = true; |
| 61 |
+ break; |
| 62 |
+ } |
| 63 |
++#endif |
| 64 |
+ default: // No Noise Reduction |
| 65 |
+ { |
| 66 |
+ raw.imgdata.params.threshold = 0; |
| 67 |
+ raw.imgdata.params.fbdd_noiserd = 0; |
| 68 |
++#if !LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 19) |
| 69 |
+ raw.imgdata.params.linenoise = 0; |
| 70 |
+ raw.imgdata.params.cfaline = false; |
| 71 |
+ raw.imgdata.params.lclean = 0; |
| 72 |
+ raw.imgdata.params.cclean = 0; |
| 73 |
+ raw.imgdata.params.cfa_clean = false; |
| 74 |
++#endif |
| 75 |
+ break; |
| 76 |
+ } |
| 77 |
+ } |
| 78 |
+ |
| 79 |
++#if !LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 19) |
| 80 |
+ // Chromatic aberration correction. |
| 81 |
+ raw.imgdata.params.ca_correc = m_parent->m_rawDecodingSettings.enableCACorrection; |
| 82 |
+ raw.imgdata.params.cared = m_parent->m_rawDecodingSettings.caMultiplier[0]; |
| 83 |
+ raw.imgdata.params.cablue = m_parent->m_rawDecodingSettings.caMultiplier[1]; |
| 84 |
++#endif |
| 85 |
+ |
| 86 |
+ // Exposure Correction before interpolation. |
| 87 |
+ raw.imgdata.params.exp_correc = m_parent->m_rawDecodingSettings.expoCorrection; |
| 88 |
+@@ -461,8 +467,10 @@ bool KDcraw::Private::loadFromLibraw(const QString& filePath, QByteArray& imageD |
| 89 |
+ |
| 90 |
+ raw.imgdata.params.dcb_iterations = m_parent->m_rawDecodingSettings.dcbIterations; |
| 91 |
+ raw.imgdata.params.dcb_enhance_fl = m_parent->m_rawDecodingSettings.dcbEnhanceFl; |
| 92 |
++#if !LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 19) |
| 93 |
+ raw.imgdata.params.eeci_refine = m_parent->m_rawDecodingSettings.eeciRefine; |
| 94 |
+ raw.imgdata.params.es_med_passes = m_parent->m_rawDecodingSettings.esMedPasses; |
| 95 |
++#endif |
| 96 |
+ |
| 97 |
+ //------------------------------------------------------------------------------------------- |
| 98 |
+ |
| 99 |
+-- |
| 100 |
+2.18.0 |
| 101 |
+ |
| 102 |
|
| 103 |
diff --git a/media-gfx/krita/krita-4.0.3.ebuild b/media-gfx/krita/krita-4.0.3.ebuild |
| 104 |
index ef2f33ef248..fd16ae05438 100644 |
| 105 |
--- a/media-gfx/krita/krita-4.0.3.ebuild |
| 106 |
+++ b/media-gfx/krita/krita-4.0.3.ebuild |
| 107 |
@@ -69,7 +69,7 @@ COMMON_DEPEND=" |
| 108 |
dev-python/sip[${PYTHON_USEDEP}] |
| 109 |
) |
| 110 |
qtmedia? ( $(add_qt_dep qtmultimedia) ) |
| 111 |
- raw? ( <media-libs/libraw-0.19:= ) |
| 112 |
+ raw? ( media-libs/libraw:= ) |
| 113 |
tiff? ( media-libs/tiff:0 ) |
| 114 |
" |
| 115 |
DEPEND="${COMMON_DEPEND} |
| 116 |
@@ -86,6 +86,8 @@ RDEPEND="${COMMON_DEPEND} |
| 117 |
# bug 630508 |
| 118 |
RESTRICT+=" test" |
| 119 |
|
| 120 |
+PATCHES=( "${FILESDIR}/${P}-libraw-0.19.patch" ) |
| 121 |
+ |
| 122 |
pkg_setup() { |
| 123 |
use python && python-single-r1_pkg_setup |
| 124 |
} |
Archives