path: root/v3.6.0.1.Arch.patch

diff --git a/arras/distributed/CMakeLists.txt b/arras/distributed/CMakeLists.txt
index 788085e..88c590d 100644
--- a/arras/distributed/CMakeLists.txt
+++ b/arras/distributed/CMakeLists.txt
@@ -20,8 +20,7 @@ find_package(Boost REQUIRED
             chrono
             date_time
             filesystem
-            program_options
-            system)
+            program_options)
 
 # if we aren't building ArrasCore, get it from the release
 if (NOT Building_ArrasCore)
diff --git a/moonray/CMakeLists.txt b/moonray/CMakeLists.txt
index 737f3c3..1e35c98 100644
--- a/moonray/CMakeLists.txt
+++ b/moonray/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Copyright 2023-2025 DreamWorks Animation LLC
 # SPDX-License-Identifier: Apache-2.0
 
-add_subdirectory(hydra)
+#add_subdirectory(hydra)
 add_subdirectory(mcrt_denoise)
 add_subdirectory(moonray)
 add_subdirectory(moonray_arras)
Submodule arras/arras4_core contains modified content
diff --git a/arras/arras4_core/CMakeLists.txt b/arras/arras4_core/CMakeLists.txt
index 5b10407..c297424 100644
--- a/arras/arras4_core/CMakeLists.txt
+++ b/arras/arras4_core/CMakeLists.txt
@@ -36,8 +36,7 @@ find_package(Boost REQUIRED
     chrono
     date_time
     filesystem
-    program_options
-    system)
+    program_options)
 
 if (IsWindowsPlatform)
     find_package(curl REQUIRED)
diff --git a/arras/arras4_core/arras4_log/lib/arras4_athena/CMakeLists.txt b/arras/arras4_core/arras4_log/lib/arras4_athena/CMakeLists.txt
index adf6a7b..8f70f4e 100644
--- a/arras/arras4_core/arras4_log/lib/arras4_athena/CMakeLists.txt
+++ b/arras/arras4_core/arras4_log/lib/arras4_athena/CMakeLists.txt
@@ -25,7 +25,7 @@ set_property(TARGET ${LibName}
 )
 
 if(IsUnixPlatform) # Linux/Darwin
-    set(PlatformSpecificLibs Boost::date_time Boost::system)
+    set(PlatformSpecificLibs Boost::date_time)
 elseif(IsWindowsPlatform)
     set(PlatformSpecificLibs ws2_32)
 endif()
diff --git a/arras/arras4_core/arras4_log/lib/arras4_athena/UdpSyslog_boost.h b/arras/arras4_core/arras4_log/lib/arras4_athena/UdpSyslog_boost.h
index 0cc9ee4..9206012 100755
--- a/arras/arras4_core/arras4_log/lib/arras4_athena/UdpSyslog_boost.h
+++ b/arras/arras4_core/arras4_log/lib/arras4_athena/UdpSyslog_boost.h
@@ -9,7 +9,7 @@
 #include <iomanip>
 
 #include <boost/asio/buffer.hpp>
-#include <boost/asio/io_service.hpp>
+#include <boost/asio/io_context.hpp>
 #include <boost/asio/ip/udp.hpp>
 #include <boost/asio/ip/address.hpp>
 #include <boost/asio/ip/host_name.hpp>
@@ -38,11 +38,9 @@ class UdpSyslog
 
         // resolve hostname to target endpoint
         boost::asio::ip::udp::resolver hostNameResolver(mService);
-        boost::asio::ip::udp::resolver::query q(boost::asio::ip::udp::v4(),
-                                                addr,
-                                                std::to_string(port), 
-                                                boost::asio::ip::resolver_query_base::address_configured);
-        mTarget = *hostNameResolver.resolve(q);
+        auto results = hostNameResolver.resolve(boost::asio::ip::udp::v4(), addr, std::to_string(port));
+        mTarget = *results.begin();
+
 
         // get local host name
         boost::system::error_code err;
@@ -61,7 +59,7 @@ class UdpSyslog
       
 private:
 
