VFX 2024 build fixes for oiio, osl, usd

packages/conan/recipes/materialx/conandata.yml

@@ -41,7 +41,13 @@ patches:
     - patch_file: "patches/pybind11-cmake.patch"
       patch_description: "CMake: Must call find_package() on Python3 before pybind11"
       patch_type: "conan"
+    - patch_file: "patches/1.39.3-cmake-libraries.patch"
+      patch_descriptions: "MaterialX support files in share/MaterialX"
+      patch_type: "conan"
   "1.39.1":
     - patch_file: "patches/pybind11-cmake.patch"
       patch_description: "CMake: Must call find_package() on Python3 before pybind11"
       patch_type: "conan"
+    - patch_file: "patches/1.39.3-cmake-libraries.patch"
+      patch_descriptions: "MaterialX support files in share/MaterialX"
+      patch_type: "conan"

packages/conan/recipes/oiio/patches/2.5.19.0-cmake-targets.patch

@@ -331,12 +331,14 @@ index 6556cd2eb..b9c4cd958 100644
      endif ()
      # If an external copy wasn't found and we requested that missing
      # packages be built, or we we are forcing a local copy to be built, then
-@@ -378,7 +414,7 @@ macro (find_or_download_fmt)
+@@ -378,7 +414,9 @@ macro (find_or_download_fmt)
          set (fmt_VERSION "${FMT_VERSION_MAJOR}.${FMT_VERSION_MINOR}.${FMT_VERSION_PATCH}")
          list (APPEND CFP_ALL_BUILD_DEPS_FOUND "${pkgname} ${${pkgname}_VERSION}")
      else ()
 -        get_target_property(FMT_INCLUDE_DIR fmt::fmt-header-only INTERFACE_INCLUDE_DIRECTORIES)
 +        get_target_property(FMT_INCLUDE_DIR fmt::fmt INTERFACE_INCLUDE_DIRECTORIES)
++        # Get rid of generator expression from Conan
++        string(REGEX REPLACE "^\\$<\\$<CONFIG:Release>:(.*)>$" "\\1" FMT_INCLUDE_DIR "${FMT_INCLUDE_DIR}")
          set (OIIO_USING_FMT_LOCAL FALSE)
          checked_find_package (fmt REQUIRED
                                VERSION_MIN 7.0)
@@ -495,7 +497,7 @@ diff --git src/libutil/CMakeLists.txt src/libutil/CMakeLists.txt
 index f873b3eed..cf5d4e74c 100644
 --- src/libutil/CMakeLists.txt
 +++ src/libutil/CMakeLists.txt
-@@ -20,20 +20,13 @@ target_link_libraries (OpenImageIO_Util
+@@ -20,15 +20,15 @@ target_link_libraries (OpenImageIO_Util
              ${GCC_ATOMIC_LIBRARIES}
              ${OPENIMAGEIO_IMATH_DEPENDENCY_VISIBILITY}
              ${OPENIMAGEIO_IMATH_TARGETS}
@@ -507,17 +509,13 @@ index f873b3eed..cf5d4e74c 100644
              $<TARGET_NAME_IF_EXISTS:TBB::tbb>
              ${CMAKE_DL_LIBS}
          )
- 
--if (INTERNALIZE_FMT OR OIIO_USING_FMT_LOCAL)
+
+ if (INTERNALIZE_FMT OR OIIO_USING_FMT_LOCAL)
 -    add_dependencies(OpenImageIO_Util fmt_internal_target)
--else ()
--    target_link_libraries (OpenImageIO_Util
--                           PUBLIC fmt::fmt-header-only)
--endif ()
--
- if (WIN32)
-     add_definitions(-DWIN32_LEAN_AND_MEAN -DNOMINMAX -DNOGDI -DVC_EXTRALEAN)
-     target_link_libraries (OpenImageIO_Util PRIVATE psapi)
++    add_dependencies(OpenImageIO_Util fmt::fmt)
+ else ()
+     target_link_libraries (OpenImageIO_Util
+                            PUBLIC fmt::fmt-header-only)
 diff --git src/ptex.imageio/CMakeLists.txt src/ptex.imageio/CMakeLists.txt
 index 16634fedb..82060ac29 100644
 --- src/ptex.imageio/CMakeLists.txt
@@ -538,3 +536,17 @@ index 16634fedb..82060ac29 100644
 +                     INCLUDE_DIRS ${ptex_INCLUDE_DIRS}
                       DEFINITIONS "-DUSE_PTEX")
  endif ()
