commit:     f5897ec5bfe99fb0f29ec7a021771e0c0d2c4b68
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun Apr  7 10:31:34 2019 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Apr  7 10:31:50 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5897ec5

media-libs/ctl: Fix compat with newer openexr

Closes: https://bugs.gentoo.org/668454
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>

 media-libs/ctl/ctl-1.5.2-r1.ebuild               |  7 +++++--
 media-libs/ctl/files/ctl-1.5.2-openexr-2.3.patch | 13 +++++++++++++
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/media-libs/ctl/ctl-1.5.2-r1.ebuild 
b/media-libs/ctl/ctl-1.5.2-r1.ebuild
index 55acc2744c9..07a248ff7ba 100644
--- a/media-libs/ctl/ctl-1.5.2-r1.ebuild
+++ b/media-libs/ctl/ctl-1.5.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,6 +22,9 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/CTL-ctl-${PV}"
 
-PATCHES=( 
"${FILESDIR}/${P}-Use-GNUInstallDirs-and-fix-PkgConfig-files-1.patch" )
+PATCHES=(
+       "${FILESDIR}/${P}-Use-GNUInstallDirs-and-fix-PkgConfig-files-1.patch"
+       "${FILESDIR}/${P}-openexr-2.3.patch"
+)
 
 mycmakeargs=( -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}" )

diff --git a/media-libs/ctl/files/ctl-1.5.2-openexr-2.3.patch 
b/media-libs/ctl/files/ctl-1.5.2-openexr-2.3.patch
new file mode 100644
index 00000000000..ac4ceb3e548
--- /dev/null
+++ b/media-libs/ctl/files/ctl-1.5.2-openexr-2.3.patch
@@ -0,0 +1,13 @@
+Index: CTL-ctl-1.5.2/lib/IlmCtlSimd/CtlSimdInst.cpp
+===================================================================
+--- CTL-ctl-1.5.2.orig/lib/IlmCtlSimd/CtlSimdInst.cpp
++++ CTL-ctl-1.5.2/lib/IlmCtlSimd/CtlSimdInst.cpp
+@@ -189,7 +189,7 @@ SimdInst::executePath (SimdBoolMask &mas
+           REPLACE_EXC
+               (e, "\n" <<
+                xcontext.fileName() << ":" <<
+-               inst->lineNumber() << ": " << e);
++               inst->lineNumber() << ": " << e.what());
+ 
+           throw e;
+       }

Reply via email to