-    boost::asio::io_service mService;
+    boost::asio::io_context mService;
     boost::asio::ip::udp::socket mSocket;
     boost::asio::ip::udp::endpoint mTarget;
     std::string mLocalHostName;
Submodule moonray/scene_rdl2 contains modified content
diff --git a/moonray/scene_rdl2/lib/common/grid_util/AffinityResourceControl.cc b/moonray/scene_rdl2/lib/common/grid_util/AffinityResourceControl.cc
index ce6672d..6c2360a 100644
--- a/moonray/scene_rdl2/lib/common/grid_util/AffinityResourceControl.cc
+++ b/moonray/scene_rdl2/lib/common/grid_util/AffinityResourceControl.cc
@@ -5,6 +5,7 @@
 #include "NumaUtil.h"
 #include "ShmAffinityInfo.h"
 
+#include <algorithm> // sort
 #include <iostream> // debug
 #include <unistd.h> // getpid()
 #include <unordered_set>
diff --git a/moonray/scene_rdl2/lib/common/grid_util/BinPacketDictionary.h b/moonray/scene_rdl2/lib/common/grid_util/BinPacketDictionary.h
index d7e6bf5..50da2b6 100644
--- a/moonray/scene_rdl2/lib/common/grid_util/BinPacketDictionary.h
+++ b/moonray/scene_rdl2/lib/common/grid_util/BinPacketDictionary.h
@@ -5,6 +5,7 @@
 #include <scene_rdl2/render/cache/ValueContainerDequeue.h>
 #include <scene_rdl2/render/cache/ValueContainerEnqueue.h>
 
