From nobody Sun Jul 17 15:52:51 2022 X-Original-To: dev-commits-ports-main@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 4Lm8kW6mV6z4WdS4; Sun, 17 Jul 2022 15:52:51 +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 4Lm8kW69bfz3p6g; Sun, 17 Jul 2022 15:52:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658073171; 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=CNnMLOz0BieERQN8yMw/izHi5NKyPm6lWeVqIGeRN74=; b=qXDQg3CKPRtOYjuVUdVgQwkQvfus+TKu82dv2OfZA1m40+MFwL6Fzvor6mQXhxExo1Mhr0 8K2EfL5LSvp6Rer6YMN5BdunQ/+9Z8e58NcqxFAKb9Lvk64nSMTmqNIQBkEPcM5zEPi7XF eNaN7EzakhKkhiJzIQUcJrOo3TjwqbYQCDFTbWE2T3UPA7EYYvJrDQs+zbTRtinvB9aqmH 7KfFI8ZSoyLuBJOsRVfj1ddtPJnSyGCC5j/Jciua3Ui+Q3KSnkRr2SxfYAa0wjFbjPKkYp 6VESKDkrmnH0jO6AD0+x8yYMmuqkMikjBJjS5wAE4+Pi5juKbcyE72w8CLfXnA== 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 4Lm8kW4tcHz15bs; Sun, 17 Jul 2022 15:52:51 +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 26HFqppr080039; Sun, 17 Jul 2022 15:52:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26HFqpAv080038; Sun, 17 Jul 2022 15:52:51 GMT (envelope-from git) Date: Sun, 17 Jul 2022 15:52:51 GMT Message-Id: <202207171552.26HFqpAv080038@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: 0cc44b495ddf - main - graphics/gmic: Restore gmic executable List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: 0cc44b495ddff468691ec05fc84e53a59c11635d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658073171; 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=CNnMLOz0BieERQN8yMw/izHi5NKyPm6lWeVqIGeRN74=; b=Fq12G610+SrziKZcHeNkwqHIaRkPBe4AkCWU8caWb3cmpUkedxkyND8S/yDxgaSbhWtD+6 oHxICIRxIXIAF331E4yq1EPc4K2DDw0E2qYgElaGwyzRG9iMJIkQlHRFyVvaT+zCa5dTh6 EaWLpOnVQhl7GItGFCW/eWiahjmjHgO0OO/nRAfdRlZu/e4teek43Q5ohGdKA4q3SKelH4 9FTHIqm2O8FHOmE0oloYyJkGjW6tTmST5JEYqbkZxt5E82MV8ihucPvSFuSgIhcMSP2xPZ FboOvIN4NRqUtJ+re78g0as/33MDniNyQ/QH9YnGz0Hroy8S6xCQnxYIV6y13A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658073171; a=rsa-sha256; cv=none; b=BzIJoyypES4wlMkebXE2TdQfStglm2cuMesYDPXQkQ+ftCGcJoHggFtJNTPAk9hAiRKcIh IZJ45Bf80VI6zFjtd/p6Y1ENzjcTbN7mYGQAwDRLDEIimc9QHEpPvu2rOmk5AIDZOBiOAS TzsslGGVESaObKJbVlmfk58//a/Xm6e81QnZKxIhw6Jy3VQblGuY4fdT59LhXYZwwhVI5A zcbA+eDkXATVWgMQRpZd7jKl/Q189WDTvh49l7F+VVxcClcAy830MvgTl9kwZsSDaXX4yF hhG2F0cWwzls6lvswvi0/+V3TRp/eaH+UuT867mNB1lsV/mTQZGvb+adL4hy0w== 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=0cc44b495ddff468691ec05fc84e53a59c11635d commit 0cc44b495ddff468691ec05fc84e53a59c11635d Author: Yuri Victorovich AuthorDate: 2022-07-17 15:50:03 +0000 Commit: Yuri Victorovich CommitDate: 2022-07-17 15:52:49 +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 --- 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