diff options
author | Thierry Thomas <thierry@FreeBSD.org> | 2016-05-30 19:51:48 +0000 |
---|---|---|
committer | Thierry Thomas <thierry@FreeBSD.org> | 2016-05-30 19:51:48 +0000 |
commit | ec0073af772a58e789c0a68a9fb1eec86cfea45d (patch) | |
tree | 27abb5f8f298ca982a5e323136f16f655d2a9146 /graphics | |
parent | Update WWW: (diff) |
Upgrade to 1.7.2.
Changelog at https://github.com/dtschump/CImg/releases/tag/v.172
Diffstat (limited to 'graphics')
-rw-r--r-- | graphics/cimg/Makefile | 13 | ||||
-rw-r--r-- | graphics/cimg/distinfo | 5 | ||||
-rw-r--r-- | graphics/cimg/files/patch-examples__Makefile | 10 |
3 files changed, 16 insertions, 12 deletions
diff --git a/graphics/cimg/Makefile b/graphics/cimg/Makefile index 4a1f152690f9..b5041b8dfcdf 100644 --- a/graphics/cimg/Makefile +++ b/graphics/cimg/Makefile @@ -3,7 +3,7 @@ PORTNAME= cimg DISTVERSIONPREFIX= v -DISTVERSION= 1.7.1 +DISTVERSION= 1.7.2 PORTEPOCH= 3 CATEGORIES= graphics devel @@ -50,13 +50,15 @@ REINPLACE_ARGS= -i "" LIB_DEPENDS+= libboard.so:graphics/libboard . if !defined(WITH_DEBUG) -LIB_DEPENDS+= libpng.so:graphics/png \ +LIB_DEPENDS+= libcurl.so:ftp/curl \ + libpng.so:graphics/png \ libtiff.so:graphics/tiff \ - libIlmImf.so:graphics/OpenEXR \ + libHalf.so:graphics/ilmbase \ + libIlmImf.so:graphics/OpenEXR \ libgimp-2.0.so:graphics/gimp-app \ - libfftw3.so:math/fftw3 \ + libfftw3.so:math/fftw3 \ libopencv_legacy.so:graphics/opencv \ - libopencv_core.so:graphics/opencv-core\ + libopencv_core.so:graphics/opencv-core \ libGraphicsMagick.so:graphics/GraphicsMagick USES+= jpeg ALL_TARGET= Mlinux @@ -79,6 +81,7 @@ LIB_DEPENDS+= libavformat.so:multimedia/ffmpeg USES+= fortran . endif +USE_XORG+= x11 xrandr . if defined(WITH_XSHM) USE_XORG+= xext . endif diff --git a/graphics/cimg/distinfo b/graphics/cimg/distinfo index 7f0954fd01e1..0197ff4d758e 100644 --- a/graphics/cimg/distinfo +++ b/graphics/cimg/distinfo @@ -1,2 +1,3 @@ -SHA256 (dtschump-CImg-v1.7.1-v.171_GH0.tar.gz) = a58bbfb83dbac200103d9b96654339bac5b16ace0d2959404d71aa7150f5d0ab -SIZE (dtschump-CImg-v1.7.1-v.171_GH0.tar.gz) = 18791773 +TIMESTAMP = 1464635857 +SHA256 (dtschump-CImg-v1.7.2-v.172_GH0.tar.gz) = f078475ba6165587c8110b0dbf1108982af2b303ea226e171e73fbdd32a52e38 +SIZE (dtschump-CImg-v1.7.2-v.172_GH0.tar.gz) = 18831756 diff --git a/graphics/cimg/files/patch-examples__Makefile b/graphics/cimg/files/patch-examples__Makefile index c5223d47a70b..713c376ffe11 100644 --- a/graphics/cimg/files/patch-examples__Makefile +++ b/graphics/cimg/files/patch-examples__Makefile @@ -1,4 +1,4 @@ ---- examples/Makefile.orig 2016-03-24 12:00:28 UTC +--- examples/Makefile.orig 2016-05-26 09:25:43 UTC +++ examples/Makefile @@ -85,7 +85,7 @@ CIMG_EXTRA_FILES = use_tiff_stream use_j # Set correct variables and paths @@ -13,8 +13,8 @@ CFLAGS = -I.. LIBS = else --CFLAGS = -I.. -Wall -W -+CFLAGS = -I.. -Wall -W $(CPPFLAGS) +-CFLAGS = -I.. -Wall -Wextra ++CFLAGS = -I.. -Wall -Wextra $(CPPFLAGS) LIBS = -lm endif @@ -117,7 +117,7 @@ all $(CIMG_EXTRA_FILES) # Linux/BSD/Mac OSX targets, with X11 display. -@@ -412,8 +416,10 @@ $(CIMG_ZLIB_CFLAGS) \ +@@ -436,8 +440,10 @@ $(CIMG_ZLIB_CFLAGS) \ $(CIMG_CURL_CFLAGS) \ $(CIMG_OPENCV_CFLAGS) \ $(CIMG_MAGICK_CFLAGS) \ @@ -128,7 +128,7 @@ $(CIMG_X11_LIBS) \ $(CIMG_XSHM_LIBS) \ $(CIMG_XRANDR_LIBS) \ -@@ -425,6 +431,7 @@ $(CIMG_ZLIB_LIBS) \ +@@ -449,6 +455,7 @@ $(CIMG_ZLIB_LIBS) \ $(CIMG_CURL_LIBS) \ $(CIMG_OPENCV_LIBS) \ $(CIMG_MAGICK_LIBS) \ |