Sophie

Sophie

distrib > Mageia > 9 > armv7hl > media > core-release-src > by-pkgid > 3241693ae8a75eb18fe83035cfa9aa42 > files > 12

blender-3.3.8-1.mga9.src.rpm

diff -w -uNr blender-3.3.1-git20220930.orig/build_files/build_environment/patches/usd.diff blender-3.3.1-git20220930/build_files/build_environment/patches/usd.diff
--- blender-3.3.1-git20220930.orig/build_files/build_environment/patches/usd.diff	2022-10-02 17:56:46.000000000 +0200
+++ blender-3.3.1-git20220930/build_files/build_environment/patches/usd.diff	2022-10-02 23:01:24.028717433 +0200
@@ -1,7 +1,7 @@
 diff -x .git -ur usd.orig/cmake/defaults/Packages.cmake external_usd/cmake/defaults/Packages.cmake
 --- usd.orig/cmake/defaults/Packages.cmake	2019-10-24 22:39:53.000000000 +0200
 +++ external_usd/cmake/defaults/Packages.cmake	2019-11-28 13:00:33.185957483 +0100
-@@ -64,7 +64,7 @@
+@@ -132,7 +132,7 @@ if(PXR_BUILD_USD_TOOLS OR PXR_BUILD_TEST
  endif()
  
  # --TBB
@@ -10,11 +10,10 @@
  add_definitions(${TBB_DEFINITIONS})
  
  # --math
-
 diff -Naur usd_orig/cmake/defaults/msvcdefaults.cmake external_usd/cmake/defaults/msvcdefaults.cmake
 --- usd_orig/cmake/defaults/msvcdefaults.cmake	2022-02-18 14:49:09 -0700
 +++ external_usd/cmake/defaults/msvcdefaults.cmake	2022-03-14 11:41:50 -0600
-@@ -120,9 +120,6 @@
+@@ -120,9 +120,6 @@ _add_define("WIN32_LEAN_AND_MEAN")
  # for all translation units.
  set(_PXR_CXX_FLAGS "${_PXR_CXX_FLAGS} /bigobj")
  
@@ -24,38 +23,11 @@
  # Enable multiprocessor builds.
  set(_PXR_CXX_FLAGS "${_PXR_CXX_FLAGS} /MP")
  set(_PXR_CXX_FLAGS "${_PXR_CXX_FLAGS} /Gm-")
-
-diff --git a/pxr/base/work/singularTask.h b/pxr/base/work/singularTask.h
---- a/pxr/base/work/singularTask.h
-+++ b/pxr/base/work/singularTask.h
-@@ -120,7 +120,7 @@
-                     // case we go again to ensure the task can do whatever it
-                     // was awakened to do.  Once we successfully take the count
-                     // to zero, we stop.
--                    size_t old = count;
-+                    std::size_t old = count;
-                     do { _fn(); } while (
-                         !count.compare_exchange_strong(old, 0));
-                 });
-
-diff --git a/pxr/usd/sdr/shaderMetadataHelpers.h b/pxr/usd/sdr/shaderMetadataHelpers.h
---- a/pxr/usd/sdr/shaderMetadataHelpers.h
-+++ b/pxr/usd/sdr/shaderMetadataHelpers.h
-@@ -32,6 +32,8 @@
- #include "pxr/base/tf/token.h"
- #include "pxr/usd/sdr/declare.h"
- 
-+#include <limits>
-+
- PXR_NAMESPACE_OPEN_SCOPE
- 
- /// \namespace ShaderMetadataHelpers
-
 diff --git a/pxr/base/arch/timing.h b/pxr/base/arch/timing.h
 index 517561f..fda5a1f 100644
 --- a/pxr/base/arch/timing.h
 +++ b/pxr/base/arch/timing.h
-@@ -91,6 +91,10 @@ ArchGetTickTime()
+@@ -84,6 +84,10 @@ ArchGetTickTime()
  inline uint64_t
  ArchGetStartTickTime()
  {
@@ -66,7 +38,7 @@
      uint64_t t;
  #if defined (ARCH_OS_DARWIN)
      return ArchGetTickTime();
-@@ -123,6 +127,7 @@ ArchGetStartTickTime()
+@@ -116,6 +120,7 @@ ArchGetStartTickTime()
  #error "Unsupported architecture."
  #endif
    return t;
@@ -74,7 +46,7 @@
  }
  
  /// Get a "stop" tick time for measuring an interval of time.  See
-@@ -132,6 +137,10 @@ ArchGetStartTickTime()
+@@ -125,6 +130,10 @@ ArchGetStartTickTime()
  inline uint64_t
  ArchGetStopTickTime()
  {
@@ -85,7 +57,7 @@
      uint64_t t;
  #if defined (ARCH_OS_DARWIN)
      return ArchGetTickTime();
-@@ -162,11 +171,11 @@ ArchGetStopTickTime()
+@@ -155,11 +164,11 @@ ArchGetStopTickTime()
  #error "Unsupported architecture."
  #endif
    return t;