media-gfx/krita: Bump to 5.2.2

Closes: https://bugs.gentoo.org/921972

Signed-off-by: Sebastian Parborg <darkdefende@gmail.com>
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Sebastian Parborg
2024-07-13 18:34:38 +01:00
committed by Sam James
parent 41760d52db
commit ffd02e2a65
5 changed files with 169 additions and 0 deletions
+1
View File
@@ -1,2 +1,3 @@
DIST krita-5.1.5-exiv2-0.28.patch.xz 4664 BLAKE2B e364325be3d8e40e293a7d268136be3737ce5d2b9b5607f140b30ba3e687dc8d86545f4463348587711150f1652b521f87efc859a1bf2bc3b5ed704cf3236781 SHA512 130ba9cce7d6c0138f7ef6dab1445816c2e29752aa16643c32a7d9c00d7a156ac88f01afdb782ab03fc1e0822660a070f74c02e7cde4dfbcec30baaf3c3dba7f
DIST krita-5.1.5.tar.xz 184981952 BLAKE2B 3d8d26849d8508dc040fb3ac5ab4d0ce724f670bf7d5782b37702b55afe5063543e6aa564a1c9326c90fb16f7905941e3f1ffd4296efd6f8a1c7cb34c0b41716 SHA512 b745eb9f51bb08df0948d6b97b85aee6a74b496df3e8423fb9107d79551daadb21960b4bb5c438348f662c67d0ec5b2fa6da18cfa5feb418659881cddd24d8f1
DIST krita-5.2.2.tar.xz 189146788 BLAKE2B 1cfb9f404258467f2cc616bc0320a463f7291d2fe75c76b873982c3741d1f21a338aabed60bc216628e54ae01f7ba52d3b713c3a00d920b03645cba23927d207 SHA512 d2e55d9a6c7be79f5b6661a1bd605cdf1ce20ec78cdaab1ba19a4acca5397afa0c0e8bc1cbf60120993b156aef65ed35fde2de756841342d18221c82ea81a1eb
@@ -0,0 +1,18 @@
Disable the cmake find_package method. It will instead fallback to use pkgconfig.
Without this, it will fail to find fftw3 and error out.
--- a/cmake/modules/FindFFTW3.cmake 2023-11-24 19:59:45.904059240 +0100
+++ b/cmake/modules/FindFFTW3.cmake 2023-11-24 20:00:17.029563107 +0100
@@ -74,9 +74,9 @@
endforeach()
mark_as_advanced(PKG_FFTW_CONFIG_DIR)
-find_package(FFTW3 QUIET NO_MODULE
- HINTS ${PKG_FFTW_CONFIG_DIR} /usr/lib/cmake/fftw3 /usr/local/lib/cmake/fftw3
-)
+#find_package(FFTW3 QUIET NO_MODULE
+# HINTS ${PKG_FFTW_CONFIG_DIR} /usr/lib/cmake/fftw3 /usr/local/lib/cmake/fftw3
+#)
mark_as_advanced(FFTW3_DIR)
# if we found the FFTW3 CMake package then we can start
@@ -0,0 +1,14 @@
Disable the cmake find_package method. It will instead fallback to use pkgconfig.
Without this, it will fail to find openjpeg and error out.
--- a/cmake/modules/FindOpenJPEG.cmake 2023-11-24 19:58:50.650715138 +0100
+++ b/cmake/modules/FindOpenJPEG.cmake 2023-11-24 19:58:57.217399495 +0100
@@ -45,7 +45,7 @@
# No hints in this case because the library versions semantically
# the module folder, and it's also capitalized, so let CMake handle it.
-find_package(OPENJPEG QUIET NO_MODULE NAMES OpenJPEG)
+#find_package(OPENJPEG QUIET NO_MODULE NAMES OpenJPEG)
mark_as_advanced(OPENJPEG_DIR)
if(OPENJPEG_FOUND)
+134
View File
@@ -0,0 +1,134 @@
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
ECM_TEST="forceoptional"
PYTHON_COMPAT=( python3_{10..12} )
KFMIN=5.82.0
QTMIN=5.15.5
VIRTUALX_REQUIRED="test"
inherit ecm kde.org python-single-r1
if [[ ${KDE_BUILD_TYPE} = release ]]; then
SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
KEYWORDS="~amd64"
fi
DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
HOMEPAGE="https://apps.kde.org/krita/ https://krita.org/en/"
LICENSE="GPL-3"
SLOT="5"
IUSE="color-management fftw gif +gsl heif jpeg2k jpegxl +mypaint-brush-engine openexr pdf media +raw +xsimd webp"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
# bug 630508
RESTRICT="test"
RDEPEND="${PYTHON_DEPS}
dev-libs/boost:=
dev-libs/quazip:0=[qt5(+)]
$(python_gen_cond_dep '
dev-python/PyQt5[declarative,gui,widgets,${PYTHON_USEDEP}]
dev-python/sip:=[${PYTHON_USEDEP}]
')
>=dev-qt/qtconcurrent-${QTMIN}:5
>=dev-qt/qtdbus-${QTMIN}:5
>=dev-qt/qtdeclarative-${QTMIN}:5
>=dev-qt/qtgui-${QTMIN}:5=[-gles2-only]
>=dev-qt/qtnetwork-${QTMIN}:5
>=dev-qt/qtprintsupport-${QTMIN}:5
>=dev-qt/qtsql-${QTMIN}:5
>=dev-qt/qtsvg-${QTMIN}:5
>=dev-qt/qtwidgets-${QTMIN}:5
>=dev-qt/qtx11extras-${QTMIN}:5
>=dev-qt/qtxml-${QTMIN}:5
>=kde-frameworks/kcompletion-${KFMIN}:5
>=kde-frameworks/kconfig-${KFMIN}:5
>=kde-frameworks/kcoreaddons-${KFMIN}:5
>=kde-frameworks/kcrash-${KFMIN}:5
>=kde-frameworks/kguiaddons-${KFMIN}:5
>=kde-frameworks/ki18n-${KFMIN}:5
>=kde-frameworks/kiconthemes-${KFMIN}:5
>=kde-frameworks/kitemmodels-${KFMIN}:5
>=kde-frameworks/kitemviews-${KFMIN}:5
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
>=kde-frameworks/kwindowsystem-${KFMIN}:5
>=kde-frameworks/kxmlgui-${KFMIN}:5
media-gfx/exiv2:=
media-libs/lcms
media-libs/libjpeg-turbo:=
media-libs/libpng:=
media-libs/tiff:=
sys-libs/zlib
virtual/opengl
x11-libs/libX11
x11-libs/libXi
color-management? ( >=media-libs/opencolorio-2.0.0 )
fftw? ( sci-libs/fftw:3.0= )
gif? ( media-libs/giflib )
gsl? ( sci-libs/gsl:= )
jpeg2k? ( media-libs/openjpeg:= )
jpegxl? ( >=media-libs/libjxl-0.7.0_pre20220825 )
heif? ( >=media-libs/libheif-1.11:=[x265] )
mypaint-brush-engine? ( media-libs/libmypaint:= )
openexr? ( media-libs/openexr:= )
pdf? ( app-text/poppler[qt5] )
media? ( media-libs/mlt:= )
raw? ( kde-apps/libkdcraw:= )
xsimd? ( dev-cpp/xsimd )
webp? ( >=media-libs/libwebp-1.2.0:= )
"
DEPEND="${RDEPEND}"
BDEPEND="
dev-cpp/eigen:3
dev-lang/perl
sys-devel/gettext
dev-libs/immer
dev-libs/lager
dev-libs/zug
dev-libs/libunibreak
"
PATCHES=(
"${FILESDIR}/${PN}-4.3.1-tests-optional.patch"
"${FILESDIR}/${PN}-5.1.5-sip-6.8.patch" # bug 919139
"${FILESDIR}/${PN}-5.1.5-libjxl-0.9.patch" # bug 922524
"${FILESDIR}/${PN}-5.2.2-fftw.patch"
"${FILESDIR}/${PN}-5.2.2-openjpeg.patch"
)
pkg_setup() {
python-single-r1_pkg_setup
ecm_pkg_setup
}
src_configure() {
# Prevent sandbox violation from FindPyQt5.py module
# See Gentoo-bug 655918
addpredict /dev/dri
local mycmakeargs=(
-DENABLE_UPDATERS=OFF
-DKRITA_ENABLE_PCH=OFF # big mess.
-DCMAKE_DISABLE_FIND_PACKAGE_KSeExpr=ON # not packaged
$(cmake_use_find_package color-management OpenColorIO)
$(cmake_use_find_package fftw FFTW3)
$(cmake_use_find_package gif GIF)
$(cmake_use_find_package gsl GSL)
$(cmake_use_find_package heif HEIF)
$(cmake_use_find_package jpeg2k OpenJPEG)
$(cmake_use_find_package jpegxl JPEGXL)
$(cmake_use_find_package mypaint-brush-engine LibMyPaint)
$(cmake_use_find_package openexr OpenEXR)
$(cmake_use_find_package pdf Poppler)
$(cmake_use_find_package media Mlt7)
$(cmake_use_find_package raw KF5KDcraw)
$(cmake_use_find_package xsimd xsimd)
$(cmake_use_find_package webp WebP)
)
ecm_src_configure
}
+2
View File
@@ -10,7 +10,9 @@
</upstream>
<use>
<flag name="color-management">Enable color management via <pkg>media-libs/opencolorio</pkg></flag>
<flag name="media">Enable sound support for animations via <pkg>media-libs/mlt</pkg></flag>
<flag name="mypaint-brush-engine">Enable MyPaint brush engine support <pkg>media-libs/libmypaint</pkg></flag>
<flag name="qtmedia">Enable sound support for animations via <pkg>dev-qt/qtmultimedia</pkg></flag>
<flag name="xsimd">Enable usage of SIMD instructions via <pkg>dev-cpp/xsimd</pkg></flag>
</use>
</pkgmetadata>