+
+diff --git src/cmake/Config.cmake.in src/cmake/Config.cmake.in
+index 16634fedb..82060ac29 10064
+--- src/cmake/Config.cmake.in
++++ src/cmake/Config.cmake.in
+@@ -21,7 +21,7 @@
+     endif ()
+ endif ()
+
+-if (NOT @OIIO_USING_FMT_LOCAL@ AND NOT @INTERNALIZE_FMT@)
++if (1)
+     find_dependency(fmt)
+ endif ()
+

packages/vfx2/Dockerfile

@@ -15,6 +15,7 @@ ARG ASWF_BOOST_VERSION
 ARG ASWF_CMAKE_VERSION
 ARG ASWF_CPPUNIT_VERSION
 ARG ASWF_EXPAT_VERSION
+ARG ASWF_FMT_VERSION
 ARG ASWF_FREETYPE_VERSION
 ARG ASWF_GLEW_VERSION
 ARG ASWF_GLFW_VERSION
@@ -125,6 +126,8 @@ ARG ASWF_PYSTRING_VERSION
 ENV ASWF_PYSTRING_VERSEION=${ASWF_PYSTRING_VERSION}
 ARG ASWF_EXPAT_VERSION
 ENV ASWF_EXPAT_VERSION=${ASWF_EXPAT_VERSION}
+ARG ASWF_FMT_VERSION
+ENV ASWF_FMT_VERSION=${ASWF_FMT_VERSION}
 ARG ASWF_FREETYPE_VERSION
 ENV ASWF_FREETYPE_VERSION=${ASWF_FREETYPE_VERSION}
 ARG ASWF_MINIZIP_NG_VERSION
@@ -180,6 +183,7 @@ COPY <<EOF /usr/local/conanfile.txt
 ., * -> .
 [requires]
 expat/${ASWF_EXPAT_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL}
+fmt/${ASWF_FMT_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL}
 onetbb/${ASWF_ONETBB_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL}
 partio/${ASWF_PARTIO_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL}
 pybind11/${ASWF_PYBIND11_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL}

python/aswfdocker/data/versions.yaml

@@ -620,7 +620,7 @@ versions:
       ASWF_CXX_STANDARD: "17"
       # ASWF packages
       ASWF_IMATH_VERSION: "3.1.12"
-      ASWF_MATERIALX_VERSION: "1.39.2"
+      ASWF_MATERIALX_VERSION: "1.39.1"
       ASWF_OCIO_CONFIGS_VERSION: "1.0_r2"
       ASWF_OCIO_VERSION: "2.3.2"
       ASWF_OIIO_VERSION: "2.5.19.0"

scripts/vfx/build_osl.sh

@@ -11,6 +11,36 @@ fi
 tar -zxf "$DOWNLOADS_DIR/osl-${ASWF_OSL_VERSION}.tar.gz"
 cd "OpenShadingLanguage-${ASWF_OSL_VERSION}"
 
+if [[ $ASWF_OSL_VERSION == 1.13.11.0 ]]; then
+# Serialize CUDA builds to avoid race condition
+
+cat << 'EOF' | patch -p1
+diff --git a/src/testshade/CMakeLists.txt b/src/testshade/CMakeLists.txt
+index d99dd79ac..bfda2778a 100644
+--- a/src/testshade/CMakeLists.txt
++++ b/src/testshade/CMakeLists.txt
+@@ -80,6 +80,9 @@
+ target_link_libraries (testshade
+                        PRIVATE
+                            oslexec oslquery)
++if (OSL_USE_OPTIX)
++    add_dependencies(testshade testshade_ptx)
++endif ()
+
+ install (TARGETS testshade RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} )
+
+@@ -96,6 +99,7 @@
+ if (NOT CODECOV)
+     # The 'libtestshade' library
+     add_library ( "libtestshade" ${testshade_srcs} )
++    add_dependencies(libtestshade testshade)
+
+     set_target_properties (libtestshade
+                            PROPERTIES
+EOF
+
+fi
+
 if [[ $ASWF_DTS_VERSION == 9 && $ASWF_CUDA_VERSION == 10* ]]; then
     CUDA_COMPUTE_VERSION=compute_30
 else