From nobody Sun Jan 14 19:00:34 2024 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 4TCl362xyPz56tN9; Sun, 14 Jan 2024 19:00:34 +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 4TCl362Tphz4nK1; Sun, 14 Jan 2024 19:00:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705258834; 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=m4FuqeanoXnCTHXpOIBcDnsSRwmZGOSA8sStzzJ455s=; b=toRzaMn/ssh+fTvZ7kI+aMhcYBW79UtykjCiC30DFZwmULnZ+e2TBsycT7dW7ns8JkGH31 4+sSL4H4r7pRCehRnEA5EYTTO/CvDWQZcx5krE9uAl6ADIB89ebsNxO+YnTYAo/5hf8nNh VrzcxhInYOkXAdHqcIJhO7njkT2ANnxePhg19zxlrzHXsZpjfQcmL/K3yTrkwdBCBatnn1 vNOLqQYp1XizvjwHWWiP3kjwWyiNSXlIKbk/2moNf2Aldf5vmIBykj6DbNvWAvrmTxi6B6 1JBrNrngpcGeqZps+F9xuJ1zVCfQZ2Zukmgj0cWWfA8n80fw54+4dBjERQfheQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705258834; 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=m4FuqeanoXnCTHXpOIBcDnsSRwmZGOSA8sStzzJ455s=; b=ub+E8VAcv6wCg0iyJBDx+pqr7tKmLyrtvMbIK9jfjNuRsfoFvbDYXy+Zvc7zek1Yu00uZt 4/I6lMulKVCQvd2CCGfsBCA9WBRuHNejFh7fkVo35npgrrUBIiZrOkoGDbJzfApotsTv5T SbBmfrW9NLOM7FS1VselbXyQpZpgwZ9hB1MqMFdqkN+pyeRBNFImVGDBZWQKcXIsei971Y wdbqIokYU3dBgsGOG7c0EKzwWqxvKRXmnE1aNJuHjRnCn4ZOfx1rIe4fDz9bM96am2UMa6 I0dglp8/vcuos6D66I5q4tnW490BhfHr/E7i14PzY0RSeaiGN00KjFQmXlLTFQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705258834; a=rsa-sha256; cv=none; b=eR7tBsU+WvM9H/an0IKV26golRjZyGWzML8dWCZaJ/pRQSu1QcAIhNnO5sIwN3AWejDHc4 Y8bmj8YoXrt3RlbWGY9Ix6l6YJc5VuUcpGT2pQYplGlszNFsFoOgj2VpUtboDerKdX9RVW q8e3QuoM/a9zSKoxrrsWcmIyuTDQzX+7BHAijJL/GJmXvziUHP0U4S14+fN9qz47wnVih5 QqD7Uba9+MMcUbxQyFpjbnmosdo7NO9aho7tepbkb9WAGWOZi1Wg2FQJU+u+DGOC30GkyD SmhS2NLirGGnscWVySOr74dV2DdyHvz2KNUMouk9iC2+eHLts1WRo4/7FkIvYQ== 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 4TCl361YGvzQ1L; Sun, 14 Jan 2024 19:00:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40EJ0Y35049200; Sun, 14 Jan 2024 19:00:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40EJ0Y13049197; Sun, 14 Jan 2024 19:00:34 GMT (envelope-from git) Date: Sun, 14 Jan 2024 19:00:34 GMT Message-Id: <202401141900.40EJ0Y13049197@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: a16027367d87 - main - graphics/cimg: upgrade to 3.3.3 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: a16027367d87b73d456121c704b091e229254712 Auto-Submitted: auto-generated The branch main has been updated by thierry: URL: https://cgit.FreeBSD.org/ports/commit/?id=a16027367d87b73d456121c704b091e229254712 commit a16027367d87b73d456121c704b091e229254712 Author: Thierry Thomas AuthorDate: 2024-01-14 15:57:30 +0000 Commit: Thierry Thomas CommitDate: 2024-01-14 19:00:29 +0000 graphics/cimg: upgrade to 3.3.3 Also activate OpenMP. --- graphics/cimg/Makefile | 3 +-- graphics/cimg/distinfo | 6 +++--- graphics/cimg/files/patch-examples__Makefile | 28 ++++++++++++++++++---------- 3 files changed, 22 insertions(+), 15 deletions(-) diff --git a/graphics/cimg/Makefile b/graphics/cimg/Makefile index 0f924ffae052..f925ecf4efe3 100644 --- a/graphics/cimg/Makefile +++ b/graphics/cimg/Makefile @@ -1,7 +1,6 @@ PORTNAME= cimg DISTVERSIONPREFIX= v. -DISTVERSION= 3.3.2 -PORTREVISION= 1 +DISTVERSION= 3.3.3 PORTEPOCH= 3 CATEGORIES= graphics devel diff --git a/graphics/cimg/distinfo b/graphics/cimg/distinfo index b81dd58910fb..0489f2df57ba 100644 --- a/graphics/cimg/distinfo +++ b/graphics/cimg/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1699724135 -SHA256 (dtschump-CImg-v.3.3.2_GH0.tar.gz) = 2fffcc1c5abe6c86e38e2ae57e0f9c41985711d01e069cf6910c72382d3b536e -SIZE (dtschump-CImg-v.3.3.2_GH0.tar.gz) = 12662681 +TIMESTAMP = 1705246100 +SHA256 (dtschump-CImg-v.3.3.3_GH0.tar.gz) = 13bf5467952a5973d50d043c270b23c172de8cb89d8202d30d189aef1e506749 +SIZE (dtschump-CImg-v.3.3.3_GH0.tar.gz) = 12663036 diff --git a/graphics/cimg/files/patch-examples__Makefile b/graphics/cimg/files/patch-examples__Makefile index 5ee929259352..bb61907dc368 100644 --- a/graphics/cimg/files/patch-examples__Makefile +++ b/graphics/cimg/files/patch-examples__Makefile @@ -1,6 +1,6 @@ ---- examples/Makefile.orig 2022-08-19 17:18:04 UTC +--- examples/Makefile.orig 2024-01-10 06:42:56 UTC +++ examples/Makefile -@@ -89,7 +89,7 @@ VERSION2 = $(shell grep 'cimg_version\ ' ../CImg.h | t +@@ -89,7 +89,7 @@ SVERSION = $(VERSION1).$(VERSION2).$(VERSION3) VERSION3 = $(shell grep 'cimg_version\ ' ../CImg.h | tail -c2 | head -c1) SVERSION = $(VERSION1).$(VERSION2).$(VERSION3) @@ -9,7 +9,7 @@ EXE_PRE = EXE_EXT = -@@ -111,7 +111,7 @@ IS_ICPC = 1 +@@ -111,7 +111,7 @@ CXXVER = $(CXX) endif CXXVER = $(CXX) @@ -18,7 +18,7 @@ LIBS = -lm ifdef IS_GCC CXXVER = $(shell $(CXX) -v 2>&1 | tail -n 1) -@@ -151,7 +151,7 @@ DEBUG_CFLAGS = -Dcimg_verbosity=3 -Dcimg_strict_warnin +@@ -151,7 +151,7 @@ VT100_CFLAGS = -Dcimg_use_vt100 VT100_CFLAGS = -Dcimg_use_vt100 # Flags to enable code optimization by the compiler. @@ -27,7 +27,7 @@ ifdef IS_GCC # 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 +@@ -176,9 +176,9 @@ OPENCV_DEFINE = -Dcimg_use_opencv # Flags to enable OpenCV support. OPENCV_DEFINE = -Dcimg_use_opencv @@ -39,7 +39,7 @@ # Flags used to disable display capablities of CImg NODISPLAY_CFLAGS = -Dcimg_display=0 -@@ -228,7 +228,7 @@ JPEG_LIBS = -ljpeg +@@ -228,7 +228,7 @@ TIFF_CFLAGS = $(TIFF_DEFINE) $(TIFF_INCDIR) TIFF_DEFINE = -Dcimg_use_tiff TIFF_INCDIR = TIFF_CFLAGS = $(TIFF_DEFINE) $(TIFF_INCDIR) @@ -48,7 +48,7 @@ # Flags to enable native support for loading HEIF image files, using the libheif library. # ( https://github.com/strukturag/libheif ) -@@ -247,16 +247,16 @@ MINC2_LIBS = -lminc_io -lvolume_io2 -lminc2 -lnetcdf - +@@ -247,16 +247,16 @@ OPENEXR_DEFINE = -Dcimg_use_openexr # Flags to enable native support for EXR image files, using the OpenEXR library. # ( http://www.openexr.com/ ) OPENEXR_DEFINE = -Dcimg_use_openexr @@ -95,7 +95,7 @@ # Flags to compile GIMP plug-ins. ifeq ($(MSYSTEM),MINGW32) -@@ -372,6 +372,7 @@ $(TIFF_LIBS) \ +@@ -372,6 +372,7 @@ $(XSHM_LIBS)" \ $(HEIF_LIBS) \ $(LAPACK_LIBS) \ $(XSHM_LIBS)" \ @@ -103,7 +103,15 @@ all $(EXTRA_FILES) # Linux/BSD/Mac OSX targets, with X11 display. -@@ -465,8 +466,11 @@ $(ZLIB_CFLAGS) \ +@@ -452,6 +453,7 @@ $(OPT_CFLAGS) \ + @$(MAKE) \ + "CONF_CFLAGS = \ + $(OPT_CFLAGS) \ ++$(OPENMP_CFLAGS) \ + $(VT100_CFLAGS) \ + $(X11_CFLAGS) \ + $(XSHM_CFLAGS) \ +@@ -465,8 +467,11 @@ $(MAGICK_CFLAGS) \ $(CURL_CFLAGS) \ $(OPENCV_CFLAGS) \ $(MAGICK_CFLAGS) \ @@ -115,7 +123,7 @@ $(X11_LIBS) \ $(XSHM_LIBS) \ $(XRANDR_LIBS) \ -@@ -479,6 +483,8 @@ $(ZLIB_LIBS) \ +@@ -479,6 +484,8 @@ $(MAGICK_LIBS) \ $(CURL_LIBS) \ $(OPENCV_LIBS) \ $(MAGICK_LIBS) \