From 5933b1b8cbef01a4cd5e425edcc49ce8c1231ad0 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Sun, 1 Jul 2018 12:46:12 -0300 Subject: [PATCH] krita: rebuild against libraw.so.19 [ci skip] --- common/shlibs | 25 +++++++++ .../fix-compiling-with-libraw-0.19.patch | 55 +++++++++++++++++++ srcpkgs/krita/template | 5 +- 3 files changed, 83 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/krita/patches/fix-compiling-with-libraw-0.19.patch diff --git a/common/shlibs b/common/shlibs index bc46908fa30..df1f8b0b8c7 100644 --- a/common/shlibs +++ b/common/shlibs @@ -913,6 +913,31 @@ libdmapsharing-3.0.so.2 libdmapsharing-2.9.12_1 libgexiv2.so.2 libgexiv2-0.6.1_1 libraw.so.19 libraw-0.19.0_1 libraw_r.so.19 libraw-0.19.0_1 +libkritaversion.so.17 krita-4.1.0_4 +libkritaglobal.so.17 krita-4.1.0_4 +libkritaplugin.so.17 krita-4.1.0_4 +libkritawidgetutils.so.17 krita-4.1.0_4 +libkritawidgets.so.17 krita-4.1.0_4 +libkritastore.so.17 krita-4.1.0_4 +libkritaodf.so.17 krita-4.1.0_4 +libkritaflake.so.17 krita-4.1.0_4 +libkritabasicflakes.so.17 krita-4.1.0_4 +libkritapigment.so.17 krita-4.1.0_4 +libkritacommand.so.17 krita-4.1.0_4 +libkritalibbrush.so.17 krita-4.1.0_4 +libkritapsd.so.17 krita-4.1.0_4 +libkritacolor.so.17 krita-4.1.0_4 +libkritacolord.so.17 krita-4.1.0_4 +libkritaimage.so.17 krita-4.1.0_4 +libkritaui.so.17 krita-4.1.0_4 +libkritavectorimage.so.17 krita-4.1.0_4 +libkritaimpex.so.17 krita-4.1.0_4 +libkritalibkis.so.17 krita-4.1.0_4 +libkritaqml.so.17 krita-4.1.0_4 +libkritatextlayout.so.17 krita-4.1.0_4 +libkritatext.so.17 krita-4.1.0_4 +libkritalibkra.so.17 krita-4.1.0_4 +libkritalibpaintop.so.17 krita-4.1.0_4 libdjvulibre.so.21 libdjvulibre-3.5.24_1 libgxps.so.2 libgxps-0.2.0_1 libt1.so.5 libt1-5.1.2_1 diff --git a/srcpkgs/krita/patches/fix-compiling-with-libraw-0.19.patch b/srcpkgs/krita/patches/fix-compiling-with-libraw-0.19.patch new file mode 100644 index 00000000000..5187e05f770 --- /dev/null +++ b/srcpkgs/krita/patches/fix-compiling-with-libraw-0.19.patch @@ -0,0 +1,55 @@ +diff --git a/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw_p.cpp b/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw_p.cpp +index 1c761f8563..cdf5b507ec 100644 +--- a/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw_p.cpp ++++ b/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw_p.cpp +@@ -375,40 +375,14 @@ bool KDcraw::Private::loadFromLibraw(const QString& filePath, QByteArray& imageD + raw.imgdata.params.fbdd_noiserd = lround(m_parent->m_rawDecodingSettings.NRThreshold / 100.0); + break; + } +- case RawDecodingSettings::LINENR: +- { +- // (100 - 1000) => (0.001 - 0.02) conversion. +- raw.imgdata.params.linenoise = m_parent->m_rawDecodingSettings.NRThreshold * 2.11E-5 + 0.00111111; +- raw.imgdata.params.cfaline = true; +- break; +- } +- +- case RawDecodingSettings::IMPULSENR: +- { +- // (100 - 1000) => (0.005 - 0.05) conversion. +- raw.imgdata.params.lclean = m_parent->m_rawDecodingSettings.NRThreshold * 5E-5; +- raw.imgdata.params.cclean = m_parent->m_rawDecodingSettings.NRChroThreshold * 5E-5; +- raw.imgdata.params.cfa_clean = true; +- break; +- } + default: // No Noise Reduction + { + raw.imgdata.params.threshold = 0; + raw.imgdata.params.fbdd_noiserd = 0; +- 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; + break; + } + } + +- // 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]; +- + // Exposure Correction before interpolation. + raw.imgdata.params.exp_correc = m_parent->m_rawDecodingSettings.expoCorrection; + raw.imgdata.params.exp_shift = m_parent->m_rawDecodingSettings.expoCorrectionShift; +@@ -461,8 +435,6 @@ 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; +- raw.imgdata.params.eeci_refine = m_parent->m_rawDecodingSettings.eeciRefine; +- raw.imgdata.params.es_med_passes = m_parent->m_rawDecodingSettings.esMedPasses; + + //------------------------------------------------------------------------------------------- + + diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template index 524bac7ff4c..387868f6c7a 100644 --- a/srcpkgs/krita/template +++ b/srcpkgs/krita/template @@ -1,8 +1,9 @@ # Template file for 'krita' pkgname=krita version=4.1.0 -revision=3 +revision=4 nocross=yes +patch_args="-Np1" build_style=cmake replaces="calligra-krita>=0" configure_args="-Wno-dev -DBUILD_TESTING=OFF" @@ -17,5 +18,5 @@ makedepends="karchive-devel kconfig-devel kwidgetsaddons-devel kcompletion-devel poppler-qt5-devel" license="GPL-3.0-only" homepage="https://krita.org/" -distfiles="$KDE_SITE/krita/${version}/krita-${version}.tar.gz" +distfiles="${KDE_SITE}/krita/${version}/krita-${version}.tar.gz" checksum=78792df8165b986b806dcf9960a2679f683f2263e06f3ad5a24b0f78d8f27ed5