gentoo auto-resync : 03:10:2023 - 23:49:49

9 files changed, 60 insertions, 5 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index d0c97ed4b3a4..6da517a1cc58 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index 9dee2e4dc894..50e2e0d0bcf6 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -2,14 +2,15 @@ AUX blender-3.2.2-Cycles-add-option-to-specify-OptiX-runtime-root-dire.patch 451
 AUX blender-3.2.2-Fix-T100845-wrong-Cycles-OptiX-runtime-compilation-i.patch 986 BLAKE2B 6055d38fded76be0c3f1f42f1e17e434ba69be90a0fb032856b1a339683a28c6786e945fc88d7b39006efc090e198586e5ebebb8fa542e93bcb07b9b91f6ce1f SHA512 8c5259d54e687ae03316fa69efcee02dbbf2a374de6fa9151484795af7d602c2d603900f1b38b7d4a09d8cb66e73666e500cb37004cbca5a13241d9cb5442ab0
 AUX blender-3.2.2-support-building-with-musl-libc.patch 5583 BLAKE2B 193548ea61608b6a355912cdd11eba60c58ac7975612890ff26b95b0d8974e3ed871e9e3d5437b7e36fc22b6a711e7af672b87a4e4f0b0765b95e4065dbcb934 SHA512 225065ac63344084918585272badfd58dc542e4b9370351fa4ff246fb8568d18027bd1d07fc139ac247236b75690578bb598731e00ea18767ed8e9d34d35b2fc
 AUX blender-3.3.0-fix-build-with-boost-1.81.patch 490 BLAKE2B ff9625bec6783a5a55d2d0a8b9afeae718e0c8d714aee42e89577158504b72f6cdc325a3aa4b21291319ed886f722d6216af8ba4680ff5cb046289c9f2dc9f61 SHA512 9a7bad9947c03e3265c07266fb901319665cb2869395c46e5a9a63953772a5af880b6f038e38a695bb9e0cbfaae1f1a08fa61b8a565d2081e6c8d9e6c7a80547
+AUX blender-3.3.6-cycles-gcc13.patch 299 BLAKE2B c20c113bf845cb55188cd53c4c3e52e2876430d5b708161afbfd6afd0a50fb7cc4cf099df2202fa8c149bb18dc82e9e880cd083f35b61faaff80852a39358e3f SHA512 8986fd86e1f060c7310e5ecbae8f968faae5257af92f248874d7bccade4b75890a51a97706be653a6441292f0a459aa88b9935f545733eb34ac3b324c0d3b2df
 DIST blender-3.3.6.tar.xz 41912972 BLAKE2B 94f9dd1a7993f399d612275ed3cfc1d482b0778d2d0b50ae40b73714b6afce93e036915a5b8ea415b6642b1e2d0a281db15ba8addd95c23771c381050722aac7 SHA512 db453b9c7c0ad508e04f603c970e111afb577f3dc0bd25f2ce47312e8560223dcf0307b0a306014dd79adda76de49b6d26e6e63400cade1430568332fe5b2d57
 DIST blender-3.3.8.tar.xz 41915180 BLAKE2B 7fb24afe2151bba53d8c25160bd697145aced74a8cd9a7ac92b2f66bc0ab59e995009f20f9e9bb622b05d614919137153805a2e233de5b0bb0a41a2ac3405a76 SHA512 63aef1e543a9c8bbc5f8838292ad2e8d0d9a8ee6fd2d71a419c1edc1a0ee1f59f7e9eab59bc20bf32ca56ba440bab1534c6c94c6ca2c5ab964e80bd452b7e519
 DIST blender-3.4.1.tar.xz 53666296 BLAKE2B ec5b2771c1b55ecdf3c2c86a413ae5599545800fc072eff45cf212b32c74af60fc3d650ad931fff221c1073adb2b447df3287a965f884a4760a5d972c9877aee SHA512 d6de3ec9cd1a1e4d4e4a838af0cfc113c91c3c1b66703027e0ed61bd818dafc4e4304fd041738ddea32fc76b1ad9b7737cbdcf74d56a0406a87c457375d907ab
 DIST blender-3.5.1.tar.xz 69780800 BLAKE2B 6961280b9d5fb606a35137ce355bf07b4dc16908d5d52cfd3a914907721da16108b8780b1894413a69ab69d455f5d1575697079a24c2bdcecb17174cf7a7c7c7 SHA512 7c9c03de8532884f8ab39fecf1450f8be4bc937a018bd14240ace81a89e422625aba9c4865f6efbb8371f5f01e930932fa5cf03c9d14d44c5312db33e3c56131
 DIST blender-3.6.0.tar.xz 70428872 BLAKE2B a43f2c0a2db6fa624b1bd96264462312d31f2e3983c463da9d17b0c793d0d344dfbbc13acfb8bab53cc37f5b5b3479d60b8046475aa6c977074ef35414640eaf SHA512 5fbb7a48d1f18e5cc6430bdefb4d7d9e8a52d387cf92a319c7fbc8836a3f5a6f90fab13f152be49c3558a8f70ed9f0d1f7aeddb264a938496a2f93254bb569cb
