Date: Sat, 20 May 2017 19:45:46 +0000 (UTC) From: "Tobias C. Berner" <tcberner@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r441331 - in head/graphics/vigra: . files Message-ID: <201705201945.v4KJjkZO085052@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tcberner Date: Sat May 20 19:45:46 2017 New Revision: 441331 URL: https://svnweb.freebsd.org/changeset/ports/441331 Log: Cleanup graphics/vigra * fix shebang for vigra-config (a python script, therefore, also add python as a run-depends). * add LIB_DPENDS to make qa happy * add patch-CMakeLists.txt to add toggles for the imageformats JPEG, TIFF and PNG aswell as for FFTW * modernize option handling Reviewed by: rakuco Approved by: rakuco (mentor) Differential Revision: https://reviews.freebsd.org/D10668 Added: head/graphics/vigra/files/patch-CMakeLists.txt (contents, props changed) Modified: head/graphics/vigra/Makefile head/graphics/vigra/pkg-plist Modified: head/graphics/vigra/Makefile ============================================================================== --- head/graphics/vigra/Makefile Sat May 20 18:49:10 2017 (r441330) +++ head/graphics/vigra/Makefile Sat May 20 19:45:46 2017 (r441331) @@ -3,7 +3,7 @@ PORTNAME= vigra DISTVERSION= 1.11.0 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= graphics MAINTAINER= ports@FreeBSD.org @@ -12,91 +12,60 @@ COMMENT= VIGRA stands for "Vision with G LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt +LIB_DEPENDS= libHalf.so:graphics/ilmbase \ + libsz.so:science/szip + +USES= cmake:outsource python:2,run shebangfix +CMAKE_ARGS= -DDEPENDENCY_SEARCH_PREFIX:PATH=${LOCALBASE} \ + -DDOCINSTALL:PATH=${DOCSDIR_REL} + USE_GITHUB= yes GH_ACCOUNT= ukoethe GH_TAGNAME= e6c21f3 -USES= cmake -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 +OPTIONS_DEFINE= HDF5 OPENEXR NUMPY DOCS FFTW OPTIONS_DEFAULT= HDF5 OPENEXR -NUMPY_DESC= NumPy mathematical computing (USE Fortran/GCC47+) +OPTIONS_GROUP= IMAGEFORMATS +OPTIONS_GROUP_IMAGEFORMATS= PNG JPEG TIFF +OPTIONS_SUB= yes -.include <bsd.port.options.mk> +HDF5_CMAKE_BOOL= WITH_HDF5 +HDF5_LIB_DEPENDS= libhdf5.so:science/hdf5 -.if ${PORT_OPTIONS:MHDF5} -CMAKE_ARGS+= -DWITH_HDF5=1 -LIB_DEPENDS+= libhdf5.so:science/hdf5 -.else -CMAKE_ARGS+= -DWITH_HDF5=0 -.endif - -.if ${PORT_OPTIONS:MOPENEXR} -CMAKE_ARGS+= -DWITH_OPENEXR=1 -LIB_DEPENDS+= libIlmImf.so:graphics/OpenEXR -.else -CMAKE_ARGS+= -DWITH_OPENEXR=0 -.endif - -.if ${PORT_OPTIONS:MNUMPY} -# Should ignore Python3 since commit f51b0b5 -#CONFLICTS_BUILD= python3* -CMAKE_ARGS+= -DWITH_VIGRANUMPY=1 -USES+= compiler:gcc-c++11-lib python:2 -BUILD_DEPENDS+= nosetests:devel/py-nose -BUILD_DEPENDS+= ${PYTHON_SITELIBDIR}/numpy/core/numeric.py:math/py-numpy -#BUILD_DEPENDS+= sphinx-build:textproc/py-sphinx -LIB_DEPENDS+= libboost_python.so:devel/boost-python-libs -RUN_DEPENDS:= ${BUILD_DEPENDS} -PLIST_SUB+= PYTHON="" -.else -CMAKE_ARGS+= -DWITH_VIGRANUMPY=0 -PLIST_SUB+= PYTHON="@comment " -.endif - -# Vigra's CMakeLists.txt does not support disabling those so we hook them -# as dependencies here unconditionally (without OPTIONS=) even though if -# they are not present then Vigra/CMake will do without them (they are not -# mandatory). -# -# Notice that if you define e.g. WITHOUT_VIGRA_TIFF and graphics/tiff is -# installed on your system, then the lib will be picked up by Vigra, the -# dependency will not be recorded by the ports system and later deletion -# of graphics/tiff will break Vigra. Only define WITHOUT_VIGRA_TIFF if you -# do not have graphics/tiff installed and do not want TIFF support in Vigra. - -.if !defined(WITHOUT_VIGRA_TIFF) -LIB_DEPENDS+= libtiff.so:graphics/tiff -.endif - -.if !defined(WITHOUT_VIGRA_JPEG) -USES+= jpeg -.endif - -.if !defined(WITHOUT_VIGRA_PNG) -LIB_DEPENDS+= libpng.so:graphics/png -.endif - -.if !defined(WITHOUT_VIGRA_FFTW) -LIB_DEPENDS+= libfftw3.so:math/fftw3 -LIB_DEPENDS+= libfftw3f.so:math/fftw3-float -.endif +OPENEXR_CMAKE_BOOL= WITH_OPENEXR +OPENEXR_LIB_DEPENDS= libIlmImf.so:graphics/OpenEXR -pre-everything:: -.if ${PORT_OPTIONS:MNUMPY} +NUMPY_DESC= NumPy mathematical computing (USE Fortran/GCC47+) +NUMPY_CMAKE_BOOL= WITH_VIGRANUMPY +NUMPY_USES= compiler:gcc-c++11-lib python:2,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= libboost_python.so:devel/boost-python-libs + +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} "" -.endif - -post-patch: -# FIXME: This is ugly - @${RM} ${WRKSRC}/include/vigra/*.orig .include <bsd.port.mk> Added: head/graphics/vigra/files/patch-CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/vigra/files/patch-CMakeLists.txt Sat May 20 19:45:46 2017 (r441331) @@ -0,0 +1,32 @@ +Add toggeles for the FreeBSD ports options. + +--- CMakeLists.txt.orig 2017-05-10 18:52:52 UTC ++++ CMakeLists.txt +@@ -58,12 +58,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) ++if (WITH_TIFF) + VIGRA_FIND_PACKAGE(TIFF NAMES libtiff) ++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) Modified: head/graphics/vigra/pkg-plist ============================================================================== --- head/graphics/vigra/pkg-plist Sat May 20 18:49:10 2017 (r441330) +++ head/graphics/vigra/pkg-plist Sat May 20 19:45:46 2017 (r441331) @@ -170,32 +170,31 @@ include/vigra/windows.h lib/libvigraimpex.so lib/libvigraimpex.so.5 lib/libvigraimpex.so.5.1.10.0 -%%PYTHON%%%%PYTHON_SITELIBDIR%%/vigra/__init__.py -%%PYTHON%%%%PYTHON_SITELIBDIR%%/vigra/__version__.py -%%PYTHON%%%%PYTHON_SITELIBDIR%%/vigra/analysis.so -%%PYTHON%%%%PYTHON_SITELIBDIR%%/vigra/arraytypes.py -%%PYTHON%%%%PYTHON_SITELIBDIR%%/vigra/colors.so -%%PYTHON%%%%PYTHON_SITELIBDIR%%/vigra/filters.so -%%PYTHON%%%%PYTHON_SITELIBDIR%%/vigra/fourier.so -%%PYTHON%%%%PYTHON_SITELIBDIR%%/vigra/geometry.so -%%PYTHON%%%%PYTHON_SITELIBDIR%%/vigra/impex.so -%%PYTHON%%%%PYTHON_SITELIBDIR%%/vigra/learning.so -%%PYTHON%%%%PYTHON_SITELIBDIR%%/vigra/noise.so -%%PYTHON%%%%PYTHON_SITELIBDIR%%/vigra/optimization.so -%%PYTHON%%%%PYTHON_SITELIBDIR%%/vigra/pyqt/__init__.py -%%PYTHON%%%%PYTHON_SITELIBDIR%%/vigra/pyqt/imagewindow.py -%%PYTHON%%%%PYTHON_SITELIBDIR%%/vigra/pyqt/overlays.py -%%PYTHON%%%%PYTHON_SITELIBDIR%%/vigra/pyqt/quickdialog.py -%%PYTHON%%%%PYTHON_SITELIBDIR%%/vigra/pyqt/viewer2svg.py -%%PYTHON%%%%PYTHON_SITELIBDIR%%/vigra/sampling.so -%%PYTHON%%%%PYTHON_SITELIBDIR%%/vigra/tagged_array.py -%%PYTHON%%%%PYTHON_SITELIBDIR%%/vigra/ufunc.py -%%PYTHON%%%%PYTHON_SITELIBDIR%%/vigra/vigranumpycore.so lib/vigra/VigraConfig.cmake lib/vigra/VigraConfigVersion.cmake lib/vigra/vigra-targets-%%CMAKE_BUILD_TYPE%%.cmake lib/vigra/vigra-targets.cmake -%%PYTHON%%lib/vigranumpy/VigranumpyConfig.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/colors.so +%%NUMPY%%%%PYTHON_SITELIBDIR%%/vigra/filters.so +%%NUMPY%%%%PYTHON_SITELIBDIR%%/vigra/geometry.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/vigranumpycore.so +%%NUMPY%%lib/vigranumpy/VigranumpyConfig.cmake
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201705201945.v4KJjkZO085052>