| 1 |
commit: 2a3b6c5198adfcce7199f63efd346e665ec3a076 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Aug 29 09:00:29 2018 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Aug 29 10:51:23 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=2a3b6c51 |
| 7 |
|
| 8 |
kde-apps/libkdcraw: Fix build with >=libraw-0.19 |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/659860 |
| 11 |
Package-Manager: Portage-2.3.48, Repoman-2.3.10 |
| 12 |
|
| 13 |
.../files/libkdcraw-18.08.0-libraw-0.19.patch | 54 ++++++++++++++++++++++ |
| 14 |
kde-apps/libkdcraw/libkdcraw-18.08.0.ebuild | 2 + |
| 15 |
kde-apps/libkdcraw/libkdcraw-18.08.49.9999.ebuild | 2 + |
| 16 |
3 files changed, 58 insertions(+) |
| 17 |
|
| 18 |
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 |
| 19 |
new file mode 100644 |
| 20 |
index 0000000000..fe40357620 |
| 21 |
--- /dev/null |
| 22 |
+++ b/kde-apps/libkdcraw/files/libkdcraw-18.08.0-libraw-0.19.patch |
| 23 |
@@ -0,0 +1,54 @@ |
| 24 |
+Patch taken from: https://phabricator.kde.org/D15132 |
| 25 |
+KDE-bug: https://bugs.kde.org/show_bug.cgi?id=397345 |
| 26 |
+ |
| 27 |
+diff --git a/src/kdcraw_p.cpp b/src/kdcraw_p.cpp |
| 28 |
+--- a/src/kdcraw_p.cpp |
| 29 |
++++ b/src/kdcraw_p.cpp |
| 30 |
+@@ -371,6 +371,7 @@ |
| 31 |
+ raw.imgdata.params.fbdd_noiserd = lround(m_parent->m_rawDecodingSettings.NRThreshold / 100.0); |
| 32 |
+ break; |
| 33 |
+ } |
| 34 |
++#if !LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 19) |
| 35 |
+ case RawDecodingSettings::LINENR: |
| 36 |
+ { |
| 37 |
+ // (100 - 1000) => (0.001 - 0.02) conversion. |
| 38 |
+@@ -387,23 +388,28 @@ |
| 39 |
+ raw.imgdata.params.cfa_clean = true; |
| 40 |
+ break; |
| 41 |
+ } |
| 42 |
++#endif |
| 43 |
+ default: // No Noise Reduction |
| 44 |
+ { |
| 45 |
+ raw.imgdata.params.threshold = 0; |
| 46 |
+ raw.imgdata.params.fbdd_noiserd = 0; |
| 47 |
++#if !LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 19) |
| 48 |
+ raw.imgdata.params.linenoise = 0; |
| 49 |
+ raw.imgdata.params.cfaline = false; |
| 50 |
+ raw.imgdata.params.lclean = 0; |
| 51 |
+ raw.imgdata.params.cclean = 0; |
| 52 |
+ raw.imgdata.params.cfa_clean = false; |
| 53 |
++#endif |
| 54 |
+ break; |
| 55 |
+ } |
| 56 |
+ } |
| 57 |
+ |
| 58 |
++#if !LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 19) |
| 59 |
+ // Chromatic aberration correction. |
| 60 |
+ raw.imgdata.params.ca_correc = m_parent->m_rawDecodingSettings.enableCACorrection; |
| 61 |
+ raw.imgdata.params.cared = m_parent->m_rawDecodingSettings.caMultiplier[0]; |
| 62 |
+ raw.imgdata.params.cablue = m_parent->m_rawDecodingSettings.caMultiplier[1]; |
| 63 |
++#endif |
| 64 |
+ |
| 65 |
+ // Exposure Correction before interpolation. |
| 66 |
+ raw.imgdata.params.exp_correc = m_parent->m_rawDecodingSettings.expoCorrection; |
| 67 |
+@@ -457,8 +463,10 @@ |
| 68 |
+ |
| 69 |
+ raw.imgdata.params.dcb_iterations = m_parent->m_rawDecodingSettings.dcbIterations; |
| 70 |
+ raw.imgdata.params.dcb_enhance_fl = m_parent->m_rawDecodingSettings.dcbEnhanceFl; |
| 71 |
++#if !LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 19) |
| 72 |
+ raw.imgdata.params.eeci_refine = m_parent->m_rawDecodingSettings.eeciRefine; |
| 73 |
+ raw.imgdata.params.es_med_passes = m_parent->m_rawDecodingSettings.esMedPasses; |
| 74 |
++#endif |
| 75 |
+ |
| 76 |
+ //------------------------------------------------------------------------------------------- |
| 77 |
+ |
| 78 |
|
| 79 |
diff --git a/kde-apps/libkdcraw/libkdcraw-18.08.0.ebuild b/kde-apps/libkdcraw/libkdcraw-18.08.0.ebuild |
| 80 |
index 88aa251600..1c07a36708 100644 |
| 81 |
--- a/kde-apps/libkdcraw/libkdcraw-18.08.0.ebuild |
| 82 |
+++ b/kde-apps/libkdcraw/libkdcraw-18.08.0.ebuild |
| 83 |
@@ -16,3 +16,5 @@ DEPEND=" |
| 84 |
>=media-libs/libraw-0.16:= |
| 85 |
" |
| 86 |
RDEPEND="${DEPEND}" |
| 87 |
+ |
| 88 |
+PATCHES=( "${FILESDIR}/${P}-libraw-0.19.patch" ) |
| 89 |
|
| 90 |
diff --git a/kde-apps/libkdcraw/libkdcraw-18.08.49.9999.ebuild b/kde-apps/libkdcraw/libkdcraw-18.08.49.9999.ebuild |
| 91 |
index f36ab4a9e1..7f1046fa17 100644 |
| 92 |
--- a/kde-apps/libkdcraw/libkdcraw-18.08.49.9999.ebuild |
| 93 |
+++ b/kde-apps/libkdcraw/libkdcraw-18.08.49.9999.ebuild |
| 94 |
@@ -16,3 +16,5 @@ DEPEND=" |
| 95 |
>=media-libs/libraw-0.16:= |
| 96 |
" |
| 97 |
RDEPEND="${DEPEND}" |
| 98 |
+ |
| 99 |
+PATCHES=( "${FILESDIR}/${PN}-18.08.0-libraw-0.19.patch" ) |
Archives