diff options
author | Andrew Savchenko <bircoph@gentoo.org> | 2015-04-05 13:23:57 +0300 |
---|---|---|
committer | Andrew Savchenko <bircoph@gentoo.org> | 2015-04-05 13:23:57 +0300 |
commit | 5da44762c108d7ab9a2320ac660410771635901c (patch) | |
tree | 63daf4f7f4396487f27bd3ceaa7e8bfe3aa3fc18 /media-gfx | |
parent | openafs{,-kernel}: in portage tree now (diff) | |
download | bircoph-5da44762c108d7ab9a2320ac660410771635901c.tar.gz bircoph-5da44762c108d7ab9a2320ac660410771635901c.tar.bz2 bircoph-5da44762c108d7ab9a2320ac660410771635901c.zip |
enblend: fix bug 489718
Fix cmake's vigra check.
Diffstat (limited to 'media-gfx')
-rw-r--r-- | media-gfx/enblend/ChangeLog | 245 | ||||
-rw-r--r-- | media-gfx/enblend/Manifest | 5 | ||||
-rw-r--r-- | media-gfx/enblend/enblend-4.1.3.ebuild | 77 | ||||
-rw-r--r-- | media-gfx/enblend/files/enblend-4.1.3-vigra_check.patch | 11 | ||||
-rw-r--r-- | media-gfx/enblend/metadata.xml | 9 |
5 files changed, 347 insertions, 0 deletions
diff --git a/media-gfx/enblend/ChangeLog b/media-gfx/enblend/ChangeLog new file mode 100644 index 0000000..e4eee0b --- /dev/null +++ b/media-gfx/enblend/ChangeLog @@ -0,0 +1,245 @@ +# ChangeLog for media-gfx/enblend +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/enblend/ChangeLog,v 1.61 2014/12/20 16:28:53 maekke Exp $ + + 20 Dec 2014; Markus Meier <maekke@gentoo.org> enblend-4.1.3.ebuild: + move boost to RDEPEND by Nikoli in bug #531924 + + 22 Oct 2014; Markus Meier <maekke@gentoo.org> enblend-4.1.3.ebuild: + work around sys-apps/texinfo-5.1 incompatibility for bug #479978 and fix doc + path + + 15 Jun 2014; Markus Meier <maekke@gentoo.org> enblend-4.1.2.ebuild, + enblend-4.1.3.ebuild: + add missing sys-apps/help2man to DEPEND by Raffaello D. Di Napoli in bug + #467140 + +*enblend-4.1.3 (23 May 2014) + + 23 May 2014; Tim Harder <radhermit@gentoo.org> +enblend-4.1.3.ebuild: + Version bump. + +*enblend-4.1.2 (26 Nov 2013) + + 26 Nov 2013; Justin Lecher <jlec@gentoo.org> +enblend-4.1.2.ebuild, + metadata.xml: + Version BUmp + + 09 Sep 2013; Markus Meier <maekke@gentoo.org> enblend-4.1.1-r1.ebuild: + add slot operator deps for media-libs/openexr and dev-libs/boost + + 08 Sep 2013; Markus Meier <maekke@gentoo.org> enblend-4.1.1-r1.ebuild: + fix USE=gpu cmake configure argument by Nikoli in bug #484118 + +*enblend-4.1.1-r1 (06 Sep 2013) + + 06 Sep 2013; Markus Meier <maekke@gentoo.org> +enblend-4.1.1-r1.ebuild: + add CMake based ebuild, using EAPI=5, should fix bug #476836 and bug #460274 + + 08 May 2013; Tim Harder <radhermit@gentoo.org> -enblend-4.0.ebuild, + -files/enblend-4.0-libpng14.patch, -files/enblend-4.0-libpng15.patch, + -enblend-4.1.ebuild: + Remove old. + + 11 Apr 2013; Vicente Olivert Riera <vincent@gentoo.org> enblend-4.1.1.ebuild: + amd64, ppc and x86 stable, wrt bug #465428 + +*enblend-4.1.1 (03 Mar 2013) + + 03 Mar 2013; Markus Meier <maekke@gentoo.org> +enblend-4.1.1.ebuild: + version bump + + 11 Dec 2012; Markus Meier <maekke@gentoo.org> enblend-4.1.ebuild: + add missing sci-libs/gsl dependency by Martin Jansa in bug #446816 + +*enblend-4.1 (09 Dec 2012) + + 09 Dec 2012; Markus Meier <maekke@gentoo.org> +enblend-4.1.ebuild: + version bump + + 05 May 2012; Jeff Horelick <jdhore@gentoo.org> enblend-4.0.ebuild: + dev-util/pkgconfig -> virtual/pkgconfig + + 28 Jan 2012; Christoph Junghans <ottxor@gentoo.org> enblend-4.0.ebuild: + fix bug #347786 + + 12 Aug 2011; Samuli Suominen <ssuominen@gentoo.org> enblend-4.0.ebuild: + Seems the -libpng15.patch isn't entirely compatible with libpng14, apply + workaround from bug #378677 + + 07 Aug 2011; Samuli Suominen <ssuominen@gentoo.org> enblend-4.0.ebuild, + +files/enblend-4.0-libpng15.patch: + Fix building with libpng15 wrt #355893 by Mike Frysinger + + 08 Nov 2010; Markus Meier <maekke@gentoo.org> enblend-4.0.ebuild: + change jpeg dep to virtual/jpeg + + 16 Sep 2010; Tomáš Chvátal <scarabeus@gentoo.org> enblend-4.0.ebuild: + virtual/glut -> media-libs/glut + + 21 Jun 2010; Samuli Suominen <ssuominen@gentoo.org> enblend-4.0.ebuild: + Restrict media-libs/lcms depend to old version. + + 28 May 2010; Markus Meier <maekke@gentoo.org> -enblend-3.2.ebuild: + old + + 28 May 2010; Markus Meier <maekke@gentoo.org> enblend-4.0.ebuild: + x86 stable, bug #320409 + + 24 May 2010; <nixnut@gentoo.org> enblend-4.0.ebuild: + ppc stable #320409 + + 21 May 2010; Markos Chandras <hwoarang@gentoo.org> enblend-4.0.ebuild: + Stable on amd64 wrt bug #320409 + + 08 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> enblend-4.0.ebuild, + +files/enblend-4.0-libpng14.patch: + Fix building with libpng14. + +*enblend-4.0 (18 Dec 2009) + + 18 Dec 2009; Markus Meier <maekke@gentoo.org> -enblend-4.0_rc2.ebuild, + -enblend-4.0_rc3.ebuild, +enblend-4.0.ebuild: + version bump to final 4.0 release + +*enblend-4.0_rc3 (05 Dec 2009) + + 05 Dec 2009; Markus Meier <maekke@gentoo.org> +enblend-4.0_rc3.ebuild: + version bump + +*enblend-4.0_rc2 (29 Nov 2009) + + 29 Nov 2009; Markus Meier <maekke@gentoo.org> +enblend-4.0_rc2.ebuild, + metadata.xml: + version bump to 4.0_rc2 release + + 14 Nov 2009; Markus Meier <maekke@gentoo.org> enblend-3.2.ebuild: + boost dep is DEPEND only, bug #293069 + + 16 Aug 2009; Markus Meier <maekke@gentoo.org> enblend-3.2.ebuild: + migrate to EAPI=2 + + 08 Dec 2008; Markus Meier <maekke@gentoo.org> + -files/enblend-3.0-amd64_compilation.patch, + -files/enblend-3.0-endless_loop_anneal.patch, + -files/enblend-3.0-gcc43.patch, -enblend-3.0.ebuild: + old + + 06 Dec 2008; nixnut <nixnut@gentoo.org> enblend-3.2.ebuild: + Stable on ppc wrt bug 249380 + + 28 Nov 2008; Markus Meier <maekke@gentoo.org> enblend-3.2.ebuild: + force -j1 as this package needs about 1 GB RAM for every parallel compile + instance, bug #249033 + + 22 Nov 2008; Markus Meier <maekke@gentoo.org> enblend-3.2.ebuild: + amd64/x86 stable, bug #246827 + + 26 Oct 2008; Mike Frysinger <vapier@gentoo.org> enblend-3.2.ebuild: + Do not force building with -O3. + + 06 Oct 2008; Markus Meier <maekke@gentoo.org> + -enblend-3.0_p20080807.ebuild: + old + + 10 Sep 2008; Markus Meier <maekke@gentoo.org> enblend-3.2.ebuild: + remove unneeded src_unpack + +*enblend-3.2 (10 Sep 2008) + + 10 Sep 2008; Markus Meier <maekke@gentoo.org> +enblend-3.2.ebuild: + bump to version 3.2, reported in bug #237261 + +*enblend-3.0_p20080807 (16 Aug 2008) + + 16 Aug 2008; Markus Meier <maekke@gentoo.org> + +enblend-3.0_p20080807.ebuild: + snapshot-bump, required for hugin-0.7.0_rc2 + + 02 May 2008; Markus Meier <maekke@gentoo.org> + +files/enblend-3.0-gcc43.patch, -enblend-2.3.ebuild, -enblend-2.5.ebuild, + enblend-3.0.ebuild: + fix building with gcc-4.3 by Peter Alfredsen in bug #219779; remove old + + 22 Dec 2007; Tobias Scherbaum <dertobi123@gentoo.org> enblend-3.0.ebuild: + ppc stable, bug #202095 + + 18 Dec 2007; Markus Meier <maekke@gentoo.org> enblend-3.0.ebuild: + plotutils needs to be built with X, bug #202476 + + 17 Dec 2007; Christian Faulhammer <opfer@gentoo.org> enblend-3.0.ebuild: + stable x86, bug 202095 + + 16 Dec 2007; Samuli Suominen <drac@gentoo.org> enblend-3.0.ebuild: + amd64 stable wrt #202095 + + 12 Dec 2007; Markus Meier <maekke@gentoo.org> enblend-3.0.ebuild: + add a warning, that you need enough ram to compile this package + + 16 Apr 2007; Christian Faulhammer <opfer@gentoo.org> enblend-2.5.ebuild: + stable amd64, bug 173068 + + 08 Apr 2007; Joseph Jezak <josejx@gentoo.org> enblend-2.5.ebuild: + Marked ppc stable for bug #173068. + + 22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog: + Transition to Manifest2. + +*enblend-3.0 (05 Feb 2007) + + 05 Feb 2007; Marcelo Goes <vanquirius@gentoo.org> + +files/enblend-3.0-amd64_compilation.patch, + +files/enblend-3.0-endless_loop_anneal.patch, +enblend-3.0.ebuild: + 3.0 version bump for bug 164677. Thanks to Ralph Holz <ralph-bugzillagentoo + at ralphholz dot de>, Tim Harder <thorium90 at gmail dot com>, Hal Engel + <hvengel at astound dot net> and Christian Kanzian <christian.kanzian at gmx + dot at>. + + 15 Jul 2006; Bryan Østergaard <kloeri@gentoo.org> metadata.xml: + Remove halcy0n from metadata.xml as he's retired. + + 18 Apr 2006; Mark Loeser <halcy0n@gentoo.org> enblend-2.5.ebuild: + Stable on x86 + + 20 Feb 2006; Mark Loeser <halcy0n@gentoo.org> metadata.xml: + metadata.xml cleanup + +*enblend-2.5 (18 Dec 2005) + + 18 Dec 2005; Mark Loeser <halcy0n@gentoo.org> -enblend-2.1.ebuild, + -enblend-2.2.ebuild, +enblend-2.5.ebuild: + Bump to 2.5 and clean out some old versions + + 06 Nov 2005; Luis Medinas <metalgod@gentoo.org> enblend-2.3.ebuild: + Marked Stable on amd64. + + 13 Sep 2005; Mark Loeser <halcy0n@gentoo.org> enblend-2.3.ebuild: + Stable on x86 + + 06 Sep 2005; Olivier Crête <tester@gentoo.org> enblend-2.2.ebuild: + Stable on amd64 + +*enblend-2.3 (11 Aug 2005) + + 11 Aug 2005; Mark Loeser <halcy0n@gentoo.org> metadata.xml, + enblend-2.2.ebuild, +enblend-2.3.ebuild: + Version bump to enblend-2.3. bug #93305 + enblend-2.2 stable on x86 + + 21 Apr 2005; Herbie Hopkins <herbs@gentoo.org> enblend-2.2.ebuild: + ~amd64 keyword added + +*enblend-2.2 (21 Apr 2005) + + 21 Apr 2005; Luca Barbato <lu_zero@gentoo.org> +enblend-2.2.ebuild: + New version + + 07 Apr 2005; Marcus D. Hanwell <cryos@gentoo.org> enblend-2.1.ebuild: + Marked ~amd64, closes bug 87438. + +*enblend-2.1 (24 Feb 2005) + + 24 Feb 2005; Luca Barbato <lu_zero@gentoo.org> +metadata.xml, + +enblend-2.1.ebuild: + First commit, thanks to David Grant <david.grant@telus.net> for the updated + ebuild diff --git a/media-gfx/enblend/Manifest b/media-gfx/enblend/Manifest new file mode 100644 index 0000000..0ad26dd --- /dev/null +++ b/media-gfx/enblend/Manifest @@ -0,0 +1,5 @@ +AUX enblend-4.1.3-vigra_check.patch 464 SHA256 e3f4d417908c188284302882f8a35cbc0e8b69ad872699c476caff7ee723929a SHA512 e6a84c74220fcd985704d4b071ecc6f37dde8582ca9089a3dd0a782d739550e0479e52632324d25462fc59145e2309e21bdb406ad89b03902fa933b3322caab1 WHIRLPOOL db10e43c61758d32e0a401eedbb7258a160071f85823e35bd4f8207216a7c431645060493d1fce47d9b7e4e4aafb7e39c33857a4214d38a77bbf495333c69403 +DIST enblend-enfuse-4.1.3.tar.gz 862079 SHA256 1c00ae95cd05502759d7d47f99e6ba1150f8807f8f4f46c800cd46c5ad0df9ac SHA512 0a3487783afadee896b84411330898393cda4be4cbb79d36013daa98c17ab88f97a298c21a5c398b7cb2ce83e8dc4519a80e18be472c5fec10c3114037b6db73 WHIRLPOOL ab33a8ca5c38d9a5dca6aaeed7cbc806f7c34c5642f9e568a90d14789ecede896c0da888e5fe7e7d30e586778e0734495d06055fc189732e55bc0c013e699b48 +EBUILD enblend-4.1.3.ebuild 1857 SHA256 cc462c7ebafb1b6e7b609d8c2201c1481503121ed763d72c58c3cd9f9b6121f9 SHA512 657884f94276b2c045793df19407753fbf029ad7cef1da085e11cb0037861bba6d18cc82c26846d129cc8ce14dd756df78bac6bb597ec17cf0e473104257c026 WHIRLPOOL d6337f3208c59ad026e2e7d75cacdafa3eaa4748c3a812233bfdaa8e0c482eca18d8c65af73dc6ac64f7e9332348c533ca4543b54590536af62aedc2c572b427 +MISC ChangeLog 8266 SHA256 440438260d856b709651b399afdfea9559441323975ea00268fdc2964685265a SHA512 68160cb2828b5f7757469fd4be7829d68d5a9fa720c15457ff674685fa5612f62b1b5a7f2b486f631188146afa808a10772df56bd3b9b26bf0383377dff1e241 WHIRLPOOL 06cf0b372dbda57ef8a0396b3a9bdbcc41ff01e9ddcf975dad1c5e3d028d202e6ebb4e703e5192e08749b6ebaed860d9bb6370cf033ec1a043749cecc7262580 +MISC metadata.xml 305 SHA256 4e06be2c7d3ea7e6b48e1c938b3c189c8306f03260145f803ba70bb34e6f156a SHA512 3e155dedb4d84c0b03cb5cf386e5ff95aaa9270fe2806c4dfb0e6d51d7d1b36f748cb973812440932fbd167c49a86fdb4ae1758caad406e98108555972d79c95 WHIRLPOOL 863ba9ae8ce5eef6b26682a81b0babe689097bbf29654516f5184f48e78e000844ab2701dd48c48d31d8eed472a8f7fd4377c5344e4d7120f9369eb75cd3d4d2 diff --git a/media-gfx/enblend/enblend-4.1.3.ebuild b/media-gfx/enblend/enblend-4.1.3.ebuild new file mode 100644 index 0000000..5089d38 --- /dev/null +++ b/media-gfx/enblend/enblend-4.1.3.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/enblend/enblend-4.1.3.ebuild,v 1.4 2014/12/20 16:28:53 maekke Exp $ + +EAPI=5 + +inherit cmake-utils + +MY_P="${PN}-enfuse-${PV/_rc/rc}" + +DESCRIPTION="Image Blending with Multiresolution Splines" +HOMEPAGE="http://enblend.sourceforge.net/" +SRC_URI="mirror://sourceforge/enblend/${MY_P}.tar.gz" + +LICENSE="GPL-2 VIGRA" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="debug doc gpu image-cache openmp" + +REQUIRED_USE="openmp? ( !image-cache )" + +RDEPEND=" + >=dev-libs/boost-1.31.0:= + media-libs/glew + >=media-libs/lcms-2.5:2 + >=media-libs/libpng-1.2.43:0= + >=media-libs/openexr-1.0:= + media-libs/plotutils[X] + media-libs/tiff + >=media-libs/vigra-1.8.0 + sci-libs/gsl + virtual/jpeg:0= + debug? ( dev-libs/dmalloc ) + gpu? ( media-libs/freeglut )" +DEPEND="${RDEPEND} + sys-apps/help2man + virtual/pkgconfig + doc? ( + media-gfx/imagemagick + media-gfx/transfig + sci-visualization/gnuplot[gd] + virtual/latex-base + )" + +S="${WORKDIR}/${MY_P}" + +PATCHES=( "${FILESDIR}/${PN}-4.1.3-vigra_check.patch" ) + +src_prepare() { + sed -i -e "/CXX_FLAGS/s:-O3::g" CMakeLists.txt || die + sed -i -e "s:doc/enblend:share/doc/${PF}:" doc/CMakeLists.txt || die + cmake-utils_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DCMAKE_CXX_FLAGS_RELEASE="" + -DMAKEINFO_EXE="/bin/true" + $(cmake-utils_use_enable debug DMALLOC) + $(cmake-utils_use doc DOC) + $(cmake-utils_use_enable image-cache IMAGECACHE) + $(cmake-utils_use_enable openmp) + $(cmake-utils_use_enable gpu) + ) + CMAKE_BUILD_TYPE="Release" + cmake-utils_src_configure +} + +src_compile() { + # forcing -j1 as every parallel compilation process needs about 1 GB RAM. + cmake-utils_src_compile -j1 +} + +src_install() { + local DOCS=( AUTHORS ChangeLog NEWS README ) + cmake-utils_src_install +} diff --git a/media-gfx/enblend/files/enblend-4.1.3-vigra_check.patch b/media-gfx/enblend/files/enblend-4.1.3-vigra_check.patch new file mode 100644 index 0000000..982293e --- /dev/null +++ b/media-gfx/enblend/files/enblend-4.1.3-vigra_check.patch @@ -0,0 +1,11 @@ +--- ConfigureChecks.cmake.orig 2013-10-07 10:50:00.000000000 +0400 ++++ ConfigureChecks.cmake 2015-03-31 13:42:40.179527224 +0300 +@@ -53,7 +53,7 @@ + if(VIGRA_FOUND AND NOT VIGRA_VERSION_CHECK) + unset(VIGRA_SETIMAGEINDEX CACHE) + set(CMAKE_REQUIRED_INCLUDES ${VIGRA_INCLUDE_DIR}) +- set(CMAKE_REQUIRED_LIBRARIES ${VIGRA_LIBRARIES}) ++ set(CMAKE_REQUIRED_LIBRARIES ${VIGRA_LIBRARIES} -lpthread) + check_cxx_source_compiles( + " + #include <vigra/imageinfo.hxx> diff --git a/media-gfx/enblend/metadata.xml b/media-gfx/enblend/metadata.xml new file mode 100644 index 0000000..db61829 --- /dev/null +++ b/media-gfx/enblend/metadata.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <herd>graphics</herd> + <use> + <flag name="gpu">GPU support for Enblend</flag> + <flag name="image-cache">allow for processing of large images</flag> + </use> +</pkgmetadata> |