Unverified Commit 13239a4c authored by Dmitry Kalinkin's avatar Dmitry Kalinkin Committed by GitHub
Browse files

blender: 5.1.0 -> 5.1.1 (#510134)

parents 1e5f785c af1f03bc

pkgs/by-name/bl/blender/fix-quite-clog-warning.patch

0 → 100644
+13 −0
Original line number Diff line number Diff line 
diff --git a/source/blender/gpu/vulkan/vk_texture_pool.cc b/source/blender/gpu/vulkan/vk_texture_pool.cc

index 850e7808ae7..3478d4907f2 100644

--- a/source/blender/gpu/vulkan/vk_texture_pool.cc

+++ b/source/blender/gpu/vulkan/vk_texture_pool.cc

@@ -554,7 +554,7 @@ void VKTexturePool::log_usage_data()

     log_message += std::format(" ({} cached VkImages)", current_usage_data_.image_cache_size);

   }

 

-  CLOG_TRACE(&LOG, log_message.c_str());

+  CLOG_TRACE(&LOG, "%s", log_message.c_str());

 }

 

 }  // namespace gpu

pkgs/by-name/bl/blender/package.nix

+5 −2
Original line number Diff line number Diff line
@@ -118,12 +118,12 @@ in 


stdenv'.mkDerivation (finalAttrs: {

  pname = "blender";

  version = "5.1.0";

  version = "5.1.1";



  src = fetchzip {

    name = "source";

    url = "https://download.blender.org/source/blender-${finalAttrs.version}.tar.xz";

    hash = "sha256-knXAK3mW0tDz5ukuYkAZMv/zF9NLR8pofc3ujabcsys=";

    hash = "sha256-iJolR8iS2go0doO96ibyseCeMunFL+XPoQ25NbX6oOA=";

  };



  patches = [
@@ -131,6 +131,9 @@ stdenv'.mkDerivation (finalAttrs: { 
    # ceres-solver dependency propagates eigen 3 and appears to be incompatible

    # with more recent versions.

    ./eigen-3-compat.patch

    # Required due to `-Werror=format-security` in nixpkgs

    # https://projects.blender.org/blender/blender/commit/470127ede2448de50a6936b8484b3c382c76d596

    ./fix-quite-clog-warning.patch

  ]

  # Minimal backport of hiprt 3.x support from https://projects.blender.org/blender/blender/pulls/144889

  ++ lib.optionals rocmSupport [