From owner-svn-ports-head@freebsd.org Thu Dec 6 09:11:36 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2FE1F1324A2A; Thu, 6 Dec 2018 09:11:36 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C1AFE87617; Thu, 6 Dec 2018 09:11:35 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 88887216BD; Thu, 6 Dec 2018 09:11:35 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wB69BZ1s090807; Thu, 6 Dec 2018 09:11:35 GMT (envelope-from yuri@FreeBSD.org) Received: (from yuri@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wB69BYJN090800; Thu, 6 Dec 2018 09:11:34 GMT (envelope-from yuri@FreeBSD.org) Message-Id: <201812060911.wB69BYJN090800@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: yuri set sender to yuri@FreeBSD.org using -f From: Yuri Victorovich Date: Thu, 6 Dec 2018 09:11:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r486745 - in head/graphics/gmic: . files X-SVN-Group: ports-head X-SVN-Commit-Author: yuri X-SVN-Commit-Paths: in head/graphics/gmic: . files X-SVN-Commit-Revision: 486745 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: C1AFE87617 X-Spamd-Result: default: False [-0.37 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-0.42)[-0.423,0]; NEURAL_SPAM_SHORT(0.10)[0.104,0]; NEURAL_HAM_LONG(-0.05)[-0.054,0] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Dec 2018 09:11:36 -0000 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 gmic::list_p_is_abort = CImgList(); 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);