+#include <functional>
 #include <string>
 
 namespace scene_rdl2 {
diff --git a/moonray/scene_rdl2/mod/python/py_scene_rdl2/CMakeLists.txt b/moonray/scene_rdl2/mod/python/py_scene_rdl2/CMakeLists.txt
index a36f8f3..aa9873e 100644
--- a/moonray/scene_rdl2/mod/python/py_scene_rdl2/CMakeLists.txt
+++ b/moonray/scene_rdl2/mod/python/py_scene_rdl2/CMakeLists.txt
@@ -13,7 +13,6 @@ endif()
 find_package(Python COMPONENTS Interpreter Development)
 find_package(Boost REQUIRED
   COMPONENTS
-    system
     "${BOOST_PYTHON_COMPONENT_NAME}"
     date_time
     chrono)
@@ -66,7 +65,6 @@ target_include_directories(${component} SYSTEM
 
 target_link_libraries(${component}
     PRIVATE
-        Boost::system
         Boost::${BOOST_PYTHON_COMPONENT_NAME}
         Boost::date_time
         Boost::chrono
Submodule moonray/moonray contains modified content
diff --git a/moonray/moonray/lib/common/mcrt_util/CPUID.h b/moonray/moonray/lib/common/mcrt_util/CPUID.h
index 5b77f43..f34ee35 100644
--- a/moonray/moonray/lib/common/mcrt_util/CPUID.h
+++ b/moonray/moonray/lib/common/mcrt_util/CPUID.h
@@ -244,8 +244,8 @@ private:
 
         if (cpuid_leaf_7[EBX] & bit_AVX512F   ) features |= CPUFeatures::CPU_FEATURE_AVX512F;
         if (cpuid_leaf_7[EBX] & bit_AVX512DQ  ) features |= CPUFeatures::CPU_FEATURE_AVX512DQ;
-        if (cpuid_leaf_7[EBX] & bit_AVX512PF  ) features |= CPUFeatures::CPU_FEATURE_AVX512PF;
-        if (cpuid_leaf_7[EBX] & bit_AVX512ER  ) features |= CPUFeatures::CPU_FEATURE_AVX512ER;
+        //if (cpuid_leaf_7[EBX] & bit_AVX512PF  ) features |= CPUFeatures::CPU_FEATURE_AVX512PF;
+        //if (cpuid_leaf_7[EBX] & bit_AVX512ER  ) features |= CPUFeatures::CPU_FEATURE_AVX512ER;
         if (cpuid_leaf_7[EBX] & bit_AVX512CD  ) features |= CPUFeatures::CPU_FEATURE_AVX512CD;
         if (cpuid_leaf_7[EBX] & bit_AVX512BW  ) features |= CPUFeatures::CPU_FEATURE_AVX512BW;
         if (cpuid_leaf_7[EBX] & bit_AVX512IFMA) features |= CPUFeatures::CPU_FEATURE_AVX512IFMA;
Submodule moonray/moonshine_usd contains modified content
diff --git a/moonray/moonshine_usd/CMakeLists.txt b/moonray/moonshine_usd/CMakeLists.txt
index eddff22..ad7a84d 100644
--- a/moonray/moonshine_usd/CMakeLists.txt
+++ b/moonray/moonshine_usd/CMakeLists.txt
@@ -68,6 +68,16 @@ if(NOT pxr_FOUND)
     find_package(pxr REQUIRED)
 endif()
 
+if(TARGET usd_ms)
+    foreach(pxr_lib gf tf trace vt work cameraUtil hd hdx hf sdf usd usdGeom usdImaging usdSkel usdShade usdLux usdVol ndr sdr ar)
+        if(NOT TARGET ${pxr_lib})
+            add_library(${pxr_lib} INTERFACE IMPORTED)
+            set_target_properties(${pxr_lib} PROPERTIES INTERFACE_LINK_LIBRARIES "usd_ms;OpenGL::GL")
+        endif()
+    endforeach()
+endif()
+
+
 # Our USD config doesn't specify TBB or Boost dependencies,
 # so we need to pull the in explicitly
 find_package(TBB REQUIRED)
Submodule moonray/moonray_gui contains modified content
diff --git a/moonray/moonray_gui/cmd/moonray_gui/CMakeLists.txt b/moonray/moonray_gui/cmd/moonray_gui/CMakeLists.txt
index ee33633..08c8a0f 100644
--- a/moonray/moonray_gui/cmd/moonray_gui/CMakeLists.txt
+++ b/moonray/moonray_gui/cmd/moonray_gui/CMakeLists.txt
@@ -103,5 +103,8 @@ if (NOT OpenColorIO_FOUND)
     target_compile_definitions(${target} PRIVATE DISABLE_OCIO)
 endif()
 
+# Class of "emit" from QT and TBB collide
+target_compile_definitions(${target} PRIVATE QT_NO_KEYWORDS)
+
 install(TARGETS ${target}
     RUNTIME DESTINATION bin)
diff --git a/moonray/moonray_gui/cmd/moonray_gui/ColorPicker.cc b/moonray/moonray_gui/cmd/moonray_gui/ColorPicker.cc
index a803f9d..8b03f8a 100644
--- a/moonray/moonray_gui/cmd/moonray_gui/ColorPicker.cc
+++ b/moonray/moonray_gui/cmd/moonray_gui/ColorPicker.cc
@@ -55,7 +55,7 @@ void ColorPicker::slot_changeColor(const QColor& color)
                                                                                  .arg(mColor.blue());
     mSelector->setStyleSheet(style);
 
-    emit sig_colorChanged(mColor);
+    Q_EMIT sig_colorChanged(mColor);
 }
 
-}
\ No newline at end of file
+}
diff --git a/moonray/moonray_gui/cmd/moonray_gui/ColorPicker.h b/moonray/moonray_gui/cmd/moonray_gui/ColorPicker.h
index 2deda90..4ab6da2 100644
--- a/moonray/moonray_gui/cmd/moonray_gui/ColorPicker.h
+++ b/moonray/moonray_gui/cmd/moonray_gui/ColorPicker.h
@@ -30,12 +30,12 @@ private:
     QColorDialog* mColorDialog;
     QPushButton* mSelector;
     
-signals:
+Q_SIGNALS:
     void sig_colorChanged(const QColor& color);
 
-public slots:
+public Q_SLOTS:
     void slot_changeColor(const QColor& color);
     void slot_openColorDialog();
 };
 