-EBUILD blender-3.3.6-r1.ebuild 13256 BLAKE2B 8e3567b93348f37b85d34d8ee590123499c7decd0e50c6a83c9b9af5e883b310315c46b083678030ac0758521e0a8f6d38e84b6a7e48f7c4eb7e93926c0a37cf SHA512 79731ee4d1e6180dea797c7160106fc0ae32b2fcdf6aea5b8b17692c399fd7fc08c5c7b9e32ef1a5c23ab556bcabbb9e4ef0fa7d717484ff909652e718687046
-EBUILD blender-3.3.8.ebuild 13409 BLAKE2B c8dd3349b7f92ceb9db19a9aee85a421009567acb92d4abcb84ce7ddb39202806e2cd3942e79b946f8947f867243c948d85472aa4c61e80ddf499a984c2ca1d2 SHA512 f3cd33710958dee43f11716e1790a68bd0b9eada9d01fbcd9ffded6cc224c63eba3c01495188a39c0507640a4d31d5ac10286c5ab8e9fe19cfc57bcd3b1d0da2
-EBUILD blender-3.4.1-r3.ebuild 13654 BLAKE2B 8d2c330dc32977b90415cba95198564f6bd4cab7a6c2dcb4202d70ba5166fddf3f056362adda309ea853c3f01c38a4ec8832c7aa4ad154b4da0fd237c1a3aaa4 SHA512 fa7800eca9d5d2ff611131ed8c49e964ffe1d05312b8f8704e7bc08168e25f93924032b5b5a32671ea21c2d26d04b026b33d8c3f2bd10e6b17a7557762967c56
+EBUILD blender-3.3.6-r1.ebuild 13302 BLAKE2B f1a2259f6b19519c4173098c410b150829d1dec4d87b627195c46e93564a25a48c1e51612555521d1d36c5edabfb6aba47f256bdc5a32b9a2acc3b06f5ea78ca SHA512 133cc929d7c45a5ad9dbf85b82941052b436d68cdd7a6d24ecf2022ad932d6f8915beb695c7894261335321fac12146ad2d2899ad6a5750cc0b0ed098a8f0298
+EBUILD blender-3.3.8.ebuild 13454 BLAKE2B 2573244f4b9630fc18539e0ce92fe6275e885cf15ef58184d5158e2a22c84ec049c618eb0967c0041af6785c629fe0988f1a0dde8e129d0ce97db6c77e1ee739 SHA512 664e3abe29c62634d58484fd9282599556466407d633e7950a33d4ae4bfae0f44a7ff96a8b58afc215bbb2e405412aa1c483059b727add64e68a13ab866a60ca
+EBUILD blender-3.4.1-r3.ebuild 13700 BLAKE2B 396b6a3a873898bed55afbcf302e795e7e3d04f756ed088ab1a0a4535deefe0eca28470a8dbccdf517a5f6a52cfbd71f63a077361f424ca40b6df8c16c150442 SHA512 a1084dd472a4e8fd20b78c895d74c4653ed0fa89dad07706b578dc4e89768b37526a32e6c11a9f8b82d56fc3b8cbf09a8e428cd6ad98df2ef02f3e42550887a2
 EBUILD blender-3.5.1-r1.ebuild 13940 BLAKE2B b466b2c3c1b907872d85e560eb45f2f743432873bf80f2ea96510640944d8792416c843ea20d3c520cf53d7306aa264b883a1308e1285b1869bd5b6862ef39a9 SHA512 61ed94ad6ce5bbf61829351d01d717541863b83e8f92f198336480083b903cbe45ee2f509186a758c4cc0b50b73726fd8bd4a1f3c82b7f77295599506fce5b2c
 EBUILD blender-3.6.0.ebuild 13940 BLAKE2B b466b2c3c1b907872d85e560eb45f2f743432873bf80f2ea96510640944d8792416c843ea20d3c520cf53d7306aa264b883a1308e1285b1869bd5b6862ef39a9 SHA512 61ed94ad6ce5bbf61829351d01d717541863b83e8f92f198336480083b903cbe45ee2f509186a758c4cc0b50b73726fd8bd4a1f3c82b7f77295599506fce5b2c
 EBUILD blender-9999.ebuild 13938 BLAKE2B fc0a67ef6a31852b6f1144cf2d02537242b039c4e617753ad9a2315e20ad8f9429f899ba3c6a982048fcb5d51b912497ab7a5a0b00fbad7479f9f3fb5220995e SHA512 4b09d3499ce22fc9a5ab19ac17a904173b7ef009411ee12f9f2f77c3bc6f75a7a08694d671e98e5a488a3f7b843e574623357f635de49946d2e4037a750f40a7
