From owner-dev-commits-ports-main@freebsd.org Mon Apr 12 00:34:12 2021 Return-Path: Delivered-To: dev-commits-ports-main@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 55F005E3E29; Mon, 12 Apr 2021 00:34:12 +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 4FJV9J1jzWz4ncf; Mon, 12 Apr 2021 00:34:12 +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 21ADC5AB8; Mon, 12 Apr 2021 00:34:12 +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 13C0YBHF092092; Mon, 12 Apr 2021 00:34:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13C0YB4k092091; Mon, 12 Apr 2021 00:34:11 GMT (envelope-from git) Date: Mon, 12 Apr 2021 00:34:11 GMT Message-Id: <202104120034.13C0YB4k092091@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: 50731b13c882 - main - devel/kf5-extra-cmake-modules: 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: 50731b13c8827a92ad082f683bc171e45407453f Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Apr 2021 00:34:12 -0000 The branch main has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=50731b13c8827a92ad082f683bc171e45407453f commit 50731b13c8827a92ad082f683bc171e45407453f Author: Matthias Andree AuthorDate: 2021-04-11 04:37:24 +0000 Commit: Matthias Andree CommitDate: 2021-04-12 00:33:35 +0000 devel/kf5-extra-cmake-modules: make compatible with OpenEXR/Imath 3.0 --- devel/kf5-extra-cmake-modules/Makefile | 1 + .../files/patch-find-modules_FindOpenEXR.cmake | 46 ++++++++++++++++++++++ 2 files changed, 47 insertions(+) diff --git a/devel/kf5-extra-cmake-modules/Makefile b/devel/kf5-extra-cmake-modules/Makefile index 11d7023c2f8b..5d4806667fcf 100644 --- a/devel/kf5-extra-cmake-modules/Makefile +++ b/devel/kf5-extra-cmake-modules/Makefile @@ -2,6 +2,7 @@ PORTNAME= extra-cmake-modules DISTVERSION= ${KDE_FRAMEWORKS_VERSION} +PORTREVISION= 1 CATEGORIES= devel kde kde-frameworks MAINTAINER= kde@FreeBSD.org diff --git a/devel/kf5-extra-cmake-modules/files/patch-find-modules_FindOpenEXR.cmake b/devel/kf5-extra-cmake-modules/files/patch-find-modules_FindOpenEXR.cmake new file mode 100644 index 000000000000..5147f47565bd --- /dev/null +++ b/devel/kf5-extra-cmake-modules/files/patch-find-modules_FindOpenEXR.cmake @@ -0,0 +1,46 @@ +--- find-modules/FindOpenEXR.cmake.orig 2021-02-26 21:48:38 UTC ++++ find-modules/FindOpenEXR.cmake +@@ -44,6 +44,13 @@ pkg_check_modules(PC_OpenEXR QUIET OpenEXR) + + set(OpenEXR_DEFINITIONS ${PC_OpenEXR_CFLAGS_OTHER}) + ++find_path(Imath_INCLUDE_DIR ImathMath.h ++ PATHS ++ ${PC_Imath_INCLUDEDIR} ++ ${PC_Imath_INCLUDE_DIRS} ++ PATH_SUFFIXES Imath ++) ++ + find_path(OpenEXR_INCLUDE_DIR ImfRgbaFile.h + PATHS + ${PC_OpenEXR_INCLUDEDIR} +@@ -52,7 +59,7 @@ find_path(OpenEXR_INCLUDE_DIR ImfRgbaFile.h + ) + + # Required libraries for OpenEXR +-find_library(OpenEXR_HALF_LIBRARY NAMES Half ++find_library(OpenEXR_HALF_LIBRARY NAMES Imath + PATHS + ${PC_OpenEXR_LIBDIR} + ${PC_OpenEXR_LIBRARY_DIRS} +@@ -73,7 +80,7 @@ find_library(OpenEXR_ILMTHREAD_LIBRARY NAMES IlmThread + ${PC_OpenEXR_LIBRARY_DIRS} + ) + # This is the actual OpenEXR library +-find_library(OpenEXR_ILMIMF_LIBRARY NAMES IlmImf ++find_library(OpenEXR_ILMIMF_LIBRARY NAMES OpenEXR + PATHS + ${PC_OpenEXR_LIBDIR} + ${PC_OpenEXR_LIBRARY_DIRS} +@@ -109,9 +116,10 @@ find_package_handle_standard_args(OpenEXR + OpenEXR_IMATH_LIBRARY + OpenEXR_ILMTHREAD_LIBRARY + OpenEXR_INCLUDE_DIR ++ Imath_INCLUDE_DIR + VERSION_VAR OpenEXR_VERSION_STRING) + +-set(OpenEXR_INCLUDE_DIRS ${OpenEXR_INCLUDE_DIR}) ++set(OpenEXR_INCLUDE_DIRS ${Imath_INCLUDE_DIR} ${OpenEXR_INCLUDE_DIR}) + + include(FeatureSummary) + set_package_properties(OpenEXR PROPERTIES