-} // namespace moonray_gui
\ No newline at end of file
+} // namespace moonray_gui
diff --git a/moonray/moonray_gui/cmd/moonray_gui/MainWindow.h b/moonray/moonray_gui/cmd/moonray_gui/MainWindow.h
index 2f52c3d..2b0b8b6 100644
--- a/moonray/moonray_gui/cmd/moonray_gui/MainWindow.h
+++ b/moonray/moonray_gui/cmd/moonray_gui/MainWindow.h
@@ -4,7 +4,6 @@
 #pragma once
 
 #include "GuiTypes.h"
-#include "QtQuirks.h"
 
 #include <QLabel>
 #include <QMainWindow>
@@ -44,9 +43,9 @@ private:
     QTimer* mTimer;
 
     
-public slots:
+public Q_SLOTS:
     void hideTextOverlay();
-signals:
+Q_SIGNALS:
     void sig_hideRecordingOverlay();
 };
 
diff --git a/moonray/moonray_gui/cmd/moonray_gui/PathVisualizerGui.cc b/moonray/moonray_gui/cmd/moonray_gui/PathVisualizerGui.cc
index 55e7988..2f9f71f 100644
--- a/moonray/moonray_gui/cmd/moonray_gui/PathVisualizerGui.cc
+++ b/moonray/moonray_gui/cmd/moonray_gui/PathVisualizerGui.cc
@@ -338,7 +338,7 @@ PathVisualizerGui::slot_togglePathVisualizer()
         // to "Turn on", and refresh the frame
         mPathVisualizerManager->turnOff();
         mOnBtn->setText("Turn On");
-        emit sig_styleParamChanged();
+        Q_EMIT sig_styleParamChanged();
     } else {
         // If the visualizer is off, turn it on, start the visualization
         // process, and set the button text to "Turn off"
@@ -483,49 +483,49 @@ PathVisualizerGui::slot_setLineWidth(const int value)
 {
     mPathVisualizerManager->setLineWidth(static_cast<float>(value));
     mLineWidthValue->setText(QString::number(value));
-    emit sig_styleParamChanged();
+    Q_EMIT sig_styleParamChanged();
 }
 
 void
 PathVisualizerGui::slot_setCameraRayColor(const QColor& color)
 {
     mPathVisualizerManager->setCameraRayColor(convertFromQColor(color)); 
-    emit sig_styleParamChanged();
+    Q_EMIT sig_styleParamChanged();
 }
 
 void
 PathVisualizerGui::slot_setIndirectDiffuseRayColor(const QColor& color)
 {
     mPathVisualizerManager->setIndirectDiffuseRayColor(convertFromQColor(color)); 
-    emit sig_styleParamChanged();
+    Q_EMIT sig_styleParamChanged();
 }
 
 void
 PathVisualizerGui::slot_setIndirectSpecularRayColor(const QColor& color)
 {
     mPathVisualizerManager->setIndirectSpecularRayColor(convertFromQColor(color)); 
-    emit sig_styleParamChanged();
+    Q_EMIT sig_styleParamChanged();
 }
 
 void
 PathVisualizerGui::slot_setDirectDiffuseRayColor(const QColor& color)
 {
     mPathVisualizerManager->setDirectDiffuseRayColor(convertFromQColor(color)); 
-    emit sig_styleParamChanged();
+    Q_EMIT sig_styleParamChanged();
 }
 
 void
 PathVisualizerGui::slot_setDirectSpecularRayColor(const QColor& color)
 {
     mPathVisualizerManager->setDirectSpecularRayColor(convertFromQColor(color)); 
-    emit sig_styleParamChanged();
+    Q_EMIT sig_styleParamChanged();
 }
 
 void
 PathVisualizerGui::slot_setDirectLightRayColor(const QColor& color)
 {
     mPathVisualizerManager->setDirectLightRayColor(convertFromQColor(color)); 
-    emit sig_styleParamChanged();
+    Q_EMIT sig_styleParamChanged();
 }
 
 }
