Attachment 200129 Details for Bug 228623 – patch

[patch] patch

vigra.diff (text/plain), 10.91 KB, created by Kurt Jaeger on 2018-12-15 09:09:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kurt Jaeger

Created: 2018-12-15 09:09:47 UTC

Size: 10.91 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 487481)
>+++ Makefile	(working copy)
>@@ -2,13 +2,10 @@
> # $FreeBSD$
> 
> PORTNAME=	vigra
>-DISTVERSION=	1.11.0
>-PORTREVISION=	26
>+DISTVERSION=	1.11.1
>+DISTVERSIONPREFIX=v
> 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"
> 
>@@ -18,13 +15,14 @@
> LIB_DEPENDS=	libHalf.so:graphics/ilmbase \
> 		libsz.so:science/szip
> 
>-USES=		cmake:outsource python:2.7,run shebangfix
>+#USES=		cmake:outsource python:2.7,run shebangfix
>+USES=		cmake:outsource compiler:c++14-lang python:2.7,run shebangfix
> CMAKE_ARGS=	-DDEPENDENCY_SEARCH_PREFIX:PATH=${LOCALBASE} \
> 		-DDOCINSTALL:PATH=${DOCSDIR_REL}
> 
> USE_GITHUB=	yes
> GH_ACCOUNT=     ukoethe
>-GH_TAGNAME=     e6c21f3
>+GH_TAGNAME=     8acd73a
> 
> SHEBANG_FILES=	config/vigra-config.in
> 
>Index: distinfo
>===================================================================
>--- distinfo	(revision 487481)
>+++ distinfo	(working copy)
>@@ -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: files/patch-CMakeLists.txt
>===================================================================
>--- files/patch-CMakeLists.txt	(revision 487481)
>+++ files/patch-CMakeLists.txt	(working copy)
>@@ -1,11 +1,9 @@
>-Add toggeles for the FreeBSD ports options.
>-
>---- CMakeLists.txt.orig	2017-05-10 18:52:52 UTC
>-+++ CMakeLists.txt
>-@@ -58,12 +58,27 @@ ENDIF ()
>+--- CMakeLists.txt.orig	2018-10-19 18:12:20.000000000 +0200
>++++ CMakeLists.txt	2018-12-14 21:56:11.649128000 +0100
>+@@ -97,14 +97,27 @@
>  #
>  ##################################################
>-
>+ 
> +# FreeBSD ports: add toggles for options
> +option( WITH_PNG "Enable PNG support" ON )
> +option( WITH_JPEG "Enable JPEG support" ON )
>@@ -12,10 +10,10 @@
> +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)
>@@ -26,7 +24,8 @@
> +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: pkg-plist
>===================================================================
>--- pkg-plist	(revision 487481)
>+++ pkg-plist	(working copy)
>@@ -2,9 +2,13 @@
> 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
>@@ -12,7 +16,12 @@
> 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
>@@ -23,20 +32,28 @@
> 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
>@@ -44,8 +61,14 @@
> 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
>@@ -57,9 +80,11 @@
> 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
>@@ -71,14 +96,25 @@
> 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
>@@ -94,6 +130,7 @@
> 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
>@@ -101,16 +138,25 @@
> 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
>@@ -125,10 +171,17 @@
> 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
>@@ -137,12 +190,16 @@
> 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
>@@ -151,9 +208,12 @@
> 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
>@@ -162,6 +222,8 @@
> 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
>@@ -168,8 +230,8 @@
> 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
>@@ -181,10 +243,13 @@
> %%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
>@@ -197,5 +262,6 @@
> %%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

Actions: View | Diff

Attachments on bug 228623: 200129