commit: 7f82dcf755d6676dda0ac065883e93076afc6d84 Author: Bernd Waibel <waebbl <AT> gmail <DOT> com> AuthorDate: Sun Sep 30 19:52:49 2018 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Thu Oct 11 18:42:50 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f82dcf7
media-gfx/openexr_viewers: bump to version 2.3.0 Bug: 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> Closes: https://github.com/gentoo/gentoo/pull/10030 media-gfx/openexr_viewers/Manifest | 1 + .../openexr_viewers-2.3.0-fix-cg-libdir.patch | 13 ++++ .../openexr_viewers-2.3.0-fix-configure.patch | 83 ++++++++++++++++++++++ .../openexr_viewers/openexr_viewers-2.3.0.ebuild | 67 +++++++++++++++++ 4 files changed, 164 insertions(+) diff --git a/media-gfx/openexr_viewers/Manifest b/media-gfx/openexr_viewers/Manifest index 9d883fc660f..7a07e939ae0 100644 --- a/media-gfx/openexr_viewers/Manifest +++ b/media-gfx/openexr_viewers/Manifest @@ -1,3 +1,4 @@ DIST openexr_viewers-2.0.1.tar.gz 495240 BLAKE2B 4cccdcca362c59f77eb73c03c4300e64d2df9456b0108908fac96e0ae5d5c804525f9fe321ac159043b18c05727addb5e318ed0ba002132c3e2a5728256838a5 SHA512 75af19e4a06d31bbb21217bc75a800852d2817dd9d120b879c377316e8aa64f75c49dccbb0d2a4d11d949f48b8fac40249692d1286a77e4812e43b3e8e303235 DIST openexr_viewers-2.1.0.tar.gz 497290 BLAKE2B 15d8c23e8a738788f7aeb896b671a42005569a8cf177fbe193d9dbe4df418302be2beabc86344a88137a3a0e6b7b8bbfd66ec213882e52d4df5788157e182163 SHA512 fd3b08ad91b1b2299d01d56c7a17694538fd912302db3472a8d8621b49a699a42604de8d816288399b31207304c7684de198acecd2c8a9825d35b827b8a2ddaf DIST openexr_viewers-2.2.0.tar.gz 486235 BLAKE2B db1ebc95dfb7d5b9b1ead3cd3d1eeb4406e4ad5704c90b080d3929c7dea7a2be631e74e2cb597803f55e05783fda43fdb33edc64ba63522d31122f96a4675608 SHA512 ab2f15d0352fa4e9daf76c7317312dad6cfe7b65a86affaf057c8eceb48d2637fc0df58125ea2ec5ad3b7251eed392a8eccff1001cfeced969bbb66fe92284f8 +DIST openexr_viewers-2.3.0.tar.gz 532154 BLAKE2B 353c69a6efbdab6ef7669f531be22b34c11cce3cc790b513eb99d323fc5e1827cb4b0656eab2db61ee89f01c02169c3c855cc4222275964156f31928ae08e015 SHA512 2b7ce7c75733f390bec5c3f9c49edc08da2631e3a45ae20a732dddf9fd813137c3124d0c6e90450fa2b9068f0c40c76374ee7ff9cf0d8697080b2b180c624c5d diff --git a/media-gfx/openexr_viewers/files/openexr_viewers-2.3.0-fix-cg-libdir.patch b/media-gfx/openexr_viewers/files/openexr_viewers-2.3.0-fix-cg-libdir.patch new file mode 100644 index 00000000000..1c3ef1a5923 --- /dev/null +++ b/media-gfx/openexr_viewers/files/openexr_viewers-2.3.0-fix-cg-libdir.patch @@ -0,0 +1,13 @@ +diff --git a/m4/path.cb.m4 b/m4/path.cb.m4 +index 7e38708..832b96c 100644 +--- a/m4/path.cb.m4 ++++ b/m4/path.cb.m4 +@@ -12,7 +12,7 @@ AC_ARG_WITH(cg-prefix,[ --with-cg-prefix=PFX Prefix where Cg is installed (opt + + if test x$cg_prefix != x ; then + CG_CXXFLAGS="-I$cg_prefix/include" +- CG_LDFLAGS="-L$cg_prefix/lib -lGL -lCg -lCgGL -lGLU -lpthread -lglut" ++ CG_LDFLAGS="-L$cg_prefix/lib64 -lGL -lCg -lCgGL -lGLU -lpthread -lglut" + else + case $host_os in + darwin*) diff --git a/media-gfx/openexr_viewers/files/openexr_viewers-2.3.0-fix-configure.patch b/media-gfx/openexr_viewers/files/openexr_viewers-2.3.0-fix-configure.patch new file mode 100644 index 00000000000..f9d51d5045b --- /dev/null +++ b/media-gfx/openexr_viewers/files/openexr_viewers-2.3.0-fix-configure.patch @@ -0,0 +1,83 @@ +diff --git a/configure.ac b/configure.ac +index 0ae7531..f2cdfee 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -4,8 +4,7 @@ AC_SUBST(OPENEXR_VIEWERS_VERSION, 2.3.0) + AC_CANONICAL_HOST + AC_CONFIG_SRCDIR(playexr/main.cpp) + AM_CONFIG_HEADER(config/OpenEXR_ViewersConfig.h) +-AM_INIT_AUTOMAKE(1.6.3) dnl Require automake 1.6.3 or better +-AM_MAINTAINER_MODE ++AM_INIT_AUTOMAKE + + + LIBTOOL_CURRENT=24 +@@ -19,7 +18,7 @@ AC_PROG_CXX + AC_PROG_INSTALL + AC_PROG_CC + AC_PROG_LN_S +-AC_PROG_LIBTOOL ++LT_INIT + AC_PROG_MAKE_SET + + dnl +@@ -124,19 +109,8 @@ AC_ARG_ENABLE(threading, + [multithread="${enableval}"], [multithread=yes]) + + if test x$PKG_CONFIG == xno && test "x${multithread}" != xno ; then +- ACX_PTHREAD( +- [ +- AC_DEFINE(HAVE_PTHREAD) +- OPENEXR_LIBS="$PTHREAD_LIBS $OPENEXR_LIBS" +- OPENEXR_CXXFLAGS="$OPENEXR_CXXFLAGS $PTHREAD_CFLAGS" +- OPENEXR_CTL_LIBS="$PTHREAD_LIBS $OPENEXR_CTL_LIBS" +- OPENEXR_CTL_CXXFLAGS="$OPENEXR_CTL_CXXFLAGS $PTHREAD_CFLAGS" +- CC="$PTHREAD_CC" +- +- AM_POSIX_SEM() +- ], +- [AC_MSG_ERROR([POSIX thread support required])]) +- AC_MSG_NOTICE([multithread true, LIBS = $LIBS, CC = $CC, CXXFLAGS = $CXXFLAGS]) ++ AX_PTHREAD ++ AC_DEFINE([HAVE_PTHREAD], [1], [define if POSIX thread support is available]) + fi + + +@@ -233,10 +155,13 @@ AM_PATH_FLTK(have_fltk=yes, have_fltk=no) + dnl + dnl check for Cg + dnl +-if test "${have_fltk}" = yes; then ++AC_ARG_ENABLE(cg, AS_HELP_STRING([--enable-cg], ++ [enable nvidia cg support [[default: test]]]), [want_cg="${enableval}"], [want_cg=yes]) ++ ++if test "${have_fltk}" = yes -a "${want_cg}" != no; then + AM_PATH_CG(have_cg=yes, have_cg=no) + if test "${have_cg}" = yes; then +- AC_DEFINE(HAVE_FRAGMENT_SHADERS) ++ AC_DEFINE([HAVE_FRAGMENT_SHADERS], [1], [define if Cg support is available]) + fi + else have_cg=no + fi +@@ -251,20 +176,10 @@ AC_C_CONST + AC_C_INLINE + AC_TYPE_SIZE_T + +-dnl gcc optimization +-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 Platform-specific stuff + case "$host" in + *darwin*) +- AC_DEFINE(HAVE_DARWIN) ++ AC_DEFINE([HAVE_DARWIN], [1], [define if compiling on darwin platform (OSX)]) + + dnl OS X universal binary support, requires --disable-dependency-tracking + AC_ARG_ENABLE(osx-universal-binaries, diff --git a/media-gfx/openexr_viewers/openexr_viewers-2.3.0.ebuild b/media-gfx/openexr_viewers/openexr_viewers-2.3.0.ebuild new file mode 100644 index 00000000000..e7eaf9ca077 --- /dev/null +++ b/media-gfx/openexr_viewers/openexr_viewers-2.3.0.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools flag-o-matic + +DESCRIPTION="OpenEXR Viewers" +HOMEPAGE="http://openexr.com/"; +SRC_URI="https://github.com/openexr/openexr/releases/download/v${PV}/${P}.tar.gz"; + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="cg" + +RDEPEND=" + ~media-libs/ilmbase-${PV}:= + ~media-libs/openexr-${PV}:= + virtual/opengl + x11-libs/fltk:1[opengl] + cg? ( media-gfx/nvidia-cg-toolkit ) +" + +DEPEND=" + ${RDEPEND} + virtual/pkgconfig +" + +DOCS=( ChangeLog README.md ) + +PATCHES=( + "${FILESDIR}/${P}-fix-configure.patch" + "${FILESDIR}/${P}-fix-cg-libdir.patch" +) + +src_prepare() { + default + sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die + eautoreconf +} + +src_configure() { + local myeconfargs=( + --disable-openexrctltest + --with-fltk-config="/usr/bin/fltk-config" + ) + + if use cg; then + myeconfargs+=( + --enable-cg + --with-cg-prefix="/opt/nvidia-cg-toolkit" + ) + append-ldflags "$(no-as-needed)" # binary-only libCg is not properly linked + fi + + econf "${myeconfargs[@]}" +} + +src_install() { + emake \ + DESTDIR="${D}" \ + docdir=/usr/share/doc/${PF}/pdf \ + install + + einstalldocs +}
