diff options
Diffstat (limited to 'media-libs/openimageio/files')
| -rw-r--r-- | media-libs/openimageio/files/openimageio-1.1.1-x86-build.patch | 15 | ||||
| -rw-r--r-- | media-libs/openimageio/files/openimageio-1.3.5-openexr-2.x.patch | 36 |
2 files changed, 51 insertions, 0 deletions
diff --git a/media-libs/openimageio/files/openimageio-1.1.1-x86-build.patch b/media-libs/openimageio/files/openimageio-1.1.1-x86-build.patch new file mode 100644 index 00000000000..59821660cc8 --- /dev/null +++ b/media-libs/openimageio/files/openimageio-1.1.1-x86-build.patch @@ -0,0 +1,15 @@ +http://bugs.gentoo.org/444784 + +--- src/libutil/SHA1.cpp ++++ src/libutil/SHA1.cpp +@@ -8,9 +8,9 @@ + + // If compiling with MFC, you might want to add #include "StdAfx.h" + ++#include "SHA1.h" + #include "hash.h" + #include "dassert.h" +-#include "SHA1.h" + + #ifdef SHA1_UTILITY_FUNCTIONS + #define SHA1_MAX_FILE_BUFFER 8000 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 00000000000..0668f0466a9 --- /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 () + |