diff --git a/media-libs/openimageio/openimageio-2.3.10.0.recipe b/media-libs/openimageio/openimageio-2.3.10.0.recipe index 2ef1d88cc..f1a145e8a 100644 --- a/media-libs/openimageio/openimageio-2.3.10.0.recipe +++ b/media-libs/openimageio/openimageio-2.3.10.0.recipe @@ -8,27 +8,34 @@ world, and is also incorporated into several commercial products." HOMEPAGE="https://github.com/OpenImageIO/" COPYRIGHT="2008-present Contributors to the OpenImageIO project." LICENSE="BSD (3-clause)" -REVISION="3" +REVISION="4" SOURCE_URI="$HOMEPAGE/oiio/archive/refs/tags/v$portVersion.tar.gz" -CHECKSUM_SHA256="3b8a43135792373da7d8897a5937dce96cfd2a2bfb92ff8c51a870df1e9cfbd9" +CHECKSUM_SHA256="23e2dc4b0fe82f1ccbc794b29608a3022aa9728cda766026dd7e1d4c0fc40f69" SOURCE_FILENAME="openimageio-$portVersion.tar.gz" -SOURCE_DIR="oiio-$portVersion" +SOURCE_DIR="OpenImageIO-$portVersion" PATCHES="openimageio-$portVersion.patchset" ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" +commandBinDir=$binDir +commandSuffix=$secondaryArchSuffix +if [ "$targetArchitecture" = x86_gcc2 ]; then + commandSuffix= + commandBinDir=$prefix/bin +fi + libVersion="2.3.10" -libVersionCompat="$libVersion compat >= ${libVersion%%.*}" +libVersionCompat="$libVersion compat >= ${libVersion%.*}" PROVIDES=" openimageio$secondaryArchSuffix = $portVersion - cmd:iconvert$secondaryArchSuffix - cmd:idiff$secondaryArchSuffix - cmd:igrep$secondaryArchSuffix - cmd:iinfo$secondaryArchSuffix - cmd:maketx$secondaryArchSuffix - cmd:oiiotool$secondaryArchSuffix + cmd:iconvert$commandSuffix = $portVersion + cmd:idiff$commandSuffix = $portVersion + cmd:igrep$commandSuffix = $portVersion + cmd:iinfo$commandSuffix = $portVersion + cmd:maketx$commandSuffix = $portVersion + cmd:oiiotool$commandSuffix = $portVersion lib:libOpenImageIO$secondaryArchSuffix = $libVersionCompat lib:libOpenImageIO_Util$secondaryArchSuffix = $libVersionCompat " @@ -47,13 +54,13 @@ REQUIRES=" lib:libgif$secondaryArchSuffix lib:libglew$secondaryArchSuffix lib:libheif$secondaryArchSuffix - lib:libIex_3_0$secondaryArchSuffix - lib:libIlmThread_3_0$secondaryArchSuffix - lib:libImath_3_0$secondaryArchSuffix + lib:libIex_3_2$secondaryArchSuffix + lib:libIlmThread_3_2$secondaryArchSuffix + lib:libImath_3_1$secondaryArchSuffix lib:libjpeg$secondaryArchSuffix lib:libOpenColorIO$secondaryArchSuffix - lib:libOpenEXR_3_0$secondaryArchSuffix - lib:libOpenEXRUtil_3_0$secondaryArchSuffix + lib:libOpenEXR_3_2$secondaryArchSuffix + lib:libOpenEXRUtil_3_2$secondaryArchSuffix lib:libpng16$secondaryArchSuffix lib:libpugixml$secondaryArchSuffix lib:libraw$secondaryArchSuffix @@ -75,7 +82,7 @@ REQUIRES_devel=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - devel:libboost_system$secondaryArchSuffix >= 1.69.0 + devel:libboost_system$secondaryArchSuffix >= 1.83.0 devel:libbz2$secondaryArchSuffix devel:libcrypto$secondaryArchSuffix devel:libfreetype$secondaryArchSuffix @@ -83,13 +90,13 @@ BUILD_REQUIRES=" devel:libgif$secondaryArchSuffix devel:libglew$secondaryArchSuffix devel:libheif$secondaryArchSuffix - devel:libIex_3_0$secondaryArchSuffix - devel:libIlmThread_3_0$secondaryArchSuffix - devel:libImath_3_0$secondaryArchSuffix + devel:libIex_3_2$secondaryArchSuffix + devel:libIlmThread_3_2$secondaryArchSuffix + devel:libImath_3_1$secondaryArchSuffix devel:libjpeg$secondaryArchSuffix devel:libOpenColorIO$secondaryArchSuffix - devel:libOpenEXR_3_0$secondaryArchSuffix - devel:libOpenEXRUtil_3_0$secondaryArchSuffix + devel:libOpenEXR_3_2$secondaryArchSuffix + devel:libOpenEXRUtil_3_2$secondaryArchSuffix devel:libpng16$secondaryArchSuffix devel:libpugixml$secondaryArchSuffix devel:libraw$secondaryArchSuffix @@ -110,12 +117,12 @@ BUILD_PREREQUIRES=" " defineDebugInfoPackage openimageio$secondaryArchSuffix \ - $binDir/iconvert \ - $binDir/idiff \ - $binDir/igrep \ - $binDir/iinfo \ - $binDir/maketx \ - $binDir/oiiotool \ + $commandBinDir/iconvert \ + $commandBinDir/idiff \ + $commandBinDir/igrep \ + $commandBinDir/iinfo \ + $commandBinDir/maketx \ + $commandBinDir/oiiotool \ $libDir/libOpenImageIO.so.$libVersion \ $libDir/libOpenImageIO_Util.so.$libVersion @@ -123,12 +130,12 @@ BUILD() { cmake -B build -S . \ $cmakeDirArgs \ + -DCMAKE_INSTALL_BINDIR=$commandBinDir \ -DUSE_PYTHON=OFF \ -DUSE_EXTERNAL_PUGIXML=ON \ - -DOIIO_BUILD_TESTS=OFF \ -DBUILD_TESTING=OFF \ -DOIIO_BUILD_TESTS=OFF \ - -DCMAKE_BUILD_TYPE=Release + -DCMAKE_BUILD_TYPE=Release -Wno-dev make -C build $jobArgs } @@ -136,7 +143,9 @@ INSTALL() { make -C build install - prepareInstalledDevelLibs libOpenImageIO libOpenImageIO_Util + prepareInstalledDevelLibs \ + libOpenImageIO \ + libOpenImageIO_Util fixPkgconfig # devel package diff --git a/media-libs/openimageio/patches/openimageio-2.3.10.0.patchset b/media-libs/openimageio/patches/openimageio-2.3.10.0.patchset index 83638ed59..782f456be 100644 --- a/media-libs/openimageio/patches/openimageio-2.3.10.0.patchset +++ b/media-libs/openimageio/patches/openimageio-2.3.10.0.patchset @@ -31,8 +31,8 @@ index 699d592..059af0f 100644 endif() - -+if (__HAIKU__) -+ target_link_libraries (OpenImageIO network) ++if (HAIKU) ++ target_link_libraries (OpenImageIO PRIVATE network) +endif() if (MSVC)