From owner-dev-commits-ports-all@freebsd.org Mon Apr 12 00:34:32 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 661BF5E419C; Mon, 12 Apr 2021 00:34:32 +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 4FJV9g64vrz4p0n; Mon, 12 Apr 2021 00:34:31 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 7E0495ABE; Mon, 12 Apr 2021 00:34:31 +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 13C0YVrW092469; Mon, 12 Apr 2021 00:34:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13C0YVaK092468; Mon, 12 Apr 2021 00:34:31 GMT (envelope-from git) Date: Mon, 12 Apr 2021 00:34:31 GMT Message-Id: <202104120034.13C0YVaK092468@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Andree Subject: git: 9afced56643d - main - graphics/cimg: make compatible with OpenEXR/Imath 3.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mandree X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9afced56643d76c48d9fac24ede0e1e39f3478cd Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Apr 2021 00:34:32 -0000 The branch main has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=9afced56643d76c48d9fac24ede0e1e39f3478cd commit 9afced56643d76c48d9fac24ede0e1e39f3478cd Author: Matthias Andree AuthorDate: 2021-04-11 04:41:04 +0000 Commit: Matthias Andree CommitDate: 2021-04-12 00:33:44 +0000 graphics/cimg: make compatible with OpenEXR/Imath 3.0 --- graphics/cimg/Makefile | 6 ++++-- graphics/cimg/files/patch-examples__Makefile | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/graphics/cimg/Makefile b/graphics/cimg/Makefile index 1934340d4a4e..3f084382634a 100644 --- a/graphics/cimg/Makefile +++ b/graphics/cimg/Makefile @@ -3,6 +3,7 @@ PORTNAME= cimg DISTVERSIONPREFIX= v. DISTVERSION= 2.9.7 +PORTREVISION= 1 PORTEPOCH= 3 CATEGORIES= graphics devel @@ -49,9 +50,9 @@ LIB_DEPENDS+= libboard.so:graphics/libboard LIB_DEPENDS+= libcurl.so:ftp/curl \ libpng.so:graphics/png \ libtiff.so:graphics/tiff \ - libHalf.so:graphics/ilmbase \ + libImath.so:math/Imath \ libheif.so:graphics/libheif \ - libIlmImf.so:graphics/openexr \ + libOpenEXR.so:graphics/openexr \ libgimp-2.0.so:graphics/gimp-app \ libfftw3.so:math/fftw3 \ libopencv_core.so:graphics/opencv \ @@ -83,6 +84,7 @@ USE_XORG+= xext . endif DOCBASE= README.txt +CFLAGS+= -I${LOCALBASE}/include/Imath -I${LOCALBASE}/include/OpenEXR MAKE_ARGS+= CPPFLAGS="${CFLAGS}" FREEBSD_LDFLAGS="${LDFLAGS}" PROGS= CImg_demo captcha curve_editor2d dtmri_view3d \ edge_explorer2d fade_images gaussian_fit1d generate_loop_macros \ diff --git a/graphics/cimg/files/patch-examples__Makefile b/graphics/cimg/files/patch-examples__Makefile index 91b8048819cb..01f6af383905 100644 --- a/graphics/cimg/files/patch-examples__Makefile +++ b/graphics/cimg/files/patch-examples__Makefile @@ -58,7 +58,8 @@ -OPENEXR_INCDIR = -I/usr/include/OpenEXR +OPENEXR_INCDIR = -I$(LOCALBASE)/include/OpenEXR OPENEXR_CFLAGS = $(OPENEXR_DEFINE) $(OPENEXR_INCDIR) - OPENEXR_LIBS = -lIlmImf -lHalf +-OPENEXR_LIBS = -lIlmImf -lHalf ++OPENEXR_LIBS = -lOpenEXR -lImath # Flags to enable native support for various video files, using the FFMPEG library. # ( http://www.ffmpeg.org/ )