From: "Markus Meier" <maekke@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] dev/maekke:master commit in: media-gfx/pfstools/
Date: Wed, 23 Oct 2013 18:11:58 +0000 (UTC) [thread overview]
Message-ID: <1382552275.ef1beeee13620cbb22dc84016ce435b3c282e959.maekke@gentoo> (raw)
commit: ef1beeee13620cbb22dc84016ce435b3c282e959
Author: Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 23 18:17:55 2013 +0000
Commit: Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Wed Oct 23 18:17:55 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/maekke.git;a=commit;h=ef1beeee
bump to 1.8.5, fix qt4 support, bump EAPI
Package-Manager: portage-2.2.7
Manifest-Sign-Key: 072AD062
---
media-gfx/pfstools/ChangeLog | 23 ---------
media-gfx/pfstools/Manifest | 17 +++++--
media-gfx/pfstools/pfstools-1.8.1.ebuild | 54 ----------------------
...pfstools-1.8.4.ebuild => pfstools-1.8.5.ebuild} | 35 +++++++-------
4 files changed, 29 insertions(+), 100 deletions(-)
diff --git a/media-gfx/pfstools/ChangeLog b/media-gfx/pfstools/ChangeLog
deleted file mode 100644
index fe560f5..0000000
--- a/media-gfx/pfstools/ChangeLog
+++ /dev/null
@@ -1,23 +0,0 @@
-# ChangeLog for media-gfx/pfstools
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-*pfstools-1.8.4 (05 Jul 2011)
-
- 05 Jul 2011; Markus Meier <maekke@gentoo.org> pfstools-1.8.1.ebuild,
- +pfstools-1.8.4.ebuild:
- version bump, qt4 support disabled as detection doesn't work yet. remove qt3
- support from 1.8.1
-
- 24 Oct 2010; Markus Meier <maekke@gentoo.org> pfstools-1.8.1.ebuild:
- virtual/glut -> media-libs/freeglut
-
- 30 Oct 2009; Markus Meier <maekke@gentoo.org> pfstools-1.8.1.ebuild:
- add amd64 keyword
-
-*pfstools-1.8.1 (29 Oct 2009)
-
- 29 Oct 2009; Markus Meier <maekke@gentoo.org> +pfstools-1.8.1.ebuild,
- +files/pfstools-1.8.1-glibc-2.10.patch, +metadata.xml:
- initial import of pfstools, ebuild by me
-
diff --git a/media-gfx/pfstools/Manifest b/media-gfx/pfstools/Manifest
index 2c2f837..5fa3577 100644
--- a/media-gfx/pfstools/Manifest
+++ b/media-gfx/pfstools/Manifest
@@ -1,8 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
AUX pfstools-1.8.1-glibc-2.10.patch 447 SHA256 30a4ffe98f68a082bad6938506f96f83151fb6a3c31400f1f22b6cbb260079de SHA512 d8aec79be9d8a8ae0132ccf58bb9b2d9b3b41d142dba075668d0b39f05dc0803ca5fff949cb3bef466f692e63f952aeb282b2eb358427827d679bbe119e5161c WHIRLPOOL 22a92dd372c4c4c8e1908cae7f476bbe223ead5af4c2c262f2e26bbdc03710bbdbe81a6c98bc814eba135cd0e67386d0d454b9bd0490a4ca21c16904e3848920
AUX pfstools-1.8.4-fixmoc.patch 240 SHA256 e1e0b0c98b91d148a83121cdc40e79051fef719817e3ce4e59e3af41d81f4721 SHA512 435acce900e1f76adec9f4b4822363ccb1da3478edda57a293c1ee25cfad6efc12b1cbdc7dd7c6dda207b85aa93b586c4ecef75b1b86d73c978c7091361f8557 WHIRLPOOL 7dba063959012aabb0b83b1286b7ab771cf5e2fece744f243c94ce8daccd30d9e0a9587ca684a48201be7aa26c94e6f303130c4ab233a983e23034d549b9d7d9
-DIST pfstools-1.8.1.tar.gz 773999 SHA256 8c34445b4ac467f0bb5b2d69275257b335835ebf3a156bfbf08a7bb10652f59d
-DIST pfstools-1.8.4.tar.gz 843942 SHA256 584ccd9d753428645053730c49802cc44a24839ca03fe1824ffb12efa6f70bcf SHA512 925455b73439ecf119bd2d6afa5f39525c8bfca355837581759a67e9ac7fe0d1e05a365933b201cacc0691e68ad7ad10013e02f2ca94ad12d91d61557a0edd5e WHIRLPOOL 6a86945f3e9aa09600144432f0b5f9919ce56f476963ad90e78d699b9577492db493318c25ac62d73d29a6ab888bc262d690e96c67ccf37c55209edc14a8cdc6
-EBUILD pfstools-1.8.1.ebuild 1335 SHA256 ce40b48c21393f59b3b7d3d04e43314a3cc526c898a8df15c4d89e19ea04a14a SHA512 6ce1d1fb9253fa11623e193f3f393440acdd71994889d9177c71e3d925377c8c25a0efcbae8490b3e378e568ea25488a588b7d8ca29851eca1e29afbc5aeaba1 WHIRLPOOL 7f74ff132a82b8066d4bacdc07da212f98968fef019d228bd612e74ee3a2b70e346e048d7fcb0d7b2f7721740551c3c2dc713c1e2f821f2d8bbad47c4e428718
-EBUILD pfstools-1.8.4.ebuild 1742 SHA256 77bef1d50a89cc9bd6e898fe72f013ae6a446e866aab150ad1f3c9ec3c316ff6 SHA512 dfe3862d8742d662caf56b87f0ed58b14177474238b08633c73176d4267e4c3dd79085f76d76695664c0e2a65283a1b6f81ff0010b37f175f06e8b841cbbcad7 WHIRLPOOL bcc9c7cea88b4d07330281b572b4ee739e62483032579deffed1cfbd5bcd5a24f4e9253638e4e7fe32c1aa02210920ad962b0939575b9c4b601e0911cd3dca2e
-MISC ChangeLog 754 SHA256 8045022f71dfe4655d0baccd6e316cd6ce8054692dd3ce466686f63a3ace4446 SHA512 810bd918d55935a93f40118b3cacc00268f8f4a42f836448b2a89a0031b2dc33821c70feb4d81e494a8b517433034fbf8b01a51182907d191cd0ff7df5c5c296 WHIRLPOOL b0562bde4a977d20524ccec28ee1875205ccf4e577a0ff211846a405600ea564fd9b7e6c131694d1f69f22240e7686d7acff7402a4eaa682c76914547a51da8b
+DIST pfstools-1.8.5.tar.gz 846001 SHA256 2cf958d39ee3b65b034796b0abeea727590561936e295461de6365a750167306 SHA512 1ff1d540ae6182b023942466cd687e5b3a37dc8c3a6dc30c2d089dc630d7b945f7d0b47c8ab3cd759c3ec862ddca80c657101a6136e790179d8c5f002a63ea5f WHIRLPOOL b239f747f575c46e08388be91560a34f97ef1c2aab3598ca3ec7c56d674563f355ca7e84419cd3ac74a3d9c831135ddf6039e5df04d670ba64e61bea6b4a5765
+EBUILD pfstools-1.8.5.ebuild 1625 SHA256 fe53ca067cb13075f8eff413e288566dd310757dcd1a5218db65f773e2690b78 SHA512 1488c37fea39037645cfa1b6f1fdbdf90354bee8f28af7b84e4113eada1b6cc4d78b755d178a9f87d5377b27d27550db055b0754a1659c92e9948ce11263fb38 WHIRLPOOL 26d9a6a63fcef50e1e0af96d65505f4860acbb56330afca79c1e3ae3e20bf915635151c25e7c4f8dd6e77d89beacc8f6d708167ddca0de743116821359f866a1
MISC metadata.xml 717 SHA256 40274d0185631b8bb3dd8ded83ebeaac1349b89780dbf54e741f679bab54b3bd SHA512 05bc2ee037b6e7c4c64ab84f0a816ecdf4af6294cdf078ecf1f9e227a45584c36aae91243a9b010600447127e215ffce12044d0f03c52f92ab14bc0672ca8902 WHIRLPOOL fd57580ecb3c07df04eccb22b8ea13042137fc960a8c2271b05bcc21521c84dbada8e4d1048b97ac4ed6338e517d1cbb787a38ab5ada82fd57c53e5ad995cfde
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iEYEAREIAAYFAlJoEtMACgkQkKaRLQcq0GK+iACcDFe0GlVu0t6OHM7Azx83R6eb
+/60AnAqYF7FrTHzwktagIfkXa+DQdDNk
+=f8u0
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/pfstools/pfstools-1.8.1.ebuild b/media-gfx/pfstools/pfstools-1.8.1.ebuild
deleted file mode 100644
index e29a9a0..0000000
--- a/media-gfx/pfstools/pfstools-1.8.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit base multilib
-
-DESCRIPTION="${PN} package is a set of command line programs for reading,
-writing and manipulating HDR images"
-HOMEPAGE="http://pfstools.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug gdal imagemagick netpbm octave openexr opengl static-libs tiff"
-
-DEPEND="
- gdal? ( sci-libs/gdal )
- imagemagick? ( >=media-gfx/imagemagick-6.0 )
- netpbm? ( media-libs/netpbm )
- octave? ( sci-mathematics/octave )
- openexr? ( >=media-libs/openexr-1.0 )
- opengl? ( media-libs/freeglut )
- tiff? ( media-libs/tiff )"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-glibc-2.10.patch )
-
-src_configure() {
- # TODO set current octave version --with-octversion
- econf \
- --disable-jpeghdr \
- --disable-matlab \
- $(use_enable debug) \
- $(use_enable gdal) \
- $(use_enable imagemagick) \
- $(use_enable netpbm) \
- $(use_enable octave) \
- $(use_enable openexr) \
- $(use_enable opengl) \
- $(use_enable static-libs static) \
- $(use_enable tiff)
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die
- dodoc AUTHORS ChangeLog README || die
-
- if ! use static-libs; then
- rm "${D}"/usr/$(get_libdir)/*.la || die
- fi
-}
diff --git a/media-gfx/pfstools/pfstools-1.8.4.ebuild b/media-gfx/pfstools/pfstools-1.8.5.ebuild
similarity index 66%
rename from media-gfx/pfstools/pfstools-1.8.4.ebuild
rename to media-gfx/pfstools/pfstools-1.8.5.ebuild
index 01ab8ae..421d0a3 100644
--- a/media-gfx/pfstools/pfstools-1.8.4.ebuild
+++ b/media-gfx/pfstools/pfstools-1.8.5.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI="2"
+EAPI="5"
-inherit base multilib
+inherit base multilib autotools toolchain-funcs
DESCRIPTION="${PN} package is a set of command line programs for reading,
writing and manipulating HDR images"
@@ -14,15 +14,14 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-# TODO qt4 - detection doesn't work yet
-IUSE="debug gdal imagemagick netpbm octave openexr opengl static-libs tiff qt4"
+IUSE="debug gdal imagemagick netpbm octave openexr opengl qt4 static-libs tiff"
RDEPEND="
gdal? ( sci-libs/gdal )
imagemagick? ( >=media-gfx/imagemagick-6.0 )
netpbm? ( media-libs/netpbm )
octave? ( sci-mathematics/octave )
- openexr? ( >=media-libs/openexr-1.0 )
+ openexr? ( >=media-libs/openexr-1.0:0= )
opengl? ( media-libs/freeglut )
tiff? ( media-libs/tiff )"
DEPEND="${DEPEND}
@@ -31,12 +30,20 @@ DEPEND="${DEPEND}
PATCHES=( "${FILESDIR}"/${PN}-1.8.1-glibc-2.10.patch
"${FILESDIR}"/${PN}-1.8.4-fixmoc.patch )
+src_prepare() {
+ base_src_prepare || die
+ eautoreconf
+}
+
src_configure() {
# TODO set current octave version --with-octversion
+
+ export QT_CFLAGS="$($(tc-getPKG_CONFIG) QtGui --cflags)"
+ export QT_LIBS="$($(tc-getPKG_CONFIG) QtGui --libs)"
+
econf \
--disable-jpeghdr \
--disable-matlab \
-
$(use_enable debug) \
$(use_enable gdal) \
$(use_enable imagemagick) \
@@ -46,20 +53,12 @@ src_configure() {
$(use_enable opengl) \
$(use_enable static-libs static) \
$(use_enable tiff) \
- #--disable-qt
- --with-moc moc
- $(use_with qt4 x)\
- $(use_enable qt4 gui qt)\
- #$(use_enable qt4 qt) \
- $(use_with qt4 moc moc) \
- #$(use_with qt4 qtinclude /usr/include/qt4) \
- #$(use_with qt4 qtlibs /usr/$(get_libdir)/qt4) \
- #$(use_with qt4 qtdir /usr/$(get_libdir)/qt4)
+ $(use_enable qt4 qt)
}
src_install() {
- emake DESTDIR="${D}" install || die
- dodoc AUTHORS ChangeLog README || die
+ emake DESTDIR="${D}" install
+ dodoc AUTHORS ChangeLog README
if ! use static-libs; then
rm "${D}"/usr/$(get_libdir)/*.la || die
next reply other threads:[~2013-10-23 18:12 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-23 18:11 Markus Meier [this message]
-- strict thread matches above, loose matches on Subject: below --
2016-03-10 17:35 [gentoo-commits] dev/maekke:master commit in: media-gfx/pfstools/ Markus Meier
2015-11-07 7:34 Markus Meier
2015-08-18 19:55 Markus Meier
2014-03-08 13:04 Markus Meier
2014-03-08 13:04 Markus Meier
2011-07-05 20:59 Markus Meier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1382552275.ef1beeee13620cbb22dc84016ce435b3c282e959.maekke@gentoo \
--to=maekke@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox