From e9ca6445f6ec7e32be04743157e7c1b5f9b19d48 Mon Sep 17 00:00:00 2001 From: Timo Gurr Date: Fri, 5 Nov 2021 12:51:16 +0100 Subject: [PATCH] OpenSceneGraph: version bump to 3.6.5 --- ...heres-0 => OpenSceneGraph-3.6.5.exheres-0} | 10 ++- .../files/OpenSceneGraph-3.6.5-openexr3.patch | 86 +++++++++++++++++++ 2 files changed, 92 insertions(+), 4 deletions(-) rename packages/dev-games/OpenSceneGraph/{OpenSceneGraph-3.5.9-r1.exheres-0 => OpenSceneGraph-3.6.5.exheres-0} (94%) create mode 100644 packages/dev-games/OpenSceneGraph/files/OpenSceneGraph-3.6.5-openexr3.patch diff --git a/packages/dev-games/OpenSceneGraph/OpenSceneGraph-3.5.9-r1.exheres-0 b/packages/dev-games/OpenSceneGraph/OpenSceneGraph-3.6.5.exheres-0 similarity index 94% rename from packages/dev-games/OpenSceneGraph/OpenSceneGraph-3.5.9-r1.exheres-0 rename to packages/dev-games/OpenSceneGraph/OpenSceneGraph-3.6.5.exheres-0 index f9ed8e6f..be6cfb5d 100644 --- a/packages/dev-games/OpenSceneGraph/OpenSceneGraph-3.5.9-r1.exheres-0 +++ b/packages/dev-games/OpenSceneGraph/OpenSceneGraph-3.6.5.exheres-0 @@ -36,10 +36,10 @@ DEPENDENCIES=" media-libs/freetype:2 media-libs/giflib:= media-libs/gstreamer:1.0 - media-libs/ilmbase + media-libs/imath media-libs/jasper media-libs/libpng:= - media-libs/openexr + media-libs/openexr[>=3] media-libs/SDL:0 media-libs/tiff media-plugins/gst-plugins-base:1.0 @@ -53,13 +53,15 @@ DEPENDENCIES=" providers:jpeg-turbo? ( media-libs/libjpeg-turbo ) " +DEFAULT_SRC_PREPARE_PATCHES=( + "${FILES}"/${PN}-3.6.5-openexr3.patch +) + CMAKE_SRC_CONFIGURE_PARAMS=( -DCMAKE_DISABLE_FIND_PACKAGE_Asio=1 -DCMAKE_DISABLE_FIND_PACKAGE_Inventor=1 -DCMAKE_DISABLE_FIND_PACKAGE_COLLADA=1 -DCMAKE_DISABLE_FIND_PACKAGE_FBX= - -DCMAKE_DISABLE_FIND_PACKAGE_Xine=1 - -DCMAKE_DISABLE_FIND_PACKAGE_OpenVRML=1 -DCMAKE_DISABLE_FIND_PACKAGE_Performer=1 -DCMAKE_DISABLE_FIND_PACKAGE_GDAL=1 -DCMAKE_DISABLE_FIND_PACKAGE_LibVNCServer=1 diff --git a/packages/dev-games/OpenSceneGraph/files/OpenSceneGraph-3.6.5-openexr3.patch b/packages/dev-games/OpenSceneGraph/files/OpenSceneGraph-3.6.5-openexr3.patch new file mode 100644 index 00000000..ba52889f --- /dev/null +++ b/packages/dev-games/OpenSceneGraph/files/OpenSceneGraph-3.6.5-openexr3.patch @@ -0,0 +1,86 @@ +Source: Arch, https://github.com/archlinux/svntogit-community/blob/packages/openscenegraph/trunk/openscenegraph-openexr3.patch +Upstream: Reported, https://github.com/openscenegraph/OpenSceneGraph/issues/1075 +Reason: Fix build with OpenEXR >= 3 + +diff --git a/CMakeModules/FindOpenEXR.cmake b/CMakeModules/FindOpenEXR.cmake +index 233be972b..d1b022881 100644 +--- a/CMakeModules/FindOpenEXR.cmake ++++ b/CMakeModules/FindOpenEXR.cmake +@@ -51,11 +51,11 @@ MACRO(OPENEXR_FIND libname) + OPENEXR_FIND_VAR(OPENEXR_${libname}_LIBRARY_DEBUG ${libname}d) + ENDMACRO(OPENEXR_FIND) + +-OPENEXR_FIND(IlmImf) ++OPENEXR_FIND(OpenEXR) + + SET(OPENEXR_FOUND "NO") +-IF(OPENEXR_INCLUDE_DIR AND OPENEXR_IlmImf_LIBRARY) +- SET(OPENEXR_LIBRARIES ${OPENEXR_IlmImf_LIBRARY} ) +- SET(OPENEXR_LIBRARIES_VARS OPENEXR_IlmImf_LIBRARY ) ++IF(OPENEXR_INCLUDE_DIR AND OPENEXR_OpenEXR_LIBRARY) ++ SET(OPENEXR_LIBRARIES ${OPENEXR_OpenEXR_LIBRARY} ) ++ SET(OPENEXR_LIBRARIES_VARS OPENEXR_OpenEXR_LIBRARY ) + SET(OPENEXR_FOUND "YES") +-ENDIF(OPENEXR_INCLUDE_DIR AND OPENEXR_IlmImf_LIBRARY) ++ENDIF(OPENEXR_INCLUDE_DIR AND OPENEXR_OpenEXR_LIBRARY) +diff --git a/CMakeModules/Findilmbase.cmake b/CMakeModules/Findilmbase.cmake +index 4b076c7c9..4610497fa 100644 +--- a/CMakeModules/Findilmbase.cmake ++++ b/CMakeModules/Findilmbase.cmake +@@ -10,7 +10,7 @@ + # Created by Robert Osfield. + + +-FIND_PATH(ILMBASE_INCLUDE_DIR OpenEXR/ImathVec.h ++FIND_PATH(ILMBASE_INCLUDE_DIR Imath/ImathVec.h + $ENV{ILMBASE_DIR}/include + $ENV{ILMBASE_DIR} + ~/Library/Frameworks +@@ -28,7 +28,7 @@ FIND_PATH(ILMBASE_INCLUDE_DIR OpenEXR/ImathVec.h + # example: ILMBASE_FIND_VAR(OPENEXR_IlmThread_LIBRARY IlmThread) + MACRO(ILMBASE_FIND_VAR varname libname) + FIND_LIBRARY( ${varname} +- NAMES ${libname} ${libname}-2_1 ${libname}-2_2 ++ NAMES ${libname} ${libname}-2_1 ${libname}-2_2 ${libname}-3_0 + PATHS + $ENV{ILMBASE_DIR}/lib + $ENV{ILMBASE_DIR} +@@ -53,11 +53,11 @@ ENDMACRO(ILMBASE_FIND) + + ILMBASE_FIND(IlmThread) + ILMBASE_FIND(Iex) +-ILMBASE_FIND(Half) ++ILMBASE_FIND(Imath) + + SET(ILMBASE_FOUND "NO") +-IF(ILMBASE_INCLUDE_DIR AND ILMBASE_IlmThread_LIBRARY AND ILMBASE_Iex_LIBRARY AND ILMBASE_Half_LIBRARY) +- SET(ILMBASE_LIBRARIES ${ILMBASE_IlmThread_LIBRARY} ${ILMBASE_Half_LIBRARY} ${ILMBASE_Iex_LIBRARY} ) +- SET(ILMBASE_LIBRARIES_VARS ILMBASE_IlmThread_LIBRARY ILMBASE_Half_LIBRARY ILMBASE_Iex_LIBRARY ) ++IF(ILMBASE_INCLUDE_DIR AND ILMBASE_IlmThread_LIBRARY AND ILMBASE_Iex_LIBRARY AND ILMBASE_Imath_LIBRARY) ++ SET(ILMBASE_LIBRARIES ${ILMBASE_IlmThread_LIBRARY} ${ILMBASE_Imath_LIBRARY} ${ILMBASE_Iex_LIBRARY} ) ++ SET(ILMBASE_LIBRARIES_VARS ILMBASE_IlmThread_LIBRARY ILMBASE_Imath_LIBRARY ILMBASE_Iex_LIBRARY ) + SET(ILMBASE_FOUND "YES") +-ENDIF(ILMBASE_INCLUDE_DIR AND ILMBASE_IlmThread_LIBRARY AND ILMBASE_Iex_LIBRARY AND ILMBASE_Half_LIBRARY) ++ENDIF(ILMBASE_INCLUDE_DIR AND ILMBASE_IlmThread_LIBRARY AND ILMBASE_Iex_LIBRARY AND ILMBASE_Imath_LIBRARY) +diff --git a/src/osgPlugins/exr/CMakeLists.txt b/src/osgPlugins/exr/CMakeLists.txt +index 6191ed18f..9a368b2c2 100644 +--- a/src/osgPlugins/exr/CMakeLists.txt ++++ b/src/osgPlugins/exr/CMakeLists.txt +@@ -1,4 +1,4 @@ +-INCLUDE_DIRECTORIES( ${ILMBASE_INCLUDE_DIR}/OpenEXR ) ++INCLUDE_DIRECTORIES( ${ILMBASE_INCLUDE_DIR}/Imath ) + INCLUDE_DIRECTORIES( ${OPENEXR_INCLUDE_DIR}/OpenEXR ) + + SET(TARGET_SRC ReaderWriterEXR.cpp ) +diff --git a/src/osgPlugins/exr/ReaderWriterEXR.cpp b/src/osgPlugins/exr/ReaderWriterEXR.cpp +index 7132e97f8..96c5507ef 100644 +--- a/src/osgPlugins/exr/ReaderWriterEXR.cpp ++++ b/src/osgPlugins/exr/ReaderWriterEXR.cpp +@@ -13,6 +13,7 @@ + #include + #include + ++#include + #include + #include + #include