Date: Thursday, April 29, 2021 @ 22:01:23 Author: arojas Revision: 925284
openexr 3.0 rebuild Added: openscenegraph/trunk/openscenegraph-openexr3.patch Modified: openscenegraph/trunk/PKGBUILD -------------------------------+ PKGBUILD | 16 +++++-- openscenegraph-openexr3.patch | 82 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 94 insertions(+), 4 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-04-29 21:56:03 UTC (rev 925283) +++ PKGBUILD 2021-04-29 22:01:23 UTC (rev 925284) @@ -6,7 +6,7 @@ pkgname=openscenegraph pkgver=3.6.5 -pkgrel=3 +pkgrel=4 pkgdesc='Open Source, high performance real-time graphics toolkit' url='http://www.openscenegraph.org' arch=('x86_64') @@ -16,10 +16,18 @@ optdepends=('ffmpeg' 'gdal' 'gst-plugins-base-libs' 'jasper' 'librsvg' 'libvncserver' 'openexr' 'poppler-glib') conflicts=('openthreads') provides=('openthreads') -source=(https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-${pkgver}.tar.gz) -sha256sums=('aea196550f02974d6d09291c5d83b51ca6a03b3767e234a8c0e21322927d1e12') -sha512sums=('7002fa30a3bcf6551d2e1050b4ca75a3736013fd190e4f50953717406864da1952deb09f530bc8c5ddf6e4b90204baec7dbc283f497829846d46d561f66feb4b') +source=(https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-${pkgver}.tar.gz + openscenegraph-openexr3.patch) +sha256sums=('aea196550f02974d6d09291c5d83b51ca6a03b3767e234a8c0e21322927d1e12' + '680ea7cd1b1681fb42137dd1510c64862507b889286d8788d3f017d9d307792d') +sha512sums=('7002fa30a3bcf6551d2e1050b4ca75a3736013fd190e4f50953717406864da1952deb09f530bc8c5ddf6e4b90204baec7dbc283f497829846d46d561f66feb4b' + '0788e87bf17adf586d5041c5b565d0a09fe38f7c5e96a843e69f5171737aef68bd277b240ccf860cfb78e36ea6d7d7c599ecff104bb78de513d1b3edb70358ef') +prepare() { + cd OpenSceneGraph-OpenSceneGraph-${pkgver} + patch -p1 < ../openscenegraph-openexr3.patch # Fix build with openEXR 3 +} + build() { mkdir -p OpenSceneGraph-OpenSceneGraph-${pkgver}/build cd OpenSceneGraph-OpenSceneGraph-${pkgver}/build Added: openscenegraph-openexr3.patch =================================================================== --- openscenegraph-openexr3.patch (rev 0) +++ openscenegraph-openexr3.patch 2021-04-29 22:01:23 UTC (rev 925284) @@ -0,0 +1,82 @@ +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 <osgDB/FileNameUtils> + #include <osgDB/FileUtils> + ++#include <ImfInt64.h> + #include <ImfRgbaFile.h> + #include <ImfIO.h> + #include <ImfArray.h>
