mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-27 00:57:50 +00:00
Code Issues Releases Activity

- Upgrade to 1.5.6.

Browse Source 
- Remove conflict with gimp-gmic-plugin.
This commit is contained in:
Thierry Thomas 2013-07-04 21:56:34 +00:00
parent 8a338f8af8
commit eddf97f3cc
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=322293
5 changed files with 49 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
graphics/cimg/Makefile
View File

@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= cimg
PORTVERSION= 1.5.5
PORTREVISION= 1
PORTVERSION= 1.5.6
PORTEPOCH= 3
CATEGORIES= graphics devel
MASTER_SITES= SF/${PORTNAME} \
@ -41,8 +40,6 @@ LIB_DEPENDS+= board.0:${PORTSDIR}/graphics/libboard
USE_FORTRAN= yes
CONFLICTS= gimp-gmic-plugin-1.*
. if !defined(WITH_DEBUG)
LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png \
jpeg:${PORTSDIR}/graphics/jpeg \
@ -52,9 +49,9 @@ LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png \
gimp-2.0:${PORTSDIR}/graphics/gimp-app \
fftw3:${PORTSDIR}/math/fftw3 \
GraphicsMagick++:${PORTSDIR}/graphics/GraphicsMagick
ALL_TARGET= oFreeBSD
ALL_TARGET= Mlinux
. else
ALL_TARGET= dFreeBSD
ALL_TARGET= dlinux
WITHOUT_MEDCON= yes
WITHOUT_FFMPEG= yes
WITHOUT_LAPACK= yes
@ -69,7 +66,7 @@ LIB_DEPENDS+= avformat1:${PORTSDIR}/multimedia/ffmpeg1
DOCBASE= README.txt
PROGS= CImg_demo captcha curve_editor2d dtmri_view3d \
edge_explorer2d fade_images gaussian_fit1d generate_loop_macros gmic \
edge_explorer2d fade_images gaussian_fit1d generate_loop_macros \
hough_transform2d image2ascii image_registration2d image_surface3d \
jawbreaker mcf_levelsets2d mcf_levelsets3d odykill \
pde_TschumperleDeriche2d pde_heatflow2d plotter1d radon_transform2d \

4
graphics/cimg/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (cimg-1.5.5/CImg-1.5.5.zip) = bdad2e062fa35611dfe517b3e204dcb7f526a455fb05ca543144ea6bbfd851a7
SIZE (cimg-1.5.5/CImg-1.5.5.zip) = 12947668
SHA256 (cimg-1.5.6/CImg-1.5.6.zip) = 7047781cafd0009f652d3ec15a019eae3e1ea439d077fe633e86663964ce65e6
SIZE (cimg-1.5.6/CImg-1.5.6.zip) = 12164550

134
graphics/cimg/files/patch-examples::Makefile
View File

