Index: head/graphics/cimg/Makefile =================================================================== --- head/graphics/cimg/Makefile (revision 486480) +++ head/graphics/cimg/Makefile (revision 486481) @@ -1,150 +1,150 @@ # Created by: thierry@pompo.net # $FreeBSD$ PORTNAME= cimg DISTVERSIONPREFIX= v. -DISTVERSION= 2.4.1 -PORTREVISION= 1 +DISTVERSION= 2.4.2 PORTEPOCH= 3 CATEGORIES= graphics devel MAINTAINER= thierry@FreeBSD.org COMMENT= C++ Template Image Processing Library LICENSE= CeCILL_C CeCILL LICENSE_COMB= dual LICENSE_NAME_CeCILL_C= CeCILL-C LICENSE_NAME_CeCILL= CeCILL LICENSE_FILE_CeCILL_C= ${WRKSRC}/Licence_CeCILL-C_V1-en.txt LICENSE_FILE_CeCILL= ${WRKSRC}/Licence_CeCILL_V2-en.txt LICENSE_PERMS_CeCILL_C= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept LICENSE_PERMS_CeCILL= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept BROKEN_aarch64= invokes x86 assembler BROKEN_armv6= invokes x86 assembler BROKEN_armv7= invokes x86 assembler BROKEN_mips= invokes x86 assembler BROKEN_mips64= invokes x86 assembler BROKEN_sparc64= invokes x86 assembler BROKEN_powerpc64= invokes x86 assembler USE_GITHUB= yes GH_ACCOUNT= dtschump GH_PROJECT= CImg .if !defined(WITHOUT_LAPACK) . if defined(WITH_ATLAS) USES+= blaslapack:atlas . else USES+= blaslapack . endif .endif BUILD_WRKSRC= ${WRKSRC}/examples OPTIONS_DEFINE= DOCS EXAMPLES .include .if ${PORT_OPTIONS:MDOCS} || ${PORT_OPTIONS:MEXAMPLES} USES+= gmake pkgconfig:build .endif .if ${PORT_OPTIONS:MDOCS} REINPLACE_ARGS= -i "" LIB_DEPENDS+= libboard.so:graphics/libboard . if !defined(WITH_DEBUG) LIB_DEPENDS+= libcurl.so:ftp/curl \ libpng.so:graphics/png \ libtiff.so:graphics/tiff \ libHalf.so:graphics/ilmbase \ libIlmImf.so:graphics/openexr \ libgimp-2.0.so:graphics/gimp-app \ libfftw3.so:math/fftw3 \ libopencv_video.so:graphics/opencv \ libopencv_core.so:graphics/opencv-core \ libGraphicsMagick.so:graphics/GraphicsMagick USES+= jpeg ALL_TARGET= Mlinux . else ALL_TARGET= dlinux WITHOUT_MEDCON= yes WITHOUT_FFMPEG= yes WITHOUT_LAPACK= yes . endif . if !defined(WITHOUT_MEDCON) RUN_DEPENDS+= medcon:graphics/xmedcon . endif . if !defined(WITHOUT_FFMPEG) LIB_DEPENDS+= libavformat.so:multimedia/ffmpeg . endif . if !defined(WITHOUT_LAPACK) # Don't really need Fortran, but required to link with blas/lapack USES+= fortran . endif USE_XORG+= x11 xrandr . if defined(WITH_XSHM) USE_XORG+= xext . endif DOCBASE= README.txt +MAKE_ENV+= FREEBSD_LDFLAGS="${LDFLAGS}" PROGS= CImg_demo captcha curve_editor2d dtmri_view3d \ edge_explorer2d fade_images gaussian_fit1d generate_loop_macros \ hough_transform2d image2ascii image_registration2d image_surface3d \ jawbreaker mcf_levelsets2d mcf_levelsets3d odykill \ pde_TschumperleDeriche2d pde_heatflow2d plotter1d radon_transform2d \ scene3d spherical_function3d tetris tron tutorial use_RGBclass \ use_chlpca use_draw_gradient use_jpeg_buffer use_nlmeans use_skeleton \ wavelet_atrous .else NO_BUILD= yes .endif .include pre-configure-DOCS-on: ${REINPLACE_CMD} -e 's|make|${MAKE_CMD}|' ${BUILD_WRKSRC}/Makefile pre-configure-DOCS-off: ${REINPLACE_CMD} -e 's|^OPTFLAGS|#OPTFLAGS|' ${BUILD_WRKSRC}/Makefile pre-configure: . if !defined(WITHOUT_FFMPEG) ${REINPLACE_CMD} -e 's|#FFMPEG_CFLAGS|FFMPEG_CFLAGS|' \ -e 's|#FFMPEG_DEFINE|FFMPEG_DEFINE|' \ -e 's|#FFMPEG_LIBS|FFMPEG_LIBS|' \ ${BUILD_WRKSRC}/Makefile . endif . if !defined(WITHOUT_LAPACK) ${REINPLACE_CMD} -e 's|#LAPACK_CFLAGS|LAPACK_CFLAGS|' \ -e 's|#LAPACK_DEFINE|LAPACK_DEFINE|' \ -e 's|#LAPACK_LIBS|LAPACK_LIBS|' \ -e 's|-lblas -llapack|-L${LOCALBASE}/lib ${BLASLIB} ${LAPACKLIB}|' \ ${BUILD_WRKSRC}/Makefile . endif . if defined(WITH_XSHM) ${REINPLACE_CMD} -e 's|XSHM_CFLAGS = #|XSHM_CFLAGS =|' \ -e 's|XSHM_LDFLAGS = #|XSHM_LDFLAGS =|' \ ${BUILD_WRKSRC}/Makefile . endif ${REINPLACE_CMD} -e 's|-pedantic|${CFLAGS}|' ${BUILD_WRKSRC}/Makefile do-install: ${INSTALL_DATA} ${WRKSRC}/CImg.h ${STAGEDIR}${PREFIX}/include do-install-DOCS-on: ${INSTALL_PROGRAM} ${PROGS:C|^|${BUILD_WRKSRC}/|} ${STAGEDIR}${PREFIX}/bin ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${DOCBASE:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} do-install-EXAMPLES-on: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${CP} -R ${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR} @(cd ${STAGEDIR}${EXAMPLESDIR} && ${MAKE_CMD} clean) @${RM} ${STAGEDIR}${EXAMPLESDIR}/*.orig .include Index: head/graphics/cimg/distinfo =================================================================== --- head/graphics/cimg/distinfo (revision 486480) +++ head/graphics/cimg/distinfo (revision 486481) @@ -1,3 +1,3 @@ -TIMESTAMP = 1541016670 -SHA256 (dtschump-CImg-v.2.4.1_GH0.tar.gz) = 8249610a17197747219ee5f7cb64c8ddb7749d396d89c3ebc853b049b37701f0 -SIZE (dtschump-CImg-v.2.4.1_GH0.tar.gz) = 11072570 +TIMESTAMP = 1543780030 +SHA256 (dtschump-CImg-v.2.4.2_GH0.tar.gz) = 8e4b375c3b50827cdaa399d259ca8223450d674c52dd538c672ae6da1c6607ef +SIZE (dtschump-CImg-v.2.4.2_GH0.tar.gz) = 11074772 Index: head/graphics/cimg/files/patch-examples__Makefile =================================================================== --- head/graphics/cimg/files/patch-examples__Makefile (revision 486480) +++ head/graphics/cimg/files/patch-examples__Makefile (revision 486481) @@ -1,121 +1,112 @@ ---- examples/Makefile.orig 2018-10-02 08:22:30 UTC +--- examples/Makefile.orig 2018-11-30 12:37:36 UTC +++ examples/Makefile -@@ -84,7 +84,7 @@ EXTRA_FILES = use_tiff_stream use_jpeg_b - # Set correct variables and paths - #--------------------------------- - VERSION = `grep 'cimg_version\ ' ../CImg.h | tail -c4 | head -c3` --X11PATH = /usr/X11R6 -+X11PATH = $(LOCALBASE) - EXEPFX = - ifeq ($(MSYSTEM),MINGW32) - EXESFX = .exe -@@ -107,7 +107,7 @@ CXXVER = "icpc \( `$(CXX) -v 2>&1` - CFLAGS = -I.. - LIBS = - else --CFLAGS = -I.. -Wall -Wextra -Wfatal-errors -+CFLAGS = -I.. -Wall -Wextra $(CPPFLAGS) - LIBS = -lm +@@ -89,7 +89,7 @@ VERSION2 = $(shell grep 'cimg_version\ ' + VERSION3 = $(shell grep 'cimg_version\ ' ../CImg.h | tail -c2 | head -c1) + SVERSION=$(VERSION1).$(VERSION2).$(VERSION3) + +-X11PATH = /usr/X11R6 ++X11PATH = $(LOCALBASE) + + EXE_PRE = + EXE_EXT = +@@ -111,7 +111,7 @@ IS_ICPC = 1 endif -@@ -131,12 +131,12 @@ VT100_CFLAGS = -Dcimg_use_vt100 + CXXVER = $(CXX) +-CFLAGS = -I.. -Wall -Wextra -Wfatal-errors ++CFLAGS = -I.. -Wall -Wextra $(CPPFLAGS) + LIBS = -lm + ifdef IS_GCC + CXXVER = $(shell $(CXX) -v 2>&1 | tail -n 1) +@@ -144,9 +144,9 @@ DEBUG_CFLAGS = -Dcimg_verbosity=3 -Dcimg + VT100_CFLAGS = -Dcimg_use_vt100 # Flags to enable code optimization by the compiler. - ifeq ($(notdir $(CXX)),g++) --OPT_CFLAGS = -Ofast -mtune=generic -+OPT_CFLAGS = -mtune=generic - else - ifeq ($(notdir $(CXX)),icpc) - OPT_CFLAGS = -fast - else -OPT_CFLAGS = -Ofast +OPT_CFLAGS = # -Ofast - handled by the port CFLAGS + ifdef IS_GCC +-OPT_CFLAGS = -Ofast -mtune=generic ++OPT_CFLAGS = -mtune=generic endif - endif - -@@ -203,7 +203,7 @@ JPEG_LIBS = -ljpeg + ifdef IS_ICPC + OPT_CFLAGS = -fast +@@ -217,7 +217,7 @@ JPEG_LIBS = -ljpeg TIFF_DEFINE = -Dcimg_use_tiff TIFF_INCDIR = TIFF_CFLAGS = $(TIFF_DEFINE) $(TIFF_INCDIR) -TIFF_LIBS = -ltiff +TIFF_LIBS = -ltiff -ltiffxx # Flags to enable native support for MINC2 image files, using the MINC2 library. # ( http://en.wikibooks.org/wiki/MINC/Reference/MINC2.0_Users_Guide ) -@@ -215,16 +215,16 @@ MINC2_LIBS = -lminc_io -lvolume_io2 -lmi +@@ -229,16 +229,16 @@ MINC2_LIBS = -lminc_io -lvolume_io2 -lmi # Flags to enable native support for EXR image files, using the OpenEXR library. # ( http://www.openexr.com/ ) OPENEXR_DEFINE = -Dcimg_use_openexr -OPENEXR_INCDIR = -I/usr/include/OpenEXR +OPENEXR_INCDIR = -I$(LOCALBASE)/include/OpenEXR OPENEXR_CFLAGS = $(OPENEXR_DEFINE) $(OPENEXR_INCDIR) OPENEXR_LIBS = -lIlmImf -lHalf # Flags to enable native support for various video files, using the FFMPEG library. # ( http://www.ffmpeg.org/ ) -FFMPEG_DEFINE = -Dcimg_use_ffmpeg -D__STDC_CONSTANT_MACROS -FFMPEG_INCDIR = -I/usr/include/libavcodec -I/usr/include/libavformat -I/usr/include/libswscale -I/usr/include/ffmpeg -FFMPEG_CFLAGS = $(FFMPEG_DEFINE) $(FFMPEG_INCDIR) -FFMPEG_LIBS = -lavcodec -lavformat -lswscale +#FFMPEG_DEFINE = -Dcimg_use_ffmpeg -D__STDC_CONSTANT_MACROS +FFMPEG_INCDIR = -I$(LOCALBASE)/include/libavcodec -I$(LOCALBASE)/include/libavformat -I$(LOCALBASE)/include/libswscale -I$(LOCALBASE)/include/ffmpeg +#FFMPEG_CFLAGS = $(FFMPEG_DEFINE) $(FFMPEG_INCDIR) +#FFMPEG_LIBS = -lavcodec -lavformat -lswscale # Flags to enable native support for compressed .cimgz files, using the Zlib library. # ( http://www.zlib.net/ ) -@@ -260,18 +260,21 @@ endif +@@ -274,15 +274,15 @@ endif # Flags to enable the use of LAPACK routines for matrix computation # ( http://www.netlib.org/lapack/ ) -LAPACK_DEFINE = -Dcimg_use_lapack +#LAPACK_DEFINE = -Dcimg_use_lapack LAPACK_INCDIR = -LAPACK_CFLAGS = $(LAPACK_DEFINE) $(LAPACK_INCDIR) -LAPACK_LIBS = -lblas -llapack +#LAPACK_CFLAGS = $(LAPACK_DEFINE) $(LAPACK_INCDIR) +#LAPACK_LIBS = -lblas -llapack # Flags to enable the use of the Board library - # ( http://libboard.sourceforge.net/ ) + # ( https://github.com/c-koi/libboard ) BOARD_DEFINE = -Dcimg_use_board -BOARD_INCDIR = -I/usr/include/board +BOARD_INCDIR = -I$(LOCALBASE)/include/board BOARD_CFLAGS = $(BOARD_DEFINE) $(BOARD_INCDIR) BOARD_LIBS = -lboard -+# Flags to compile on FreeBSD -+FREEBSD_LDFLAGS = $(LDFLAGS) -ffast-math -I$(X11PATH)/include $(EXTRA_FLAGS) -lX11 -L$(X11PATH)/lib -+ - # Flags to compile on Sun Solaris - SOLARIS_LIBS = -R$(X11PATH)/lib -lrt -lnsl -lsocket - -@@ -347,6 +350,7 @@ $(X11_LIBS) \ +@@ -361,6 +361,7 @@ $(X11_LIBS) \ $(TIFF_LIBS) \ $(LAPACK_LIBS) \ $(XSHM_LIBS)" \ +$(PTHREAD_LIBS)" \ all $(EXTRA_FILES) # Linux/BSD/Mac OSX targets, with X11 display. -@@ -439,8 +443,11 @@ $(ZLIB_CFLAGS) \ +@@ -453,8 +454,11 @@ $(ZLIB_CFLAGS) \ $(CURL_CFLAGS) \ $(OPENCV_CFLAGS) \ $(MAGICK_CFLAGS) \ +$(LAPACK_CFLAGS) \ +$(BOARD_CFLAGS) \ $(FFTW3_CFLAGS)" \ "CONF_LIBS = \ +$(FREEBSD_LDFLAGS) \ $(X11_LIBS) \ $(XSHM_LIBS) \ $(XRANDR_LIBS) \ -@@ -452,6 +459,8 @@ $(ZLIB_LIBS) \ +@@ -466,6 +470,8 @@ $(ZLIB_LIBS) \ $(CURL_LIBS) \ $(OPENCV_LIBS) \ $(MAGICK_LIBS) \ +$(LAPACK_LIBS) \ +$(BOARD_LIBS) \ $(FFTW3_LIBS)" \ "STRIP_EXE=true" \ all $(EXTRA_FILES)