Deps_builder: minor build fixes, windows fixes and hash updates

small clean-up pass on #112530 that resolves the following problems

- Missing python_windows.diff
- CONFIGURE_ENV_MSVC is new in 4.0 and didn't exist in 3.3 breaking
the python build
- Hash updates for USD and OIIO both had repo renames leading to a
change there
- OIIO was building with -DREQUIRED_DEPS=python and -DUSE_PYTHON=OFF
- Updates in creators cmake for the ffmpeg 6.0 dll names.

build_files/build_environment/cmake/openimageio.cmake

@@ -43,7 +43,7 @@ set(OPENIMAGEIO_EXTRA_ARGS
   -DBUILD_SHARED_LIBS=OFF
   ${OPENIMAGEIO_LINKSTATIC}
   ${DEFAULT_BOOST_FLAGS}
-  -DREQUIRED_DEPS=WebP$<SEMICOLON>JPEGTurbo$<SEMICOLON>TIFF$<SEMICOLON>OpenEXR$<SEMICOLON>PNG$<SEMICOLON>OpenJPEG$<SEMICOLON>fmt$<SEMICOLON>Robinmap$<SEMICOLON>ZLIB$<SEMICOLON>pugixml$<SEMICOLON>Python
+  -DREQUIRED_DEPS=WebP$<SEMICOLON>JPEGTurbo$<SEMICOLON>TIFF$<SEMICOLON>OpenEXR$<SEMICOLON>PNG$<SEMICOLON>OpenJPEG$<SEMICOLON>fmt$<SEMICOLON>Robinmap$<SEMICOLON>ZLIB$<SEMICOLON>pugixml
   -DUSE_LIBSQUISH=OFF
   -DUSE_QT5=OFF
   -DUSE_NUKE=OFF

build_files/build_environment/cmake/python.cmake

@@ -39,7 +39,7 @@ if(WIN32)
       ${CMAKE_COMMAND} -E copy ${ZLIB_SOURCE_FOLDER}/../external_zlib-build/zconf.h ${PYTHON_EXTERNALS_FOLDER}/zlib-1.2.13/zconf.h &&
       ${PATCH_CMD} --verbose -p1 -d ${BUILD_DIR}/python/src/external_python < ${PATCH_DIR}/python_windows.diff
     CONFIGURE_COMMAND echo "."
-    BUILD_COMMAND ${CONFIGURE_ENV_MSVC} && cd ${BUILD_DIR}/python/src/external_python/pcbuild/ && set IncludeTkinter=false && set LDFLAGS=/DEBUG && call prepare_ssl.bat && call build.bat -e -p x64 -c ${BUILD_MODE}
+    BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/python/src/external_python/pcbuild/ && set IncludeTkinter=false && set LDFLAGS=/DEBUG && call prepare_ssl.bat && call build.bat -e -p x64 -c ${BUILD_MODE}
     INSTALL_COMMAND ${PYTHON_BINARY_INTERNAL} ${PYTHON_SRC}/PC/layout/main.py -b ${PYTHON_SRC}/PCbuild/amd64 -s ${PYTHON_SRC} -t ${PYTHON_SRC}/tmp/ --include-stable --include-pip --include-dev --include-launchers  --include-venv --include-symbols ${PYTHON_EXTRA_INSTLAL_FLAGS} --copy ${LIBDIR}/python
   )
   add_dependencies(

build_files/build_environment/cmake/versions.cmake

@@ -161,7 +161,7 @@ set(OPENMP_FILE openmp-${OPENMP_VERSION}.src.tar.xz)
 
 set(OPENIMAGEIO_VERSION v2.3.20.0)
 set(OPENIMAGEIO_URI https://github.com/OpenImageIO/oiio/archive/refs/tags/${OPENIMAGEIO_VERSION}.tar.gz)
-set(OPENIMAGEIO_HASH defb1fe7c8e64bac60eb3cacaf5c3736)
+set(OPENIMAGEIO_HASH 5a25a98b961f04f8b2828885b50e9a2b)
 set(OPENIMAGEIO_HASH_TYPE MD5)
 set(OPENIMAGEIO_FILE OpenImageIO-${OPENIMAGEIO_VERSION}.tar.gz)
 
@@ -462,7 +462,7 @@ set(EMBREE_FILE embree-v${EMBREE_VERSION}.zip)
 
 set(USD_VERSION 22.03)
 set(USD_URI https://github.com/PixarAnimationStudios/OpenUSD/archive/v${USD_VERSION}.tar.gz)
-set(USD_HASH e0e441a05057692a83124a1195b09eed)
+set(USD_HASH f6b1d79cbce82d1da6fc1a322ab7a2c1)
 set(USD_HASH_TYPE MD5)
 set(USD_FILE usd-v${USD_VERSION}.tar.gz)
 

build_files/build_environment/patches/python_windows.diff

@@ -0,0 +1,59 @@
+--- a/PCbuild/prepare_ssl.bat	2022-10-30 11:48:14 -0600
++++ b/PCbuild/prepare_ssl.bat	2022-10-30 11:53:16 -0600
+@@ -47,12 +47,13 @@
+ if "%PERL%" == "" where perl > "%TEMP%\perl.loc" 2> nul && set /P PERL= <"%TEMP%\perl.loc" & del "%TEMP%\perl.loc"
+ if "%PERL%" == "" (echo Cannot locate perl.exe on PATH or as PERL variable & exit /b 4)
+ 
+-%MSBUILD% "%PCBUILD%\openssl.vcxproj" /p:Configuration=Release /p:Platform=Win32
+-if errorlevel 1 exit /b
++REM Blender: we only need x64, ssl is kind of a long build, so just build what we need
++REM %MSBUILD% "%PCBUILD%\openssl.vcxproj" /p:Configuration=Release /p:Platform=Win32
++REM if errorlevel 1 exit /b
+ %MSBUILD% "%PCBUILD%\openssl.vcxproj" /p:Configuration=Release /p:Platform=x64
+ if errorlevel 1 exit /b
+-%MSBUILD% "%PCBUILD%\openssl.vcxproj" /p:Configuration=Release /p:Platform=ARM
+-if errorlevel 1 exit /b
+-%MSBUILD% "%PCBUILD%\openssl.vcxproj" /p:Configuration=Release /p:Platform=ARM64
+-if errorlevel 1 exit /b
++REM %MSBUILD% "%PCBUILD%\openssl.vcxproj" /p:Configuration=Release /p:Platform=ARM
++REM if errorlevel 1 exit /b
++REM %MSBUILD% "%PCBUILD%\openssl.vcxproj" /p:Configuration=Release /p:Platform=ARM64
++REM if errorlevel 1 exit /b
+
+diff -aurw Python-3.10.12/PCbuild/openssl.props external_python/PCbuild/openssl.props
+--- Python-3.10.12/PCbuild/openssl.props	2023-06-06 16:30:33 -0600
++++ external_python/PCbuild/openssl.props	2023-06-20 09:58:57 -0600
+@@ -10,7 +10,7 @@
+     </Link>
+   </ItemDefinitionGroup>
+   <PropertyGroup>
+-    <_DLLSuffix>-1_1</_DLLSuffix>
++    <_DLLSuffix>-3</_DLLSuffix>
+     <_DLLSuffix Condition="$(Platform) == 'ARM'">$(_DLLSuffix)-arm</_DLLSuffix>
+     <_DLLSuffix Condition="$(Platform) == 'ARM64'">$(_DLLSuffix)-arm64</_DLLSuffix>
+   </PropertyGroup>
+diff -aurw Python-3.10.12/PCbuild/openssl.vcxproj external_python/PCbuild/openssl.vcxproj
+--- Python-3.10.12/PCbuild/openssl.vcxproj	2023-06-06 16:30:33 -0600
++++ external_python/PCbuild/openssl.vcxproj	2023-06-20 08:50:43 -0600
+@@ -98,7 +98,7 @@
+ 
+   <Target Name="_CopyToOutput" AfterTargets="Build">
+     <ItemGroup>
+-      <_Built Include="$(opensslDir)\LICENSE" />
++      <_Built Include="$(opensslDir)\LICENSE.txt" />
+       <_Built Include="$(IntDir)\libcrypto.lib;$(IntDir)\libcrypto-*.dll;$(IntDir)\libcrypto-*.pdb" />
+       <_Built Include="$(IntDir)\libssl.lib;$(IntDir)\libssl-*.dll;$(IntDir)\libssl-*.pdb" />
+       <_AppLink Include="$(opensslDir)\ms\applink.c" />
+diff -aurw Python-3.10.12/PCbuild/regen.targets external_python/PCbuild/regen.targets
+--- Python-3.10.12/PCbuild/regen.targets	2023-06-06 16:30:33 -0600
++++ external_python/PCbuild/regen.targets	2023-06-20 09:37:17 -0600
+@@ -89,7 +89,7 @@
+     <_LicenseSources Include="$(PySourcePath)LICENSE;
+                               $(PySourcePath)PC\crtlicense.txt;
+                               $(bz2Dir)LICENSE;
+-                              $(opensslOutDir)LICENSE;
++                              $(opensslOutDir)LICENSE.txt;
+                               $(libffiDir)LICENSE;" />
+     <_LicenseSources Include="$(tcltkDir)tcllicense.terms;
+                               $(tcltkDir)tklicense.terms;
+

source/creator/CMakeLists.txt

@@ -898,9 +898,20 @@ elseif(WIN32)
 
   if(WITH_CODEC_FFMPEG)
     # Filenames change slightly between ffmpeg versions
-    # check both 5.0 and fallback to 4.4 to ease the transition
+    # check both 6.0 and fallback to 5.0 to ease the transition
     # between versions.
-    if(EXISTS "${LIBDIR}/ffmpeg/lib/avcodec-59.dll")
+    if(EXISTS "${LIBDIR}/ffmpeg/lib/avcodec-60.dll")
+      install(
+        FILES
+          ${LIBDIR}/ffmpeg/lib/avcodec-60.dll
+          ${LIBDIR}/ffmpeg/lib/avformat-60.dll
+          ${LIBDIR}/ffmpeg/lib/avdevice-60.dll
+          ${LIBDIR}/ffmpeg/lib/avutil-58.dll
+          ${LIBDIR}/ffmpeg/lib/swscale-7.dll
+          ${LIBDIR}/ffmpeg/lib/swresample-4.dll
+        DESTINATION "."
+      )
+    else()
       install(
         FILES
           ${LIBDIR}/ffmpeg/lib/avcodec-59.dll
@@ -911,17 +922,6 @@ elseif(WIN32)
           ${LIBDIR}/ffmpeg/lib/swresample-4.dll
         DESTINATION "."
       )
-    else()
-      install(
-        FILES
-          ${LIBDIR}/ffmpeg/lib/avcodec-58.dll
-          ${LIBDIR}/ffmpeg/lib/avformat-58.dll
-          ${LIBDIR}/ffmpeg/lib/avdevice-58.dll
-          ${LIBDIR}/ffmpeg/lib/avutil-56.dll
-          ${LIBDIR}/ffmpeg/lib/swscale-5.dll
-          ${LIBDIR}/ffmpeg/lib/swresample-3.dll
-        DESTINATION "."
-      )
     endif()
   endif()
   if(WITH_TBB)