diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-10-22 11:09:47 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-10-22 11:09:47 +0100 |
| commit | 64e107b9b6058580ff0432107eb37cefb0b2a7d8 (patch) | |
| tree | 9a44e603e2ae365e2b1fe35ac37f73e830cdee1d /media-libs/openexr/files | |
| parent | 957235cf19a691360c720f7913672adda4258ed0 (diff) | |
gentoo resync : 22.10.2018
Diffstat (limited to 'media-libs/openexr/files')
| -rw-r--r-- | media-libs/openexr/files/openexr-1.7.0-gcc43.patch | 11 | ||||
| -rw-r--r-- | media-libs/openexr/files/openexr-2.3.0-fix-build-system.patch | 68 |
2 files changed, 68 insertions, 11 deletions
diff --git a/media-libs/openexr/files/openexr-1.7.0-gcc43.patch b/media-libs/openexr/files/openexr-1.7.0-gcc43.patch deleted file mode 100644 index ab99eb9a19fb..000000000000 --- a/media-libs/openexr/files/openexr-1.7.0-gcc43.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- exrenvmap/blurImage.cpp -+++ exrenvmap/blurImage.cpp -@@ -39,6 +39,8 @@ - // - //----------------------------------------------------------------------------- - -+#include <cstring> -+ - #include <blurImage.h> - - #include <resizeImage.h> diff --git a/media-libs/openexr/files/openexr-2.3.0-fix-build-system.patch b/media-libs/openexr/files/openexr-2.3.0-fix-build-system.patch new file mode 100644 index 000000000000..811a7af38758 --- /dev/null +++ b/media-libs/openexr/files/openexr-2.3.0-fix-build-system.patch @@ -0,0 +1,68 @@ +diff --git a/configure.ac b/configure.ac +index 067f9d0..fdbe2f8 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -13,8 +13,7 @@ AC_SUBST(OPENEXR_VERSION_API, ${OPENEXR_VERSION_MAJOR}_${OPENEXR_VERSION_MINOR}) + AC_CANONICAL_HOST + AC_CONFIG_SRCDIR(IlmImfTest/main.cpp) + AC_CONFIG_HEADERS([config/OpenEXRConfig.h]) +-AM_INIT_AUTOMAKE(1.6.3) dnl Require automake 1.6.3 or better +-AM_MAINTAINER_MODE ++AM_INIT_AUTOMAKE + + + LIBTOOL_CURRENT=24 +@@ -28,7 +27,7 @@ AC_PROG_CXX + AC_PROG_INSTALL + AC_PROG_CC + AC_PROG_LN_S +-AC_PROG_LIBTOOL ++LT_INIT + AC_PROG_MAKE_SET + + dnl +@@ -58,8 +57,8 @@ AM_PATH_PKGCONFIG( + [ILMBASE]) + + dnl Define the version string +-AC_DEFINE_UNQUOTED([OPENEXR_VERSION_STRING], "${VERSION}", [OpenEXR version string]) +-AC_DEFINE_UNQUOTED([OPENEXR_PACKAGE_STRING], "${PACKAGE_STRING}", [OpenEXR version string]) ++AC_DEFINE_UNQUOTED([OPENEXR_VERSION_STRING], ["${VERSION}"], [OpenEXR version string]) ++AC_DEFINE_UNQUOTED([OPENEXR_PACKAGE_STRING], ["${PACKAGE_STRING}"], [OpenEXR version string]) + AC_DEFINE_UNQUOTED([OPENEXR_VERSION_MAJOR], [${OPENEXR_VERSION_MAJOR}], [OpenEXR version string]) + AC_DEFINE_UNQUOTED([OPENEXR_VERSION_MINOR], [${OPENEXR_VERSION_MINOR}], [OpenEXR version string]) + AC_DEFINE_UNQUOTED([OPENEXR_VERSION_PATCH], [${OPENEXR_VERSION_PATCH}], [OpenEXR version string]) +@@ -110,16 +109,7 @@ AC_ARG_ENABLE(threading, + [multithread="${enableval}"], [multithread=yes]) + + AS_IF([test "x${multithread}" != xno], [ +- ACX_PTHREAD( +- [ +- AC_DEFINE(OPENEXR_IMF_HAVE_PTHREAD) +- ILMBASE_LIBS="$PTHREAD_LIBS $ILMBASE_LIBS" +- ILMBASE_CXXFLAGS="$ILMBASE_CXXFLAGS $PTHREAD_CFLAGS" +- CC="$PTHREAD_CC" +- +- AM_POSIX_SEM() +- ], +- [AC_MSG_ERROR([POSIX thread support required])]) ++ AX_PTHREAD + + AC_DEFINE([OPENEXR_IMF_HAVE_PTHREAD], [1], [Define if pthreads are available]) + +@@ -195,15 +185,6 @@ dnl AC_MSG_RESULT($complete_iomanip) + dnl AC_LANG_RESTORE + AC_DEFINE([OPENEXR_IMF_HAVE_COMPLETE_IOMANIP], [1], [Define when std::right is available]) + +-AC_MSG_CHECKING(for gcc optimization flags) +-old_cflags=$CFLAGS +-CFLAGS="$CFLAGS -pipe" +-AC_TRY_COMPILE([#include <stdio.h>], +-[ printf ("hello, world"); ], +-[ EXTRA_OPT_CFLAGS="-pipe"],[ EXTRA_OPT_CFLAGS=""]) +-CFLAGS=$old_cflags +-AC_MSG_RESULT([$EXTRA_OPT_CFLAGS]) +- + + dnl Check to see if the toolset supports AVX instructions in inline asm + AC_ARG_ENABLE([avx], |