svn commit: r486745 - in head/graphics/gmic: . files

[Yuri Victorovich]

Author: yuri
Date: Thu Dec  6 09:11:34 2018
New Revision: 486745
URL: https://svnweb.freebsd.org/changeset/ports/486745

Log:
  graphics/gmic: Update 2.4.1 -> 2.4.2
  
  Reported by:	repology

Modified:
  head/graphics/gmic/Makefile
  head/graphics/gmic/distinfo
  head/graphics/gmic/files/patch-CMakeLists.txt
  head/graphics/gmic/files/patch-src_gmic.cpp

Modified: head/graphics/gmic/Makefile
==============================================================================
--- head/graphics/gmic/Makefile	Thu Dec  6 09:01:31 2018	(r486744)
+++ head/graphics/gmic/Makefile	Thu Dec  6 09:11:34 2018	(r486745)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	gmic
-DISTVERSION=	2.4.1
+DISTVERSION=	2.4.2
 CATEGORIES=	graphics
 MASTER_SITES=	https://gmic.eu/files/source/
 DISTNAME=	${PORTNAME}_${DISTVERSION}
@@ -21,7 +21,6 @@ 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 \
@@ -37,9 +36,12 @@ 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

Modified: head/graphics/gmic/distinfo
==============================================================================
--- head/graphics/gmic/distinfo	Thu Dec  6 09:01:31 2018	(r486744)
+++ head/graphics/gmic/distinfo	Thu Dec  6 09:11:34 2018	(r486745)
@@ -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

Modified: head/graphics/gmic/files/patch-CMakeLists.txt
==============================================================================
--- head/graphics/gmic/files/patch-CMakeLists.txt	Thu Dec  6 09:01:31 2018	(r486744)
+++ head/graphics/gmic/files/patch-CMakeLists.txt	Thu Dec  6 09:11:34 2018	(r486745)
@@ -1,4 +1,4 @@
---- 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)
@@ -14,9 +14,9 @@
  # 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()
  

Modified: head/graphics/gmic/files/patch-src_gmic.cpp
==============================================================================
--- head/graphics/gmic/files/patch-src_gmic.cpp	Thu Dec  6 09:01:31 2018	(r486744)
+++ head/graphics/gmic/files/patch-src_gmic.cpp	Thu Dec  6 09:11:34 2018	(r486745)
@@ -1,6 +1,6 @@
---- 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<void*> gmic::list_p_is_abort = CImgList<void*>();
  bool *gmic::abort_ptr(bool *const p_is_abort) {
@@ -9,7 +9,7 @@
    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);