aboutsummaryrefslogtreecommitdiff
path: root/graphics/osg34
diff options
context:
space:
mode:
authorMatthias Andree <mandree@FreeBSD.org>2021-04-11 22:18:18 +0000
committerMatthias Andree <mandree@FreeBSD.org>2021-04-12 00:33:51 +0000
commit9e2ecd86da6871979e279c7db3649f040c4e9192 (patch)
tree55e335a828e12d74bd41ef03cdd76ef01fc3d5f4 /graphics/osg34
parentbc5a54f73de0d99f3948c83571c73997abbc8fb7 (diff)
downloadports-9e2ecd86da6871979e279c7db3649f040c4e9192.tar.gz
ports-9e2ecd86da6871979e279c7db3649f040c4e9192.zip
graphics/osg34: make compatible with OpenEXR/Imath 3.0
Diffstat (limited to 'graphics/osg34')
-rw-r--r--graphics/osg34/Makefile6
-rw-r--r--graphics/osg34/files/patch-CMakeModules_FindOpenEXR.cmake23
2 files changed, 26 insertions, 3 deletions
diff --git a/graphics/osg34/Makefile b/graphics/osg34/Makefile
index 8881ffb9ba01..316f6e9d1772 100644
--- a/graphics/osg34/Makefile
+++ b/graphics/osg34/Makefile
@@ -3,7 +3,7 @@
PORTNAME= osg
PORTVERSION= 3.4.1
DISTVERSIONPREFIX= OpenSceneGraph-
-PORTREVISION= 20
+PORTREVISION= 21
CATEGORIES= graphics
PKGNAMESUFFIX= 34
@@ -29,7 +29,7 @@ USE_GL= gl glu
USE_XORG= x11
USE_LDCONFIG= yes
# needed to ensure build on gcc-based archs; harmless otherwise
-CXXFLAGS+= -Wno-narrowing
+CXXFLAGS+= -Wno-narrowing -I${LOCALBASE}/include/Imath -DInt64=uint64_t
PLIST_SUB= OSG_VERSION=${PORTVERSION} \
OSG_SHLIBVER=131 \
@@ -87,7 +87,7 @@ LUA_VARS_OFF= FORCE_IGNORE+="Lua51 Lua52"
NVTT_LIB_DEPENDS= libnvtt.so:graphics/nvidia-texture-tools
NVTT_VARS= FORCE_REQUIRE+=NVTT
NVTT_VARS_OFF= FORCE_IGNORE+=NVTT
-OPENEXR_LIB_DEPENDS= libIlmImf.so:graphics/openexr
+OPENEXR_LIB_DEPENDS= libOpenEXR.so:graphics/openexr libImath.so:math/Imath
OPENEXR_VARS= FORCE_REQUIRE+=OpenEXR
OPENEXR_VARS_OFF= FORCE_IGNORE+=OpenEXR
PDF_LIB_DEPENDS= libpoppler-glib.so:graphics/poppler-glib
diff --git a/graphics/osg34/files/patch-CMakeModules_FindOpenEXR.cmake b/graphics/osg34/files/patch-CMakeModules_FindOpenEXR.cmake
new file mode 100644
index 000000000000..e8fb99b70796
--- /dev/null
+++ b/graphics/osg34/files/patch-CMakeModules_FindOpenEXR.cmake
@@ -0,0 +1,23 @@
+--- CMakeModules/FindOpenEXR.cmake.orig 2021-04-11 21:39:01 UTC
++++ CMakeModules/FindOpenEXR.cmake
+@@ -51,14 +51,14 @@ MACRO(OPENEXR_FIND libname)
+ OPENEXR_FIND_VAR(OPENEXR_${libname}_LIBRARY_DEBUG ${libname}d)
+ ENDMACRO(OPENEXR_FIND)
+
+-OPENEXR_FIND(IlmImf)
++OPENEXR_FIND(OpenEXR)
+ OPENEXR_FIND(IlmThread)
+ OPENEXR_FIND(Iex)
+-OPENEXR_FIND(Half)
++OPENEXR_FIND(Imath)
+
+ SET(OPENEXR_FOUND "NO")
+-IF(OPENEXR_INCLUDE_DIR AND OPENEXR_IlmImf_LIBRARY AND OPENEXR_IlmThread_LIBRARY AND OPENEXR_Iex_LIBRARY AND OPENEXR_Half_LIBRARY)
+- SET(OPENEXR_LIBRARIES ${OPENEXR_IlmImf_LIBRARY} ${OPENEXR_IlmThread_LIBRARY} ${OPENEXR_Half_LIBRARY} ${OPENEXR_Iex_LIBRARY} )
+- SET(OPENEXR_LIBRARIES_VARS OPENEXR_IlmImf_LIBRARY OPENEXR_IlmThread_LIBRARY OPENEXR_Half_LIBRARY OPENEXR_Iex_LIBRARY )
++IF(OPENEXR_INCLUDE_DIR AND OPENEXR_OpenEXR_LIBRARY AND OPENEXR_IlmThread_LIBRARY AND OPENEXR_Iex_LIBRARY AND OPENEXR_Imath_LIBRARY)
++ SET(OPENEXR_LIBRARIES ${OPENEXR_OpenEXR_LIBRARY} ${OPENEXR_IlmThread_LIBRARY} ${OPENEXR_Imath_LIBRARY} ${OPENEXR_Iex_LIBRARY} )
++ SET(OPENEXR_LIBRARIES_VARS OPENEXR_OpenEXR_LIBRARY OPENEXR_IlmThread_LIBRARY OPENEXR_Imath_LIBRARY OPENEXR_Iex_LIBRARY )
+ SET(OPENEXR_FOUND "YES")
+-ENDIF(OPENEXR_INCLUDE_DIR AND OPENEXR_IlmImf_LIBRARY AND OPENEXR_IlmThread_LIBRARY AND OPENEXR_Iex_LIBRARY AND OPENEXR_Half_LIBRARY)
++ENDIF(OPENEXR_INCLUDE_DIR AND OPENEXR_OpenEXR_LIBRARY AND OPENEXR_IlmThread_LIBRARY AND OPENEXR_Iex_LIBRARY AND OPENEXR_Imath_LIBRARY)