diff options
| author | Matthias Andree <mandree@FreeBSD.org> | 2021-04-11 04:37:24 +0000 |
|---|---|---|
| committer | Matthias Andree <mandree@FreeBSD.org> | 2021-04-12 00:33:35 +0000 |
| commit | 50731b13c8827a92ad082f683bc171e45407453f (patch) | |
| tree | 68f33ea56a24d203f4ef3e9e5d02c104a77d5ed0 | |
| parent | e9f871d1473ebf0a4ca67e871b828f39b0f84b48 (diff) | |
| download | ports-50731b13c8827a92ad082f683bc171e45407453f.tar.gz ports-50731b13c8827a92ad082f683bc171e45407453f.zip | |
devel/kf5-extra-cmake-modules: make compatible with OpenEXR/Imath 3.0
| -rw-r--r-- | devel/kf5-extra-cmake-modules/Makefile | 1 | ||||
| -rw-r--r-- | devel/kf5-extra-cmake-modules/files/patch-find-modules_FindOpenEXR.cmake | 46 |
2 files changed, 47 insertions, 0 deletions
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 |