+++ /dev/null
-From 9fd6b44701e674058b0eaa5d3f98a99e410a1e03 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-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
-
+++ /dev/null
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-PYTHON_COMPAT=( python3_{4,5,6} )
-inherit kde5 python-single-r1
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
- SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.gz"
- KEYWORDS="amd64 ~x86"
-fi
-
-DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
-HOMEPAGE="https://www.kde.org/applications/graphics/krita/ https://krita.org/"
-LICENSE="GPL-3"
-IUSE="color-management fftw gif +gsl +jpeg openexr pdf qtmedia +raw tiff vc"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
- $(add_frameworks_dep karchive)
- $(add_frameworks_dep kcompletion)
- $(add_frameworks_dep kconfig)
- $(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep kcrash)
- $(add_frameworks_dep kguiaddons)
- $(add_frameworks_dep ki18n)
- $(add_frameworks_dep kiconthemes)
- $(add_frameworks_dep kio)
- $(add_frameworks_dep kitemmodels)
- $(add_frameworks_dep kitemviews)
- $(add_frameworks_dep kwidgetsaddons)
- $(add_frameworks_dep kwindowsystem)
- $(add_frameworks_dep kxmlgui)
- $(add_qt_dep qtconcurrent)
- $(add_qt_dep qtdbus)
- $(add_qt_dep qtdeclarative)
- $(add_qt_dep qtgui '-gles2')
- $(add_qt_dep qtnetwork)
- $(add_qt_dep qtprintsupport)
- $(add_qt_dep qtsvg)
- $(add_qt_dep qtwidgets)
- $(add_qt_dep qtx11extras)
- $(add_qt_dep qtxml)
- dev-libs/boost:=
- dev-python/PyQt5[${PYTHON_USEDEP}]
- dev-python/sip[${PYTHON_USEDEP}]
- media-gfx/exiv2:=
- media-libs/lcms
- media-libs/libpng:0=
- sys-libs/zlib
- virtual/opengl
- x11-libs/libX11
- x11-libs/libxcb
- x11-libs/libXi
- color-management? ( media-libs/opencolorio )
- fftw? ( sci-libs/fftw:3.0= )
- gif? ( media-libs/giflib )
- gsl? ( sci-libs/gsl:= )
- jpeg? ( virtual/jpeg:0 )
- openexr? (
- media-libs/ilmbase:=
- media-libs/openexr
- )
- pdf? ( app-text/poppler[qt5] )
- qtmedia? ( $(add_qt_dep qtmultimedia) )
- raw? ( media-libs/libraw:= )
- tiff? ( media-libs/tiff:0 )
-"
-DEPEND="${COMMON_DEPEND}
- dev-cpp/eigen:3
- dev-lang/perl
- sys-devel/gettext
- vc? ( >=dev-libs/vc-1.1.0 )
-"
-RDEPEND="${COMMON_DEPEND}
- !app-office/calligra:4[calligra_features_krita]
- !app-office/calligra-l10n:4[calligra_features_krita(+)]
-"
-
-# bug 630508
-RESTRICT+=" test"
-
-PATCHES=(
- "${FILESDIR}/${PN}-4.0.3-tests-optional.patch"
- "${FILESDIR}/${PN}-4.0.3-libraw-0.19.patch"
-)
-
-pkg_setup() {
- python-single-r1_pkg_setup
- kde5_pkg_setup
-}
-
-src_configure() {
- # Prevent sandbox violation from FindPyQt5.py module
- # See Gentoo-bug 655918
- addpredict /dev/dri
-
- local mycmakeargs=(
- $(cmake-utils_use_find_package color-management OCIO)
- $(cmake-utils_use_find_package fftw FFTW3)
- $(cmake-utils_use_find_package gif GIF)
- $(cmake-utils_use_find_package gsl GSL)
- $(cmake-utils_use_find_package jpeg JPEG)
- $(cmake-utils_use_find_package openexr OpenEXR)
- $(cmake-utils_use_find_package pdf Poppler)
- $(cmake-utils_use_find_package qtmedia Qt5Multimedia)
- $(cmake-utils_use_find_package raw LibRaw)
- $(cmake-utils_use_find_package tiff TIFF)
- $(cmake-utils_use_find_package vc Vc)
- )
-
- kde5_src_configure
-}
projects / gentoo.git / commitdiff