* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openexr_viewers/, media-gfx/openexr_viewers/files/
@ 2018-10-11 18:42 Michał Górny
0 siblings, 0 replies; 3+ messages in thread
From: Michał Górny @ 2018-10-11 18:42 UTC (permalink / raw
To: gentoo-commits
commit: 7f82dcf755d6676dda0ac065883e93076afc6d84
Author: Bernd Waibel <waebbl <AT> gmail <DOT> com>
AuthorDate: Sun Sep 30 19:52:49 2018 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Oct 11 18:42:50 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f82dcf7
media-gfx/openexr_viewers: bump to version 2.3.0
Bug: https://bugs.gentoo.org/639998
Suggested-by: Jonathan Scruggs <dracwyrm <AT> gentoo.org>
Signed-off-by: Bernd Waibel <waebbl <AT> gmail.com>
Package-Manager: Portage-2.3.49, Repoman-2.3.10
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/10030
media-gfx/openexr_viewers/Manifest | 1 +
.../openexr_viewers-2.3.0-fix-cg-libdir.patch | 13 ++++
.../openexr_viewers-2.3.0-fix-configure.patch | 83 ++++++++++++++++++++++
.../openexr_viewers/openexr_viewers-2.3.0.ebuild | 67 +++++++++++++++++
4 files changed, 164 insertions(+)
diff --git a/media-gfx/openexr_viewers/Manifest b/media-gfx/openexr_viewers/Manifest
index 9d883fc660f..7a07e939ae0 100644
--- a/media-gfx/openexr_viewers/Manifest
+++ b/media-gfx/openexr_viewers/Manifest
@@ -1,3 +1,4 @@
DIST openexr_viewers-2.0.1.tar.gz 495240 BLAKE2B 4cccdcca362c59f77eb73c03c4300e64d2df9456b0108908fac96e0ae5d5c804525f9fe321ac159043b18c05727addb5e318ed0ba002132c3e2a5728256838a5 SHA512 75af19e4a06d31bbb21217bc75a800852d2817dd9d120b879c377316e8aa64f75c49dccbb0d2a4d11d949f48b8fac40249692d1286a77e4812e43b3e8e303235
DIST openexr_viewers-2.1.0.tar.gz 497290 BLAKE2B 15d8c23e8a738788f7aeb896b671a42005569a8cf177fbe193d9dbe4df418302be2beabc86344a88137a3a0e6b7b8bbfd66ec213882e52d4df5788157e182163 SHA512 fd3b08ad91b1b2299d01d56c7a17694538fd912302db3472a8d8621b49a699a42604de8d816288399b31207304c7684de198acecd2c8a9825d35b827b8a2ddaf
DIST openexr_viewers-2.2.0.tar.gz 486235 BLAKE2B db1ebc95dfb7d5b9b1ead3cd3d1eeb4406e4ad5704c90b080d3929c7dea7a2be631e74e2cb597803f55e05783fda43fdb33edc64ba63522d31122f96a4675608 SHA512 ab2f15d0352fa4e9daf76c7317312dad6cfe7b65a86affaf057c8eceb48d2637fc0df58125ea2ec5ad3b7251eed392a8eccff1001cfeced969bbb66fe92284f8
+DIST openexr_viewers-2.3.0.tar.gz 532154 BLAKE2B 353c69a6efbdab6ef7669f531be22b34c11cce3cc790b513eb99d323fc5e1827cb4b0656eab2db61ee89f01c02169c3c855cc4222275964156f31928ae08e015 SHA512 2b7ce7c75733f390bec5c3f9c49edc08da2631e3a45ae20a732dddf9fd813137c3124d0c6e90450fa2b9068f0c40c76374ee7ff9cf0d8697080b2b180c624c5d
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
new file mode 100644
index 00000000000..1c3ef1a5923
--- /dev/null
+++ b/media-gfx/openexr_viewers/files/openexr_viewers-2.3.0-fix-cg-libdir.patch
@@ -0,0 +1,13 @@
+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/files/openexr_viewers-2.3.0-fix-configure.patch b/media-gfx/openexr_viewers/files/openexr_viewers-2.3.0-fix-configure.patch
new file mode 100644
index 00000000000..f9d51d5045b
--- /dev/null
+++ b/media-gfx/openexr_viewers/files/openexr_viewers-2.3.0-fix-configure.patch
@@ -0,0 +1,83 @@
+diff --git a/configure.ac b/configure.ac
+index 0ae7531..f2cdfee 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -4,8 +4,7 @@ AC_SUBST(OPENEXR_VIEWERS_VERSION, 2.3.0)
+ AC_CANONICAL_HOST
+ AC_CONFIG_SRCDIR(playexr/main.cpp)
+ AM_CONFIG_HEADER(config/OpenEXR_ViewersConfig.h)
+-AM_INIT_AUTOMAKE(1.6.3) dnl Require automake 1.6.3 or better
+-AM_MAINTAINER_MODE
++AM_INIT_AUTOMAKE
+
+
+ LIBTOOL_CURRENT=24
+@@ -19,7 +18,7 @@ AC_PROG_CXX
+ AC_PROG_INSTALL
+ AC_PROG_CC
+ AC_PROG_LN_S
+-AC_PROG_LIBTOOL
++LT_INIT
+ AC_PROG_MAKE_SET
+
+ dnl
+@@ -124,19 +109,8 @@ AC_ARG_ENABLE(threading,
+ [multithread="${enableval}"], [multithread=yes])
+
+ if test x$PKG_CONFIG == xno && test "x${multithread}" != xno ; then
+- ACX_PTHREAD(
+- [
+- AC_DEFINE(HAVE_PTHREAD)
+- OPENEXR_LIBS="$PTHREAD_LIBS $OPENEXR_LIBS"
+- OPENEXR_CXXFLAGS="$OPENEXR_CXXFLAGS $PTHREAD_CFLAGS"
+- OPENEXR_CTL_LIBS="$PTHREAD_LIBS $OPENEXR_CTL_LIBS"
+- OPENEXR_CTL_CXXFLAGS="$OPENEXR_CTL_CXXFLAGS $PTHREAD_CFLAGS"
+- CC="$PTHREAD_CC"
+-
+- AM_POSIX_SEM()
+- ],
+- [AC_MSG_ERROR([POSIX thread support required])])
+- AC_MSG_NOTICE([multithread true, LIBS = $LIBS, CC = $CC, CXXFLAGS = $CXXFLAGS])
++ AX_PTHREAD
++ AC_DEFINE([HAVE_PTHREAD], [1], [define if POSIX thread support is available])
+ fi
+
+
+@@ -233,10 +155,13 @@ 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, AS_HELP_STRING([--enable-cg],
++ [enable nvidia cg support [[default: test]]]), [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)
++ AC_DEFINE([HAVE_FRAGMENT_SHADERS], [1], [define if Cg support is available])
+ fi
+ else have_cg=no
+ fi
+@@ -251,20 +176,10 @@ AC_C_CONST
+ AC_C_INLINE
+ AC_TYPE_SIZE_T
+
+-dnl gcc optimization
+-AC_MSG_CHECKING(for gcc optimization flags)
+-old_cflags=$CFLAGS
+-CFLAGS="$CFLAGS -pipe"
+-AC_TRY_COMPILE([#include <stdio.h>],
+-[ printf ("hello, world"); ],
+-[ EXTRA_OPT_CFLAGS="-pipe"],[ EXTRA_OPT_CFLAGS=""])
+-CFLAGS=$old_cflags
+-AC_MSG_RESULT([$EXTRA_OPT_CFLAGS])
+-
+ dnl Platform-specific stuff
+ case "$host" in
+ *darwin*)
+- AC_DEFINE(HAVE_DARWIN)
++ AC_DEFINE([HAVE_DARWIN], [1], [define if compiling on darwin platform (OSX)])
+
+ dnl OS X universal binary support, requires --disable-dependency-tracking
+ AC_ARG_ENABLE(osx-universal-binaries,
diff --git a/media-gfx/openexr_viewers/openexr_viewers-2.3.0.ebuild b/media-gfx/openexr_viewers/openexr_viewers-2.3.0.ebuild
new file mode 100644
index 00000000000..e7eaf9ca077
--- /dev/null
+++ b/media-gfx/openexr_viewers/openexr_viewers-2.3.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2018 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="https://github.com/openexr/openexr/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="cg"
+
+RDEPEND="
+ ~media-libs/ilmbase-${PV}:=
+ ~media-libs/openexr-${PV}:=
+ virtual/opengl
+ x11-libs/fltk:1[opengl]
+ cg? ( media-gfx/nvidia-cg-toolkit )
+"
+
+DEPEND="
+ ${RDEPEND}
+ virtual/pkgconfig
+"
+
+DOCS=( ChangeLog README.md )
+
+PATCHES=(
+ "${FILESDIR}/${P}-fix-configure.patch"
+ "${FILESDIR}/${P}-fix-cg-libdir.patch"
+)
+
+src_prepare() {
+ default
+ sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die
+ eautoreconf
+}
+
+src_configure() {
+ local myeconfargs=(
+ --disable-openexrctltest
+ --with-fltk-config="/usr/bin/fltk-config"
+ )
+
+ if use cg; then
+ myeconfargs+=(
+ --enable-cg
+ --with-cg-prefix="/opt/nvidia-cg-toolkit"
+ )
+ append-ldflags "$(no-as-needed)" # binary-only libCg is not properly linked
+ fi
+
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ emake \
+ DESTDIR="${D}" \
+ docdir=/usr/share/doc/${PF}/pdf \
+ install
+
+ einstalldocs
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openexr_viewers/, media-gfx/openexr_viewers/files/
@ 2019-06-04 5:43 Andreas K. Hüttel
0 siblings, 0 replies; 3+ messages in thread
From: Andreas K. Hüttel @ 2019-06-04 5:43 UTC (permalink / raw
To: gentoo-commits
commit: c5568e5a14f896d7a411c3c7bfba5c1c8ca6ebc1
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 4 05:42:08 2019 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Jun 4 05:43:09 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5568e5a
media-gfx/openexr_viewers: remove old, drop to ~arch
Package-Manager: Portage-2.3.67, Repoman-2.3.13
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
media-gfx/openexr_viewers/Manifest | 3 --
.../openexr_viewers-2.0.0-nvidia-automagic.patch | 14 ------
...exr_viewers-2.2.0-Remove-nVidia-automagic.patch | 28 -----------
.../openexr_viewers/openexr_viewers-2.0.1.ebuild | 55 --------------------
.../openexr_viewers/openexr_viewers-2.1.0.ebuild | 55 --------------------
.../openexr_viewers-2.2.0-r1.ebuild | 58 ----------------------
.../openexr_viewers/openexr_viewers-2.2.0.ebuild | 55 --------------------
7 files changed, 268 deletions(-)
diff --git a/media-gfx/openexr_viewers/Manifest b/media-gfx/openexr_viewers/Manifest
index 7a07e939ae0..dd864f9214f 100644
--- a/media-gfx/openexr_viewers/Manifest
+++ b/media-gfx/openexr_viewers/Manifest
@@ -1,4 +1 @@
-DIST openexr_viewers-2.0.1.tar.gz 495240 BLAKE2B 4cccdcca362c59f77eb73c03c4300e64d2df9456b0108908fac96e0ae5d5c804525f9fe321ac159043b18c05727addb5e318ed0ba002132c3e2a5728256838a5 SHA512 75af19e4a06d31bbb21217bc75a800852d2817dd9d120b879c377316e8aa64f75c49dccbb0d2a4d11d949f48b8fac40249692d1286a77e4812e43b3e8e303235
-DIST openexr_viewers-2.1.0.tar.gz 497290 BLAKE2B 15d8c23e8a738788f7aeb896b671a42005569a8cf177fbe193d9dbe4df418302be2beabc86344a88137a3a0e6b7b8bbfd66ec213882e52d4df5788157e182163 SHA512 fd3b08ad91b1b2299d01d56c7a17694538fd912302db3472a8d8621b49a699a42604de8d816288399b31207304c7684de198acecd2c8a9825d35b827b8a2ddaf
-DIST openexr_viewers-2.2.0.tar.gz 486235 BLAKE2B db1ebc95dfb7d5b9b1ead3cd3d1eeb4406e4ad5704c90b080d3929c7dea7a2be631e74e2cb597803f55e05783fda43fdb33edc64ba63522d31122f96a4675608 SHA512 ab2f15d0352fa4e9daf76c7317312dad6cfe7b65a86affaf057c8eceb48d2637fc0df58125ea2ec5ad3b7251eed392a8eccff1001cfeced969bbb66fe92284f8
DIST openexr_viewers-2.3.0.tar.gz 532154 BLAKE2B 353c69a6efbdab6ef7669f531be22b34c11cce3cc790b513eb99d323fc5e1827cb4b0656eab2db61ee89f01c02169c3c855cc4222275964156f31928ae08e015 SHA512 2b7ce7c75733f390bec5c3f9c49edc08da2631e3a45ae20a732dddf9fd813137c3124d0c6e90450fa2b9068f0c40c76374ee7ff9cf0d8697080b2b180c624c5d
diff --git a/media-gfx/openexr_viewers/files/openexr_viewers-2.0.0-nvidia-automagic.patch b/media-gfx/openexr_viewers/files/openexr_viewers-2.0.0-nvidia-automagic.patch
deleted file mode 100644
index 1ea9f869a67..00000000000
--- a/media-gfx/openexr_viewers/files/openexr_viewers-2.0.0-nvidia-automagic.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- configure.ac
-+++ configure.ac
-@@ -192,7 +192,10 @@
- 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)
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
deleted file mode 100644
index 41fba94523a..00000000000
--- a/media-gfx/openexr_viewers/files/openexr_viewers-2.2.0-Remove-nVidia-automagic.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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/openexr_viewers-2.0.1.ebuild b/media-gfx/openexr_viewers/openexr_viewers-2.0.1.ebuild
deleted file mode 100644
index 55ed1bb8c3a..00000000000
--- a/media-gfx/openexr_viewers/openexr_viewers-2.0.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils flag-o-matic
-
-DESCRIPTION="OpenEXR Viewers"
-HOMEPAGE="https://openexr.com"
-SRC_URI="https://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:=
- >=media-libs/openexr_ctl-1.0.1-r2:=
- opengl? (
- virtual/opengl
- x11-libs/fltk:1[opengl]
- cg? ( media-gfx/nvidia-cg-toolkit )
- )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-src_prepare() {
- sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die
- epatch "${FILESDIR}"/${PN}-2.0.0-nvidia-automagic.patch
- 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
-}
diff --git a/media-gfx/openexr_viewers/openexr_viewers-2.1.0.ebuild b/media-gfx/openexr_viewers/openexr_viewers-2.1.0.ebuild
deleted file mode 100644
index 65031959622..00000000000
--- a/media-gfx/openexr_viewers/openexr_viewers-2.1.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils flag-o-matic
-
-DESCRIPTION="OpenEXR Viewers"
-HOMEPAGE="https://openexr.com"
-SRC_URI="https://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:=
- >=media-libs/openexr_ctl-1.0.1-r2:=
- opengl? (
- virtual/opengl
- x11-libs/fltk:1[opengl]
- cg? ( media-gfx/nvidia-cg-toolkit )
- )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-src_prepare() {
- sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die
- epatch "${FILESDIR}"/${PN}-2.0.0-nvidia-automagic.patch
- 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
-}
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
deleted file mode 100644
index a141f777a8e..00000000000
--- a/media-gfx/openexr_viewers/openexr_viewers-2.2.0-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools flag-o-matic
-
-DESCRIPTION="OpenEXR Viewers"
-HOMEPAGE="https://openexr.com"
-SRC_URI="https://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
-}
diff --git a/media-gfx/openexr_viewers/openexr_viewers-2.2.0.ebuild b/media-gfx/openexr_viewers/openexr_viewers-2.2.0.ebuild
deleted file mode 100644
index 55ed1bb8c3a..00000000000
--- a/media-gfx/openexr_viewers/openexr_viewers-2.2.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils flag-o-matic
-
-DESCRIPTION="OpenEXR Viewers"
-HOMEPAGE="https://openexr.com"
-SRC_URI="https://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:=
- >=media-libs/openexr_ctl-1.0.1-r2:=
- opengl? (
- virtual/opengl
- x11-libs/fltk:1[opengl]
- cg? ( media-gfx/nvidia-cg-toolkit )
- )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-src_prepare() {
- sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die
- epatch "${FILESDIR}"/${PN}-2.0.0-nvidia-automagic.patch
- 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
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/openexr_viewers/, media-gfx/openexr_viewers/files/
@ 2021-03-31 6:31 Joonas Niilola
0 siblings, 0 replies; 3+ messages in thread
From: Joonas Niilola @ 2021-03-31 6:31 UTC (permalink / raw
To: gentoo-commits
commit: 7e7987b872728dfbb033d5ec3b75ef0c017020ff
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Fri Mar 26 16:36:25 2021 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Mar 31 06:29:14 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e7987b8
media-gfx/openexr_viewers: last rite
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
media-gfx/openexr_viewers/Manifest | 1 -
.../openexr_viewers-2.3.0--with-cg-libdir.patch | 23 ------
.../openexr_viewers-2.3.0-fix-configure.patch | 83 ----------------------
media-gfx/openexr_viewers/metadata.xml | 13 ----
.../openexr_viewers/openexr_viewers-2.3.0.ebuild | 68 ------------------
5 files changed, 188 deletions(-)
diff --git a/media-gfx/openexr_viewers/Manifest b/media-gfx/openexr_viewers/Manifest
deleted file mode 100644
index dd864f9214f..00000000000
--- a/media-gfx/openexr_viewers/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST openexr_viewers-2.3.0.tar.gz 532154 BLAKE2B 353c69a6efbdab6ef7669f531be22b34c11cce3cc790b513eb99d323fc5e1827cb4b0656eab2db61ee89f01c02169c3c855cc4222275964156f31928ae08e015 SHA512 2b7ce7c75733f390bec5c3f9c49edc08da2631e3a45ae20a732dddf9fd813137c3124d0c6e90450fa2b9068f0c40c76374ee7ff9cf0d8697080b2b180c624c5d
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
deleted file mode 100644
index 9d118e362d4..00000000000
--- a/media-gfx/openexr_viewers/files/openexr_viewers-2.3.0--with-cg-libdir.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-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-configure.patch b/media-gfx/openexr_viewers/files/openexr_viewers-2.3.0-fix-configure.patch
deleted file mode 100644
index f9d51d5045b..00000000000
--- a/media-gfx/openexr_viewers/files/openexr_viewers-2.3.0-fix-configure.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 0ae7531..f2cdfee 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -4,8 +4,7 @@ AC_SUBST(OPENEXR_VIEWERS_VERSION, 2.3.0)
- AC_CANONICAL_HOST
- AC_CONFIG_SRCDIR(playexr/main.cpp)
- AM_CONFIG_HEADER(config/OpenEXR_ViewersConfig.h)
--AM_INIT_AUTOMAKE(1.6.3) dnl Require automake 1.6.3 or better
--AM_MAINTAINER_MODE
-+AM_INIT_AUTOMAKE
-
-
- LIBTOOL_CURRENT=24
-@@ -19,7 +18,7 @@ AC_PROG_CXX
- AC_PROG_INSTALL
- AC_PROG_CC
- AC_PROG_LN_S
--AC_PROG_LIBTOOL
-+LT_INIT
- AC_PROG_MAKE_SET
-
- dnl
-@@ -124,19 +109,8 @@ AC_ARG_ENABLE(threading,
- [multithread="${enableval}"], [multithread=yes])
-
- if test x$PKG_CONFIG == xno && test "x${multithread}" != xno ; then
-- ACX_PTHREAD(
-- [
-- AC_DEFINE(HAVE_PTHREAD)
-- OPENEXR_LIBS="$PTHREAD_LIBS $OPENEXR_LIBS"
-- OPENEXR_CXXFLAGS="$OPENEXR_CXXFLAGS $PTHREAD_CFLAGS"
-- OPENEXR_CTL_LIBS="$PTHREAD_LIBS $OPENEXR_CTL_LIBS"
-- OPENEXR_CTL_CXXFLAGS="$OPENEXR_CTL_CXXFLAGS $PTHREAD_CFLAGS"
-- CC="$PTHREAD_CC"
--
-- AM_POSIX_SEM()
-- ],
-- [AC_MSG_ERROR([POSIX thread support required])])
-- AC_MSG_NOTICE([multithread true, LIBS = $LIBS, CC = $CC, CXXFLAGS = $CXXFLAGS])
-+ AX_PTHREAD
-+ AC_DEFINE([HAVE_PTHREAD], [1], [define if POSIX thread support is available])
- fi
-
-
-@@ -233,10 +155,13 @@ 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, AS_HELP_STRING([--enable-cg],
-+ [enable nvidia cg support [[default: test]]]), [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)
-+ AC_DEFINE([HAVE_FRAGMENT_SHADERS], [1], [define if Cg support is available])
- fi
- else have_cg=no
- fi
-@@ -251,20 +176,10 @@ AC_C_CONST
- AC_C_INLINE
- AC_TYPE_SIZE_T
-
--dnl gcc optimization
--AC_MSG_CHECKING(for gcc optimization flags)
--old_cflags=$CFLAGS
--CFLAGS="$CFLAGS -pipe"
--AC_TRY_COMPILE([#include <stdio.h>],
--[ printf ("hello, world"); ],
--[ EXTRA_OPT_CFLAGS="-pipe"],[ EXTRA_OPT_CFLAGS=""])
--CFLAGS=$old_cflags
--AC_MSG_RESULT([$EXTRA_OPT_CFLAGS])
--
- dnl Platform-specific stuff
- case "$host" in
- *darwin*)
-- AC_DEFINE(HAVE_DARWIN)
-+ AC_DEFINE([HAVE_DARWIN], [1], [define if compiling on darwin platform (OSX)])
-
- dnl OS X universal binary support, requires --disable-dependency-tracking
- AC_ARG_ENABLE(osx-universal-binaries,
diff --git a/media-gfx/openexr_viewers/metadata.xml b/media-gfx/openexr_viewers/metadata.xml
deleted file mode 100644
index 80b95a6d4e5..00000000000
--- a/media-gfx/openexr_viewers/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>media-video@gentoo.org</email>
- </maintainer>
- <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.3.0.ebuild b/media-gfx/openexr_viewers/openexr_viewers-2.3.0.ebuild
deleted file mode 100644
index 3c0b4ab6335..00000000000
--- a/media-gfx/openexr_viewers/openexr_viewers-2.3.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic
-
-DESCRIPTION="OpenEXR Viewers"
-HOMEPAGE="https://www.openexr.com/"
-SRC_URI="https://github.com/openexr/openexr/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="cg"
-
-RDEPEND="
- ~media-libs/ilmbase-${PV}:=
- ~media-libs/openexr-${PV}:=
- virtual/opengl
- x11-libs/fltk:1[opengl]
- cg? ( media-gfx/nvidia-cg-toolkit )
-"
-
-DEPEND="
- ${RDEPEND}
- virtual/pkgconfig
-"
-
-DOCS=( ChangeLog README.md )
-
-PATCHES=(
- "${FILESDIR}/${P}-fix-configure.patch"
- "${FILESDIR}/${P}--with-cg-libdir.patch"
-)
-
-src_prepare() {
- default
- sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die
- eautoreconf
-}
-
-src_configure() {
- local myeconfargs=(
- --disable-openexrctltest
- --with-fltk-config="/usr/bin/fltk-config"
- )
-
- if use cg; then
- 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
-
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- emake \
- DESTDIR="${D}" \
- docdir=/usr/share/doc/${PF}/pdf \
- install
-
- einstalldocs
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-03-31 6:31 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-03-31 6:31 [gentoo-commits] repo/gentoo:master commit in: media-gfx/openexr_viewers/, media-gfx/openexr_viewers/files/ Joonas Niilola
-- strict thread matches above, loose matches on Subject: below --
2019-06-04 5:43 Andreas K. Hüttel
2018-10-11 18:42 Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox