From nobody Tue Apr 26 17:17:38 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 4EA9B1AAF4AC; Tue, 26 Apr 2022 17:17:39 +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 4KnpVC1cpzz4vXB; Tue, 26 Apr 2022 17:17:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650993459; 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=tDTwpiblFZyEXox8oDHRe7C8pUnMozX1OvpSSmvtdCM=; b=DEZ1l7W642zXq55n99mUAOCE5876YkgNcPeJMNQ68HZVLcYJbfxh2Gcwm+wPaNgWFgsiQj ElbHHx4pKPRjWoW/90gFYxWRpqp9s0idaPaZPP/5h6LtSmgOcSJYRO5P5Ifr8z1lFjkB3x eMF06d3mAmKI0CewMKMg+sshCyc4d9nirPyelMVe24LXNX3TB8AXfzwEv6t9k3q5ivgd/M +r2ohlUeUnpcBFXqrWNA/3Mww8pSf5GrllCEgiLK8emi/qbBwQsRUhE5reGoyY5fQjGbbW u4wT3onn1H+G5Xghk83APY6ZU75gvDp/L/rgY4jgMjpi1dtwgxe00BottOwIcA== 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 0E04913611; Tue, 26 Apr 2022 17:17:39 +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 23QHHc0s020503; Tue, 26 Apr 2022 17:17:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23QHHcGv020502; Tue, 26 Apr 2022 17:17:38 GMT (envelope-from git) Date: Tue, 26 Apr 2022 17:17:38 GMT Message-Id: <202204261717.23QHHcGv020502@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Thierry Thomas Subject: git: 4c30f7f1c91f - main - graphics/cimg: upgrade to 3.1.0 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: thierry X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4c30f7f1c91fc6e500646edc84939404b0d59a20 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650993459; 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=tDTwpiblFZyEXox8oDHRe7C8pUnMozX1OvpSSmvtdCM=; b=LwQX9wczY/qUtf8NU4CubzmHRuCdXbwm/Ozu9adn7A3duo7QcGECGscaKPnpj4DBFfnM21 zbezWoyh2S3q0xfK3AuD/Z0oEYGzo84lQ4QmbC5O8XH7QOFwyVgv0ldho203MbuvOBUftb tfqb2Mnxm43zZGwIKz3pYvZAclvcIRiz9o0IDmxTmIDSbLWd0QCXLzQQc5QLQushJg7E7I 1wvuVZ4rk8wDEg1kGVb3sJh2WqGYbP+e7HTZMm4ul/EOzdZNBBhwFpcrCwHOZn/vIY3ODD zEVKMK2RK62RDm5QValdxlljbV97gzOnKacnLQPK0nF6F0wfFDYnybyqJyKJWQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650993459; a=rsa-sha256; cv=none; b=F+y21+IuSm24jBWI7U/vXtgJznn8aZ/j7OvOlxs73ftbF+WQ39YiKwLmUNzAeDn3e5ju3d 3TafJ7UlZ5Ky6uJcpeZNW7sXbIIszrrJB0a4ESVdeKlSC5utCc9fBvDQ1heu0QLo/ckdeL cayLgniaLxIMdQ0NDefJB4zeeZUo/CCrMnSDD3TXk7XRZ75S2e++6sOvf4a1EQiiyy3VSF GHVJ+/1mJg4etw4jUgTco2K3mUm/p4kajKE1p5UUQvrGwaYmNybN3a1U2T9ENueyTWysvg XCZ3JYl8wnDCsRRi6H2oWqv628Si0fPJL3jzAz21XLDkeXjjK9CV1h0nvbbL/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by thierry: URL: https://cgit.FreeBSD.org/ports/commit/?id=4c30f7f1c91fc6e500646edc84939404b0d59a20 commit 4c30f7f1c91fc6e500646edc84939404b0d59a20 Author: Thierry Thomas AuthorDate: 2022-04-26 17:12:25 +0000 Commit: Thierry Thomas CommitDate: 2022-04-26 17:17:33 +0000 graphics/cimg: upgrade to 3.1.0 --- graphics/cimg/Makefile | 3 +-- graphics/cimg/distinfo | 6 +++--- graphics/cimg/files/patch-examples__Makefile | 25 +++++++++++-------------- 3 files changed, 15 insertions(+), 19 deletions(-) diff --git a/graphics/cimg/Makefile b/graphics/cimg/Makefile index 83bbc9f4d06c..e9b3991df6c3 100644 --- a/graphics/cimg/Makefile +++ b/graphics/cimg/Makefile @@ -2,9 +2,8 @@ PORTNAME= cimg DISTVERSIONPREFIX= v. -DISTVERSION= 3.0.2 +DISTVERSION= 3.1.0 PORTEPOCH= 3 -PORTREVISION= 1 CATEGORIES= graphics devel MAINTAINER= thierry@FreeBSD.org diff --git a/graphics/cimg/distinfo b/graphics/cimg/distinfo index f698fc3dc7b1..91885d2fb626 100644 --- a/graphics/cimg/distinfo +++ b/graphics/cimg/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1642525146 -SHA256 (dtschump-CImg-v.3.0.2_GH0.tar.gz) = 0fd89c28f627192c7b67f7a6615bed278b1e0deb360f2e4598184df184fedc9f -SIZE (dtschump-CImg-v.3.0.2_GH0.tar.gz) = 11276693 +TIMESTAMP = 1650992252 +SHA256 (dtschump-CImg-v.3.1.0_GH0.tar.gz) = 95fcba7687beed2b9cad74c01aa8f539e81775c54bab0c0ba469e2d968d25c67 +SIZE (dtschump-CImg-v.3.1.0_GH0.tar.gz) = 11951341 diff --git a/graphics/cimg/files/patch-examples__Makefile b/graphics/cimg/files/patch-examples__Makefile index a681c8e1c8f7..6b7d18d0dfc9 100644 --- a/graphics/cimg/files/patch-examples__Makefile +++ b/graphics/cimg/files/patch-examples__Makefile @@ -1,4 +1,4 @@ ---- examples/Makefile.orig 2021-04-02 13:11:36 UTC +--- examples/Makefile.orig 2022-04-26 06:16:18 UTC +++ examples/Makefile @@ -89,7 +89,7 @@ VERSION2 = $(shell grep 'cimg_version\ ' ../CImg.h | t VERSION3 = $(shell grep 'cimg_version\ ' ../CImg.h | tail -c2 | head -c1) @@ -18,19 +18,16 @@ LIBS = -lm ifdef IS_GCC CXXVER = $(shell $(CXX) -v 2>&1 | tail -n 1) -@@ -151,9 +151,9 @@ DEBUG_CFLAGS = -Dcimg_verbosity=3 -Dcimg_strict_warnin +@@ -151,7 +151,7 @@ DEBUG_CFLAGS = -Dcimg_verbosity=3 -Dcimg_strict_warnin VT100_CFLAGS = -Dcimg_use_vt100 # Flags to enable code optimization by the compiler. -OPT_CFLAGS = -Ofast +OPT_CFLAGS = # -Ofast - handled by the port CFLAGS ifdef IS_GCC --OPT_CFLAGS = -Ofast -mtune=generic -+OPT_CFLAGS = - endif - ifdef IS_ICPC - OPT_CFLAGS = -fast -@@ -172,9 +172,9 @@ endif + # Add -mtune=generic for GCC if supported. + NO_MTUNE_GENERIC = $(shell $(CXX) -mtune=generic -E - < /dev/null > /dev/null 2>&1; echo $$?) +@@ -176,9 +176,9 @@ endif # Flags to enable OpenCV support. OPENCV_DEFINE = -Dcimg_use_opencv @@ -42,7 +39,7 @@ # Flags used to disable display capablities of CImg NODISPLAY_CFLAGS = -Dcimg_display=0 -@@ -224,7 +224,7 @@ JPEG_LIBS = -ljpeg +@@ -228,7 +228,7 @@ JPEG_LIBS = -ljpeg TIFF_DEFINE = -Dcimg_use_tiff TIFF_INCDIR = TIFF_CFLAGS = $(TIFF_DEFINE) $(TIFF_INCDIR) @@ -51,7 +48,7 @@ # Flags to enable native support for loading HEIF image files, using the libheif library. # ( https://github.com/strukturag/libheif ) -@@ -243,16 +243,16 @@ MINC2_LIBS = -lminc_io -lvolume_io2 -lminc2 -lnetcdf - +@@ -247,16 +247,16 @@ MINC2_LIBS = -lminc_io -lvolume_io2 -lminc2 -lnetcdf - # Flags to enable native support for EXR image files, using the OpenEXR library. # ( http://www.openexr.com/ ) OPENEXR_DEFINE = -Dcimg_use_openexr @@ -74,7 +71,7 @@ # Flags to enable native support for compressed .cimgz files, using the Zlib library. # ( http://www.zlib.net/ ) -@@ -288,17 +288,17 @@ endif +@@ -292,17 +292,17 @@ endif # Flags to enable the use of LAPACK routines for matrix computation # ( http://www.netlib.org/lapack/ ) @@ -98,7 +95,7 @@ # Flags to compile GIMP plug-ins. ifeq ($(MSYSTEM),MINGW32) -@@ -368,6 +368,7 @@ $(TIFF_LIBS) \ +@@ -372,6 +372,7 @@ $(TIFF_LIBS) \ $(HEIF_LIBS) \ $(LAPACK_LIBS) \ $(XSHM_LIBS)" \ @@ -106,7 +103,7 @@ all $(EXTRA_FILES) # Linux/BSD/Mac OSX targets, with X11 display. -@@ -461,8 +462,11 @@ $(ZLIB_CFLAGS) \ +@@ -465,8 +466,11 @@ $(ZLIB_CFLAGS) \ $(CURL_CFLAGS) \ $(OPENCV_CFLAGS) \ $(MAGICK_CFLAGS) \ @@ -118,7 +115,7 @@ $(X11_LIBS) \ $(XSHM_LIBS) \ $(XRANDR_LIBS) \ -@@ -475,6 +479,8 @@ $(ZLIB_LIBS) \ +@@ -479,6 +483,8 @@ $(ZLIB_LIBS) \ $(CURL_LIBS) \ $(OPENCV_LIBS) \ $(MAGICK_LIBS) \