Merge branch 'main' into display-interop-id-io

Signed-off-by: Brecht Van Lommel <brecht@blender.org>

Author: brechtvl

.github/workflows/ci.yml

@@ -463,7 +463,7 @@ jobs:
                             LIBRAW_VERSION=0.21.4
                             LIBTIFF_VERSION=v4.7.1
                             OPENJPEG_VERSION=v2.5.4
-                            PTEX_VERSION=v2.4.3
+                            PTEX_VERSION=v2.5.0
                             PUGIXML_VERSION=v1.15
                             WEBP_VERSION=v1.6.0
                             FREETYPE_VERSION=VER-2-14-0

INSTALL.md

@@ -71,7 +71,7 @@ NEW or CHANGED MINIMUM dependencies since the last major release are **bold**.
  * If you want support for WebP images:
      * WebP >= 1.1 (tested through 1.6)
  * If you want support for Ptex:
-     * Ptex >= 2.3.1 (probably works for older; tested through 2.4.3)
+     * Ptex >= 2.3.1 (probably works for older; tested through 2.5)
  * If you want to be able to do font rendering into images:
      * Freetype >= 2.10.0 (tested through 2.14)
  * If you want to be able to read "ultra-HDR" embedded in JPEG files:

src/build-scripts/build_Ptex.bash

@@ -33,6 +33,7 @@ git checkout ${PTEX_VERSION} --force
 
 time cmake -S . -B ${PTEX_BUILD_DIR} -DCMAKE_BUILD_TYPE=Release \
            -DCMAKE_INSTALL_PREFIX=${PTEX_INSTALL_DIR} \
+           -DCMAKE_CXX_STANDARD=17 \
            ${PTEX_CONFIG_OPTS}
 time cmake --build ${PTEX_BUILD_DIR} --config Release --target install
 

src/build-scripts/install_homebrew_deps.bash

@@ -19,6 +19,7 @@ if [[ `which brew` == "" ]] ; then
     exit 1
 fi
 
+set -ex
 
 if [[ "${DO_BREW_UPDATE:=0}" != "0" ]] ; then
     brew update >/dev/null
@@ -27,42 +28,38 @@ echo ""
 echo "Before my brew installs:"
 brew list --versions
 
-# All cases except for clang-format target, we need the dependencies.
-brew install --display-times -q gcc ccache cmake ninja || true
-brew link --overwrite gcc
-brew install --display-times -q python@${PYTHON_VERSION} || true
-brew unlink python@3.8 || true
-brew unlink python@3.9 || true
-brew unlink python@3.10 || true
-brew link --overwrite --force python@${PYTHON_VERSION} || true
-#brew upgrade --display-times -q cmake || true
-#brew install --display-times -q libtiff
-brew install --display-times -q imath openexr opencolorio
-#brew install --display-times -q libpng giflib webp
-brew install --display-times -q jpeg-turbo openjpeg libultrahdr
-brew install --display-times -q freetype libraw dcmtk pybind11 numpy || true
-brew install --display-times -q ffmpeg libheif ptex || true
-brew install --display-times -q tbb || true
-brew install --display-times -q openvdb || true
-brew install --display-times -q robin-map || true
-if [[ "${USE_OPENCV}" != "0" ]] && [[ "${INSTALL_OPENCV:=1}" != "0" ]] ; then
-    brew install --display-times -q opencv || true
-fi
-if [[ "${USE_QT:=1}" != "0" ]] && [[ "${INSTALL_QT:=1}" != "0" ]] ; then
-    brew install --display-times -q qt${QT_VERSION}
-fi
-if [[ "${USE_LLVM:=0}" != "0" ]] || [[ "${LLVMBREWVER}" != "" ]]; then
-    brew install --display-times -q llvm${LLVMBREWVER}
-    export PATH=/usr/local/opt/llvm/bin:$PATH
+if [[ "$OIIO_BREW_INSTALL_PACKAGES" == "" ]] ; then
+    OIIO_BREW_INSTALL_PACKAGES=" \
+        ccache \
+        dcmtk \
+        ffmpeg \
+        imath \
+        libheif \
+        libraw \
+        libultrahdr \
+        numpy \
+        opencolorio \
+        openexr \
+        openjpeg \
+        openvdb \
+        ptex \
+        pybind11 \
+        robin-map \
+        tbb \
+        "
+    if [[ "${USE_OPENCV}" != "0" ]] && [[ "${INSTALL_OPENCV:=1}" != "0" ]] ; then
+        OIIO_BREW_INSTALL_PACKAGES+=" opencv"
+    fi
+    if [[ "${USE_QT:=1}" != "0" ]] && [[ "${INSTALL_QT:=1}" != "0" ]] ; then
+        OIIO_BREW_INSTALL_PACKAGES+=" qt${QT_VERSION}"
+    fi
 fi
+brew install --display-times -q $OIIO_BREW_INSTALL_PACKAGES $OIIO_BREW_EXTRA_INSTALL_PACKAGES || true
 
 echo ""
 echo "After brew installs:"
 brew list --versions
 
-# Needed on some systems
-pip${PYTHON_VERSION} install numpy
-
 # Set up paths. These will only affect the caller if this script is
 # run with 'source' rather than in a separate shell.
 export PATH=/usr/local/opt/qt5/bin:$PATH

src/libutil/filesystem.cpp

@@ -330,8 +330,15 @@ Filesystem::path_is_absolute(string_view path, bool dot_is_absolute)
 bool
 Filesystem::exists(string_view path) noexcept
 {
+#ifdef _WIN32
+    // filesystem::exists is slow on Windows for network paths, so use the
+    // WinAPI directly
+    return INVALID_FILE_ATTRIBUTES
+           != GetFileAttributesW(Strutil::utf8_to_utf16wstring(path).c_str());
+#else
     error_code ec;
     return filesystem::exists(u8path(path), ec);
+#endif
 }