diff --git a/graphics/pfstools/Makefile b/graphics/pfstools/Makefile index e69b82491815..f27dec5f433a 100644 --- a/graphics/pfstools/Makefile +++ b/graphics/pfstools/Makefile @@ -1,112 +1,112 @@ PORTNAME= pfstools DISTVERSION= 2.1.0 -PORTREVISION= 19 +PORTREVISION= 20 CATEGORIES= graphics MASTER_SITES= SF MAINTAINER= fbsd@any.com.ru COMMENT= Tools for manipulating HDR images and video frames WWW= https://pfstools.sourceforge.net/ LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING RUN_DEPENDS= bash:shells/bash CONFLICTS= pfstmo-1.* pfscalibration-1.* CFLAGS+= -I${LOCALBASE}/include/Imath LDFLAGS+= -lthr USES= cmake cpe tar:tgz dos2unix jpeg perl5 USE_CXXSTD= c++14 USE_PERL5= run USE_LDCONFIG= yes CMAKE_ARGS+= -DBUILD_SHARED_LIBS=ON \ -DWITH_MATLAB=OFF \ -DBASH_EXECUTABLE:STRING=${LOCALBASE}/bin/bash \ -DPERL_EXECUTABLE:STRING=${PERL} DOS2UNIX_GLOB= *.txt *.cmake \ *.h *.c *.cpp \ *.1 MANCOMPRESSED= yes OPTIONS_DEFINE= TIFF OPENEXR IMAGEMAGICK NETPBM \ OCTAVE FFTW GSL \ ALIGN GLVIEW VIEW \ OPENMP OPTIONS_DEFAULT= TIFF FFTW GSL NO_OPTIONS_SORT= yes OPTIONS_SUB= yes OCTAVE_DESC= Compile octave interface functions GSL_DESC= Use Gnu Scientific Libarary required for some TMOs ALIGN_DESC= Compile pfsalign, requires OpenCV w/NONFREE and libexif VIEW_DESC= Compile pfsview, requires QT5 GLVIEW_DESC= Compile pfsglview, requires GLUT TIFF_CMAKE_BOOL= WITH_TIFF TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff OPENEXR_CMAKE_BOOL= WITH_OpenEXR OPENEXR_LIB_DEPENDS= libOpenEXR.so:graphics/openexr \ libImath.so:math/Imath IMAGEMAGICK_CMAKE_BOOL= WITH_ImageMagick IMAGEMAGICK_USES= magick:6 NETPBM_CMAKE_BOOL= WITH_NetPBM NETPBM_LIB_DEPENDS= libnetpbm.so:graphics/netpbm NETPBM_IMPLIES= TIFF OCTAVE_CMAKE_BOOL= WITH_Octave OCTAVE_PATCH_DEPENDS= octave-config:math/octave OCTAVE_BUILD_DEPENDS= mkoctfile:math/octave OCTAVE_RUN_DEPENDS= octave:math/octave OCTAVE_USES= shebangfix OCTAVE_CXXFLAGS= -std=c++11 FFTW_CMAKE_BOOL= WITH_FFTW FFTW_CMAKE_ON= -DFFTW_INCLUDE_DIRS=${LOCALBASE}/include FFTW_LIB_DEPENDS= libfftw3.so:math/fftw3 \ libfftw3f.so:math/fftw3-float GSL_CMAKE_BOOL= WITH_GSL GSL_LIB_DEPENDS= libgsl.so:math/gsl ALIGN_CMAKE_BOOL= WITH_OpenCV # requires NONFREE=on which isn't a default ALIGN_LIB_DEPENDS= libopencv_nonfree.so:graphics/opencv \ libexif.so:graphics/libexif GLVIEW_CMAKE_BOOL= WITH_pfsglview GLVIEW_CMAKE_ON= -DGLUT_INCLUDE_DIRS=${LOCALBASE}/include GLVIEW_USES= gl GLVIEW_USE= GL=glut GL=gl,glu VIEW_CMAKE_BOOL= WITH_QT VIEW_USES= gl qt:5 VIEW_USE= GL=glut GL=gl,glu QT=core,gui,widgets,buildtools:build,qmake:build .include .if ${PORT_OPTIONS:MIMAGEMAGICK} && !${PORT_OPTIONS:MOPENMP} USES+= compiler:c++11-lib .endif .if ${PORT_OPTIONS:MOCTAVE} OCTAVE_BASE?= ${LOCALBASE} OCTAVE_VERSION!=${OCTAVE_BASE}/bin/octave-config -v 2>&1 || ${ECHO} "0" OCTAVE_SITE_OCT!=${OCTAVE_BASE}/bin/octave-config --oct-site-dir 2>&1 || ${ECHO} "" OCTAVE_SITE_M!= ${OCTAVE_BASE}/bin/octave-config --m-site-dir 2>&1 || ${ECHO} "" PLIST_SUB= OCTAVE_BASE=${OCTAVE_BASE} \ OCTAVE_SITE_M=${OCTAVE_SITE_M:S|^${OCTAVE_BASE}/||} \ OCTAVE_SITE_OCT=${OCTAVE_SITE_OCT:S|^${OCTAVE_BASE}/||} SHEBANG_FILES= src/octave/pfs* SHEBANG_LANG= octave octave_OLD_CMD?=/usr/bin/octave octave_CMD?= ${OCTAVE_BASE}/bin/octave-cli .endif .include diff --git a/graphics/pfstools/files/patch-CMakeLists.txt b/graphics/pfstools/files/patch-CMakeLists.txt index d0f501fd845c..79a68a3f0b35 100644 --- a/graphics/pfstools/files/patch-CMakeLists.txt +++ b/graphics/pfstools/files/patch-CMakeLists.txt @@ -1,36 +1,27 @@ ---- CMakeLists.txt.orig 2018-03-20 06:20:43 UTC +--- CMakeLists.txt.orig 2024-02-24 09:22:45 UTC +++ CMakeLists.txt -@@ -29,7 +29,7 @@ set (pfstools_VERSION_MINOR ${CPACK_PACK - set (pfslib_version 1.2) - set(CMAKE_LEGACY_CYGWIN_WIN32 0) - --set (MAN_DIR "${CMAKE_INSTALL_PREFIX}/share/man/man1" CACHE PATH "The directory where the man pages are") -+set (MAN_DIR "${CMAKE_INSTALL_PREFIX}/man/man1" CACHE PATH "The directory where the man pages are") - - include( CheckCXXSourceCompiles ) - @@ -57,12 +57,12 @@ endif( HAS_BRANCH_PREDICTION ) # ======== Find bash ======= # TODO: What if the check fails -find_program (BASH_EXECUTABLE bash) +#find_program (BASH_EXECUTABLE bash) message( "Using bash: ${BASH_EXECUTABLE}" ) # ======== Find perl ======= -find_program (PERL_EXECUTABLE perl) +#find_program (PERL_EXECUTABLE perl) # XXX Isn't found in poudriere builds for some reasoson, providing it as an argument if( PERL_EXECUTABLE ) message( "Using perl: ${PERL_EXECUTABLE}" ) else( PERL_EXECUTABLE ) @@ -250,6 +250,9 @@ if( WITH_FFTW ) else( NOT FFTW_FOUND ) set( HAVE_FFTW3F 1 ) set( HAVE_FFTW3 1 ) + if( NOT "${FFTW_INCLUDE_DIRS}" STREQUAL "" ) + include_directories ("${FFTW_INCLUDE_DIRS}") + endif( NOT "${FFTW_INCLUDE_DIRS}" STREQUAL "" ) endif( NOT FFTW_FOUND ) else( WITH_FFTW ) diff --git a/graphics/pfstools/pkg-plist b/graphics/pfstools/pkg-plist index 432962f09cc8..8ab47691d3a3 100644 --- a/graphics/pfstools/pkg-plist +++ b/graphics/pfstools/pkg-plist @@ -1,158 +1,158 @@ bin/dcraw2hdrgen bin/jpeg2hdrgen bin/pfsabsolute %%ALIGN%%bin/pfsalign bin/pfscat bin/pfsclamp bin/pfscolortransform bin/pfscut bin/pfsdisplayfunction bin/pfsextractchannels bin/pfsflip bin/pfsgamma %%GLVIEW%%bin/pfsglview bin/pfshdrcalibrate bin/pfsin bin/pfsindcraw %%OPENEXR%%bin/pfsinexr bin/pfsinhdrgen %%IMAGEMAGICK%%bin/pfsinimgmagick bin/pfsinme bin/pfsinpfm %%TIFF%%%%NETPBM%%bin/pfsinppm bin/pfsinrgbe %%TIFF%%bin/pfsintiff bin/pfsinyuv %%OCTAVE%%bin/pfsoctavelum %%OCTAVE%%bin/pfsoctavergb bin/pfsout %%OPENEXR%%bin/pfsoutexr %%IMAGEMAGICK%%bin/pfsouthdrhtml %%IMAGEMAGICK%%bin/pfsoutimgmagick bin/pfsoutpfm %%TIFF%%%%NETPBM%%bin/pfsoutppm bin/pfsoutrgbe %%TIFF%%bin/pfsouttiff bin/pfsoutyuv bin/pfspad bin/pfspanoramic bin/pfsplotresponse bin/pfsretime bin/pfsrotate bin/pfssize %%OCTAVE%%bin/pfsstat bin/pfstag bin/pfstmo_drago03 bin/pfstmo_durand02 bin/pfstmo_fattal02 %%FFTW%%bin/pfstmo_ferradans11 bin/pfstmo_mai11 bin/pfstmo_mantiuk06 %%GSL%%bin/pfstmo_mantiuk08 bin/pfstmo_pattanaik00 bin/pfstmo_reinhard02 bin/pfstmo_reinhard05 %%VIEW%%bin/pfsv %%VIEW%%bin/pfsview include/pfs/array2d.h include/pfs/pfs.h lib/libpfs.so lib/libpfs.so.2 lib/libpfs.so.2.0.0 %%OCTAVE%%%%OCTAVE_SITE_OCT%%/pfstools/pfsclose.oct %%OCTAVE%%%%OCTAVE_SITE_OCT%%/pfstools/pfsget.oct %%OCTAVE%%%%OCTAVE_SITE_OCT%%/pfstools/pfsopen.oct %%OCTAVE%%%%OCTAVE_SITE_OCT%%/pfstools/pfsput.oct %%OCTAVE%%%%OCTAVE_SITE_OCT%%/pfstools/pfsread.oct %%OCTAVE%%%%OCTAVE_SITE_OCT%%/pfstools/pfstransform_colorspace.oct %%OCTAVE%%%%OCTAVE_SITE_OCT%%/pfstools/pfswrite.oct libdata/pkgconfig/pfs.pc -man/man1/dcraw2hdrgen.1.gz -man/man1/jpeg2hdrgen.1.gz -man/man1/pfsabsolute.1.gz -%%ALIGN%%man/man1/pfsalign.1.gz -man/man1/pfscat.1.gz -man/man1/pfsclamp.1.gz -man/man1/pfscolortransform.1.gz -man/man1/pfscut.1.gz -man/man1/pfsdisplayfunction.1.gz -man/man1/pfsextractchannels.1.gz -man/man1/pfsflip.1.gz -man/man1/pfsgamma.1.gz -%%GLVIEW%%man/man1/pfsglview.1.gz -man/man1/pfshdrcalibrate.1.gz -man/man1/pfsin.1.gz -man/man1/pfsindcraw.1.gz -%%OPENEXR%%man/man1/pfsinexr.1.gz -man/man1/pfsinhdrgen.1.gz -%%IMAGEMAGICK%%man/man1/pfsinimgmagick.1.gz -man/man1/pfsinme.1.gz -man/man1/pfsinpfm.1.gz -%%TIFF%%%%NETPBM%%man/man1/pfsinppm.1.gz -man/man1/pfsinrgbe.1.gz -%%TIFF%%man/man1/pfsintiff.1.gz -man/man1/pfsinyuv.1.gz -%%OCTAVE%%man/man1/pfsoctavelum.1.gz -%%OCTAVE%%man/man1/pfsoctavergb.1.gz -man/man1/pfsout.1.gz -%%OPENEXR%%man/man1/pfsoutexr.1.gz -%%IMAGEMAGICK%%man/man1/pfsouthdrhtml.1.gz -%%IMAGEMAGICK%%man/man1/pfsoutimgmagick.1.gz -man/man1/pfsoutpfm.1.gz -%%TIFF%%%%NETPBM%%man/man1/pfsoutppm.1.gz -man/man1/pfsoutrgbe.1.gz -%%TIFF%%man/man1/pfsouttiff.1.gz -man/man1/pfsoutyuv.1.gz -man/man1/pfspad.1.gz -man/man1/pfspanoramic.1.gz -man/man1/pfsplotresponse.1.gz -man/man1/pfsretime.1.gz -man/man1/pfsrotate.1.gz -man/man1/pfssize.1.gz -%%OCTAVE%%man/man1/pfsstat.1.gz -man/man1/pfstag.1.gz -man/man1/pfstmo_drago03.1.gz -man/man1/pfstmo_durand02.1.gz -man/man1/pfstmo_fattal02.1.gz -%%FFTW%%man/man1/pfstmo_ferradans11.1.gz -man/man1/pfstmo_mai11.1.gz -man/man1/pfstmo_mantiuk06.1.gz -%%GSL%%man/man1/pfstmo_mantiuk08.1.gz -man/man1/pfstmo_pattanaik00.1.gz -man/man1/pfstmo_reinhard02.1.gz -man/man1/pfstmo_reinhard05.1.gz -%%VIEW%%man/man1/pfsview.1.gz +share/man/man1/dcraw2hdrgen.1.gz +share/man/man1/jpeg2hdrgen.1.gz +share/man/man1/pfsabsolute.1.gz +%%ALIGN%%share/man/man1/pfsalign.1.gz +share/man/man1/pfscat.1.gz +share/man/man1/pfsclamp.1.gz +share/man/man1/pfscolortransform.1.gz +share/man/man1/pfscut.1.gz +share/man/man1/pfsdisplayfunction.1.gz +share/man/man1/pfsextractchannels.1.gz +share/man/man1/pfsflip.1.gz +share/man/man1/pfsgamma.1.gz +%%GLVIEW%%share/man/man1/pfsglview.1.gz +share/man/man1/pfshdrcalibrate.1.gz +share/man/man1/pfsin.1.gz +share/man/man1/pfsindcraw.1.gz +%%OPENEXR%%share/man/man1/pfsinexr.1.gz +share/man/man1/pfsinhdrgen.1.gz +%%IMAGEMAGICK%%share/man/man1/pfsinimgmagick.1.gz +share/man/man1/pfsinme.1.gz +share/man/man1/pfsinpfm.1.gz +%%TIFF%%%%NETPBM%%share/man/man1/pfsinppm.1.gz +share/man/man1/pfsinrgbe.1.gz +%%TIFF%%share/man/man1/pfsintiff.1.gz +share/man/man1/pfsinyuv.1.gz +%%OCTAVE%%share/man/man1/pfsoctavelum.1.gz +%%OCTAVE%%share/man/man1/pfsoctavergb.1.gz +share/man/man1/pfsout.1.gz +%%OPENEXR%%share/man/man1/pfsoutexr.1.gz +%%IMAGEMAGICK%%share/man/man1/pfsouthdrhtml.1.gz +%%IMAGEMAGICK%%share/man/man1/pfsoutimgmagick.1.gz +share/man/man1/pfsoutpfm.1.gz +%%TIFF%%%%NETPBM%%share/man/man1/pfsoutppm.1.gz +share/man/man1/pfsoutrgbe.1.gz +%%TIFF%%share/man/man1/pfsouttiff.1.gz +share/man/man1/pfsoutyuv.1.gz +share/man/man1/pfspad.1.gz +share/man/man1/pfspanoramic.1.gz +share/man/man1/pfsplotresponse.1.gz +share/man/man1/pfsretime.1.gz +share/man/man1/pfsrotate.1.gz +share/man/man1/pfssize.1.gz +%%OCTAVE%%share/man/man1/pfsstat.1.gz +share/man/man1/pfstag.1.gz +share/man/man1/pfstmo_drago03.1.gz +share/man/man1/pfstmo_durand02.1.gz +share/man/man1/pfstmo_fattal02.1.gz +%%FFTW%%share/man/man1/pfstmo_ferradans11.1.gz +share/man/man1/pfstmo_mai11.1.gz +share/man/man1/pfstmo_mantiuk06.1.gz +%%GSL%%share/man/man1/pfstmo_mantiuk08.1.gz +share/man/man1/pfstmo_pattanaik00.1.gz +share/man/man1/pfstmo_reinhard02.1.gz +share/man/man1/pfstmo_reinhard05.1.gz +%%VIEW%%share/man/man1/pfsview.1.gz %%OCTAVE%%%%OCTAVE_SITE_M%%/pfstools/pfs_close_frames.m %%OCTAVE%%%%OCTAVE_SITE_M%%/pfstools/pfs_open_frames.m %%OCTAVE%%%%OCTAVE_SITE_M%%/pfstools/pfs_read_luminance.m %%OCTAVE%%%%OCTAVE_SITE_M%%/pfstools/pfs_read_rgb.m %%OCTAVE%%%%OCTAVE_SITE_M%%/pfstools/pfs_read_xyz.m %%OCTAVE%%%%OCTAVE_SITE_M%%/pfstools/pfs_write_rgb.m %%OCTAVE%%%%OCTAVE_SITE_M%%/pfstools/pfssize.m %%OCTAVE%%%%OCTAVE_SITE_M%%/pfstools/pfsview.m %%OCTAVE%%%%OCTAVE_SITE_M%%/pfstools/pfsview_list.m %%OCTAVE%%%%OCTAVE_SITE_M%%/pfstools/pfsview_rgb.m %%IMAGEMAGICK%%%%DATADIR%%/hdrhtml_c_b2.csv %%IMAGEMAGICK%%%%DATADIR%%/hdrhtml_c_b3.csv %%IMAGEMAGICK%%%%DATADIR%%/hdrhtml_c_b4.csv %%IMAGEMAGICK%%%%DATADIR%%/hdrhtml_c_b5.csv %%IMAGEMAGICK%%%%DATADIR%%/hdrhtml_default_templ/hdrhtml_image_templ.html %%IMAGEMAGICK%%%%DATADIR%%/hdrhtml_default_templ/hdrhtml_page_templ.html %%IMAGEMAGICK%%%%DATADIR%%/hdrhtml_hdrlabs_templ/hdrhtml_assets/hdr_viewer.css %%IMAGEMAGICK%%%%DATADIR%%/hdrhtml_hdrlabs_templ/hdrhtml_assets/hdr_viewer.js %%IMAGEMAGICK%%%%DATADIR%%/hdrhtml_hdrlabs_templ/hdrhtml_assets/information-red.png %%IMAGEMAGICK%%%%DATADIR%%/hdrhtml_hdrlabs_templ/hdrhtml_assets/information.png %%IMAGEMAGICK%%%%DATADIR%%/hdrhtml_hdrlabs_templ/hdrhtml_assets/loading-spinner.gif %%IMAGEMAGICK%%%%DATADIR%%/hdrhtml_hdrlabs_templ/hdrhtml_assets/mootools-1.2.4.js %%IMAGEMAGICK%%%%DATADIR%%/hdrhtml_hdrlabs_templ/hdrhtml_assets/mouse2touch.js %%IMAGEMAGICK%%%%DATADIR%%/hdrhtml_hdrlabs_templ/hdrhtml_assets/slider-black.png %%IMAGEMAGICK%%%%DATADIR%%/hdrhtml_hdrlabs_templ/hdrhtml_assets/slider-red.png %%IMAGEMAGICK%%%%DATADIR%%/hdrhtml_hdrlabs_templ/hdrhtml_assets/slider-white.png %%IMAGEMAGICK%%%%DATADIR%%/hdrhtml_hdrlabs_templ/hdrhtml_image_templ.html %%IMAGEMAGICK%%%%DATADIR%%/hdrhtml_hdrlabs_templ/hdrhtml_image_templ_slider-above.html %%IMAGEMAGICK%%%%DATADIR%%/hdrhtml_hdrlabs_templ/hdrhtml_page_templ.html %%IMAGEMAGICK%%%%DATADIR%%/hdrhtml_hdrlabs_templ/hdrhtml_page_templ_short.html %%IMAGEMAGICK%%%%DATADIR%%/hdrhtml_t_b2.csv %%IMAGEMAGICK%%%%DATADIR%%/hdrhtml_t_b3.csv %%IMAGEMAGICK%%%%DATADIR%%/hdrhtml_t_b4.csv %%IMAGEMAGICK%%%%DATADIR%%/hdrhtml_t_b5.csv