Date: Wednesday, May 11, 2022 @ 21:18:11 Author: anthraxx Revision: 1198381
archrelease: copy trunk to community-staging-x86_64 Added: openscenegraph/repos/community-staging-x86_64/ openscenegraph/repos/community-staging-x86_64/PKGBUILD (from rev 1198380, openscenegraph/trunk/PKGBUILD) openscenegraph/repos/community-staging-x86_64/ffmpeg4.4.patch (from rev 1198380, openscenegraph/trunk/ffmpeg4.4.patch) openscenegraph/repos/community-staging-x86_64/openscenegraph-openexr3.patch (from rev 1198380, openscenegraph/trunk/openscenegraph-openexr3.patch) -------------------------------+ PKGBUILD | 52 +++++++++++++++++++++++++ ffmpeg4.4.patch | 30 ++++++++++++++ openscenegraph-openexr3.patch | 82 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 164 insertions(+) Copied: openscenegraph/repos/community-staging-x86_64/PKGBUILD (from rev 1198380, openscenegraph/trunk/PKGBUILD) =================================================================== --- community-staging-x86_64/PKGBUILD (rev 0) +++ community-staging-x86_64/PKGBUILD 2022-05-11 21:18:11 UTC (rev 1198381) @@ -0,0 +1,52 @@ +# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org> +# Contributor: Sergej Pupykin <pupykin.s+a...@gmail.com> +# Contributor: Hans Janssen <jans...@gmail.com> +# Contributor: my64 <packa...@obordes.com> +# Contributor: Colin Pitrat <colin.pit...@gmail.com> + +pkgname=openscenegraph +pkgver=3.6.5 +pkgrel=12 +pkgdesc='Open Source, high performance real-time graphics toolkit' +url='http://www.openscenegraph.org' +arch=('x86_64') +license=('custom:OSGPL') +depends=('fontconfig' 'libglvnd' 'libxinerama') +makedepends=('cmake' 'ffmpeg4.4' 'gdal' 'gst-plugins-base-libs' 'jasper' 'librsvg' 'libvncserver' 'openexr' 'poppler-glib') +optdepends=('ffmpeg4.4' '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 + openscenegraph-openexr3.patch + ffmpeg4.4.patch) +sha256sums=('aea196550f02974d6d09291c5d83b51ca6a03b3767e234a8c0e21322927d1e12' + '680ea7cd1b1681fb42137dd1510c64862507b889286d8788d3f017d9d307792d' + '64a492d266e49aec611fd609251fa7dd08f75e86b25120a1abaf0328223c921a') +sha512sums=('7002fa30a3bcf6551d2e1050b4ca75a3736013fd190e4f50953717406864da1952deb09f530bc8c5ddf6e4b90204baec7dbc283f497829846d46d561f66feb4b' + '0788e87bf17adf586d5041c5b565d0a09fe38f7c5e96a843e69f5171737aef68bd277b240ccf860cfb78e36ea6d7d7c599ecff104bb78de513d1b3edb70358ef' + '9c6d63d3e38a4045b891ccf2f0a2876a52ce8b033214ef9a24072e2ebcde4d1ce12be6d420a37e3b2cb0bdbd5d7d5a808c45d3b207c20a54cfa1114dcfcd1ada') + +prepare() { + cd OpenSceneGraph-OpenSceneGraph-${pkgver} + patch -p1 < ../openscenegraph-openexr3.patch # Fix build with openEXR 3 + patch -p1 < ../ffmpeg4.4.patch # Find ffmpeg 4.4 headers +} + +build() { + mkdir -p OpenSceneGraph-OpenSceneGraph-${pkgver}/build + cd OpenSceneGraph-OpenSceneGraph-${pkgver}/build + export PKG_CONFIG_PATH='/usr/lib/ffmpeg4.4/pkgconfig' + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release \ + .. + VERBOSE=1 make +} + +package() { + cd OpenSceneGraph-OpenSceneGraph-${pkgver} + make -C build DESTDIR="${pkgdir}" install + install -Dm 644 LICENSE.txt -t "${pkgdir}/usr/share/licenses/${pkgname}" +} + +# vim: ts=2 sw=2 et: Copied: openscenegraph/repos/community-staging-x86_64/ffmpeg4.4.patch (from rev 1198380, openscenegraph/trunk/ffmpeg4.4.patch) =================================================================== --- community-staging-x86_64/ffmpeg4.4.patch (rev 0) +++ community-staging-x86_64/ffmpeg4.4.patch 2022-05-11 21:18:11 UTC (rev 1198381) @@ -0,0 +1,30 @@ +diff --git a/CMakeModules/FindFFmpeg.cmake b/CMakeModules/FindFFmpeg.cmake +index d548e7a98..7a53cfe25 100644 +--- a/CMakeModules/FindFFmpeg.cmake ++++ b/CMakeModules/FindFFmpeg.cmake +@@ -43,7 +43,7 @@ MACRO(FFMPEG_FIND varname shortname headername) + /opt/csw/include # Blastwave + /opt/include + /usr/freeware/include +- PATH_SUFFIXES ffmpeg ++ PATH_SUFFIXES ffmpeg ffmpeg4.4 + DOC "Location of FFMPEG Headers" + ) + +@@ -62,7 +62,7 @@ MACRO(FFMPEG_FIND varname shortname headername) + /opt/csw/include # Blastwave + /opt/include + /usr/freeware/include +- PATH_SUFFIXES ffmpeg ++ PATH_SUFFIXES ffmpeg ffmpeg4.4 + DOC "Location of FFMPEG Headers" + ) + +@@ -84,6 +84,7 @@ MACRO(FFMPEG_FIND varname shortname headername) + /opt/csw/lib + /opt/lib + /usr/freeware/lib64 ++ PATH_SUFFIXES ffmpeg4.4 + DOC "Location of FFMPEG Libraries" + ) + Copied: openscenegraph/repos/community-staging-x86_64/openscenegraph-openexr3.patch (from rev 1198380, openscenegraph/trunk/openscenegraph-openexr3.patch) =================================================================== --- community-staging-x86_64/openscenegraph-openexr3.patch (rev 0) +++ community-staging-x86_64/openscenegraph-openexr3.patch 2022-05-11 21:18:11 UTC (rev 1198381) @@ -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>