Skip to content

Commit 22e17a7

Browse files
committed
OSL builds with OptiX, improve Conan package instalation
- OSL now builds with OptiX, includes patch for C++20 - install_conanpackages.sh uses full_deploy generator to install all transitive dependencies Signed-off-by: Jean-Francois Panisset <panisset@gmail.com>
1 parent 0f11de7 commit 22e17a7

File tree

51 files changed

+487
-2761
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+487
-2761
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
44

55
# 2025-07-XX
66

7+
These releases no longer build / install libraries in `/usr/local/lib64`, they revert back to the default
8+
`/usr/local/lib` supported by most packages and Conan recipes. This should hopefully be transparent to
9+
consumers of these new images.
10+
711
- 2024.3 release
812
- using Conan 2 recipes
913
- updated versions
@@ -46,6 +50,7 @@ All notable changes to this project will be documented in this file.
4650
- OpenFX 1.5s
4751
- OSL 1.14.6.0 (was 1.14.5.1)
4852
- PySide 6.5.6 (was 6.5.4)
53+
- USD 25.05.01 (was 25.05)
4954
- 2026.0
5055
- pre-release for testing purposes, does not yet include late releasing ASWF packages in final 2026 release (OOCIO, OpenEXR, OpenVDB)
5156
- see `ci_common6` and `2026` sections of `versions.yaml` for full list of package versions
@@ -64,6 +69,7 @@ All notable changes to this project will be documented in this file.
6469
with keeping recipes up to date
6570
- merge upstream recipe changes, in particular changes for CMake 4 compatibility
6671
- `--keep_source` and `--keep_build` command line options are obsolete, no longer relevant with Conan 2
72+
- install_conanpackages.sh script update to use the Conan full_deploy generator which can deploy all transitive dependencies for a package in one call, mimizing the need to include dependencies in the image.yaml sources for the ci-foo containers
6773

6874
# 2025-05-04
6975

ci-base/Dockerfile

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ci-baseqt/Dockerfile

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ci-common/Dockerfile

Lines changed: 7 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ci-common/README.md

Lines changed: 18 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ci-common/image.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ packages:
88
- ninja
99
implicit_packages:
1010
- cuda
11+
- optix
1112
- glvnd
1213
- ccache
1314
- dts
@@ -48,8 +49,8 @@ docker_commands: |
4849
RUN mkdir /opt/aswf
4950
WORKDIR /opt/aswf
5051
51-
ENV LD_LIBRARY_PATH=/usr/local/lib:/usr/local/lib64:/opt/rh/httpd24/root/usr/lib64:/opt/rh/${ASWF_DTS_PREFIX}-${ASWF_DTS_VERSION}/root/usr/lib64:/opt/rh/${ASWF_DTS_PREFIX}-${ASWF_DTS_VERSION}/root/usr/lib:${LD_LIBRARY_PATH} \
52-
PATH=/opt/rh/rh-git218/root/usr/bin:/usr/local/bin:/opt/rh/${ASWF_DTS_PREFIX}-${ASWF_DTS_VERSION}/root/usr/bin:/opt/app-root/src/bin:/opt/rh/${ASWF_DTS_PREFIX}-${ASWF_DTS_VERSION}/root/usr/bin/:/usr/local/sbin:/usr/sbin:/usr/bin:/sbin:/bin \
52+
ENV LD_LIBRARY_PATH=/usr/local/lib:/opt/rh/${ASWF_DTS_PREFIX}-${ASWF_DTS_VERSION}/root/usr/lib64:/opt/rh/${ASWF_DTS_PREFIX}-${ASWF_DTS_VERSION}/root/usr/lib:${LD_LIBRARY_PATH} \
53+
PATH=/usr/local/bin:/opt/rh/${ASWF_DTS_PREFIX}-${ASWF_DTS_VERSION}/root/usr/bin:/opt/app-root/src/bin:/opt/rh/${ASWF_DTS_PREFIX}-${ASWF_DTS_VERSION}/root/usr/bin/:/usr/local/sbin:/usr/sbin:/usr/bin:/sbin:/bin \
5354
PERL5LIB=/opt/rh/rh-git218/root/usr/share/perl5/vendor_perl \
5455
MANPATH=/opt/rh/rh-git218/root/usr/share/man
5556

0 commit comments

Comments
 (0)