Skip to content

Commit 4144044

Browse files
committed
vfx2024 openimageio and vfx2024-2025 PySide
- add GNU ftp mirrors for libiconv - openimageio builds in vfx2024 - PySide builds on vfx2024/2025 (missing Conan environment overrides) Signed-off-by: Jean-Francois Panisset <[email protected]>
1 parent 1c60993 commit 4144044

File tree

9 files changed

+614
-10
lines changed

9 files changed

+614
-10
lines changed

CHANGELOG.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ consumers of these new images.
3131
- opensubdiv 3.6.1 (was 3.6.0)
3232
- python 3.11.13 (was 3.11.11)
3333
- Qt 6.5.6 (was 6.5.4)
34-
- OIIO 2.5.19.0 (was 2.5.18.0)
34+
- OIIO 2.5.19.0 (was 2.5.16.0)
3535
- OpenFX 1.5s (new)
3636
- PySide 6.5.6 (was 6.5.4)
3737
- rawtoaces 1.1-rc3 (new)
38-
- 2025.2
38+
- 2025.2 release
3939
- updated versions
4040
- Conan 2.18.1 (was 2.14.0)
4141
- Ninja 1.13.1 (was 1.12.1)

packages/conan/recipes/libiconv/conandata.yml

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,24 @@
66

77
sources:
88
"1.18":
9-
url: "https://ftp.gnu.org/gnu/libiconv/libiconv-1.18.tar.gz"
9+
url:
10+
- "https://ftpmirror.gnu.org/gnu/libiconv/libiconv-1.18.tar.gz"
11+
- "https://ftp.gnu.org/gnu/libiconv/libiconv-1.18.tar.gz"
1012
sha256: "3b08f5f4f9b4eb82f151a7040bfd6fe6c6fb922efe4b1659c66ea933276965e8"
1113
"1.17":
12-
url: "https://ftp.gnu.org/gnu/libiconv/libiconv-1.17.tar.gz"
14+
url:
15+
- "https://ftpmirror.gnu.org/gnu/libiconv/libiconv-1.17.tar.gz"
16+
- "https://ftp.gnu.org/gnu/libiconv/libiconv-1.17.tar.gz"
1317
sha256: "8f74213b56238c85a50a5329f77e06198771e70dd9a739779f4c02f65d971313"
1418
"1.16":
15-
url: "https://ftp.gnu.org/gnu/libiconv/libiconv-1.16.tar.gz"
19+
url:
20+
- "https://ftpmirror.gnu.org/gnu/libiconv/libiconv-1.16.tar.gz"
21+
- "https://ftp.gnu.org/gnu/libiconv/libiconv-1.16.tar.gz"
1622
sha256: "e6a1b1b589654277ee790cce3734f07876ac4ccfaecbee8afa0b649cf529cc04"
1723
"1.15":
18-
url: "https://ftp.gnu.org/gnu/libiconv/libiconv-1.15.tar.gz"
24+
url:
25+
- "https://ftpmirror.gnu.org/gnu/libiconv/libiconv-1.15.tar.gz"
26+
- "https://ftp.gnu.org/gnu/libiconv/libiconv-1.15.tar.gz"
1927
sha256: "ccf536620a45458d26ba83887a983b96827001e92a13847b45e4925cc8913178"
2028
patches:
2129
"1.16":

packages/conan/recipes/oiio/conandata.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,12 @@ patches:
8585
patch_description: "Ensure project builds correctly with Conan (don't pick up disabled dependencies from the system, fix different spelling of libraries)"
8686
patch_type: "conan"
8787
"2.5.19.0":
88-
- patch_file: "patches/2.5.17.0-cmake-targets.patch"
88+
- patch_file: "patches/2.5.19.0-cmake-targets.patch"
8989
patch_description: "Ensure project builds correctly with Conan (don't pick up disabled dependencies from the system, fix different spelling of libraries)"
9090
patch_type: "conan"
91+
- patch_file: "patches/2.5.19.0-raw-jp2k-cmake.patch"
92+
patch_description: "Find local builds of LibRaw, OpenJPEG"
93+
patch_type: "conan"
9194
"3.0.4.0":
9295
- patch_file: "patches/3.0.4.0-cmake-fmt.patch"
9396
patch_description: "Deal with generator expression from fmt Conan package"

0 commit comments

Comments
 (0)