diff --git a/graphics/cimg/Makefile b/graphics/cimg/Makefile index 0f924ffae052..f925ecf4efe3 100644 --- a/graphics/cimg/Makefile +++ b/graphics/cimg/Makefile @@ -1,143 +1,142 @@ PORTNAME= cimg DISTVERSIONPREFIX= v. -DISTVERSION= 3.3.2 -PORTREVISION= 1 +DISTVERSION= 3.3.3 PORTEPOCH= 3 CATEGORIES= graphics devel MAINTAINER= thierry@FreeBSD.org COMMENT= C++ Template Image Processing Library WWW= https://cimg.eu/ LICENSE= CeCILL_C CeCILL LICENSE_COMB= dual LICENSE_NAME_CeCILL_C= CeCILL-C LICENSE_NAME_CeCILL= CeCILL LICENSE_FILE_CeCILL_C= ${WRKSRC}/Licence_CeCILL-C_V1-en.txt LICENSE_FILE_CeCILL= ${WRKSRC}/Licence_CeCILL_V2-en.txt LICENSE_PERMS_CeCILL_C= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept LICENSE_PERMS_CeCILL= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept USE_GITHUB= yes GH_ACCOUNT= dtschump GH_PROJECT= CImg BUILD_WRKSRC= ${WRKSRC}/examples OPTIONS_DEFINE= DOCS EXAMPLES .include .if ${PORT_OPTIONS:MDOCS} || ${PORT_OPTIONS:MEXAMPLES} USES+= compiler:c11 gmake pkgconfig:build xorg .endif .if ${PORT_OPTIONS:MDOCS} .if !defined(WITHOUT_LAPACK) . if defined(WITH_ATLAS) USES+= blaslapack:atlas . else USES+= blaslapack . endif .endif REINPLACE_ARGS= -i "" #LIB_DEPENDS+= libboard.so:graphics/libboard . if !defined(WITH_DEBUG) LIB_DEPENDS+= libcurl.so:ftp/curl \ libpng.so:graphics/png \ libtiff.so:graphics/tiff \ libImath.so:math/Imath \ libheif.so:graphics/libheif \ libOpenEXR.so:graphics/openexr \ libgimp-2.0.so:graphics/gimp-app \ libfftw3.so:math/fftw3 \ libopencv_core.so:graphics/opencv \ libGraphicsMagick.so:graphics/GraphicsMagick RUN_DEPENDS+= dcraw:graphics/dcraw USES+= jpeg ALL_TARGET= Mlinux . else ALL_TARGET= dlinux WITHOUT_MEDCON= yes WITHOUT_FFMPEG= yes WITHOUT_LAPACK= yes . endif . if !defined(WITHOUT_MEDCON) RUN_DEPENDS+= medcon:graphics/xmedcon . endif . if !defined(WITHOUT_FFMPEG) LIB_DEPENDS+= libavformat.so:multimedia/ffmpeg . endif . if !defined(WITHOUT_LAPACK) # Don't really need Fortran, but required to link with blas/lapack USES+= fortran . endif USE_XORG+= x11 xrandr . if defined(WITH_XSHM) USE_XORG+= xext . endif DOCBASE= README.txt CFLAGS+= -I${LOCALBASE}/include/Imath -I${LOCALBASE}/include/OpenEXR MAKE_ARGS+= CPPFLAGS="${CFLAGS}" FREEBSD_LDFLAGS="${LDFLAGS}" PROGS= CImg_demo captcha curve_editor2d dtmri_view3d \ 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 \ scene3d spherical_function3d tetris tron tutorial use_RGBclass \ use_chlpca use_draw_gradient use_jpeg_buffer use_nlmeans use_skeleton \ wavelet_atrous .else NO_BUILD= yes .endif .include pre-configure-DOCS-on: ${REINPLACE_CMD} -e 's|make|${MAKE_CMD}|' ${BUILD_WRKSRC}/Makefile pre-configure-DOCS-off: ${REINPLACE_CMD} -e 's|^OPTFLAGS|#OPTFLAGS|' ${BUILD_WRKSRC}/Makefile pre-configure: . if !defined(WITHOUT_FFMPEG) ${REINPLACE_CMD} -e 's|#FFMPEG_CFLAGS|FFMPEG_CFLAGS|' \ -e 's|#FFMPEG_DEFINE|FFMPEG_DEFINE|' \ -e 's|#FFMPEG_LIBS|FFMPEG_LIBS|' \ ${BUILD_WRKSRC}/Makefile . endif . if !defined(WITHOUT_LAPACK) ${REINPLACE_CMD} -e 's|#LAPACK_CFLAGS|LAPACK_CFLAGS|' \ -e 's|#LAPACK_DEFINE|LAPACK_DEFINE|' \ -e 's|#LAPACK_LIBS|LAPACK_LIBS|' \ -e 's|-lblas -llapack|-L${LOCALBASE}/lib ${BLASLIB} ${LAPACKLIB}|' \ ${BUILD_WRKSRC}/Makefile . endif . if defined(WITH_XSHM) ${REINPLACE_CMD} -e 's|XSHM_CFLAGS = #|XSHM_CFLAGS =|' \ -e 's|XSHM_LDFLAGS = #|XSHM_LDFLAGS =|' \ ${BUILD_WRKSRC}/Makefile . endif do-install: ${INSTALL_DATA} ${WRKSRC}/CImg.h ${STAGEDIR}${PREFIX}/include do-install-DOCS-on: ${INSTALL_PROGRAM} ${PROGS:C|^|${BUILD_WRKSRC}/|} ${STAGEDIR}${PREFIX}/bin ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${DOCBASE:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} do-install-EXAMPLES-on: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${CP} -R ${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR} @(cd ${STAGEDIR}${EXAMPLESDIR} && ${MAKE_CMD} clean) @${RM} ${STAGEDIR}${EXAMPLESDIR}/*.orig .include diff --git a/graphics/cimg/distinfo b/graphics/cimg/distinfo index b81dd58910fb..0489f2df57ba 100644 --- a/graphics/cimg/distinfo +++ b/graphics/cimg/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1699724135 -SHA256 (dtschump-CImg-v.3.3.2_GH0.tar.gz) = 2fffcc1c5abe6c86e38e2ae57e0f9c41985711d01e069cf6910c72382d3b536e -SIZE (dtschump-CImg-v.3.3.2_GH0.tar.gz) = 12662681 +TIMESTAMP = 1705246100 +SHA256 (dtschump-CImg-v.3.3.3_GH0.tar.gz) = 13bf5467952a5973d50d043c270b23c172de8cb89d8202d30d189aef1e506749 +SIZE (dtschump-CImg-v.3.3.3_GH0.tar.gz) = 12663036 diff --git a/graphics/cimg/files/patch-examples__Makefile b/graphics/cimg/files/patch-examples__Makefile index 5ee929259352..bb61907dc368 100644 --- a/graphics/cimg/files/patch-examples__Makefile +++ b/graphics/cimg/files/patch-examples__Makefile @@ -1,126 +1,134 @@ ---- examples/Makefile.orig 2022-08-19 17:18:04 UTC +--- examples/Makefile.orig 2024-01-10 06:42:56 UTC +++ examples/Makefile -@@ -89,7 +89,7 @@ VERSION2 = $(shell grep 'cimg_version\ ' ../CImg.h | t +@@ -89,7 +89,7 @@ SVERSION = $(VERSION1).$(VERSION2).$(VERSION3) VERSION3 = $(shell grep 'cimg_version\ ' ../CImg.h | tail -c2 | head -c1) SVERSION = $(VERSION1).$(VERSION2).$(VERSION3) -X11PATH = /usr/X11R6 +X11PATH = $(LOCALBASE) EXE_PRE = EXE_EXT = -@@ -111,7 +111,7 @@ IS_ICPC = 1 +@@ -111,7 +111,7 @@ CXXVER = $(CXX) endif CXXVER = $(CXX) -CFLAGS = -I.. -Wall -Wextra -Wfatal-errors -Werror=unknown-pragmas -Werror=unused-label +CFLAGS = -I.. -Wall -Wextra $(CPPFLAGS) LIBS = -lm ifdef IS_GCC CXXVER = $(shell $(CXX) -v 2>&1 | tail -n 1) -@@ -151,7 +151,7 @@ DEBUG_CFLAGS = -Dcimg_verbosity=3 -Dcimg_strict_warnin +@@ -151,7 +151,7 @@ VT100_CFLAGS = -Dcimg_use_vt100 VT100_CFLAGS = -Dcimg_use_vt100 # Flags to enable code optimization by the compiler. -OPT_CFLAGS = -Ofast +OPT_CFLAGS = # -Ofast - handled by the port CFLAGS ifdef IS_GCC # Add -mtune=generic for GCC if supported. NO_MTUNE_GENERIC = $(shell $(CXX) -mtune=generic -E - < /dev/null > /dev/null 2>&1; echo $$?) -@@ -176,9 +176,9 @@ endif +@@ -176,9 +176,9 @@ OPENCV_DEFINE = -Dcimg_use_opencv # Flags to enable OpenCV support. OPENCV_DEFINE = -Dcimg_use_opencv -OPENCV_INCDIR = $(shell pkg-config opencv --cflags || echo -I/usr/include/opencv) -I/usr/include/opencv -I/usr/include/opencv4 +OPENCV_INCDIR = $(shell pkg-config opencv4 --cflags || echo -I/usr/include/opencv) -I/usr/include/opencv -I/usr/include/opencv4 OPENCV_CFLAGS = $(OPENCV_DEFINE) $(OPENCV_INCDIR) -OPENCV_LIBS = $(shell pkg-config opencv --libs || echo -lopencv_core -lopencv_highgui) +OPENCV_LIBS = $(shell pkg-config opencv4 --libs || echo -lopencv_core -lopencv_highgui) # Flags used to disable display capablities of CImg NODISPLAY_CFLAGS = -Dcimg_display=0 -@@ -228,7 +228,7 @@ JPEG_LIBS = -ljpeg +@@ -228,7 +228,7 @@ TIFF_CFLAGS = $(TIFF_DEFINE) $(TIFF_INCDIR) TIFF_DEFINE = -Dcimg_use_tiff TIFF_INCDIR = TIFF_CFLAGS = $(TIFF_DEFINE) $(TIFF_INCDIR) -TIFF_LIBS = -ltiff +TIFF_LIBS = -ltiff -ltiffxx # Flags to enable native support for loading HEIF image files, using the libheif library. # ( https://github.com/strukturag/libheif ) -@@ -247,16 +247,16 @@ MINC2_LIBS = -lminc_io -lvolume_io2 -lminc2 -lnetcdf - +@@ -247,16 +247,16 @@ OPENEXR_DEFINE = -Dcimg_use_openexr # Flags to enable native support for EXR image files, using the OpenEXR library. # ( http://www.openexr.com/ ) OPENEXR_DEFINE = -Dcimg_use_openexr -OPENEXR_INCDIR = -I/usr/include/OpenEXR +OPENEXR_INCDIR = -I$(LOCALBASE)/include/OpenEXR OPENEXR_CFLAGS = $(OPENEXR_DEFINE) $(OPENEXR_INCDIR) -OPENEXR_LIBS = -lIlmImf -lHalf +OPENEXR_LIBS = -lOpenEXR -lImath # Flags to enable native support for various video files, using the FFMPEG library. # ( http://www.ffmpeg.org/ ) -FFMPEG_DEFINE = -Dcimg_use_ffmpeg -D__STDC_CONSTANT_MACROS -FFMPEG_INCDIR = -I/usr/include/libavcodec -I/usr/include/libavformat -I/usr/include/libswscale -I/usr/include/ffmpeg -FFMPEG_CFLAGS = $(FFMPEG_DEFINE) $(FFMPEG_INCDIR) -FFMPEG_LIBS = -lavcodec -lavformat -lswscale +#FFMPEG_DEFINE = -Dcimg_use_ffmpeg -D__STDC_CONSTANT_MACROS +FFMPEG_INCDIR = -I$(LOCALBASE)/include/libavcodec -I$(LOCALBASE)/include/libavformat -I$(LOCALBASE)/include/libswscale -I$(LOCALBASE)/include/ffmpeg +#FFMPEG_CFLAGS = $(FFMPEG_DEFINE) $(FFMPEG_INCDIR) +#FFMPEG_LIBS = -lavcodec -lavformat -lswscale # Flags to enable native support for compressed .cimgz files, using the Zlib library. # ( http://www.zlib.net/ ) @@ -292,17 +292,17 @@ endif # Flags to enable the use of LAPACK routines for matrix computation # ( http://www.netlib.org/lapack/ ) -LAPACK_DEFINE = -Dcimg_use_lapack +#LAPACK_DEFINE = -Dcimg_use_lapack LAPACK_INCDIR = -LAPACK_CFLAGS = $(LAPACK_DEFINE) $(LAPACK_INCDIR) -LAPACK_LIBS = -lblas -llapack +#LAPACK_CFLAGS = $(LAPACK_DEFINE) $(LAPACK_INCDIR) +#LAPACK_LIBS = -lblas -llapack # Flags to enable the use of the Board library # ( https://github.com/c-koi/libboard ) BOARD_DEFINE = -Dcimg_use_board -BOARD_INCDIR = -I/usr/include/board -BOARD_CFLAGS = $(BOARD_DEFINE) $(BOARD_INCDIR) -BOARD_LIBS = -lboard +BOARD_INCDIR = -I$(LOCALBASE)/include/board +#BOARD_CFLAGS = $(BOARD_DEFINE) $(BOARD_INCDIR) +#BOARD_LIBS = -lboard # Flags to compile GIMP plug-ins. ifeq ($(MSYSTEM),MINGW32) -@@ -372,6 +372,7 @@ $(TIFF_LIBS) \ +@@ -372,6 +372,7 @@ $(XSHM_LIBS)" \ $(HEIF_LIBS) \ $(LAPACK_LIBS) \ $(XSHM_LIBS)" \ +$(PTHREAD_LIBS)" \ all $(EXTRA_FILES) # Linux/BSD/Mac OSX targets, with X11 display. -@@ -465,8 +466,11 @@ $(ZLIB_CFLAGS) \ +@@ -452,6 +453,7 @@ $(OPT_CFLAGS) \ + @$(MAKE) \ + "CONF_CFLAGS = \ + $(OPT_CFLAGS) \ ++$(OPENMP_CFLAGS) \ + $(VT100_CFLAGS) \ + $(X11_CFLAGS) \ + $(XSHM_CFLAGS) \ +@@ -465,8 +467,11 @@ $(MAGICK_CFLAGS) \ $(CURL_CFLAGS) \ $(OPENCV_CFLAGS) \ $(MAGICK_CFLAGS) \ +$(LAPACK_CFLAGS) \ +$(BOARD_CFLAGS) \ $(FFTW3_CFLAGS)" \ "CONF_LIBS = \ +$(FREEBSD_LDFLAGS) \ $(X11_LIBS) \ $(XSHM_LIBS) \ $(XRANDR_LIBS) \ -@@ -479,6 +483,8 @@ $(ZLIB_LIBS) \ +@@ -479,6 +484,8 @@ $(MAGICK_LIBS) \ $(CURL_LIBS) \ $(OPENCV_LIBS) \ $(MAGICK_LIBS) \ +$(LAPACK_LIBS) \ +$(BOARD_LIBS) \ $(FFTW3_LIBS)" \ "STRIP_EXE=true" \ all $(EXTRA_FILES)