Skip to content

Commit 91df124

Browse files
committed
Update deps versions
1 parent 5ce747c commit 91df124

File tree

6 files changed

+23
-16
lines changed

6 files changed

+23
-16
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ jobs:
2828
strategy:
2929
fail-fast: False
3030
matrix:
31-
os: [ubuntu-latest, windows-latest, macos-13, macos-14]
31+
os: [ubuntu-latest, windows-latest, macos-15-intel, macos-15]
32+
#os: [macos-15-intel, macos-15]
3233
env:
3334
BUILD_TYPE: Release
3435
# SANITIZE: true # uncomment to sanitize

conan-profiles/conan-profile-common

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ openimageio/*:with_libwebp=True
4141
openimageio/*:with_tbb=True
4242
openimageio/*:with_libjpeg=libjpeg-turbo
4343

44+
libultrahdr/*:with_jpeg=libjpeg-turbo
45+
4446
# boost/*:without_atomic=True
4547
boost/*:without_charconv=True
4648
# boost/*:without_chrono=True

conanfile.py

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,32 +11,32 @@
1111

1212
# Gather here the various dependency versions, for convenience
1313
# (in alphabetic order)
14-
BOOST_VERSION = "1.87.0"
15-
EIGEN_VERSION = "3.4.0"
14+
BOOST_VERSION = "1.88.0"
15+
EIGEN_VERSION = "5.0.0"
1616
EMBREE_VERSION = "4.3.3"
17-
FMT_VERSION = "11.2.0"
17+
FMT_VERSION = "12.0.0"
1818
GLFW_VERSION = "3.4"
19-
IMATH_VERSION = "3.1.12"
20-
IMGUI_VERSION = "1.91.8"
19+
IMATH_VERSION = "3.2.1"
20+
IMGUI_VERSION = "1.92.4"
2121
IMGUIFILEDIALOG_VERSION = "0.6.7"
2222
JSON_VERSION = "3.12.0"
2323
LIBDEFLATE_VERSION = "1.23"
24-
LIBICONV_VERSION = "1.17"
24+
LIBICONV_VERSION = "1.18"
2525
LLVM_OPENMP_VERSION = "17.0.6"
2626
MINIZIP_VERSION = "4.0.7"
27-
NINJA_VERSION = "1.12.1"
27+
NINJA_VERSION = "1.13.1"
2828
NVRTC_VERSION = "12.8.93"
29-
OCIO_VERSION = "2.4.2"
30-
OIIO_VERSION = "2.5.18.0"
29+
OCIO_VERSION = "2.5.0"
30+
OIIO_VERSION = "3.1.6.2"
3131
OIDN_VERSION = "2.3.3"
3232
OPENEXR_VERSION = "3.3.5"
3333
OPENSUBDIV_VERSION = "3.6.0"
3434
OPENVDB_VERSION = "11.0.0"
35-
PYBIND11_VERSION = "2.13.6"
35+
PYBIND11_VERSION = "3.0.1"
3636
ROBINHOOD_VERSION = "3.11.5"
37-
SPDLOG_VERSION = "1.15.3"
38-
TBB_VERSION = "2022.0.0"
39-
XAPIAN_CORE_VERSION = "1.4.19"
37+
SPDLOG_VERSION = "1.16.0"
38+
TBB_VERSION = "2022.2.0"
39+
XAPIAN_CORE_VERSION = "1.4.24"
4040
ZSTD_VERSION = "1.5.7"
4141

4242

local-conan-recipes/imguifiledialog/conanfile.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class ImguiFileDialogConan(ConanFile):
2828
"fPIC": True,
2929
"use_std_filesystem": True,
3030
}
31-
requires = "imgui/1.91.8"
31+
requires = "imgui/1.92.4"
3232

3333

3434
def config_options(self):

local-conan-recipes/oidn/conanfile.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
from conan.tools.scm import Git
1212

1313
# Gather here the various dependency versions, for convenience
14-
TBB_VERSION = "2022.0.0"
14+
TBB_VERSION = "2022.2.0"
1515

1616
class OidnConan(ConanFile):
1717
name = "oidn"

run-conan.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,10 @@ echo "::endgroup::"
5454
# and which ones use precompiled binaries (remote=conancenter)
5555
echo "::group::CIBW_BEFORE_BUILD: local recipes index repository"
5656
git clone https://github.com/conan-io/conan-center-index
57+
cd conan-center-index
58+
git reset --hard 73bae27b468ae37f5bacd4991d1113aefcf23b2b
59+
git clean -df # cleans any untracked files/folders
60+
cd ..
5761
conan remote add mycenter ./conan-center-index
5862
echo "::endgroup::"
5963

0 commit comments

Comments
 (0)