From owner-svn-ports-head@freebsd.org Sun Oct 25 14:59:16 2015 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 748068E52; Sun, 25 Oct 2015 14:59:16 +0000 (UTC) (envelope-from thierry@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 32005145B; Sun, 25 Oct 2015 14:59:16 +0000 (UTC) (envelope-from thierry@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9PExFx2082213; Sun, 25 Oct 2015 14:59:15 GMT (envelope-from thierry@FreeBSD.org) Received: (from thierry@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9PExEDs082209; Sun, 25 Oct 2015 14:59:14 GMT (envelope-from thierry@FreeBSD.org) Message-Id: <201510251459.t9PExEDs082209@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: thierry set sender to thierry@FreeBSD.org using -f From: Thierry Thomas Date: Sun, 25 Oct 2015 14:59:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r400152 - in head/graphics/cimg: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Oct 2015 14:59:16 -0000 Author: thierry Date: Sun Oct 25 14:59:14 2015 New Revision: 400152 URL: https://svnweb.freebsd.org/changeset/ports/400152 Log: Upgrade to 1.6.7. Modified: head/graphics/cimg/Makefile head/graphics/cimg/distinfo head/graphics/cimg/files/patch-examples__Makefile head/graphics/cimg/pkg-plist Modified: head/graphics/cimg/Makefile ============================================================================== --- head/graphics/cimg/Makefile Sun Oct 25 14:51:50 2015 (r400151) +++ head/graphics/cimg/Makefile Sun Oct 25 14:59:14 2015 (r400152) @@ -3,8 +3,7 @@ PORTNAME= cimg DISTVERSIONPREFIX= v -DISTVERSION= 1.6.4 -PORTREVISION= 2 +DISTVERSION= 1.6.7 PORTEPOCH= 3 CATEGORIES= graphics devel @@ -26,6 +25,7 @@ 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) Modified: head/graphics/cimg/distinfo ============================================================================== --- head/graphics/cimg/distinfo Sun Oct 25 14:51:50 2015 (r400151) +++ head/graphics/cimg/distinfo Sun Oct 25 14:59:14 2015 (r400152) @@ -1,2 +1,2 @@ -SHA256 (dtschump-CImg-v1.6.4_GH0.tar.gz) = 57274f9623468da7841eeda2ccf73c7645e728f9fefa8a46d6931c2cc47f0c11 -SIZE (dtschump-CImg-v1.6.4_GH0.tar.gz) = 18656533 +SHA256 (dtschump-CImg-v1.6.7-v.167_GH0.tar.gz) = 1e4d0e40f0b2cc8d646b0b6858b4cf6605723d29fe89313556ee930b3b59d1b7 +SIZE (dtschump-CImg-v1.6.7-v.167_GH0.tar.gz) = 18666461 Modified: head/graphics/cimg/files/patch-examples__Makefile ============================================================================== --- head/graphics/cimg/files/patch-examples__Makefile Sun Oct 25 14:51:50 2015 (r400151) +++ head/graphics/cimg/files/patch-examples__Makefile Sun Oct 25 14:59:14 2015 (r400152) @@ -1,4 +1,4 @@ ---- examples/Makefile.orig 2015-06-18 16:40:35 UTC +--- examples/Makefile.orig 2015-10-23 10:38:38 UTC +++ examples/Makefile @@ -85,8 +85,8 @@ CIMG_EXTRA_FILES = use_tiff_stream use_j # Set correct variables and paths @@ -9,9 +9,9 @@ +X11PATH = $(LOCALBASE) +CC = $(CXX) EXEPFX = - CCVER = $(CC) - ifeq ($(notdir $(CC)),g++) -@@ -100,7 +100,7 @@ CCVER = "icpc \( `$(CC) -v 2>&1`\ + ifeq ($(MSYSTEM),MINGW32) + EXESFX = .exe +@@ -105,7 +105,7 @@ CCVER = "icpc \( `$(CC) -v 2>&1`\ CFLAGS = -I.. LIBS = else @@ -20,7 +20,7 @@ LIBS = -lm endif -@@ -124,12 +124,12 @@ CIMG_VT100_CFLAGS = -Dcimg_use_vt100 +@@ -129,12 +129,12 @@ CIMG_VT100_CFLAGS = -Dcimg_use_vt100 # Flags to enable code optimization by the compiler. ifeq ($(notdir $(CC)),g++) @@ -35,75 +35,81 @@ endif endif -@@ -141,7 +141,7 @@ CIMG_OPENMP_CFLAGS = -Dcimg_use_openmp - - endif +@@ -149,7 +149,7 @@ endif # Flags to enable OpenCV support. --CIMG_OPENCV_CFLAGS = -Dcimg_use_opencv -I/usr/include/opencv -+CIMG_OPENCV_CFLAGS = -Dcimg_use_opencv -I$(LOCALBASE)/include/opencv + 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 - -@@ -152,7 +152,7 @@ CIMG_NODISPLAY_CFLAGS = -Dcimg_display=0 - # (X11 is used by CImg to handle display windows) - # !!! For 64bits systems : replace -L$(X11PATH)/lib by -L$(X11PATH)/lib64 !!! - CIMG_X11_CFLAGS = -I$(X11PATH)/include +@@ -163,7 +163,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 !!! -@@ -182,7 +182,7 @@ CIMG_JPEG_LIBS = -ljpeg - # Flags to enable native support for TIFF image files, using the TIFF library. - # ( http://www.libtiff.org/ ) - CIMG_TIFF_CFLAGS = -Dcimg_use_tiff +@@ -203,7 +203,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 ) -@@ -191,12 +191,12 @@ CIMG_MINC2_LIBS = -lminc_io -lvolume_io2 - +@@ -215,14 +215,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_CFLAGS = -Dcimg_use_openexr -I/usr/include/OpenEXR -+CIMG_EXR_CFLAGS = -Dcimg_use_openexr -I$(LOCALBASE)/include/OpenEXR + 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_CFLAGS = -Dcimg_use_ffmpeg -D__STDC_CONSTANT_MACROS -I/usr/include/libavcodec -I/usr/include/libavformat -I/usr/include/libswscale -I/usr/include/ffmpeg -+CIMG_FFMPEG_CFLAGS = -Dcimg_use_ffmpeg -D__STDC_CONSTANT_MACROS -I$(LOCALBASE)/include/libavcodec -I$(LOCALBASE)/include/libavformat -I$(LOCALBASE)/include/libswscale -I$(LOCALBASE)/include/ffmpeg + 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 - # Flags to enable native support for compressed .cimgz files, using the Zlib library. -@@ -209,10 +209,10 @@ CIMG_ZLIB_LIBS = -lz - CIMG_CURL_CFLAGS = -Dcimg_use_curl +@@ -240,12 +240,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_CFLAGS = -Dcimg_use_magick `Magick++-config --cppflags` `Magick++-config --cxxflags` + 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_CFLAGS = -Dcimg_use_magick `GraphicsMagick++-config --cppflags` `GraphicsMagick++-config --cxxflags` +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/ ) -@@ -225,14 +225,17 @@ endif - - # Flags to enable the use of LAPACK routines for matrix computation +@@ -262,16 +262,19 @@ endif # ( http://www.netlib.org/lapack/ ) --CIMG_LAPACK_CFLAGS = -Dcimg_use_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 = -Dcimg_use_lapack ++#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_CFLAGS = -Dcimg_use_board -I/usr/include/board -+CIMG_BOARD_CFLAGS = -Dcimg_use_board -I$(LOCALBASE)/include/board + 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 @@ -112,7 +118,7 @@ # Flags to compile on Sun Solaris CIMG_SOLARIS_LIBS = -R$(X11PATH)/lib -lrt -lnsl -lsocket -@@ -309,7 +312,8 @@ $(CIMG_XSHM_CFLAGS)" \ +@@ -344,7 +347,8 @@ $(CIMG_XSHM_CFLAGS)" \ "CONF_LIBS = \ $(CIMG_X11_LIBS) \ $(CIMG_TIFF_LIBS) \ @@ -122,7 +128,7 @@ all $(CIMG_EXTRA_FILES) # Linux/BSD/Mac OSX targets, with X11 display. -@@ -378,8 +382,10 @@ $(CIMG_ZLIB_CFLAGS) \ +@@ -413,8 +417,10 @@ $(CIMG_ZLIB_CFLAGS) \ $(CIMG_CURL_CFLAGS) \ $(CIMG_OPENCV_CFLAGS) \ $(CIMG_MAGICK_CFLAGS) \ @@ -133,7 +139,7 @@ $(CIMG_X11_LIBS) \ $(CIMG_XSHM_LIBS) \ $(CIMG_XRANDR_LIBS) \ -@@ -391,6 +397,7 @@ $(CIMG_ZLIB_LIBS) \ +@@ -426,6 +432,7 @@ $(CIMG_ZLIB_LIBS) \ $(CIMG_CURL_LIBS) \ $(CIMG_OPENCV_LIBS) \ $(CIMG_MAGICK_LIBS) \ Modified: head/graphics/cimg/pkg-plist ============================================================================== --- head/graphics/cimg/pkg-plist Sun Oct 25 14:51:50 2015 (r400151) +++ head/graphics/cimg/pkg-plist Sun Oct 25 14:59:14 2015 (r400152) @@ -47,12 +47,11 @@ include/CImg.h %%PORTEXAMPLES%%%%EXAMPLESDIR%%/image_registration2d.cpp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/image_surface3d.cpp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/img/CImg_demo.h -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/img/lena.pgm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/img/logo.bmp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/img/milla.bmp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/img/odykill.h +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/img/parrot.ppm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/img/parrot_mask.pgm -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/img/parrot_original.ppm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/img/sh0r.pgm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/img/sh1r.pgm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/img/tetris.h @@ -80,4 +79,5 @@ include/CImg.h %%PORTEXAMPLES%%%%EXAMPLESDIR%%/use_patchmatch.cpp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/use_skeleton.cpp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/use_tiff_stream.cpp +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/use_tinymatwriter.cpp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/wavelet_atrous.cpp