diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2023-10-03 23:49:50 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2023-10-03 23:49:50 +0100 |
| commit | c410d7a91a496a4fbbca686c80f7446305222d55 (patch) | |
| tree | 8ba974498cd1061dd4e883a34bd5e9be93a95214 /media-gfx/krita | |
| parent | c99c2410831577bef101e22948e954f85f56cba1 (diff) | |
gentoo auto-resync : 03:10:2023 - 23:49:49
Diffstat (limited to 'media-gfx/krita')
| -rw-r--r-- | media-gfx/krita/Manifest | 3 | ||||
| -rw-r--r-- | media-gfx/krita/files/krita-5.1.5-ocio-2.3.0.patch | 37 | ||||
| -rw-r--r-- | media-gfx/krita/krita-5.1.5.ebuild | 1 |
3 files changed, 40 insertions, 1 deletions
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest index 7f32eeedff39..57ff18d358d9 100644 --- a/media-gfx/krita/Manifest +++ b/media-gfx/krita/Manifest @@ -1,5 +1,6 @@ AUX krita-4.3.1-tests-optional.patch 2583 BLAKE2B 0b5e577bc17ef6b6487ce82ff4b4bc34064c659a3cf48d12a539c3029dd70f17b0b48a7398b68de6a937adff3af0c2d4a47d0f84fdc7746ec612fb05272d963f SHA512 f16885a72cd5f8f250b03903062c70190367ed409c2582d579bfb1e6ab09514df7f96214ce236e33bb8eec2f3872d887f9c3152f4e524b1719250a9064bf719c +AUX krita-5.1.5-ocio-2.3.0.patch 1669 BLAKE2B 17ee793479946ca07788afb109ca338c3cd9ace486b2c7443ce850cc229766eb09d7b6608337c4d8ae7a7e24d633e233d36551253c3012042062a9d5c3b0fe4f SHA512 dc88f9e1b9836d8c8bc08731ac1878c3a35d4ebbd4cc361a1a4e7b59c5217709b4e207001b18a617ef4f8881a2608b548e14d383aa9db798f13acd2be02df925 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 -EBUILD krita-5.1.5.ebuild 3589 BLAKE2B f4c32b1e21349e1689663a5242226ba449f1134ec68acbbad8c71861c11cd0d7cafca3f6cb9f427fa2555a7814334367e6615727e1268f5f2a3f85aeaba3c36e SHA512 dc598d981e58fb3f558db751fd15d93e0879713cb3d18514abbbd35af30fe8f21d3bc8cbcb90455969de2fa653720552b7e5b2f7a7ed322db1f6a41b73fc4e6c +EBUILD krita-5.1.5.ebuild 3639 BLAKE2B 24bb35951601738f6823ef9bda06d55a39188e5cc624f3d39ad2a8d89468ce53727185a8a8ce567282bb9e486769ae2f8cca90119c82dfcf6ebe34bcd1127208 SHA512 27ed807f8bcc33c26d4ab49b7ceb5c4d1e6250ca576a7813efb887d96d1e58870bbe68dda272678788dfe988fa8116957ca71bd39122f8e566c29fc3076fc76c MISC metadata.xml 709 BLAKE2B 1cca3b6d608cbdf758eec1d19d586fe2ff44275247f450d1ca43ce83478d2cf4fd248c8a034b93b2dc5be466eca14eb54c9204c7a4ef4b6394fffebc5368ffb2 SHA512 53a4a7efb077d5a6dc1885ee6487484f5882f0fcc5333289c8abbd6ab2daa2fa991a466fbd3d75177a6437e83b25c86a35519dbc956794c62df185ca7412ceb9 diff --git a/media-gfx/krita/files/krita-5.1.5-ocio-2.3.0.patch b/media-gfx/krita/files/krita-5.1.5-ocio-2.3.0.patch new file mode 100644 index 000000000000..534e24469e8a --- /dev/null +++ b/media-gfx/krita/files/krita-5.1.5-ocio-2.3.0.patch @@ -0,0 +1,37 @@ +From 48edd05f32241c537cedf2831efc5eb91a112291 Mon Sep 17 00:00:00 2001 +From: killy |0veufOrever <80536642@qq.com> +Date: Tue, 19 Sep 2023 02:18:54 +0000 +Subject: [PATCH] Update OCIO to version 2.3.0 + +--- + 3rdparty/ext_ocio/CMakeLists.txt | 4 ++-- + plugins/dockers/lut/ocio_display_filter_vfx2021.cpp | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) + +From 21d384fe9fafde2f45f7339a2234f4022c53152f Mon Sep 17 00:00:00 2001 +From: killy |0veufOrever <80536642@qq.com> +Date: Tue, 19 Sep 2023 03:17:17 +0000 +Subject: [PATCH] Dimensions are not required when the OCIO version is less + than 2.3.0 + +--- + plugins/dockers/lut/ocio_display_filter_vfx2021.cpp | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/plugins/dockers/lut/ocio_display_filter_vfx2021.cpp b/plugins/dockers/lut/ocio_display_filter_vfx2021.cpp +--- a/plugins/dockers/lut/ocio_display_filter_vfx2021.cpp ++++ b/plugins/dockers/lut/ocio_display_filter_vfx2021.cpp +@@ -507,7 +507,13 @@ + unsigned height = 0; + OCIO::GpuShaderDesc::TextureType channel = OCIO::GpuShaderDesc::TEXTURE_RGB_CHANNEL; + OCIO::Interpolation interpolation = OCIO::INTERP_LINEAR; ++ ++#if OCIO_VERSION_HEX >= 0x2030000 ++ OCIO::GpuShaderCreator::TextureDimensions dimensions; ++ shaderDesc->getTexture(idx, textureName, samplerName, width, height, channel, dimensions, interpolation); ++#else + shaderDesc->getTexture(idx, textureName, samplerName, width, height, channel, interpolation); ++#endif + + if (!textureName || !*textureName || !samplerName || !*samplerName || width == 0) { + errOpenGL << "The texture data is corrupted"; diff --git a/media-gfx/krita/krita-5.1.5.ebuild b/media-gfx/krita/krita-5.1.5.ebuild index c8945c944730..f313dc477e04 100644 --- a/media-gfx/krita/krita-5.1.5.ebuild +++ b/media-gfx/krita/krita-5.1.5.ebuild @@ -89,6 +89,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}/${PN}-4.3.1-tests-optional.patch" "${WORKDIR}/${P}-exiv2-0.28.patch" # bug 906472 + "${FILESDIR}/${P}-ocio-2.3.0.patch" # bug 915107 ) pkg_setup() { |