Gentoo Archives: gentoo-commits

From: Joonas Niilola <juippis@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/openexr_viewers/, media-gfx/openexr_viewers/files/
Date: Wed, 31 Mar 2021 06:31:52
Message-Id: 1617172154.7e7987b872728dfbb033d5ec3b75ef0c017020ff.juippis@gentoo
1 commit: 7e7987b872728dfbb033d5ec3b75ef0c017020ff
2 Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
3 AuthorDate: Fri Mar 26 16:36:25 2021 +0000
4 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
5 CommitDate: Wed Mar 31 06:29:14 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e7987b8
7
8 media-gfx/openexr_viewers: last rite
9
10 Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
11 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
12
13 media-gfx/openexr_viewers/Manifest | 1 -
14 .../openexr_viewers-2.3.0--with-cg-libdir.patch | 23 ------
15 .../openexr_viewers-2.3.0-fix-configure.patch | 83 ----------------------
16 media-gfx/openexr_viewers/metadata.xml | 13 ----
17 .../openexr_viewers/openexr_viewers-2.3.0.ebuild | 68 ------------------
18 5 files changed, 188 deletions(-)
19
20 diff --git a/media-gfx/openexr_viewers/Manifest b/media-gfx/openexr_viewers/Manifest
21 deleted file mode 100644
22 index dd864f9214f..00000000000
23 --- a/media-gfx/openexr_viewers/Manifest
24 +++ /dev/null
25 @@ -1 +0,0 @@
26 -DIST openexr_viewers-2.3.0.tar.gz 532154 BLAKE2B 353c69a6efbdab6ef7669f531be22b34c11cce3cc790b513eb99d323fc5e1827cb4b0656eab2db61ee89f01c02169c3c855cc4222275964156f31928ae08e015 SHA512 2b7ce7c75733f390bec5c3f9c49edc08da2631e3a45ae20a732dddf9fd813137c3124d0c6e90450fa2b9068f0c40c76374ee7ff9cf0d8697080b2b180c624c5d
27
28 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
29 deleted file mode 100644
30 index 9d118e362d4..00000000000
31 --- a/media-gfx/openexr_viewers/files/openexr_viewers-2.3.0--with-cg-libdir.patch
32 +++ /dev/null
33 @@ -1,23 +0,0 @@
34 -diff --git a/m4/path.cb.m4 b/m4/path.cb.m4
35 -index 7e38708..b5675b1 100644
36 ---- a/m4/path.cb.m4
37 -+++ b/m4/path.cb.m4
38 -@@ -10,9 +10,17 @@ dnl
39 - AC_ARG_WITH(cg-prefix,[ --with-cg-prefix=PFX Prefix where Cg is installed (optional)],
40 - cg_prefix="$withval", cg_prefix="")
41 -
42 -+AC_ARG_WITH(cg-libdir, [ --with-cg-libdir=PATH Directory where Cg libraries are installed (optional)],
43 -+ cg_libdir="$withval", cg_libdir="")
44 -+
45 - if test x$cg_prefix != x ; then
46 - CG_CXXFLAGS="-I$cg_prefix/include"
47 -- CG_LDFLAGS="-L$cg_prefix/lib -lGL -lCg -lCgGL -lGLU -lpthread -lglut"
48 -+ if test x$cg_libdir != x; then
49 -+ CG_LDFLAGS="-L$cg_libdir"
50 -+ else
51 -+ CG_LDFLAGS="-L$cg_prefix/lib"
52 -+ fi
53 -+ CG_LDFLAGS="$CG_LDFLAGS -lGL -lCg -lCgGL -lGLU -lpthread -lglut"
54 - else
55 - case $host_os in
56 - darwin*)
57
58 diff --git a/media-gfx/openexr_viewers/files/openexr_viewers-2.3.0-fix-configure.patch b/media-gfx/openexr_viewers/files/openexr_viewers-2.3.0-fix-configure.patch
59 deleted file mode 100644
60 index f9d51d5045b..00000000000
61 --- a/media-gfx/openexr_viewers/files/openexr_viewers-2.3.0-fix-configure.patch
62 +++ /dev/null
63 @@ -1,83 +0,0 @@
64 -diff --git a/configure.ac b/configure.ac
65 -index 0ae7531..f2cdfee 100644
66 ---- a/configure.ac
67 -+++ b/configure.ac
68 -@@ -4,8 +4,7 @@ AC_SUBST(OPENEXR_VIEWERS_VERSION, 2.3.0)
69 - AC_CANONICAL_HOST
70 - AC_CONFIG_SRCDIR(playexr/main.cpp)
71 - AM_CONFIG_HEADER(config/OpenEXR_ViewersConfig.h)
72 --AM_INIT_AUTOMAKE(1.6.3) dnl Require automake 1.6.3 or better
73 --AM_MAINTAINER_MODE
74 -+AM_INIT_AUTOMAKE
75 -
76 -
77 - LIBTOOL_CURRENT=24
78 -@@ -19,7 +18,7 @@ AC_PROG_CXX
79 - AC_PROG_INSTALL
80 - AC_PROG_CC
81 - AC_PROG_LN_S
82 --AC_PROG_LIBTOOL
83 -+LT_INIT
84 - AC_PROG_MAKE_SET
85 -
86 - dnl
87 -@@ -124,19 +109,8 @@ AC_ARG_ENABLE(threading,
88 - [multithread="${enableval}"], [multithread=yes])
89 -
90 - if test x$PKG_CONFIG == xno && test "x${multithread}" != xno ; then
91 -- ACX_PTHREAD(
92 -- [
93 -- AC_DEFINE(HAVE_PTHREAD)
94 -- OPENEXR_LIBS="$PTHREAD_LIBS $OPENEXR_LIBS"
95 -- OPENEXR_CXXFLAGS="$OPENEXR_CXXFLAGS $PTHREAD_CFLAGS"
96 -- OPENEXR_CTL_LIBS="$PTHREAD_LIBS $OPENEXR_CTL_LIBS"
97 -- OPENEXR_CTL_CXXFLAGS="$OPENEXR_CTL_CXXFLAGS $PTHREAD_CFLAGS"
98 -- CC="$PTHREAD_CC"
99 --
100 -- AM_POSIX_SEM()
101 -- ],
102 -- [AC_MSG_ERROR([POSIX thread support required])])
103 -- AC_MSG_NOTICE([multithread true, LIBS = $LIBS, CC = $CC, CXXFLAGS = $CXXFLAGS])
104 -+ AX_PTHREAD
105 -+ AC_DEFINE([HAVE_PTHREAD], [1], [define if POSIX thread support is available])
106 - fi
107 -
108 -
109 -@@ -233,10 +155,13 @@ AM_PATH_FLTK(have_fltk=yes, have_fltk=no)
110 - dnl
111 - dnl check for Cg
112 - dnl
113 --if test "${have_fltk}" = yes; then
114 -+AC_ARG_ENABLE(cg, AS_HELP_STRING([--enable-cg],
115 -+ [enable nvidia cg support [[default: test]]]), [want_cg="${enableval}"], [want_cg=yes])
116 -+
117 -+if test "${have_fltk}" = yes -a "${want_cg}" != no; then
118 - AM_PATH_CG(have_cg=yes, have_cg=no)
119 - if test "${have_cg}" = yes; then
120 -- AC_DEFINE(HAVE_FRAGMENT_SHADERS)
121 -+ AC_DEFINE([HAVE_FRAGMENT_SHADERS], [1], [define if Cg support is available])
122 - fi
123 - else have_cg=no
124 - fi
125 -@@ -251,20 +176,10 @@ AC_C_CONST
126 - AC_C_INLINE
127 - AC_TYPE_SIZE_T
128 -
129 --dnl gcc optimization
130 --AC_MSG_CHECKING(for gcc optimization flags)
131 --old_cflags=$CFLAGS
132 --CFLAGS="$CFLAGS -pipe"
133 --AC_TRY_COMPILE([#include <stdio.h>],
134 --[ printf ("hello, world"); ],
135 --[ EXTRA_OPT_CFLAGS="-pipe"],[ EXTRA_OPT_CFLAGS=""])
136 --CFLAGS=$old_cflags
137 --AC_MSG_RESULT([$EXTRA_OPT_CFLAGS])
138 --
139 - dnl Platform-specific stuff
140 - case "$host" in
141 - *darwin*)
142 -- AC_DEFINE(HAVE_DARWIN)
143 -+ AC_DEFINE([HAVE_DARWIN], [1], [define if compiling on darwin platform (OSX)])
144 -
145 - dnl OS X universal binary support, requires --disable-dependency-tracking
146 - AC_ARG_ENABLE(osx-universal-binaries,
147
148 diff --git a/media-gfx/openexr_viewers/metadata.xml b/media-gfx/openexr_viewers/metadata.xml
149 deleted file mode 100644
150 index 80b95a6d4e5..00000000000
151 --- a/media-gfx/openexr_viewers/metadata.xml
152 +++ /dev/null
153 @@ -1,13 +0,0 @@
154 -<?xml version="1.0" encoding="UTF-8"?>
155 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
156 -<pkgmetadata>
157 - <maintainer type="project">
158 - <email>media-video@g.o</email>
159 - </maintainer>
160 - <use>
161 - <flag name="cg">Add support for nvidia's cg shaders</flag>
162 - </use>
163 - <upstream>
164 - <remote-id type="github">openexr/openexr</remote-id>
165 - </upstream>
166 -</pkgmetadata>
167
168 diff --git a/media-gfx/openexr_viewers/openexr_viewers-2.3.0.ebuild b/media-gfx/openexr_viewers/openexr_viewers-2.3.0.ebuild
169 deleted file mode 100644
170 index 3c0b4ab6335..00000000000
171 --- a/media-gfx/openexr_viewers/openexr_viewers-2.3.0.ebuild
172 +++ /dev/null
173 @@ -1,68 +0,0 @@
174 -# Copyright 1999-2020 Gentoo Authors
175 -# Distributed under the terms of the GNU General Public License v2
176 -
177 -EAPI=6
178 -
179 -inherit autotools flag-o-matic
180 -
181 -DESCRIPTION="OpenEXR Viewers"
182 -HOMEPAGE="https://www.openexr.com/"
183 -SRC_URI="https://github.com/openexr/openexr/releases/download/v${PV}/${P}.tar.gz"
184 -
185 -LICENSE="BSD"
186 -SLOT="0"
187 -KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
188 -IUSE="cg"
189 -
190 -RDEPEND="
191 - ~media-libs/ilmbase-${PV}:=
192 - ~media-libs/openexr-${PV}:=
193 - virtual/opengl
194 - x11-libs/fltk:1[opengl]
195 - cg? ( media-gfx/nvidia-cg-toolkit )
196 -"
197 -
198 -DEPEND="
199 - ${RDEPEND}
200 - virtual/pkgconfig
201 -"
202 -
203 -DOCS=( ChangeLog README.md )
204 -
205 -PATCHES=(
206 - "${FILESDIR}/${P}-fix-configure.patch"
207 - "${FILESDIR}/${P}--with-cg-libdir.patch"
208 -)
209 -
210 -src_prepare() {
211 - default
212 - sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die
213 - eautoreconf
214 -}
215 -
216 -src_configure() {
217 - local myeconfargs=(
218 - --disable-openexrctltest
219 - --with-fltk-config="/usr/bin/fltk-config"
220 - )
221 -
222 - if use cg; then
223 - myeconfargs+=(
224 - --enable-cg
225 - --with-cg-prefix="/opt/nvidia-cg-toolkit"
226 - --with-cg-libdir="/opt/nvidia-cg-toolkit/$(get_libdir)"
227 - )
228 - append-ldflags "$(no-as-needed)" # binary-only libCg is not properly linked
229 - fi
230 -
231 - econf "${myeconfargs[@]}"
232 -}
233 -
234 -src_install() {
235 - emake \
236 - DESTDIR="${D}" \
237 - docdir=/usr/share/doc/${PF}/pdf \
238 - install
239 -
240 - einstalldocs
241 -}