Page MenuHome
Paste P2911

(An Untitled Masterwork)
ActivePublic
Actions

Authored by Brecht Van Lommel (brecht) on Apr 28 2022, 2:55 PM.
diff --git a/build_files/build_environment/patches/usd.diff b/build_files/build_environment/patches/usd.diff
index eb59051..d7ab821 100644
--- a/build_files/build_environment/patches/usd.diff
+++ b/build_files/build_environment/patches/usd.diff
@@ -51,3 +51,28 @@ diff --git a/pxr/usd/sdr/shaderMetadataHelpers.h b/pxr/usd/sdr/shaderMetadataHel
/// \namespace ShaderMetadataHelpers
+diff --git a/cmake/defaults/Packages.cmake b/cmake/defaults/Packages.cmake
+--- a/cmake/defaults/Packages.cmake
++++ b/cmake/defaults/Packages.cmake
+@@ -232,8 +232,9 @@
+ find_library(MVK_LIBRARIES NAMES MoltenVK PATHS $ENV{VULKAN_SDK}/lib)
+ list(APPEND VULKAN_LIBS ${MVK_LIBRARIES})
+ elseif (UNIX AND NOT APPLE)
+- find_package(X11 REQUIRED)
+- list(APPEND VULKAN_LIBS ${X11_LIBRARIES})
++ # Blender: disable X11 dependency while keeping OpenGL
++ #find_package(X11 REQUIRED)
++ #list(APPEND VULKAN_LIBS ${X11_LIBRARIES})
+ elseif (WIN32)
+ # No extra libs required
+ endif()
+@@ -259,7 +260,8 @@
+ endif()
+ # --X11
+ if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
+- find_package(X11)
++ # Blender: disable X11 dependency while keeping OpenGL
++ #find_package(X11)
+ endif()
+ # --Embree
+ if (PXR_BUILD_EMBREE_PLUGIN)

Event Timeline

Brecht Van Lommel (brecht) created this paste.Apr 28 2022, 2:55 PM