From owner-svn-ports-all@freebsd.org Mon Jun 15 07:49:41 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E45D332B2D8; Mon, 15 Jun 2020 07:49:41 +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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49lk4j5nZKz4FTm; Mon, 15 Jun 2020 07:49:41 +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 C1DD91A29F; Mon, 15 Jun 2020 07:49:41 +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 05F7nf7C043807; Mon, 15 Jun 2020 07:49:41 GMT (envelope-from yuri@FreeBSD.org) Received: (from yuri@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05F7neSU043800; Mon, 15 Jun 2020 07:49:40 GMT (envelope-from yuri@FreeBSD.org) Message-Id: <202006150749.05F7neSU043800@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: yuri set sender to yuri@FreeBSD.org using -f From: Yuri Victorovich Date: Mon, 15 Jun 2020 07:49:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r538856 - 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: 538856 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Jun 2020 07:49:42 -0000 Author: yuri Date: Mon Jun 15 07:49:40 2020 New Revision: 538856 URL: https://svnweb.freebsd.org/changeset/ports/538856 Log: graphics/gmic: Update 2.9.0 -> 2.9.1 Reported by: portscout Modified: head/graphics/gmic/Makefile head/graphics/gmic/distinfo head/graphics/gmic/files/patch-CMakeLists.txt head/graphics/gmic/files/patch-src_gmic.cpp head/graphics/gmic/pkg-plist Modified: head/graphics/gmic/Makefile ============================================================================== --- head/graphics/gmic/Makefile Mon Jun 15 07:43:24 2020 (r538855) +++ head/graphics/gmic/Makefile Mon Jun 15 07:49:40 2020 (r538856) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= gmic -DISTVERSION= 2.9.0 -PORTREVISION= 2 +DISTVERSION= 2.9.1 CATEGORIES= graphics MASTER_SITES= https://gmic.eu/files/source/ DISTNAME= ${PORTNAME}_${DISTVERSION} @@ -28,7 +27,7 @@ LIB_DEPENDS= libfftw3.so:math/fftw3 \ PORTSCOUT= limit:[0-9]\..* # not v.220 and similar -USES= cmake compiler:c++11-lang jpeg pkgconfig xorg +USES= cmake compiler:c++11-lang jpeg localbase:ldflags pkgconfig xorg USE_LDCONFIG= yes CMAKE_OFF= BUILD_LIB_STATIC Modified: head/graphics/gmic/distinfo ============================================================================== --- head/graphics/gmic/distinfo Mon Jun 15 07:43:24 2020 (r538855) +++ head/graphics/gmic/distinfo Mon Jun 15 07:49:40 2020 (r538856) @@ -1,3 +1,3 @@ -TIMESTAMP = 1585512818 -SHA256 (gmic_2.9.0.tar.gz) = 6233695f9b27999dcc7cc3aa7480b0f192bd44de85209091a3b4b8a65ae8c4b5 -SIZE (gmic_2.9.0.tar.gz) = 6195597 +TIMESTAMP = 1592199576 +SHA256 (gmic_2.9.1.tar.gz) = 50c9dd418b8d0e80c703c2e2b179b6049343567483d37d9ff6c642c6ede95d8d +SIZE (gmic_2.9.1.tar.gz) = 6212626 Modified: head/graphics/gmic/files/patch-CMakeLists.txt ============================================================================== --- head/graphics/gmic/files/patch-CMakeLists.txt Mon Jun 15 07:43:24 2020 (r538855) +++ head/graphics/gmic/files/patch-CMakeLists.txt Mon Jun 15 07:49:40 2020 (r538856) @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2020-01-23 17:04:38 UTC +--- CMakeLists.txt.orig 2020-06-15 06:22:09 UTC +++ CMakeLists.txt -@@ -108,7 +108,7 @@ set(COMPILE_FLAGS "-Dgmic_build -Dcimg_use_vt100 -Dgmi +@@ -100,7 +100,7 @@ set(COMPILE_FLAGS "-Dgmic_build -Dcimg_use_vt100 -Dgmi if(APPLE) set(COMPILE_FLAGS "${COMPILE_FLAGS} -mmacosx-version-min=10.8 -stdlib=libc++ -Wno-error=c++11-narrowing -Wc++11-extensions -fpermissive") else() @@ -9,15 +9,3 @@ endif() if(NOT "${PRERELEASE_TAG}" STREQUAL "") -@@ -247,8 +247,9 @@ endif() - - # CImg.h header - if(NOT EXISTS ${CMAKE_SOURCE_DIR}/src/CImg.h) -- file(DOWNLOAD https://github.com/dtschump/CImg/raw/master/CImg.h ${CMAKE_SOURCE_DIR}/src/CImg.h) -- execute_process(COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_SOURCE_DIR}/src/CImg.h) -+ #file(DOWNLOAD https://github.com/dtschump/CImg/raw/master/CImg.h ${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 Modified: head/graphics/gmic/files/patch-src_gmic.cpp ============================================================================== --- head/graphics/gmic/files/patch-src_gmic.cpp Mon Jun 15 07:43:24 2020 (r538855) +++ head/graphics/gmic/files/patch-src_gmic.cpp Mon Jun 15 07:49:40 2020 (r538856) @@ -1,6 +1,6 @@ ---- src/gmic.cpp.orig 2018-12-03 08:57:03 UTC +--- src/gmic.cpp.orig 2020-06-10 13:43:16 UTC +++ src/gmic.cpp -@@ -2029,7 +2029,7 @@ double gmic::mp_ext(char *const str, voi +@@ -2320,7 +2320,7 @@ double gmic::mp_setname(const unsigned int ind, const // 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,9 +9,9 @@ void* tid = (void*)(cimg_ulong)getpid(); #elif cimg_OS==1 void* tid = (void*)(cimg_ulong)syscall(SYS_gettid); -@@ -2362,7 +2362,7 @@ gmic::~gmic() { - #endif // #if cimg_display!=0 - +@@ -2660,7 +2660,7 @@ gmic::~gmic() { + cimg::exception_mode(cimg_exception_mode); + cimg_forX(display_windows,l) delete &display_window(l); cimg::mutex(21); -#if defined(__MACOSX__) || defined(__APPLE__) +#if defined(__MACOSX__) || defined(__APPLE__) || defined(__FreeBSD__) Modified: head/graphics/gmic/pkg-plist ============================================================================== --- head/graphics/gmic/pkg-plist Mon Jun 15 07:43:24 2020 (r538855) +++ head/graphics/gmic/pkg-plist Mon Jun 15 07:49:40 2020 (r538856) @@ -6,3 +6,4 @@ lib/cmake/gmic/GmicTargets.cmake lib/libgmic.so lib/libgmic.so.1 man/man1/gmic.1.gz +share/bash-completion/completions/gmic