gentoo auto-resync : 28:10:2023 - 16:35:15

2 files changed, 0 insertions, 111 deletions

diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index 52820865f3d2..e5562516c94c 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -3,7 +3,6 @@ AUX blender-3.2.2-Fix-T100845-wrong-Cycles-OptiX-runtime-compilation-i.patch 986
 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
-AUX blender-4.0.0-ocio-2.3.0.patch 4793 BLAKE2B 0ca4ecbd97b896f2be9e13f925fc01ec8e52f6ebae000cebc0fd61365d3d2aaa3e5352a8e08b5fd78b1306d15a63b223b3b7b636b341ce02e6dcb923e83b29fc SHA512 cce90221e16ad5d25744e3882ffe8874130560ecc007c6eb03f37c40ecfd90e2809ac6703bdbcde293e3dabe9d7c27d9fab7ba4bf4906466293f236c70e32c7a
 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
diff --git a/media-gfx/blender/files/blender-4.0.0-ocio-2.3.0.patch b/media-gfx/blender/files/blender-4.0.0-ocio-2.3.0.patch
deleted file mode 100644
index e6cc4a6fa026..000000000000
--- a/media-gfx/blender/files/blender-4.0.0-ocio-2.3.0.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-From 458917773afb4cdf8e1189c0bf5aff7feda6a664 Mon Sep 17 00:00:00 2001
-From: Brecht Van Lommel <brecht@blender.org>
-Date: Mon, 2 Oct 2023 17:31:08 +0200
-Subject: [PATCH] Build: changes to build with OpenColorIO 2.3
-
-Ref #113157
----
- intern/opencolorio/ocio_impl_glsl.cc          | 12 +++++++++-
- .../ocio_color_space_conversion_shader.cc     | 24 +++++++++++++++++++
- 2 files changed, 35 insertions(+), 1 deletion(-)
-
-diff --git a/intern/opencolorio/ocio_impl_glsl.cc b/intern/opencolorio/ocio_impl_glsl.cc
-index 8d46a2f0773..35e4d0b7a90 100644
---- a/intern/opencolorio/ocio_impl_glsl.cc
-+++ b/intern/opencolorio/ocio_impl_glsl.cc
-@@ -343,8 +343,15 @@ static bool addGPULut1D2D(OCIO_GPUTextures &textures,
-   unsigned int height = 0;
-   GpuShaderCreator::TextureType channel = GpuShaderCreator::TEXTURE_RGB_CHANNEL;
-   Interpolation interpolation = INTERP_LINEAR;
-+#if OCIO_VERSION_HEX >= 0x02030000
-+  /* Always use 2D textures in OpenColorIO 2.3, simpler and same performance. */
-+  GpuShaderDesc::TextureDimensions dimensions = GpuShaderDesc::TEXTURE_2D;
-+  shader_desc->getTexture(
-+      index, texture_name, sampler_name, width, height, channel, dimensions, interpolation);
-+#else
-   shader_desc->getTexture(
-       index, texture_name, sampler_name, width, height, channel, interpolation);
-+#endif
- 
-   const float *values;
-   shader_desc->getTextureValues(index, values);
-@@ -358,6 +365,7 @@ static bool addGPULut1D2D(OCIO_GPUTextures &textures,
-                                                                                   GPU_R16F;
- 
-   OCIO_GPULutTexture lut;
-+#if OCIO_VERSION_HEX < 0x02030000
-   /* There does not appear to be an explicit way to check if a texture is 1D or 2D.
-    * It depends on more than height. So check instead by looking at the source. */
-   std::string sampler1D_name = std::string("sampler1D ") + sampler_name;
-@@ -365,7 +373,9 @@ static bool addGPULut1D2D(OCIO_GPUTextures &textures,
-     lut.texture = GPU_texture_create_1d(
-         texture_name, width, 1, format, GPU_TEXTURE_USAGE_SHADER_READ, values);
-   }
--  else {
-+  else
-+#endif
-+  {
-     lut.texture = GPU_texture_create_2d(
-         texture_name, width, height, 1, format, GPU_TEXTURE_USAGE_SHADER_READ, values);
-   }
-diff --git a/source/blender/compositor/realtime_compositor/cached_resources/intern/ocio_color_space_conversion_shader.cc b/source/blender/compositor/realtime_compositor/cached_resources/intern/ocio_color_space_conversion_shader.cc
-index 4cdbb52a6ba..52492754c0f 100644
---- a/source/blender/compositor/realtime_compositor/cached_resources/intern/ocio_color_space_conversion_shader.cc
-+++ b/source/blender/compositor/realtime_compositor/cached_resources/intern/ocio_color_space_conversion_shader.cc
-@@ -95,6 +95,18 @@ class GPUShaderCreator : public OCIO::GpuShaderCreator {
-     return GPU_max_texture_size();
-   }
- 
-+#  if OCIO_VERSION_HEX >= 0x02030000
-+  void setAllowTexture1D(bool allowed) override
-+  {
-+    allow_texture_1D_ = allowed;
-+  }
-+
-+  bool getAllowTexture1D() const override
-+  {
-+    return allow_texture_1D_;
-+  }
-+#  endif
-+
-   bool addUniform(const char *name, const DoubleGetter &get_double) override
-   {
-     /* Check if a resource exists with the same name and assert if it is the case, returning false
-@@ -201,6 +213,9 @@ class GPUShaderCreator : public OCIO::GpuShaderCreator {
-                   uint width,
-                   uint height,
-                   TextureType channel,
-+#  if OCIO_VERSION_HEX >= 0x02030000
-+                  OCIO::GpuShaderDesc::TextureDimensions dimensions,
-+#  endif
-                   OCIO::Interpolation interpolation,
-                   const float *values) override
-   {
-@@ -216,7 +231,11 @@ class GPUShaderCreator : public OCIO::GpuShaderCreator {
-     GPUTexture *texture;
-     eGPUTextureFormat texture_format = (channel == TEXTURE_RGB_CHANNEL) ? GPU_RGB16F : GPU_R16F;
-     /* A height of 1 indicates a 1D texture according to the OCIO API. */
-+#  if OCIO_VERSION_HEX >= 0x02030000
-+    if (dimensions == OCIO::GpuShaderDesc::TEXTURE_1D) {
-+#  else
-     if (height == 1) {
-+#  endif
-       texture = GPU_texture_create_1d(
-           texture_name, width, 1, texture_format, GPU_TEXTURE_USAGE_SHADER_READ, values);
-       shader_create_info_.sampler(textures_.size() + 1, ImageType::FLOAT_1D, resource_name);
-@@ -398,6 +417,11 @@ class GPUShaderCreator : public OCIO::GpuShaderCreator {
-   /* A vectors that stores the created uniform buffers when bind_shader_and_resources() is called,
-    * so that they can be properly unbound and freed in the unbind_shader_and_resources() method. */
-   Vector<GPUUniformBuf *> uniform_buffers_;
-+
-+#  if OCIO_VERSION_HEX >= 0x02030000
-+  /* Allow creating 1D textures, or only use 2D textures. */
-+  bool allow_texture_1D_ = true;
-+#  endif
- };
- 
- #else
--- 
-2.30.2
-