diff --git a/common/shlibs b/common/shlibs
index aebde6d7d26..c506393cb87 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2021,8 +2021,8 @@ libtoxav.so.0 toxcore-git-20150604_1
 libgom-1.0.so.0 gom-0.3.0_1
 libetpan.so.20 libetpan-1.7.2_1
 libxmp.so.4 libxmp-4.3.7_1
-libOpenImageIO_Util.so.1.6 openimageio-1.6.12_1
-libOpenImageIO.so.1.6 openimageio-1.6.12_1
+libOpenImageIO_Util.so.1.7 openimageio-1.7.7_1
+libOpenImageIO.so.1.7 openimageio-1.7.7_1
 libOpenColorIO.so.1 opencolorio-1.0.8_1
 libyaml-cpp.so.0.5 yaml-cpp-0.5.2_1
 libpaper.so.1 libpaper-1.1.24_1
diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index f4536370d84..31878e2bfd3 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
 # Template file for 'blender'
 pkgname=blender
 version=2.78
-revision=1
+revision=2
 build_style="cmake"
 makedepends="
  libgomp-devel libpng-devel tiff-devel python3.5-devel glu-devel
diff --git a/srcpkgs/luxmark/template b/srcpkgs/luxmark/template
index ec45a741a9f..98720aac797 100644
--- a/srcpkgs/luxmark/template
+++ b/srcpkgs/luxmark/template
@@ -1,10 +1,12 @@
 # Template file for 'luxmark'
 pkgname=luxmark
 version=3.1
-revision=3
+revision=4
 build_style=cmake
 hostmakedepends="cmake"
-makedepends="openimageio-devel tiff-devel libpng-devel libgomp-devel libopenexr-devel MesaLib-devel ocl-icd-devel opencl-headers boost-devel python-devel luxrays-devel glew-devel libfreeglut-devel qt-devel"
+makedepends="openimageio-devel tiff-devel libpng-devel libgomp-devel
+ libopenexr-devel MesaLib-devel ocl-icd-devel opencl-headers boost-devel
+ python-devel luxrays-devel glew-devel libfreeglut-devel qt-devel opencl-clhpp"
 short_desc="OpenCL benchmark based on LuxCore"
 maintainer="Andrea Brancaleoni <miwaxe@gmail.com>"
 license="GPL-3"
diff --git a/srcpkgs/luxrays/template b/srcpkgs/luxrays/template
index 117ec9c958e..06c400a4c6b 100644
--- a/srcpkgs/luxrays/template
+++ b/srcpkgs/luxrays/template
@@ -1,7 +1,7 @@
 # Template file for 'luxrays'
 pkgname=luxrays
 version=3.1
-revision=3
+revision=4
 build_style=cmake
 hostmakedepends="cmake flex bison boost-python"
 makedepends="openimageio-devel tiff-devel libpng-devel libgomp-devel boost-devel glew-devel opencl-headers libopenexr-devel python-devel libfreeglut-devel embree-devel"
diff --git a/srcpkgs/opencl-clhpp/files/LICENSE.txt b/srcpkgs/opencl-clhpp/files/LICENSE.txt
new file mode 100644
index 00000000000..e022241b4aa
--- /dev/null
+++ b/srcpkgs/opencl-clhpp/files/LICENSE.txt
@@ -0,0 +1,25 @@
+Copyright (c) 2008-2015 The Khronos Group Inc.
+ 
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and/or associated documentation files (the
+"Materials"), to deal in the Materials without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Materials, and to
+permit persons to whom the Materials are furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Materials.
+
+MODIFICATIONS TO THIS FILE MAY MEAN IT NO LONGER ACCURATELY REFLECTS
+KHRONOS STANDARDS. THE UNMODIFIED, NORMATIVE VERSIONS OF KHRONOS
+SPECIFICATIONS AND HEADER INFORMATION ARE LOCATED AT
+    https://www.khronos.org/registry/
+
+THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
diff --git a/srcpkgs/opencl-clhpp/template b/srcpkgs/opencl-clhpp/template
new file mode 100644
index 00000000000..03bda3c21fd
--- /dev/null
+++ b/srcpkgs/opencl-clhpp/template
@@ -0,0 +1,28 @@
+# Template file for 'OpenCL-CLHPP'
+pkgname=opencl-clhpp
+version=2.0.10
+revision=1
+wrksrc=OpenCL-CLHPP-${version}
+noarch="yes"
+hostmakedepends="python"
+short_desc="OpenCL Host API C++ bindings (cl.hpp and cl2.hpp)"
+maintainer="lemmi <lemmi@nerd2nerd.org>"
+license="MIT"
+homepage="http://www.khronos.org/registry/cl/"
+distfiles="https://github.com/KhronosGroup/OpenCL-CLHPP/archive/v2.0.10.tar.gz"
+checksum=fa27456295c3fa534ce824eb0314190a8b3ebd3ba4d93a0b1270fc65bf378f2b
+
+do_build() {
+	python gen_cl_hpp.py -i input_cl.hpp -o cl.hpp
+}
+
+do_install() {
+	vmkdir usr/include/CL
+	install -m644 cl.hpp ${DESTDIR}/usr/include/CL
+	install -m644 input_cl2.hpp ${DESTDIR}/usr/include/CL/cl2.hpp
+
+	# LICENSE.txt from git master. Check on next update whether it can be
+	# removed again
+	
+	vlicense ${FILESDIR}/LICENSE.txt
+}
diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index a937ac13b86..8eb6a757f2a 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,7 +1,7 @@
 # Template file for 'openimageio'
 pkgname=openimageio
-version=1.6.17
-revision=2
+version=1.7.7
+revision=1
 wrksrc=oiio-Release-${version}
 build_style=cmake
 configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=0"
@@ -17,7 +17,7 @@ maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="BSD"
 homepage="https://sites.google.com/site/openimageio/home"
 distfiles="https://github.com/OpenImageIO/oiio/archive/Release-${version}.tar.gz"
-checksum=632fc1e54c882c024bf3ed50b57358af5eade9ca10c3659c0ab5477aae009bb2
+checksum=1c006765d153d1c56806e78a83ece330f7905209ecf0f5d3c3b52d77a328345a
 nocross=yes # -> ilmbase
 
 pre_build() {