From nobody Sun Jul 17 16:03:02 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 4Lm8yG3JTDz4Wflr; Sun, 17 Jul 2022 16:03:02 +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 4Lm8yG2vdbz3pcW; Sun, 17 Jul 2022 16:03:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658073782; 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=dAaSZ9CN9OV2Jlie84XtP6xAfWKP1Asm6Pe5xdQE9MA=; b=PjDp111oZXupRgkyJSeh1GO75bbYaTJfKNlnZETP40inh02qZU9umsLed/Xx6U4Twy+zw6 yiz0+fJLI5n1WSpry5zoFhW4O0Cb6l1g4yx7BdBrECaWP3HigkW5H3JZ2o9WxMczI3Y/Tr wDw3MNWA0z35SW40fGJRD4McpV30BG2zKjGUeU3D7v2hSb+CBenE3UgmMW2Cdiy9ohm4kJ fDioFAmWcBln9T6P9pBrAG2Ge4mWV4oRMN+kCr0u9muP7pnlFnDhydssYz6b0wvLR8YTM8 fVO3qpR2RoDHwDLCbiixP9KxYQShNo9LCuEyp050LChx/YmkDgj8tbCVaudg/Q== 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 4Lm8yG1kSSz15MT; Sun, 17 Jul 2022 16:03:02 +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 26HG32rL094139; Sun, 17 Jul 2022 16:03:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26HG32Df094138; Sun, 17 Jul 2022 16:03:02 GMT (envelope-from git) Date: Sun, 17 Jul 2022 16:03:02 GMT Message-Id: <202207171603.26HG32Df094138@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: a751a1707d5a - 2022Q3 - graphics/gmic: Restore gmic executable 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: a751a1707d5a9ebbe0b3f6739212d41c95f5597d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658073782; 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=dAaSZ9CN9OV2Jlie84XtP6xAfWKP1Asm6Pe5xdQE9MA=; b=xUPdadH/v8CCkyQhMi5ALR+lzz7+rvwgUn3Fq9bPoo8SVkBRuSVBD1fIWFs5QkNnO1Qdj4 C0L+MU+v3kD8E3gE/iLYmk2PoIMwfZxggG/GzABpqMbLRpo8b9aWKO3u8FqyF4gHAPWpOx PMznD28OpxiG20K2k2eghx4SHspZNFthLvg0unNahFmOcDMQeXWVuKawwVay10rtIC1QCn YPhUVZa7JmKdsEx39CauQpPD5uQqFdJ/CN25S3ibBc7sk3xVbLdIyxnwL0AfPRU7FaZIKO SJBCOSVwKHl8lSmIQx/kAzB4/sU5OxJ1LRJNffZv5gd5UsZpKt+8QElWhQK5NQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658073782; a=rsa-sha256; cv=none; b=N7e0AEbXdBaw03XqwYrekSC6nF9+DMoeevoaj6u16J45x/LfU71MbaPAj7v9viyHEg8ggw 6/LvHbtLX5YxGh21jPbiljSfySDmtAbJ9kpcUyG90UgDvBDSXMDFGpWthcII2DBrAjzwBx +dprx1d/BP01Bx5PmjCesL+f+LIlrFQVIyA9FSCZtY6m7uutp5p2srjvN22rXbUxHhqCiG /8qQS76ZsOu5YnGN0hZQ+sLwCig5hR4AbiscSNLs2cldyTf204Csq/Cx3C0vSLuaeT1/Oj /9VR1jYHjryPGRDxSsVEBmW9F2UT3pCj0dXs5ZHsHXvM9Y8iWIIsp1HIZWkV9Q== 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=a751a1707d5a9ebbe0b3f6739212d41c95f5597d commit a751a1707d5a9ebbe0b3f6739212d41c95f5597d Author: Yuri Victorovich AuthorDate: 2022-07-17 15:50:03 +0000 Commit: Yuri Victorovich CommitDate: 2022-07-17 16:02:58 +0000 graphics/gmic: Restore gmic executable ... that got removed from the port after the upstream refactored the build and switched to GNU Make. Special target 'cli' should be added for gmic executable to be built. Reported by: Andrea Venturoli (cherry picked from commit 0cc44b495ddff468691ec05fc84e53a59c11635d) --- graphics/gmic/Makefile | 9 ++++++--- graphics/gmic/files/patch-Makefile | 8 -------- graphics/gmic/files/patch-src_gmic.cpp | 4 ++-- graphics/gmic/pkg-plist | 1 + 4 files changed, 9 insertions(+), 13 deletions(-) diff --git a/graphics/gmic/Makefile b/graphics/gmic/Makefile index a788f94cf3cc..21d326cfc23a 100644 --- a/graphics/gmic/Makefile +++ b/graphics/gmic/Makefile @@ -1,5 +1,6 @@ PORTNAME= gmic DISTVERSION= 3.1.5 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= https://gmic.eu/files/source/ DISTNAME= ${PORTNAME}_${DISTVERSION} @@ -9,7 +10,7 @@ COMMENT= Framework for image processing LICENSE= CeCILL LICENSE_NAME= CeCILL -LICENSE_FILE= ${WRKSRC}/COPYING +LICENSE_FILE= ${WRKSRC}/../COPYING 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'" @@ -30,9 +31,11 @@ USE_XORG= x11 xau xcb xdmcp WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -MAKE_JOBS_UNSAFE= yes +WRKSRC_SUBDIR= src # because of makefile issues, see https://github.com/dtschump/gmic/issues/405 -ALL_TARGET= lib +MAKE_JOBS_UNSAFE= yes # see https://github.com/dtschump/gmic/issues/406 + +ALL_TARGET= lib cli # cli is bundled here until https://github.com/dtschump/gmic/issues/407 is fixed, afvter which is would be moved to gmic-cli PORTSCOUT= limit:[0-9]\..* # not v.220 and similar diff --git a/graphics/gmic/files/patch-Makefile b/graphics/gmic/files/patch-Makefile deleted file mode 100644 index 9f3a3102fd42..000000000000 --- a/graphics/gmic/files/patch-Makefile +++ /dev/null @@ -1,8 +0,0 @@ ---- Makefile.orig 2022-05-16 23:01:27 UTC -+++ Makefile -@@ -76,4 +76,4 @@ - all: all - - %: -- cd src && make $* -+ cd src && $(MAKE) $* diff --git a/graphics/gmic/files/patch-src_gmic.cpp b/graphics/gmic/files/patch-src_gmic.cpp index 4444e383d9ba..aecf74a10055 100644 --- a/graphics/gmic/files/patch-src_gmic.cpp +++ b/graphics/gmic/files/patch-src_gmic.cpp @@ -1,5 +1,5 @@ ---- src/gmic.cpp.orig 2022-06-30 12:35:34 UTC -+++ src/gmic.cpp +--- gmic.cpp.orig 2022-06-30 12:35:34 UTC ++++ gmic.cpp @@ -2314,7 +2314,7 @@ inline CImgList& gmic_runs() { } diff --git a/graphics/gmic/pkg-plist b/graphics/gmic/pkg-plist index b99da8d9407d..ed86a481cb83 100644 --- a/graphics/gmic/pkg-plist +++ b/graphics/gmic/pkg-plist @@ -1,3 +1,4 @@ +bin/gmic include/gmic.h include/gmic_libc.h lib/libgmic.so