Unbreak after ffmpeg update and upgrade to 1.4.9.

Reported by:	pointyhat via Pav
This commit is contained in:
Thierry Thomas 2011-06-29 20:50:43 +00:00
parent 7ebcb30f2b
commit 9331883eb8
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=276689
4 changed files with 65 additions and 17 deletions

View file

@ -6,14 +6,13 @@
# #
PORTNAME= cimg PORTNAME= cimg
PORTVERSION= 1.4.8 PORTVERSION= 1.4.9
PORTREVISION= 1
PORTEPOCH= 3 PORTEPOCH= 3
CATEGORIES= graphics devel CATEGORIES= graphics devel
MASTER_SITES= SF/${PORTNAME} \ MASTER_SITES= SF/${PORTNAME} \
SF/${PORTNAME}/old SF/${PORTNAME}/old
DISTNAME= CImg-${DISTVERSION} DISTNAME= CImg-${DISTVERSION}
DIST_SUBDIR= ${PORTNAME}-${PORTVERSION},${PORTEPOCH} DIST_SUBDIR= ${PORTNAME}-${PORTVERSION}
MAINTAINER= thierry@FreeBSD.org MAINTAINER= thierry@FreeBSD.org
COMMENT= The C++ Template Image Processing Library COMMENT= The C++ Template Image Processing Library

View file

@ -1,2 +1,2 @@
SHA256 (cimg-1.4.8,2/CImg-1.4.8.zip) = 38338d1855077001811a2a056303f2cabe121789647d2c5d99aecc75f1ff210c SHA256 (cimg-1.4.9/CImg-1.4.9.zip) = f2ad5027f3c9030462aceed0f2d1d4be27eb11ec419745a6ec17510361ad32cf
SIZE (cimg-1.4.8,2/CImg-1.4.8.zip) = 10647728 SIZE (cimg-1.4.9/CImg-1.4.9.zip) = 10447796

View file

