Date: Mon, 15 Feb 2016 18:41:28 +0000 (UTC) From: Thierry Thomas <thierry@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r408949 - in head/graphics/cimg: . files Message-ID: <201602151841.u1FIfSkM073592@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: thierry Date: Mon Feb 15 18:41:28 2016 New Revision: 408949 URL: https://svnweb.freebsd.org/changeset/ports/408949 Log: Upgrade to v. 1.6.9. Added: head/graphics/cimg/files/patch-plugins_tiff__stream.h (contents, props changed) Modified: head/graphics/cimg/Makefile head/graphics/cimg/distinfo head/graphics/cimg/files/patch-examples__Makefile head/graphics/cimg/pkg-descr Modified: head/graphics/cimg/Makefile ============================================================================== --- head/graphics/cimg/Makefile Mon Feb 15 18:37:57 2016 (r408948) +++ head/graphics/cimg/Makefile Mon Feb 15 18:41:28 2016 (r408949) @@ -3,7 +3,7 @@ PORTNAME= cimg DISTVERSIONPREFIX= v -DISTVERSION= 1.6.8 +DISTVERSION= 1.6.9 PORTEPOCH= 3 CATEGORIES= graphics devel Modified: head/graphics/cimg/distinfo ============================================================================== --- head/graphics/cimg/distinfo Mon Feb 15 18:37:57 2016 (r408948) +++ head/graphics/cimg/distinfo Mon Feb 15 18:41:28 2016 (r408949) @@ -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 Modified: head/graphics/cimg/files/patch-examples__Makefile ============================================================================== --- head/graphics/cimg/files/patch-examples__Makefile Mon Feb 15 18:37:57 2016 (r408948) +++ head/graphics/cimg/files/patch-examples__Makefile Mon Feb 15 18:41:28 2016 (r408949) @@ -1,17 +1,15 @@ ---- 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 @@ -20,22 +18,16 @@ 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 - -@@ -149,7 +149,7 @@ endif +@@ -148,7 +148,7 @@ endif # Flags to enable OpenCV support. CIMG_OPENCV_DEFINE = -Dcimg_use_opencv @@ -44,7 +36,7 @@ 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) @@ -53,7 +45,7 @@ # 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) @@ -62,7 +54,7 @@ # 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 @@ -79,7 +71,7 @@ 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 @@ -95,7 +87,7 @@ # 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 = @@ -118,7 +110,7 @@ # 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) \ @@ -128,7 +120,7 @@ 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) \ @@ -139,7 +131,7 @@ $(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) \ Added: head/graphics/cimg/files/patch-plugins_tiff__stream.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/cimg/files/patch-plugins_tiff__stream.h Mon Feb 15 18:41:28 2016 (r408949) @@ -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<T>& 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); + } Modified: head/graphics/cimg/pkg-descr ============================================================================== --- head/graphics/cimg/pkg-descr Mon Feb 15 18:37:57 2016 (r408948) +++ head/graphics/cimg/pkg-descr Mon Feb 15 18:41:28 2016 (r408949) @@ -21,4 +21,4 @@ CImg stands for Cool Image: it is simple lapack library to be able to compute eigenvalues or eigenvectors of big matrices. -WWW: http://cimg.sourceforge.net/ +WWW: http://cimg.eu/
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201602151841.u1FIfSkM073592>