This is a major upgrade from 3.x to 4.x.
Changelog from versions 3.4.1--4.5.1 can be found here:
https://github.com/opencv/opencv/wiki/ChangeLog
Note: this has explicitely not been added as a new graphics/opencv4 port, but replaces the
previous graphics/opencv[3] port. Again, to improve maintainability by not giving ports
the option to pick the "wrong one" - this leads however to some abandoned ports being
broken.
The port has been greatly simplified:
* graphics/opencv-core which existed to enable ffmpeg to depend on opencv, and vice versa
has been removed. ffmpeg no longer can depend on opencv.
* graphics/py-opencv has been integrated into graphics/opencv, the default versions python
bindings will be built unless the PYTHON option is explicitely turned off.
* graphics/opencv-java has been integrated into graphics/opencv -- it is off by default,
but can be enabled by toggling the JAVA option -- there are no consumers in the tree,
so that option might go away in the future.
* All the previous options have been removed and replaced by a (hopefully) sane set of
dependencies that make the port and package most usable for the majority of consumers.
- Please let me know if you think there are better defaults (i.e. anything that is missing,
or something that should not be dependet on).
- If you think something should be added or removed, please open a bug report.
- If you think something should be added as an optional dependency, please open a
bug report (with a good reason [tm]).
The depending ports have been updated to work against opencv4, or marked broken.
* Ports broken:
- graphics/rubygem-objectdetect: OpenCV4 no longer ships opencv-1.0 API
- graphics/p5-Image-ObjectDetect: OpenCV4 no longer ships opencv-1.0 API
- graphics/gimp-gmic-plugin: OpenCV4 no longer ships opencv-1.0 API
* Backports:
- misc/visp: https://github.com/lagadic/visp/commit/dfa7e4bd47c24cd2e631477e6afb18806733ff8a
- multimedia/zart: https://github.com/c-koi/zart/commit/6ca1964690afbbc78627d7c868a692401043a584,
https://github.com/c-koi/zart/commit/d3a2931b1a07ec0322211f253468000363c4b6cb
* Others:
- misc/actiona: switch to pkgconfig 'opencv4'
- multimedia/libav: drop opencv support
- misc/darknet: already failed to build prior to the upgrade
- math/saga: remove patching added to work against opencv3
- Add a pkg-message explaining how to access or sync datum grids from the CDN
(disabled by default)
- Add curl and tiff dependencies since proj can read datum grids from remote
COG (Cloud Optimized Geotiff)
- Take maintainer'ship (ok wen@)
PR: 245611
Submitted by: wen (first version)
Reviewed by: wen, rhurlin
Approved by: wen
Exp-run by: antoine
Minor release with several bug fixes and some enhancements like[1]:
- Added OpenCV version 4 support
- Separate grid system for weather data in sim_hydrology/overland_flow
- Reworked, free positioning for layout items (map, legend, titel, ...)
in print layout of saga_gui
- Added SAGA4QGIS, updated for inno-setup v6 in accessories/helper
[1] https://sourceforge.net/p/saga-gis/wiki/Changelog%207.8.0/attachment/changelog_saga_7.8.0.txt
Approved by: tcberner (mentor)
Differential Revision: https://reviews.freebsd.org/D26737
After I got a commit bit for ports, it is time now to change the maintainers entry in all 'owned' ports.
Approved by: tcberner (mentor)
Differential Revision: https://reviews.freebsd.org/D26398
Returning NULL as bool is not ok.
--- globe_gores.lo ---
globe_gores.cpp: In member function 'bool CGlobe_Gores::Add_Gore(int, int)':
globe_gores.cpp:210:16: error: converting to 'bool' from 'std::nullptr_t' requires direct-initialization [-fpermissive]
210 | return( NULL );
PR: 246720
Approved by: rhurlin@gwdg.de (maintainer)
- math/saga:
- Update to 7.6.2
- Use wxWidgets 3.0+ instead of 3.1+ since 3.1 is not a mandatory version and this reduces the number of packages installed when you install saga and qgis/grass (which requires version 3.0).
- databases/grass7:
- Update to 7.8.2 first version for python3 only
- Use ${PY_NUMPY} variable
- Readd openmp
- Use wxPython40 for python3
- Remove bash dependency. You can use any shell.
- Rework the workaround in post-install (for / touch files). Fix the long (random) standing issue with pkg-plist
- Alphabetize USES and OPTIONS
- Replace XX_configure_on by XX_configure_with as possible
- graphics/qgis:
- Update to 3.12.1
- Remove patches (applied upstream or fixed in ports: pyqt5 / sip)
- graphics/qgis-ltr:
- Update to 3.10.4
PR: 241892, 244979
Reported by: rainer hurling (maintainer), lbartoletti (maintainer)
Reviewed by: tcberner (mentor), rainer hurling (maintainer)
Approved by: tcberner (mentor), rainer hurling (maintainer)
Differential Revision: https://reviews.freebsd.org/D24198
This is needed to be able to update gegl to latest version.
Bump revision of all consumer as the ABI is not 100% backward compatible.
Provide a patch for graphics/devil to properly build with latest jasper.
While here add a missing USES=xorg to graphics/devil
as defined in Mk/bsd.default-versions.mk which has moved from GCC 8.3
to GCC 9.1 under most circumstances now after revision 507371.
This includes ports
- with USE_GCC=yes or USE_GCC=any,
- with USES=fortran,
- using Mk/bsd.octave.mk which in turn features USES=fortran, and
- with USES=compiler specifying openmp, nestedfct, c11, c++0x, c++11-lang,
c++11-lib, c++14-lang, c++17-lang, or gcc-c++11-lib
plus, everything INDEX-11 shows with a dependency on lang/gcc9 now.
PR: 238330
- Add ftp/curl as LIB_DEPENDS
- Use OpenMP from within llvm60 also for i386
- Move some dirs for ${COPYTREE_SHARE}
PR: 233408
Submitted by: rhurlin@gwdg.de(maintainer)
defined via Mk/bsd.default-versions.mk which has moved from GCC 7.4 t
GCC 8.2 under most circumstances.
This includes ports
- with USE_GCC=yes or USE_GCC=any,
- with USES=fortran,
- using Mk/bsd.octave.mk which in turn features USES=fortran, and
- with USES=compiler specifying openmp, nestedfct, c11, c++0x, c++11-lang,
c++11-lib, c++14-lang, c++17-lang, or gcc-c++11-lib
plus, as a double check, everything INDEX-11 showed depending on lang/gcc7.
PR: 231590
in the ports tree (via Mk/bsd.default-versions.mk and lang/gcc) which
has now moved from GCC 6 to GCC 7 by default.
This includes ports
- featuring USE_GCC=yes or USE_GCC=any,
- featuring USES=fortran,
- using Mk/bsd.octave.mk which in turn features USES=fortran, and those
- with USES=compiler specifying one of openmp, nestedfct, c11, c++0x,
c++11-lib, c++11-lang, c++14-lang, c++17-lang, or gcc-c++11-lib.
PR: 222542
- Use devel/liblas12 with changed naming scheme
- If using openMP, change the compiler from gcc to clang
- Recreate some patches with makepatch
PR: 227901
Submitted by: rhurlin@gwdg.de(maintainer)
wksp_tool.cpp: In member function 'virtual wxString CWKSP_Tool::Get_Description()':
wksp_tool.cpp:159:61: error: no matching function for call to 'CSG_File::Open(const wxScopedWCharBuffer, ESG_File_Flags_Open)'
if( Stream.Open(FileName.GetFullPath().wc_str(), SG_FILE_R) && Stream.Read(Description, Stream.Length()) )
^
In file included from ../saga_api/geo_tools.h:77:0,
from ../saga_api/mat_tools.h:77,
from ../saga_api/dataobject.h:84,
from ../saga_api/table.h:77,
from ../saga_api/grid.h:77,
from ../saga_api/parameters.h:77,
from ../saga_api/tool.h:76,
from ../saga_api/tool_library.h:77,
from ../saga_api/saga_api.h:118,
from res_commands.h:78,
from wksp_tool.cpp:67:
../saga_api/api_core.h:955:13: note: candidate: bool CSG_File::Open(const CSG_String&, int, bool, int)
bool Open (const CSG_String &File_Name, int Mode = SG_FILE_R, bool bBinary = true, int Encoding = SG_FILE_ENCODING_CHAR);
^~~~
../saga_api/api_core.h:955:13: note: no known conversion for argument 1 from 'const wxScopedWCharBuffer {aka const wxScopedCharTypeBuffer<wchar_t>}' to 'const CSG_String&'
wksp_tool.cpp:166:61: error: no matching function for call to 'CSG_File::Open(const wxScopedWCharBuffer, ESG_File_Flags_Open)'
if( Stream.Open(FileName.GetFullPath().wc_str(), SG_FILE_R) && Stream.Read(Description, Stream.Length()) )
^
In file included from ../saga_api/geo_tools.h:77:0,
from ../saga_api/mat_tools.h:77,
from ../saga_api/dataobject.h:84,
from ../saga_api/table.h:77,
from ../saga_api/grid.h:77,
from ../saga_api/parameters.h:77,
from ../saga_api/tool.h:76,
from ../saga_api/tool_library.h:77,
from ../saga_api/saga_api.h:118,
from res_commands.h:78,
from wksp_tool.cpp:67:
../saga_api/api_core.h:955:13: note: candidate: bool CSG_File::Open(const CSG_String&, int, bool, int)
bool Open (const CSG_String &File_Name, int Mode = SG_FILE_R, bool bBinary = true, int Encoding = SG_FILE_ENCODING_CHAR);
^~~~
../saga_api/api_core.h:955:13: note: no known conversion for argument 1 from 'const wxScopedWCharBuffer {aka const wxScopedCharTypeBuffer<wchar_t>}' to 'const CSG_String&'
PR: 223758
Submitted by: rozhuk.im@gmail.com
Obtained from: upstream
Approved by: Rainer Hurling (maintainer)
(via Mk/bsd.default-versions.mk and lang/gcc) which has moved from
GCC 5.4 to GCC 6.4 under most circumstances.
This includes ports
- with USE_GCC=yes or USE_GCC=any,
- with USES=fortran,
- using Mk/bsd.octave.mk which in turn features USES=fortran, and
- with USES=compiler specifying openmp, nestedfct, c++11-lib, c++11-lang,
c++14-lang, c++0x, c11, or gcc-c++11-lib.
PR: 219275
Renaming didn't help to unblock 3.x progress as co-existence with 2.x
was no less complex than simply fixing consumers. This commit also
restores directory-level history accidentally lost via git-svn.
PR: 210505
Pointy hat to: jbeich (should've discussed first)