From d30f996797450dc36738b8b3a49413e954c74e71 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Wed, 6 Nov 2019 22:35:30 +0100
Subject: [PATCH] opencolorio: bump version.

---
 ...-1.0.9.recipe => opencolorio-1.1.1.recipe} | 11 ++++---
 .../patches/opencolorio-1.0.9.patchset        | 22 --------------
 .../patches/opencolorio-1.1.1.patchset        | 29 +++++++++++++++++++
 3 files changed, 36 insertions(+), 26 deletions(-)
 rename media-libs/opencolorio/{opencolorio-1.0.9.recipe => opencolorio-1.1.1.recipe} (87%)
 delete mode 100644 media-libs/opencolorio/patches/opencolorio-1.0.9.patchset
 create mode 100644 media-libs/opencolorio/patches/opencolorio-1.1.1.patchset

diff --git a/media-libs/opencolorio/opencolorio-1.0.9.recipe b/media-libs/opencolorio/opencolorio-1.1.1.recipe
similarity index 87%
rename from media-libs/opencolorio/opencolorio-1.0.9.recipe
rename to media-libs/opencolorio/opencolorio-1.1.1.recipe
index b06c8c507..d8872a8aa 100644
--- a/media-libs/opencolorio/opencolorio-1.0.9.recipe
+++ b/media-libs/opencolorio/opencolorio-1.1.1.recipe
@@ -12,9 +12,9 @@ COPYRIGHT="
 	2003-2010 Sony Pictures Imageworks Inc., et al.
 	"
 LICENSE="BSD (3-clause)"
-REVISION="6"
+REVISION="1"
 SOURCE_URI="https://github.com/imageworks/OpenColorIO/archive/v$portVersion.tar.gz"
-CHECKSUM_SHA256="27c81e691c15753cd2b560c2ca4bd5679a60c2350eedd43c99d44ca25d65ea7f"
+CHECKSUM_SHA256="c9b5b9def907e1dafb29e37336b702fff22cc6306d445a13b1621b8a754c14c8"
 SOURCE_FILENAME="opencolorio-$portVersion.tar.gz"
 SOURCE_DIR="OpenColorIO-$portVersion"
 PATCHES="opencolorio-$portVersion.patchset"
@@ -26,7 +26,7 @@ PROVIDES="
 	opencolorio$secondaryArchSuffix = $portVersion compat >= 1
 	cmd:ociobakelut$secondaryArchSuffix
 	cmd:ociocheck$secondaryArchSuffix
-	lib:libopencolorio$secondaryArchSuffix = 1.0.9 compat >= 1
+	lib:libopencolorio$secondaryArchSuffix = $portVersion compat >= 1
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -36,7 +36,7 @@ REQUIRES="
 
 PROVIDES_devel="
 	opencolorio${secondaryArchSuffix}_devel = $portVersion compat >= 1
-	devel:libopencolorio$secondaryArchSuffix = 1.0.9 compat >= 1
+	devel:libopencolorio$secondaryArchSuffix = $portVersion compat >= 1
 	"
 REQUIRES_devel="
 	opencolorio$secondaryArchSuffix == $portVersion base
@@ -44,8 +44,10 @@ REQUIRES_devel="
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
+	devel:libboost_system$secondaryArchSuffix >= 1.69
 	devel:liblcms2$secondaryArchSuffix
 	devel:libtinyxml$secondaryArchSuffix
+	devel:libyaml_cpp$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
 	cmd:cmake
@@ -64,6 +66,7 @@ BUILD()
 		-DOCIO_BUILD_SHARED=ON \
 		-DUSE_EXTERNAL_LCMS=ON \
 		-DUSE_EXTERNAL_TINYXML=ON \
+		-DUSE_EXTERNAL_YAML=ON \
 		-DCMAKE_INSTALL_PREFIX:PATH=$prefix/build
 	make $jobArgs
 }
diff --git a/media-libs/opencolorio/patches/opencolorio-1.0.9.patchset b/media-libs/opencolorio/patches/opencolorio-1.0.9.patchset
deleted file mode 100644
index 81c9d9d94..000000000
--- a/media-libs/opencolorio/patches/opencolorio-1.0.9.patchset
+++ /dev/null
@@ -1,22 +0,0 @@
-From 69b86d964400423fdffb4fb181f78f4ca2ad4799 Mon Sep 17 00:00:00 2001
-From: Jerome Duval <jerome.duval@gmail.com>
-Date: Mon, 8 Jun 2015 18:48:52 +0000
-Subject: Haiku patch
-
-
-diff --git a/export/OpenColorIO/OpenColorABI.h.in b/export/OpenColorIO/OpenColorABI.h.in
-index 28e8006..5f10e50 100644
---- a/export/OpenColorIO/OpenColorABI.h.in
-+++ b/export/OpenColorIO/OpenColorABI.h.in
-@@ -65,7 +65,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- 
- // If supported, define OCIOEXPORT, OCIOHIDDEN
- // (used to choose which symbols to export from OpenColorIO)
--#if defined __linux__ || __APPLE__ || __FreeBSD__
-+#if defined __linux__ || __APPLE__ || __FreeBSD__ || __HAIKU__
-     #if __GNUC__ >= 4
-         #define OCIOEXPORT __attribute__ ((visibility("default")))
-         #define OCIOHIDDEN __attribute__ ((visibility("hidden")))
--- 
-1.8.3.4
-
diff --git a/media-libs/opencolorio/patches/opencolorio-1.1.1.patchset b/media-libs/opencolorio/patches/opencolorio-1.1.1.patchset
new file mode 100644
index 000000000..a3008f730
--- /dev/null
+++ b/media-libs/opencolorio/patches/opencolorio-1.1.1.patchset
@@ -0,0 +1,29 @@
+From 0dcabeab3b3e108b9292b137f0fe93874f8cea1e Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Wed, 6 Nov 2019 22:24:49 +0100
+Subject: not needed on Haiku
+
+
+diff --git a/src/core/OCIOYaml.cpp b/src/core/OCIOYaml.cpp
+index 68fcef6..c274a31 100644
+--- a/src/core/OCIOYaml.cpp
++++ b/src/core/OCIOYaml.cpp
+@@ -31,6 +31,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ #include <OpenColorIO/OpenColorIO.h>
+ 
+ #ifndef WIN32
++#ifndef __HAIKU__
+ 
+ // fwd declare yaml-cpp visibility
+ #pragma GCC visibility push(hidden)
+@@ -65,6 +66,7 @@ namespace YAML {
+ }
+ #pragma GCC visibility pop
+ 
++#endif
+ #endif
+ 
+ #ifdef WIN32
+-- 
+2.23.0
+