kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

graphics/osg34: make compatible with OpenEXR/Imath 3.0

Browse source
This commit is contained in:
Matthias Andree 2021-04-12 00:18:18 +02:00
parent bc5a54f73d
commit 9e2ecd86da
2 changed files with 26 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
graphics/osg34/Makefile
View file

@ -3,7 +3,7 @@
PORTNAME= osg PORTNAME= osg
PORTVERSION= 3.4.1 PORTVERSION= 3.4.1
DISTVERSIONPREFIX= OpenSceneGraph- DISTVERSIONPREFIX= OpenSceneGraph-
PORTREVISION= 20 PORTREVISION= 21
CATEGORIES= graphics CATEGORIES= graphics
PKGNAMESUFFIX= 34 PKGNAMESUFFIX= 34
@ -29,7 +29,7 @@ USE_GL= gl glu
USE_XORG= x11 USE_XORG= x11
USE_LDCONFIG= yes USE_LDCONFIG= yes
# needed to ensure build on gcc-based archs; harmless otherwise # 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} \ PLIST_SUB= OSG_VERSION=${PORTVERSION} \
OSG_SHLIBVER=131 \ OSG_SHLIBVER=131 \
@ -87,7 +87,7 @@ LUA_VARS_OFF= FORCE_IGNORE+="Lua51 Lua52"
NVTT_LIB_DEPENDS= libnvtt.so:graphics/nvidia-texture-tools NVTT_LIB_DEPENDS= libnvtt.so:graphics/nvidia-texture-tools
NVTT_VARS= FORCE_REQUIRE+=NVTT NVTT_VARS= FORCE_REQUIRE+=NVTT
NVTT_VARS_OFF= FORCE_IGNORE+=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= FORCE_REQUIRE+=OpenEXR
OPENEXR_VARS_OFF= FORCE_IGNORE+=OpenEXR OPENEXR_VARS_OFF= FORCE_IGNORE+=OpenEXR
PDF_LIB_DEPENDS= libpoppler-glib.so:graphics/poppler-glib PDF_LIB_DEPENDS= libpoppler-glib.so:graphics/poppler-glib

23
graphics/osg34/files/patch-CMakeModules_FindOpenEXR.cmake Normal file
View file

@ -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)