[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/files/

[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/files/

[Conrad Kostecki]

commit:     33af4c3909c6892809d97ad0a165e00a116717df
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sun Jan  8 15:16:12 2023 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Jan  8 22:09:32 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33af4c39

media-gfx/blender: remove unused patch

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/29018
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 .../files/blender-3.2.2-musl-glibc-prereq.patch    | 27 ----------------------
 1 file changed, 27 deletions(-)

diff --git a/media-gfx/blender/files/blender-3.2.2-musl-glibc-prereq.patch b/media-gfx/blender/files/blender-3.2.2-musl-glibc-prereq.patch
deleted file mode 100644
index a572f25788de..000000000000
--- a/media-gfx/blender/files/blender-3.2.2-musl-glibc-prereq.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Fix build error in libc_compat when using musl libc
-
-Checking for the existence of and using __GLIBC_PREREQ can't be done in the
-same conditional.
-
-Please refer: https://github.com/blender/blender/commit/7be7280c5710f7831789cdde140d010722be9068
---- a/intern/libc_compat/libc_compat.c
-+++ b/intern/libc_compat/libc_compat.c
-@@ -13,7 +13,8 @@
- #  include <features.h>
- #  include <math.h>
-
--#  if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 31)
-+#  if defined(__GLIBC_PREREQ)
-+#    if __GLIBC_PREREQ(2, 31)
-
- double __exp_finite(double x);
- double __exp2_finite(double x);
-@@ -112,5 +113,6 @@ float __powf_finite(float x, float y)
-   return powf(x, y);
- }
-
--#  endif /* __GLIBC_PREREQ */
--#endif   /* __linux__ */
-+#    endif /* __GLIBC_PREREQ(2, 31) */
-+#  endif   /* __GLIBC_PREREQ */
-+#endif     /* __linux__ */

[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/files/

[Joonas Niilola]

commit:     c012c40ba2a384244ad433e37babe4fed402ef0e
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sat Oct 28 08:52:50 2023 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Oct 28 09:18:14 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c012c40b

media-gfx/blender: remove unused patch

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/33556
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 .../blender/files/blender-4.0.0-ocio-2.3.0.patch   | 110 ---------------------
 1 file changed, 110 deletions(-)

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
-