commit: 086e36c12dff193371ce5fe3e54fb9058f1e9d52 Author: Bernd Waibel <waebbl <AT> gmail <DOT> com> AuthorDate: Sun Sep 30 19:45:39 2018 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Thu Oct 11 18:42:49 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=086e36c1
media-libs/openexr: bump to version 2.3.0 Closes: https://bugs.gentoo.org/639998 Suggested-by: Jonathan Scruggs <dracwyrm <AT> gentoo.org> Signed-off-by: Bernd Waibel <waebbl <AT> gmail.com> Package-Manager: Portage-2.3.49, Repoman-2.3.10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> media-libs/openexr/Manifest | 1 + .../files/openexr-2.3.0-fix-build-system.patch | 68 +++++++++++++++++++++ media-libs/openexr/openexr-2.3.0.ebuild | 71 ++++++++++++++++++++++ 3 files changed, 140 insertions(+) diff --git a/media-libs/openexr/Manifest b/media-libs/openexr/Manifest index 12cf82682b5..dee477215a0 100644 --- a/media-libs/openexr/Manifest +++ b/media-libs/openexr/Manifest @@ -2,3 +2,4 @@ DIST openexr-1.7.0.tar.gz 13542910 BLAKE2B f187aa1b7c703bc912bfc87eb6f9d44f1ed08 DIST openexr-2.0.1.tar.gz 12609335 BLAKE2B 25adcf5a679a0419a7ff0ddd29d4d1c5f1c28cd3fd6c81b0a5c0cc63d907e741eaea378f4ebaa9a66afce0349edf7231ebd2bb3e493aee484860c89f05f45960 SHA512 b35e3e795496f9d4a56352c907bcffef14ae062b189c4e1df35f3ab08c5e9abf829fa9149db3198d60088fa9633816650011e5f7871e07324801b95549d6695b DIST openexr-2.1.0.tar.gz 13680816 BLAKE2B 2d3cb4e0419160b07f1efe9a853f1d5deeb0499da4f79da201fc5eb1f57102891da666e161b2d8ec43a6f0b6ff6f5c7b92c2baae51a808892691182290192992 SHA512 d69924331c3392b8063229391414bb90f16ce317c76cfffe5fe0fcbb25e576f6ace8320b51c2a9987fee912cedd8e69116d4b49ba716b4a5f011131a81815403 DIST openexr-2.2.0.tar.gz 14489661 BLAKE2B fae3c5a255e8bf5121561687e9d704d7de3657eb38295ff96db6ddad240391379a6624483abbe619f80f0979fd9828992d236e55b5014916d4d39d6ff51d0815 SHA512 017abbeeb6b814508180721bc8e8940094965c4c55b135a198c6bcb109a04bf7f72e4aee81ee72cb2185fe818a41d892b383e8d2d59f40c673198948cb79279a +DIST openexr-2.3.0.tar.gz 18412067 BLAKE2B c73c4db4e414010ed8cc9f9631f3e8b17f47edf89b4ecb459aa00ff54a316b3bb1489e332bc029e0917ac4ffe7e152082244102029fd375f183da6741788dab7 SHA512 003f5bb3bd010be1ad9ff1798643ef711c683c8191625fe9b59070c9cb0c649c277cd506d890c6b239d9cbab80e83e16f1c1d1d74117c916ee3a80e061953123 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 00000000000..811a7af3875 --- /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], diff --git a/media-libs/openexr/openexr-2.3.0.ebuild b/media-libs/openexr/openexr-2.3.0.ebuild new file mode 100644 index 00000000000..99f63d05e1f --- /dev/null +++ b/media-libs/openexr/openexr-2.3.0.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools flag-o-matic toolchain-funcs multilib-minimal + +DESCRIPTION="ILM's OpenEXR high dynamic-range image file format libraries" +HOMEPAGE="http://openexr.com/"; +SRC_URI="https://github.com/openexr/openexr/releases/download/v${PV}/${P}.tar.gz"; + +LICENSE="BSD" +SLOT="0/24" # based on SONAME +KEYWORDS="~amd64 -arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris" +IUSE="cpu_flags_x86_avx examples static-libs" + +RDEPEND=" + >=media-libs/ilmbase-${PV}:=[${MULTILIB_USEDEP}] + sys-libs/zlib[${MULTILIB_USEDEP}] +" +DEPEND="${RDEPEND} + >=sys-devel/autoconf-archive-2016.09.16 + virtual/pkgconfig[${MULTILIB_USEDEP}] +" + +DOCS=( AUTHORS ChangeLog NEWS README.md ) +MULTILIB_WRAPPED_HEADERS=( /usr/include/OpenEXR/OpenEXRConfig.h ) + +PATCHES=( + "${FILESDIR}/${PN}-2.2.0-fix-cpuid-on-abi_x86_32.patch" + "${FILESDIR}/${PN}-2.2.0-fix-config.h-collision.patch" + "${FILESDIR}/${PN}-2.2.0-Install-missing-header-files.patch" + "${FILESDIR}/${P}-fix-build-system.patch" +) + +src_prepare() { + default + # Fix path for testsuite + sed -i -e "s:/var/tmp/:${T}:" IlmImfTest/tmpDir.h || die + eautoreconf +} + +multilib_src_configure() { + local myeconfargs=( + --disable-imffuzztest + --disable-imfhugetest + --enable-threading + $(use_enable cpu_flags_x86_avx avx) + $(use_enable examples imfexamples) + $(use_enable static-libs static) + ) + + # TODO: check if this still applies on updates! + # internal tool dwaLookup fails to run when linked with gold linker + tc-ld-disable-gold + + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} + +multilib_src_install_all() { + einstalldocs + + if use examples; then + docompress -x /usr/share/doc/${PF}/examples + else + rm -rf "${ED%/}"/usr/share/doc/${PF}/examples || die + fi + + # package provides .pc files + find "${D}" -name '*.la' -delete || die +}
