Index: head/graphics/gmic/Makefile =================================================================== --- head/graphics/gmic/Makefile (revision 486744) +++ head/graphics/gmic/Makefile (revision 486745) @@ -1,53 +1,55 @@ # $FreeBSD$ PORTNAME= gmic -DISTVERSION= 2.4.1 +DISTVERSION= 2.4.2 CATEGORIES= graphics MASTER_SITES= https://gmic.eu/files/source/ DISTNAME= ${PORTNAME}_${DISTVERSION} MAINTAINER= yuri@FreeBSD.org COMMENT= Framework for image processing LICENSE= CeCILL LICENSE_NAME= CeCILL LICENSE_FILE= ${WRKSRC}/COPYING LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept BROKEN_i386= error: "c++ crashes, clang-5 and 6 fail: undefined reference to `__atomic_load'" BUILD_DEPENDS= ${LOCALBASE}/include/CImg.h:graphics/cimg LIB_DEPENDS= libfftw3.so:math/fftw3 \ libGraphicsMagick++.so:graphics/GraphicsMagick \ libIlmImf.so:graphics/openexr \ libImath.so:graphics/ilmbase \ - libomp.so:devel/openmp \ libopencv_core.so:graphics/opencv-core \ libopencv_video.so:graphics/opencv \ libpng.so:graphics/png \ libtiff.so:graphics/tiff PORTSCOUT= limit:[0-9]\..* # not v.220 and similar USES= cmake:outsource compiler:c++11-lang jpeg pkgconfig USE_LDCONFIG= yes CMAKE_OFF= BUILD_LIB_STATIC CMAKE_ON= ENABLE_DYNAMIC_LINKING WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -OPTIONS_DEFINE= PLUGINS X11 -OPTIONS_DEFAULT= X11 +OPTIONS_DEFINE= OPENMP PLUGINS X11 +OPTIONS_DEFAULT= OPENMP X11 OPTIONS_SUB= yes + +OPENMP_CMAKE_BOOL= ENABLE_OPENMP +OPENMP_LIB_DEPENDS= libomp.so:devel/openmp PLUGINS_CMAKE_BOOL= BUILD_PLUGIN PLUGINS_USE= GNOME=atk,cairo,gdkpixbuf2,glib20,gtk20,pango PLUGINS_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libgimp-2.0.so:graphics/gimp-app X11_CMAKE_BOOL= ENABLE_X X11_USE= XORG=ice,sm,x11,xext .include Index: head/graphics/gmic/distinfo =================================================================== --- head/graphics/gmic/distinfo (revision 486744) +++ head/graphics/gmic/distinfo (revision 486745) @@ -1,3 +1,3 @@ -TIMESTAMP = 1542255893 -SHA256 (gmic_2.4.1.tar.gz) = 446b465d2ff7314add634115f6bffecd136ad96759eb92f76c03f231f44188d6 -SIZE (gmic_2.4.1.tar.gz) = 3809170 +TIMESTAMP = 1544084124 +SHA256 (gmic_2.4.2.tar.gz) = 0fae452232501ed7e50bbe2eaa96900a5b6daa7fb1d4366d207311bdc27d0762 +SIZE (gmic_2.4.2.tar.gz) = 3813264 Index: head/graphics/gmic/files/patch-CMakeLists.txt =================================================================== --- head/graphics/gmic/files/patch-CMakeLists.txt (revision 486744) +++ head/graphics/gmic/files/patch-CMakeLists.txt (revision 486745) @@ -1,23 +1,23 @@ ---- CMakeLists.txt.orig 2018-10-04 13:30:14 UTC +--- CMakeLists.txt.orig 2018-12-06 08:43:18 UTC +++ CMakeLists.txt @@ -108,7 +108,7 @@ set(COMPILE_FLAGS "-Dgmic_build -Dcimg_u if(APPLE) set(COMPILE_FLAGS "${COMPILE_FLAGS} -mmacosx-version-min=10.8 -stdlib=libc++ -Wno-error=c++11-narrowing -Wc++11-extensions -fpermissive") else() - set(COMPILE_FLAGS "${COMPILE_FLAGS} -Wno-error=narrowing -fno-ipa-sra -fpermissive") + set(COMPILE_FLAGS "${COMPILE_FLAGS} -Wno-error=narrowing -fpermissive") endif() if(NOT "${PRERELEASE_TAG}" STREQUAL "") @@ -237,8 +237,9 @@ endif() # CImg.h header if(NOT EXISTS ${CMAKE_SOURCE_DIR}/src/CImg.h) - file(DOWNLOAD https://framagit.org/dtschump/CImg/raw/master/CImg.h ${CMAKE_SOURCE_DIR}/src/CImg.h) -- file(TOUCH ${CMAKE_SOURCE_DIR}/src/CImg.h) +- execute_process(COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_SOURCE_DIR}/src/CImg.h) + #file(DOWNLOAD https://framagit.org/dtschump/CImg/raw/master/CImg.h ${CMAKE_SOURCE_DIR}/src/CImg.h) -+ #file(TOUCH ${CMAKE_SOURCE_DIR}/src/CImg.h) ++ #execute_process(COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_SOURCE_DIR}/src/CImg.h) + execute_process(COMMAND ln -s ${CMAKE_INSTALL_PREFIX}/include/CImg.h ${CMAKE_SOURCE_DIR}/src/CImg.h) endif() # gmic_stdlib.h header Index: head/graphics/gmic/files/patch-src_gmic.cpp =================================================================== --- head/graphics/gmic/files/patch-src_gmic.cpp (revision 486744) +++ head/graphics/gmic/files/patch-src_gmic.cpp (revision 486745) @@ -1,20 +1,20 @@ ---- src/gmic.cpp.orig 2018-05-30 23:49:53 UTC +--- src/gmic.cpp.orig 2018-12-03 08:57:03 UTC +++ src/gmic.cpp -@@ -2224,7 +2224,7 @@ double gmic::mp_ext(char *const str, voi +@@ -2029,7 +2029,7 @@ double gmic::mp_ext(char *const str, voi // Manage correspondence between abort pointers and thread ids. CImgList gmic::list_p_is_abort = CImgList(); bool *gmic::abort_ptr(bool *const p_is_abort) { -#if defined(__MACOSX__) || defined(__APPLE__) +#if defined(__MACOSX__) || defined(__APPLE__) || defined(__FreeBSD__) void* tid = (void*)(cimg_ulong)getpid(); #elif cimg_OS==1 void* tid = (void*)(cimg_ulong)syscall(SYS_gettid); -@@ -2557,7 +2557,7 @@ gmic::~gmic() { +@@ -2362,7 +2362,7 @@ gmic::~gmic() { #endif // #if cimg_display!=0 cimg::mutex(21); -#if defined(__MACOSX__) || defined(__APPLE__) +#if defined(__MACOSX__) || defined(__APPLE__) || defined(__FreeBSD__) void* tid = (void*)(cimg_ulong)getpid(); #elif cimg_OS==1 void* tid = (void*)(cimg_ulong)syscall(SYS_gettid);