From 9b0dafbf45dff05ff20f360e3392f4e047ed9885 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Fri, 14 Apr 2017 17:38:58 +0200 Subject: [PATCH] openimageio: fix build with newer boost. * fix requirements and dependency of the devel package. --- .../openimageio/openimageio-1.7.11.recipe | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/media-libs/openimageio/openimageio-1.7.11.recipe b/media-libs/openimageio/openimageio-1.7.11.recipe index 7fd96d6cb..e55481661 100644 --- a/media-libs/openimageio/openimageio-1.7.11.recipe +++ b/media-libs/openimageio/openimageio-1.7.11.recipe @@ -8,26 +8,26 @@ world, and is also incorporated into several commercial products." HOMEPAGE="http://github.com/OpenImageIO/" COPYRIGHT="2008-2015 Larry Gritz et al." LICENSE="BSD (3-clause)" -REVISION="1" -SOURCE_URI="https://github.com/OpenImageIO/oiio/archive/Release-$portVersion.tar.gz" +REVISION="2" +SOURCE_URI="$HOMEPAGE/oiio/archive/Release-$portVersion.tar.gz" CHECKSUM_SHA256="52992720488fe255f77a6fdbc44d716e3b0db922e741fa4d13ac15841dc8331d" SOURCE_FILENAME="openimageio-$portVersion.tar.gz" SOURCE_DIR="oiio-Release-$portVersion" -PATCHES="openimageio-1.7.11.patchset" +PATCHES="openimageio-$portVersion.patchset" ARCHITECTURES="x86 x86_64" SECONDARY_ARCHITECTURES="!x86_gcc2 x86" PROVIDES=" - openimageio$secondaryArchSuffix = $portVersion compat >= 1.5 + openimageio$secondaryArchSuffix = $portVersion cmd:iconvert cmd:idiff cmd:igrep cmd:iinfo cmd:maketx cmd:oiiotool - lib:libopenimageio$secondaryArchSuffix = 1.5.15 compat >= 1.5 - lib:libopenimageio_util$secondaryArchSuffix = 1.5.15 compat >= 1.5 + lib:libopenimageio$secondaryArchSuffix = $portVersion compat >= 1.7 + lib:libopenimageio_util$secondaryArchSuffix = $portVersion compat >= 1.7 " REQUIRES=" haiku$secondaryArchSuffix @@ -48,17 +48,18 @@ REQUIRES=" " PROVIDES_devel=" - openimageio${secondaryArchSuffix}_devel = $portVersion compat >= 1.5 - devel:libopenimageio$secondaryArchSuffix = 1.5.15 compat >= 1.5 - devel:libopenimageio_util$secondaryArchSuffix = 1.5.15 compat >= 1.5 + openimageio${secondaryArchSuffix}_devel = $portVersion + devel:libopenimageio$secondaryArchSuffix = $portVersion compat >= 1.7 + devel:libopenimageio_util$secondaryArchSuffix = $portVersion compat >= 1.7 " REQUIRES_devel=" openimageio$secondaryArchSuffix == $portVersion base + devel:libboost_system$secondaryArchSuffix " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - boost${secondaryArchSuffix}_devel + devel:libboost_system$secondaryArchSuffix devel:libhalf$secondaryArchSuffix devel:libilmimf$secondaryArchSuffix devel:libjpeg$secondaryArchSuffix @@ -68,14 +69,15 @@ BUILD_REQUIRES=" devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" + cmd:cmake cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:make - cmd:cmake " BUILD() { + export CXXFLAGS="-std=c++11 -DBOOST_NO_CXX11_CONSTEXPR" make $jobArgs }