git: 50731b13c882 - main - devel/kf5-extra-cmake-modules: make compatible with OpenEXR/Imath 3.0
Matthias Andree
mandree at FreeBSD.org
Mon Apr 12 00:34:12 UTC 2021
The branch main has been updated by mandree:
URL: https://cgit.FreeBSD.org/ports/commit/?id=50731b13c8827a92ad082f683bc171e45407453f
commit 50731b13c8827a92ad082f683bc171e45407453f
Author: Matthias Andree <mandree at FreeBSD.org>
AuthorDate: 2021-04-11 04:37:24 +0000
Commit: Matthias Andree <mandree at FreeBSD.org>
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 at 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
More information about the dev-commits-ports-all
mailing list