Index: head/graphics/vigra/Makefile =================================================================== --- head/graphics/vigra/Makefile (revision 487602) +++ head/graphics/vigra/Makefile (revision 487603) @@ -1,80 +1,75 @@ # Created by: cartola (Carlos E. G. Carvalho) # $FreeBSD$ PORTNAME= vigra -DISTVERSION= 1.11.0 -PORTREVISION= 26 +DISTVERSIONPREFIX=v +DISTVERSION= 1.11.1 CATEGORIES= graphics -PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ -PATCHFILES= 18675a51fca2.patch:-p1 - MAINTAINER= ports@FreeBSD.org COMMENT= VIGRA stands for "Vision with Generic Algorithms" LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt LIB_DEPENDS= libHalf.so:graphics/ilmbase \ libsz.so:science/szip -USES= cmake:outsource python:2.7,run shebangfix -CMAKE_ARGS= -DDEPENDENCY_SEARCH_PREFIX:PATH=${LOCALBASE} \ - -DDOCINSTALL:PATH=${DOCSDIR_REL} - +USES= cmake:outsource compiler:c++14-lang python:2.7,run shebangfix USE_GITHUB= yes -GH_ACCOUNT= ukoethe -GH_TAGNAME= e6c21f3 +GH_ACCOUNT= ukoethe +GH_TAGNAME= 8acd73a +USE_LDCONFIG= yes +CMAKE_ARGS= -DDEPENDENCY_SEARCH_PREFIX:PATH=${LOCALBASE} \ + -DDOCINSTALL:PATH=${DOCSDIR_REL} SHEBANG_FILES= config/vigra-config.in - -USE_LDCONFIG= yes OPTIONS_DEFINE= HDF5 OPENEXR NUMPY DOCS FFTW OPTIONS_DEFAULT= HDF5 OPENEXR FFTW ${OPTIONS_GROUP_IMAGEFORMATS} OPTIONS_GROUP= IMAGEFORMATS OPTIONS_GROUP_IMAGEFORMATS= PNG JPEG TIFF OPTIONS_SUB= yes HDF5_CMAKE_BOOL= WITH_HDF5 HDF5_LIB_DEPENDS= libhdf5.so:science/hdf5 OPENEXR_CMAKE_BOOL= WITH_OPENEXR OPENEXR_LIB_DEPENDS= libIlmImf.so:graphics/openexr NUMPY_DESC= NumPy mathematical computing (USE Fortran/GCC47+) NUMPY_CMAKE_BOOL= WITH_VIGRANUMPY NUMPY_USES= compiler:gcc-c++11-lib python:2.7,build NUMPY_BUILD_DEPENDS= nosetests:devel/py-nose \ f2py:math/py-numpy NUMPY_RUN_DEPENDS= nosetests:devel/py-nose \ f2py:math/py-numpy NUMPY_LIB_DEPENDS= ${PY_BOOST} # On FreeBSD < 11 libc++ lacks support for sized delete operators. # GCC dropped the builtin version of these operators in 6+ by # defaulting to gnu++14. Force c++11 instead. # For a more detailed discussion see: # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=219484 NUMPY_CXXFLAGS= -std=gnu++11 PNG_CMAKE_BOOL= WITH_PNG PNG_LIB_DPEENDS= libpng.so:graphics/png JPEG_CMAKE_BOOL= WITH_JPEG JPEG_USES= jpeg TIFF_CMAKE_BOOL= WITH_TIFF TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff FFTW_CMAKE_BOOL= WITH_FFTW FFTW_LIB_DEPENDS= libfftw3.so:math/fftw3 \ libfftw3f.so:math/fftw3-float post-package-NUMPY-on: @${ECHO} "" @${ECHO} "* BEWARE!" @${ECHO} "* Using py-NumPY implies Fortran and GCC 4.7+ as hard dependencies" @${ECHO} "* and require all ports, depending on vigra, to set USE_GCC=yes" @${ECHO} "" .include Index: head/graphics/vigra/distinfo =================================================================== --- head/graphics/vigra/distinfo (revision 487602) +++ head/graphics/vigra/distinfo (revision 487603) @@ -1,5 +1,3 @@ -TIMESTAMP = 1384793296 -SHA256 (ukoethe-vigra-1.11.0-e6c21f3_GH0.tar.gz) = 654074d08e46630a05084098779358baf3e4c0ab018ad6f02093823f1395b348 -SIZE (ukoethe-vigra-1.11.0-e6c21f3_GH0.tar.gz) = 29184342 -SHA256 (18675a51fca2.patch) = e6a00209716feb79aa0b4c634b5740adbb95ef61be3391ee2b6d2c9c635a7116 -SIZE (18675a51fca2.patch) = 1001 +TIMESTAMP = 1544816033 +SHA256 (ukoethe-vigra-v1.11.1-8acd73a_GH0.tar.gz) = 4249dc1e6e2cd65e1bcc7686465d1000a41a8dea5cf89c4eb9d37c57b6970291 +SIZE (ukoethe-vigra-v1.11.1-8acd73a_GH0.tar.gz) = 34211651 Index: head/graphics/vigra/files/patch-CMakeLists.txt =================================================================== --- head/graphics/vigra/files/patch-CMakeLists.txt (revision 487602) +++ head/graphics/vigra/files/patch-CMakeLists.txt (revision 487603) @@ -1,32 +1,31 @@ -Add toggeles for the FreeBSD ports options. - ---- CMakeLists.txt.orig 2017-05-10 18:52:52 UTC +--- CMakeLists.txt.orig 2018-10-19 16:12:20 UTC +++ CMakeLists.txt -@@ -58,12 +58,27 @@ ENDIF () +@@ -97,14 +97,27 @@ endif() # ################################################## - + +# FreeBSD ports: add toggles for options +option( WITH_PNG "Enable PNG support" ON ) +option( WITH_JPEG "Enable JPEG support" ON ) +option( WITH_TIFF "Enable TIFF support" ON ) +option( WITH_FFTW "Enable FFTW support" ON ) + -+ INCLUDE(VigraFindPackage) + VIGRA_FIND_PACKAGE(ZLIB) +if (WITH_TIFF) - VIGRA_FIND_PACKAGE(TIFF NAMES libtiff) + VIGRA_FIND_PACKAGE(TIFF NAMES libtiff_i libtiff) # prefer DLL on Windows +endif () +if (WITH_JPEG) VIGRA_FIND_PACKAGE(JPEG NAMES libjpeg) +endif () +if (WITH_PNG) VIGRA_FIND_PACKAGE(PNG) +endif () +if (WITH_FFTW) VIGRA_FIND_PACKAGE(FFTW3 NAMES libfftw3-3 libfftw-3.3) VIGRA_FIND_PACKAGE(FFTW3F NAMES libfftw3f-3 libfftwf-3.3) +- +endif () - + IF(WITH_OPENEXR) VIGRA_FIND_PACKAGE(OpenEXR) Index: head/graphics/vigra/files/patch-include__vigra__mathutil.hxx =================================================================== --- head/graphics/vigra/files/patch-include__vigra__mathutil.hxx (revision 487602) +++ head/graphics/vigra/files/patch-include__vigra__mathutil.hxx (revision 487603) @@ -1,15 +1,15 @@ ---- include/vigra/mathutil.hxx.orig 2013-11-18 16:48:16 UTC +--- include/vigra/mathutil.hxx.orig 2018-10-19 16:12:20 UTC +++ include/vigra/mathutil.hxx -@@ -637,7 +637,12 @@ VIGRA_DEFINE_NORM(int) +@@ -675,7 +675,12 @@ VIGRA_DEFINE_NORM(int) VIGRA_DEFINE_NORM(unsigned int) VIGRA_DEFINE_NORM(long) VIGRA_DEFINE_NORM(unsigned long) +#if defined(__FreeBSD__) || defined(__DragonFly__) +inline NormTraits::SquaredNormType squaredNorm(long long t) { return sq((long int) t); } +inline NormTraits::NormType norm(long long t) { return abs((long int) t); } +#else VIGRA_DEFINE_NORM(long long) +#endif VIGRA_DEFINE_NORM(unsigned long long) VIGRA_DEFINE_NORM(float) VIGRA_DEFINE_NORM(double) Index: head/graphics/vigra/pkg-plist =================================================================== --- head/graphics/vigra/pkg-plist (revision 487602) +++ head/graphics/vigra/pkg-plist (revision 487603) @@ -1,201 +1,267 @@ bin/vigra-config include/vigra/accessor.hxx include/vigra/accumulator-grammar.hxx include/vigra/accumulator.hxx +include/vigra/adjacency_list_graph.hxx include/vigra/affine_registration.hxx +include/vigra/affine_registration_fft.hxx include/vigra/affinegeometry.hxx include/vigra/algorithm.hxx +include/vigra/any.hxx +include/vigra/applywindowfunction.hxx include/vigra/array_vector.hxx include/vigra/autodiff.hxx include/vigra/axistags.hxx include/vigra/basicgeometry.hxx include/vigra/basicimage.hxx include/vigra/basicimageview.hxx include/vigra/bessel.hxx +include/vigra/binary_forest.hxx include/vigra/bit_array.hxx +include/vigra/blockify.hxx +include/vigra/blockwise_convolution.hxx +include/vigra/blockwise_labeling.hxx +include/vigra/blockwise_watersheds.hxx include/vigra/bordertreatment.hxx include/vigra/boundarytensor.hxx include/vigra/box.hxx include/vigra/bucket_queue.hxx include/vigra/cellconfigurations.hxx include/vigra/cellimage.hxx include/vigra/clebsch-gordan.hxx include/vigra/codec.hxx include/vigra/colorconversions.hxx include/vigra/combineimages.hxx +include/vigra/compression.hxx include/vigra/config.hxx -include/vigra/configVersion.hxx +include/vigra/config_version.hxx include/vigra/contourcirculator.hxx include/vigra/convolution.hxx include/vigra/coordinate_iterator.hxx include/vigra/copyimage.hxx include/vigra/cornerdetection.hxx +include/vigra/correlation.hxx +include/vigra/counting_iterator.hxx +include/vigra/delegate/delegate.hxx +include/vigra/delegate/detail/delegate_list.hxx +include/vigra/delegate/detail/delegate_template.hxx include/vigra/diff2d.hxx include/vigra/distancetransform.hxx +include/vigra/eccentricitytransform.hxx include/vigra/edgedetection.hxx include/vigra/eigensystem.hxx include/vigra/error.hxx include/vigra/fftw.hxx include/vigra/fftw3.hxx +include/vigra/filter_iterator.hxx include/vigra/fixedpoint.hxx include/vigra/flatmorphology.hxx include/vigra/functorexpression.hxx include/vigra/functortraits.hxx include/vigra/gaborfilter.hxx include/vigra/gaussians.hxx include/vigra/gradient_energy_tensor.hxx +include/vigra/graph_algorithms.hxx +include/vigra/graph_generalization.hxx +include/vigra/graph_item_impl.hxx +include/vigra/graph_maps.hxx +include/vigra/graph_rag_project_back.hxx include/vigra/graphs.hxx include/vigra/hdf5impex.hxx +include/vigra/hierarchical_clustering.hxx include/vigra/histogram.hxx include/vigra/imagecontainer.hxx include/vigra/imageinfo.hxx include/vigra/imageiterator.hxx include/vigra/imageiteratoradapter.hxx include/vigra/impex.hxx include/vigra/impexalpha.hxx include/vigra/impexbase.hxx include/vigra/initimage.hxx include/vigra/inspectimage.hxx include/vigra/inspector_passes.hxx +include/vigra/integral_image.hxx include/vigra/interpolating_accessor.hxx include/vigra/invariant_features3D.hxx include/vigra/iteratoradapter.hxx +include/vigra/iteratorfacade.hxx include/vigra/iteratortags.hxx include/vigra/iteratortraits.hxx include/vigra/labelimage.hxx include/vigra/labelvolume.hxx include/vigra/linear_algebra.hxx include/vigra/linear_solve.hxx include/vigra/localminmax.hxx include/vigra/mathutil.hxx include/vigra/matlab.hxx include/vigra/matlab_FLEXTYPE.hxx include/vigra/matrix.hxx +include/vigra/medianfilter.hxx include/vigra/memory.hxx +include/vigra/merge_graph_adaptor.hxx include/vigra/meshgrid.hxx include/vigra/metaprogramming.hxx +include/vigra/metrics.hxx include/vigra/multi_array.hxx +include/vigra/multi_array_chunked.hxx +include/vigra/multi_array_chunked_hdf5.hxx +include/vigra/multi_blocking.hxx +include/vigra/multi_blockwise.hxx include/vigra/multi_convolution.hxx include/vigra/multi_distance.hxx include/vigra/multi_fft.hxx +include/vigra/multi_fwd.hxx include/vigra/multi_gridgraph.hxx +include/vigra/multi_handle.hxx +include/vigra/multi_hierarchical_iterator.hxx +include/vigra/multi_histogram.hxx include/vigra/multi_impex.hxx include/vigra/multi_iterator.hxx include/vigra/multi_iterator_coupled.hxx include/vigra/multi_labeling.hxx include/vigra/multi_localminmax.hxx include/vigra/multi_math.hxx include/vigra/multi_morphology.hxx include/vigra/multi_opencl.hxx include/vigra/multi_pointoperators.hxx include/vigra/multi_resize.hxx include/vigra/multi_shape.hxx include/vigra/multi_tensorutilities.hxx include/vigra/multi_watersheds.hxx include/vigra/navigator.hxx include/vigra/noise_normalization.hxx +include/vigra/non_local_mean.hxx include/vigra/nonlineardiffusion.hxx include/vigra/numerictraits.hxx include/vigra/numpy_array.hxx include/vigra/numpy_array_converters.hxx include/vigra/numpy_array_taggedshape.hxx include/vigra/numpy_array_traits.hxx include/vigra/orientedtensorfilters.hxx +include/vigra/overlapped_blocks.hxx +include/vigra/permutation.hxx include/vigra/pixelneighborhood.hxx include/vigra/polygon.hxx include/vigra/polynomial.hxx +include/vigra/polynomial_registration.hxx +include/vigra/polytope.hxx +include/vigra/print_backtrace.hxx +include/vigra/priority_queue.hxx include/vigra/project2ellipse.hxx +include/vigra/projective_registration.hxx include/vigra/promote_traits.hxx include/vigra/promote_traits.hxx.py +include/vigra/python_graph.hxx include/vigra/python_utility.hxx include/vigra/quadprog.hxx include/vigra/quaternion.hxx include/vigra/random.hxx +include/vigra/random_access_set.hxx include/vigra/random_forest.hxx include/vigra/random_forest/features.hxx include/vigra/random_forest/rf_algorithm.hxx include/vigra/random_forest/rf_common.hxx include/vigra/random_forest/rf_decisionTree.hxx include/vigra/random_forest/rf_earlystopping.hxx include/vigra/random_forest/rf_nodeproxy.hxx include/vigra/random_forest/rf_online_prediction_set.hxx include/vigra/random_forest/rf_preprocessing.hxx include/vigra/random_forest/rf_region.hxx include/vigra/random_forest/rf_ridge_split.hxx include/vigra/random_forest/rf_split.hxx include/vigra/random_forest/rf_visitors.hxx include/vigra/random_forest/splices.hxx +include/vigra/random_forest_3.hxx +include/vigra/random_forest_3/random_forest.hxx +include/vigra/random_forest_3/random_forest_common.hxx +include/vigra/random_forest_3/random_forest_visitors.hxx +include/vigra/random_forest_3_hdf5_impex.hxx include/vigra/random_forest_deprec.hxx include/vigra/random_forest_hdf5_impex.hxx include/vigra/rational.hxx +include/vigra/rbf_registration.hxx include/vigra/recursiveconvolution.hxx +include/vigra/region_shrinking.hxx include/vigra/regression.hxx include/vigra/resampling_convolution.hxx include/vigra/resizeimage.hxx include/vigra/rfftw.hxx include/vigra/rgbvalue.hxx include/vigra/sampling.hxx include/vigra/seededregiongrowing.hxx include/vigra/seededregiongrowing3d.hxx +include/vigra/seg_to_seeds.hxx include/vigra/separableconvolution.hxx +include/vigra/shockfilter.hxx include/vigra/sifImport.hxx include/vigra/singular_value_decomposition.hxx include/vigra/sized_int.hxx +include/vigra/skeleton.hxx include/vigra/slanted_edge_mtf.hxx include/vigra/slic.hxx +include/vigra/specklefilters.hxx include/vigra/splineimageview.hxx include/vigra/splines.hxx include/vigra/static_assert.hxx include/vigra/stdconvolution.hxx include/vigra/stdimage.hxx include/vigra/stdimagefunctions.hxx include/vigra/symmetry.hxx include/vigra/tensorutilities.hxx +include/vigra/threading.hxx +include/vigra/threadpool.hxx include/vigra/tiff.hxx include/vigra/timing.hxx include/vigra/tinyvector.hxx +include/vigra/transform_iterator.hxx include/vigra/transformimage.hxx include/vigra/tuple.hxx include/vigra/tv_filter.hxx include/vigra/type_lists.hxx include/vigra/union_find.hxx include/vigra/unittest.hxx include/vigra/unsupervised_decomposition.hxx include/vigra/utilities.hxx +include/vigra/vector_distance.hxx +include/vigra/visit_border.hxx include/vigra/voxelneighborhood.hxx include/vigra/watersheds.hxx include/vigra/watersheds3d.hxx include/vigra/wigner-matrix.hxx include/vigra/windows.h lib/libvigraimpex.so -lib/libvigraimpex.so.5 -lib/libvigraimpex.so.5.1.10.0 +lib/libvigraimpex.so.11 +lib/libvigraimpex.so.11.1.11.1 lib/vigra/VigraConfig.cmake lib/vigra/VigraConfigVersion.cmake lib/vigra/vigra-targets-%%CMAKE_BUILD_TYPE%%.cmake lib/vigra/vigra-targets.cmake %%PORTDOCS%%%%DOCSDIR%%/vigra/index.html %%PORTDOCS%%%%DOCSDIR%%/vigra/vigra-icon.ico %%PORTDOCS%%%%DOCSDIR%%/vigra/vigra.css %%NUMPY%%%%PYTHON_SITELIBDIR%%/vigra/__init__.py %%NUMPY%%%%PYTHON_SITELIBDIR%%/vigra/__version__.py %%NUMPY%%%%PYTHON_SITELIBDIR%%/vigra/analysis.so %%NUMPY%%%%PYTHON_SITELIBDIR%%/vigra/arraytypes.py +%%NUMPY%%%%PYTHON_SITELIBDIR%%/vigra/blockwise.so %%NUMPY%%%%PYTHON_SITELIBDIR%%/vigra/colors.so %%NUMPY%%%%PYTHON_SITELIBDIR%%/vigra/filters.so %%NUMPY%%%%PYTHON_SITELIBDIR%%/vigra/fourier.so %%NUMPY%%%%PYTHON_SITELIBDIR%%/vigra/geometry.so +%%NUMPY%%%%PYTHON_SITELIBDIR%%/vigra/graphs.so +%%NUMPY%%%%PYTHON_SITELIBDIR%%/vigra/histogram.so %%NUMPY%%%%PYTHON_SITELIBDIR%%/vigra/impex.so %%NUMPY%%%%PYTHON_SITELIBDIR%%/vigra/learning.so %%NUMPY%%%%PYTHON_SITELIBDIR%%/vigra/noise.so %%NUMPY%%%%PYTHON_SITELIBDIR%%/vigra/optimization.so %%NUMPY%%%%PYTHON_SITELIBDIR%%/vigra/pyqt/__init__.py %%NUMPY%%%%PYTHON_SITELIBDIR%%/vigra/pyqt/imagewindow.py %%NUMPY%%%%PYTHON_SITELIBDIR%%/vigra/pyqt/overlays.py %%NUMPY%%%%PYTHON_SITELIBDIR%%/vigra/pyqt/quickdialog.py %%NUMPY%%%%PYTHON_SITELIBDIR%%/vigra/pyqt/viewer2svg.py %%NUMPY%%%%PYTHON_SITELIBDIR%%/vigra/sampling.so %%NUMPY%%%%PYTHON_SITELIBDIR%%/vigra/tagged_array.py %%NUMPY%%%%PYTHON_SITELIBDIR%%/vigra/ufunc.py +%%NUMPY%%%%PYTHON_SITELIBDIR%%/vigra/utilities.so %%NUMPY%%%%PYTHON_SITELIBDIR%%/vigra/vigranumpycore.so %%NUMPY%%lib/vigranumpy/VigranumpyConfig.cmake