Merge remote-tracking branch 'origin/blender-v4.2-release'

build_files/build_environment/cmake/opencollada.cmake

@@ -18,9 +18,8 @@ if(UNIX)
   endif()
   set(PATCH_MAYBE_DOS2UNIX_CMD
     ${_dos2unix}
-    ${PATCH_DIR}/opencollada.diff
     ${BUILD_DIR}/opencollada/src/external_opencollada/CMakeLists.txt
-    ${BUILD_DIR}/opencollada/src/external_opencollada/Externals/LibXML/CMakeLists.txt &&
+    ${BUILD_DIR}/opencollada/src/external_opencollada/Externals/LibXML/CMakeLists.txt
   )
 else()
   set(OPENCOLLADA_EXTRA_ARGS
@@ -43,9 +42,6 @@ ExternalProject_Add(external_opencollada
 
   PATCH_COMMAND
     ${PATCH_MAYBE_DOS2UNIX_CMD}
-    ${PATCH_CMD} -p 1 -N -d
-      ${BUILD_DIR}/opencollada/src/external_opencollada <
-      ${PATCH_DIR}/opencollada.diff
 
   CMAKE_ARGS
     -DCMAKE_INSTALL_PREFIX=${LIBDIR}/opencollada

build_files/build_environment/cmake/versions.cmake

@@ -147,9 +147,9 @@ set(SDL_FILE SDL2-${SDL_VERSION}.tar.gz)
 set(SDL_CPE "cpe:2.3:a:libsdl:sdl:${SDL_VERSION}:*:*:*:*:*:*:*")
 set(SDL_HOMEPAGE https://www.libsdl.org)
 
-set(OPENCOLLADA_VERSION v1.6.68)
-set(OPENCOLLADA_URI https://github.com/KhronosGroup/OpenCOLLADA/archive/${OPENCOLLADA_VERSION}.tar.gz)
-set(OPENCOLLADA_HASH ee7dae874019fea7be11613d07567493)
+set(OPENCOLLADA_VERSION 717cb7c1041a1796aad3cf843dd8f5095d7a6a33)
+set(OPENCOLLADA_URI https://github.com/aras-p/OpenCOLLADA/archive/${OPENCOLLADA_VERSION}.tar.gz)
+set(OPENCOLLADA_HASH 64cb7f705751790f1a8c6d0dfe6682cd)
 set(OPENCOLLADA_HASH_TYPE MD5)
 set(OPENCOLLADA_FILE opencollada-${OPENCOLLADA_VERSION}.tar.gz)
 

build_files/cmake/platform/platform_unix.cmake

@@ -341,7 +341,13 @@ if(WITH_OPENCOLLADA)
     if(WITH_STATIC_LIBS)
       # PCRE is bundled with OpenCollada without headers, so can't use
       # find_package reliably to detect it.
-      set(PCRE_LIBRARIES ${LIBDIR}/opencollada/lib/libpcre.a)
+      # NOTE: newer fork no longer depends on PCRE: see !122270.
+      if(EXISTS ${LIBDIR}/opencollada/lib/libpcre.a)
+        set(PCRE_LIBRARIES ${LIBDIR}/opencollada/lib/libpcre.a)
+      else()
+        # Quiet warnings.
+        set(PCRE_LIBRARIES)
+      endif()
     else()
       find_package_wrapper(PCRE)
     endif()

build_files/cmake/platform/platform_win32.cmake

@@ -512,12 +512,13 @@ if(WITH_OPENCOLLADA)
   endif()
 
   list(APPEND OPENCOLLADA_LIBRARIES ${OPENCOLLADA}/lib/opencollada/UTF.lib)
+  if(EXISTS ${OPENCOLLADA}/lib/opencollada/pcre.lib)
+    set(PCRE_LIBRARIES
+      optimized ${OPENCOLLADA}/lib/opencollada/pcre.lib
 
-  set(PCRE_LIBRARIES
-    optimized ${OPENCOLLADA}/lib/opencollada/pcre.lib
-
-    debug ${OPENCOLLADA}/lib/opencollada/pcre_d.lib
-  )
+      debug ${OPENCOLLADA}/lib/opencollada/pcre_d.lib
+    )
+  endif()
 endif()
 
 if(WITH_CODEC_FFMPEG)