1 |
commit: 91e4e15fe3a0b637babfac61466cc52d4ee32097 |
2 |
Author: Jonathan Scruggs <j.scruggs <AT> gmail <DOT> com> |
3 |
AuthorDate: Sat Sep 23 13:10:11 2017 +0000 |
4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Sep 28 12:45:08 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91e4e15f |
7 |
|
8 |
media-gfx/openexr_viewers: Revision bump to 2.2.0-r1 |
9 |
|
10 |
* Converted ebuild to EAPI 6 |
11 |
* Made patch compatible with PATCHES |
12 |
* Changed dependencies to depend on new CTL version |
13 |
* Tidied metadata.xml file |
14 |
|
15 |
Closes: #5725 |
16 |
|
17 |
...exr_viewers-2.2.0-Remove-nVidia-automagic.patch | 28 +++++++++++ |
18 |
media-gfx/openexr_viewers/metadata.xml | 3 ++ |
19 |
.../openexr_viewers-2.2.0-r1.ebuild | 58 ++++++++++++++++++++++ |
20 |
3 files changed, 89 insertions(+) |
21 |
|
22 |
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 |
23 |
new file mode 100644 |
24 |
index 00000000000..41fba94523a |
25 |
--- /dev/null |
26 |
+++ b/media-gfx/openexr_viewers/files/openexr_viewers-2.2.0-Remove-nVidia-automagic.patch |
27 |
@@ -0,0 +1,28 @@ |
28 |
+From e8d26df2a888f307e61584367f5dc14894d8be82 Mon Sep 17 00:00:00 2001 |
29 |
+From: Jonathan Scruggs <j.scruggs@×××××.com> |
30 |
+Date: Sat, 23 Sep 2017 13:39:34 +0100 |
31 |
+Subject: [PATCH] OpenEXR_Viewers: Remove nVidia automagic |
32 |
+ |
33 |
+--- |
34 |
+ OpenEXR_Viewers/configure.ac | 5 ++++- |
35 |
+ 1 file changed, 4 insertions(+), 1 deletion(-) |
36 |
+ |
37 |
+diff --git a/configure.ac b/configure.ac |
38 |
+index 94c88cd..1de94f6 100644 |
39 |
+--- a/configure.ac |
40 |
++++ b/configure.ac |
41 |
+@@ -194,7 +194,10 @@ AM_PATH_FLTK(have_fltk=yes, have_fltk=no) |
42 |
+ dnl |
43 |
+ dnl check for Cg |
44 |
+ dnl |
45 |
+-if test "${have_fltk}" = yes; then |
46 |
++AC_ARG_ENABLE(cg, AC_HELP_STRING([--enable-cg], |
47 |
++ [enable nvidia cg support [[default=check]]]), [want_cg="${enableval}"], [want_cg=yes]) |
48 |
++ |
49 |
++if test "${have_fltk}" = yes -a "${want_cg}" != "no"; then |
50 |
+ AM_PATH_CG(have_cg=yes, have_cg=no) |
51 |
+ if test "${have_cg}" = yes; then |
52 |
+ AC_DEFINE(HAVE_FRAGMENT_SHADERS) |
53 |
+-- |
54 |
+2.14.1 |
55 |
+ |
56 |
|
57 |
diff --git a/media-gfx/openexr_viewers/metadata.xml b/media-gfx/openexr_viewers/metadata.xml |
58 |
index 24568f72b00..80b95a6d4e5 100644 |
59 |
--- a/media-gfx/openexr_viewers/metadata.xml |
60 |
+++ b/media-gfx/openexr_viewers/metadata.xml |
61 |
@@ -7,4 +7,7 @@ |
62 |
<use> |
63 |
<flag name="cg">Add support for nvidia's cg shaders</flag> |
64 |
</use> |
65 |
+ <upstream> |
66 |
+ <remote-id type="github">openexr/openexr</remote-id> |
67 |
+ </upstream> |
68 |
</pkgmetadata> |
69 |
|
70 |
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 |
71 |
new file mode 100644 |
72 |
index 00000000000..9e78e40c52a |
73 |
--- /dev/null |
74 |
+++ b/media-gfx/openexr_viewers/openexr_viewers-2.2.0-r1.ebuild |
75 |
@@ -0,0 +1,58 @@ |
76 |
+# Copyright 1999-2017 Gentoo Foundation |
77 |
+# Distributed under the terms of the GNU General Public License v2 |
78 |
+ |
79 |
+EAPI=6 |
80 |
+inherit autotools flag-o-matic |
81 |
+ |
82 |
+DESCRIPTION="OpenEXR Viewers" |
83 |
+HOMEPAGE="http://openexr.com/" |
84 |
+SRC_URI="http://download.savannah.gnu.org/releases/openexr/${P}.tar.gz" |
85 |
+ |
86 |
+LICENSE="BSD" |
87 |
+SLOT="0" |
88 |
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" |
89 |
+IUSE="cg opengl" |
90 |
+ |
91 |
+RDEPEND="~media-libs/ilmbase-${PV}:= |
92 |
+ ~media-libs/openexr-${PV}:= |
93 |
+ >=media-libs/ctl-1.5.2:= |
94 |
+ x11-libs/fltk:1[opengl] |
95 |
+ opengl? ( |
96 |
+ virtual/opengl |
97 |
+ x11-libs/fltk:1[opengl] |
98 |
+ cg? ( media-gfx/nvidia-cg-toolkit ) |
99 |
+ )" |
100 |
+ |
101 |
+DEPEND="${RDEPEND} |
102 |
+ virtual/pkgconfig" |
103 |
+ |
104 |
+PATCHES=( "${FILESDIR}/${P}-Remove-nVidia-automagic.patch" ) |
105 |
+ |
106 |
+src_prepare() { |
107 |
+ default |
108 |
+ sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die |
109 |
+ eautoreconf |
110 |
+} |
111 |
+ |
112 |
+src_configure() { |
113 |
+ local myconf |
114 |
+ |
115 |
+ if use cg; then |
116 |
+ myconf="--with-cg-prefix=/opt/nvidia-cg-toolkit" |
117 |
+ append-flags "$(no-as-needed)" # binary-only libCg is not properly linked |
118 |
+ fi |
119 |
+ |
120 |
+ econf \ |
121 |
+ $(use_enable cg) \ |
122 |
+ $(use_with opengl fltk-config /usr/bin/fltk-config) \ |
123 |
+ ${myconf} |
124 |
+} |
125 |
+ |
126 |
+src_install() { |
127 |
+ emake \ |
128 |
+ DESTDIR="${D}" \ |
129 |
+ docdir=/usr/share/doc/${PF}/pdf \ |
130 |
+ install |
131 |
+ |
132 |
+ dodoc AUTHORS ChangeLog NEWS README |
133 |
+} |