From nobody Sun Jul 17 16:03:01 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 4Lm8yF2CT9z4Wfp9; Sun, 17 Jul 2022 16:03:01 +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 4Lm8yF1f7yz3pl2; Sun, 17 Jul 2022 16:03:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658073781; 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=wsljrxjsk4KUTq9uraHwYNEXEQA2pZFwqSiTiFEyOms=; b=lfFJuNyI/o7TffoNZAy3nq6u9mDZo7kyEUKhCko79Nob65RkRhCzzPC0IoAcwXhaauNC6H BlXXYjgHojQUcxSR3ekI/ECVyr4EMpCEq3W+5epy7Jpc7d5S2ysZNi59LHQAOjOy4sCh8C HcgpOIQ0s3hXlDJdXhhQnUiUlPEDbCwHt64PxqW+pIL4pW/aqPTdoytYob+phjnM7ALRGO wY+xF+aqLoaQnAGt+mwG4sT1IC5SWjFgTbDUdLpB4iQrp7Bq9hN74ZOItsCqD3y1yZR8eF yHGCKYyjlx+kf5+iM1eGK2qyDaPCPrrwplNlwl00c2jh3HdlOlSjcPXYxreXJg== 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 4Lm8yF0jYcz15w4; Sun, 17 Jul 2022 16:03:01 +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 26HG31lO094115; Sun, 17 Jul 2022 16:03:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26HG31Td094114; Sun, 17 Jul 2022 16:03:01 GMT (envelope-from git) Date: Sun, 17 Jul 2022 16:03:01 GMT Message-Id: <202207171603.26HG31Td094114@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Yuri Victorovich Subject: git: 5dfc56a9eee6 - 2022Q3 - graphics/gmic: Update 3.1.3 -> 3.1.5 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/2022Q3 X-Git-Reftype: branch X-Git-Commit: 5dfc56a9eee692a592d158505678b6f575d0f7a8 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658073781; 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=wsljrxjsk4KUTq9uraHwYNEXEQA2pZFwqSiTiFEyOms=; b=iaKbL30Ux6nEke8NDBFwgzfFPU7JAS7Vp0zXmYPMU+kt2kmrUvUR66dmw1F9T++1vX9q61 GBVsvbhARy+AJXEVZMbM6PL2VEaqUvPgRgqvAPTl96C7cCj7Dkrve4OKdui6ijZ5+muKxf hepXF9YGfklWJTvkSANCNqUSkFWmWODq6yy+bfer/QB9mBS3paPAW9FL44nube4RgE753G WzWtsdHi8t5ITHKT8OLotuhC8UaxkjbcWhNF0VMw4fN/rFPKwF6heXmzrat30LT77DI/Nb 1FM4ofCpvNaEWP2ipsTw/FqA/7E1zV9i0dqWy02tWN5P/So/ilHoRBlJ4O02gQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658073781; a=rsa-sha256; cv=none; b=ZQShC+2p5B3FAOkDDGsPOIJhloTgltan8SZLaQ/46mMXyHDT1Ozy7Yh4TMl3u22bq6BvZ+ aCmZYuxPW5836L/3IEZCKYr7g94AkAilKalVpZzIueVbVnHq6R4O8zrynqBWgoAK8GmYLk AN4kUKGJ5DC27g0o2yh85UNDPC12S7QsldWpxmX45zmu1jhQibzhy6bAEu+rzP5VDT55PH SMU8L0ejzSpl3SQEByGHG6qvuc2fyNewGbuU2zHN6SGYViGUzTwZTDpjvHs7lUeA2h6f9y 82Kq8ntnSXTa8082OVJA9YQbkgbGPqCXd8HBft5VfJlNEvbIovLPo1P2nUQqLA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q3 has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=5dfc56a9eee692a592d158505678b6f575d0f7a8 commit 5dfc56a9eee692a592d158505678b6f575d0f7a8 Author: Yuri Victorovich AuthorDate: 2022-07-04 07:16:19 +0000 Commit: Yuri Victorovich CommitDate: 2022-07-17 16:02:57 +0000 graphics/gmic: Update 3.1.3 -> 3.1.5 Reported by: portscout (cherry picked from commit 11422944c5b58d8e606c63e44bc0475f55df953d) --- graphics/gmic/Makefile | 5 +++-- graphics/gmic/distinfo | 6 +++--- graphics/gmic/files/patch-src_gmic.cpp | 33 +++++++++++++++++++++------------ graphics/gmic/pkg-plist | 2 +- 4 files changed, 28 insertions(+), 18 deletions(-) diff --git a/graphics/gmic/Makefile b/graphics/gmic/Makefile index 24fed0983167..a788f94cf3cc 100644 --- a/graphics/gmic/Makefile +++ b/graphics/gmic/Makefile @@ -1,5 +1,5 @@ PORTNAME= gmic -DISTVERSION= 3.1.3 +DISTVERSION= 3.1.5 CATEGORIES= graphics MASTER_SITES= https://gmic.eu/files/source/ DISTNAME= ${PORTNAME}_${DISTVERSION} @@ -24,8 +24,9 @@ LIB_DEPENDS= libcurl.so:ftp/curl \ libpng.so:graphics/png \ libtiff.so:graphics/tiff -USES= compiler:c++11-lang gmake jpeg localbase:ldflags pkgconfig +USES= compiler:c++11-lang gettext-runtime gmake jpeg localbase:ldflags pkgconfig xorg USE_LDCONFIG= yes +USE_XORG= x11 xau xcb xdmcp WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} diff --git a/graphics/gmic/distinfo b/graphics/gmic/distinfo index 386b7d390b4f..fb5cddd1e25c 100644 --- a/graphics/gmic/distinfo +++ b/graphics/gmic/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1655578556 -SHA256 (gmic_3.1.3.tar.gz) = 25d1583932801321fe559ee87c3c19c60d45f9119447d86049f073ad295b3da3 -SIZE (gmic_3.1.3.tar.gz) = 10770532 +TIMESTAMP = 1656916160 +SHA256 (gmic_3.1.5.tar.gz) = fa77e85b3a39638008515ac525f23f0ed7a45b63c463c0ba6292c87f5e88e30d +SIZE (gmic_3.1.5.tar.gz) = 10782647 diff --git a/graphics/gmic/files/patch-src_gmic.cpp b/graphics/gmic/files/patch-src_gmic.cpp index 80860cb5274a..4444e383d9ba 100644 --- a/graphics/gmic/files/patch-src_gmic.cpp +++ b/graphics/gmic/files/patch-src_gmic.cpp @@ -1,20 +1,29 @@ ---- src/gmic.cpp.orig 2022-05-11 08:15:20 UTC +--- src/gmic.cpp.orig 2022-06-30 12:35:34 UTC +++ src/gmic.cpp -@@ -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) { +@@ -2314,7 +2314,7 @@ inline CImgList& gmic_runs() { + } + + inline void* get_tid() { -#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); -@@ -2858,7 +2858,7 @@ gmic::~gmic() { - cimg::exception_mode(cimg_exception_mode); - cimg_forX(display_windows,l) delete &display_window(l); - cimg::mutex(21); +@@ -2322,7 +2322,7 @@ inline void* get_tid() { + void* tid = (void*)(cimg_ulong)GetCurrentThreadId(); + #else + void* tid = (void*)0; +-#endif // #if defined(__MACOSX__) || defined(__APPLE__) ++#endif // #if defined(__MACOSX__) || defined(__APPLE__) || defined(__FreeBSD__) + return tid; + } + +@@ -10762,7 +10762,7 @@ gmic& gmic::_run(const CImgList& commands_line, + #ifdef gmic_is_parallel + #ifdef PTHREAD_CANCEL_ENABLE + -#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); + const cimg_uint64 stacksize = (cimg_uint64)8*1024*1024; + pthread_attr_t thread_attr; + if (!pthread_attr_init(&thread_attr) && !pthread_attr_setstacksize(&thread_attr,stacksize)) diff --git a/graphics/gmic/pkg-plist b/graphics/gmic/pkg-plist index 37e56be4c2c7..b99da8d9407d 100644 --- a/graphics/gmic/pkg-plist +++ b/graphics/gmic/pkg-plist @@ -2,7 +2,7 @@ include/gmic.h include/gmic_libc.h lib/libgmic.so lib/libgmic.so.3 -lib/libgmic.so.313 +lib/libgmic.so.315 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