From nobody Tue May 17 05:20:58 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 555C51AEA5D1; Tue, 17 May 2022 05:20:59 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4L2Pbb1Dwbz3hFP; Tue, 17 May 2022 05:20:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652764859; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=akkDfRxaA/imQ76sL91xK12oBOFG9KY6OZTHJm3OlcU=; b=rJeUSsDqX0IMPuBMwK3WpXoAj+hf7d2UT8WVYeH8bOgy6wvmqMxzAAn1OUcNtyp5RNzTuD odjzfdqUxgrFwUASOswcZGZC/FlR8cEMlWb94G7X+YLlyGV1TMVAC9wpVj3MHS90kfuu1B 9OHou/hTPQ74gjgty3DIp6ATxsHwM1GtZcbJUYGmA1V9qGZQ1P86FXw7poDe+TfHV9fPiU mq2+gQLdCBglyMZST6a0EqWc1X0r2unSL5LVfe57Y6BdEIALER0y/zZdLjMgVWlThR6oaf QL43qghJWupSHHEVhbTbMRXEqXApS6I9X9+5S06bPU1uJv8B4Y7Ci7V4i7datg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id ECC006B23; Tue, 17 May 2022 05:20:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 24H5Kw6g040283; Tue, 17 May 2022 05:20:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24H5KwGE040282; Tue, 17 May 2022 05:20:58 GMT (envelope-from git) Date: Tue, 17 May 2022 05:20:58 GMT Message-Id: <202205170520.24H5KwGE040282@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 27089289ec6b - main - graphics/gmic: Update 3.0.1 -> 3.1.2 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 27089289ec6b94710cc90dffc076cca5bd99c134 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652764859; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=akkDfRxaA/imQ76sL91xK12oBOFG9KY6OZTHJm3OlcU=; b=jwMYs0pSx6baMxsKZhGi5dTcZpjpbMtAQb64lonnruvoD49UJwbSwjiqV6FarqixBVyjri JeIevI6phoON5NEHPkz+ksoD5TUBvAhpjqZDVjI8H3u6R9nEqFnvwpecJXVatpKUWy3LCC deMy2LExb+qVPPEZlGV8MRSH1bq0LW+yiSAhEdV3Q2ZN+sHjrXlghDRqP0ngHO/3LF1Z7X n/x4Fcot3XEGRL+Mk5o2CNWE/SGdLQJ5i5mDrsJt+/NNBK9dlI0iM7bM0XnJDkZcpT+poP Dx9GHNXDwxVietu4ZL94juY015jHWY2AAEzRDsHF0AorC2Ni+4Zd0TplHLD+vQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652764859; a=rsa-sha256; cv=none; b=RisKyxRoDmfO8vmuVPcgjum9FN2akLEXQrVyvVCfy+zCJpTuptaySaqRIBfkEb7ZU5UjAy AWRgPmFPwPjNRFNQSCeCbquo9XYZBAGXVFuB8pCimd4wkRPBbWo873vBX/Jb0EBf+A0gsI aQLTkY3VpcL4Ul69opmjqSIOR3UtCHO7shp8kDbbGaGfYuwhdX87MoI8brw6pETbLpzPIW GEIyfkoPYrbdh7/6H7eyadDXb3r0vckuhRLJqin67UPCOY/PbEinMfwHkL1nn7oe2zHdUr N6GSoFpHkpHKcubpangFxol15pMLCEOniLx/3F6DGuDbjy5gPqF7eO812jnSKw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=27089289ec6b94710cc90dffc076cca5bd99c134 commit 27089289ec6b94710cc90dffc076cca5bd99c134 Author: Yuri Victorovich AuthorDate: 2022-05-17 05:20:09 +0000 Commit: Yuri Victorovich CommitDate: 2022-05-17 05:20:55 +0000 graphics/gmic: Update 3.0.1 -> 3.1.2 --- graphics/darktable/Makefile | 2 +- graphics/gmic/Makefile | 21 ++++++++------------- graphics/gmic/distinfo | 6 +++--- graphics/gmic/files/patch-CMakeLists.txt | 11 ----------- graphics/gmic/files/patch-src_gmic.cpp | 6 +++--- graphics/gmic/pkg-plist | 12 ++++++------ multimedia/zart/Makefile | 2 +- 7 files changed, 22 insertions(+), 38 deletions(-) diff --git a/graphics/darktable/Makefile b/graphics/darktable/Makefile index 3e6d39faab1d..c24d4dfc34dd 100644 --- a/graphics/darktable/Makefile +++ b/graphics/darktable/Makefile @@ -2,7 +2,7 @@ PORTNAME= darktable PORTVERSION= 3.8.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics MASTER_SITES= https://github.com/darktable-org/${PORTNAME}/releases/download/release-${PORTVERSION:C/\.rc/rc/}/ diff --git a/graphics/gmic/Makefile b/graphics/gmic/Makefile index d28e7ab6023b..420dace564de 100644 --- a/graphics/gmic/Makefile +++ b/graphics/gmic/Makefile @@ -1,5 +1,5 @@ PORTNAME= gmic -DISTVERSION= 3.0.1 +DISTVERSION= 3.1.2 CATEGORIES= graphics MASTER_SITES= https://gmic.eu/files/source/ DISTNAME= ${PORTNAME}_${DISTVERSION} @@ -14,6 +14,7 @@ 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= gimptool-2.0:graphics/gimp-app LIB_DEPENDS= libcurl.so:ftp/curl \ libfftw3.so:math/fftw3 \ libGraphicsMagick++.so:graphics/GraphicsMagick \ @@ -23,24 +24,18 @@ LIB_DEPENDS= libcurl.so:ftp/curl \ libpng.so:graphics/png \ libtiff.so:graphics/tiff -USES= cmake compiler:c++11-lang jpeg localbase:ldflags pkgconfig +USES= compiler:c++11-lang gmake jpeg localbase:ldflags pkgconfig USE_LDCONFIG= yes -CMAKE_OFF= BUILD_LIB_STATIC -CMAKE_ON= ENABLE_DYNAMIC_LINKING - WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -OPTIONS_DEFINE= OPENMP X11 -OPTIONS_DEFAULT= OPENMP X11 -OPTIONS_SUB= yes - -OPENMP_CMAKE_BOOL= ENABLE_OPENMP +MAKE_JOBS_UNSAFE= yes -X11_CMAKE_BOOL= ENABLE_X -X11_USES= xorg -X11_USE= XORG=ice,sm,x11,xext +ALL_TARGET= lib PORTSCOUT= limit:[0-9]\..* # not v.220 and similar +post-install: + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgmic.so.312 + .include diff --git a/graphics/gmic/distinfo b/graphics/gmic/distinfo index 5abf6acd7632..f8c7634b1e2b 100644 --- a/graphics/gmic/distinfo +++ b/graphics/gmic/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1642176210 -SHA256 (gmic_3.0.1.tar.gz) = 6cc20a20e3ab53ce485ccf6e044a30141b3d62cf7743b83bb04906ff29453035 -SIZE (gmic_3.0.1.tar.gz) = 10457923 +TIMESTAMP = 1652739109 +SHA256 (gmic_3.1.2.tar.gz) = d5070c559c75161a225d74a99c19faf2485a3983139290f998cc6359bb318ba4 +SIZE (gmic_3.1.2.tar.gz) = 10694085 diff --git a/graphics/gmic/files/patch-CMakeLists.txt b/graphics/gmic/files/patch-CMakeLists.txt deleted file mode 100644 index e432c8d055fe..000000000000 --- a/graphics/gmic/files/patch-CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- CMakeLists.txt.orig 2021-12-09 09:25:45 UTC -+++ CMakeLists.txt -@@ -100,7 +100,7 @@ list(APPEND GMIC_CXX_COMPILE_FLAGS -Dgmic_build -Dcimg - if(APPLE) - list(APPEND GMIC_CXX_COMPILE_FLAGS -mmacosx-version-min=10.8 -stdlib=libc++ -Wno-error=c++11-narrowing -Wc++11-extensions -fpermissive) - else() -- list(APPEND GMIC_CXX_COMPILE_FLAGS -Wno-error=narrowing -fno-ipa-sra -fpermissive) -+ list(APPEND GMIC_CXX_COMPILE_FLAGS -Wno-error=narrowing -fpermissive) - endif() - - if(NOT "${PRERELEASE_TAG}" STREQUAL "") diff --git a/graphics/gmic/files/patch-src_gmic.cpp b/graphics/gmic/files/patch-src_gmic.cpp index fe2ae81af054..80860cb5274a 100644 --- a/graphics/gmic/files/patch-src_gmic.cpp +++ b/graphics/gmic/files/patch-src_gmic.cpp @@ -1,6 +1,6 @@ ---- src/gmic.cpp.orig 2020-06-10 13:43:16 UTC +--- src/gmic.cpp.orig 2022-05-11 08:15:20 UTC +++ src/gmic.cpp -@@ -2320,7 +2320,7 @@ double gmic::mp_setname(const unsigned int ind, const +@@ -2516,7 +2516,7 @@ double gmic::mp_store(const Ts *const ptr, const unsig // 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); -@@ -2660,7 +2660,7 @@ gmic::~gmic() { +@@ -2858,7 +2858,7 @@ gmic::~gmic() { cimg::exception_mode(cimg_exception_mode); cimg_forX(display_windows,l) delete &display_window(l); cimg::mutex(21); diff --git a/graphics/gmic/pkg-plist b/graphics/gmic/pkg-plist index 68c6e628f706..777162c6c4c1 100644 --- a/graphics/gmic/pkg-plist +++ b/graphics/gmic/pkg-plist @@ -1,9 +1,9 @@ -bin/gmic include/gmic.h -lib/cmake/gmic/GmicConfig.cmake -lib/cmake/gmic/GmicTargets-%%CMAKE_BUILD_TYPE%%.cmake -lib/cmake/gmic/GmicTargets.cmake +include/gmic_libc.h lib/libgmic.so -lib/libgmic.so.1 +lib/libgmic.so.3 +lib/libgmic.so.312 +libexec/gimp/2.2/plug-ins/gmic_cluts.gmz +libexec/gimp/2.2/plug-ins/gmic_denoise_cnn.gmz +share/man/fr/man1/gmic.1.gz share/man/man1/gmic.1.gz -share/bash-completion/completions/gmic diff --git a/multimedia/zart/Makefile b/multimedia/zart/Makefile index e2ecfddb1e85..2b25a99f610f 100644 --- a/multimedia/zart/Makefile +++ b/multimedia/zart/Makefile @@ -1,6 +1,6 @@ PORTNAME= zart PORTVERSION= g20191124 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia MASTER_SITES= https://gmic.eu/files/source/:gmic DISTFILES= gmic_${GMIC_VERSION}.tar.gz:gmic