From 57b3a47c812818a2afdd011255e006a2978c6f70 Mon Sep 17 00:00:00 2001 From: thierry Date: Sat, 19 Apr 2008 12:09:16 +0000 Subject: Upgrade to 1.2.8. Changelog at . --- graphics/cimg/Makefile | 17 +++++++---- graphics/cimg/distinfo | 6 ++-- graphics/cimg/files/patch-examples::Makefile | 43 ++++++++++++++++------------ graphics/cimg/pkg-plist | 19 +++++++----- 4 files changed, 50 insertions(+), 35 deletions(-) diff --git a/graphics/cimg/Makefile b/graphics/cimg/Makefile index 609fd2091fec..f34dc3b9d490 100644 --- a/graphics/cimg/Makefile +++ b/graphics/cimg/Makefile @@ -6,8 +6,7 @@ # PORTNAME= cimg -PORTVERSION= 1.2.7 -PORTREVISION= 1 +PORTVERSION= 1.2.8 PORTEPOCH= 1 CATEGORIES= graphics devel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} @@ -26,6 +25,7 @@ MAKE_ENV= CPPFLAGS="${CFLAGS} ${LAPACK_DEF} ${PTHREAD_CFLAGS}" \ .if !defined(NOPORTDOCS) BUILD_DEPENDS+= doxygen:${PORTSDIR}/devel/doxygen +USE_GMAKE= yes USE_GCC= 3.4+ REINPLACE_ARGS= -i "" LIB_DEPENDS+= board.0:${PORTSDIR}/graphics/libboard @@ -55,11 +55,15 @@ RUN_DEPENDS+= gm:${PORTSDIR}/graphics/GraphicsMagick .if !defined(WITHOUT_MEDCON) RUN_DEPENDS+= medcon:${PORTSDIR}/graphics/xmedcon .endif +.if !defined(WITHOUT_FFMPEG) +RUN_DEPENDS+= ffmpeg:${PORTSDIR}/multimedia/ffmpeg +.endif DOCBASE= CHANGES.txt README.txt -DOCREFS= download.shtml favicon.ico favicon.png foot_reference.html \ - head.html head_reference.html img index.shtml links.shtml \ - news.shtml reference screenshots.shtml +DOCREFS= CImg.doxygen CImg_documentation.h CImg_reference.pdf chat.shtml \ + download.shtml favicon.ico favicon.png footer.html header.html \ + header_reference.html img index.shtml links.shtml news.shtml \ + reference screenshots.shtml .else NOBUILD= yes .endif @@ -69,6 +73,7 @@ pre-configure: .if !defined(NOPORTDOCS) ${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 @@ -88,7 +93,7 @@ do-install: ${CP} -R ${WRKSRC}/documentation/${doc} ${DOCSDIR} . endfor ${CP} -R ${WRKSRC}/examples/* ${EXAMPLESDIR} - @(cd ${EXAMPLESDIR} && ${MAKE} clean) + @(cd ${EXAMPLESDIR} && ${GMAKE} clean) ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR} ${EXAMPLESDIR} ${FIND} ${DOCSDIR} ${EXAMPLESDIR} -type f -exec ${CHMOD} ${SHAREMODE} {} \; .endif diff --git a/graphics/cimg/distinfo b/graphics/cimg/distinfo index 4f44c65f1999..b17680a8a46f 100644 --- a/graphics/cimg/distinfo +++ b/graphics/cimg/distinfo @@ -1,3 +1,3 @@ -MD5 (cimg-1.2.7_1,1/CImg-1.2.7.zip) = 6ace15afde21fa4884c8ea1ae1ce3072 -SHA256 (cimg-1.2.7_1,1/CImg-1.2.7.zip) = aad74c25446caf84c0725496dc5cc2c2b8555b4062989c89985dd7af8b718d83 -SIZE (cimg-1.2.7_1,1/CImg-1.2.7.zip) = 6173936 +MD5 (cimg-1.2.8,1/CImg-1.2.8.zip) = b52b6ff9d93ddf50f4872d666c33d836 +SHA256 (cimg-1.2.8,1/CImg-1.2.8.zip) = e97d723589f625fee52ad0e429ba872b9f4b334cb7e6fd7c0e8995daf67c7dc8 +SIZE (cimg-1.2.8,1/CImg-1.2.8.zip) = 6462492 diff --git a/graphics/cimg/files/patch-examples::Makefile b/graphics/cimg/files/patch-examples::Makefile index 4e7cc60ace5b..9389b77108a0 100644 --- a/graphics/cimg/files/patch-examples::Makefile +++ b/graphics/cimg/files/patch-examples::Makefile @@ -1,21 +1,26 @@ ---- ./examples/Makefile.orig 2008-01-04 11:24:33.000000000 +0100 -+++ ./examples/Makefile 2008-01-04 23:22:20.000000000 +0100 -@@ -42,10 +42,10 @@ +--- ./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 @@ # Set correct variables and paths #--------------------------------- - CIMG_VERSION = 1.27 --CC = g++ + CIMG_VERSION = 1.28 -X11PATH = /usr/X11R6 --CFLAGS = -Wall -W -ansi -pedantic -ffast-math --LDFLAGS = -lm -lpthread -+CC = $(CXX) +-CC = g++ +#X11PATH = /usr/X11R6 -+#CFLAGS = -Wall -W -ansi -pedantic -ffast-math ++#CC = g++ + + ifeq ($(CC),icc) + CFLAGS = -ansi + LDFLAGS = -lpthread + else +-CFLAGS = -Wall -W -ansi -pedantic +-LDFLAGS = -lm -lpthread ++#CFLAGS = -Wall -W -ansi -pedantic +#LDFLAGS = -lm -lpthread + endif #-------------------------------------------------- - # Set compilation flags allowing to customize CImg -@@ -80,7 +80,7 @@ +@@ -131,7 +131,7 @@ CIMG_FFTW3_FLAGS = -Dcimg_use_fftw3 -lfftw3 # Flags to enable the use of LAPACK routines for matrix computation @@ -24,9 +29,9 @@ # Flags to enable the use of the Board library CIMG_BOARD_FLAGS = -Dcimg_use_board -lboard -@@ -88,6 +88,9 @@ - # Flags to compile on Solaris - CIMG_SOLARIS_FLAGS = -R$(X11PATH)/lib -lrt -lnsl -lsocket +@@ -142,6 +142,9 @@ + # Flags to compile on MacOSX with Carbon-based display support + CIMG_CARBON_FLAGS = -Dcimg_display_type=3 -framework Carbon +# Flags to compile on FreeBSD +CIMG_FREEBSD_FLAGS = -ansi -ffast-math -I$(X11PATH)/include $(EXTRA_FLAGS) -lX11 -L$(X11PATH)/lib @@ -34,18 +39,18 @@ # Set default compilation flags. # Uncomment lines here, if you want to customize your default configuration CIMG_DEFAULT_FLAGS = $(CIMG_X11_FLAGS) \ -@@ -144,7 +147,7 @@ +@@ -208,7 +211,7 @@ all: $(CIMG_FILES) clean: -- rm -f *.exe *~ jpeg_buffer greycstoration4gimp $(CIMG_FILES) -+ rm -f *.exe *~ jpeg_buffer greycstoration4gimp $(CIMG_FILES) Makefile.orig +- rm -rf *.app *.exe *~ jpeg_buffer greycstoration4gimp $(CIMG_FILES) ++ rm -rf *.app *.exe *~ jpeg_buffer greycstoration4gimp $(CIMG_FILES) Makefile.orig greycstoration4gimp: greycstoration4gimp.cpp @echo -@@ -164,6 +167,12 @@ +@@ -228,6 +231,12 @@ Mlinux: - make "ARCHFLAGS=-O3 $(CIMG_ALL_FLAGS)" all jpeg_buffer greycstoration4gimp + make "ARCHFLAGS=$(CIMG_ALL_FLAGS)" all jpeg_buffer greycstoration4gimp +# FreeBSD targets +dFreeBSD: diff --git a/graphics/cimg/pkg-plist b/graphics/cimg/pkg-plist index f9d045815fcd..fa55ee1256e9 100644 --- a/graphics/cimg/pkg-plist +++ b/graphics/cimg/pkg-plist @@ -1,13 +1,17 @@ %%PORTDOCS%%bin/CImg_demo include/CImg.h %%PORTDOCS%%%%DOCSDIR%%/CHANGES.txt +%%PORTDOCS%%%%DOCSDIR%%/CImg.doxygen +%%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 -%%PORTDOCS%%%%DOCSDIR%%/foot_reference.html -%%PORTDOCS%%%%DOCSDIR%%/head.html -%%PORTDOCS%%%%DOCSDIR%%/head_reference.html +%%PORTDOCS%%%%DOCSDIR%%/footer.html +%%PORTDOCS%%%%DOCSDIR%%/header.html +%%PORTDOCS%%%%DOCSDIR%%/header_reference.html %%PORTDOCS%%%%DOCSDIR%%/img/CImgLogo.jpg %%PORTDOCS%%%%DOCSDIR%%/img/CImgLogo2.jpg %%PORTDOCS%%%%DOCSDIR%%/img/CImgLogo3.jpg @@ -16,6 +20,7 @@ include/CImg.h %%PORTDOCS%%%%DOCSDIR%%/img/curve_editor.jpg %%PORTDOCS%%%%DOCSDIR%%/img/item_chat.jpg %%PORTDOCS%%%%DOCSDIR%%/img/item_download.jpg +%%PORTDOCS%%%%DOCSDIR%%/img/item_guestbook.jpg %%PORTDOCS%%%%DOCSDIR%%/img/item_intro.jpg %%PORTDOCS%%%%DOCSDIR%%/img/item_links.jpg %%PORTDOCS%%%%DOCSDIR%%/img/item_news.jpg @@ -230,12 +235,12 @@ include/CImg.h %%PORTDOCS%%%%EXAMPLESDIR%%/jawbreaker.cpp %%PORTDOCS%%%%EXAMPLESDIR%%/jpeg_buffer.cpp %%PORTDOCS%%%%EXAMPLESDIR%%/mcf_levelsets.cpp -%%PORTDOCS%%%%EXAMPLESDIR%%/mcf_levelsets3D.cpp +%%PORTDOCS%%%%EXAMPLESDIR%%/mcf_levelsets3d.cpp %%PORTDOCS%%%%EXAMPLESDIR%%/nlmeans.cpp %%PORTDOCS%%%%EXAMPLESDIR%%/odykill.cpp -%%PORTDOCS%%%%EXAMPLESDIR%%/pde_TschumperleDeriche2D.cpp -%%PORTDOCS%%%%EXAMPLESDIR%%/pde_heatflow2D.cpp -%%PORTDOCS%%%%EXAMPLESDIR%%/pslider.cpp +%%PORTDOCS%%%%EXAMPLESDIR%%/pde_TschumperleDeriche2d.cpp +%%PORTDOCS%%%%EXAMPLESDIR%%/pde_heatflow2d.cpp +%%PORTDOCS%%%%EXAMPLESDIR%%/radon_transform.cpp %%PORTDOCS%%%%EXAMPLESDIR%%/tetris.cpp %%PORTDOCS%%%%EXAMPLESDIR%%/toolbox3d.cpp %%PORTDOCS%%%%EXAMPLESDIR%%/tron.cpp -- cgit