Bug 275402
| Summary: | graphics/opencolorio: Udpate to 2.3.2 | ||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|
| Product: | Ports & Packages | Reporter: | Loïc Bartoletti <lbartoletti> | ||||||||
| Component: | Individual Port(s) | Assignee: | Vladimir Druzenko <vvd> | ||||||||
| Status: | Closed FIXED | ||||||||||
| Severity: | Affects Some People | CC: | FreeBSD, agh, fernape, fluffy, vvd | ||||||||
| Priority: | --- | Flags: | FreeBSD:
maintainer-feedback+
|
||||||||
| Version: | Latest | ||||||||||
| Hardware: | Any | ||||||||||
| OS: | Any | ||||||||||
| Bug Depends on: | |||||||||||
| Bug Blocks: | 275303, 275819 | ||||||||||
| Attachments: |
|
||||||||||
^Triage: reporter is committer, assign accordingly. "Shane" is it ok for you? I marked it as approved last week. (In reply to Shane from comment #3) AFAIK, there is no "approved" on bugzilla. The '+' is for maintainer-feedback but not for "approved". But, anyway, thanks! So far, my experience has been that a + for maintainer feedback for the bug has been taken as approval. There is the ability to approve attachments, but bug poster has to request approval before anyone else is able to change that - see bug #233924 (In reply to Loïc Bartoletti from comment #0) Loic, you have provided a slightly wrong patch. docs shound be in docs plist, not common BTW, I've have a 2.3.1 update https://people.freebsd.org/~fluffy/-patches/0001-graphics-opencolorio-update-to-2.3.1-release.patch Created attachment 247025 [details]
graphics/opencolorio: update to 2.3.1 release
Indeed, and fyi, Shane, you have to upgrade blender to 4.x. Blender 3 doesn't compile with opencolorio 2.3. Thanks. (In reply to Loïc Bartoletti from comment #8) Loic, Shane, jfui: I've working on blender4 and have blender 3.6.7 prepared too if anyone interested https://people.freebsd.org/~fluffy/-patches/0001-graphics-blender-update-to-3.6.7-release.patch (In reply to Dima Panov from comment #9) also openimegeio, openshadinglanguage, opensubdiv https://people.freebsd.org/~fluffy/-patches/0001-graphics-openimageio-update-to-2.5.6.0-release.patch https://people.freebsd.org/~fluffy/-patches/0001-graphics-openshadinglanguage-update-to-1.12.14.0-rel.patch https://people.freebsd.org/~fluffy/-patches/0001-graphics-opensubdiv-update-to-3.6.0-release.patch related updates for blender and dependencies: devel/robin-map bug #275817 graphics/opensubdiv bug #275821 graphics/openimageio bug #275818 graphics/openshadinglanguage bug #275822 graphics/blender bug #275819 Commit? (In reply to Vladimir Druzenko from comment #12) Needs minizip-ng first https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=275303 (In reply to Dima Panov from comment #13) Should be committed at same time, since opencolorio requires minizip-ng, but opencolorio will be broken (a few days) with the new version of minizip-ng, right? (In reply to Loïc Bartoletti from comment #14) yep. ping me as you're be ready. here or via telegram (https://t.me/FluffyBSD) Created attachment 249571 [details] Update to 2.3.2 Update to 2.3.2: - Drop ${OPTIONS_DEFAULT} as the Ports framework already marks DOCS as default - Replace pkg-plist-docs with ${DOCS_PORTDOCS}, add static patch to fix installation directory, add post-patch target, and remove post-install-DOCS-on target https://github.com/AcademySoftwareFoundation/OpenColorIO/compare/v2.2.1...v2.3.2 [TESTPORT] main-amd64-current: PASS [TESTPORT] 13_2-amd64-release: PASS [TESTPORT] 13_3-amd64-release: PASS [TESTPORT] 13_3-i386-release: PASS [TESTPORT] 14_0-amd64-release: PASS [TESTPORT] main-i386-current: FAIL [TESTPORT] 13_2-i386-release: FAIL [TESTPORT] 14_0-i386-release: FAIL Previous tests in comment #6 were against archivers/minizip-ng-4.0.5 (bug #275303) Tested consumers of graphics/opencolorio-2.3.2 with archivers/minizip-ng-4.0.5: [TESTPORT] poudriere-testport graphics/krita: [TESTPORT] main-amd64-current: PASS [TESTPORT] 13_2-amd64-release: PASS [TESTPORT] 13_3-amd64-release: PASS [TESTPORT] 13_3-i386-release: PASS [TESTPORT] 14_0-amd64-release: PASS [TESTPORT] main-i386-current: FAIL [TESTPORT] 13_2-i386-release: FAIL [TESTPORT] 14_0-i386-release: FAIL [TESTPORT] poudriere-testport graphics/art: [TESTPORT] main-amd64-current: PASS [TESTPORT] 13_2-amd64-release: PASS [TESTPORT] 13_3-amd64-release: PASS [TESTPORT] 13_3-i386-release: PASS [TESTPORT] 14_0-amd64-release: PASS [TESTPORT] main-i386-current: FAIL [TESTPORT] 13_2-i386-release: FAIL [TESTPORT] 14_0-i386-release: FAIL (In reply to Alastair Hogge from comment #18) I'm ok with the other changes with 2.3.2 update. The current port fails on i386 13.2/14.0/main because it can't find zstd, from archivers/zstd. Its odd that 13.3-i386 builds but 14.0-i386 and main-i386 fail. Fixes should happen in main and filter down to 13.3, maybe that means the break has not been merged down to 13 yet. Update of blender and all dependencies in one patch: https://reviews.freebsd.org/D45051 A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=3e51c20bc069008c296e62e3efb6642d143ac255 commit 3e51c20bc069008c296e62e3efb6642d143ac255 Author: Alastair Hogge <agh@riseup.net> AuthorDate: 2024-05-29 20:12:12 +0000 Commit: Vladimir Druzenko <vvd@FreeBSD.org> CommitDate: 2024-05-29 20:26:12 +0000 graphics/{,py-}opencolorio{,-tools}: Udpate to 2.3.2 Changelogs: https://github.com/AcademySoftwareFoundation/OpenColorIO/releases/tag/v2.3.0 https://github.com/AcademySoftwareFoundation/OpenColorIO/releases/tag/v2.3.1 https://github.com/AcademySoftwareFoundation/OpenColorIO/releases/tag/v2.3.2 PR: 275402 Tested by: fluffy, lbartoletti, vvd Approved by: Shane <FreeBSD@ShaneWare.Biz> (maintaner) graphics/opencolorio-tools/Makefile | 2 +- graphics/opencolorio/Makefile | 4 ++-- graphics/opencolorio/distinfo | 8 +++----- ...-share_cmake_modules_FindExtPackages.cmake (gone) | 20 -------------------- ...tch-share_cmake_modules_Findyaml-cpp.cmake (gone) | 13 ------------- graphics/opencolorio/pkg-plist-docs | 2 ++ graphics/py-opencolorio/Makefile | 2 +- 7 files changed, 9 insertions(+), 42 deletions(-) Thanks! (In reply to Alastair Hogge from comment #16) > [TESTPORT] main-i386-current: FAIL > [TESTPORT] 13_2-i386-release: FAIL > [TESTPORT] 14_0-i386-release: FAIL Can you show more info? For me it build fine in poudriere on 13.2 and 13.3 i386. I don't have 14 yet and can't test (update planed just after release of 14.1: https://www.freebsd.org/releases/14.1R/schedule/). diizzy reported build failure on 14.0 i386:
/wrkdirs/usr/ports/graphics/opencolorio/work/OpenColorIO-2.3.2/src/OpenColorIO/ops/cdl/CDLOpCPU.cpp:339:18: error: always_inline function '_mm_loadu_ps' requires target feature 'sse', but would be inlined into function 'LoadRenderParams' that is compiled without support for 'sse'
slope = _mm_loadu_ps(renderParams.getSlope());
Are you having the same error?
I found - it's typo or renamed option OCIO_USE_SSE: must be OCIO_USE_SSE2.
Patch is obvious and already tested on 13.2 and 13.3 i386:
--- Makefile.orig
+++ Makefile
@@ -44,9 +44,9 @@ PLIST_SUB= SHL3=${PORTVERSION} SHL2=${PORTVERSION:R}
.include <bsd.port.options.mk>
.if (defined(MACHINE_CPU) && ${MACHINE_CPU:Msse2})
-CMAKE_ON+= OCIO_USE_SSE
+CMAKE_ON+= OCIO_USE_SSE2
.else
-CMAKE_OFF+= OCIO_USE_SSE
+CMAKE_OFF+= OCIO_USE_SSE2
.endif
.if ${PORT_OPTIONS:MDOCS}
My previous testport-s work fine with CPUTYPE=core2 and nehalem on all i386.
But fail with CPUTYPE=pentium3 and older and with default CPUTYPE=i486 for ARCH i386.
I'll commit this patch very soon.
This upstream commit: https://github.com/AcademySoftwareFoundation/OpenColorIO/commit/caa20dd1962f0d659a9214ac28815a1b904d4118#diff-1e7de1ae2d059d21e1dd75d5812d5a34b0222cef273b7c3a2af62eb747f9d20a A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=cf58ecc3a65aaf905c0b07af1544ddb19b5af10b commit cf58ecc3a65aaf905c0b07af1544ddb19b5af10b Author: Vladimir Druzenko <vvd@FreeBSD.org> AuthorDate: 2024-05-30 18:21:00 +0000 Commit: Vladimir Druzenko <vvd@FreeBSD.org> CommitDate: 2024-05-30 19:02:17 +0000 graphics/opencolorio: fix build on i386 with CPUTYPE older than pentium4 Fixing build errors such as: /wrkdirs/usr/ports/graphics/opencolorio/work/OpenColorIO-2.3.2/src/OpenColorIO/ops/cdl/CDLOpCPU.cpp:339:18: error: always_inline function '_mm_loadu_ps' requires target feature 'sse', but would be inlined into function 'LoadRenderParams' that is compiled without support for 'sse' slope = _mm_loadu_ps(renderParams.getSlope()); But it build fine with CPUTYPE=pentium4 or newer. Default on i386 is CPUTYPE=i486. Upstream reworked SIMD detection and usage in commit: https://github.com/AcademySoftwareFoundation/OpenColorIO/commit/caa20dd1962f0d659a9214ac28815a1b904d4118#diff-1e7de1ae2d059d21e1dd75d5812d5a34b0222cef273b7c3a2af62eb747f9d20a PR: 275402 Reported by: diizzy (via email) Approved by: portmgr (blanket, fix build) Fixes: 3e51c20bc069 (graphics/{,py-}opencolorio{,-tools}: Udpate to 2.3.2) graphics/opencolorio/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=98ebc5d3c875e9bfb8e17d2e170f5bc6b7722cf8 commit 98ebc5d3c875e9bfb8e17d2e170f5bc6b7722cf8 Author: Vladimir Druzenko <vvd@FreeBSD.org> AuthorDate: 2024-06-01 00:46:20 +0000 Commit: Vladimir Druzenko <vvd@FreeBSD.org> CommitDate: 2024-06-01 00:46:20 +0000 graphics/{,py-}opencolorio{,-tools}: fix plist in py- port after update to 2.3.2 While here pet portclippy and remove unnecessary dependencies. PR: 275402 275494 Reported by: antoine Approved by: portmgr (blanket, fix build) Fixes: 3e51c20bc069 (graphics/{,py-}opencolorio{,-tools}: Udpate to 2.3.2) graphics/opencolorio-tools/Makefile | 4 +-- graphics/opencolorio/Makefile | 48 +++++++++++++++-------------------- graphics/opencolorio/pkg-plist-pyglue | 3 ++- graphics/py-opencolorio/Makefile | 4 +-- 4 files changed, 26 insertions(+), 33 deletions(-) |
Created attachment 246630 [details] graphics/opencolorio: Update to 2.3.0 Hi, Please, this is an update of graphics/opencolorio which is required to bump minizip-ng to the latest version (see #275303). - bump version - remove files/patch-share_cmake_modules_FindExtPackages.cmake - fix pkg-plist