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

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

[Alexis Ballier]

commit:     91e4e15fe3a0b637babfac61466cc52d4ee32097
Author:     Jonathan Scruggs <j.scruggs <AT> gmail <DOT> com>
AuthorDate: Sat Sep 23 13:10:11 2017 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Thu Sep 28 12:45:08 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91e4e15f

media-gfx/openexr_viewers: Revision bump to 2.2.0-r1

* Converted ebuild to EAPI 6
* Made patch compatible with PATCHES
* Changed dependencies to depend on new CTL version
* Tidied metadata.xml file

Closes: #5725

 ...exr_viewers-2.2.0-Remove-nVidia-automagic.patch | 28 +++++++++++
 media-gfx/openexr_viewers/metadata.xml             |  3 ++
 .../openexr_viewers-2.2.0-r1.ebuild                | 58 ++++++++++++++++++++++
 3 files changed, 89 insertions(+)

diff --git a/media-gfx/openexr_viewers/files/openexr_viewers-2.2.0-Remove-nVidia-automagic.patch b/media-gfx/openexr_viewers/files/openexr_viewers-2.2.0-Remove-nVidia-automagic.patch
new file mode 100644
index 00000000000..41fba94523a
--- /dev/null
+++ b/media-gfx/openexr_viewers/files/openexr_viewers-2.2.0-Remove-nVidia-automagic.patch
@@ -0,0 +1,28 @@
+From e8d26df2a888f307e61584367f5dc14894d8be82 Mon Sep 17 00:00:00 2001
+From: Jonathan Scruggs <j.scruggs@gmail.com>
+Date: Sat, 23 Sep 2017 13:39:34 +0100
+Subject: [PATCH] OpenEXR_Viewers: Remove nVidia automagic
+
+---
+ OpenEXR_Viewers/configure.ac | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 94c88cd..1de94f6 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -194,7 +194,10 @@ 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, AC_HELP_STRING([--enable-cg],
++  [enable nvidia cg support [[default=check]]]), [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)
+-- 
+2.14.1
+

diff --git a/media-gfx/openexr_viewers/metadata.xml b/media-gfx/openexr_viewers/metadata.xml
index 24568f72b00..80b95a6d4e5 100644
--- a/media-gfx/openexr_viewers/metadata.xml
+++ b/media-gfx/openexr_viewers/metadata.xml
@@ -7,4 +7,7 @@
 	<use>
 		<flag name="cg">Add support for nvidia's cg shaders</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">openexr/openexr</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/media-gfx/openexr_viewers/openexr_viewers-2.2.0-r1.ebuild b/media-gfx/openexr_viewers/openexr_viewers-2.2.0-r1.ebuild
new file mode 100644
index 00000000000..9e78e40c52a
--- /dev/null
+++ b/media-gfx/openexr_viewers/openexr_viewers-2.2.0-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 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="http://download.savannah.gnu.org/releases/openexr/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="cg opengl"
+
+RDEPEND="~media-libs/ilmbase-${PV}:=
+	~media-libs/openexr-${PV}:=
+	>=media-libs/ctl-1.5.2:=
+	x11-libs/fltk:1[opengl]
+	opengl? (
+		virtual/opengl
+		x11-libs/fltk:1[opengl]
+		cg? ( media-gfx/nvidia-cg-toolkit )
+	)"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}/${P}-Remove-nVidia-automagic.patch" )
+
+src_prepare() {
+	default
+	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	if use cg; then
+		myconf="--with-cg-prefix=/opt/nvidia-cg-toolkit"
+		append-flags "$(no-as-needed)" # binary-only libCg is not properly linked
+	fi
+
+	econf \
+		$(use_enable cg) \
+		$(use_with opengl fltk-config /usr/bin/fltk-config) \
+		${myconf}
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		docdir=/usr/share/doc/${PF}/pdf \
+		install
+
+	dodoc AUTHORS ChangeLog NEWS README
+}

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

[Andreas Sturmlechner]

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