Bug 279528 - graphics/blender: sort out Makefile, pet portclippy
Summary: graphics/blender: sort out Makefile, pet portclippy
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Some People
Assignee: Vladimir Druzenko
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2024-06-04 18:56 UTC by Vladimir Druzenko
Modified: 2024-06-09 16:41 UTC (History)
1 user (show)

See Also:
FreeBSD: maintainer-feedback+


Attachments
v1 (42.39 KB, patch)
2024-06-04 18:56 UTC, Vladimir Druzenko
vvd: maintainer-approval?
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Vladimir Druzenko freebsd_committer freebsd_triage 2024-06-04 18:56:41 UTC
Created attachment 251225 [details]
v1

Updating port options and dependencies in preparation for updating to 4.1.1.

Tested build in poudriere (testport) and on live system 13.3 amd64.
Tested build with all options ON (except HEADLESS and broken USD) and with all options OFF.
Comment 1 Shane 2024-06-05 11:09:45 UTC
My only question would be why remove some options?

I can see some have been removed from the projects CMakeLists.txt.

DDS, HDR, OPENIMAGEIO and TIFF are still valid build options. While I don't personally see any point in disabling them, I don't know of a reason to force them to always be on.
Comment 2 Vladimir Druzenko freebsd_committer freebsd_triage 2024-06-05 15:42:26 UTC
(In reply to Shane from comment #1)
I did't find options DDS, HDR, OPENIMAGEIO.
DDS:
$ grep -R DDS /usr/ports/graphics/blender/work/blender-4.0.2 | grep -i cmake | wc -l
0
grep -R WITH_IMAGE_DDS /usr/ports/graphics/blender/work/blender-4.0.2 | wc -l
0

HDR:
$ rep -R HDR /usr/ports/graphics/blender/work/blender-4.0.2 | grep -i cmake | grep -v extern/audaspace/CMakeLists.txt | wc -l
0
grep -R WITH_IMAGE_HDR /usr/ports/graphics/blender/work/blender-4.0.2 | wc -l
0

OPENIMAGEIO:
$ grep -R WITH_OPENIMAGEIO /usr/ports/graphics/blender/work/blender-4.0.2
/usr/ports/graphics/blender/work/blender-4.0.2/build_files/cmake/platform/platform_old_libs_update.cmake:  if(WITH_OPENIMAGEIO)
$ grep -R platform_old_libs_update.cmake /usr/ports/graphics/blender/work/blender-4.0.2 | wc -l
0

TIFF is "almost" mandatory:
build_files/cmake/platform/platform_unix.cmake (107):
find_package_wrapper(JPEG REQUIRED)
find_package_wrapper(PNG REQUIRED)
find_package_wrapper(ZLIB REQUIRED)
find_package_wrapper(Zstd REQUIRED)
find_package_wrapper(Epoxy REQUIRED)

# XXX Linking errors with debian static tiff :/
# find_package_wrapper(TIFF REQUIRED)
find_package(TIFF)
Comment 3 Vladimir Druzenko freebsd_committer freebsd_triage 2024-06-05 15:48:27 UTC
So as not to forget I am writing here: try WITH_HYDRA (require USD) after upstream fix build USD with OneTBB.
Comment 4 Shane 2024-06-06 09:06:17 UTC
(In reply to Vladimir Druzenko from comment #2)

Actually my bad, I managed to be looking in an old branch.
Comment 5 Vladimir Druzenko freebsd_committer freebsd_triage 2024-06-06 14:07:39 UTC
Check this plz too: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=279498
Comment 6 commit-hook freebsd_committer freebsd_triage 2024-06-09 16:40:55 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=4d1c6bfa5ec6b7039402b8a926c3c62a18d5675b

commit 4d1c6bfa5ec6b7039402b8a926c3c62a18d5675b
Author:     Vladimir Druzenko <vvd@FreeBSD.org>
AuthorDate: 2024-06-09 16:24:20 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2024-06-09 16:40:00 +0000

    graphics/blender: sort out Makefile, pet portclippy

    - Remove removed and add new added by ustream build options.
    - Remove unused dependencies, unbundle EIGEN3 and LZO.
    - Fix IMLIES - make same as in upstream's CMakeLists.txt.
    - Make graphics/openimageio and graphics/tiff mandatory same as in upstream.
    - Adjust allowed ARCHS and OPTIONS_DEFAULT_* for allowed ARCHS.
    - Fix whitespaces in OPTIONS_DEFINE and OPTIONS_DEFAULT.
    - Pet portclippy and other small changes.

    PR:             279528
    Approved by:    Shane <FreeBSD@ShaneWare.Biz> (maintaner)

 graphics/blender/Makefile                          | 187 ++++++++--------
 graphics/blender/Makefile.options                  |  91 ++++----
 graphics/blender/files/patch-CMakeLists.txt        |   4 +-
 .../files/patch-intern_cycles_CMakeLists.txt       |   4 +-
 .../patch-intern_cycles_kernel_osl_CMakeLists.txt  |   4 +-
 ...intern_locale_boost__locale__wrapper.cpp (gone) |  17 --
 ...com_gltf2__io__draco__compression__extension.py |   4 +-
 graphics/blender/pkg-plist                         | 244 ++++++++++-----------
 8 files changed, 257 insertions(+), 298 deletions(-)