@ -1,9 +1,9 @@
--- examples/Makefile.orig 2011-01-21 15:58:40.000000000 +0100 --- examples/Makefile.orig 2011-06-09 13:32:15.000000000 +0200
+++ examples/Makefile 2011-01-24 22:24:41.000000000 +0100 +++ examples/Makefile 2011-06-27 22:17:58.000000000 +0200
@@ -85,8 +85,8 @@ @@ -85,8 +85,8 @@
# Set correct variables and paths # Set correct variables and paths
#--------------------------------- #---------------------------------
CIMG_VERSION = 1.4.8 CIMG_VERSION = 1.4.9
-X11PATH = /usr/X11R6 -X11PATH = /usr/X11R6
-CC = g++ -CC = g++
+#X11PATH = /usr/X11R6 +#X11PATH = /usr/X11R6
@ -38,13 +38,13 @@
# Flags to enable fast image display, using the XSHM library (when using X11). # 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 !!! # !!! Seems to randomly crash when used on MacOSX, so do not use it on MacOSX !!!
@@ -175,12 +175,12 @@ @@ -180,12 +180,12 @@
# Flags to enable native support for EXR image files, using the OpenEXR library. # Flags to enable native support for EXR image files, using the OpenEXR library.
# ( http://www.openexr.com/ ) # ( http://www.openexr.com/ )
-CIMG_EXR_CFLAGS = -Dcimg_use_openexr -I/usr/include/OpenEXR -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 CIMG_EXR_LDFLAGS = -lIlmImf -lHalf
# Flags to enable native support for various video files, using the FFMPEG library. # Flags to enable native support for various video files, using the FFMPEG library.
# ( http://www.ffmpeg.org/ ) # ( http://www.ffmpeg.org/ )
@ -53,7 +53,7 @@
CIMG_FFMPEG_LDFLAGS = -lavcodec -lavformat -lswscale CIMG_FFMPEG_LDFLAGS = -lavcodec -lavformat -lswscale
# Flags to enable native support for compressed .cimgz files, using the Zlib library. # Flags to enable native support for compressed .cimgz files, using the Zlib library.
@@ -190,8 +190,8 @@ @@ -195,8 +195,8 @@
# 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 Magick++ library.
# ( http://www.imagemagick.org/Magick++/ ) # ( http://www.imagemagick.org/Magick++/ )
@ -64,7 +64,7 @@
# Flags to enable faster Discrete Fourier Transform computation, using the FFTW3 library # Flags to enable faster Discrete Fourier Transform computation, using the FFTW3 library
# ( http://www.fftw.org/ ) # ( http://www.fftw.org/ )
@@ -204,14 +204,17 @@ @@ -209,14 +209,17 @@
# Flags to enable the use of LAPACK routines for matrix computation # Flags to enable the use of LAPACK routines for matrix computation
# ( http://www.netlib.org/lapack/ ) # ( http://www.netlib.org/lapack/ )
@ -85,7 +85,7 @@
# Flags to compile on Sun Solaris # Flags to compile on Sun Solaris
CIMG_SOLARIS_LDFLAGS = -R$(X11PATH)/lib -lrt -lnsl -lsocket CIMG_SOLARIS_LDFLAGS = -R$(X11PATH)/lib -lrt -lnsl -lsocket
@@ -245,6 +248,9 @@ @@ -250,6 +253,9 @@
@echo " > mlinux : Linus/BSD target, no display, minimal features, optimizations enabled." @echo " > mlinux : Linus/BSD target, no display, minimal features, optimizations enabled."
@echo " > Mlinux : Linux/BSD target, X11 display, maximal features, optimizations enabled." @echo " > Mlinux : Linux/BSD target, X11 display, maximal features, optimizations enabled."
@echo @echo
@ -95,7 +95,7 @@
@echo " > solaris : Sun Solaris target, X11 display, optimizations disabled." @echo " > solaris : Sun Solaris target, X11 display, optimizations disabled."
@echo " > dsolaris : Sun Solaris target, X11 display, debug mode." @echo " > dsolaris : Sun Solaris target, X11 display, debug mode."
@echo " > osolaris : Sun Solaris target, X11 display, optimizations enabled." @echo " > osolaris : Sun Solaris target, X11 display, optimizations enabled."
@@ -288,7 +294,7 @@ @@ -293,7 +299,7 @@
$(CC) -o gmic_gimp.o -c gmic.cpp -Dcimg_build -Dgmic_gimp -Dgmic_minimal $(CIMG_OPT_CFLAGS) $(CIMG_FFTW3_CFLAGS) $(CIMG_PNG_CFLAGS) $(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 gmic_gimp: gmic_gimp.o gmic_gimp.cpp
@ -104,7 +104,7 @@
# Specific targets for 'gmic'. # Specific targets for 'gmic'.
gmic_def: gmic_def.gmic gmic_def: gmic_def.gmic
@@ -328,7 +334,7 @@ @@ -333,7 +339,7 @@
gmic_uint.o gmic_int.o gmic_float.o gmic_double.o $(CFLAGS) $(LDFLAGS) $(CONF_CFLAGS) $(CONF_LDFLAGS) gmic_uint.o gmic_int.o gmic_float.o gmic_double.o $(CFLAGS) $(LDFLAGS) $(CONF_CFLAGS) $(CONF_LDFLAGS)
gmic_minimal: gmic_minimal:
@ -113,7 +113,7 @@
ifeq ($(STRIP_EXE),true) ifeq ($(STRIP_EXE),true)
strip $(EXEPFX)gmic strip $(EXEPFX)gmic
@@ -414,6 +420,56 @@ @@ -421,6 +427,56 @@
"STRIP_EXE=true" \ "STRIP_EXE=true" \
all $(CIMG_EXTRA_FILES) all $(CIMG_EXTRA_FILES)

View file

@ -5,7 +5,6 @@ include/CImg.h
%%PORTDOCS%%%%DOCSDIR%%/CHANGES.txt %%PORTDOCS%%%%DOCSDIR%%/CHANGES.txt
%%PORTDOCS%%%%DOCSDIR%%/CImg.doxygen %%PORTDOCS%%%%DOCSDIR%%/CImg.doxygen
%%PORTDOCS%%%%DOCSDIR%%/CImg_documentation.h %%PORTDOCS%%%%DOCSDIR%%/CImg_documentation.h
%%PORTDOCS%%%%DOCSDIR%%/CImg_reference.pdf
%%PORTDOCS%%%%DOCSDIR%%/README.txt %%PORTDOCS%%%%DOCSDIR%%/README.txt
%%PORTDOCS%%%%DOCSDIR%%/chat.shtml %%PORTDOCS%%%%DOCSDIR%%/chat.shtml
%%PORTDOCS%%%%DOCSDIR%%/download.shtml %%PORTDOCS%%%%DOCSDIR%%/download.shtml
@ -78,6 +77,7 @@ include/CImg.h
%%PORTDOCS%%%%DOCSDIR%%/img/postcard29.jpg %%PORTDOCS%%%%DOCSDIR%%/img/postcard29.jpg
%%PORTDOCS%%%%DOCSDIR%%/img/postcard3.jpg %%PORTDOCS%%%%DOCSDIR%%/img/postcard3.jpg
%%PORTDOCS%%%%DOCSDIR%%/img/postcard30.jpg %%PORTDOCS%%%%DOCSDIR%%/img/postcard30.jpg
%%PORTDOCS%%%%DOCSDIR%%/img/postcard31.jpg
%%PORTDOCS%%%%DOCSDIR%%/img/postcard4.jpg %%PORTDOCS%%%%DOCSDIR%%/img/postcard4.jpg
%%PORTDOCS%%%%DOCSDIR%%/img/postcard5.jpg %%PORTDOCS%%%%DOCSDIR%%/img/postcard5.jpg
%%PORTDOCS%%%%DOCSDIR%%/img/postcard6.jpg %%PORTDOCS%%%%DOCSDIR%%/img/postcard6.jpg
@ -85,8 +85,11 @@ include/CImg.h
%%PORTDOCS%%%%DOCSDIR%%/img/postcard8.jpg %%PORTDOCS%%%%DOCSDIR%%/img/postcard8.jpg
%%PORTDOCS%%%%DOCSDIR%%/img/postcard9.jpg %%PORTDOCS%%%%DOCSDIR%%/img/postcard9.jpg
%%PORTDOCS%%%%DOCSDIR%%/img/project-support.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_box3d.jpg
%%PORTDOCS%%%%DOCSDIR%%/img/reference/ref_cone3d.jpg %%PORTDOCS%%%%DOCSDIR%%/img/reference/ref_cone3d.jpg
%%PORTDOCS%%%%DOCSDIR%%/img/reference/ref_constructor1.jpg
%%PORTDOCS%%%%DOCSDIR%%/img/reference/ref_constructor2.jpg
%%PORTDOCS%%%%DOCSDIR%%/img/reference/ref_contrast_LUT256.jpg %%PORTDOCS%%%%DOCSDIR%%/img/reference/ref_contrast_LUT256.jpg
%%PORTDOCS%%%%DOCSDIR%%/img/reference/ref_cut.jpg %%PORTDOCS%%%%DOCSDIR%%/img/reference/ref_cut.jpg
%%PORTDOCS%%%%DOCSDIR%%/img/reference/ref_cylinder3d.jpg %%PORTDOCS%%%%DOCSDIR%%/img/reference/ref_cylinder3d.jpg
@ -101,14 +104,23 @@ include/CImg.h
%%PORTDOCS%%%%DOCSDIR%%/img/reference/ref_isosurface3d.jpg %%PORTDOCS%%%%DOCSDIR%%/img/reference/ref_isosurface3d.jpg
%%PORTDOCS%%%%DOCSDIR%%/img/reference/ref_label_regions.jpg %%PORTDOCS%%%%DOCSDIR%%/img/reference/ref_label_regions.jpg
%%PORTDOCS%%%%DOCSDIR%%/img/reference/ref_map.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_noise.jpg
%%PORTDOCS%%%%DOCSDIR%%/img/reference/ref_norm.jpg %%PORTDOCS%%%%DOCSDIR%%/img/reference/ref_norm.jpg
%%PORTDOCS%%%%DOCSDIR%%/img/reference/ref_normalize.jpg %%PORTDOCS%%%%DOCSDIR%%/img/reference/ref_normalize.jpg
%%PORTDOCS%%%%DOCSDIR%%/img/reference/ref_normalize2.jpg %%PORTDOCS%%%%DOCSDIR%%/img/reference/ref_normalize2.jpg
%%PORTDOCS%%%%DOCSDIR%%/img/reference/ref_operator_comma.jpg
%%PORTDOCS%%%%DOCSDIR%%/img/reference/ref_operator_eq.jpg
%%PORTDOCS%%%%DOCSDIR%%/img/reference/ref_operator_less.jpg
%%PORTDOCS%%%%DOCSDIR%%/img/reference/ref_operator_minus.jpg
%%PORTDOCS%%%%DOCSDIR%%/img/reference/ref_operator_plus.jpg
%%PORTDOCS%%%%DOCSDIR%%/img/reference/ref_operator_plus1.jpg
%%PORTDOCS%%%%DOCSDIR%%/img/reference/ref_plane3d.jpg %%PORTDOCS%%%%DOCSDIR%%/img/reference/ref_plane3d.jpg
%%PORTDOCS%%%%DOCSDIR%%/img/reference/ref_quantize.jpg %%PORTDOCS%%%%DOCSDIR%%/img/reference/ref_quantize.jpg
%%PORTDOCS%%%%DOCSDIR%%/img/reference/ref_rainbow_LUT256.jpg %%PORTDOCS%%%%DOCSDIR%%/img/reference/ref_rainbow_LUT256.jpg
%%PORTDOCS%%%%DOCSDIR%%/img/reference/ref_sphere3d.jpg %%PORTDOCS%%%%DOCSDIR%%/img/reference/ref_sphere3d.jpg
%%PORTDOCS%%%%DOCSDIR%%/img/reference/ref_sqr.jpg
%%PORTDOCS%%%%DOCSDIR%%/img/reference/ref_sqrt.jpg
%%PORTDOCS%%%%DOCSDIR%%/img/reference/ref_threshold.jpg %%PORTDOCS%%%%DOCSDIR%%/img/reference/ref_threshold.jpg
%%PORTDOCS%%%%DOCSDIR%%/img/reference/ref_torus3d.jpg %%PORTDOCS%%%%DOCSDIR%%/img/reference/ref_torus3d.jpg
%%PORTDOCS%%%%DOCSDIR%%/img/ss_blobs.jpg %%PORTDOCS%%%%DOCSDIR%%/img/ss_blobs.jpg
@ -198,7 +210,31 @@ include/CImg.h
%%PORTDOCS%%%%DOCSDIR%%/reference/doxygen.png %%PORTDOCS%%%%DOCSDIR%%/reference/doxygen.png
%%PORTDOCS%%%%DOCSDIR%%/reference/form_0.png %%PORTDOCS%%%%DOCSDIR%%/reference/form_0.png
%%PORTDOCS%%%%DOCSDIR%%/reference/form_1.png %%PORTDOCS%%%%DOCSDIR%%/reference/form_1.png
%%PORTDOCS%%%%DOCSDIR%%/reference/form_10.png
%%PORTDOCS%%%%DOCSDIR%%/reference/form_11.png
%%PORTDOCS%%%%DOCSDIR%%/reference/form_12.png
%%PORTDOCS%%%%DOCSDIR%%/reference/form_13.png
%%PORTDOCS%%%%DOCSDIR%%/reference/form_14.png
%%PORTDOCS%%%%DOCSDIR%%/reference/form_15.png
%%PORTDOCS%%%%DOCSDIR%%/reference/form_16.png
%%PORTDOCS%%%%DOCSDIR%%/reference/form_17.png
%%PORTDOCS%%%%DOCSDIR%%/reference/form_18.png
%%PORTDOCS%%%%DOCSDIR%%/reference/form_19.png
%%PORTDOCS%%%%DOCSDIR%%/reference/form_2.png %%PORTDOCS%%%%DOCSDIR%%/reference/form_2.png
%%PORTDOCS%%%%DOCSDIR%%/reference/form_20.png
%%PORTDOCS%%%%DOCSDIR%%/reference/form_21.png
%%PORTDOCS%%%%DOCSDIR%%/reference/form_22.png
%%PORTDOCS%%%%DOCSDIR%%/reference/form_23.png
%%PORTDOCS%%%%DOCSDIR%%/reference/form_24.png
%%PORTDOCS%%%%DOCSDIR%%/reference/form_25.png
%%PORTDOCS%%%%DOCSDIR%%/reference/form_26.png
%%PORTDOCS%%%%DOCSDIR%%/reference/form_3.png
%%PORTDOCS%%%%DOCSDIR%%/reference/form_4.png
%%PORTDOCS%%%%DOCSDIR%%/reference/form_5.png
%%PORTDOCS%%%%DOCSDIR%%/reference/form_6.png
%%PORTDOCS%%%%DOCSDIR%%/reference/form_7.png
%%PORTDOCS%%%%DOCSDIR%%/reference/form_8.png
%%PORTDOCS%%%%DOCSDIR%%/reference/form_9.png
%%PORTDOCS%%%%DOCSDIR%%/reference/formula.repository %%PORTDOCS%%%%DOCSDIR%%/reference/formula.repository
%%PORTDOCS%%%%DOCSDIR%%/reference/functions.html %%PORTDOCS%%%%DOCSDIR%%/reference/functions.html
%%PORTDOCS%%%%DOCSDIR%%/reference/functions_0x62.html %%PORTDOCS%%%%DOCSDIR%%/reference/functions_0x62.html
@ -280,25 +316,38 @@ include/CImg.h
%%PORTDOCS%%%%DOCSDIR%%/reference/nav_f.png %%PORTDOCS%%%%DOCSDIR%%/reference/nav_f.png
%%PORTDOCS%%%%DOCSDIR%%/reference/nav_h.png %%PORTDOCS%%%%DOCSDIR%%/reference/nav_h.png
%%PORTDOCS%%%%DOCSDIR%%/reference/open.png %%PORTDOCS%%%%DOCSDIR%%/reference/open.png
%%PORTDOCS%%%%DOCSDIR%%/reference/ref_atan2.jpg
%%PORTDOCS%%%%DOCSDIR%%/reference/ref_box3d.jpg %%PORTDOCS%%%%DOCSDIR%%/reference/ref_box3d.jpg
%%PORTDOCS%%%%DOCSDIR%%/reference/ref_cone3d.jpg %%PORTDOCS%%%%DOCSDIR%%/reference/ref_cone3d.jpg
%%PORTDOCS%%%%DOCSDIR%%/reference/ref_constructor1.jpg
%%PORTDOCS%%%%DOCSDIR%%/reference/ref_constructor2.jpg
%%PORTDOCS%%%%DOCSDIR%%/reference/ref_cut.jpg %%PORTDOCS%%%%DOCSDIR%%/reference/ref_cut.jpg
%%PORTDOCS%%%%DOCSDIR%%/reference/ref_cylinder3d.jpg %%PORTDOCS%%%%DOCSDIR%%/reference/ref_cylinder3d.jpg
%%PORTDOCS%%%%DOCSDIR%%/reference/ref_elevation3d.jpg %%PORTDOCS%%%%DOCSDIR%%/reference/ref_elevation3d.jpg
%%PORTDOCS%%%%DOCSDIR%%/reference/ref_ellipsoid3d.jpg %%PORTDOCS%%%%DOCSDIR%%/reference/ref_ellipsoid3d.jpg
%%PORTDOCS%%%%DOCSDIR%%/reference/ref_equalize.jpg %%PORTDOCS%%%%DOCSDIR%%/reference/ref_equalize.jpg
%%PORTDOCS%%%%DOCSDIR%%/reference/ref_histogram.jpg %%PORTDOCS%%%%DOCSDIR%%/reference/ref_histogram.jpg
%%PORTDOCS%%%%DOCSDIR%%/reference/ref_image.jpg
%%PORTDOCS%%%%DOCSDIR%%/reference/ref_index.jpg %%PORTDOCS%%%%DOCSDIR%%/reference/ref_index.jpg
%%PORTDOCS%%%%DOCSDIR%%/reference/ref_isoline3d.jpg %%PORTDOCS%%%%DOCSDIR%%/reference/ref_isoline3d.jpg
%%PORTDOCS%%%%DOCSDIR%%/reference/ref_isosurface3d.jpg %%PORTDOCS%%%%DOCSDIR%%/reference/ref_isosurface3d.jpg
%%PORTDOCS%%%%DOCSDIR%%/reference/ref_map.jpg %%PORTDOCS%%%%DOCSDIR%%/reference/ref_map.jpg
%%PORTDOCS%%%%DOCSDIR%%/reference/ref_mul.jpg
%%PORTDOCS%%%%DOCSDIR%%/reference/ref_noise.jpg %%PORTDOCS%%%%DOCSDIR%%/reference/ref_noise.jpg
%%PORTDOCS%%%%DOCSDIR%%/reference/ref_norm.jpg %%PORTDOCS%%%%DOCSDIR%%/reference/ref_norm.jpg
%%PORTDOCS%%%%DOCSDIR%%/reference/ref_normalize.jpg %%PORTDOCS%%%%DOCSDIR%%/reference/ref_normalize.jpg
%%PORTDOCS%%%%DOCSDIR%%/reference/ref_normalize2.jpg %%PORTDOCS%%%%DOCSDIR%%/reference/ref_normalize2.jpg
%%PORTDOCS%%%%DOCSDIR%%/reference/ref_operator_comma.jpg
%%PORTDOCS%%%%DOCSDIR%%/reference/ref_operator_eq.jpg
%%PORTDOCS%%%%DOCSDIR%%/reference/ref_operator_less.jpg
%%PORTDOCS%%%%DOCSDIR%%/reference/ref_operator_minus.jpg
%%PORTDOCS%%%%DOCSDIR%%/reference/ref_operator_plus.jpg
%%PORTDOCS%%%%DOCSDIR%%/reference/ref_operator_plus1.jpg
%%PORTDOCS%%%%DOCSDIR%%/reference/ref_plane3d.jpg %%PORTDOCS%%%%DOCSDIR%%/reference/ref_plane3d.jpg
%%PORTDOCS%%%%DOCSDIR%%/reference/ref_quantize.jpg %%PORTDOCS%%%%DOCSDIR%%/reference/ref_quantize.jpg
%%PORTDOCS%%%%DOCSDIR%%/reference/ref_sphere3d.jpg %%PORTDOCS%%%%DOCSDIR%%/reference/ref_sphere3d.jpg
%%PORTDOCS%%%%DOCSDIR%%/reference/ref_sqr.jpg
%%PORTDOCS%%%%DOCSDIR%%/reference/ref_sqrt.jpg
%%PORTDOCS%%%%DOCSDIR%%/reference/ref_threshold.jpg %%PORTDOCS%%%%DOCSDIR%%/reference/ref_threshold.jpg
%%PORTDOCS%%%%DOCSDIR%%/reference/ref_torus3d.jpg %%PORTDOCS%%%%DOCSDIR%%/reference/ref_torus3d.jpg
%%PORTDOCS%%%%DOCSDIR%%/reference/structcimg__library_1_1CImg-members.html %%PORTDOCS%%%%DOCSDIR%%/reference/structcimg__library_1_1CImg-members.html