From nobody Thu Aug 25 21:54:09 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 4MDGvQ0FJbz4Zcdr; Thu, 25 Aug 2022 21:54:10 +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 4MDGvP6rZkz3spD; Thu, 25 Aug 2022 21:54:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661464450; 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=DPNhSOiqmv1GeEShITLynFBHMi3VVzC0JESSAPOhqek=; b=Z0/B/BuD1tkI6k8Pd6AyPj4iIE0v2aigeMjM+rYFzq4B2/G8iuUflSwdWE85B8TsHCSw6z T2DvOyEwoXSAT3PDodVhcPV2rSqODcG4B0K1qfAwW6YcG+6H++5kSF52FzuKcvr9276jfN p0WnpiMe+a/JuR00B8zeXMyZJrOzif1Ejk88NcsPD5ViVqjcp8WAs7mq6NZuma+QOGRlAF /lmGW6NEugwDWgKNX+VbMMKOX19ywdM+TaWyQyO7aq38rn94ibC6BJT+tjGUr22x1gDval vXtiTuZLm5WJ9duXH4sovoHLcBp9/JUARfVL5Ocng3gsXjYW7CRB/rJxiglDsg== 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 4MDGvP5tvfz13YJ; Thu, 25 Aug 2022 21:54:09 +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 27PLs9xZ013309; Thu, 25 Aug 2022 21:54:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27PLs9Bu013308; Thu, 25 Aug 2022 21:54:09 GMT (envelope-from git) Date: Thu, 25 Aug 2022 21:54:09 GMT Message-Id: <202208252154.27PLs9Bu013308@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 296ebc603ab7 - main - graphics/GraphicsMagick: enable JXL by default after 7ea47cecaa27 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: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 296ebc603ab7d698ba5d85a3969b75aba0c83e6d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661464450; 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=DPNhSOiqmv1GeEShITLynFBHMi3VVzC0JESSAPOhqek=; b=Bolb5IT+iOAaKoEmzE/GsPA7wWv9MHkKNZuw9r7WADud/ME4Fk7SIZhAAJGmDTRa8Vvqct Dgk6vazzUde5g5MLdUbXPRmgKOSF2g8MNWMDBdCSY/L49o5wuAtuJ06olb6VquhMwL+uvI hbQdvhpfTtF6+M7CyMYhsPDhnH7W7/YciSPn0GD6xkVpp231HWocHeFq3kaGFoFQKenqqe hGp2Bz3PRPqFssLnBUsreJWptDJ8NdoMGtFFBlQ+TqPcJlxdYnt5aI0rMLwYjG4lD7Gon9 t44jcC4f2w+ukGbV8AydjgqrnRfp22cBz2vtUTgfO8E4efPKR8U9UbYGOTZ62g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661464450; a=rsa-sha256; cv=none; b=vYt8Lwii4opugnhoVDhilfHRPaUox4ELAXyZOHuARcDr/a4bncQQl3orwvprjjAbkcgC6Y 4ZEJ29JaC7b1iMQAmoSaVgHIKa4rtnPaUzZv7z4dFBOvunPakzpeo9ocJwsiq1w6VMaUui eEGWaYTZUH9XRGrSKgvaKcw07pvnh3nYU16UuYKM+SFI3jeoiLM50UGjUHp04HnZet6lzA vZcczr+B686c6E0zqFTQBnJ0UMnaXaGMkIpwDuap4sVBFrzl3ZiHmtBjXhIHfxnlFqqGRz fV3aWwrX2MGtsUME3wVw6rEZFbTrMF4rGkBI0YytOpn7WSZanGv6lWupAT4g/Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=296ebc603ab7d698ba5d85a3969b75aba0c83e6d commit 296ebc603ab7d698ba5d85a3969b75aba0c83e6d Author: Jan Beich AuthorDate: 2022-08-09 15:09:46 +0000 Commit: Jan Beich CommitDate: 2022-08-25 21:53:42 +0000 graphics/GraphicsMagick: enable JXL by default after 7ea47cecaa27 PR: 265741 Approved by: maintainer timeout (2 weeks) --- graphics/GraphicsMagick/Makefile | 6 ++---- graphics/GraphicsMagick/files/patch-configure | 13 +++++++++++++ 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/graphics/GraphicsMagick/Makefile b/graphics/GraphicsMagick/Makefile index ca005bdce131..a606be9f1177 100644 --- a/graphics/GraphicsMagick/Makefile +++ b/graphics/GraphicsMagick/Makefile @@ -1,6 +1,6 @@ PORTNAME= GraphicsMagick PORTVERSION= 1.3.38 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= graphics MASTER_SITES= SF @@ -25,8 +25,7 @@ USE_LDCONFIG= yes WINDOWS_FONT_DIR?= ${LOCALBASE}/share/fonts/webfonts OPTIONS_DEFINE= BZIP2 DOCS FPX FREETYPE HEIF JASPER JBIG JPEG JXL LCMS2 LZMA OPENMP Q8BIT PNG SSE TEST TIFF UMEM WEBP WMF X11 XML ZLIB ZSTD -OPTIONS_DEFAULT=BZIP2 FREETYPE JASPER JBIG JPEG LCMS2 LZMA OPENMP PNG TIFF WEBP WMF X11 XML ZLIB -JXL_DESC= JPEG XL image format via libjxl (BROKEN now) +OPTIONS_DEFAULT=BZIP2 FREETYPE JASPER JBIG JPEG JXL LCMS2 LZMA OPENMP PNG TIFF WEBP WMF X11 XML ZLIB Q8BIT_DESC= Use 8-bit pixels (speed) instead of 16-bit (quality) UMEM_DESC= UMEM memory allocation library support TEST_DESC= Run bundled self-tests after build @@ -44,7 +43,6 @@ JBIG_CONFIGURE_WITH= jbig JBIG_LIB_DEPENDS= libjbig.so:graphics/jbigkit JPEG_CONFIGURE_WITH= jpeg JPEG_USES= jpeg -JXL_BROKEN= does not build: use of undeclared identifier 'JxlEncoderFrameSettings' JXL_CONFIGURE_WITH= jxl JXL_LIB_DEPENDS= libjxl.so:graphics/libjxl LCMS2_CONFIGURE_WITH= lcms2 diff --git a/graphics/GraphicsMagick/files/patch-configure b/graphics/GraphicsMagick/files/patch-configure index 92a9e3083493..01011aea16aa 100644 --- a/graphics/GraphicsMagick/files/patch-configure +++ b/graphics/GraphicsMagick/files/patch-configure @@ -69,6 +69,19 @@ # Check for system-dependent libraries X programs must link with. # Do this before checking for the system-independent R6 libraries +@@ -27336,10 +27281,8 @@ $as_echo "no -- some components failed test" >&6; } + $as_echo "no -- some components failed test" >&6; } + have_jxl='no (failed tests)' + else +- # JXL is a C++ Lib so requires linking with stdc++. +- # TODO: A better solution would be to tell automake to do any linking with +- # c++, but I can't figure out a way to get this working. +- LIB_JXL='-ljxl -ljxl_threads -lhwy -lbrotlidec -lbrotlienc -lstdc++' ++ # TODO: use pkg-config ++ LIB_JXL='-ljxl -ljxl_threads' + LIBS="$LIB_JXL $LIBS" + + $as_echo "#define HasJXL 1" >>confdefs.h @@ -27703,7 +27649,7 @@ fi #