From owner-dev-commits-ports-all@freebsd.org Mon Apr 12 00:34:23 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 CAA515E409F; Mon, 12 Apr 2021 00:34:23 +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 4FJV9W3x3gz4nvP; Mon, 12 Apr 2021 00:34:23 +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 65851565D; Mon, 12 Apr 2021 00:34:23 +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 13C0YN7i092310; Mon, 12 Apr 2021 00:34:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13C0YNst092309; Mon, 12 Apr 2021 00:34:23 GMT (envelope-from git) Date: Mon, 12 Apr 2021 00:34:23 GMT Message-Id: <202104120034.13C0YNst092309@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: d5f6e8b84e88 - main - graphics/luminance-qt5: 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: d5f6e8b84e881d773e7b7f089874e9075d688c89 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:24 -0000 The branch main has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=d5f6e8b84e881d773e7b7f089874e9075d688c89 commit d5f6e8b84e881d773e7b7f089874e9075d688c89 Author: Matthias Andree AuthorDate: 2021-04-11 01:44:53 +0000 Commit: Matthias Andree CommitDate: 2021-04-12 00:33:40 +0000 graphics/luminance-qt5: make compatible with OpenEXR/Imath 3.0 --- graphics/luminance-qt5/Makefile | 8 +++++--- .../patch-build__files_Modules_FindOpenEXR.cmake | 23 ++++++++++++++++++++++ 2 files changed, 28 insertions(+), 3 deletions(-) diff --git a/graphics/luminance-qt5/Makefile b/graphics/luminance-qt5/Makefile index 2ad670154fdf..b5071aa27eff 100644 --- a/graphics/luminance-qt5/Makefile +++ b/graphics/luminance-qt5/Makefile @@ -2,7 +2,7 @@ PORTNAME= luminance-hdr DISTVERSION= 2.5.1 -PORTREVISION= 15 +PORTREVISION= 16 CATEGORIES= graphics MASTER_SITES= SF/qtpfsgui/luminance/${DISTVERSION} PKGNAMESUFFIX= -qt5 @@ -17,7 +17,7 @@ EXPIRATION_DATE=2021-06-23 BUILD_DEPENDS= ${LOCALBASE}/include/fftw3.h:math/fftw3 LIB_DEPENDS= libcfitsio.so:astro/cfitsio \ - libHalf.so:graphics/ilmbase \ + libImath.so:math/Imath \ libtiff.so:graphics/tiff \ libraw_r.so:graphics/libraw \ libfftw3f.so:math/fftw3-float \ @@ -25,9 +25,11 @@ LIB_DEPENDS= libcfitsio.so:astro/cfitsio \ libexiv2.so:graphics/exiv2 \ liblcms2.so:graphics/lcms2 \ libpng.so:graphics/png \ - libIlmImf.so:graphics/openexr \ + libOpenEXR.so:graphics/openexr \ libboost_date_time.so:devel/boost-libs +CFLAGS+= -I${LOCALBASE}/include/Imath + USES= cmake desktop-file-utils jpeg pkgconfig qt:5 tar:bzip2 USE_QT= concurrent core declarative gui location network printsupport \ sql svg webchannel webengine widgets xml \ diff --git a/graphics/luminance-qt5/files/patch-build__files_Modules_FindOpenEXR.cmake b/graphics/luminance-qt5/files/patch-build__files_Modules_FindOpenEXR.cmake new file mode 100644 index 000000000000..a6e21e9799d8 --- /dev/null +++ b/graphics/luminance-qt5/files/patch-build__files_Modules_FindOpenEXR.cmake @@ -0,0 +1,23 @@ +--- build_files/Modules/FindOpenEXR.cmake.orig 2017-05-10 19:14:06 UTC ++++ build_files/Modules/FindOpenEXR.cmake +@@ -39,18 +39,16 @@ if (NOT OPENEXR_VERSION) + endif() + if (${OPENEXR_VERSION} VERSION_LESS "2.1") + SET(_openexr_FIND_COMPONENTS +- Half + Iex +- IlmImf ++ OpenEXR + IlmThread + Imath + ) + else () + string(REGEX REPLACE "([0-9]+)[.]([0-9]+).*" "\\1_\\2" _openexr_libs_ver ${OPENEXR_VERSION}) + SET(_openexr_FIND_COMPONENTS +- Half ++ OpenEXR-${_openexr_libs_ver} + Iex-${_openexr_libs_ver} +- IlmImf-${_openexr_libs_ver} + IlmThread-${_openexr_libs_ver} + Imath-${_openexr_libs_ver} + )