[gentoo-commits] repo/gentoo:master commit in: media-gfx/openexr_viewers/files/, media-gfx/openexr_viewers/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     7ae4594e8c806e9e2ab9099834c9d5380c2ce3ce
Author:     Bernd Waibel <waebbl <AT> gmail <DOT> com>
AuthorDate: Thu Oct 18 20:45:29 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Oct 31 18:58:24 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ae4594e

media-gfx/openexr_viewers: fix Cg libdir

* remove files/openexr_viewers-2.3.0-fix-cg-libdir.patch
* add files/openexr_viewers-2.3.0--with-cg-libdir.patch

Addresses an issue, where Cg libraries where not found on 32-bit
arches. The patch adds an option --with-cg-libdir to configure to
pass 32-/64-bit specific libraries of Cg to configure script.

Thanks to Arfrever Frehtes Taifersar Arahesis for reporting the issue.

See also
https://github.com/gentoo/gentoo/pull/10030#pullrequestreview-164522412

Closes: https://bugs.gentoo.org/668754
Signed-off-by: Bernd Waibel <waebbl <AT> gmail.com>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
Closes: https://github.com/gentoo/gentoo/pull/10172
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../openexr_viewers-2.3.0--with-cg-libdir.patch    | 23 ++++++++++++++++++++++
 .../openexr_viewers-2.3.0-fix-cg-libdir.patch      | 13 ------------
 .../openexr_viewers/openexr_viewers-2.3.0.ebuild   |  5 +++--
 3 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/media-gfx/openexr_viewers/files/openexr_viewers-2.3.0--with-cg-libdir.patch b/media-gfx/openexr_viewers/files/openexr_viewers-2.3.0--with-cg-libdir.patch
new file mode 100644
index 00000000000..9d118e362d4
--- /dev/null
+++ b/media-gfx/openexr_viewers/files/openexr_viewers-2.3.0--with-cg-libdir.patch
@@ -0,0 +1,23 @@
+diff --git a/m4/path.cb.m4 b/m4/path.cb.m4
+index 7e38708..b5675b1 100644
+--- a/m4/path.cb.m4
++++ b/m4/path.cb.m4
+@@ -10,9 +10,17 @@ dnl
+ AC_ARG_WITH(cg-prefix,[  --with-cg-prefix=PFX  Prefix where Cg is installed (optional)],
+ 	    cg_prefix="$withval", cg_prefix="")
+ 
++AC_ARG_WITH(cg-libdir, [  --with-cg-libdir=PATH Directory where Cg libraries are installed (optional)],
++	    cg_libdir="$withval", cg_libdir="")
++
+   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"
++    if test x$cg_libdir != x; then
++       CG_LDFLAGS="-L$cg_libdir"
++    else
++       CG_LDFLAGS="-L$cg_prefix/lib"
++    fi
++    CG_LDFLAGS="$CG_LDFLAGS -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-cg-libdir.patch b/media-gfx/openexr_viewers/files/openexr_viewers-2.3.0-fix-cg-libdir.patch
deleted file mode 100644
index 1c3ef1a5923..00000000000
--- a/media-gfx/openexr_viewers/files/openexr_viewers-2.3.0-fix-cg-libdir.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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/openexr_viewers-2.3.0.ebuild b/media-gfx/openexr_viewers/openexr_viewers-2.3.0.ebuild
index e7eaf9ca077..a1981cf42cd 100644
--- a/media-gfx/openexr_viewers/openexr_viewers-2.3.0.ebuild
+++ b/media-gfx/openexr_viewers/openexr_viewers-2.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -31,7 +31,7 @@ DOCS=( ChangeLog README.md )
 
 PATCHES=(
 	"${FILESDIR}/${P}-fix-configure.patch"
-	"${FILESDIR}/${P}-fix-cg-libdir.patch"
+	"${FILESDIR}/${P}--with-cg-libdir.patch"
 )
 
 src_prepare() {
@@ -50,6 +50,7 @@ src_configure() {
 		myeconfargs+=(
 			--enable-cg
 			--with-cg-prefix="/opt/nvidia-cg-toolkit"
+			--with-cg-libdir="/opt/nvidia-cg-toolkit/$(get_libdir)"
 		)
 		append-ldflags "$(no-as-needed)" # binary-only libCg is not properly linked
 	fi