graphics-libs/opencolorio: version 1.1.1

6 files changed, 43 insertions, 4 deletions

diff --git a/graphics-libs/opencolorio/0001-fix-build-error-with-newer-versions-of-mesa.patch b/graphics-libs/opencolorio/0001-fix-build-error-with-newer-versions-of-mesa.patch
new file mode 100644
index 0000000000..0c06ed149f
--- /dev/null
+++ b/graphics-libs/opencolorio/0001-fix-build-error-with-newer-versions-of-mesa.patch
@@ -0,0 +1,24 @@
+From 8c479ed9ca7490fa5e5620aabf610ba3e0beb3fc Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <bwlf@bandrate.org>
+Date: Sun, 30 Jun 2019 13:17:34 +0200
+Subject: [PATCH] fix build error with newer versions of mesa
+
+---
+ src/apps/ociodisplay/main.cpp | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/apps/ociodisplay/main.cpp b/src/apps/ociodisplay/main.cpp
+index f8184ad..c29f03f 100644
+--- a/src/apps/ociodisplay/main.cpp
++++ b/src/apps/ociodisplay/main.cpp
+@@ -56,7 +56,6 @@ namespace OCIO = OCIO_NAMESPACE;
+ #else
+ #include <GL/glew.h>
+ #include <GL/gl.h>
+-#include <GL/glext.h>
+ #include <GL/glut.h>
+ #endif
+ 
+-- 
+2.22.0
+
diff --git a/graphics-libs/opencolorio/BUILD b/graphics-libs/opencolorio/BUILD
index e013b8d866..cfba1bcdf0 100755
--- a/graphics-libs/opencolorio/BUILD
+++ b/graphics-libs/opencolorio/BUILD
@@ -1 +1,5 @@
+OPTS="-DUSE_EXTERNAL_TINYXML=off $OPTS" &&
+CFLAGS="-Wno-error=deprecated-declarations -Wno-error=cast-function-type -Wno-error=unused-function $CFLAGS" &&
+CXXFLAGS="-Wno-error=deprecated-declarations -Wno-error=cast-function-type -Wno-error=unused-function $CXXFLAGS" &&
+
 cmake_build
diff --git a/graphics-libs/opencolorio/DEPENDS b/graphics-libs/opencolorio/DEPENDS
index 9a1a24f0b9..5f3344808c 100755
--- a/graphics-libs/opencolorio/DEPENDS
+++ b/graphics-libs/opencolorio/DEPENDS
@@ -1,7 +1,8 @@
 depends cmake        &&
 depends -sub CXX gcc &&
-depends tinyxml "-DUSE_EXTERNAL_TINYXML=on" &&
+
 depends lcms2   "-DUSE_EXTERNAL_LCMS=on"    &&
+
 optional_depends python \
                  "" \
                  "" \
diff --git a/graphics-libs/opencolorio/DETAILS b/graphics-libs/opencolorio/DETAILS
index d700950abd..7830a68d6b 100755
--- a/graphics-libs/opencolorio/DETAILS
+++ b/graphics-libs/opencolorio/DETAILS
@@ -1,9 +1,9 @@
            SPELL=opencolorio
-         VERSION=1.0.9
-        XVERSION=2b12063
+         VERSION=1.1.1
+        XVERSION=ebdec41
           SOURCE="opencolorio-${VERSION}.tar.gz"
    SOURCE_URL[0]=http://github.com/imageworks/OpenColorIO/tarball/v${VERSION}
-     SOURCE_HASH=sha512:a3b33949061d16a0e3648c9206291771b9e7532ce56727fe9d323ca15d88e24baf649657286139e1568d5c3564d2b8258d4c3442b3350245f8d2556dc2f1f5d2
+     SOURCE_HASH=sha512:3f5cdb32adcaf6adf064a9b4c219b7661922f09fcaf5818bbbba7104a73af1a91075ae6a0f94f75b5b94dc8705f0e2bbc66f4f52067f67ae8b947cfef599ea22
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/imageworks-OpenColorIO-${XVERSION}"
         WEB_SITE="http://opencolorio.org/index.html"
       LICENSE[0]=BSD
diff --git a/graphics-libs/opencolorio/HISTORY b/graphics-libs/opencolorio/HISTORY
index b469bf97f6..a07f49aa30 100644
--- a/graphics-libs/opencolorio/HISTORY
+++ b/graphics-libs/opencolorio/HISTORY
@@ -1,3 +1,8 @@
+2019-06-30 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+	* DETAILS: version 1.1.1
+	* BUILD, DEPENDS, PRE_BUILD, 0001-fix-build-error-with-newer-versions-of-mesa.patch:
+	  fix build errors
+
 2015-05-24 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
 	* DETAILS: version 1.0.9
 
diff --git a/graphics-libs/opencolorio/PRE_BUILD b/graphics-libs/opencolorio/PRE_BUILD
new file mode 100755
index 0000000000..bfc014ed2e
--- /dev/null
+++ b/graphics-libs/opencolorio/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build      &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p1 < "$SPELL_DIRECTORY/0001-fix-build-error-with-newer-versions-of-mesa.patch"
+