Index: head/graphics/cimg/Makefile =================================================================== --- head/graphics/cimg/Makefile (revision 408948) +++ head/graphics/cimg/Makefile (revision 408949) @@ -1,140 +1,140 @@ # Created by: thierry@pompo.net # $FreeBSD$ PORTNAME= cimg DISTVERSIONPREFIX= v -DISTVERSION= 1.6.8 +DISTVERSION= 1.6.9 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 ONLY_FOR_ARCHS= i386 amd64 ONLY_FOR_ARCHS_REASON= "invokes i386 asm" USE_GITHUB= yes GH_ACCOUNT= dtschump GH_PROJECT= CImg GH_TAGNAME= ${DISTVERSIONPREFIX}.${DISTVERSION:S/.//g} .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 .endif .if ${PORT_OPTIONS:MDOCS} REINPLACE_ARGS= -i "" LIB_DEPENDS+= libboard.so:${PORTSDIR}/graphics/libboard . if !defined(WITH_DEBUG) LIB_DEPENDS+= libpng.so:${PORTSDIR}/graphics/png \ libtiff.so:${PORTSDIR}/graphics/tiff \ libIlmImf.so:${PORTSDIR}/graphics/OpenEXR \ libgimp-2.0.so:${PORTSDIR}/graphics/gimp-app \ libfftw3.so:${PORTSDIR}/math/fftw3 \ libopencv_legacy.so:${PORTSDIR}/graphics/opencv \ libopencv_core.so:${PORTSDIR}/graphics/opencv-core\ libGraphicsMagick.so:${PORTSDIR}/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:${PORTSDIR}/graphics/xmedcon . endif . if !defined(WITHOUT_FFMPEG) LIB_DEPENDS+= libavformat.so:${PORTSDIR}/multimedia/ffmpeg . endif . if !defined(WITHOUT_LAPACK) # Don't really need Fortran, but required to link with blas/lapack USES+= fortran . endif . if defined(WITH_XSHM) USE_XORG+= xext . endif DOCBASE= README.txt 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|#CIMG_FFMPEG_CFLAGS|CIMG_FFMPEG_CFLAGS|' \ -e 's|#CIMG_FFMPEG_LDFLAGS|CIMG_FFMPEG_LDFLAGS|' \ ${BUILD_WRKSRC}/Makefile . endif . if !defined(WITHOUT_LAPACK) ${REINPLACE_CMD} -e 's|#CIMG_LAPACK_CFLAGS|CIMG_LAPACK_CFLAGS|' \ -e 's|#CIMG_LAPACK_LIBS|CIMG_LAPACK_LIBS|' \ -e 's|-lblas -llapack|-L${LOCALBASE}/lib ${BLASLIB} ${LAPACKLIB}|' \ ${BUILD_WRKSRC}/Makefile . endif . if defined(WITH_XSHM) ${REINPLACE_CMD} -e 's|CIMG_XSHM_CFLAGS = #|CIMG_XSHM_CFLAGS =|' \ -e 's|CIMG_XSHM_LDFLAGS = #|CIMG_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 408948) +++ head/graphics/cimg/distinfo (revision 408949) @@ -1,2 +1,2 @@ -SHA256 (dtschump-CImg-v1.6.8-v.168_GH0.tar.gz) = 1f867e529be37ad8fdefcf9775253f812bd34bf20ae874f92cb48a95cc56adce -SIZE (dtschump-CImg-v1.6.8-v.168_GH0.tar.gz) = 18677979 +SHA256 (dtschump-CImg-v1.6.9-v.169_GH0.tar.gz) = d8b304e537a64a9d3213669bf52d3282490b84347248460c9a8bb3a0cf0f22c7 +SIZE (dtschump-CImg-v1.6.9-v.169_GH0.tar.gz) = 18776098 Index: head/graphics/cimg/files/patch-examples__Makefile =================================================================== --- head/graphics/cimg/files/patch-examples__Makefile (revision 408948) +++ head/graphics/cimg/files/patch-examples__Makefile (revision 408949) @@ -1,149 +1,141 @@ ---- examples/Makefile.orig 2015-10-23 10:38:38 UTC +--- examples/Makefile.orig 2016-02-04 15:57:56 UTC +++ examples/Makefile -@@ -85,8 +85,8 @@ CIMG_EXTRA_FILES = use_tiff_stream use_j +@@ -85,7 +85,7 @@ CIMG_EXTRA_FILES = use_tiff_stream use_j # Set correct variables and paths #--------------------------------- CIMG_VERSION = _cimg_version -X11PATH = /usr/X11R6 --CC = g++ +X11PATH = $(LOCALBASE) -+CC = $(CXX) EXEPFX = ifeq ($(MSYSTEM),MINGW32) EXESFX = .exe -@@ -105,7 +105,7 @@ CCVER = "icpc \( `$(CC) -v 2>&1`\ +@@ -104,7 +104,7 @@ CXXVER = "icpc \( `$(CXX) -v 2>&1` CFLAGS = -I.. LIBS = else -CFLAGS = -I.. -Wall -W +CFLAGS = -I.. -Wall -W $(CPPFLAGS) LIBS = -lm endif -@@ -129,12 +129,12 @@ CIMG_VT100_CFLAGS = -Dcimg_use_vt100 +@@ -128,7 +128,7 @@ CIMG_VT100_CFLAGS = -Dcimg_use_vt100 # Flags to enable code optimization by the compiler. - ifeq ($(notdir $(CC)),g++) + ifeq ($(notdir $(CXX)),g++) -CIMG_OPT_CFLAGS = -O2 -mtune=generic +CIMG_OPT_CFLAGS = -mtune=generic else - ifeq ($(notdir $(CC)),icpc) + ifeq ($(notdir $(CXX)),icpc) CIMG_OPT_CFLAGS = -fast - else --CIMG_OPT_CFLAGS = -O2 -+CIMG_OPT_CFLAGS = - endif - endif +@@ -148,7 +148,7 @@ endif -@@ -149,7 +149,7 @@ endif - # Flags to enable OpenCV support. CIMG_OPENCV_DEFINE = -Dcimg_use_opencv -CIMG_OPENCV_INCDIR = -I/usr/include/opencv +CIMG_OPENCV_INCDIR = -I$(LOCALBASE)/include/opencv CIMG_OPENCV_CFLAGS = $(CIMG_OPENCV_DEFINE) $(CIMG_OPENCV_INCDIR) CIMG_OPENCV_LIBS = -lopencv_core -lopencv_highgui #CIMG_OPENCV_LIBS = -lcv -lhighgui #-> Use this for OpenCV < 2.2.0 -@@ -163,7 +163,7 @@ CIMG_NODISPLAY_CFLAGS = -Dcimg_display=0 +@@ -162,7 +162,7 @@ CIMG_NODISPLAY_CFLAGS = -Dcimg_display=0 CIMG_X11_DEFINE = -Dcimg_display=1 CIMG_X11_INCDIR = -I$(X11PATH)/include CIMG_X11_CFLAGS = $(CIMG_X11_DEFINE) $(CIMG_X11_INCDIR) -CIMG_X11_LIBS = -L$(X11PATH)/lib -lpthread -lX11 +CIMG_X11_LIBS = -L$(X11PATH)/lib -lX11 $(PTHREAD_LIBS) # Flags to enable fast image display, using the XSHM library (when using X11). # !!! Seems to randomly crash when used on MacOSX and 64bits systems, so use it only when necessary !!! -@@ -203,7 +203,7 @@ CIMG_JPEG_LIBS = -ljpeg +@@ -202,7 +202,7 @@ CIMG_JPEG_LIBS = -ljpeg CIMG_TIFF_DEFINE = -Dcimg_use_tiff CIMG_TIFF_INCDIR = CIMG_TIFF_CFLAGS = $(CIMG_TIFF_DEFINE) $(CIMG_TIFF_INCDIR) -CIMG_TIFF_LIBS = -ltiff +CIMG_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,14 +215,14 @@ CIMG_MINC2_LIBS = -lminc_io -lvolume_io2 +@@ -214,14 +214,14 @@ CIMG_MINC2_LIBS = -lminc_io -lvolume_io2 # Flags to enable native support for EXR image files, using the OpenEXR library. # ( http://www.openexr.com/ ) CIMG_EXR_DEFINE = -Dcimg_use_openexr -CIMG_EXR_INCDIR = -I/usr/include/OpenEXR +CIMG_EXR_INCDIR = -I$(LOCALBASE)/include/OpenEXR CIMG_EXR_CFLAGS = $(CIMG_EXR_DEFINE) $(CIMG_EXR_INCDIR) CIMG_EXR_LIBS = -lIlmImf -lHalf # Flags to enable native support for various video files, using the FFMPEG library. # ( http://www.ffmpeg.org/ ) CIMG_FFMPEG_DEFINE = -Dcimg_use_ffmpeg -D__STDC_CONSTANT_MACROS -CIMG_FFMPEG_INCDIR = -I/usr/include/libavcodec -I/usr/include/libavformat -I/usr/include/libswscale -I/usr/include/ffmpeg +CIMG_FFMPEG_INCDIR = -I$(LOCALBASE)/include/libavcodec -I$(LOCALBASE)/include/libavformat -I$(LOCALBASE)/include/libswscale -I$(LOCALBASE)/include/ffmpeg CIMG_FFMPEG_CFLAGS = $(CIMG_FFMPEG_DEFINE) $(CIMG_FFMPEG_INCDIR) CIMG_FFMPEG_LIBS = -lavcodec -lavformat -lswscale -@@ -240,12 +240,12 @@ CIMG_CURL_INCDIR = +@@ -239,12 +239,12 @@ CIMG_CURL_INCDIR = CIMG_CURL_CFLAGS = $(CIMG_CURL_DEFINE) CIMG_CURL_LIBS = -lcurl -# Flags to enable native support of most classical image file formats, using the Magick++ library. +# Flags to enable native support of most classical image file formats, using the GraphicsMagick++ library. # ( http://www.imagemagick.org/Magick++/ ) CIMG_MAGICK_DEFINE = -Dcimg_use_magick -CIMG_MAGICK_INCDIR = `Magick++-config --cppflags` `Magick++-config --cxxflags` +CIMG_MAGICK_INCDIR = `GraphicsMagick++-config --cppflags` `GraphicsMagick++-config --cxxflags` CIMG_MAGICK_CFLAGS = $(CIMG_MAGICK_DEFINE) $(CIMG_MAGICK_INCDIR) -CIMG_MAGICK_LIBS = `Magick++-config --ldflags` `Magick++-config --libs` +CIMG_MAGICK_LIBS = `GraphicsMagick++-config --ldflags` `GraphicsMagick++-config --libs` # Flags to enable faster Discrete Fourier Transform computation, using the FFTW3 library # ( http://www.fftw.org/ ) -@@ -262,16 +262,19 @@ endif +@@ -261,16 +261,19 @@ endif # ( http://www.netlib.org/lapack/ ) CIMG_LAPACK_DEFINE = -Dcimg_use_lapack CIMG_LAPACK_INCDIR = -CIMG_LAPACK_CFLAGS = $(CIMG_LAPACK_DEFINE) $(CIMG_LAPACK_INCDIR) -CIMG_LAPACK_LIBS = -lblas -lg2c -llapack +#CIMG_LAPACK_CFLAGS = $(CIMG_LAPACK_DEFINE) $(CIMG_LAPACK_INCDIR) +#CIMG_LAPACK_LIBS = -lblas -llapack # Flags to enable the use of the Board library # ( http://libboard.sourceforge.net/ ) CIMG_BOARD_DEFINE = -Dcimg_use_board -CIMG_BOARD_INCDIR = -I/usr/include/board +CIMG_BOARD_INCDIR = -I$(LOCALBASE)/include/board CIMG_BOARD_CFLAGS = $(CIMG_BOARD_DEFINE) $(CIMG_BOARD_INCDIR) CIMG_BOARD_LIBS = -lboard +# Flags to compile on FreeBSD +CIMG_FREEBSD_LDFLAGS = $(LDFLAGS) -ansi -ffast-math -I$(X11PATH)/include $(EXTRA_FLAGS) -lX11 -L$(X11PATH)/lib + # Flags to compile on Sun Solaris CIMG_SOLARIS_LIBS = -R$(X11PATH)/lib -lrt -lnsl -lsocket -@@ -344,7 +347,8 @@ $(CIMG_XSHM_CFLAGS)" \ +@@ -343,7 +346,8 @@ $(CIMG_XSHM_CFLAGS)" \ "CONF_LIBS = \ $(CIMG_X11_LIBS) \ $(CIMG_TIFF_LIBS) \ -$(CIMG_XSHM_LIBS)" \ +$(CIMG_XSHM_LIBS) \ +$(PTHREAD_LIBS)" \ all $(CIMG_EXTRA_FILES) # Linux/BSD/Mac OSX targets, with X11 display. -@@ -413,8 +417,10 @@ $(CIMG_ZLIB_CFLAGS) \ +@@ -412,8 +416,10 @@ $(CIMG_ZLIB_CFLAGS) \ $(CIMG_CURL_CFLAGS) \ $(CIMG_OPENCV_CFLAGS) \ $(CIMG_MAGICK_CFLAGS) \ +$(CIMG_LAPACK_CFLAGS) \ $(CIMG_FFTW3_CFLAGS)" \ "CONF_LIBS = \ +$(CIMG_FREEBSD_LDFLAGS) \ $(CIMG_X11_LIBS) \ $(CIMG_XSHM_LIBS) \ $(CIMG_XRANDR_LIBS) \ -@@ -426,6 +432,7 @@ $(CIMG_ZLIB_LIBS) \ +@@ -425,6 +431,7 @@ $(CIMG_ZLIB_LIBS) \ $(CIMG_CURL_LIBS) \ $(CIMG_OPENCV_LIBS) \ $(CIMG_MAGICK_LIBS) \ +$(CIMG_LAPACK_LIBS) \ $(CIMG_FFTW3_LIBS)" \ "STRIP_EXE=true" \ all $(CIMG_EXTRA_FILES) Index: head/graphics/cimg/files/patch-plugins_tiff__stream.h =================================================================== --- head/graphics/cimg/files/patch-plugins_tiff__stream.h (nonexistent) +++ head/graphics/cimg/files/patch-plugins_tiff__stream.h (revision 408949) @@ -0,0 +1,12 @@ +--- plugins/tiff_stream.h.orig 2016-02-04 15:57:56 UTC ++++ plugins/tiff_stream.h +@@ -102,7 +102,8 @@ const CImg& save_tiff(std::ostream *t + TIFF *tif = TIFFStreamOpen("MemTiff", tiffOutStream); + if (tif) + { +- cimg_forZ(*this,z) get_slice(z)._save_tiff(tif,z,compression_type,0,0); ++/* Upstream fix for issue #42 */ ++ cimg_forZ(*this,z) get_slice(z)._save_tiff(tif,z,z,compression_type,0,0); + tiffOutStream->flush(); + TIFFClose(tif); + } Property changes on: head/graphics/cimg/files/patch-plugins_tiff__stream.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/graphics/cimg/pkg-descr =================================================================== --- head/graphics/cimg/pkg-descr (revision 408948) +++ head/graphics/cimg/pkg-descr (revision 408949) @@ -1,24 +1,24 @@ CImg stands for Cool Image: it is simple to use and efficient. . The CImg Library is a free C++ toolkit providing simple classes and functions to load, save, process and display images in your own C++ code. . It is highly portable and fully works on Unix/X11, Windows and MacOS X operating systems. It should compile on other systems as well (eventually without display capabilities). . It consists only of a single header file CImg.h that must be included in your program source. . It contains useful image processing algorithms for loading/saving, resizing/ rotating, filtering, object drawing (text, lines, faces, ellipses,..), etc. . Images are instancied by a class able to represent images up to 4-dimension wide (from 1-D scalar signals to 3-D volumes of vector-valued pixels), with template pixel types. . It depends on a minimal number of libraries: you can compile it with only standard C libraries. No need for exotic libraries and complex dependencies. . Additional features appear with the use of GraphicsMagick: install the GraphicsMagick package to be able to load and save compressed image formats (GIF,BMP,TIF,JPG,PNG,...). . Additional features appear with the use of LAPACK: link your code with the lapack library to be able to compute eigenvalues or eigenvectors of big matrices. -WWW: http://cimg.sourceforge.net/ +WWW: http://cimg.eu/