Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@ jobs:
batched: b8_AVX2,b8_AVX512,b16_AVX512
setenvs: export LIBTIFF_VERSION=v4.7.1
PTEX_VERSION=v2.4.3
PUGIXML_VERSION=v1.15
PUGIXML_VERSION=v1.16
FREETYPE_VERSION=VER-2-14-3
- desc: latest releases clang18/C++17 llvm18 oiio-rel exr3.4 py3.12 avx2 batch-b16avx512
nametag: linux-latest-releases
Expand All @@ -349,7 +349,7 @@ jobs:
batched: b8_AVX2,b8_AVX512,b16_AVX512
setenvs: export LIBTIFF_VERSION=v4.7.1
PTEX_VERSION=v2.4.3
PUGIXML_VERSION=v1.15
PUGIXML_VERSION=v1.16
FREETYPE_VERSION=VER-2-14-3
- desc: bleeding edge gcc14/C++17 llvm17 oiio/ocio/exr/pybind-main py3.12 avx2 batch-b16avx512
nametag: linux-bleeding-edge
Expand All @@ -369,7 +369,6 @@ jobs:
batched: b8_AVX2,b8_AVX512,b16_AVX512
setenvs: export PUGIXML_VERSION=master
PTEX_VERSION=v2.4.3
PUGIXML_VERSION=v1.15
FREETYPE_VERSION=VER-2-14-3
OpenImageIO_DEPENDENCY_BUILD_ALLOW_UNVERIFIED_TAGS=ON
- desc: clang14/C++17 llvm14 py3.10 avx2 batch-b16avx512
Expand Down Expand Up @@ -556,7 +555,7 @@ jobs:
openimageio_ver: release
skip_tests: 1
setenvs: export OSL_CMAKE_FLAGS="-DUSE_LLVM_BTCODE=ON"
PUGIXML_VERSION=v1.14
PUGIXML_VERSION=v1.16
OpenImageIO_BUILD_MISSING_DEPS="Freetype;TIFF;libdeflate;libjpeg-turbo"
LLVM_GOOGLE_DRIVE_ID="1uy7PNVlTQ-H56unXGOS6siRWtNcdS1J7"

Expand Down
2 changes: 1 addition & 1 deletion INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ NEW or CHANGED minimum dependencies since the last major release are **bold**.
Note that on some MacOS/xcode releases, the system-installed Bison is too
old, and it's better to install a newer Bison (via Homebrew is one way to
do this easily).
* [PugiXML](http://pugixml.org/) >= 1.8 (we have tested through 1.15).
* [PugiXML](http://pugixml.org/) >= 1.8 (we have tested through 1.16).
* (optional) [Partio](https://www.disneyanimation.com/technology/partio.html)
If it is not found at build time, the OSL `pointcloud` functions will not
be operative.
Expand Down
2 changes: 1 addition & 1 deletion src/build-scripts/build_pugixml.bash
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ set -ex

# Repo and branch/tag/commit of pugixml to download if we don't have it yet
PUGIXML_REPO=${PUGIXML_REPO:=https://github.com/zeux/pugixml.git}
PUGIXML_VERSION=${PUGIXML_VERSION:=v1.11.4}
PUGIXML_VERSION=${PUGIXML_VERSION:=v1.16}

LOCAL_DEPS_DIR=${LOCAL_DEPS_DIR:=${PWD}/ext}
PUGIXML_SOURCE_DIR=${PUGIXML_SOURCE_DIR:=${LOCAL_DEPS_DIR}/pugixml}
Expand Down
Loading