math/saga: Configure did not find OpenCV headers
ClosedPublic
Actions

Authored by rhurlin on Oct 2 2020, 5:58 PM.

Details

Reviewers

arrowd
tcberner

Commits

rP551288: math/saga: Configure not finding OpenCV headers

Summary

Because of a change in the sources[1], that I missed before, the ports Makefile did not find the opencv header files any more. As a result the OpenCV module will not be build.

[1] SAGA GIS opencv version 4 support: https://sourceforge.net/p/saga-gis/code/ci/1a4b6df792186480953f4fb20474f16b328a9a5c/

While here, remove not needed, OpenMP related, post-patch of configure files. These files are patched now via files/patch-configure.ac.

Bump portrevision to get a more functional SAGA GIS.

Tested on Poudriere. 'portlint -AC' is fine.

Diff Detail

Repository

rP FreeBSD ports repository

Lint

No Lint Coverage

Unit

No Test Coverage

Build Status

Buildable 33952
Build 31147: arc lint + arc unit

Event Timeline

rhurlin created this revision.Oct 2 2020, 5:58 PM

Herald added a subscriber: mat. · View Herald TranscriptOct 2 2020, 5:58 PM

rhurlin requested review of this revision.Oct 2 2020, 5:58 PM

Harbormaster completed remote builds in B33951: Diff 77790.Oct 2 2020, 5:58 PM

rhurlin edited the summary of this revision. (Show Details)Oct 2 2020, 6:00 PM

tcberner added inline comments.Oct 2 2020, 7:20 PM

math/saga/Makefile
92–93	^could you do this in a proper patch? There does not seem to be a reason to use a sed-call here. sed-calls should only be used for dynamic patching, if the patch is static, prefer a patch in files/. If I overlook something, let me know :)

Convert sed replacement to proper patch file.

Thanks Tobias, for the hint.
While I searched for a solution to find the OpenCV headers, I overlooked the next step to create a real patch file.

Should be done now ;)

Harbormaster completed remote builds in B33952: Diff 77799.Oct 2 2020, 7:46 PM

Thanks :)

Dumb question: it's looking for opencv4, I would assume as it wants opencv-4.x and not what we have opencv-3.x -- is it really working?

mfg Tobias

In D26645#593660, @tcberner wrote:

Dumb question: it's looking for opencv4, I would assume as it wants opencv-4.x and not what we have opencv-3.x -- is it really working?

I just tested again with some simple datasets. And yes, it seems to work as expected.

Obviously there is some code in SAGA GIS to handle older API. The hint in the according SAGA GIS commit[1] "using previous version will need manual editing of Makefile.am (change 'opencv4' to 'opencv3'!?)" would otherwise also make little sense ...

[1] https://sourceforge.net/p/saga-gis/code/ci/1a4b6df792186480953f4fb20474f16b328a9a5c/

Thank you for thinking your way into this :)

LGTM then :)

I will look at updating opencv to 4.x

This revision is now accepted and ready to land.Oct 3 2020, 9:17 AM

Nice to hear. I just mentioned you already took the port from pool.

Closed by commit rP551288: math/saga: Configure not finding OpenCV headers (authored by rhurlin). · Explain WhyOct 3 2020, 9:51 AM

This revision was automatically updated to reflect the committed changes.

rhurlin added a commit: rP551288: math/saga: Configure not finding OpenCV headers.