@ -1,9 +1,9 @@
--- examples/Makefile.orig 2013-05-15 22:14:38.000000000 +0200
+++ examples/Makefile 2013-05-16 19:28:54.000000000 +0200
@@ -86,8 +86,8 @@
--- examples/Makefile.orig 2013-07-04 17:26:45.000000000 +0200
+++ examples/Makefile 2013-07-04 23:45:47.000000000 +0200
@@ -84,8 +84,8 @@
# Set correct variables and paths
#---------------------------------
CIMG_VERSION = 1.5.5
CIMG_VERSION = 1.5.6
-X11PATH = /usr/X11R6
-CC = g++
+#X11PATH = $(X11PATH)
@ -11,7 +11,7 @@
EXEPFX =
CCVER = $(CC)
ifeq ($(CC),g++)
@@ -127,7 +127,7 @@
@@ -125,7 +125,7 @@
ifeq ($(CC),icc)
CIMG_OPT_CFLAGS = -O3 -ipo -no-prec-div
else
@ -20,16 +20,18 @@
endif
# Flags to enable OpenMP support.
@@ -138,7 +138,7 @@
@@ -136,8 +136,8 @@
endif
# Flags to enable OpenCV support.
-CIMG_OPENCV_CFLAGS = -Dcimg_use_opencv -I/usr/include/opencv
-CIMG_OPENCV_LDFLAGS = -lcv -lhighgui
+CIMG_OPENCV_CFLAGS = -Dcimg_use_opencv -I$(LOCALBASE)/include/opencv
CIMG_OPENCV_LDFLAGS = -lcv -lhighgui
+CIMG_OPENCV_LDFLAGS = -lopencv_legacy -lopencv_highgui
# Flags used to disable display capablities of CImg
@@ -148,7 +148,7 @@
CIMG_NODISPLAY_CFLAGS = -Dcimg_display=0
@@ -146,7 +146,7 @@
# (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
@ -38,7 +40,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 !!!
@@ -187,13 +187,13 @@
@@ -185,13 +185,13 @@
# Flags to enable native support for EXR image files, using the OpenEXR library.
# ( http://www.openexr.com/ )
@ -55,7 +57,7 @@
# Flags to enable native support for compressed .cimgz files, using the Zlib library.
# ( http://www.zlib.net/ )
@@ -202,8 +202,8 @@
@@ -200,8 +200,8 @@
# Flags to enable native support of most classical image file formats, using the Magick++ library.
# ( http://www.imagemagick.org/Magick++/ )
@ -66,7 +68,7 @@
# Flags to enable faster Discrete Fourier Transform computation, using the FFTW3 library
# ( http://www.fftw.org/ )
@@ -216,14 +216,17 @@
@@ -214,14 +214,17 @@
# Flags to enable the use of LAPACK routines for matrix computation
# ( http://www.netlib.org/lapack/ )
@ -87,88 +89,32 @@
# Flags to compile on Sun Solaris
CIMG_SOLARIS_LDFLAGS = -R$(X11PATH)/lib -lrt -lnsl -lsocket
@@ -257,6 +260,9 @@
@echo " > mlinux : Linus/BSD target, no display, minimal features, optimizations enabled."
@echo " > Mlinux : Linux/BSD target, X11 display, maximal features, optimizations enabled."
@echo
+ @echo " > dFreeBSD : FreeBSD, X11 display, debug mode."
+ @echo " > oFreeBSD : FreeBSD target, X11 display, maximal features for packages."
+ @echo
@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."
@@ -293,7 +299,7 @@
$(CC) -o gmic_gimp.o -c gmic.cpp -Dcimg_build -Dgmic_gimp -Dgmic_float_only $(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` $(CIMG_GIMP_CFLAGS) $(CIMG_OPT_FLAGS) $(CIMG_FFTW3_LDFLAGS) $(CIMG_PNG_LDFLAGS) -lpthread
+ $(CC) -o $(EXEPFX)gmic_gimp gmic_gimp.cpp gmic_gimp.o -Dcimg_build `gimptool-2.0 --cflags` `gimptool-2.0 --libs` $(CIMG_GIMP_CFLAGS) $(CIMG_OPT_FLAGS) $(CIMG_FFTW3_LDFLAGS) $(CIMG_PNG_LDFLAGS) $(PTHREAD_LIBS)
# Specific targets for 'gmic'.
gmic_def: gmic_def.gmic
@@ -327,7 +333,7 @@
gmic_uint.o gmic_int.o gmic_float.o gmic_double.o $(CFLAGS) $(CONF_CFLAGS) $(CONF_LDFLAGS) $(LDFLAGS)
gmic_minimal:
- $(CC) -o $(EXEPFX)gmic gmic.cpp -Dgmic_main -Dgmic_float_only -Dcimg_build -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 -Dgmic_main -Dgmic_float_only -Dcimg_build -Dcimg_use_fftw3 -Dcimg_use_png -Dcimg_display=1 -I$(X11PATH)/include -g -W -Wall -ansi -pedantic -L$(X11PATH)/lib -lX11 -lfftw3 -lpng -lz $(PTHREAD_LIBS)
ifeq ($(STRIP_EXE),true)
strip $(EXEPFX)gmic
@@ -415,6 +421,56 @@
@@ -344,26 +347,26 @@
$(CIMG_XSHM_CFLAGS) \
$(CIMG_XRANDR_CFLAGS) \
$(CIMG_TIFF_CFLAGS) \
-$(CIMG_MINC2_CFLAGS) \
$(CIMG_EXR_CFLAGS) \
$(CIMG_PNG_CFLAGS) \
$(CIMG_JPEG_CFLAGS) \
$(CIMG_ZLIB_CFLAGS) \
$(CIMG_OPENCV_CFLAGS) \
$(CIMG_MAGICK_CFLAGS) \
+$(CIMG_LAPACK_CFLAGS) \
$(CIMG_FFTW3_CFLAGS)" \
"CONF_LDFLAGS = \
$(CIMG_X11_LDFLAGS) \
$(CIMG_XSHM_LDFLAGS) \
$(CIMG_XRANDR_LDFLAGS) \
$(CIMG_TIFF_LDFLAGS) \
-$(CIMG_MINC2_LDFLAGS) \
$(CIMG_EXR_LDFLAGS) \
$(CIMG_PNG_LDFLAGS) \
$(CIMG_JPEG_LDFLAGS) \
$(CIMG_ZLIB_LDFLAGS) \
$(CIMG_OPENCV_LDFLAGS) \
$(CIMG_MAGICK_LDFLAGS) \
+$(CIMG_LAPACK_LDFLAGS) \
$(CIMG_FFTW3_LDFLAGS)" \
"STRIP_EXE=true" \
all $(CIMG_EXTRA_FILES)
+# FreeBSD targets
+dFreeBSD:
+ make \
+"CONF_CFLAGS = \
+$(CIMG_DEBUG_CFLAGS) \
+$(CIMG_VT100_CFLAGS) \
+$(CIMG_X11_CFLAGS) \
+$(CIMG_XSHM_CFLAGS) \
+$(CIMG_XRANDR_CFLAGS) \
+$(CIMG_ZLIB_CFLAGS)" \
+"CONF_LDFLAGS = \
+$(CIMG_FREEBSD_LDFLAGS) \
+$(CIMG_ZLIB_LDFLAGS) \
+$(CIMG_X11_LDFLAGS) \
+$(CIMG_XSHM_LDFLAGS) \
+$(CIMG_XRANDR_LDFLAGS)" \
+all
+
+oFreeBSD:
+ make \
+"CONF_CFLAGS = \
+$(CIMG_OPT_CFLAGS) \
+$(CIMG_VT100_CFLAGS) \
+$(CIMG_X11_CFLAGS) \
+$(CIMG_XSHM_CFLAGS) \
+$(CIMG_XRANDR_CFLAGS) \
+$(CIMG_TIFF_CFLAGS) \
+$(CIMG_PNG_CFLAGS) \
+$(CIMG_JPEG_CFLAGS) \
+$(CIMG_ZLIB_CFLAGS) \
+$(CIMG_MAGICK_CFLAGS) \
+$(CIMG_FFMPEG_CFLAGS) \
+$(CIMG_LAPACK_CFLAGS) \
+$(CIMG_FFTW3_CFLAGS)" \
+"CONF_LDFLAGS = \
+$(CIMG_FREEBSD_LDFLAGS) \
+$(CIMG_X11_LDFLAGS) \
+$(CIMG_XSHM_LDFLAGS) \
+$(CIMG_XRANDR_LDFLAGS) \
+$(CIMG_TIFF_LDFLAGS) \
+$(CIMG_PNG_LDFLAGS) \
+$(CIMG_JPEG_LDFLAGS) \
+$(CIMG_ZLIB_LDFLAGS) \
+$(CIMG_MAGICK_LDFLAGS) \
+$(CIMG_FFMPEG_LDFLAGS) \
+$(CIMG_LAPACK_LDFLAGS) \
+$(CIMG_FFTW3_LDFLAGS)" \
+"STRIP_EXE=true" \
+all use_jpeg_buffer gmic
+
# Sun Solaris targets, with X11 display.
solaris:
@$(MAKE) \

12
graphics/cimg/pkg-plist
View File

@ -6,7 +6,6 @@
%%PORTDOCS%%bin/fade_images
%%PORTDOCS%%bin/gaussian_fit1d
%%PORTDOCS%%bin/generate_loop_macros
%%PORTDOCS%%bin/gmic
%%PORTDOCS%%bin/hough_transform2d
%%PORTDOCS%%bin/image2ascii
%%PORTDOCS%%bin/image_registration2d
@ -43,7 +42,6 @@ include/CImg.h
%%PORTDOCS%%%%DOCSDIR%%/header.html
%%PORTDOCS%%%%DOCSDIR%%/header_reference.html
%%PORTDOCS%%%%DOCSDIR%%/img/CImgLogo.jpg
%%PORTDOCS%%%%DOCSDIR%%/img/CImgLogo2.jpg
%%PORTDOCS%%%%DOCSDIR%%/img/CImg_flyer.jpg
%%PORTDOCS%%%%DOCSDIR%%/img/curve_editor.jpg
%%PORTDOCS%%%%DOCSDIR%%/img/item_authors.jpg
@ -122,13 +120,15 @@ include/CImg.h
%%PORTDOCS%%%%DOCSDIR%%/img/postcard42.jpg
%%PORTDOCS%%%%DOCSDIR%%/img/postcard43.jpg
%%PORTDOCS%%%%DOCSDIR%%/img/postcard44.jpg
%%PORTDOCS%%%%DOCSDIR%%/img/postcard45.jpg
%%PORTDOCS%%%%DOCSDIR%%/img/postcard46.jpg
%%PORTDOCS%%%%DOCSDIR%%/img/postcard47.jpg
%%PORTDOCS%%%%DOCSDIR%%/img/postcard5.jpg
%%PORTDOCS%%%%DOCSDIR%%/img/postcard6.jpg
%%PORTDOCS%%%%DOCSDIR%%/img/postcard7.jpg
%%PORTDOCS%%%%DOCSDIR%%/img/postcard8.jpg
%%PORTDOCS%%%%DOCSDIR%%/img/postcard9.jpg
%%PORTDOCS%%%%DOCSDIR%%/img/project-support.jpg
%%PORTDOCS%%%%DOCSDIR%%/img/reference/ref_atan2.jpg
%%PORTDOCS%%%%DOCSDIR%%/img/reference/ref_box3d.jpg
%%PORTDOCS%%%%DOCSDIR%%/img/reference/ref_colormap_cool.jpg
%%PORTDOCS%%%%DOCSDIR%%/img/reference/ref_colormap_cube.jpg
@ -155,7 +155,6 @@ include/CImg.h
%%PORTDOCS%%%%DOCSDIR%%/img/reference/ref_isosurface3d.jpg
%%PORTDOCS%%%%DOCSDIR%%/img/reference/ref_label_regions.jpg
%%PORTDOCS%%%%DOCSDIR%%/img/reference/ref_map.jpg
%%PORTDOCS%%%%DOCSDIR%%/img/reference/ref_mul.jpg
%%PORTDOCS%%%%DOCSDIR%%/img/reference/ref_noise.jpg
%%PORTDOCS%%%%DOCSDIR%%/img/reference/ref_norm.jpg
%%PORTDOCS%%%%DOCSDIR%%/img/reference/ref_normalize.jpg
@ -454,11 +453,6 @@ include/CImg.h
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fade_images.cpp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gaussian_fit1d.cpp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/generate_loop_macros.cpp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gmic.cpp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gmic.h
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gmic_def.gmic
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gmic_def.h
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gmic_gimp.cpp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hough_transform2d.cpp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/image2ascii.cpp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/image_registration2d.cpp

2
graphics/gimp-gmic-plugin/Makefile
View File

@ -20,8 +20,6 @@ LIB_DEPENDS= GraphicsMagick++.9:${PORTSDIR}/graphics/GraphicsMagick13 \
fftw3:${PORTSDIR}/math/fftw3 \
gimp-2.0:${PORTSDIR}/graphics/gimp-app
CONFLICTS= cimg-[0-9]*
OPTIONS_DEFINE= BASH
BASH_DESC= Install programmable completions for Bash
OPTIONS_EXCLUDE=NLS DOCS