diff --git a/media-gfx/blender/blender-3.3.6-r1.ebuild b/media-gfx/blender/blender-3.3.6-r1.ebuild
index 5680b3b6a336..8452075832d4 100644
--- a/media-gfx/blender/blender-3.3.6-r1.ebuild
+++ b/media-gfx/blender/blender-3.3.6-r1.ebuild
@@ -133,6 +133,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-3.2.2-Cycles-add-option-to-specify-OptiX-runtime-root-dire.patch
 	"${FILESDIR}"/${PN}-3.2.2-Fix-T100845-wrong-Cycles-OptiX-runtime-compilation-i.patch
 	"${FILESDIR}"/${PN}-3.3.0-fix-build-with-boost-1.81.patch
+	"${FILESDIR}"/${PN}-3.3.6-cycles-gcc13.patch
 )
 
 blender_check_requirements() {
diff --git a/media-gfx/blender/blender-3.3.8.ebuild b/media-gfx/blender/blender-3.3.8.ebuild
index fac6a83ed7f7..12beb87e5c35 100644
--- a/media-gfx/blender/blender-3.3.8.ebuild
+++ b/media-gfx/blender/blender-3.3.8.ebuild
@@ -19,7 +19,7 @@ else
 	# Update these between major releases.
 	TEST_TARBALL_VERSION="$(ver_cut 1-2).0"
 	#SRC_URI+=" test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.xz )"
-	KEYWORDS="~amd64 ~arm ~arm64"
+	KEYWORDS="amd64 ~arm ~arm64"
 fi
 
 SLOT="${PV%.*}"
@@ -133,6 +133,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-3.2.2-Cycles-add-option-to-specify-OptiX-runtime-root-dire.patch
 	"${FILESDIR}"/${PN}-3.2.2-Fix-T100845-wrong-Cycles-OptiX-runtime-compilation-i.patch
 	"${FILESDIR}"/${PN}-3.3.0-fix-build-with-boost-1.81.patch
+	"${FILESDIR}"/${PN}-3.3.6-cycles-gcc13.patch
 )
 
 blender_check_requirements() {
diff --git a/media-gfx/blender/blender-3.4.1-r3.ebuild b/media-gfx/blender/blender-3.4.1-r3.ebuild
index 7a0b020b28fc..801a0d0bf0db 100644
--- a/media-gfx/blender/blender-3.4.1-r3.ebuild
+++ b/media-gfx/blender/blender-3.4.1-r3.ebuild
@@ -140,6 +140,7 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.3.0-fix-build-with-boost-1.81.patch
+	"${FILESDIR}"/${PN}-3.3.6-cycles-gcc13.patch
 )
 
 blender_check_requirements() {
diff --git a/media-gfx/blender/files/blender-3.3.6-cycles-gcc13.patch b/media-gfx/blender/files/blender-3.3.6-cycles-gcc13.patch
new file mode 100644
index 000000000000..955be2424e19
--- /dev/null
+++ b/media-gfx/blender/files/blender-3.3.6-cycles-gcc13.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/914740
+--- a/intern/cycles/util/thread.cpp
++++ b/intern/cycles/util/thread.cpp
+@@ -6,6 +6,8 @@
+ #include "util/system.h"
+ #include "util/windows.h"
+ 
++#include <system_error>
++
+ CCL_NAMESPACE_BEGIN
+ 
+ thread::thread(function<void()> run_cb) : run_cb_(run_cb), joined_(false)
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() {