diff options
| author | Thierry Thomas <thierry@FreeBSD.org> | 2015-08-26 19:54:54 +0000 |
|---|---|---|
| committer | Thierry Thomas <thierry@FreeBSD.org> | 2015-08-26 19:54:54 +0000 |
| commit | e4ca5175df7f645c3e74bf6c4046c6638a6c6c84 (patch) | |
| tree | 374e1125157d6cfe16e49823c1d904def8d5170a /graphics/cimg/files | |
| parent | 242481663d765115bbed1b98f75cfc963c25882b (diff) | |
| download | ports-e4ca5175df7f645c3e74bf6c4046c6638a6c6c84.tar.gz ports-e4ca5175df7f645c3e74bf6c4046c6638a6c6c84.zip | |
Upgrade graphics/cimg to 1.6.4, as it moved to GitHub. It also uses the newer
options helpers and fixes the EXAMPLES do-install case.
PR: ports/202634
Submitted by: Naram Qashat
Notes
Notes:
svn path=/head/; revision=395396
Diffstat (limited to 'graphics/cimg/files')
| -rw-r--r-- | graphics/cimg/files/patch-examples__Makefile | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/graphics/cimg/files/patch-examples__Makefile b/graphics/cimg/files/patch-examples__Makefile index d5a7c020aba5..084a20b6f28e 100644 --- a/graphics/cimg/files/patch-examples__Makefile +++ b/graphics/cimg/files/patch-examples__Makefile @@ -1,12 +1,12 @@ ---- examples/Makefile.orig 2015-04-15 07:50:13 UTC +--- examples/Makefile.orig 2015-06-18 16:40:35 UTC +++ examples/Makefile @@ -85,8 +85,8 @@ CIMG_EXTRA_FILES = use_tiff_stream use_j # Set correct variables and paths #--------------------------------- - CIMG_VERSION = 1.6.2 + CIMG_VERSION = _cimg_version -X11PATH = /usr/X11R6 -CC = g++ -+#X11PATH = $(X11PATH) ++X11PATH = $(LOCALBASE) +CC = $(CXX) EXEPFX = CCVER = $(CC) @@ -112,16 +112,16 @@ # Flags to compile on Sun Solaris CIMG_SOLARIS_LIBS = -R$(X11PATH)/lib -lrt -lnsl -lsocket -@@ -335,7 +338,8 @@ $(CIMG_X11_CFLAGS) \ - $(CIMG_XSHM_CFLAGS)" \ +@@ -309,7 +312,8 @@ $(CIMG_XSHM_CFLAGS)" \ "CONF_LIBS = \ $(CIMG_X11_LIBS) \ + $(CIMG_TIFF_LIBS) \ -$(CIMG_XSHM_LIBS)" \ +$(CIMG_XSHM_LIBS) \ +$(PTHREAD_LIBS)" \ - all + all $(CIMG_EXTRA_FILES) - olinux: + # Linux/BSD/Mac OSX targets, with X11 display. @@ -378,8 +382,10 @@ $(CIMG_ZLIB_CFLAGS) \ $(CIMG_CURL_CFLAGS) \ $(CIMG_OPENCV_CFLAGS) \ @@ -133,11 +133,11 @@ $(CIMG_X11_LIBS) \ $(CIMG_XSHM_LIBS) \ $(CIMG_XRANDR_LIBS) \ -@@ -389,6 +395,7 @@ $(CIMG_PNG_LIBS) \ - $(CIMG_JPEG_LIBS) \ - $(CIMG_ZLIB_LIBS) \ +@@ -391,6 +397,7 @@ $(CIMG_ZLIB_LIBS) \ $(CIMG_CURL_LIBS) \ -+$(CIMG_LAPACK_LIBS) \ $(CIMG_OPENCV_LIBS) \ $(CIMG_MAGICK_LIBS) \ ++$(CIMG_LAPACK_LIBS) \ $(CIMG_FFTW3_LIBS)" \ + "STRIP_EXE=true" \ + all $(CIMG_EXTRA_FILES) |