| 1 |
commit: 7ae4594e8c806e9e2ab9099834c9d5380c2ce3ce |
| 2 |
Author: Bernd Waibel <waebbl <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Thu Oct 18 20:45:29 2018 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Oct 31 18:58:24 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ae4594e |
| 7 |
|
| 8 |
media-gfx/openexr_viewers: fix Cg libdir |
| 9 |
|
| 10 |
* remove files/openexr_viewers-2.3.0-fix-cg-libdir.patch |
| 11 |
* add files/openexr_viewers-2.3.0--with-cg-libdir.patch |
| 12 |
|
| 13 |
Addresses an issue, where Cg libraries where not found on 32-bit |
| 14 |
arches. The patch adds an option --with-cg-libdir to configure to |
| 15 |
pass 32-/64-bit specific libraries of Cg to configure script. |
| 16 |
|
| 17 |
Thanks to Arfrever Frehtes Taifersar Arahesis for reporting the issue. |
| 18 |
|
| 19 |
See also |
| 20 |
https://github.com/gentoo/gentoo/pull/10030#pullrequestreview-164522412 |
| 21 |
|
| 22 |
Closes: https://bugs.gentoo.org/668754 |
| 23 |
Signed-off-by: Bernd Waibel <waebbl <AT> gmail.com> |
| 24 |
Package-Manager: Portage-2.3.51, Repoman-2.3.11 |
| 25 |
Closes: https://github.com/gentoo/gentoo/pull/10172 |
| 26 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 27 |
|
| 28 |
.../openexr_viewers-2.3.0--with-cg-libdir.patch | 23 ++++++++++++++++++++++ |
| 29 |
.../openexr_viewers-2.3.0-fix-cg-libdir.patch | 13 ------------ |
| 30 |
.../openexr_viewers/openexr_viewers-2.3.0.ebuild | 5 +++-- |
| 31 |
3 files changed, 26 insertions(+), 15 deletions(-) |
| 32 |
|
| 33 |
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 |
| 34 |
new file mode 100644 |
| 35 |
index 00000000000..9d118e362d4 |
| 36 |
--- /dev/null |
| 37 |
+++ b/media-gfx/openexr_viewers/files/openexr_viewers-2.3.0--with-cg-libdir.patch |
| 38 |
@@ -0,0 +1,23 @@ |
| 39 |
+diff --git a/m4/path.cb.m4 b/m4/path.cb.m4 |
| 40 |
+index 7e38708..b5675b1 100644 |
| 41 |
+--- a/m4/path.cb.m4 |
| 42 |
++++ b/m4/path.cb.m4 |
| 43 |
+@@ -10,9 +10,17 @@ dnl |
| 44 |
+ AC_ARG_WITH(cg-prefix,[ --with-cg-prefix=PFX Prefix where Cg is installed (optional)], |
| 45 |
+ cg_prefix="$withval", cg_prefix="") |
| 46 |
+ |
| 47 |
++AC_ARG_WITH(cg-libdir, [ --with-cg-libdir=PATH Directory where Cg libraries are installed (optional)], |
| 48 |
++ cg_libdir="$withval", cg_libdir="") |
| 49 |
++ |
| 50 |
+ if test x$cg_prefix != x ; then |
| 51 |
+ CG_CXXFLAGS="-I$cg_prefix/include" |
| 52 |
+- CG_LDFLAGS="-L$cg_prefix/lib -lGL -lCg -lCgGL -lGLU -lpthread -lglut" |
| 53 |
++ if test x$cg_libdir != x; then |
| 54 |
++ CG_LDFLAGS="-L$cg_libdir" |
| 55 |
++ else |
| 56 |
++ CG_LDFLAGS="-L$cg_prefix/lib" |
| 57 |
++ fi |
| 58 |
++ CG_LDFLAGS="$CG_LDFLAGS -lGL -lCg -lCgGL -lGLU -lpthread -lglut" |
| 59 |
+ else |
| 60 |
+ case $host_os in |
| 61 |
+ darwin*) |
| 62 |
|
| 63 |
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 |
| 64 |
deleted file mode 100644 |
| 65 |
index 1c3ef1a5923..00000000000 |
| 66 |
--- a/media-gfx/openexr_viewers/files/openexr_viewers-2.3.0-fix-cg-libdir.patch |
| 67 |
+++ /dev/null |
| 68 |
@@ -1,13 +0,0 @@ |
| 69 |
-diff --git a/m4/path.cb.m4 b/m4/path.cb.m4 |
| 70 |
-index 7e38708..832b96c 100644 |
| 71 |
---- a/m4/path.cb.m4 |
| 72 |
-+++ b/m4/path.cb.m4 |
| 73 |
-@@ -12,7 +12,7 @@ AC_ARG_WITH(cg-prefix,[ --with-cg-prefix=PFX Prefix where Cg is installed (opt |
| 74 |
- |
| 75 |
- if test x$cg_prefix != x ; then |
| 76 |
- CG_CXXFLAGS="-I$cg_prefix/include" |
| 77 |
-- CG_LDFLAGS="-L$cg_prefix/lib -lGL -lCg -lCgGL -lGLU -lpthread -lglut" |
| 78 |
-+ CG_LDFLAGS="-L$cg_prefix/lib64 -lGL -lCg -lCgGL -lGLU -lpthread -lglut" |
| 79 |
- else |
| 80 |
- case $host_os in |
| 81 |
- darwin*) |
| 82 |
|
| 83 |
diff --git a/media-gfx/openexr_viewers/openexr_viewers-2.3.0.ebuild b/media-gfx/openexr_viewers/openexr_viewers-2.3.0.ebuild |
| 84 |
index e7eaf9ca077..a1981cf42cd 100644 |
| 85 |
--- a/media-gfx/openexr_viewers/openexr_viewers-2.3.0.ebuild |
| 86 |
+++ b/media-gfx/openexr_viewers/openexr_viewers-2.3.0.ebuild |
| 87 |
@@ -1,4 +1,4 @@ |
| 88 |
-# Copyright 1999-2018 Gentoo Foundation |
| 89 |
+# Copyright 1999-2018 Gentoo Authors |
| 90 |
# Distributed under the terms of the GNU General Public License v2 |
| 91 |
|
| 92 |
EAPI=6 |
| 93 |
@@ -31,7 +31,7 @@ DOCS=( ChangeLog README.md ) |
| 94 |
|
| 95 |
PATCHES=( |
| 96 |
"${FILESDIR}/${P}-fix-configure.patch" |
| 97 |
- "${FILESDIR}/${P}-fix-cg-libdir.patch" |
| 98 |
+ "${FILESDIR}/${P}--with-cg-libdir.patch" |
| 99 |
) |
| 100 |
|
| 101 |
src_prepare() { |
| 102 |
@@ -50,6 +50,7 @@ src_configure() { |
| 103 |
myeconfargs+=( |
| 104 |
--enable-cg |
| 105 |
--with-cg-prefix="/opt/nvidia-cg-toolkit" |
| 106 |
+ --with-cg-libdir="/opt/nvidia-cg-toolkit/$(get_libdir)" |
| 107 |
) |
| 108 |
append-ldflags "$(no-as-needed)" # binary-only libCg is not properly linked |
| 109 |
fi |
Archives