From f1134daff2127aeee4e01b949e154d44d848df06 Mon Sep 17 00:00:00 2001
From: miqlas <5569059+extrowerk@users.noreply.github.com>
Date: Sun, 3 Dec 2017 18:00:11 +0100
Subject: [PATCH] Oiio pugi fix (#1831)

* WIP

* OIIO : use system pugixml

* OIIO: disable python as it isn't vital.

* OIIO: debuginfo

* Bump revision

* Arch cleanup
---
 .../openimageio/openimageio-1.8.6.recipe      | 21 ++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/media-libs/openimageio/openimageio-1.8.6.recipe b/media-libs/openimageio/openimageio-1.8.6.recipe
index 5cb2a6519..2dc820708 100644
--- a/media-libs/openimageio/openimageio-1.8.6.recipe
+++ b/media-libs/openimageio/openimageio-1.8.6.recipe
@@ -8,15 +8,15 @@ world, and is also incorporated into several commercial products."
 HOMEPAGE="http://github.com/OpenImageIO/"
 COPYRIGHT="2008-2017 Larry Gritz et al."
 LICENSE="BSD (3-clause)"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="$HOMEPAGE/oiio/archive/Release-$portVersion.tar.gz"
 CHECKSUM_SHA256="9e070d56c0f71496ca77290a78abd948af9c2799983bc27c22a36dcc16ffe2e3"
 SOURCE_FILENAME="openimageio-$portVersion.tar.gz"
 SOURCE_DIR="oiio-Release-$portVersion"
 PATCHES="openimageio-$portVersion.patchset"
 
-ARCHITECTURES="x86 x86_64"
-SECONDARY_ARCHITECTURES="!x86_gcc2 x86"
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
 	openimageio$secondaryArchSuffix = $portVersion
@@ -31,6 +31,7 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
+#	cmd:python2
 #	lib:libavcodec$secondaryArchSuffix
 	lib:libboost_atomic$secondaryArchSuffix
 	lib:libboost_chrono$secondaryArchSuffix
@@ -50,6 +51,7 @@ REQUIRES="
 	lib:libjpeg$secondaryArchSuffix
 	lib:libopencolorio$secondaryArchSuffix
 	lib:libpng16$secondaryArchSuffix
+	lib:libpugixml$secondaryArchSuffix
 	lib:libraw$secondaryArchSuffix
 	lib:libssl$secondaryArchSuffix #yeah, really
 	lib:libtiff$secondaryArchSuffix
@@ -82,6 +84,7 @@ BUILD_REQUIRES="
 	devel:libjpeg$secondaryArchSuffix
 	devel:libopencolorio$secondaryArchSuffix
 	devel:libpng16$secondaryArchSuffix
+	devel:libpugixml$secondaryArchSuffix
 	devel:libraw$secondaryArchSuffix
 	devel:libssl$secondaryArchSuffix
 	devel:libtiff$secondaryArchSuffix
@@ -94,8 +97,19 @@ BUILD_PREREQUIRES="
 	cmd:ld$secondaryArchSuffix
 	cmd:make
 	cmd:pkg_config$secondaryArchSuffix
+#	cmd:python2
 	"
 
+defineDebugInfoPackage openimageio$secondaryArchSuffix \
+	$binDir/iconvert \
+	$binDir/idiff \
+	$binDir/igrep \
+	$binDir/iinfo \
+	$binDir/maketx \
+	$binDir/oiiotool \
+	$libDir/libOpenImageIO.so.$portVersion \
+	$libDir/libOpenImageIO_Util.so.$portVersion
+
 BUILD()
 {
 	mkdir -p build
@@ -108,6 +122,7 @@ BUILD()
 		-DFONTS_INSTALL_DIR="$fontsDir/ttfonts" \
 		-DINCLUDE_INSTALL_DIR=$includeDir/OpenImageIO \
 		-DMAN_INSTALL_DIR=$manDir \
+		-DUSE_EXTERNAL_PUGIXML=ON \
 		$cmakeDirArgs
 	make $jobArgs
 }