mirror of
https://git.FreeBSD.org/ports.git
synced 2025-01-15 07:56:36 +00:00
Upgrade to 1.2.9.
Changelog at <https://sourceforge.net/project/shownotes.php?release_id=609581>.
This commit is contained in:
Thierry Thomas
parent
90431d33ea
commit
a3f8577b7d
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=215899
@ -6,8 +6,7 @@
|
||||
#
|
||||
|
||||
PORTNAME= cimg
|
||||
PORTVERSION= 1.2.8
|
||||
PORTREVISION= 3
|
||||
PORTVERSION= 1.2.9
|
||||
PORTEPOCH= 2
|
||||
CATEGORIES= graphics devel
|
||||
MASTER_SITES= SF
|
||||
@ -19,8 +18,8 @@ COMMENT= The C++ Template Image Processing Library
|
||||
|
||||
USE_ZIP= yes
|
||||
BUILD_WRKSRC= ${WRKSRC}/examples
|
||||
MAKE_ENV= CPPFLAGS="${CFLAGS} ${LAPACK_DEF} ${PTHREAD_CFLAGS}" \
|
||||
LDFLAGS="${LDFLAGS} ${LAPACK_LIB} ${PTHREAD_LIBS}" \
|
||||
MAKE_ENV= CPPFLAGS="${CFLAGS} ${LAPACK_DEF} ${PTHREAD_CFLAGS}" \
|
||||
LDFLAGS="${LDFLAGS} ${LAPACK_LIB} ${PTHREAD_LIBS} -lstdc++" \
|
||||
X11PATH=${LOCALBASE}
|
||||
|
||||
.if !defined(NOPORTDOCS)
|
||||
@ -58,7 +57,7 @@ RUN_DEPENDS+= ffmpeg:${PORTSDIR}/multimedia/ffmpeg
|
||||
. endif
|
||||
|
||||
DOCBASE= CHANGES.txt README.txt
|
||||
DOCREFS= CImg.doxygen CImg_documentation.h CImg_reference.pdf chat.shtml \
|
||||
DOCREFS= CImg.doxygen CImg_documentation.h CImg_reference.pdf \
|
||||
download.shtml favicon.ico favicon.png footer.html header.html \
|
||||
header_reference.html img index.shtml links.shtml news.shtml \
|
||||
reference screenshots.shtml
|
||||
@ -69,12 +68,18 @@ NO_BUILD= yes
|
||||
pre-configure:
|
||||
.if !defined(NOPORTDOCS)
|
||||
${DIRNAME} `${LOCALBASE}/bin/${F77} -print-libgcc-file-name` > ${WRKSRC}/LIBDIR
|
||||
${GREP} -lR 'img/' ${BUILD_WRKSRC} | \
|
||||
${XARGS} ${REINPLACE_CMD} -e 's|"img/|"${EXAMPLESDIR}/img/|g'
|
||||
${REINPLACE_CMD} -e 's|make|${GMAKE}|' ${BUILD_WRKSRC}/Makefile
|
||||
.else
|
||||
${REINPLACE_CMD} -e 's|^OPTFLAGS|#OPTFLAGS|' ${BUILD_WRKSRC}/Makefile
|
||||
.endif
|
||||
. if !defined(WITHOUT_FFMPEG)
|
||||
${REINPLACE_CMD} -e 's|#.*$$(CIMG_FFMPEG_FLAGS)| $$(CIMG_FFMPEG_FLAGS)|' \
|
||||
${BUILD_WRKSRC}/Makefile
|
||||
. endif
|
||||
. if !defined(WITHOUT_LAPACK)
|
||||
${REINPLACE_CMD} -e 's|#.*$$(CIMG_LAPACK_FLAGS)| $$(CIMG_LAPACK_FLAGS)|' \
|
||||
${BUILD_WRKSRC}/Makefile
|
||||
. endif
|
||||
|
||||
.if !defined(NOPORTDOCS)
|
||||
post-build:
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
MD5 (cimg-1.2.8,2/CImg-1.2.8.zip) = b52b6ff9d93ddf50f4872d666c33d836
|
||||
SHA256 (cimg-1.2.8,2/CImg-1.2.8.zip) = e97d723589f625fee52ad0e429ba872b9f4b334cb7e6fd7c0e8995daf67c7dc8
|
||||
SIZE (cimg-1.2.8,2/CImg-1.2.8.zip) = 6462492
|
||||
MD5 (cimg-1.2.9,2/CImg-1.2.9.zip) = b4cad020a467559d7060e1aa372565ba
|
||||
SHA256 (cimg-1.2.9,2/CImg-1.2.9.zip) = 4499e2cc3aa3c432cde76eb3533f06cc3c6d60d7c871d764f80843028761dac5
|
||||
SIZE (cimg-1.2.9,2/CImg-1.2.9.zip) = 6698508
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
--- ./examples/Makefile.orig 2008-04-18 12:46:38.000000000 +0200
|
||||
+++ ./examples/Makefile 2008-04-18 21:54:25.000000000 +0200
|
||||
@@ -73,15 +73,15 @@
|
||||
--- examples/Makefile.orig 2008-06-26 14:31:17.000000000 +0200
|
||||
+++ examples/Makefile 2008-06-28 13:54:24.000000000 +0200
|
||||
@@ -75,15 +75,15 @@
|
||||
# Set correct variables and paths
|
||||
#---------------------------------
|
||||
CIMG_VERSION = 1.28
|
||||
CIMG_VERSION = 1.29
|
||||
-X11PATH = /usr/X11R6
|
||||
-CC = g++
|
||||
+#X11PATH = /usr/X11R6
|
||||
@ -20,7 +20,16 @@
|
||||
endif
|
||||
|
||||
#--------------------------------------------------
|
||||
@@ -131,7 +131,7 @@
|
||||
@@ -101,7 +101,7 @@
|
||||
ifeq ($(CC),icc)
|
||||
CIMG_OPT_FLAGS = -O3 -ipo -no-prec-div
|
||||
else
|
||||
-CIMG_OPT_FLAGS = -O3 -ffast-math
|
||||
+CIMG_OPT_FLAGS = -ffast-math
|
||||
endif
|
||||
|
||||
# Flags to enable OpenMP support.
|
||||
@@ -146,10 +146,10 @@
|
||||
CIMG_FFTW3_FLAGS = -Dcimg_use_fftw3 -lfftw3
|
||||
|
||||
# Flags to enable the use of LAPACK routines for matrix computation
|
||||
@ -28,18 +37,63 @@
|
||||
+CIMG_LAPACK_FLAGS = -Dcimg_use_lapack -lblas -llapack
|
||||
|
||||
# Flags to enable the use of the Board library
|
||||
CIMG_BOARD_FLAGS = -Dcimg_use_board -lboard
|
||||
@@ -142,6 +142,9 @@
|
||||
-CIMG_BOARD_FLAGS = -Dcimg_use_board -I/usr/include/board -lboard
|
||||
+CIMG_BOARD_FLAGS = -Dcimg_use_board -I$(LOCALBASE)/board -lboard
|
||||
|
||||
# Flags to compile on Solaris
|
||||
CIMG_SOLARIS_FLAGS = -R$(X11PATH)/lib -lrt -lnsl -lsocket
|
||||
@@ -157,6 +157,9 @@
|
||||
# Flags to compile on MacOSX with Carbon-based display support
|
||||
CIMG_CARBON_FLAGS = -Dcimg_display_type=3 -framework Carbon
|
||||
CIMG_CARBON_FLAGS = -Dcimg_display=3 -framework Carbon
|
||||
|
||||
+# Flags to compile on FreeBSD
|
||||
+CIMG_FREEBSD_FLAGS = -ansi -ffast-math -I$(X11PATH)/include $(EXTRA_FLAGS) -lX11 -L$(X11PATH)/lib
|
||||
+
|
||||
# Set default compilation flags.
|
||||
# Uncomment lines here, if you want to customize your default configuration
|
||||
CIMG_DEFAULT_FLAGS = $(CIMG_X11_FLAGS) \
|
||||
@@ -208,7 +211,7 @@
|
||||
CIMG_DEFAULT_FLAGS = $(CIMG_VT100_FLAGS) \
|
||||
@@ -164,15 +167,15 @@
|
||||
$(CIMG_XSHM_FLAGS) \
|
||||
$(CIMG_XRANDR_FLAGS) \
|
||||
# $(CIMG_OPENMP_FLAGS) \
|
||||
-# $(CIMG_PNG_FLAGS) \
|
||||
-# $(CIMG_JPEG_FLAGS) \
|
||||
-# $(CIMG_TIFF_FLAGS) \
|
||||
+ $(CIMG_PNG_FLAGS) \
|
||||
+ $(CIMG_JPEG_FLAGS) \
|
||||
+ $(CIMG_TIFF_FLAGS) \
|
||||
# $(CIMG_FFMPEG_FLAGS) \
|
||||
-# $(CIMG_ZLIB_FLAGS) \
|
||||
-# $(CIMG_MAGICK_FLAGS) \
|
||||
-# $(CIMG_FFTW3_FLAGS)
|
||||
-# $(CIMG_LAPACK_FLAGS)
|
||||
-# $(CIMG_BOARD_FLAGS)
|
||||
+ $(CIMG_ZLIB_FLAGS) \
|
||||
+ $(CIMG_MAGICK_FLAGS) \
|
||||
+ $(CIMG_FFTW3_FLAGS) \
|
||||
+# $(CIMG_LAPACK_FLAGS) \
|
||||
+ $(CIMG_BOARD_FLAGS)
|
||||
|
||||
# Set full compilation flags.
|
||||
CIMG_FULL_FLAGS = $(CIMG_OPT_FLAGS) \
|
||||
@@ -184,12 +187,12 @@
|
||||
$(CIMG_PNG_FLAGS) \
|
||||
$(CIMG_JPEG_FLAGS) \
|
||||
$(CIMG_ZLIB_FLAGS) \
|
||||
+ $(CIMG_MAGICK_FLAGS) \
|
||||
+ $(CIMG_BOARD_FLAGS) \
|
||||
+ $(CIMG_FFTW3_FLAGS) \
|
||||
# $(CIMG_FFMPEG_FLAGS) \
|
||||
-# $(CIMG_MAGICK_FLAGS) \
|
||||
-# $(CIMG_OPENMP_FLAGS) \
|
||||
-# $(CIMG_FFTW3_FLAGS) \
|
||||
# $(CIMG_LAPACK_FLAGS) \
|
||||
-# $(CIMG_BOARD_FLAGS)
|
||||
+# $(CIMG_OPENMP_FLAGS)
|
||||
|
||||
#-------------------------
|
||||
# Define Makefile entries
|
||||
@@ -234,7 +237,7 @@
|
||||
all: $(CIMG_FILES)
|
||||
|
||||
clean:
|
||||
@ -48,16 +102,16 @@
|
||||
|
||||
greycstoration4gimp: greycstoration4gimp.cpp
|
||||
@echo
|
||||
@@ -228,6 +231,12 @@
|
||||
@@ -254,6 +257,12 @@
|
||||
Mlinux:
|
||||
make "ARCHFLAGS=$(CIMG_ALL_FLAGS)" all jpeg_buffer greycstoration4gimp
|
||||
make "ARCHFLAGS=$(CIMG_FULL_FLAGS)" "STRIP_EXE=1" all jpeg_buffer greycstoration4gimp
|
||||
|
||||
+# FreeBSD targets
|
||||
+dFreeBSD:
|
||||
+ make "ARCHFLAGS=$(CIMG_FREEBSD_FLAGS) $(CIMG_DEFAULT_FLAGS)" all
|
||||
+
|
||||
+oFreeBSD:
|
||||
+ make "ARCHFLAGS=$(CIMG_FREEBSD_FLAGS) $(CIMG_ALL_FLAGS)" all
|
||||
+ make "ARCHFLAGS=$(CIMG_FREEBSD_FLAGS) $(CIMG_FULL_FLAGS)" all
|
||||
# Sun Solaris targets
|
||||
solaris:
|
||||
make "ARCHFLAGS=$(CIMG_SOLARIS_FLAGS) $(CIMG_DEFAULT_FLAGS)" all
|
||||
|
||||
@ -5,7 +5,6 @@ include/CImg.h
|
||||
%%PORTDOCS%%%%DOCSDIR%%/CImg_documentation.h
|
||||
%%PORTDOCS%%%%DOCSDIR%%/CImg_reference.pdf
|
||||
%%PORTDOCS%%%%DOCSDIR%%/README.txt
|
||||
%%PORTDOCS%%%%DOCSDIR%%/chat.shtml
|
||||
%%PORTDOCS%%%%DOCSDIR%%/download.shtml
|
||||
%%PORTDOCS%%%%DOCSDIR%%/favicon.ico
|
||||
%%PORTDOCS%%%%DOCSDIR%%/favicon.png
|
||||
@ -99,6 +98,7 @@ include/CImg.h
|
||||
%%PORTDOCS%%%%DOCSDIR%%/reference/doxygen.css
|
||||
%%PORTDOCS%%%%DOCSDIR%%/reference/doxygen.png
|
||||
%%PORTDOCS%%%%DOCSDIR%%/reference/functions.html
|
||||
%%PORTDOCS%%%%DOCSDIR%%/reference/functions_0x61.html
|
||||
%%PORTDOCS%%%%DOCSDIR%%/reference/functions_0x62.html
|
||||
%%PORTDOCS%%%%DOCSDIR%%/reference/functions_0x63.html
|
||||
%%PORTDOCS%%%%DOCSDIR%%/reference/functions_0x64.html
|
||||
@ -124,6 +124,7 @@ include/CImg.h
|
||||
%%PORTDOCS%%%%DOCSDIR%%/reference/functions_0x79.html
|
||||
%%PORTDOCS%%%%DOCSDIR%%/reference/functions_0x7e.html
|
||||
%%PORTDOCS%%%%DOCSDIR%%/reference/functions_func.html
|
||||
%%PORTDOCS%%%%DOCSDIR%%/reference/functions_func_0x61.html
|
||||
%%PORTDOCS%%%%DOCSDIR%%/reference/functions_func_0x62.html
|
||||
%%PORTDOCS%%%%DOCSDIR%%/reference/functions_func_0x63.html
|
||||
%%PORTDOCS%%%%DOCSDIR%%/reference/functions_func_0x64.html
|
||||
@ -157,10 +158,14 @@ include/CImg.h
|
||||
%%PORTDOCS%%%%DOCSDIR%%/reference/group__cimg__files__io.html
|
||||
%%PORTDOCS%%%%DOCSDIR%%/reference/group__cimg__loops.html
|
||||
%%PORTDOCS%%%%DOCSDIR%%/reference/group__cimg__options.html
|
||||
%%PORTDOCS%%%%DOCSDIR%%/reference/group__cimg__overview.html
|
||||
%%PORTDOCS%%%%DOCSDIR%%/reference/group__cimg__storage.html
|
||||
%%PORTDOCS%%%%DOCSDIR%%/reference/group__cimg__structure.html
|
||||
%%PORTDOCS%%%%DOCSDIR%%/reference/group__cimg__tutorial.html
|
||||
%%PORTDOCS%%%%DOCSDIR%%/reference/group__cimg__visual2005.html
|
||||
%%PORTDOCS%%%%DOCSDIR%%/reference/group__cimgdisplay__structure.html
|
||||
%%PORTDOCS%%%%DOCSDIR%%/reference/group__cimgexception__structure.html
|
||||
%%PORTDOCS%%%%DOCSDIR%%/reference/group__cimglist__structure.html
|
||||
%%PORTDOCS%%%%DOCSDIR%%/reference/hierarchy.html
|
||||
%%PORTDOCS%%%%DOCSDIR%%/reference/index.html
|
||||
%%PORTDOCS%%%%DOCSDIR%%/reference/modules.html
|
||||
@ -185,6 +190,7 @@ include/CImg.h
|
||||
%%PORTDOCS%%%%DOCSDIR%%/screenshots.shtml
|
||||
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/CImg_demo.cpp
|
||||
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile
|
||||
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/captcha.cpp
|
||||
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cimgmatlab_cannyderiche.cpp
|
||||
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cimgmatlab_cannyderiche.m
|
||||
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/curve_editor.cpp
|
||||
@ -199,38 +205,16 @@ include/CImg.h
|
||||
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/image2ascii.cpp
|
||||
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/image_registration.cpp
|
||||
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/image_surface.cpp
|
||||
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/img/brain.bmp
|
||||
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/img/cdrom.bmp
|
||||
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/img/choose.bmp
|
||||
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/img/dynamite.bmp
|
||||
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/img/enemy.bmp
|
||||
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/img/enemy10.bmp
|
||||
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/img/enemy11.bmp
|
||||
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/img/enemy12.bmp
|
||||
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/img/enemy13.bmp
|
||||
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/img/enemy14.bmp
|
||||
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/img/enemy15.bmp
|
||||
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/img/enemy16.bmp
|
||||
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/img/enemy2.bmp
|
||||
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/img/enemy3.bmp
|
||||
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/img/enemy4.bmp
|
||||
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/img/enemy5.bmp
|
||||
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/img/enemy6.bmp
|
||||
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/img/enemy7.bmp
|
||||
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/img/enemy8.bmp
|
||||
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/img/enemy9.bmp
|
||||
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/img/foot.ppm
|
||||
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/img/heart.bmp
|
||||
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/img/CImg_demo.h
|
||||
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/img/lena.pgm
|
||||
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/img/light3d.ppm
|
||||
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/img/logo.ppm
|
||||
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/img/milla.ppm
|
||||
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/img/logo.bmp
|
||||
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/img/milla.bmp
|
||||
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/img/odykill.h
|
||||
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/img/parrot_mask.pgm
|
||||
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/img/parrot_original.ppm
|
||||
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/img/sh0r.pgm
|
||||
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/img/sh1r.pgm
|
||||
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/img/title.bmp
|
||||
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/img/tomato.bmp
|
||||
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/img/tetris.h
|
||||
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/inrcast.cpp
|
||||
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/jawbreaker.cpp
|
||||
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/jpeg_buffer.cpp
|
||||
@ -241,8 +225,8 @@ include/CImg.h
|
||||
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pde_TschumperleDeriche2d.cpp
|
||||
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pde_heatflow2d.cpp
|
||||
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/radon_transform.cpp
|
||||
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/scene3d.cpp
|
||||
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tetris.cpp
|
||||
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/toolbox3d.cpp
|
||||
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tron.cpp
|
||||
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial.cpp
|
||||
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/wavelet_atrous.cpp
|
||||
|
||||
Loading…
Reference in New Issue
Block a user