Fix missing -pthread with OpenEXR 2.x. The file it's checking if -pthread is required or not, doesn't exist anymore in OpenEXR 2.x.

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

3 files changed, 45 insertions, 2 deletions

diff --git a/media-libs/openimageio/ChangeLog b/media-libs/openimageio/ChangeLog
index 004e5eca6bdd..db553ae3503d 100644
--- a/media-libs/openimageio/ChangeLog
+++ b/media-libs/openimageio/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/openimageio
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/openimageio/ChangeLog,v 1.26 2014/01/24 21:46:13 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openimageio/ChangeLog,v 1.27 2014/02/17 06:41:48 ssuominen Exp $
+
+  17 Feb 2014; Samuli Suominen <ssuominen@gentoo.org>
+  +files/openimageio-1.3.5-openexr-2.x.patch, openimageio-1.3.5.ebuild:
+  Fix missing -pthread with OpenEXR 2.x. The file it's checking if -pthread is
+  required or not, doesn't exist anymore in OpenEXR 2.x.
 
   24 Jan 2014; Andreas K. Huettel <dilfridge@gentoo.org>
   openimageio-1.1.1.ebuild, openimageio-1.1.7.ebuild, openimageio-1.3.5.ebuild:
diff --git a/media-libs/openimageio/files/openimageio-1.3.5-openexr-2.x.patch b/media-libs/openimageio/files/openimageio-1.3.5-openexr-2.x.patch
new file mode 100644
index 000000000000..0668f0466a9a
--- /dev/null
+++ b/media-libs/openimageio/files/openimageio-1.3.5-openexr-2.x.patch
@@ -0,0 +1,36 @@
+There is no IlmBaseConfig.h in OpenEXR 2.x
+
+../libOpenImageIO/libOpenImageIO.so.1.3.5: error: undefined reference to 'pthread_mutexattr_init'
+../libOpenImageIO/libOpenImageIO.so.1.3.5: error: undefined reference to 'pthread_mutexattr_settype'
+../libOpenImageIO/libOpenImageIO.so.1.3.5: error: undefined reference to 'pthread_mutexattr_destroy'
+../libOpenImageIO/libOpenImageIO.so.1.3.5: error: undefined reference to 'pthread_spin_lock'
+../libOpenImageIO/libOpenImageIO.so.1.3.5: error: undefined reference to 'pthread_spin_unlock'
+../libOpenImageIO/libOpenImageIO.so.1.3.5: error: undefined reference to 'pthread_spin_destroy'
+../libOpenImageIO/libOpenImageIO.so.1.3.5: error: undefined reference to 'pthread_spin_init'
+../libOpenImageIO/libOpenImageIO.so.1.3.5: error: undefined reference to 'pthread_detach'
+
+--- src/cmake/modules/FindIlmBase.cmake
++++ src/cmake/modules/FindIlmBase.cmake
+@@ -176,17 +176,11 @@
+ set (ILMBASE_CACHED_STATE ${ILMBASE_CURRENT_STATE}
+   CACHE INTERNAL "State last seen by FindIlmBase.cmake" FORCE)
+ 
+-# Link with pthreads if required
+-if (NOT WIN32 AND EXISTS ${ILMBASE_INCLUDE_DIR}/OpenEXR/IlmBaseConfig.h)
+-  file (STRINGS ${ILMBASE_INCLUDE_DIR}/OpenEXR/IlmBaseConfig.h
+-    ILMBASE_HAVE_PTHREAD
+-    REGEX "^[ \\t]*#define[ \\t]+HAVE_PTHREAD[ \\t]1[ \\t]*\$"
+-  )
+-  if (ILMBASE_HAVE_PTHREAD)
+-    find_package (Threads)
+-    if (CMAKE_USE_PTHREADS_INIT)
+-      set (ILMBASE_PTHREADS ${CMAKE_THREAD_LIBS_INIT})
+-    endif ()
++# Always link to pthreads for OpenEXR 2.x
++if (NOT WIN32)
++  find_package (Threads)
++  if (CMAKE_USE_PTHREADS_INIT)
++    set (ILMBASE_PTHREADS ${CMAKE_THREAD_LIBS_INIT})
+   endif ()
+ endif ()
+ 
diff --git a/media-libs/openimageio/openimageio-1.3.5.ebuild b/media-libs/openimageio/openimageio-1.3.5.ebuild
index e35dac43f18e..294473ff9105 100644
--- a/media-libs/openimageio/openimageio-1.3.5.ebuild
+++ b/media-libs/openimageio/openimageio-1.3.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/openimageio/openimageio-1.3.5.ebuild,v 1.2 2014/01/24 21:46:13 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openimageio/openimageio-1.3.5.ebuild,v 1.3 2014/02/17 06:41:48 ssuominen Exp $
 
 EAPI=5
 
@@ -59,6 +59,8 @@ pkg_setup() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-openexr-2.x.patch
+
 	# remove bundled code to make it build
 	# https://github.com/OpenImageIO/oiio/issues/403
 	rm */pugixml* || die