gentoo auto-resync : 01:05:2023 - 17:20:35

4 files changed, 0 insertions, 357 deletions

diff --git a/media-gfx/blender/files/blender-2.93.13-openvdb-10.patch b/media-gfx/blender/files/blender-2.93.13-openvdb-10.patch
deleted file mode 100644
index 42db25179cdc..000000000000
--- a/media-gfx/blender/files/blender-2.93.13-openvdb-10.patch
+++ /dev/null
@@ -1,107 +0,0 @@
---- a/intern/cycles/render/volume.cpp
-+++ b/intern/cycles/render/volume.cpp
-@@ -259,7 +259,8 @@ void VolumeMeshBuilder::add_grid(openvdb::GridBase::ConstPtr grid,
- void VolumeMeshBuilder::add_padding(int pad_size)
- {
- #ifdef WITH_OPENVDB
--  openvdb::tools::dilateVoxels(topology_grid->tree(), pad_size);
-+  openvdb::tools::dilateActiveValues(
-+      topology_grid->tree(), pad_size, openvdb::tools::NN_FACE, openvdb::tools::IGNORE_TILES);
- #else
-   (void)pad_size;
- #endif
-diff --git a/source/blender/blenkernel/BKE_volume.h b/source/blender/blenkernel/BKE_volume.h
-index 8b42de7303d..068cdf87d16 100644
---- a/source/blender/blenkernel/BKE_volume.h
-+++ b/source/blender/blenkernel/BKE_volume.h
-@@ -104,7 +104,6 @@ typedef enum VolumeGridType {
-   VOLUME_GRID_INT,
-   VOLUME_GRID_INT64,
-   VOLUME_GRID_MASK,
--  VOLUME_GRID_STRING,
-   VOLUME_GRID_VECTOR_FLOAT,
-   VOLUME_GRID_VECTOR_DOUBLE,
-   VOLUME_GRID_VECTOR_INT,
-@@ -218,8 +217,6 @@ auto BKE_volume_grid_type_operation(const VolumeGridType grid_type, OpType &&op)
-       return op.template operator()<openvdb::Vec3IGrid>();
-     case VOLUME_GRID_VECTOR_DOUBLE:
-       return op.template operator()<openvdb::Vec3dGrid>();
--    case VOLUME_GRID_STRING:
--      return op.template operator()<openvdb::StringGrid>();
-     case VOLUME_GRID_MASK:
-       return op.template operator()<openvdb::MaskGrid>();
-     case VOLUME_GRID_POINTS:
-diff --git a/source/blender/blenkernel/intern/volume.cc b/source/blender/blenkernel/intern/volume.cc
-index 39a7725bfa3..a0e2d1a83cd 100644
---- a/source/blender/blenkernel/intern/volume.cc
-+++ b/source/blender/blenkernel/intern/volume.cc
-@@ -1345,9 +1345,6 @@ VolumeGridType BKE_volume_grid_type_openvdb(const openvdb::GridBase &grid)
-   if (grid.isType<openvdb::Vec3dGrid>()) {
-     return VOLUME_GRID_VECTOR_DOUBLE;
-   }
--  if (grid.isType<openvdb::StringGrid>()) {
--    return VOLUME_GRID_STRING;
--  }
-   if (grid.isType<openvdb::MaskGrid>()) {
-     return VOLUME_GRID_MASK;
-   }
-@@ -1383,7 +1380,6 @@ int BKE_volume_grid_channels(const VolumeGrid *grid)
-     case VOLUME_GRID_VECTOR_DOUBLE:
-     case VOLUME_GRID_VECTOR_INT:
-       return 3;
--    case VOLUME_GRID_STRING:
-     case VOLUME_GRID_POINTS:
-     case VOLUME_GRID_UNKNOWN:
-       return 0;
-@@ -1624,13 +1620,8 @@ struct CreateGridWithChangedResolutionOp {
- 
-   template<typename GridType> typename openvdb::GridBase::Ptr operator()()
-   {
--    if constexpr (std::is_same_v<GridType, openvdb::StringGrid>) {
--      return {};
--    }
--    else {
--      return create_grid_with_changed_resolution(static_cast<const GridType &>(grid),
--                                                 resolution_factor);
--    }
-+    return create_grid_with_changed_resolution(static_cast<const GridType &>(grid),
-+                                               resolution_factor);
-   }
- };
- 
-diff --git a/source/blender/blenkernel/intern/volume_render.cc b/source/blender/blenkernel/intern/volume_render.cc
-index c0a205b5673..7ccf04df941 100644
---- a/source/blender/blenkernel/intern/volume_render.cc
-+++ b/source/blender/blenkernel/intern/volume_render.cc
-@@ -77,7 +77,6 @@ static void extract_dense_float_voxels(const VolumeGridType grid_type,
-     case VOLUME_GRID_VECTOR_INT:
-       return extract_dense_voxels<openvdb::Vec3IGrid, openvdb::Vec3f>(
-           grid, bbox, reinterpret_cast<openvdb::Vec3f *>(r_voxels));
--    case VOLUME_GRID_STRING:
-     case VOLUME_GRID_POINTS:
-     case VOLUME_GRID_UNKNOWN:
-       /* Zero channels to copy. */
-diff --git a/source/blender/makesrna/intern/rna_volume.c b/source/blender/makesrna/intern/rna_volume.c
-index 3100c1195f4..2854f02a4d4 100644
---- a/source/blender/makesrna/intern/rna_volume.c
-+++ b/source/blender/makesrna/intern/rna_volume.c
-@@ -241,7 +241,6 @@
-       {VOLUME_GRID_INT, "INT", 0, "Integer", "32-bit integer"},
-       {VOLUME_GRID_INT64, "INT64", 0, "Integer 64-bit", "64-bit integer"},
-       {VOLUME_GRID_MASK, "MASK", 0, "Mask", "No data, boolean mask of active voxels"},
--      {VOLUME_GRID_STRING, "STRING", 0, "String", "Text string"},
-       {VOLUME_GRID_VECTOR_FLOAT, "VECTOR_FLOAT", 0, "Float Vector", "3D float vector"},
-       {VOLUME_GRID_VECTOR_DOUBLE, "VECTOR_DOUBLE", 0, "Double Vector", "3D double vector"},
-       {VOLUME_GRID_VECTOR_INT, "VECTOR_INT", 0, "Integer Vector", "3D integer vector"},
-diff --git a/source/blender/modifiers/intern/MOD_volume_displace.cc b/source/blender/modifiers/intern/MOD_volume_displace.cc
-index af3a502162d..e2d7f445731 100644
---- a/source/blender/modifiers/intern/MOD_volume_displace.cc
-+++ b/source/blender/modifiers/intern/MOD_volume_displace.cc
-@@ -201,7 +201,6 @@
-   template<typename GridType> void operator()()
-   {
-     if constexpr (std::is_same_v<GridType, openvdb::points::PointDataGrid> ||
--                  std::is_same_v<GridType, openvdb::StringGrid> ||
-                   std::is_same_v<GridType, openvdb::MaskGrid>) {
-       /* We don't support displacing these grid types yet. */
-       return;
diff --git a/media-gfx/blender/files/blender-3.0.0-intern-ghost-fix-typo-in-finding-XF86VMODE.patch b/media-gfx/blender/files/blender-3.0.0-intern-ghost-fix-typo-in-finding-XF86VMODE.patch
deleted file mode 100644
index 51d8ded23366..000000000000
--- a/media-gfx/blender/files/blender-3.0.0-intern-ghost-fix-typo-in-finding-XF86VMODE.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-https://developer.blender.org/D13464
-
-From 781c56f054b4c7717739752336427a811f7633eb Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Sat, 4 Dec 2021 00:38:59 +0000
-Subject: [PATCH] intern/ghost: fix typo in finding XF86VMODE
-
----
- intern/ghost/CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/intern/ghost/CMakeLists.txt b/intern/ghost/CMakeLists.txt
-index 4164231..663598e 100644
---- a/intern/ghost/CMakeLists.txt
-+++ b/intern/ghost/CMakeLists.txt
-@@ -245,10 +245,10 @@ elseif(WITH_GHOST_X11 OR WITH_GHOST_WAYLAND)
-     if(WITH_X11_XF86VMODE)
-       add_definitions(-DWITH_X11_XF86VMODE)
-       list(APPEND INC_SYS
--        ${X11_xf86vmode_INCLUDE_PATH}
-+        ${X11_Xxf86vmode_INCLUDE_PATH}
-       )
-       list(APPEND LIB
--        ${X11_Xf86vmode_LIB}
-+        ${X11_Xxf86vmode_LIB}
-       )
-     endif()
- 
--- 
-2.34.1
-
diff --git a/media-gfx/blender/files/blender-3.0.1-openexr.patch b/media-gfx/blender/files/blender-3.0.1-openexr.patch
deleted file mode 100644
index 435498cd8a3d..000000000000
--- a/media-gfx/blender/files/blender-3.0.1-openexr.patch
+++ /dev/null
@@ -1,190 +0,0 @@
-https://src.fedoraproject.org/rpms/blender/blob/rawhide/f/blender-openexr.patch
-
---- a/source/blender/imbuf/intern/openexr/openexr_api.cpp
-+++ b/source/blender/imbuf/intern/openexr/openexr_api.cpp
-@@ -32,30 +32,31 @@
- #include <stdexcept>
- #include <string>
- 
--#include <Iex.h>
-+#include <OpenEXR/Iex.h>
- #include <ImathBox.h>
--#include <ImfArray.h>
--#include <ImfChannelList.h>
--#include <ImfCompression.h>
--#include <ImfCompressionAttribute.h>
--#include <ImfIO.h>
--#include <ImfInputFile.h>
--#include <ImfOutputFile.h>
--#include <ImfPixelType.h>
--#include <ImfStandardAttributes.h>
--#include <ImfStringAttribute.h>
--#include <ImfVersion.h>
--#include <half.h>
-+#include <OpenEXR/ImfArray.h>
-+#include <OpenEXR/ImfFrameBuffer.h>
-+#include <OpenEXR/ImfChannelList.h>
-+#include <OpenEXR/ImfCompression.h>
-+#include <OpenEXR/ImfCompressionAttribute.h>
-+#include <OpenEXR/ImfIO.h>
-+#include <OpenEXR/ImfInputFile.h>
-+#include <OpenEXR/ImfOutputFile.h>
-+#include <OpenEXR/ImfPixelType.h>
-+#include <OpenEXR/ImfStandardAttributes.h>
-+#include <OpenEXR/ImfStringAttribute.h>
-+#include <OpenEXR/ImfVersion.h>
-+#include <Imath/half.h>
- 
- /* multiview/multipart */
--#include <ImfInputPart.h>
--#include <ImfMultiPartInputFile.h>
--#include <ImfMultiPartOutputFile.h>
--#include <ImfMultiView.h>
--#include <ImfOutputPart.h>
--#include <ImfPartHelper.h>
--#include <ImfPartType.h>
--#include <ImfTiledOutputPart.h>
-+#include <OpenEXR/ImfInputPart.h>
-+#include <OpenEXR/ImfMultiPartInputFile.h>
-+#include <OpenEXR/ImfMultiPartOutputFile.h>
-+#include <OpenEXR/ImfMultiView.h>
-+#include <OpenEXR/ImfOutputPart.h>
-+#include <OpenEXR/ImfPartHelper.h>
-+#include <OpenEXR/ImfPartType.h>
-+#include <OpenEXR/ImfTiledOutputPart.h>
- 
- #include "DNA_scene_types.h" /* For OpenEXR compression constants */
- 
-@@ -131,12 +132,12 @@ class IMemStream : public Imf::IStream {
-     return false;
-   }
- 
--  Int64 tellg() override
-+  uint64_t tellg() override
-   {
-     return _exrpos;
-   }
- 
--  void seekg(Int64 pos) override
-+  void seekg(uint64_t pos) override
-   {
-     _exrpos = pos;
-   }
-@@ -146,8 +147,8 @@ class IMemStream : public Imf::IStream {
-   }
- 
-  private:
--  Int64 _exrpos;
--  Int64 _exrsize;
-+  uint64_t _exrpos;
-+  uint64_t _exrsize;
-   unsigned char *_exrbuf;
- };
- 
-@@ -182,12 +183,12 @@ class IFileStream : public Imf::IStream
-     return check_error();
-   }
- 
--  Int64 tellg() override
-+  uint64_t tellg() override
-   {
-     return std::streamoff(ifs.tellg());
-   }
- 
--  void seekg(Int64 pos) override
-+  void seekg(uint64_t pos) override
-   {
-     ifs.seekg(pos);
-     check_error();
-@@ -231,19 +232,19 @@ class OMemStream : public OStream {
-     ibuf->encodedsize += n;
-   }
- 
--  Int64 tellp() override
-+  uint64_t tellp() override
-   {
-     return offset;
-   }
- 
--  void seekp(Int64 pos) override
-+  void seekp(uint64_t pos) override
-   {
-     offset = pos;
-     ensure_size(offset);
-   }
- 
-  private:
--  void ensure_size(Int64 size)
-+  void ensure_size(uint64_t size)
-   {
-     /* if buffer is too small increase it. */
-     while (size > ibuf->encodedbuffersize) {
-@@ -254,7 +255,7 @@ class OMemStream : public OStream {
-   }
- 
-   ImBuf *ibuf;
--  Int64 offset;
-+  uint64_t offset;
- };
- 
- /* File Output Stream */
-@@ -284,12 +285,12 @@ class OFileStream : public OStream {
-     check_error();
-   }
- 
--  Int64 tellp() override
-+  uint64_t tellp() override
-   {
-     return std::streamoff(ofs.tellp());
-   }
- 
--  void seekp(Int64 pos) override
-+  void seekp(uint64_t pos) override
-   {
-     ofs.seekp(pos);
-     check_error();
---- a/build_files/cmake/Modules/FindOpenEXR.cmake
-+++ b/build_files/cmake/Modules/FindOpenEXR.cmake
-@@ -25,6 +25,7 @@
- # see accompanying file BSD-3-Clause-license.txt for details.
- #=============================================================================
- 
-+
- # If OPENEXR_ROOT_DIR was defined in the environment, use it.
- IF(NOT OPENEXR_ROOT_DIR AND NOT $ENV{OPENEXR_ROOT_DIR} STREQUAL "")
-   SET(OPENEXR_ROOT_DIR $ENV{OPENEXR_ROOT_DIR})
-@@ -33,6 +34,16 @@ ENDIF()
- # Old versions (before 2.0?) do not have any version string, just assuming this should be fine though.
- SET(_openexr_libs_ver_init "2.0")
- 
-+find_package(Imath CONFIG QUIET)
-+if(TARGET Imath::Imath)
-+SET(_openexr_FIND_COMPONENTS
-+  Imath
-+  Iex
-+  OpenEXR
-+  IlmThread
-+)
-+
-+else()
- SET(_openexr_FIND_COMPONENTS
-   Half
-   Iex
-@@ -40,6 +51,7 @@ SET(_openexr_FIND_COMPONENTS
-   IlmThread
-   Imath
- )
-+endif()
- 
- SET(_openexr_SEARCH_DIRS
-   ${OPENEXR_ROOT_DIR}
-@@ -121,6 +133,9 @@ IF(OPENEXR_FOUND)
-   SET(OPENEXR_LIBRARIES ${_openexr_LIBRARIES})
-   # Both include paths are needed because of dummy OSL headers mixing #include <OpenEXR/foo.h> and #include <foo.h> :(
-   SET(OPENEXR_INCLUDE_DIRS ${OPENEXR_INCLUDE_DIR} ${OPENEXR_INCLUDE_DIR}/OpenEXR)
-+  if(TARGET Imath::Imath)
-+	  list(APPEND OPENEXR_INCLUDE_DIRS ${OPENEXR_INCLUDE_DIR}/Imath)
-+  endif()
- ENDIF()
- 
- MARK_AS_ADVANCED(
diff --git a/media-gfx/blender/files/blender-3.0.1-openimageio-2.3.patch b/media-gfx/blender/files/blender-3.0.1-openimageio-2.3.patch
deleted file mode 100644
index 3ba3000037d0..000000000000
--- a/media-gfx/blender/files/blender-3.0.1-openimageio-2.3.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-https://src.fedoraproject.org/rpms/blender/raw/rawhide/f/blender-oiio-2.3.patch
-https://bugs.gentoo.org/831357
---- a/build_files/cmake/Modules/FindOpenImageIO.cmake
-+++ b/build_files/cmake/Modules/FindOpenImageIO.cmake
-@@ -48,6 +48,15 @@ FIND_LIBRARY(OPENIMAGEIO_LIBRARY
-     lib64 lib
-   )
- 
-+FIND_LIBRARY(OPENIMAGEIO_UTIL_LIBRARY
-+  NAMES
-+    OpenImageIO_Util
-+  HINTS
-+    ${_openimageio_SEARCH_DIRS}
-+  PATH_SUFFIXES
-+    lib64 lib
-+  )
-+
- FIND_FILE(OPENIMAGEIO_IDIFF
-   NAMES
-     idiff
-@@ -64,7 +73,7 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenIm
-     OPENIMAGEIO_LIBRARY OPENIMAGEIO_INCLUDE_DIR)
- 
- IF(OPENIMAGEIO_FOUND)
--  SET(OPENIMAGEIO_LIBRARIES ${OPENIMAGEIO_LIBRARY})
-+  SET(OPENIMAGEIO_LIBRARIES ${OPENIMAGEIO_LIBRARY} ${OPENIMAGEIO_UTIL_LIBRARY})
-   SET(OPENIMAGEIO_INCLUDE_DIRS ${OPENIMAGEIO_INCLUDE_DIR})
-   IF(EXISTS ${OPENIMAGEIO_INCLUDE_DIR}/OpenImageIO/pugixml.hpp)
-     SET(OPENIMAGEIO_PUGIXML_FOUND TRUE)