diff options
author | Thierry Thomas <thierry@FreeBSD.org> | 2011-01-24 22:41:25 +0000 |
---|---|---|
committer | Thierry Thomas <thierry@FreeBSD.org> | 2011-01-24 22:41:25 +0000 |
commit | 5fc8670fdcc21d9083e72f7ed7ef3e58cdd2bb34 (patch) | |
tree | 63e4560f78ef1e97bfd47cc21da1c0f4f75d6e21 /graphics/cimg/files | |
parent | d417ce8c009b147c8e1bbfb5a0753b8bfaef82cf (diff) | |
download | ports-5fc8670fdcc21d9083e72f7ed7ef3e58cdd2bb34.tar.gz ports-5fc8670fdcc21d9083e72f7ed7ef3e58cdd2bb34.zip |
Upgrade to 1.4.7.
Feature safe: yes
Notes
Notes:
svn path=/head/; revision=268184
Diffstat (limited to 'graphics/cimg/files')
-rw-r--r-- | graphics/cimg/files/patch-examples::Makefile | 38 |
1 files changed, 27 insertions, 11 deletions
diff --git a/graphics/cimg/files/patch-examples::Makefile b/graphics/cimg/files/patch-examples::Makefile index 81d6002cb1cd..375c707faf7a 100644 --- a/graphics/cimg/files/patch-examples::Makefile +++ b/graphics/cimg/files/patch-examples::Makefile @@ -1,9 +1,9 @@ ---- examples/Makefile.orig 2010-10-01 15:26:30.000000000 +0200 -+++ examples/Makefile 2010-10-03 15:09:36.000000000 +0200 +--- examples/Makefile.orig 2011-01-21 15:58:40.000000000 +0100 ++++ examples/Makefile 2011-01-24 22:24:41.000000000 +0100 @@ -85,8 +85,8 @@ # Set correct variables and paths #--------------------------------- - CIMG_VERSION = 1.4.6 + CIMG_VERSION = 1.4.7 -X11PATH = /usr/X11R6 -CC = g++ +#X11PATH = /usr/X11R6 @@ -38,23 +38,21 @@ # Flags to enable fast image display, using the XSHM library (when using X11). # !!! Seems to randomly crash when used on MacOSX, so do not use it on MacOSX !!! -@@ -175,13 +175,13 @@ +@@ -175,12 +175,12 @@ # 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_CFLAGS = -Dcimg_use_openexr -I/$(LOCALBASE)/include/OpenEXR CIMG_EXR_LDFLAGS = -lIlmImf # Flags to enable native support for various video files, using the FFMPEG library. # ( http://www.ffmpeg.org/ ) --CIMG_FFMPEG_CFLAGS = -Dcimg_use_ffmpeg -I/usr/include/libavcodec -I/usr/include/libavformat -I/usr/include/libswscale --CIMG_FFMPEG_LDFLAGS = -lavcodec -lavformat -lswscale -+#CIMG_FFMPEG_CFLAGS = -Dcimg_use_ffmpeg -I$(LOCALBASE)/include/libavcodec -I$(LOCALBASE)/include/libavformat -I$(LOCALBASE)/include/libswscale -+#CIMG_FFMPEG_LDFLAGS = -L$(LOCALBASE)/lib -lavcodec -lavformat -lswscale +-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_LDFLAGS = -lavcodec -lavformat -lswscale # Flags to enable native support for compressed .cimgz files, using the Zlib library. - # ( http://www.zlib.net/ ) @@ -190,8 +190,8 @@ # Flags to enable native support of most classical image file formats, using the Magick++ library. @@ -97,7 +95,25 @@ @echo " > solaris : Sun Solaris target, X11 display, optimizations disabled." @echo " > dsolaris : Sun Solaris target, X11 display, debug mode." @echo " > osolaris : Sun Solaris target, X11 display, optimizations enabled." -@@ -420,6 +426,56 @@ +@@ -288,7 +294,7 @@ + $(CC) -o gmic_gimp.o -c gmic.cpp -Dcimg_build -Dgmic_gimp -Dgmic_minimal $(CIMG_OPT_CFLAGS) $(CIMG_FFTW3_CFLAGS) $(CIMG_PNG_CFLAGS) + + gmic_gimp: gmic_gimp.o gmic_gimp.cpp +- $(CC) -o $(EXEPFX)gmic_gimp gmic_gimp.cpp gmic_gimp.o -Dcimg_build `gimptool-2.0 --cflags` `gimptool-2.0 --libs` -lpthread $(CIMG_OPT_FLAGS) $(CIMG_FFTW3_LDFLAGS) $(CIMG_PNG_LDFLAGS) $(CIMG_GIMP_CFLAGS) ++ $(CC) -o $(EXEPFX)gmic_gimp gmic_gimp.cpp gmic_gimp.o -Dcimg_build `gimptool-2.0 --cflags` `gimptool-2.0 --libs` $(CIMG_OPT_FLAGS) $(CIMG_FFTW3_LDFLAGS) $(CIMG_PNG_LDFLAGS) $(CIMG_GIMP_CFLAGS) $(PTHREAD_LIBS) + + # Specific targets for 'gmic'. + gmic_def: gmic_def.gmic +@@ -328,7 +334,7 @@ + gmic_uint.o gmic_int.o gmic_float.o gmic_double.o $(CFLAGS) $(LDFLAGS) $(CONF_CFLAGS) $(CONF_LDFLAGS) + + gmic_minimal: +- $(CC) -o $(EXEPFX)gmic gmic.cpp -I.. -Dcimg_build -Dgmic_minimal -Dgmic_main -Dcimg_use_fftw3 -Dcimg_use_png -Dcimg_display=1 -I/usr/X11R6/include -g -W -Wall -ansi -pedantic -L/usr/X11R6/lib -lX11 -lpthread -lfftw3 -lpng -lz ++ $(CC) -o $(EXEPFX)gmic gmic.cpp -I.. -Dcimg_build -Dgmic_minimal -Dgmic_main -Dcimg_use_fftw3 -Dcimg_use_png -Dcimg_display=1 -I$(LOCALBASE)/X11R6/include -g -W -Wall -ansi -pedantic -L$(LOCALBASE)/X11R6/lib -lX11 -lfftw3 -lpng -lz $(PTHREAD_LIBS) + + ifeq ($(STRIP_EXE),true) + strip $(EXEPFX)gmic +@@ -414,6 +420,56 @@ "STRIP_EXE=true" \ all $(CIMG_EXTRA_FILES) |