diff --git a/moonray/moonray_gui/cmd/moonray_gui/PathVisualizerGui.h b/moonray/moonray_gui/cmd/moonray_gui/PathVisualizerGui.h
index 4616086..6b6553b 100644
--- a/moonray/moonray_gui/cmd/moonray_gui/PathVisualizerGui.h
+++ b/moonray/moonray_gui/cmd/moonray_gui/PathVisualizerGui.h
@@ -26,7 +26,7 @@ public:
 
     ~PathVisualizerGui();
 
-public slots:
+public Q_SLOTS:
 
     void slot_togglePathVisualizer();
 
@@ -58,7 +58,7 @@ public slots:
     void slot_setDirectSpecularRayColor(const QColor& color);
     void slot_setDirectLightRayColor(const QColor& color);
 
-signals:
+Q_SIGNALS:
     void sig_styleParamChanged();
 
 private:
diff --git a/moonray/moonray_gui/cmd/moonray_gui/QtQuirks.h b/moonray/moonray_gui/cmd/moonray_gui/QtQuirks.h
deleted file mode 100644
index 1325197..0000000
--- a/moonray/moonray_gui/cmd/moonray_gui/QtQuirks.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2023-2024 DreamWorks Animation LLC
-// SPDX-License-Identifier: Apache-2.0
-
-
-#pragma once
-
-// Include this header before any Qt headers to compile with icc14/gcc48.
-
-// These should totally not be necessary, but BaRT is black magic and I have
-// absolutely no idea WTF it's doing.
-#define slots Q_SLOTS
-#define signals Q_SIGNALS
-
diff --git a/moonray/moonray_gui/cmd/moonray_gui/RenderGui.h b/moonray/moonray_gui/cmd/moonray_gui/RenderGui.h
index 0ec9694..ef48c41 100644
--- a/moonray/moonray_gui/cmd/moonray_gui/RenderGui.h
+++ b/moonray/moonray_gui/cmd/moonray_gui/RenderGui.h
@@ -10,7 +10,7 @@
 #include <moonray/rendering/rndr/rndr.h>
 #include <scene_rdl2/common/grid_util/ShmFbOutput.h>
 
-#include <tbb/atomic.h>
+//#include <tbb/atomic.h>
 
 #define NUM_TILE_FADE_STEPS  4
 
@@ -123,7 +123,7 @@ private:
     /// The renderering code will strive to render this frame. If it's rendering
     /// a frame with a lower timestamp then we know the frame it's currently
     /// rendering is old.
-    tbb::atomic<uint32_t>   mMasterTimestamp;
+    std::atomic<uint32_t>   mMasterTimestamp;
 
     /// The timestamp of the frame the renderer is currently processing.
     uint32_t                mRenderTimestamp;
diff --git a/moonray/moonray_gui/cmd/moonray_gui/RenderViewport.cc b/moonray/moonray_gui/cmd/moonray_gui/RenderViewport.cc
index 75311ae..cd8d089 100644
--- a/moonray/moonray_gui/cmd/moonray_gui/RenderViewport.cc
+++ b/moonray/moonray_gui/cmd/moonray_gui/RenderViewport.cc
@@ -779,7 +779,7 @@ RenderViewport::mousePressEvent(QMouseEvent *event)
         const int finalY = y + static_cast<int>(heightDiscrepancy*0.5f);
 
         if (x >= 0 && x < mWidth && finalY >= 0 && finalY < mHeight) {
-            emit sig_pixelSelected(x, finalY);
+            Q_EMIT sig_pixelSelected(x, finalY);
         }
     }
 }
diff --git a/moonray/moonray_gui/cmd/moonray_gui/RenderViewport.h b/moonray/moonray_gui/cmd/moonray_gui/RenderViewport.h
index 92764e7..d43a117 100644
--- a/moonray/moonray_gui/cmd/moonray_gui/RenderViewport.h
+++ b/moonray/moonray_gui/cmd/moonray_gui/RenderViewport.h
@@ -4,7 +4,6 @@
 #pragma once
 
 #ifndef Q_MOC_RUN
-#include "QtQuirks.h"
 #include "FrameUpdateEvent.h"
 #include "FreeCam.h"
 #include "GlslBuffer.h"
