From 82b24421a1eb824541a69d2364002213af92fddd Mon Sep 17 00:00:00 2001 From: Jan Kleinert Date: Thu, 11 Dec 2025 15:49:45 +0100 Subject: [PATCH 1/3] rebuild opencascade and pythonocc --- opencascade-static/meta.yaml | 6 +++--- opencascade/meta.yaml | 6 +++--- python-occ-7x/meta.yaml | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/opencascade-static/meta.yaml b/opencascade-static/meta.yaml index 5618a80..3b2390e 100644 --- a/opencascade-static/meta.yaml +++ b/opencascade-static/meta.yaml @@ -16,7 +16,7 @@ source: - oceonly-freeimage_staticlib_support.patch build: - number: 7 + number: 8 detect_binary_files_with_prefix: True requirements: @@ -33,8 +33,8 @@ requirements: - ninja host: - libglu # [linux] - - freetype-static ==2.6.5 - - freeimageplus-static ==3.18.0 + - freetype-static ==2.14.1 + - freeimage-static ==3.18.0 - tbb - tbb-devel - python diff --git a/opencascade/meta.yaml b/opencascade/meta.yaml index 5590d69..339621a 100644 --- a/opencascade/meta.yaml +++ b/opencascade/meta.yaml @@ -15,7 +15,7 @@ source: - dlr-feature-coons_c2.patch build: - number: 0 + number: 1 detect_binary_files_with_prefix: True requirements: @@ -32,7 +32,7 @@ requirements: - ninja host: - libglu # [linux] - - freeimageplus + - freeimage - tbb ==2019.5 - tbb-devel ==2019.5 - python @@ -41,7 +41,7 @@ requirements: - fontconfig # [unix] run: - - freeimageplus + - freeimage - tbb ==2019.5 - freetype - six diff --git a/python-occ-7x/meta.yaml b/python-occ-7x/meta.yaml index 1d9e2d7..a828476 100644 --- a/python-occ-7x/meta.yaml +++ b/python-occ-7x/meta.yaml @@ -11,7 +11,7 @@ source: - 0001-DLR-patch-to-support-c2-continous-coons-patches.patch build: - number: 1 + number: 2 binary_relocation: false [osx] requirements: From dca443a1239f876157aea1ecd4bba06f44ed1233 Mon Sep 17 00:00:00 2001 From: Jan Kleinert Date: Mon, 15 Dec 2025 12:34:30 +0100 Subject: [PATCH 2/3] rebuild freeimage, don't build pythonocc (just yet) --- freeimage/meta.yaml | 2 +- python-occ-7x/meta.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/freeimage/meta.yaml b/freeimage/meta.yaml index bfa4f4f..f4fae42 100644 --- a/freeimage/meta.yaml +++ b/freeimage/meta.yaml @@ -32,7 +32,7 @@ source: - path: FreeImageConfig-static.h build: - number: 24 + number: 4 run_exports: - {{ pin_subpackage(name, max_pin='x.x') }} diff --git a/python-occ-7x/meta.yaml b/python-occ-7x/meta.yaml index a828476..1d9e2d7 100644 --- a/python-occ-7x/meta.yaml +++ b/python-occ-7x/meta.yaml @@ -11,7 +11,7 @@ source: - 0001-DLR-patch-to-support-c2-continous-coons-patches.patch build: - number: 2 + number: 1 binary_relocation: false [osx] requirements: From 872f2346bb7980865b0a7cf767b39adcadcfe451 Mon Sep 17 00:00:00 2001 From: Jan Kleinert Date: Mon, 15 Dec 2025 13:41:23 +0100 Subject: [PATCH 3/3] change download link for opencascade --- opencascade-static/meta.yaml | 5 ++--- opencascade/meta.yaml | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/opencascade-static/meta.yaml b/opencascade-static/meta.yaml index 3b2390e..43e088c 100644 --- a/opencascade-static/meta.yaml +++ b/opencascade-static/meta.yaml @@ -6,9 +6,8 @@ package: version: {{ version }} source: - fn: {{ name }}-{{ version }}.tar.gz - url: http://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h={{ commit }};sf=tgz - sha256: 9f7285acdfe63754955dfba1114010d5f273ac2be189c9717c4228bb28fd675f + url: https://github.com/Open-Cascade-SAS/OCCT/archive/refs/tags/{{ commit }}.tar.gz + sha256: dea04077d71507c666aaa7ccaeacc73ab580d6572d7f75e90a1984c4c0302a7a patches: - fix-invalid-conversion.patch # https://github.com/Open-Cascade-SAS/OCCT/discussions/48 - fix-private-linking.patch diff --git a/opencascade/meta.yaml b/opencascade/meta.yaml index 339621a..f409d5f 100644 --- a/opencascade/meta.yaml +++ b/opencascade/meta.yaml @@ -6,9 +6,8 @@ package: version: {{ version }} source: - fn: {{ name }}-{{ version }}.tar.gz - url: http://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h={{ commit }};sf=tgz - sha256: 9f7285acdfe63754955dfba1114010d5f273ac2be189c9717c4228bb28fd675f + url: https://github.com/Open-Cascade-SAS/OCCT/archive/refs/tags/{{ commit }}.tar.gz + sha256: dea04077d71507c666aaa7ccaeacc73ab580d6572d7f75e90a1984c4c0302a7a patches: - fix-invalid-conversion.patch # https://github.com/Open-Cascade-SAS/OCCT/discussions/48 - fix-private-linking.patch