@@ -83,10 +82,10 @@ public:
     
     static const char* mHelp;
 
-public slots:
+public Q_SLOTS:
     void slot_forceFrameRedraw();
 
-signals:
+Q_SIGNALS:
     void sig_pixelSelected(int x, int y);
 
 protected:
Submodule moonray/hydra/hdMoonray contains modified content
diff --git a/moonray/hydra/hdMoonray/CMakeLists.txt b/moonray/hydra/hdMoonray/CMakeLists.txt
index 2f61a2a..156beb4 100644
--- a/moonray/hydra/hdMoonray/CMakeLists.txt
+++ b/moonray/hydra/hdMoonray/CMakeLists.txt
@@ -31,6 +31,16 @@ if(NOT pxr_FOUND)
     find_package(pxr REQUIRED)
 endif()
 
+if(TARGET usd_ms)
+    foreach(pxr_lib gf tf trace vt work cameraUtil hd hdx hf sdf usd usdGeom usdImaging usdSkel usdShade usdLux usdVol ndr sdr ar)
+        if(NOT TARGET ${pxr_lib})
+            add_library(${pxr_lib} INTERFACE IMPORTED)
+            set_target_properties(${pxr_lib} PROPERTIES INTERFACE_LINK_LIBRARIES "usd_ms;OpenGL::GL")
+        endif()
+    endforeach()
+endif()
+
+
 # This is needed for linking against the USD 0.25.5 libraries
 # as they depend on OpenGL but don't specify it in
 # their cmake config.
Submodule arras/arras_render contains modified content
diff --git a/arras/arras_render/client/OrbitCam.h b/arras/arras_render/client/OrbitCam.h
index 070a2db..95ac568 100644
--- a/arras/arras_render/client/OrbitCam.h
+++ b/arras/arras_render/client/OrbitCam.h
@@ -3,6 +3,7 @@
 #pragma once
 #include "NavigationCam.h"
 
+#include <functional>
 ///
 /// Controls:
 ///
Submodule cmake_modules contains modified content
diff --git a/cmake_modules/cmake/FindTBB.cmake b/cmake_modules/cmake/FindTBB.cmake
index 201dc94..a13c8bb 100644
--- a/cmake_modules/cmake/FindTBB.cmake
+++ b/cmake_modules/cmake/FindTBB.cmake
@@ -8,6 +8,13 @@
 ## target TBB can be found where the component targets TBB:comp are out of scope, causing an
 ## error at line 222
 
+#===============================================================================
+# Try to find modern system-provided TBB first
+find_package(TBB CONFIG QUIET)
+if(TBB_FOUND)
+    # System TBB found, use it and skip the rest of this legacy script
+    return()
+endif()
 #===============================================================================
 # This script will attempt to find TBB and set up a TBB target.
 #
Submodule moonray/hydra/moonray_sdr_plugins contains modified content
diff --git a/moonray/hydra/moonray_sdr_plugins/CMakeLists.txt b/moonray/hydra/moonray_sdr_plugins/CMakeLists.txt
index 2af290a..efa3131 100644
--- a/moonray/hydra/moonray_sdr_plugins/CMakeLists.txt
+++ b/moonray/hydra/moonray_sdr_plugins/CMakeLists.txt
@@ -16,6 +16,16 @@ if(NOT pxr_FOUND)
     find_package(pxr REQUIRED)
 endif()
 
+if(TARGET usd_ms)
+    foreach(pxr_lib gf tf trace vt work cameraUtil hd hdx hf sdf usd usdGeom usdImaging usdSkel usdShade usdLux usdVol ndr sdr ar)
+        if(NOT TARGET ${pxr_lib})
+            add_library(${pxr_lib} INTERFACE IMPORTED)
+            set_target_properties(${pxr_lib} PROPERTIES INTERFACE_LINK_LIBRARIES "usd_ms;OpenGL::GL")
+        endif()
+    endforeach()
+endif()
+
+
 find_package(Python REQUIRED COMPONENTS Development)
 
 add_subdirectory(moonrayShaderDiscovery)