* [gentoo-commits] dev/maekke:master commit in: media-gfx/hugin/files/, media-gfx/hugin/
@ 2011-10-02 21:37 Markus Meier
0 siblings, 0 replies; 9+ messages in thread
From: Markus Meier @ 2011-10-02 21:37 UTC (permalink / raw
To: gentoo-commits
commit: b0f1b599f6f37d46de98de4a02d815df11c77565
Author: Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 2 21:39:19 2011 +0000
Commit: Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Sun Oct 2 21:39:19 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/maekke.git;a=commit;h=b0f1b599
final version in gentoo-x86
---
media-gfx/hugin/ChangeLog | 520 --------------------
media-gfx/hugin/Manifest | 30 --
.../hugin/files/hugin-2010.0.0_rc1-libpng14.patch | 15 -
.../hugin/files/hugin-2011.0.0_rc1-libpng15.patch | 275 -----------
media-gfx/hugin/hugin-2010.0.0.ebuild | 61 ---
media-gfx/hugin/hugin-2010.2.0.ebuild | 59 ---
media-gfx/hugin/hugin-2010.4.0.ebuild | 64 ---
media-gfx/hugin/hugin-2011.0.0.ebuild | 61 ---
media-gfx/hugin/hugin-2011.2.0_beta1.ebuild | 66 ---
media-gfx/hugin/hugin-2011.2.0_rc1.ebuild | 66 ---
media-gfx/hugin/hugin-2011.2.0_rc4.ebuild | 66 ---
media-gfx/hugin/hugin-2011.2.0_rc5.ebuild | 66 ---
media-gfx/hugin/metadata.xml | 11 -
13 files changed, 0 insertions(+), 1360 deletions(-)
diff --git a/media-gfx/hugin/ChangeLog b/media-gfx/hugin/ChangeLog
deleted file mode 100644
index 7c8c18a..0000000
--- a/media-gfx/hugin/ChangeLog
+++ /dev/null
@@ -1,520 +0,0 @@
-# ChangeLog for media-gfx/hugin
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/ChangeLog,v 1.112 2011/05/29 21:07:01 maekke Exp $
-
-*hugin-2011.0.0 (29 May 2011)
-
- 29 May 2011; Markus Meier <maekke@gentoo.org> -hugin-2011.0.0_rc1.ebuild,
- +hugin-2011.0.0.ebuild:
- version bump
-
- 20 May 2011; Markus Meier <maekke@gentoo.org> hugin-2011.0.0_rc1.ebuild:
- add ro to LANGS, update enblend version
-
- 18 May 2011; Tim Harder <radhermit@gentoo.org> hugin-2011.0.0_rc1.ebuild:
- Bump libpano13 dependency (bug #367917 by Daniel Neugebauer).
-
-*hugin-2011.0.0_rc1 (18 May 2011)
-
- 18 May 2011; Tim Harder <radhermit@gentoo.org> +hugin-2011.0.0_rc1.ebuild,
- +files/hugin-2011.0.0_rc1-libpng15.patch:
- Version bump to release candidate. Remove old post install message, bump to
- EAPI 4, apply patch for libpng-1.5 (bug #355885).
-
- 13 Feb 2011; Tim Harder <radhermit@gentoo.org> hugin-2010.0.0.ebuild,
- hugin-2010.2.0.ebuild, hugin-2010.4.0.ebuild:
- Depend on wxGTK with the X USE flag enabled (bug #354223 by Grygoriy
- Fuchedzhy).
-
-*hugin-2010.4.0 (01 Jan 2011)
-
- 01 Jan 2011; Markus Meier <maekke@gentoo.org> -hugin-2010.4.0_beta1.ebuild,
- -hugin-2010.4.0_beta2.ebuild, -hugin-2010.4.0_rc1.ebuild,
- -hugin-2010.4.0_rc3.ebuild, +hugin-2010.4.0.ebuild:
- version bump to 2010.4.0 final, remove beta/rc releases
-
-*hugin-2010.4.0_rc3 (28 Dec 2010)
-
- 28 Dec 2010; Markus Meier <maekke@gentoo.org> +hugin-2010.4.0_rc3.ebuild:
- version bump
-
-*hugin-2010.4.0_rc1 (25 Dec 2010)
-
- 25 Dec 2010; Markus Meier <maekke@gentoo.org> +hugin-2010.4.0_rc1.ebuild:
- version bump
-
- 05 Dec 2010; Markos Chandras <hwoarang@gentoo.org> hugin-2010.2.0.ebuild:
- Stable on amd64 wrt bug #347633
-
- 05 Dec 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
- hugin-2010.2.0.ebuild:
- x86 stable wrt bug #347633
-
-*hugin-2010.4.0_beta2 (04 Dec 2010)
-
- 04 Dec 2010; Markus Meier <maekke@gentoo.org> +hugin-2010.4.0_beta2.ebuild:
- version bump
-
-*hugin-2010.4.0_beta1 (27 Nov 2010)
-
- 27 Nov 2010; Markus Meier <maekke@gentoo.org> +hugin-2010.4.0_beta1.ebuild:
- version bump to 2010.4 beta1
-
- 08 Nov 2010; Markus Meier <maekke@gentoo.org> hugin-2010.0.0.ebuild,
- hugin-2010.2.0.ebuild:
- change jpeg dep to virtual/jpeg
-
-*hugin-2010.2.0 (13 Oct 2010)
-
- 13 Oct 2010; Markus Meier <maekke@gentoo.org>
- -hugin-2010.2.0_beta1.ebuild, -hugin-2010.2.0_beta2.ebuild,
- -hugin-2010.2.0_rc1.ebuild, -hugin-2010.2.0_rc2.ebuild,
- +hugin-2010.2.0.ebuild:
- version bump, remove prereleases
-
-*hugin-2010.2.0_rc2 (30 Sep 2010)
-
- 30 Sep 2010; Markus Meier <maekke@gentoo.org> +hugin-2010.2.0_rc2.ebuild:
- version bump
-
-*hugin-2010.2.0_rc1 (21 Sep 2010)
-
- 21 Sep 2010; Markus Meier <maekke@gentoo.org> +hugin-2010.2.0_rc1.ebuild:
- version bump
-
- 16 Sep 2010; Tomáš Chvátal <scarabeus@gentoo.org>
- hugin-2010.0.0.ebuild, hugin-2010.2.0_beta1.ebuild,
- hugin-2010.2.0_beta2.ebuild:
- virtual/glut -> media-libs/glut
-
-*hugin-2010.2.0_beta2 (05 Sep 2010)
-
- 05 Sep 2010; Markus Meier <maekke@gentoo.org>
- +hugin-2010.2.0_beta2.ebuild:
- version bump
-
-*hugin-2010.2.0_beta1 (18 Jul 2010)
-
- 18 Jul 2010; Markus Meier <maekke@gentoo.org>
- +hugin-2010.2.0_beta1.ebuild:
- version bump
-
- 27 May 2010; Markus Meier <maekke@gentoo.org> -hugin-2009.2.0.ebuild,
- -hugin-2009.4.0.ebuild:
- old
-
- 25 May 2010; Pacho Ramos <pacho@gentoo.org> hugin-2010.0.0.ebuild:
- stable amd64, bug 320411
-
- 24 May 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
- hugin-2010.0.0.ebuild:
- x86 stable wrt bug #320411
-
- 24 May 2010; <nixnut@gentoo.org> hugin-2010.0.0.ebuild:
- ppc stable #320411
-
- 28 Mar 2010; Markus Meier <maekke@gentoo.org> hugin-2010.0.0.ebuild:
- add pkgconfig to DEPEND by Nikoli in bug #311693
-
-*hugin-2010.0.0 (26 Mar 2010)
-
- 26 Mar 2010; Markus Meier <maekke@gentoo.org> -hugin-2010.0.0_rc1.ebuild,
- +hugin-2010.0.0.ebuild:
- bump to final 2010.0.0 release, remove rc version
-
- 10 Mar 2010; Samuli Suominen <ssuominen@gentoo.org>
- hugin-2010.0.0_rc1.ebuild, +files/hugin-2010.0.0_rc1-libpng14.patch:
- Fix building with libpng14.
-
-*hugin-2010.0.0_rc1 (07 Mar 2010)
-
- 07 Mar 2010; Markus Meier <maekke@gentoo.org> +hugin-2010.0.0_rc1.ebuild:
- version bump to 2010.0.0_rc1
-
- 17 Feb 2010; Markus Meier <maekke@gentoo.org> hugin-2009.4.0.ebuild:
- add virtual/glut to dependencies by Seerp in bug #305049
-
- 09 Jan 2010; Markus Meier <maekke@gentoo.org>
- -files/hugin-0.7.0-gcc44.patch, -files/hugin-0.7.0_rc2-as-needed.patch,
- -hugin-0.8.0.ebuild, -files/hugin-0.8.0_rc3-as-needed.patch,
- -files/hugin-0.8.0_rc4-use_system_cmake_findboost.patch:
- old
-
- 07 Jan 2010; Brent Baude <ranger@gentoo.org> hugin-2009.2.0.ebuild:
- Marking hugin-2009.2.0 ppc for bug 294316
-
- 20 Dec 2009; Olivier Crête <tester@gentoo.org> hugin-2009.2.0.ebuild:
- Stable on amd64, bug #294316
-
- 16 Dec 2009; Christian Faulhammer <fauli@gentoo.org>
- hugin-2009.2.0.ebuild:
- stable x86, bug 294316
-
-*hugin-2009.4.0 (16 Dec 2009)
-
- 16 Dec 2009; Markus Meier <maekke@gentoo.org> -hugin-2009.4.0_rc1.ebuild,
- -hugin-2009.4.0_rc2.ebuild, -hugin-2009.4.0_rc3.ebuild,
- +hugin-2009.4.0.ebuild:
- version bump to 2009.4.0 final release
-
-*hugin-2009.4.0_rc3 (02 Dec 2009)
-
- 02 Dec 2009; Markus Meier <maekke@gentoo.org> +hugin-2009.4.0_rc3.ebuild:
- version bump
-
- 25 Oct 2009; Markus Meier <maekke@gentoo.org> -hugin-0.7.0.ebuild:
- old
-
- 25 Oct 2009; Markus Meier <maekke@gentoo.org> hugin-0.8.0.ebuild:
- amd64/x86 stable, bug #284686
-
- 24 Oct 2009; nixnut <nixnut@gentoo.org> hugin-0.8.0.ebuild:
- ppc stable #284686
-
-*hugin-2009.4.0_rc2 (19 Oct 2009)
-
- 19 Oct 2009; Markus Meier <maekke@gentoo.org> +hugin-2009.4.0_rc2.ebuild:
- bump
-
-*hugin-2009.4.0_rc1 (11 Oct 2009)
-
- 11 Oct 2009; Markus Meier <maekke@gentoo.org> +hugin-2009.4.0_rc1.ebuild:
- version bump
-
-*hugin-2009.2.0 (30 Sep 2009)
-
- 30 Sep 2009; Markus Meier <maekke@gentoo.org>
- -hugin-2009.2.0_beta3.ebuild, +hugin-2009.2.0.ebuild,
- -files/hugin-2009.2.0_beta3-asneeded.patch:
- version bump to final 2009.02.0 release
-
- 29 Sep 2009; Markus Meier <maekke@gentoo.org> hugin-0.7.0.ebuild,
- hugin-0.8.0.ebuild, hugin-2009.2.0_beta3.ebuild:
- block dev-util/cocom due to a file collision wrt bug #280241
-
-*hugin-2009.2.0_beta3 (13 Sep 2009)
-
- 13 Sep 2009; Markus Meier <maekke@gentoo.org> hugin-0.7.0.ebuild,
- -hugin-0.7.0-r1.ebuild, +hugin-2009.2.0_beta3.ebuild,
- +files/hugin-2009.2.0_beta3-asneeded.patch:
- version bump, EAPI=2 for stable ebuild, remove old
-
- 01 Aug 2009; Markus Meier <maekke@gentoo.org> hugin-0.8.0.ebuild:
- tweak x11-libs/wxGTK dep for bug #279653 and bug #269689
-
-*hugin-0.8.0 (26 Jul 2009)
-
- 26 Jul 2009; Markus Meier <maekke@gentoo.org> -hugin-0.8.0_beta1.ebuild,
- -hugin-0.8.0_beta2.ebuild, -hugin-0.8.0_beta3.ebuild,
- -hugin-0.8.0_beta4.ebuild, -hugin-0.8.0_rc1.ebuild,
- -hugin-0.8.0_rc3.ebuild, -hugin-0.8.0_rc4.ebuild, -hugin-0.8.0_rc5.ebuild,
- +hugin-0.8.0.ebuild, -files/hugin-0.8.0_beta1-as-needed.patch,
- -files/hugin-0.8.0_rc3-unset_lapack.patch:
- bump to 0.8.0 final release
-
-*hugin-0.8.0_rc5 (09 Jul 2009)
-
- 09 Jul 2009; Markus Meier <maekke@gentoo.org> +hugin-0.8.0_rc5.ebuild:
- version bump (this will likely be the last rc)
-
- 28 Jun 2009; Tiziano Müller <dev-zero@gentoo.org> hugin-0.8.0_rc4.ebuild,
- +files/hugin-0.8.0_rc4-use_system_cmake_findboost.patch:
- Added patch to make it build with recent boost versions. Removed now
- unnecessary patch from stack. Added missing exiftool dependency.
-
-*hugin-0.8.0_rc4 (27 Jun 2009)
-
- 27 Jun 2009; Markus Meier <maekke@gentoo.org> +hugin-0.8.0_rc4.ebuild:
- version bump
-
- 19 Jun 2009; Tiziano Müller <dev-zero@gentoo.org> hugin-0.8.0_rc3.ebuild,
- +files/hugin-0.8.0_rc3-unset_lapack.patch:
- Added patch to unset LAPACK_LIBRARIES if lapack is not found, otherwise
- cmake sets it to NOTFOUND leading to an error.
-
-*hugin-0.8.0_rc3 (10 Jun 2009)
-
- 10 Jun 2009; Markus Meier <maekke@gentoo.org> +hugin-0.8.0_rc3.ebuild,
- +files/hugin-0.8.0_rc3-as-needed.patch:
- version bump to 0.8.0_rc3, with (experimental) lapack support
-
- 24 May 2009; Markus Meier <maekke@gentoo.org> hugin-0.7.0.ebuild,
- hugin-0.7.0-r1.ebuild, +files/hugin-0.7.0-gcc44.patch:
- fix building with gcc-4.4 by David Watzke, bug #270593
-
-*hugin-0.8.0_rc1 (07 May 2009)
-
- 07 May 2009; Markus Meier <maekke@gentoo.org> +hugin-0.8.0_rc1.ebuild:
- version bump
-
-*hugin-0.8.0_beta4 (01 May 2009)
-
- 01 May 2009; Markus Meier <maekke@gentoo.org> +hugin-0.8.0_beta4.ebuild:
- version bump
-
-*hugin-0.8.0_beta3 (04 Apr 2009)
-
- 04 Apr 2009; Markus Meier <maekke@gentoo.org> +hugin-0.8.0_beta3.ebuild:
- version bump to 0.8.0_beta3
-
- 19 Mar 2009; Markus Meier <maekke@gentoo.org> hugin-0.7.0.ebuild,
- hugin-0.7.0-r1.ebuild:
- assign RDEPEND
-
- 19 Mar 2009; Markus Meier <maekke@gentoo.org>
- -files/hugin-0.6.1-1_0.6.1-1.1.patch, -files/hugin-0.6.1-as-needed.patch,
- -files/hugin-0.6.1-gcc43.patch, -hugin-0.6.1-r2.ebuild:
- old
-
- 18 Mar 2009; Joseph Jezak <josejx@gentoo.org> hugin-0.7.0.ebuild:
- Marked ppc stable for bug #246827.
-
- 11 Mar 2009; Markus Meier <maekke@gentoo.org> hugin-0.8.0_beta2.ebuild:
- add en_GB language, fix IUSE assignement and raise libpano13 dep
-
-*hugin-0.8.0_beta2 (09 Mar 2009)
-
- 09 Mar 2009; Markus Meier <maekke@gentoo.org> +hugin-0.8.0_beta2.ebuild:
- bump to hugin-0.8.0_beta2
-
-*hugin-0.8.0_beta1 (25 Feb 2009)
-
- 25 Feb 2009; Markus Meier <maekke@gentoo.org>
- +files/hugin-0.8.0_beta1-as-needed.patch, +hugin-0.8.0_beta1.ebuild:
- bump to hugin-0.8.0_beta1
-
- 02 Dec 2008; <chainsaw@gentoo.org> hugin-0.7.0.ebuild,
- hugin-0.7.0-r1.ebuild:
- Add ~ppc keyword based on PowerBook6,7 testing by Christian "papillon81"
- Schmitt <chrschmitt@gmail.com>. Closes bug #234909.
-
- 28 Nov 2008; Markus Meier <maekke@gentoo.org>
- -files/hugin-0.7_beta4-insec-file.patch,
- -files/hugin-0.7_beta4-as-needed.patch, -hugin-0.7_beta4-r1.ebuild,
- hugin-0.7.0.ebuild, hugin-0.7.0-r1.ebuild:
- add missing media-gfx/exiv2 dependency for bug #248628; remove old
-
- 26 Nov 2008; Ryan Hill <dirtyepic@gentoo.org> hugin-0.7.0.ebuild:
- Call wxwidgets_pkg_setup.
-
- 22 Nov 2008; Markus Meier <maekke@gentoo.org> hugin-0.7.0.ebuild:
- amd64/x86 stable, bug #246827
-
- 08 Oct 2008; Markus Meier <maekke@gentoo.org> hugin-0.6.1-r2.ebuild:
- add missing x11-libs/gtk+ dep, bug #239698
-
- 06 Oct 2008; Markus Meier <maekke@gentoo.org> hugin-0.7.0-r1.ebuild:
- fix broken dep on dev-libs/boost, thanks to voyageur and Betelgeuse
-
-*hugin-0.7.0-r1 (06 Oct 2008)
-*hugin-0.7.0 (06 Oct 2008)
-
- 06 Oct 2008; Markus Meier <maekke@gentoo.org> -hugin-0.7.0_rc2.ebuild,
- -hugin-0.7.0_rc3.ebuild, -hugin-0.7.0_rc4.ebuild, -hugin-0.7.0_rc5.ebuild,
- -hugin-0.7.0_rc6.ebuild, +hugin-0.7.0.ebuild, +hugin-0.7.0-r1.ebuild:
- bump to 0.7.0 final release (-r1 is an EAPI=2 version of the ebuild, -r0
- is a stable candidate), remove old
-
-*hugin-0.7.0_rc6 (15 Sep 2008)
-
- 15 Sep 2008; Markus Meier <maekke@gentoo.org> +hugin-0.7.0_rc6.ebuild:
- bump to 0.7.0_rc6
-
-*hugin-0.7.0_rc5 (15 Sep 2008)
-
- 15 Sep 2008; Markus Meier <maekke@gentoo.org> +hugin-0.7.0_rc5.ebuild:
- bump to 0.7.0_rc5
-
-*hugin-0.7.0_rc4 (02 Sep 2008)
-
- 02 Sep 2008; Markus Meier <maekke@gentoo.org> +hugin-0.7.0_rc4.ebuild:
- bump to 0.7.0_rc4
-
-*hugin-0.7.0_rc3 (28 Aug 2008)
-
- 28 Aug 2008; Markus Meier <maekke@gentoo.org> +hugin-0.7.0_rc3.ebuild:
- bump to 0.7.0_rc3
-
- 18 Aug 2008; Markus Meier <maekke@gentoo.org>
- +files/hugin-0.7.0_rc2-as-needed.patch, hugin-0.7.0_rc2.ebuild:
- fix building with --as-needed, bug #235004
-
-*hugin-0.7.0_rc2 (16 Aug 2008)
-
- 16 Aug 2008; Markus Meier <maekke@gentoo.org> metadata.xml,
- +hugin-0.7.0_rc2.ebuild:
- bump to hugin-0.7.0_rc2; describe local use flags in metadata.xml
-
- 10 May 2008; Mike Frysinger <vapier@gentoo.org> hugin-0.7_beta4-r1.ebuild:
- Also apply gcc-4.3 patch to hugin-0.7_beta4-r1.
-
- 02 May 2008; Markus Meier <maekke@gentoo.org>
- +files/hugin-0.6.1-gcc43.patch, hugin-0.6.1-r2.ebuild:
- fix building with gcc-4.3 by Peter Alfredsen, bug #219783
-
- 16 Mar 2008; Markus Meier <maekke@gentoo.org> hugin-0.6.1-r2.ebuild:
- zip dep is also needed in hugin-0.6
-
- 09 Mar 2008; Markus Meier <maekke@gentoo.org> hugin-0.7_beta4-r1.ebuild:
- add app-arch/zip dep, bug #212808
-
- 12 Jan 2008; Markus Meier <maekke@gentoo.org>
- -files/hugin-0.5-gcc41.patch, -files/hugin-0.5_rc2-gcc4.patch,
- -hugin-0.5_rc1-r2.ebuild, -hugin-0.5.ebuild, -hugin-0.6.1.ebuild,
- -hugin-0.6.1-r1.ebuild:
- old
-
- 11 Jan 2008; nixnut <nixnut@gentoo.org> hugin-0.6.1-r2.ebuild:
- Stable on ppc wrt bug 205154
-
- 17 Dec 2007; Christian Faulhammer <opfer@gentoo.org>
- hugin-0.6.1-r2.ebuild:
- stable x86, bug 202095
-
- 16 Dec 2007; Samuli Suominen <drac@gentoo.org> hugin-0.6.1-r2.ebuild:
- amd64 stable wrt #180381
-
-*hugin-0.7_beta4-r1 (03 Dec 2007)
-*hugin-0.6.1-r2 (03 Dec 2007)
-
- 03 Dec 2007; Markus Meier <maekke@gentoo.org>
- +files/hugin-0.6.1-as-needed.patch,
- +files/hugin-0.7_beta4-as-needed.patch,
- +files/hugin-0.7_beta4-insec-file.patch, +hugin-0.6.1-r2.ebuild,
- -hugin-0.7_beta4.ebuild, +hugin-0.7_beta4-r1.ebuild:
- revision bump, fix as-needed (bug #180381), also fix security bug #195996
- for 0.7
-
- 14 Nov 2007; Peter Weller <welp@gentoo.org> hugin-0.6.1-r1.ebuild:
- Stable on amd64 wrt bug 195996
-
- 26 Oct 2007; Luca Barbato <lu_zero@gentoo.org> hugin-0.6.1-r1.ebuild:
- Marked ppc
-
- 26 Oct 2007; Markus Meier <maekke@gentoo.org> hugin-0.6.1-r1.ebuild:
- x86 stable, security bug #195996
-
-*hugin-0.6.1-r1 (25 Oct 2007)
-
- 25 Oct 2007; Luca Barbato <lu_zero@gentoo.org>
- +files/hugin-0.6.1-1_0.6.1-1.1.patch, +hugin-0.6.1-r1.ebuild:
- Security Fix, see bug #195996. Debian patch applied
-
- 13 Oct 2007; Ryan Hill <dirtyepic@gentoo.org> hugin-0.5_rc1-r2.ebuild,
- hugin-0.5.ebuild, hugin-0.6.1.ebuild, hugin-0.7_beta4.ebuild:
- Lock wxGTK to 2.6.
-
- 23 Jul 2007; Luca Barbato <lu_zero@gentoo.org> hugin-0.6.1.ebuild,
- hugin-0.7_beta4.ebuild:
- Fix the bad fix I committed before
-
- 15 Jul 2007; Luca Barbato <lu_zero@gentoo.org> hugin-0.6.1.ebuild,
- hugin-0.7_beta4.ebuild:
- make hugin build with newer boost, thanks to Jakub for the fix in bug #181414
-
- 30 Apr 2007; Marius Mauch <genone@gentoo.org> hugin-0.5_rc1-r2.ebuild,
- hugin-0.6.1.ebuild, hugin-0.7_beta4.ebuild:
- Replacing einfo with elog
-
- 16 Apr 2007; Christian Faulhammer <opfer@gentoo.org> hugin-0.6.1.ebuild:
- stable amd64, bug 173068
-
- 08 Apr 2007; Joseph Jezak <josejx@gentoo.org> hugin-0.6.1.ebuild:
- Marked ppc stable for bug #173068.
-
- 06 Apr 2007; Christian Faulhammer <opfer@gentoo.org> hugin-0.6.1.ebuild:
- stable x86, bug 173068
-
- 05 Apr 2007; Marcelo Goes <vanquirius@gentoo.org> hugin-0.6.1.ebuild,
- hugin-0.7_beta4.ebuild:
- Depend on >=media-gfx/enblend-2.4 if the enblend flag is set for bug 173418.
- Thanks to Nicolas Laurent <nicolas.mario at gmail dot com>.
-
-*hugin-0.7_beta4 (02 Apr 2007)
-
- 02 Apr 2007; Marcelo Goes <vanquirius@gentoo.org> +hugin-0.7_beta4.ebuild:
- Add 0.7_beta4 for bug 141617. In package.mask for now. Thanks again to
- people who contributed in the bug.
-
- 03 Mar 2007; Marcelo Goes <vanquirius@gentoo.org> hugin-0.6.1.ebuild:
- Improve einfo explanation for enblend and sift USE flags for bug 141617.
- Thanks to Tim Harder <thorium90 at gmail dot com>.
-
-*hugin-0.6.1 (23 Feb 2007)
-
- 23 Feb 2007; Marcelo Goes <vanquirius@gentoo.org> +hugin-0.6.1.ebuild:
- 0.6.1 version bump for bug 141617. Thanks to David Grant <davidgrant at
- gmail dot com>, Hal Engel <hvengel at astound dot net>, Tarmo Tanav <sn4ip3r
- at estprog dot ee>, Emmanuel Favre_Nicolin <manouchk at gmail dot com>, Paul
- Berens <pjb8774 at rit dot edu>, Johann Cardon <johann.cardon at free dot
- fr>, Patrick Huber <phuber at swisstech dot net>, Toon Verstraelen
- <Toon.Verstraelen at UGent dot be>, Paul de Vries <phsdv at tiscali dot fr>,
- Norman Thomas <news at hiroki dot de>, Christian Kanzian <christian.kanzian
- at gmx dot at>, Jorge Nerin <gentoo-bugs at redvip.homelinux dot net>, Tim
- Harder <thorium90 at gmail dot com>, Serge Gavrilov <serge at pdmi dot ras
- dot ru>, Andrew Wilchak <azdruid at gmail dot com>, Chris Mayo <mayo at
- clara dot co dot uk> and anyone I could have missed.
-
- 22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
- Transition to Manifest2.
-
- 24 Sep 2006; Olivier Crête <tester@gentoo.org> hugin-0.5.ebuild:
- Stable on amd64
-
- 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> hugin-0.5.ebuild:
- Stable on x86
-
- 20 Feb 2006; Mark Loeser <halcy0n@gentoo.org> metadata.xml:
- metadata.xml cleanup
-
- 15 Jan 2006; Mark Loeser <halcy0n@gentoo.org>
- +files/hugin-0.5-gcc41.patch, hugin-0.5.ebuild:
- Add dep on enblend, and also add patch to fix compilation with gcc-4.1
-
-*hugin-0.5 (18 Dec 2005)
-
- 18 Dec 2005; Mark Loeser <halcy0n@gentoo.org> -hugin-0.5_rc2.ebuild,
- +hugin-0.5.ebuild:
- Bump to 0.5; bug #115714, and clean out old versions
-
- 26 Nov 2005; Mark Loeser <halcy0n@gentoo.org>
- files/hugin-0.5_rc2-gcc4.patch:
- Fix gcc4 patch
-
- 19 Nov 2005; Mark Loeser <halcy0n@gentoo.org>
- +files/hugin-0.5_rc2-gcc4.patch, hugin-0.5_rc2.ebuild:
- Add patch to fix compilation with gcc4.
-
-*hugin-0.5_rc1-r2 (16 Oct 2005)
-
- 16 Oct 2005; Mark Loeser <halcy0n@gentoo.org> -hugin-0.5_rc1.ebuild,
- -hugin-0.5_rc1-r1.ebuild, +hugin-0.5_rc1-r2.ebuild:
- Fixing the default autopano executable. This ebuild also gets rid of the gtk2
- useflag
-
-*hugin-0.5_rc2 (01 Oct 2005)
-*hugin-0.5_rc1-r1 (01 Oct 2005)
-
- 01 Oct 2005; Mark Loeser <halcy0n@gentoo.org> +hugin-0.5_rc1-r1.ebuild,
- +hugin-0.5_rc2.ebuild:
- Remove gtk useflag, since gtk2 is the only available toolkit. Bump to _rc2.
- bug #107776
-
- 16 Sep 2005; Mark Loeser <halcy0n@gentoo.org> hugin-0.5_rc1.ebuild:
- Stable on x86
-
- 21 Aug 2005; Luis Medinas <metalgod@gentoo.org> hugin-0.5_rc1.ebuild:
- Added ~amd64 keywords. Closes bug #103254.
-
- 11 Aug 2005; David Holm <dholm@gentoo.org> hugin-0.5_rc1.ebuild:
- Added to ~ppc.
-
-*hugin-0.5_rc1 (10 Aug 2005)
-
- 10 Aug 2005; Mark Loeser <halcy0n@gentoo.org> +metadata.xml,
- +hugin-0.5_rc1.ebuild:
- Initial commit of hugin. Thanks to everyone on bug #48269
-
diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
deleted file mode 100644
index 6486d56..0000000
--- a/media-gfx/hugin/Manifest
+++ /dev/null
@@ -1,30 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX hugin-2010.0.0_rc1-libpng14.patch 722 RMD160 83a65c1c8931490c339b87d8302495180750c17f SHA1 0396e246c4ec90aa21a7a0076836d8ebb4d052ed SHA256 2cd425ff1c6036e13b33b83d2772f7c4282fbfb8872c4402efb4e074318d295a
-AUX hugin-2011.0.0_rc1-libpng15.patch 11844 RMD160 6e922615911c816011ec7bb2cda8d2867a296d3b SHA1 e655023c0c7c2f96b3f5cd2d73bfa464276abd9e SHA256 48c05955b94a34bd5b96e560ebbeb0cdbce04f47fddde793f91c3a0bb37559a6
-DIST hugin-2010.0.0.tar.gz 12085453 RMD160 e2b03fe00a4a0242a1f3c4fd641cf8a3e312d516 SHA1 41eb7253aab12b913a5c9b6d9975d8652390dcb5 SHA256 ed30c5021709b8970a43f1e4c2295b5c899bc0fb87ffb63135a3c0ecde3bb523
-DIST hugin-2010.2.0.tar.gz 12412050 RMD160 c39d279bf95cdf5686e5994030bb4eb61ba285aa SHA1 f0676f28cd3fbebcf4086f55af7cf09566772899 SHA256 70fd1d5ffa017b3eb14e0760cd70185aab641aa343d129f9590826b01d5df2e2
-DIST hugin-2010.4.0.tar.bz2 11009978 RMD160 f97b8d37470443eb81c3e915e5f5efa91227b135 SHA1 47f25c0a8b97c27108e567bcd22203c87f268d07 SHA256 d45cc65df6b424ef5bf1c5d2cd99a360ecfda46688782c75f36dd5341cb9c38e
-DIST hugin-2011.0.0.tar.bz2 11439430 RMD160 1388980580ecba70a0d47597ddf06df9b85ab2b5 SHA1 22e1ad3846291a9bbe58570683e213921a6f0116 SHA256 866273f6218d300a52c0148960681faa2c4e05383d97f868a2eb47b457b5f4fc
-DIST hugin-2011.2.0_beta1.tar.bz2 11369710 RMD160 287a127f0c37ed305b86d8c3838b6c0b5c1fb5ce SHA1 ed32ac77b836bf0ae6aa43c8a368cf2df80e76ab SHA256 6ad6ed6a96d79f3b8862704f4f34cd792ab920fbaa68fd799142fb7ae6cab263
-DIST hugin-2011.2.0_rc1.tar.bz2 11392456 RMD160 bdd3d046843734bb9a3566483ef9d78dd645e4ff SHA1 545d469b22de18bbd7fc867e6ac5d8a91e42a22e SHA256 a6b7599681c24b7dd8a70f5a5b30b9459506c75b6fd9767ebfbc02a7939ff6b0
-DIST hugin-2011.2.0_rc4.tar.bz2 11438004 RMD160 001d776d2aa555337435460331a9c1b58ee4809c SHA1 4da599f69ff4f0a53cdf8275048c87221cf6edb1 SHA256 70c61f8efcea94714f238ea1d11c12acac39202cddac9012fdfdfa90ddd2708e
-DIST hugin-2011.2.0_rc5.tar.bz2 11506840 RMD160 6bd526c651adb986d7b2f21959c8c390727a9563 SHA1 79dfdac229b4e58f50c893c1238bdd0921ad9da6 SHA256 bd9ef8d2f62c6dbcbadc2b9208cdcf6e4b6512760335c726b697bffd5e89b5be
-EBUILD hugin-2010.0.0.ebuild 1497 RMD160 d6eb0b943c827c1e15481dda7ec200f17a657b54 SHA1 ad98c63c71a685b416295e7fe305eafac6b86a64 SHA256 9726e127e191065da8da53c58e979baccdf1df6902202d2abf6cfce2c8773077
-EBUILD hugin-2010.2.0.ebuild 1455 RMD160 97fc580fad0db0e9e42c9f540fa663a0e7522ec7 SHA1 f8b6db7cc1e1883c37e4c196acc2bd06dfe8da36 SHA256 495302c92a8e86cffaf0c7ad14f0e7005d349d22910dc44f5c79a59251a917ce
-EBUILD hugin-2010.4.0.ebuild 1621 RMD160 bf69636ab52c4cb43741dbfa58dd35e6ae4310c5 SHA1 b58ad517685ddeebdf2a050ceda09f03e000de0a SHA256 349d713053bdb5fc93592d18b7fe7655d7a395b5487dff50b9361ec5b1492360
-EBUILD hugin-2011.0.0.ebuild 1506 RMD160 f78461585ab9a73921f74502f85367a66f0518e8 SHA1 8b0898dfab2ce4d8e7f59db9851f84441f2afdbd SHA256 28271a58786b4ebb6dfbb6962855aed46edb9477fafdad7fc26fe5126c47023a
-EBUILD hugin-2011.2.0_beta1.ebuild 1610 RMD160 8a9e73e96d5c9546b90cff30d181a5df5b4a77d4 SHA1 ea58580ddc4272d2f253d44e57fe0ede3b8bf5a9 SHA256 d3982ce4f5964645cc5be0afd4dfbf5a6fba50de5788c69c68bc55a6fac7a6e5
-EBUILD hugin-2011.2.0_rc1.ebuild 1610 RMD160 8a9e73e96d5c9546b90cff30d181a5df5b4a77d4 SHA1 ea58580ddc4272d2f253d44e57fe0ede3b8bf5a9 SHA256 d3982ce4f5964645cc5be0afd4dfbf5a6fba50de5788c69c68bc55a6fac7a6e5
-EBUILD hugin-2011.2.0_rc4.ebuild 1610 RMD160 8a9e73e96d5c9546b90cff30d181a5df5b4a77d4 SHA1 ea58580ddc4272d2f253d44e57fe0ede3b8bf5a9 SHA256 d3982ce4f5964645cc5be0afd4dfbf5a6fba50de5788c69c68bc55a6fac7a6e5
-EBUILD hugin-2011.2.0_rc5.ebuild 1613 RMD160 778953beac8d608f4c832f8474c3ee0cbdb99e20 SHA1 830cf197660a2bee8213bc70e3ec415da2238972 SHA256 e001e138ee2c87dc57a20655569a6364add87c0ce19e7f755f1e9af63bc6b6a7
-MISC ChangeLog 18141 RMD160 2eb9dc3258cc146dbd132c552abafda8f2a06bd6 SHA1 4a67f21683eac74307add5d01896e6667e65693a SHA256 cfdfc4b4a9bcc83ac7cec1bbfd83a5633430415e716707918904b55508bebab3
-MISC metadata.xml 389 RMD160 245f5d872a463181d63366d6c76a82c87d020fd7 SHA1 a26b77c69d62bedb9789e79b5ca35f28fa56981d SHA256 6f26cd9c2b64a96c1c86a8a468a261af4cf4dfaa86b4d7ddcfaee1ca98314803
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk53PtYACgkQkKaRLQcq0GKMFwCfYQ5LUVCkfElZykwhcyHuFc99
-AAQAoJnMGV2kwxT5LZcHc9RAt94Si4c4
-=DVwI
------END PGP SIGNATURE-----
diff --git a/media-gfx/hugin/files/hugin-2010.0.0_rc1-libpng14.patch b/media-gfx/hugin/files/hugin-2010.0.0_rc1-libpng14.patch
deleted file mode 100644
index fdc0263..0000000
--- a/media-gfx/hugin/files/hugin-2010.0.0_rc1-libpng14.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-http://repos.archlinux.org/wsvn/packages/hugin/trunk/libpng14.patch
-
---- src/foreign/vigra/vigra_impex/png.cxx
-+++ src/foreign/vigra/vigra_impex/png.cxx
-@@ -271,8 +271,8 @@
- // expand gray values to at least one byte size
- if ( color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8 ) {
- if (setjmp(png->jmpbuf))
-- vigra_postcondition( false,png_error_message.insert(0, "error in png_set_gray_1_2_4_to_8(): ").c_str());
-- png_set_gray_1_2_4_to_8(png);
-+ vigra_postcondition( false,png_error_message.insert(0, "error in png_set_expand_gray_1_2_4_to_8(): ").c_str());
-+ png_set_expand_gray_1_2_4_to_8(png);
- bit_depth = 8;
- }
-
diff --git a/media-gfx/hugin/files/hugin-2011.0.0_rc1-libpng15.patch b/media-gfx/hugin/files/hugin-2011.0.0_rc1-libpng15.patch
deleted file mode 100644
index 2752231..0000000
--- a/media-gfx/hugin/files/hugin-2011.0.0_rc1-libpng15.patch
+++ /dev/null
@@ -1,275 +0,0 @@
---- hugin-2011.0.0.orig/src/foreign/vigra/vigra_impex/png.cxx
-+++ hugin-2011.0.0/src/foreign/vigra/vigra_impex/png.cxx
-@@ -78,7 +75,7 @@
- static void PngError( png_structp png_ptr, png_const_charp error_msg )
- {
- png_error_message = std::string(error_msg);
-- longjmp( png_ptr->jmpbuf, 1 );
-+ longjmp( png_jmpbuf(png_ptr), 1 );
- }
-
- // called on non-fatal errors
-@@ -200,9 +197,9 @@
- // check if the file is a png file
- const unsigned int sig_size = 8;
- png_byte sig[sig_size];
-- std::fread( sig, sig_size, 1, file.get() );
-+ std::size_t readCount = std::fread( sig, sig_size, 1, file.get() );
- const int no_png = png_sig_cmp( sig, 0, sig_size );
-- vigra_precondition( !no_png, "given file is not a png file.");
-+ vigra_precondition( (readCount == 1) && !no_png, "given file is not a png file.");
-
- // create png read struct with user defined handlers
- png = png_create_read_struct( PNG_LIBPNG_VER_STRING, NULL,
-@@ -210,7 +207,7 @@
- vigra_postcondition( png != 0, "could not create the read struct." );
-
- // create info struct
-- if (setjmp(png->jmpbuf)) {
-+ if (setjmp(png_jmpbuf(png))) {
- png_destroy_read_struct( &png, &info, NULL );
- vigra_postcondition( false, png_error_message.insert(0, "error in png_create_info_struct(): ").c_str() );
- }
-@@ -218,14 +215,14 @@
- vigra_postcondition( info != 0, "could not create the info struct." );
-
- // init png i/o
-- if (setjmp(png->jmpbuf)) {
-+ if (setjmp(png_jmpbuf(png))) {
- png_destroy_read_struct( &png, &info, NULL );
- vigra_postcondition( false, png_error_message.insert(0, "error in png_init_io(): ").c_str() );
- }
- png_init_io( png, file.get() );
-
- // specify that the signature was already read
-- if (setjmp(png->jmpbuf)) {
-+ if (setjmp(png_jmpbuf(png))) {
- png_destroy_read_struct( &png, &info, NULL );
- vigra_postcondition( false, png_error_message.insert(0, "error in png_set_sig_bytes(): ").c_str() );
- }
-@@ -241,13 +238,13 @@
- void PngDecoderImpl::init()
- {
- // read all chunks up to the image data
-- if (setjmp(png->jmpbuf))
-+ if (setjmp(png_jmpbuf(png)))
- vigra_postcondition( false, png_error_message.insert(0, "error in png_read_info(): ").c_str() );
- png_read_info( png, info );
-
- // pull over the header fields
- int interlace_method, compression_method, filter_method;
-- if (setjmp(png->jmpbuf))
-+ if (setjmp(png_jmpbuf(png)))
- vigra_postcondition( false, png_error_message.insert(0, "error in png_get_IHDR(): ").c_str() );
- png_get_IHDR( png, info, &width, &height, &bit_depth, &color_type,
- &interlace_method, &compression_method, &filter_method );
-@@ -261,7 +258,7 @@
-
- // transform palette to rgb
- if ( color_type == PNG_COLOR_TYPE_PALETTE) {
-- if (setjmp(png->jmpbuf))
-+ if (setjmp(png_jmpbuf(png)))
- vigra_postcondition( false, png_error_message.insert(0, "error in png_palette_to_rgb(): ").c_str() );
- png_set_palette_to_rgb(png);
- color_type = PNG_COLOR_TYPE_RGB;
-@@ -270,15 +267,10 @@
-
- // expand gray values to at least one byte size
- if ( color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8 ) {
--#if (PNG_LIBPNG_VER >= 10400)
-- if (setjmp(png->jmpbuf))
-- vigra_postcondition( false,png_error_message.insert(0, "error in png_set_expand_gray_1_2_4_to_8(): ").c_str());
-+ if (setjmp(png_jmpbuf(png)))
-+ vigra_postcondition(false,
-+ png_error_message.insert(0, "error in png_set_expand_gray_1_2_4_to_8(): ").c_str());
- png_set_expand_gray_1_2_4_to_8(png);
--#else
-- if (setjmp(png->jmpbuf))
-- vigra_postcondition( false,png_error_message.insert(0, "error in png_set_gray_1_2_4_to_8(): ").c_str());
-- png_set_gray_1_2_4_to_8(png);
--#endif
- bit_depth = 8;
- }
-
-@@ -286,7 +278,7 @@
- #if 0
- // strip alpha channel
- if ( color_type & PNG_COLOR_MASK_ALPHA ) {
-- if (setjmp(png->jmpbuf))
-+ if (setjmp(png_jmpbuf(png)))
- vigra_postcondition( false, png_error_message.insert(0, "error in png_set_strip_alpha(): ").c_str() );
- png_set_strip_alpha(png);
- color_type ^= PNG_COLOR_MASK_ALPHA;
-@@ -317,8 +309,8 @@
- }
-
- // read resolution
-- x_resolution = png_get_x_pixels_per_meter( png, info ) / 254.0;
-- y_resolution = png_get_y_pixels_per_meter( png, info ) / 254.0;
-+ x_resolution = png_get_x_pixels_per_meter( png, info ) * 0.0254f;
-+ y_resolution = png_get_y_pixels_per_meter( png, info ) * 0.0254f;
-
- // read offset
- position.x = png_get_x_offset_pixels( png, info );
-@@ -328,9 +320,13 @@
- #if (PNG_LIBPNG_VER > 10008) && defined(PNG_READ_iCCP_SUPPORTED)
- char * dummyName;
- int dummyCompType;
-+#if (PNG_LIBPNG_VER < 10500)
- char * profilePtr;
-+#else
-+ png_byte * profilePtr;
-+#endif
- png_uint_32 profileLen;
-- if (info->valid & PNG_INFO_iCCP) {
-+ if (png_get_valid( png, info, PNG_INFO_iCCP )) {
- png_get_iCCP(png, info, &dummyName, &dummyCompType, &profilePtr, &profileLen) ;
- iccProfilePtr = (unsigned char *) profilePtr;
- iccProfileLength = profileLen;
-@@ -343,7 +339,7 @@
- // image gamma
- double image_gamma = 0.45455;
- if ( png_get_valid( png, info, PNG_INFO_gAMA ) ) {
-- if (setjmp(png->jmpbuf))
-+ if (setjmp(png_jmpbuf(png)))
- vigra_postcondition( false, png_error_message.insert(0, "error in png_get_gAMA(): ").c_str() );
- png_get_gAMA( png, info, &image_gamma );
- }
-@@ -352,26 +348,26 @@
- double screen_gamma = 2.2;
-
- // set gamma correction
-- if (setjmp(png->jmpbuf))
-+ if (setjmp(png_jmpbuf(png)))
- vigra_postcondition( false, png_error_message.insert(0, "error in png_set_gamma(): ").c_str() );
- png_set_gamma( png, screen_gamma, image_gamma );
- #endif
-
- // interlace handling, get number of read passes needed
-- if (setjmp(png->jmpbuf))
-+ if (setjmp(png_jmpbuf(png)))
- vigra_postcondition( false,png_error_message.insert(0, "error in png_set_interlace_handling(): ").c_str());
- n_interlace_passes = png_set_interlace_handling(png);
-
- // update png library state to reflect any changes that were made
-- if (setjmp(png->jmpbuf))
-+ if (setjmp(png_jmpbuf(png)))
- vigra_postcondition( false, png_error_message.insert(0, "error in png_read_update_info(): ").c_str() );
- png_read_update_info( png, info );
-
-- if (setjmp(png->jmpbuf))
-+ if (setjmp(png_jmpbuf(png)))
- vigra_postcondition( false,png_error_message.insert(0, "error in png_get_channels(): ").c_str());
- n_channels = png_get_channels(png, info);
-
-- if (setjmp(png->jmpbuf))
-+ if (setjmp(png_jmpbuf(png)))
- vigra_postcondition( false,png_error_message.insert(0, "error in png_get_rowbytes(): ").c_str());
- rowsize = png_get_rowbytes(png, info);
-
-@@ -381,9 +377,10 @@
-
- void PngDecoderImpl::nextScanline()
- {
-- for (int i=0; i < n_interlace_passes; i++) {
-- if (setjmp(png->jmpbuf))
-- vigra_postcondition( false,png_error_message.insert(0, "error in png_read_row(): ").c_str());
-+ if (setjmp(png_jmpbuf(png)))
-+ vigra_postcondition( false,png_error_message.insert(0, "error in png_read_row(): ").c_str());
-+ for (int i=0; i < n_interlace_passes; i++)
-+ {
- png_read_row(png, row_data.begin(), NULL);
- }
- }
-@@ -548,7 +545,7 @@
- vigra_postcondition( png != 0, "could not create the write struct." );
-
- // create info struct
-- if (setjmp(png->jmpbuf)) {
-+ if (setjmp(png_jmpbuf(png))) {
- png_destroy_write_struct( &png, &info );
- vigra_postcondition( false, png_error_message.insert(0, "error in png_info_struct(): ").c_str() );
- }
-@@ -559,7 +556,7 @@
- }
-
- // init png i/o
-- if (setjmp(png->jmpbuf)) {
-+ if (setjmp(png_jmpbuf(png))) {
- png_destroy_write_struct( &png, &info );
- vigra_postcondition( false, png_error_message.insert(0, "error in png_init_io(): ").c_str() );
- }
-@@ -574,7 +571,7 @@
- void PngEncoderImpl::finalize()
- {
- // write the IHDR
-- if (setjmp(png->jmpbuf))
-+ if (setjmp(png_jmpbuf(png)))
- vigra_postcondition( false, png_error_message.insert(0, "error in png_set_IHDR(): ").c_str() );
- png_set_IHDR( png, info, width, height, bit_depth, color_type,
- PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT,
-@@ -582,16 +579,16 @@
-
- // set resolution
- if (x_resolution > 0 && y_resolution > 0) {
-- if (setjmp(png->jmpbuf))
-+ if (setjmp(png_jmpbuf(png)))
- vigra_postcondition( false, png_error_message.insert(0, "error in png_set_pHYs(): ").c_str() );
-- png_set_pHYs(png, info, (png_uint_32) (x_resolution * 254 + 0.5),
-- (png_uint_32) (y_resolution * 254 + 0.5),
-+ png_set_pHYs(png, info, (png_uint_32) (x_resolution / 0.0254 + 0.5),
-+ (png_uint_32) (y_resolution / 0.0254 + 0.5),
- PNG_RESOLUTION_METER);
- }
-
- // set offset
- if (position.x > 0 && position.y > 0) {
-- if (setjmp(png->jmpbuf))
-+ if (setjmp(png_jmpbuf(png)))
- vigra_postcondition( false, png_error_message.insert(0, "error in png_set_oFFs(): ").c_str() );
- png_set_oFFs(png, info, position.x, position.y, PNG_OFFSET_PIXEL);
- }
-@@ -599,13 +596,17 @@
- #if (PNG_LIBPNG_VER > 10008) && defined(PNG_WRITE_iCCP_SUPPORTED)
- // set icc profile
- if (iccProfile.size() > 0) {
-- png_set_iCCP(png, info, "icc", 0,
-- (char *)iccProfile.begin(), iccProfile.size());
-+ png_set_iCCP(png, info, (png_charp)("icc"), 0,
-+#if (PNG_LIBPNG_VER < 10500)
-+ (png_charp)iccProfile.begin(), (png_uint_32)iccProfile.size());
-+#else
-+ (png_byte*)iccProfile.begin(), (png_uint_32)iccProfile.size());
-+#endif
- }
- #endif
-
- // write the info struct
-- if (setjmp(png->jmpbuf))
-+ if (setjmp(png_jmpbuf(png)))
- vigra_postcondition( false, png_error_message.insert(0, "error in png_write_info(): ").c_str() );
- png_write_info( png, info );
-
-@@ -637,10 +638,10 @@
- }
-
- // write the whole image
-- if (setjmp(png->jmpbuf))
-+ if (setjmp(png_jmpbuf(png)))
- vigra_postcondition( false, png_error_message.insert(0, "error in png_write_image(): ").c_str() );
- png_write_image( png, row_pointers.begin() );
-- if (setjmp(png->jmpbuf))
-+ if (setjmp(png_jmpbuf(png)))
- vigra_postcondition( false, png_error_message.insert(0, "error in png_write_end(): ").c_str() );
- png_write_end(png, info);
- }
-@@ -688,8 +689,7 @@
- pimpl->components = bands;
- }
-
-- void PngEncoder::setCompressionType( const std::string & comp,
-- int quality )
-+ void PngEncoder::setCompressionType( const std::string & /* comp */, int /* quality */)
- {
- // nothing is settable => do nothing
- }
diff --git a/media-gfx/hugin/hugin-2010.0.0.ebuild b/media-gfx/hugin/hugin-2010.0.0.ebuild
deleted file mode 100644
index 904aee6..0000000
--- a/media-gfx/hugin/hugin-2010.0.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2010.0.0.ebuild,v 1.9 2011/07/05 19:41:43 maekke Exp $
-
-EAPI=2
-WX_GTK_VER="2.8"
-
-inherit wxwidgets versionator cmake-utils
-
-DESCRIPTION="GUI for the creation & processing of panoramic images"
-HOMEPAGE="http://hugin.sf.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="GPL-2 SIFT"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-LANGS=" bg ca cs de en_GB es fi fr hu it ja ko nl pl pt_BR ru sk sl sv uk zh_CN zh_TW"
-IUSE="lapack +sift $(echo ${LANGS//\ /\ linguas_})"
-
-CDEPEND="
- !!dev-util/cocom
- app-arch/zip
- >=dev-libs/boost-1.35.0-r5
- >=media-gfx/enblend-3.0_p20080807
- media-gfx/exiv2
- media-libs/freeglut
- >=media-libs/libpano13-2.9.14
- media-libs/libpng
- media-libs/openexr
- media-libs/tiff
- sys-libs/zlib
- virtual/jpeg
- x11-libs/wxGTK:2.8[X,opengl,-odbc]
- lapack? ( virtual/lapack )
- sift? ( media-gfx/autopano-sift-C )"
-RDEPEND="${CDEPEND}
- media-libs/exiftool"
-DEPEND="${CDEPEND}
- dev-util/pkgconfig"
-
-S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)
-
-PATCHES=( "${FILESDIR}/${P}_rc1-libpng14.patch" )
-
-pkg_setup() {
- DOCS="AUTHORS README TODO"
- mycmakeargs="$(cmake-utils_use_enable lapack)"
-}
-
-src_install() {
- cmake-utils_src_install
-
- for lang in ${LANGS} ; do
- case ${lang} in
- ca) dir=ca_ES;;
- cs) dir=cs_CZ;;
- *) dir=${lang};;
- esac
- use linguas_${lang} || rm -r "${D}"/usr/share/locale/${dir}
- done
-}
diff --git a/media-gfx/hugin/hugin-2010.2.0.ebuild b/media-gfx/hugin/hugin-2010.2.0.ebuild
deleted file mode 100644
index e346dc4..0000000
--- a/media-gfx/hugin/hugin-2010.2.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2010.2.0.ebuild,v 1.7 2011/07/05 19:41:43 maekke Exp $
-
-EAPI=2
-WX_GTK_VER="2.8"
-
-inherit wxwidgets versionator cmake-utils
-
-DESCRIPTION="GUI for the creation & processing of panoramic images"
-HOMEPAGE="http://hugin.sf.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="GPL-2 SIFT"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-LANGS=" bg ca cs de en_GB es fi fr hu it ja ko nl pl pt_BR ru sk sl sv uk zh_CN zh_TW"
-IUSE="lapack +sift $(echo ${LANGS//\ /\ linguas_})"
-
-CDEPEND="
- !!dev-util/cocom
- app-arch/zip
- >=dev-libs/boost-1.35.0-r5
- >=media-gfx/enblend-3.0_p20080807
- media-gfx/exiv2
- media-libs/freeglut
- >=media-libs/libpano13-2.9.17
- media-libs/libpng
- media-libs/openexr
- media-libs/tiff
- sys-libs/zlib
- virtual/jpeg
- x11-libs/wxGTK:2.8[X,opengl,-odbc]
- lapack? ( virtual/lapack )
- sift? ( media-gfx/autopano-sift-C )"
-RDEPEND="${CDEPEND}
- media-libs/exiftool"
-DEPEND="${CDEPEND}
- dev-util/pkgconfig"
-
-S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)
-
-pkg_setup() {
- DOCS="AUTHORS README TODO"
- mycmakeargs=( $(cmake-utils_use_enable lapack LAPACK) )
-}
-
-src_install() {
- cmake-utils_src_install
-
- for lang in ${LANGS} ; do
- case ${lang} in
- ca) dir=ca_ES;;
- cs) dir=cs_CZ;;
- *) dir=${lang};;
- esac
- use linguas_${lang} || rm -r "${D}"/usr/share/locale/${dir}
- done
-}
diff --git a/media-gfx/hugin/hugin-2010.4.0.ebuild b/media-gfx/hugin/hugin-2010.4.0.ebuild
deleted file mode 100644
index b7d2c95..0000000
--- a/media-gfx/hugin/hugin-2010.4.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2010.4.0.ebuild,v 1.3 2011/07/05 19:41:43 maekke Exp $
-
-EAPI=2
-WX_GTK_VER="2.8"
-
-inherit wxwidgets versionator cmake-utils
-
-DESCRIPTION="GUI for the creation & processing of panoramic images"
-HOMEPAGE="http://hugin.sf.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-LICENSE="GPL-2 SIFT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-LANGS=" bg ca cs de en_GB es fi fr hu it ja ko nl pl pt_BR ru sk sl sv uk zh_CN zh_TW"
-IUSE="lapack sift $(echo ${LANGS//\ /\ linguas_})"
-
-CDEPEND="
- !!dev-util/cocom
- app-arch/zip
- >=dev-libs/boost-1.35.0-r5
- >=media-gfx/enblend-3.0_p20080807
- media-gfx/exiv2
- media-libs/freeglut
- >=media-libs/libpano13-2.9.17
- media-libs/libpng
- media-libs/openexr
- media-libs/tiff
- sys-libs/zlib
- virtual/jpeg
- x11-libs/wxGTK:2.8[X,opengl,-odbc]
- lapack? ( virtual/lapack )
- sift? ( media-gfx/autopano-sift-C )"
-RDEPEND="${CDEPEND}
- media-libs/exiftool"
-DEPEND="${CDEPEND}
- dev-util/pkgconfig"
-
-S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)
-
-pkg_setup() {
- DOCS="authors.txt README TODO"
- mycmakeargs=( $(cmake-utils_use_enable lapack LAPACK) )
-}
-
-src_install() {
- cmake-utils_src_install
-
- for lang in ${LANGS} ; do
- case ${lang} in
- ca) dir=ca_ES;;
- cs) dir=cs_CZ;;
- *) dir=${lang};;
- esac
- use linguas_${lang} || rm -r "${D}"/usr/share/locale/${dir}
- done
-}
-
-pkg_postinst() {
- elog "Please note that the sift USE-flag has been disabled by default"
- elog "as hugin ships its own control point generator with 2010.4"
-}
diff --git a/media-gfx/hugin/hugin-2011.0.0.ebuild b/media-gfx/hugin/hugin-2011.0.0.ebuild
deleted file mode 100644
index 62be542..0000000
--- a/media-gfx/hugin/hugin-2011.0.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2011.0.0.ebuild,v 1.2 2011/07/05 19:41:43 maekke Exp $
-
-EAPI=4
-WX_GTK_VER="2.8"
-
-inherit wxwidgets versionator cmake-utils
-
-DESCRIPTION="GUI for the creation & processing of panoramic images"
-HOMEPAGE="http://hugin.sf.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-LICENSE="GPL-2 SIFT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-LANGS=" bg ca cs de en_GB es fi fr hu it ja ko nl pl pt_BR ro ru sk sl sv uk zh_CN zh_TW"
-IUSE="lapack sift $(echo ${LANGS//\ /\ linguas_})"
-
-CDEPEND="
- !!dev-util/cocom
- app-arch/zip
- >=dev-libs/boost-1.35.0-r5
- >=media-gfx/enblend-4.0
- media-gfx/exiv2
- media-libs/freeglut
- >=media-libs/libpano13-2.9.18
- media-libs/libpng
- media-libs/openexr
- media-libs/tiff
- sys-libs/zlib
- virtual/jpeg
- x11-libs/wxGTK:2.8[X,opengl,-odbc]
- lapack? ( virtual/lapack )
- sift? ( media-gfx/autopano-sift-C )"
-RDEPEND="${CDEPEND}
- media-libs/exiftool"
-DEPEND="${CDEPEND}
- dev-util/pkgconfig"
-
-S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)
-
-PATCHES=( "${FILESDIR}"/${P}_rc1-libpng15.patch )
-
-pkg_setup() {
- DOCS="authors.txt README TODO"
- mycmakeargs=( $(cmake-utils_use_enable lapack LAPACK) )
-}
-
-src_install() {
- cmake-utils_src_install
-
- for lang in ${LANGS} ; do
- case ${lang} in
- ca) dir=ca_ES;;
- cs) dir=cs_CZ;;
- *) dir=${lang};;
- esac
- use linguas_${lang} || rm -r "${D}"/usr/share/locale/${dir}
- done
-}
diff --git a/media-gfx/hugin/hugin-2011.2.0_beta1.ebuild b/media-gfx/hugin/hugin-2011.2.0_beta1.ebuild
deleted file mode 100644
index 9722617..0000000
--- a/media-gfx/hugin/hugin-2011.2.0_beta1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2011.0.0.ebuild,v 1.1 2011/05/29 21:07:01 maekke Exp $
-
-EAPI=3
-WX_GTK_VER="2.8"
-PYTHON_DEPEND="python? 2:2.6 3"
-
-inherit python wxwidgets versionator cmake-utils
-
-DESCRIPTION="GUI for the creation & processing of panoramic images"
-HOMEPAGE="http://hugin.sf.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-LICENSE="GPL-2 SIFT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-LANGS=" bg ca cs de en_GB es fi fr hu it ja ko nl pl pt_BR ro ru sk sl sv uk zh_CN zh_TW"
-IUSE="lapack python sift $(echo ${LANGS//\ /\ linguas_})"
-
-CDEPEND="
- !!dev-util/cocom
- app-arch/zip
- dev-cpp/tclap
- >=dev-libs/boost-1.35.0-r5
- dev-libs/zthread
- >=media-gfx/enblend-4.0
- media-gfx/exiv2
- media-libs/freeglut
- >=media-libs/libpano13-2.9.18
- media-libs/libpng
- media-libs/openexr
- media-libs/tiff
- sys-libs/zlib
- virtual/jpeg
- x11-libs/wxGTK:2.8[X,opengl,-odbc]
- lapack? ( virtual/lapack )
- sift? ( media-gfx/autopano-sift-C )"
-RDEPEND="${CDEPEND}
- media-libs/exiftool"
-DEPEND="${CDEPEND}
- dev-util/pkgconfig
- python? ( >=dev-lang/swig-2.0.4 )"
-
-S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)
-
-pkg_setup() {
- DOCS="authors.txt README TODO"
- mycmakeargs=(
- $(cmake-utils_use_enable lapack LAPACK)
- $(cmake-utils_use_build python HSI)
- )
-}
-
-src_install() {
- cmake-utils_src_install
-
- for lang in ${LANGS} ; do
- case ${lang} in
- ca) dir=ca_ES;;
- cs) dir=cs_CZ;;
- *) dir=${lang};;
- esac
- use linguas_${lang} || rm -r "${D}"/usr/share/locale/${dir}
- done
-}
diff --git a/media-gfx/hugin/hugin-2011.2.0_rc1.ebuild b/media-gfx/hugin/hugin-2011.2.0_rc1.ebuild
deleted file mode 100644
index 9722617..0000000
--- a/media-gfx/hugin/hugin-2011.2.0_rc1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2011.0.0.ebuild,v 1.1 2011/05/29 21:07:01 maekke Exp $
-
-EAPI=3
-WX_GTK_VER="2.8"
-PYTHON_DEPEND="python? 2:2.6 3"
-
-inherit python wxwidgets versionator cmake-utils
-
-DESCRIPTION="GUI for the creation & processing of panoramic images"
-HOMEPAGE="http://hugin.sf.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-LICENSE="GPL-2 SIFT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-LANGS=" bg ca cs de en_GB es fi fr hu it ja ko nl pl pt_BR ro ru sk sl sv uk zh_CN zh_TW"
-IUSE="lapack python sift $(echo ${LANGS//\ /\ linguas_})"
-
-CDEPEND="
- !!dev-util/cocom
- app-arch/zip
- dev-cpp/tclap
- >=dev-libs/boost-1.35.0-r5
- dev-libs/zthread
- >=media-gfx/enblend-4.0
- media-gfx/exiv2
- media-libs/freeglut
- >=media-libs/libpano13-2.9.18
- media-libs/libpng
- media-libs/openexr
- media-libs/tiff
- sys-libs/zlib
- virtual/jpeg
- x11-libs/wxGTK:2.8[X,opengl,-odbc]
- lapack? ( virtual/lapack )
- sift? ( media-gfx/autopano-sift-C )"
-RDEPEND="${CDEPEND}
- media-libs/exiftool"
-DEPEND="${CDEPEND}
- dev-util/pkgconfig
- python? ( >=dev-lang/swig-2.0.4 )"
-
-S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)
-
-pkg_setup() {
- DOCS="authors.txt README TODO"
- mycmakeargs=(
- $(cmake-utils_use_enable lapack LAPACK)
- $(cmake-utils_use_build python HSI)
- )
-}
-
-src_install() {
- cmake-utils_src_install
-
- for lang in ${LANGS} ; do
- case ${lang} in
- ca) dir=ca_ES;;
- cs) dir=cs_CZ;;
- *) dir=${lang};;
- esac
- use linguas_${lang} || rm -r "${D}"/usr/share/locale/${dir}
- done
-}
diff --git a/media-gfx/hugin/hugin-2011.2.0_rc4.ebuild b/media-gfx/hugin/hugin-2011.2.0_rc4.ebuild
deleted file mode 100644
index 9722617..0000000
--- a/media-gfx/hugin/hugin-2011.2.0_rc4.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2011.0.0.ebuild,v 1.1 2011/05/29 21:07:01 maekke Exp $
-
-EAPI=3
-WX_GTK_VER="2.8"
-PYTHON_DEPEND="python? 2:2.6 3"
-
-inherit python wxwidgets versionator cmake-utils
-
-DESCRIPTION="GUI for the creation & processing of panoramic images"
-HOMEPAGE="http://hugin.sf.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-LICENSE="GPL-2 SIFT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-LANGS=" bg ca cs de en_GB es fi fr hu it ja ko nl pl pt_BR ro ru sk sl sv uk zh_CN zh_TW"
-IUSE="lapack python sift $(echo ${LANGS//\ /\ linguas_})"
-
-CDEPEND="
- !!dev-util/cocom
- app-arch/zip
- dev-cpp/tclap
- >=dev-libs/boost-1.35.0-r5
- dev-libs/zthread
- >=media-gfx/enblend-4.0
- media-gfx/exiv2
- media-libs/freeglut
- >=media-libs/libpano13-2.9.18
- media-libs/libpng
- media-libs/openexr
- media-libs/tiff
- sys-libs/zlib
- virtual/jpeg
- x11-libs/wxGTK:2.8[X,opengl,-odbc]
- lapack? ( virtual/lapack )
- sift? ( media-gfx/autopano-sift-C )"
-RDEPEND="${CDEPEND}
- media-libs/exiftool"
-DEPEND="${CDEPEND}
- dev-util/pkgconfig
- python? ( >=dev-lang/swig-2.0.4 )"
-
-S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)
-
-pkg_setup() {
- DOCS="authors.txt README TODO"
- mycmakeargs=(
- $(cmake-utils_use_enable lapack LAPACK)
- $(cmake-utils_use_build python HSI)
- )
-}
-
-src_install() {
- cmake-utils_src_install
-
- for lang in ${LANGS} ; do
- case ${lang} in
- ca) dir=ca_ES;;
- cs) dir=cs_CZ;;
- *) dir=${lang};;
- esac
- use linguas_${lang} || rm -r "${D}"/usr/share/locale/${dir}
- done
-}
diff --git a/media-gfx/hugin/hugin-2011.2.0_rc5.ebuild b/media-gfx/hugin/hugin-2011.2.0_rc5.ebuild
deleted file mode 100644
index 37548c9..0000000
--- a/media-gfx/hugin/hugin-2011.2.0_rc5.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2011.0.0.ebuild,v 1.1 2011/05/29 21:07:01 maekke Exp $
-
-EAPI=3
-WX_GTK_VER="2.8"
-PYTHON_DEPEND="python? 2:2.6 3"
-
-inherit python wxwidgets versionator cmake-utils
-
-DESCRIPTION="GUI for the creation & processing of panoramic images"
-HOMEPAGE="http://hugin.sf.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-LICENSE="GPL-2 SIFT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-LANGS=" bg ca cs da de en_GB es fi fr hu it ja ko nl pl pt_BR ro ru sk sl sv uk zh_CN zh_TW"
-IUSE="lapack python sift $(echo ${LANGS//\ /\ linguas_})"
-
-CDEPEND="
- !!dev-util/cocom
- app-arch/zip
- dev-cpp/tclap
- >=dev-libs/boost-1.35.0-r5
- dev-libs/zthread
- >=media-gfx/enblend-4.0
- media-gfx/exiv2
- media-libs/freeglut
- >=media-libs/libpano13-2.9.18
- media-libs/libpng
- media-libs/openexr
- media-libs/tiff
- sys-libs/zlib
- virtual/jpeg
- x11-libs/wxGTK:2.8[X,opengl,-odbc]
- lapack? ( virtual/lapack )
- sift? ( media-gfx/autopano-sift-C )"
-RDEPEND="${CDEPEND}
- media-libs/exiftool"
-DEPEND="${CDEPEND}
- dev-util/pkgconfig
- python? ( >=dev-lang/swig-2.0.4 )"
-
-S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)
-
-pkg_setup() {
- DOCS="authors.txt README TODO"
- mycmakeargs=(
- $(cmake-utils_use_enable lapack LAPACK)
- $(cmake-utils_use_build python HSI)
- )
-}
-
-src_install() {
- cmake-utils_src_install
-
- for lang in ${LANGS} ; do
- case ${lang} in
- ca) dir=ca_ES;;
- cs) dir=cs_CZ;;
- *) dir=${lang};;
- esac
- use linguas_${lang} || rm -r "${D}"/usr/share/locale/${dir}
- done
-}
diff --git a/media-gfx/hugin/metadata.xml b/media-gfx/hugin/metadata.xml
deleted file mode 100644
index 1c5a459..0000000
--- a/media-gfx/hugin/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>graphics</herd>
- <longdescription>hugin is a panorama stitching program</longdescription>
- <use>
- <flag name='sift'>automatically align images with
- <pkg>media-gfx/autopano-sift</pkg> or
- <pkg>media-gfx/autopano-sift-C</pkg></flag>
- </use>
-</pkgmetadata>
^ permalink raw reply related [flat|nested] 9+ messages in thread* [gentoo-commits] dev/maekke:master commit in: media-gfx/hugin/files/, media-gfx/hugin/
@ 2015-11-07 6:37 Markus Meier
0 siblings, 0 replies; 9+ messages in thread
From: Markus Meier @ 2015-11-07 6:37 UTC (permalink / raw
To: gentoo-commits
commit: 8772d8c01ab595f3924c07d621c4db611180b7db
Author: Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 7 06:33:12 2015 +0000
Commit: Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Sat Nov 7 06:33:12 2015 +0000
URL: https://gitweb.gentoo.org/dev/maekke.git/commit/?id=8772d8c0
media-gfx/hugin: sync with main tree
Package-Manager: portage-2.2.23
Manifest-Sign-Key: 0x363AF1F7765A9D02
media-gfx/hugin/Manifest | 38 +-
.../hugin/files/hugin-2014.0.0-ParseExp.patch | 527 ---------------------
.../hugin/files/hugin-2014.0.0-lensfun-0.3.0.patch | 15 -
media-gfx/hugin/hugin-2014.0.0-r1.ebuild | 89 ----
media-gfx/hugin/hugin-2014.0.0.ebuild | 89 ----
media-gfx/hugin/hugin-2015.0.0-r1.ebuild | 2 +-
media-gfx/hugin/hugin-2015.0.0.ebuild | 86 ----
media-gfx/hugin/metadata.xml | 5 +-
8 files changed, 21 insertions(+), 830 deletions(-)
diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index 5cab9fc..c416fc2 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -1,32 +1,26 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
-AUX hugin-2014.0.0-ParseExp.patch 16829 SHA256 d4c9b4770bcac21aaa476646c08654885829eb2c05f03943e07f4c92d134d633 SHA512 8058e693c2bc0e80483d716dc033784828cf8c34c59c2108b9cccffb65ca818f4107b9af8d9acc1a82abb65e3498e69ec39708d2a359c99d14b286ed39e02cf4 WHIRLPOOL a2e498485b620d9cbece1e3a91215b95f2c08614b52cd3bca138f5b4050766df31abd608299288244c336023fb6d0a8830737fbf0d3cd5d2b2eb2a83f931678b
-AUX hugin-2014.0.0-lensfun-0.3.0.patch 612 SHA256 d4099a2ebc2203bd23807823c0370364bf65faba1ec5ebc596053fda3e6333db SHA512 3fbea4e1c123bfd797514703a32311e5fa19bae1f531f5e81e9cbc4e72a5c4547c3e707709c8c7e3589f6b591c277c0f99600d4ca0d69b4676990e471040f485 WHIRLPOOL 63841447a3f7ef940b9b4e660097e5ff2df3fc2e66568bba8ef605e28a1fe00c235ecf057644a887216a0da2f8cf936c2aac006fab934868284f2f896ad9966f
-DIST hugin-2014.0.0.tar.bz2 10974274 SHA256 f098aa0ede44010d3bb2bb38693177533fd776c45063a338c4c483d7e471ec29 SHA512 f4dd7a59f96d4574d420691d221265309d1ff18b7df04df2c2f0946f3d669e78823e2a53f038ac7bddaaf2037e21c45bf54f19d2a90ce9d5d95a836331e34ca5 WHIRLPOOL e8915454fcc5d54037289b0e91b8c441288706874891b72541414cad83556f6587d15d18be38405917da6c69b590121bc74a2ffa130bb9f1abea223c6fb1375d
DIST hugin-2015.0.0.tar.bz2 10611519 SHA256 2cd93c110be95d439f9e68653f3738d059a26f5c28973f75475ef59cbaa2cbbd SHA512 bb2acf4dea80d43280778f67594dd1ddb0c2e186bcbaafe460fe47e0bd464ae2191b9b25344245e7267316e602ac2179cc838a0dcecb0d408c2206890a5ab6a2 WHIRLPOOL f9d47da7962a19894f323b85084fc7fda925ed5041188ffb1fbcea09ce7719baa7b26c95c66ec22139d24b683d6b1cba8b821949c166814e435efc5fc0e0a11e
-EBUILD hugin-2014.0.0-r1.ebuild 1988 SHA256 1ce01deee7b7a6070f8afcf53373ff75f5f9d4ffa19ef0e063682cd4965872b7 SHA512 70677bade49a243b3c97a640f33bf2d968ac45208f66ad3933afd55a1dd64add1ba525a831aafb1312b290a748c032b4587494edb38e3e6194c8e0188f5594f1 WHIRLPOOL a813733f5ed996a1d38f8b5eed99043c295548e1f2a30c1f08c0f73afa8c37ef2015b5fc7dc40b9d74db4a36ce91627468be8fb218cf65af771f3a6cad681253
-EBUILD hugin-2014.0.0.ebuild 1992 SHA256 39460dc169bd6c9f082980b61addf316afe21426727dd47c2df53cd65abfe032 SHA512 75e7184035b36efad83280727f8a7cb8d5df8ee50cc3ac1d143a1081129b7d0cd55545c1a51031f418845f94701c633fdb7166efccb3a7f307bab16f2bcf4a79 WHIRLPOOL e9e45ca88b6e4e59138dfc9168b156983e70de7d486693af8ed9789ddaf55a3ffabf259b41a5d1d7ed3de1d1bfeb18dc88520a8401ff92cbde46a08308b518d2
-EBUILD hugin-2015.0.0-r1.ebuild 2001 SHA256 c156f33f520b72698c94c906d8f84ba4c60e49b07ed3470cf9e2aba6ea1d0e5a SHA512 af1046bb7da20bc540ee8964057660cbb7b4e0f723fd2e6c838ea59c5269b33d97596cf9dbc726053ac5368d01bd9a8c8b00310619287a6ba6a5fb314e55d41d WHIRLPOOL 8e02035eb65879a196119e13c69aea015663b6a0eae4b682724cb88982d7a59adc9fdd18778ac58c62c40d6501e6dd5e9bf56d1a2c875a5b498eb404aaf5068f
-EBUILD hugin-2015.0.0.ebuild 2007 SHA256 d40ae026901ee8d29fae61206cf74d317b576e842fe42a27864c1f239498d74b SHA512 42904eccfd824b07a449f2a07b7de9129b0d86f01dcbd0f7381485fb8cd6e7c746eed48556252e28d9e90f2324b1d15eb30e7167a174fc69b727945c2e587659 WHIRLPOOL 4beb1050616ffaf51e8a0dca2f8a1eb81f4524cf58d1c3941438c3b553367323eec5fa8ba7a8d85d30f3e1fb2178ec3864e2118d52b9ec1f3122f564f75411d6
+EBUILD hugin-2015.0.0-r1.ebuild 1999 SHA256 e3bd4434df3b96042e3ac0af877aa362087fafa2ca0628b1542dbccef2c8c78c SHA512 f69c38d3dfa3773d87a6dc32222af20fd46f2ddfa1e051db8198d62c28effff607fa1c859724ec184bb6606c59c166da7ba8abd1997dfe2f47e36dc639dddf34 WHIRLPOOL 247aa89a0da99b6d6e204e16cfc2b827b64ba96734514fa70ca8a669ad20dcf124854c8d853272e6910c0d164d9abb7dbba9df436fe246dcbf838e816bc4d6a7
EBUILD hugin-9999.ebuild 2036 SHA256 aea1e37f5e73978955aa67b2a735e5a3fd9c0db266b98279aa97de09f1b93b92 SHA512 4dac84a8836db26444e2bbe13303ea0725d25c842d534a32f8ad0795aa00d55104e3243c6641fef6273b5f0cebcb9999d65146083413c3de1d18823ada8ac829 WHIRLPOOL 3f070b1d1968da3595095cd2e5ede2a311ea53527dd71da41a421a35b366725f9326c5bd1bafd06914dcb8c5ce4e0756f5668f3ff321103a768225a26e5d4823
-MISC metadata.xml 395 SHA256 1e88681d08863b52f3ae17f149901c3d84b6c6197913f7538d17572b33adbf9b SHA512 52848e953af2d3a398f9309a8af40261df0bb78365a3065f805ad06fbc40bea2a44b23ca70aa898b7dbb39a1c2e1309f036762de81d66824bdea09f767039a21 WHIRLPOOL dbdfadbbd20f6acd3961b786bb7bc5e57fd8fd954373cf4a645a008ddaf9273406072cc5ab1497ca1bdefbb77834996d8210c4d9f8cf1a716a7a788b29431684
+MISC metadata.xml 474 SHA256 a3329c0e475d6a761222daa9e01fcf54ee378b001ec6255495b5ffb8d760ba49 SHA512 2390f3d4cdd5f30c16773e59715aa4c1f1dc6b41ddbfacb510efd9feef4d9062730740280f1e5a8166ddc7d3ae492417dec02a2d24a351f40201c7cfbcaac12f WHIRLPOOL d5984757160eefa4a359855481b90c38d28dfdc367cd60f6e2972a84b046b1510df97dc9000e09568e31bf93e7536c2d591c3042a9dcf5867ec8e966639b26e7
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.1
-iQJ8BAEBCABmBQJV04xfXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJWPZsoXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyMDhFOEI5QzhFQzk5QTE1M0I0QkI3Mzc3
-QkU3NkVDMjU1N0I0NDNDAAoJEHvnbsJVe0Q8erwQAJJeY85RX5VMUl2bxpmQHy+0
-i6X3779c9BLwxqggx8KlVbA3zq47Dg4uvEqRxhwMtb4oEPOlNVhOteejbKykU1ne
-EthtOyrdMtHxqnULTbta6nGDyLNPLuQNpBnmUTRk4SKjqeVypkFa7uopk/xQB0b3
-vn1FzRo+x2433qq6+VJDLfjqUYjVNc92K5kaa8NMG5//2NA46HOfW/oWYPoCB1xQ
-zU2t6CVtc6qZq+vOes3fzmT8w5RpLb7DvkV/jZ/ANMPUSGFxGnI08k1ATHPYjpO9
-gWD8Y5tAJ1TKyihwUQzACVm2JBC2OgW4Exa2eDJEpbW5wN0tOqpvsv7BMTQ5tHS8
-3lLL9fb7PfTxZkP0HxHUcYfzTyAz3RodJRenF+kX5d1CYs3A5/Jn6+Eh7PRrd4bh
-FbNkSHmOL8JuL0Zpz80a8qoxN+0aOUSqcxQEj6MPZmtbSA+uUWX1OlqB+AVzcjeT
-5ttz7cjZBCxCTrbqUtR9+4C/jC7YZVcnMWcmaMrdpLrtpvmiIu50jlJ5yYQsPf88
-5UbHEUgh5ulSwyjoSwVK89NIX+vqMgmkSh+yvuSrmGnzQzyG2uBXztzKwHMLpiWx
-FJ45eo88j48KWQiA+oUkgQGTEaEE4ZMcoWbYA3N3TEacdje4FU9cmFDdPSVesdL8
-b6N64rZAGUbJ3RcooIyX
-=w6av
+QkU3NkVDMjU1N0I0NDNDAAoJEHvnbsJVe0Q8G4gQAJSqBgPDG2ohVcw+fFyVgPDa
+2Wc4LnLxdXbFiawGj73OKEZCAvKOSLS/fVRgOeaMGUKUyLwAXuwjXggSfqzB7rNl
+MsUG+9/ZRog49XgXnMOyzU/j2Xy2+wI2FK+dChD4tGn20xSAltlD3+NRAoRjFfDO
+O7nt86URuBF98qsT+1npY0BS6PLZA+LmNbBJytbgWMlzdRwFT3DnPRFD1erFQhVG
+f6NYW4/lrPhMVygWRXEaOwYM+ipaXrMh3NjANL3+B01XXkRp3DlxP1eKEyS0z700
+Hmf4up6jOyVbUCkU8/tmZFJoedf3Bn7C7PRzXtWpSP8EgGye7wVxOoF7DKuoJmtD
+q3BDYdlT71yGkHSnUaCD4Tog5MN8TOHtmrgl4WxWd1e4huA86ioDOm/hhSPeleEs
+Mx9Xp+M3UUo74gwbGB9vc4ELTRAtaXgi7JB3JLxH65DZUa6JFut24QYxL0/X9tzn
+TGyo7wKTuTfuPFShxc5xfElFiEymEPTz6/7SyLpewsfAzQJMjCfmVg+TX2wNgTnV
+ZYvInhbD3BopYVxL37J2coWFVbZZuUdKLApgDWY9a5vTee0jSSt3W5GWVT2/uucp
+dQJSZOgUOLIoDwpPpQO2s1Qi9rIcE6RkjoyPpgG/i1LrVXGbYjpVtrJ/PKzzFDvP
+AQzFFeG5qYwkJKqANt84
+=W6kA
-----END PGP SIGNATURE-----
diff --git a/media-gfx/hugin/files/hugin-2014.0.0-ParseExp.patch b/media-gfx/hugin/files/hugin-2014.0.0-ParseExp.patch
deleted file mode 100644
index 3ee0dee..0000000
--- a/media-gfx/hugin/files/hugin-2014.0.0-ParseExp.patch
+++ /dev/null
@@ -1,527 +0,0 @@
-Contains revisions 6407:917d117ba6b0 6597:5b768c308932 6688:dde84e96b755 6689:e237d6d1d873 of ParseExp.cpp/h
-
-diff -r 917d117ba6b0 -r e237d6d1d873 src/tools/ParseExp.cpp
---- a/src/tools/ParseExp.cpp Sun Dec 15 18:20:14 2013 +0100
-+++ b/src/tools/ParseExp.cpp Sat Sep 13 11:22:39 2014 +0200
-@@ -1,262 +1,246 @@
--// -*- c-basic-offset: 4 -*-
--
--/** @file ParseExp.cpp
-- *
-- * @brief functions to parse expressions from strings
-- *
-- * @author T. Modes
-- *
-- */
--
--/* This program is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU General Public
-- * License as published by the Free Software Foundation; either
-- * version 2 of the License, or (at your option) any later version.
-- *
-- * This software is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-- * General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public
-- * License along with this software; if not, write to the Free Software
-- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-- *
-- */
--
--// implementation is based on blog at
--// http://agentzlerich.blogspot.de/2011/06/using-boost-spirit-21-to-evaluate.html
--// modified to Hugins need
--// added if statement
--
--#include "ParseExp.h"
--
--#include <limits>
--#include <iterator>
--
--#include <boost/spirit/version.hpp>
--#if !defined(SPIRIT_VERSION) || SPIRIT_VERSION < 0x2010
--#error "At least Spirit version 2.1 required"
--#endif
--#include <boost/math/constants/constants.hpp>
--#include <boost/spirit/include/phoenix.hpp>
--#include <boost/spirit/include/qi.hpp>
--
--namespace Parser
--{
--
--// helper classes to implement operators
--
--//power function
--struct lazy_pow_
--{
-- template <typename X, typename Y>
-- struct result { typedef X type; };
--
-- template <typename X, typename Y>
-- X operator()(X x, Y y) const
-- {
-- return std::pow(x, y);
-- }
--};
--
--// modulus for double values
--struct lazy_mod_
--{
-- template <typename X, typename Y>
-- struct result { typedef X type; };
--
-- template <typename X, typename Y>
-- X operator()(X x, Y y) const
-- {
-- return std::fmod(x,y);
-- }
--};
--
--// if statement
--struct lazy_if_
--{
-- template <typename X, typename Y, typename Z>
-- struct result { typedef Y type; };
--
-- template <typename X, typename Y, typename Z>
-- X operator()(X x, Y y, Z z) const
-- {
-- return x ? y : z;
-- }
--};
--
--// wrapper for unary function
--struct lazy_ufunc_
--{
-- template <typename F, typename A1>
-- struct result { typedef A1 type; };
--
-- template <typename F, typename A1>
-- A1 operator()(F f, A1 a1) const
-- {
-- return f(a1);
-- }
--};
--
--// convert rad into deg
--double deg(const double d)
--{
-- return d*180.0/boost::math::constants::pi<double>();
--};
--
--// convert deg into rad
--double rad(const double d)
--{
-- return d*boost::math::constants::pi<double>()/180;
--};
--
--// the main grammar class
--struct grammar:boost::spirit::qi::grammar<std::string::const_iterator, double(), boost::spirit::ascii::space_type>
--{
--
-- // symbol table for constants like "pi", e.g. image number and value
-- struct constant_ : boost::spirit::qi::symbols<char, double>
-- {
-- constant_(const ConstantMap constMap)
-- {
-- this->add("pi", boost::math::constants::pi<double>());
-- if(constMap.size()>0)
-- {
-- for(ConstantMap::const_iterator it=constMap.begin(); it!=constMap.end(); it++)
-- {
-- this->add(it->first, it->second);
-- };
-- };
-- };
-- };
--
-- // symbol table for unary functions like "abs"
-- struct ufunc_ : boost::spirit::qi::symbols<char, double(*)(double) >
-- {
-- ufunc_()
-- {
-- this->add
-- ("abs" , (double (*)(double)) std::abs )
-- ("acos" , (double (*)(double)) std::acos )
-- ("asin" , (double (*)(double)) std::asin )
-- ("atan" , (double (*)(double)) std::atan )
-- ("ceil" , (double (*)(double)) std::ceil )
-- ("sin" , (double (*)(double)) std::sin )
-- ("cos" , (double (*)(double)) std::cos )
-- ("tan" , (double (*)(double)) std::tan )
-- ("exp" , (double (*)(double)) std::exp )
-- ("floor" , (double (*)(double)) std::floor)
-- ("sqrt" , (double (*)(double)) std::sqrt )
-- ("deg" , (double (*)(double)) deg )
-- ("rad" , (double (*)(double)) rad )
-- ;
-- }
-- } ufunc;
--
-- boost::spirit::qi::rule<std::string::const_iterator, double(), boost::spirit::ascii::space_type> expression, term, factor, primary, compExpression, compTerm, numExpression;
--
-- grammar(const ConstantMap constMap) : grammar::base_type(expression)
-- {
-- using boost::spirit::qi::real_parser;
-- using boost::spirit::qi::real_policies;
-- real_parser<double,real_policies<double> > real;
--
-- using boost::spirit::qi::_1;
-- using boost::spirit::qi::_2;
-- using boost::spirit::qi::_3;
-- using boost::spirit::qi::no_case;
-- using boost::spirit::qi::_val;
-- struct constant_ constant(constMap);
--
-- boost::phoenix::function<lazy_pow_> lazy_pow;
-- boost::phoenix::function<lazy_mod_> lazy_mod;
-- boost::phoenix::function<lazy_if_> lazy_if;
-- boost::phoenix::function<lazy_ufunc_> lazy_ufunc;
--
-- expression =
-- (compExpression >> '\?' >> compExpression >> ':' >> compExpression) [_val = lazy_if(_1, _2, _3)]
-- | compExpression [_val=_1]
-- ;
--
-- compExpression=
-- compTerm [_val=_1]
-- >> * ( ("&&" >> compTerm [_val = _val && _1] )
-- |("||" >> compTerm [_val = _val || _1] )
-- )
-- ;
--
-- compTerm =
-- numExpression [_val = _1 ]
-- >>*( ( '<' >> numExpression [_val = _val < _1])
-- |( '>' >> numExpression [_val = _val > _1])
-- |( "<=" >> numExpression [_val = _val <= _1])
-- |( ">=" >> numExpression [_val = _val >= _1])
-- |( "==" >> numExpression [_val = _val == _1])
-- |( "!=" >> numExpression [_val = _val != _1])
-- )
-- ;
--
-- numExpression =
-- term [_val = _1]
-- >> *( ('+' >> term [_val += _1])
-- | ('-' >> term [_val -= _1])
-- )
-- ;
--
-- term =
-- factor [_val = _1]
-- >> *( ('*' >> factor [_val *= _1])
-- | ('/' >> factor [_val /= _1])
-- | ('%' >> factor [_val = lazy_mod(_val, _1)])
-- )
-- ;
--
-- factor =
-- primary [_val = _1]
-- >> *( ('^' >> factor [_val = lazy_pow(_val, _1)]) )
-- ;
--
-- primary =
-- real [_val = _1]
-- | '(' >> expression [_val = _1] >> ')'
-- | ('-' >> primary [_val = -_1])
-- | ('+' >> primary [_val = _1])
-- | no_case[constant] [_val = _1]
-- | (no_case[ufunc] >> '(' >> expression >> ')') [_val = lazy_ufunc(_1, _2) ]
-- ;
--
-- };
--};
--
--//template <typename ParserType, typename Iterator>
--bool parse(std::string::const_iterator &iter,
-- std::string::const_iterator end,
-- const grammar &g,
-- double& result)
--{
-- if(!boost::spirit::qi::phrase_parse(iter, end, g, boost::spirit::ascii::space, result))
-- {
-- return false;
-- };
-- // we check if the full string could parsed
-- return iter==end;
--}
--
--// the function which exposes the interface to external
--// version without pre-defined constants
--bool ParseExpression(const std::string& expression, double& result)
--{
-- ConstantMap constants;
-- return ParseExpression(expression, result, constants);
--};
--
--// version with pre-defined constants
--bool ParseExpression(const std::string& expression, double& result, const ConstantMap& constants)
--{
-- grammar g(constants);
-- std::string::const_iterator it=expression.begin();
-- return parse(it, expression.end(), g, result);
--};
--
--} // namespace
-+// -*- c-basic-offset: 4 -*-
-+
-+/** @file ParseExp.cpp
-+ *
-+ * @brief functions to parse expressions from strings
-+ *
-+ * @author T. Modes
-+ *
-+ */
-+
-+/* This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2 of the License, or (at your option) any later version.
-+ *
-+ * This software is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public
-+ * License along with this software; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-+ *
-+ */
-+
-+// implementation is based on blog at
-+// http://agentzlerich.blogspot.de/2011/06/using-boost-spirit-21-to-evaluate.html
-+// modified to Hugins need
-+// added if statement
-+
-+#include "ParseExp.h"
-+
-+#include <limits>
-+#include <iterator>
-+
-+#define BOOST_SPIRIT_USE_PHOENIX_V3 1
-+#include <boost/spirit/version.hpp>
-+#if !defined(SPIRIT_VERSION) || SPIRIT_VERSION < 0x2010
-+#error "At least Spirit version 2.1 required"
-+#endif
-+#include <boost/math/constants/constants.hpp>
-+#include <boost/spirit/include/phoenix.hpp>
-+#include <boost/spirit/include/qi.hpp>
-+
-+namespace Parser
-+{
-+
-+// helper classes to implement operators
-+
-+//power function
-+struct lazy_pow_
-+{
-+ typedef double result_type;
-+
-+ double operator()(double x, double y) const
-+ {
-+ return std::pow(x, y);
-+ }
-+};
-+
-+// modulus for double values
-+struct lazy_mod_
-+{
-+ typedef double result_type;
-+
-+ double operator()(double x, double y) const
-+ {
-+ return std::fmod(x,y);
-+ }
-+};
-+
-+// if statement
-+struct lazy_if_
-+{
-+ typedef double result_type;
-+
-+ double operator()(double x, double y, double z) const
-+ {
-+ return (std::fabs(x)>1e-5) ? y : z;
-+ }
-+};
-+
-+// wrapper for unary function
-+struct lazy_ufunc_
-+{
-+ typedef double result_type;
-+
-+ double operator()(double (*f)(double), double a1) const
-+ {
-+ return f(a1);
-+ }
-+};
-+
-+// convert rad into deg
-+const double deg(const double d)
-+{
-+ return d*180.0/boost::math::constants::pi<double>();
-+};
-+
-+// convert deg into rad
-+const double rad(const double d)
-+{
-+ return d*boost::math::constants::pi<double>()/180;
-+};
-+
-+// the main grammar class
-+struct grammar:boost::spirit::qi::grammar<std::string::const_iterator, double(), boost::spirit::ascii::space_type>
-+{
-+
-+ // symbol table for constants like "pi", e.g. image number and value
-+ struct constant_ : boost::spirit::qi::symbols<char, double>
-+ {
-+ constant_(const ConstantMap constMap)
-+ {
-+ this->add("pi", boost::math::constants::pi<double>());
-+ if (constMap.size()>0)
-+ {
-+ for (ConstantMap::const_iterator it = constMap.begin(); it != constMap.end(); it++)
-+ {
-+ this->add(it->first, it->second);
-+ };
-+ };
-+ };
-+ };
-+
-+ // symbol table for unary functions like "abs"
-+ struct ufunc_ : boost::spirit::qi::symbols<char, double(*)(double) >
-+ {
-+ ufunc_()
-+ {
-+ this->add
-+ ("abs", (double(*)(double)) std::abs)
-+ ("acos", (double(*)(double)) std::acos)
-+ ("asin", (double(*)(double)) std::asin)
-+ ("atan", (double(*)(double)) std::atan)
-+ ("ceil", (double(*)(double)) std::ceil)
-+ ("sin", (double(*)(double)) std::sin)
-+ ("cos", (double(*)(double)) std::cos)
-+ ("tan", (double(*)(double)) std::tan)
-+ ("exp", (double(*)(double)) std::exp)
-+ ("floor", (double(*)(double)) std::floor)
-+ ("sqrt", (double(*)(double)) std::sqrt)
-+ ("deg", (double(*)(double)) deg)
-+ ("rad", (double(*)(double)) rad)
-+ ;
-+ }
-+ } ufunc;
-+
-+ boost::spirit::qi::rule<std::string::const_iterator, double(), boost::spirit::ascii::space_type> expression, term, factor, primary, compExpression, compTerm, numExpression;
-+
-+ grammar(const ConstantMap constMap) : grammar::base_type(expression)
-+ {
-+ using boost::spirit::qi::real_parser;
-+ using boost::spirit::qi::real_policies;
-+ real_parser<double, real_policies<double> > real;
-+
-+ using boost::spirit::qi::_1;
-+ using boost::spirit::qi::_2;
-+ using boost::spirit::qi::_3;
-+ using boost::spirit::qi::no_case;
-+ using boost::spirit::qi::_val;
-+ struct constant_ constant(constMap);
-+
-+ boost::phoenix::function<lazy_pow_> lazy_pow;
-+ boost::phoenix::function<lazy_mod_> lazy_mod;
-+ boost::phoenix::function<lazy_if_> lazy_if;
-+ boost::phoenix::function<lazy_ufunc_> lazy_ufunc;
-+
-+ expression =
-+ (compExpression >> '\?' >> compExpression >> ':' >> compExpression)[_val = lazy_if(_1, _2, _3)]
-+ | compExpression[_val = _1]
-+ ;
-+
-+ compExpression =
-+ compTerm[_val = _1]
-+ >> *(("&&" >> compTerm[_val = _val && _1])
-+ | ("||" >> compTerm[_val = _val || _1])
-+ )
-+ ;
-+
-+ compTerm =
-+ numExpression[_val = _1]
-+ >> *(('<' >> numExpression[_val = _val < _1])
-+ | ('>' >> numExpression[_val = _val > _1])
-+ | ("<=" >> numExpression[_val = _val <= _1])
-+ | (">=" >> numExpression[_val = _val >= _1])
-+ | ("==" >> numExpression[_val = _val == _1])
-+ | ("!=" >> numExpression[_val = _val != _1])
-+ )
-+ ;
-+
-+ numExpression =
-+ term[_val = _1]
-+ >> *(('+' >> term[_val += _1])
-+ | ('-' >> term[_val -= _1])
-+ )
-+ ;
-+
-+ term =
-+ factor[_val = _1]
-+ >> *(('*' >> factor[_val *= _1])
-+ | ('/' >> factor[_val /= _1])
-+ | ('%' >> factor[_val = lazy_mod(_val, _1)])
-+ )
-+ ;
-+
-+ factor =
-+ primary[_val = _1]
-+ >> *(('^' >> factor[_val = lazy_pow(_val, _1)]))
-+ ;
-+
-+ primary =
-+ real[_val = _1]
-+ | '(' >> expression[_val = _1] >> ')'
-+ | ('-' >> primary[_val = -_1])
-+ | ('+' >> primary[_val = _1])
-+ | no_case[constant][_val = _1]
-+ | (no_case[ufunc] >> '(' >> expression >> ')')[_val = lazy_ufunc(_1, _2)]
-+ ;
-+
-+ };
-+};
-+
-+bool parse(std::string::const_iterator& iter,
-+ std::string::const_iterator end,
-+ const grammar& g,
-+ double& result)
-+{
-+ if(!boost::spirit::qi::phrase_parse(iter, end, g, boost::spirit::ascii::space, result))
-+ {
-+ return false;
-+ };
-+ // we check if the full string could parsed
-+ return iter==end;
-+}
-+
-+// version with pre-defined constants
-+bool ParseExpression(const std::string& expression, double& result, const ConstantMap& constants)
-+{
-+ grammar g(constants);
-+ std::string::const_iterator it=expression.begin();
-+ return parse(it, expression.end(), g, result);
-+};
-+
-+} // namespace
-diff -r 917d117ba6b0 -r e237d6d1d873 src/tools/ParseExp.h
---- a/src/tools/ParseExp.h Sun Dec 15 18:20:14 2013 +0100
-+++ b/src/tools/ParseExp.h Sat Sep 13 11:22:39 2014 +0200
-@@ -33,8 +33,7 @@
- {
- typedef std::map<const char*, double> ConstantMap;
-
--bool ParseExpression(const std::string& expression, double& result);
--bool ParseExpression(const std::string& expression, double& result, const ConstantMap& constants);
-+bool ParseExpression(const std::string& expression, double& result, const ConstantMap& constants=ConstantMap());
-
- };
-
diff --git a/media-gfx/hugin/files/hugin-2014.0.0-lensfun-0.3.0.patch b/media-gfx/hugin/files/hugin-2014.0.0-lensfun-0.3.0.patch
deleted file mode 100644
index f60e686..0000000
--- a/media-gfx/hugin/files/hugin-2014.0.0-lensfun-0.3.0.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=524700
-
-diff -Naur hugin-2014.0.0.orig/src/hugin_base/lensdb/LensDB.cpp hugin-2014.0.0/src/hugin_base/lensdb/LensDB.cpp
---- hugin-2014.0.0.orig/src/hugin_base/lensdb/LensDB.cpp 2014-04-27 08:26:57.000000000 +0200
-+++ hugin-2014.0.0/src/hugin_base/lensdb/LensDB.cpp 2014-10-08 10:44:29.445076647 +0200
-@@ -620,7 +620,9 @@
- break;
- case LF_DIST_MODEL_NONE:
- case LF_DIST_MODEL_POLY5:
-+#ifdef LF_DIST_MODEL_FOV1
- case LF_DIST_MODEL_FOV1:
-+#endif
- default:
- return false;
- break;
diff --git a/media-gfx/hugin/hugin-2014.0.0-r1.ebuild b/media-gfx/hugin/hugin-2014.0.0-r1.ebuild
deleted file mode 100644
index 965c600..0000000
--- a/media-gfx/hugin/hugin-2014.0.0-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-WX_GTK_VER="3.0"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit base python-single-r1 wxwidgets versionator cmake-utils
-
-DESCRIPTION="GUI for the creation & processing of panoramic images"
-HOMEPAGE="http://hugin.sf.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2 SIFT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-LANGS=" cs da de en_GB es eu fi fr hu it ja nl pl pt_BR ro ru sk sv zh_CN zh_TW"
-IUSE="debug lapack python sift $(echo ${LANGS//\ /\ linguas_})"
-
-CDEPEND="
- !!dev-util/cocom
- app-arch/zip
- dev-cpp/tclap
- >=dev-libs/boost-1.49.0-r1:=
- dev-libs/zthread
- >=media-gfx/enblend-4.0
- media-gfx/exiv2:=
- media-libs/freeglut
- media-libs/glew:=
- media-libs/lensfun
- >=media-libs/libpano13-2.9.19_beta1:0=
- media-libs/libpng:0=
- media-libs/openexr:=
- media-libs/tiff
- sys-libs/zlib
- virtual/jpeg
- x11-libs/wxGTK:3.0=[X,opengl]
- lapack? ( virtual/lapack )
- sift? ( media-gfx/autopano-sift-C )"
-RDEPEND="${CDEPEND}
- media-libs/exiftool"
-DEPEND="${CDEPEND}
- sys-devel/gettext
- virtual/pkgconfig
- python? ( ${PYTHON_DEPS} >=dev-lang/swig-2.0.4 )"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)
-
-PATCHES=(
- "${FILESDIR}"/${P}-lensfun-0.3.0.patch
- "${FILESDIR}"/${P}-ParseExp.patch
-)
-
-pkg_setup() {
- DOCS="authors.txt README TODO"
- mycmakeargs=(
- $(cmake-utils_use_enable lapack LAPACK)
- $(cmake-utils_use_build python HSI)
- )
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- sed \
- -e 's:-O3::g' \
- -i src/celeste/CMakeLists.txt || die
- rm CMakeModules/{FindLAPACK,FindPkgConfig}.cmake || die
-
- cmake-utils_src_prepare
-}
-
-src_install() {
- cmake-utils_src_install
- use python && python_optimize
-
- for lang in ${LANGS} ; do
- case ${lang} in
- ca) dir=ca_ES;;
- cs) dir=cs_CZ;;
- *) dir=${lang};;
- esac
- use linguas_${lang} || rm -r "${D}"/usr/share/locale/${dir}
- done
-}
diff --git a/media-gfx/hugin/hugin-2014.0.0.ebuild b/media-gfx/hugin/hugin-2014.0.0.ebuild
deleted file mode 100644
index 9a43a5b..0000000
--- a/media-gfx/hugin/hugin-2014.0.0.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-WX_GTK_VER="2.8"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit base python-single-r1 wxwidgets versionator cmake-utils
-
-DESCRIPTION="GUI for the creation & processing of panoramic images"
-HOMEPAGE="http://hugin.sf.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2 SIFT"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-
-LANGS=" cs da de en_GB es eu fi fr hu it ja nl pl pt_BR ro ru sk sv zh_CN zh_TW"
-IUSE="debug lapack python sift $(echo ${LANGS//\ /\ linguas_})"
-
-CDEPEND="
- !!dev-util/cocom
- app-arch/zip
- dev-cpp/tclap
- >=dev-libs/boost-1.49.0-r1:=
- dev-libs/zthread
- >=media-gfx/enblend-4.0
- media-gfx/exiv2:=
- media-libs/freeglut
- media-libs/glew:=
- media-libs/lensfun
- >=media-libs/libpano13-2.9.19_beta1:0=
- media-libs/libpng:0=
- media-libs/openexr:=
- media-libs/tiff
- sys-libs/zlib
- virtual/jpeg
- x11-libs/wxGTK:2.8=[X,opengl,-odbc]
- lapack? ( virtual/lapack )
- sift? ( media-gfx/autopano-sift-C )"
-RDEPEND="${CDEPEND}
- media-libs/exiftool"
-DEPEND="${CDEPEND}
- sys-devel/gettext
- virtual/pkgconfig
- python? ( ${PYTHON_DEPS} >=dev-lang/swig-2.0.4 )"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)
-
-PATCHES=(
- "${FILESDIR}"/${P}-lensfun-0.3.0.patch
- "${FILESDIR}"/${P}-ParseExp.patch
-)
-
-pkg_setup() {
- DOCS="authors.txt README TODO"
- mycmakeargs=(
- $(cmake-utils_use_enable lapack LAPACK)
- $(cmake-utils_use_build python HSI)
- )
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- sed \
- -e 's:-O3::g' \
- -i src/celeste/CMakeLists.txt || die
- rm CMakeModules/{FindLAPACK,FindPkgConfig}.cmake || die
-
- cmake-utils_src_prepare
-}
-
-src_install() {
- cmake-utils_src_install
- use python && python_optimize
-
- for lang in ${LANGS} ; do
- case ${lang} in
- ca) dir=ca_ES;;
- cs) dir=cs_CZ;;
- *) dir=${lang};;
- esac
- use linguas_${lang} || rm -r "${D}"/usr/share/locale/${dir}
- done
-}
diff --git a/media-gfx/hugin/hugin-2015.0.0-r1.ebuild b/media-gfx/hugin/hugin-2015.0.0-r1.ebuild
index b42262b..3306723 100644
--- a/media-gfx/hugin/hugin-2015.0.0-r1.ebuild
+++ b/media-gfx/hugin/hugin-2015.0.0-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
LICENSE="GPL-2 SIFT"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
LANGS=" ca@valencia ca_ES cs_CZ da de en_GB es eu fi fr hu it ja nl pl pt_BR ro ru sk sv zh_CN zh_TW"
IUSE="debug lapack python sift $(echo ${LANGS//\ /\ linguas_})"
diff --git a/media-gfx/hugin/hugin-2015.0.0.ebuild b/media-gfx/hugin/hugin-2015.0.0.ebuild
deleted file mode 100644
index 0798df9..0000000
--- a/media-gfx/hugin/hugin-2015.0.0.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-WX_GTK_VER="2.8"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit base python-single-r1 wxwidgets versionator cmake-utils
-
-DESCRIPTION="GUI for the creation & processing of panoramic images"
-HOMEPAGE="http://hugin.sf.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2 SIFT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-LANGS=" ca@valencia ca_ES cs_CZ da de en_GB es eu fi fr hu it ja nl pl pt_BR ro ru sk sv zh_CN zh_TW"
-IUSE="debug lapack python sift $(echo ${LANGS//\ /\ linguas_})"
-
-CDEPEND="
- !!dev-util/cocom
- dev-db/sqlite:3
- >=dev-libs/boost-1.49.0-r1:=
- dev-libs/zthread
- >=media-gfx/enblend-4.0
- media-gfx/exiv2:=
- media-libs/freeglut
- media-libs/glew:=
- >=media-libs/libpano13-2.9.19_beta1:0=
- media-libs/libpng:0=
- media-libs/openexr:=
- media-libs/tiff:0
- >=media-libs/vigra-1.9.0[openexr]
- sci-libs/fftw:=
- sys-libs/zlib
- virtual/glu
- virtual/jpeg:0
- virtual/opengl
- x11-libs/wxGTK:2.8=[X,opengl,-odbc]
- lapack? ( virtual/blas virtual/lapack )
- sift? ( media-gfx/autopano-sift-C )"
-RDEPEND="${CDEPEND}
- media-libs/exiftool"
-DEPEND="${CDEPEND}
- dev-cpp/tclap
- sys-devel/gettext
- virtual/pkgconfig
- python? ( ${PYTHON_DEPS} >=dev-lang/swig-2.0.4 )"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)
-
-pkg_setup() {
- DOCS="authors.txt README TODO"
- mycmakeargs=(
- $(cmake-utils_use_enable lapack LAPACK)
- $(cmake-utils_use_build python HSI)
- )
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- sed \
- -e 's:-O3::g' \
- -i src/celeste/CMakeLists.txt || die
- rm CMakeModules/{FindLAPACK,FindPkgConfig}.cmake || die
-
- cmake-utils_src_prepare
-}
-
-src_install() {
- cmake-utils_src_install
- use python && python_optimize
-
- for lang in ${LANGS} ; do
- case ${lang} in
- ca@valencia) dir=ca_ES@valencia;;
- *) dir=${lang};;
- esac
- use linguas_${lang} || rm -r "${D}"/usr/share/locale/${dir}
- done
-}
diff --git a/media-gfx/hugin/metadata.xml b/media-gfx/hugin/metadata.xml
index abdaa4c..e87859e 100644
--- a/media-gfx/hugin/metadata.xml
+++ b/media-gfx/hugin/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>graphics</herd>
@@ -8,4 +8,7 @@
<pkg>media-gfx/autopano-sift</pkg> or
<pkg>media-gfx/autopano-sift-C</pkg></flag>
</use>
+ <upstream>
+ <remote-id type="sourceforge">hugin</remote-id>
+ </upstream>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 9+ messages in thread* [gentoo-commits] dev/maekke:master commit in: media-gfx/hugin/files/, media-gfx/hugin/
@ 2015-01-02 18:31 Markus Meier
0 siblings, 0 replies; 9+ messages in thread
From: Markus Meier @ 2015-01-02 18:31 UTC (permalink / raw
To: gentoo-commits
commit: f740ee8ee532576e98c44b1824b14387eea77184
Author: Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 2 18:31:24 2015 +0000
Commit: Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Fri Jan 2 18:31:24 2015 +0000
URL: http://sources.gentoo.org/gitweb/?p=dev/maekke.git;a=commit;h=f740ee8e
fix building with dev-libs/boost-1.56, bug #525400
Package-Manager: portage-2.2.15
Manifest-Sign-Key: 072AD062
---
media-gfx/hugin/Manifest | 11 +-
.../hugin/files/hugin-2014.0.0-ParseExp.patch | 527 +++++++++++++++++++++
media-gfx/hugin/hugin-2014.0.0-r1.ebuild | 5 +-
media-gfx/hugin/hugin-2014.0.0.ebuild | 5 +-
4 files changed, 541 insertions(+), 7 deletions(-)
diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index 9441812..6be43ff 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -6,20 +6,21 @@ AUX hugin-2011.4.0-gcc47.patch 1243 SHA256 ff1e2f55eb94e22546c3185cde458f51a503f
AUX hugin-2012.0.0-boost.patch 1690 SHA256 024354bf8c6fea9cc113f8645224eb8402c4406e310db5b72b27c2d6bd188182 SHA512 78dbeb9e2e0450f354ea2920a8081f34024a512db6a2536508401db622be5cce292661b244788eebec9fb03c89c5c3b17c5c8eef7c6a9bde31cca78e68de416b WHIRLPOOL 42452ac88ad1fc0dd2d7a94c5ea0c412c9742c1a255943242614bad1f459aed46de44ef281f3d443dd4377549bef3f4dfd86561e2ebbf14f42b8d508e3c1dc82
AUX hugin-2012.0.0-perl.patch 272 SHA256 2e21c6cbffe4d06a9a97787f22fbe6e6eff6130906c791d051cb7e1a6a05a92a SHA512 0f0e6d42012ae70ccf3ede51a24763f6e9cd6e46e7cc287c2a52b5b2753928dcda630568811a23d6cc5e836e11a9b3bec5202844a878e4ac58349ea379c7d9d8 WHIRLPOOL 82256829f4083bd043aa8105088a19bb0c04e7de9deb6802f33d1055f56663630437419a6b8830ff95a2904a9bc5ed74de1969aa45774723f650074db79bfcfb
AUX hugin-2013.0.0-boost.patch 1690 SHA256 4a4e507546d344811f16390dcfc90f42d70807bc3ace8e7b1df3ceb9dea7cc30 SHA512 280d3555dc3774ccead2a962a8efd3a3942da296d6565185b9f84e79f03b9a6398e103357b80496b121fa07822fd1cfb9b580ef0c4da8fbaf6ddd7665d135cd7 WHIRLPOOL 60770064bb4fb292a4a12308ee4a004b6b114ada751cd713a2df061dc7670e0b0c7f39c50d3f6510f037a9e987a69f9e4aef645d6d9674dfc0306d4e155982fa
+AUX hugin-2014.0.0-ParseExp.patch 16829 SHA256 d4c9b4770bcac21aaa476646c08654885829eb2c05f03943e07f4c92d134d633 SHA512 8058e693c2bc0e80483d716dc033784828cf8c34c59c2108b9cccffb65ca818f4107b9af8d9acc1a82abb65e3498e69ec39708d2a359c99d14b286ed39e02cf4 WHIRLPOOL a2e498485b620d9cbece1e3a91215b95f2c08614b52cd3bca138f5b4050766df31abd608299288244c336023fb6d0a8830737fbf0d3cd5d2b2eb2a83f931678b
AUX hugin-2014.0.0-lensfun-0.3.0.patch 612 SHA256 d4099a2ebc2203bd23807823c0370364bf65faba1ec5ebc596053fda3e6333db SHA512 3fbea4e1c123bfd797514703a32311e5fa19bae1f531f5e81e9cbc4e72a5c4547c3e707709c8c7e3589f6b591c277c0f99600d4ca0d69b4676990e471040f485 WHIRLPOOL 63841447a3f7ef940b9b4e660097e5ff2df3fc2e66568bba8ef605e28a1fe00c235ecf057644a887216a0da2f8cf936c2aac006fab934868284f2f896ad9966f
DIST hugin-2012.0.0.tar.bz2 11658665 SHA256 63dfd88ac90d3af4b958111db951bb7fbf2c66ad6b0246e6305403eb5de971b3 SHA512 acf97d383091eca300074a8e207ec5500a8b96a5116708a6ff23fb8f5359a77016867ee2ae21a4e40c4d07d056b5c27844c03c275ec29c0b604ecb31b73ee0a8 WHIRLPOOL d058639202aef1f6beb475bc8c170ac4269bf5050bfcbc48678ddde67188e12eb29c216b6ce8f79571c91ff43e271dac706bd4f432d3f640d549f87b371caa43
DIST hugin-2013.0.0.tar.bz2 11247583 SHA256 484e1ed58fa6fe4bae1f423967101549345bcca2653b992afbc0ed9ec0dbebd5 SHA512 dea1682c16991441278a881e5e0916ffdbe8e0012f0dcf45875ee97fe7dc698d4d98037916e63c9a651557adc45c89e4e350ad976fec020562bc17a31f608a86 WHIRLPOOL c3d8e175ff23c8761815406039a8027da327925f07a18b00bde4d457228a2562f30f5df3fb5dff17f8003f985d7b51ec39d557a064c7e228b09ff73473c41e6a
DIST hugin-2014.0.0.tar.bz2 10974274 SHA256 f098aa0ede44010d3bb2bb38693177533fd776c45063a338c4c483d7e471ec29 SHA512 f4dd7a59f96d4574d420691d221265309d1ff18b7df04df2c2f0946f3d669e78823e2a53f038ac7bddaaf2037e21c45bf54f19d2a90ce9d5d95a836331e34ca5 WHIRLPOOL e8915454fcc5d54037289b0e91b8c441288706874891b72541414cad83556f6587d15d18be38405917da6c69b590121bc74a2ffa130bb9f1abea223c6fb1375d
EBUILD hugin-2012.0.0.ebuild 1649 SHA256 263d0a369e9c552afdb170e11e1e2965106f3d97d5d8cbdc771c14c578ce4e43 SHA512 ce0c63b945690dcbe2d0bac11a87073127505d0bf15809ac95f99c04399e211eb132d51e7c8de82909225651e8f01f5be66fd640131360f2568187af5f476855 WHIRLPOOL df1ce0cb4f1728145a3ba69608dbc03f2373d97976052bfec37a9bc9353a4f184a8cc2476471f3153ed786dbd98267ca6eca10c1077f00997defaf284892f54d
EBUILD hugin-2013.0.0-r1.ebuild 2035 SHA256 1e6dc81a4fa7cda22bfd3181587588e22be6f8269fbe3328f0419d8718ba5c6e SHA512 a69d73c96eef15fc1ceea490c6a7014f44f08fc6845c0679e4b6656e171ac4f5d78636aaa746fd46e96abc3f0228ca6f7458115080d9c6e2dfb6a2a2845bedf8 WHIRLPOOL 79a39aca4bec1406bf066e3e70bde7c11e18384de2a13c16793b232435676773db2f6ad0b6eca73a0e213c56fb22f3e548470874ab46aef6822b74d9d07d7811
-EBUILD hugin-2014.0.0-r1.ebuild 2060 SHA256 40940f37d48d0468dd372a82ed10219fbfe2ae920afc0c5366f4341b7c8f684e SHA512 c03a9ad8dafc5682417433519b3c6f0067b478414727de19c6443ca4a0e5086bbea6da5e7e36c7c7ae0c111bde5510ee4952a782704be025be407065f82cb688 WHIRLPOOL eeb7d1e0ada2b7e75d3515a2eb626f91b02074a3c9d9f66e36dbc28bf72230d991e29103d1e5e79f43ab359b8bdddd375c1627945827ac921709bf6579290723
-EBUILD hugin-2014.0.0.ebuild 2063 SHA256 38fc3ee06e20de44394423a65d194fec9c30a5eb1d320f2dfa22e6d4aa00a858 SHA512 e7d92f001d79bda595f550f84caf84e6bf79e8267142b30c505d253eb5327d58f7302fb79b00ac9fecd8e7abba5503cac40f88473aeba2ea55cb2bd1f6afd4dd WHIRLPOOL c1deb0032c37b5a11ca324c8d5b11f27c60a36bafd059cfa84e23de5b9f605ae2ae6185086b029614cc8d7ac5aa57bff239763feb04eb12cc961dc33c9674190
+EBUILD hugin-2014.0.0-r1.ebuild 2096 SHA256 7ffd51acefe25d17e44c5df9d56bc74045b118e2c07a43a3ea48875aec6b9dfc SHA512 33048905f4db1bb0a67334b60ab50b7d8bf926ace7e67374f02f250f4a232999f09a7c0b82fda9bad5065f4bec963a37c02b863758ffc539e42b4e3059eb3c6e WHIRLPOOL bc555f22030f7377fcf85d649904a6c634b8f0d8f1c1322572c9ac3e56683d9454ed9b66da9aca189dc6789e8182c7c539551146625b964a4b76ec8b3b9a4fb1
+EBUILD hugin-2014.0.0.ebuild 2099 SHA256 8e9dd0277346f198b0cac3fc1dda21db341c662ad67c00128f270bf327cb71e7 SHA512 565610edddfd4031b964803951d5d254d82e00a9d8c8d4958bedf52889a2617a6dffebbaef2057b40ca7b70222c75ae66c510df7f0118bd06844a3532124653d WHIRLPOOL d53da4f8669b3179f65bd463babd44b7e31692d0d38a61c126c293c7f24923715616fceedaf6c7130dda141156b90e2a04ed4110759c3071b99ae4270e9137a0
EBUILD hugin-9999.ebuild 2033 SHA256 4ecb687517f373ffe547edee0dba76948d19b434a08b1298c8708bb2c79ba1dc SHA512 be3f2fdb1ad69ab8197b82be34e9061431381c1581bbaecb6092ff1da8ba44d2fa5eebec08c222676e150bc10627ca440ce74bff4b1a2dbfd34c427bd4199d3e WHIRLPOOL aa82437f1b2cdcb3d50fe1c6712a51a63033da2a34343ad08dd0de957dc0b6b980622dd00e510a639cc6e892a272c0788aa02e1daed93232a71167cff2eece1f
MISC metadata.xml 395 SHA256 1e88681d08863b52f3ae17f149901c3d84b6c6197913f7538d17572b33adbf9b SHA512 52848e953af2d3a398f9309a8af40261df0bb78365a3065f805ad06fbc40bea2a44b23ca70aa898b7dbb39a1c2e1309f036762de81d66824bdea09f767039a21 WHIRLPOOL dbdfadbbd20f6acd3961b786bb7bc5e57fd8fd954373cf4a645a008ddaf9273406072cc5ab1497ca1bdefbb77834996d8210c4d9f8cf1a716a7a788b29431684
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iEYEAREIAAYFAlSmy74ACgkQkKaRLQcq0GLKmgCgi9vrXeNL3b5xqlDqjREPIh3g
-hXEAoKadz06RU+ipFGg8i5Q922J5Boq/
-=Lp5C
+iEYEAREIAAYFAlSm4/wACgkQkKaRLQcq0GIGPgCcCuWDu1KaQNrgRv7h66eieKjr
+HnMAnjCynW5ixznFnCjY3z/TvMpIYqGQ
+=byVF
-----END PGP SIGNATURE-----
diff --git a/media-gfx/hugin/files/hugin-2014.0.0-ParseExp.patch b/media-gfx/hugin/files/hugin-2014.0.0-ParseExp.patch
new file mode 100644
index 0000000..3ee0dee
--- /dev/null
+++ b/media-gfx/hugin/files/hugin-2014.0.0-ParseExp.patch
@@ -0,0 +1,527 @@
+Contains revisions 6407:917d117ba6b0 6597:5b768c308932 6688:dde84e96b755 6689:e237d6d1d873 of ParseExp.cpp/h
+
+diff -r 917d117ba6b0 -r e237d6d1d873 src/tools/ParseExp.cpp
+--- a/src/tools/ParseExp.cpp Sun Dec 15 18:20:14 2013 +0100
++++ b/src/tools/ParseExp.cpp Sat Sep 13 11:22:39 2014 +0200
+@@ -1,262 +1,246 @@
+-// -*- c-basic-offset: 4 -*-
+-
+-/** @file ParseExp.cpp
+- *
+- * @brief functions to parse expressions from strings
+- *
+- * @author T. Modes
+- *
+- */
+-
+-/* This program is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU General Public
+- * License as published by the Free Software Foundation; either
+- * version 2 of the License, or (at your option) any later version.
+- *
+- * This software is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- * General Public License for more details.
+- *
+- * You should have received a copy of the GNU General Public
+- * License along with this software; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+- *
+- */
+-
+-// implementation is based on blog at
+-// http://agentzlerich.blogspot.de/2011/06/using-boost-spirit-21-to-evaluate.html
+-// modified to Hugins need
+-// added if statement
+-
+-#include "ParseExp.h"
+-
+-#include <limits>
+-#include <iterator>
+-
+-#include <boost/spirit/version.hpp>
+-#if !defined(SPIRIT_VERSION) || SPIRIT_VERSION < 0x2010
+-#error "At least Spirit version 2.1 required"
+-#endif
+-#include <boost/math/constants/constants.hpp>
+-#include <boost/spirit/include/phoenix.hpp>
+-#include <boost/spirit/include/qi.hpp>
+-
+-namespace Parser
+-{
+-
+-// helper classes to implement operators
+-
+-//power function
+-struct lazy_pow_
+-{
+- template <typename X, typename Y>
+- struct result { typedef X type; };
+-
+- template <typename X, typename Y>
+- X operator()(X x, Y y) const
+- {
+- return std::pow(x, y);
+- }
+-};
+-
+-// modulus for double values
+-struct lazy_mod_
+-{
+- template <typename X, typename Y>
+- struct result { typedef X type; };
+-
+- template <typename X, typename Y>
+- X operator()(X x, Y y) const
+- {
+- return std::fmod(x,y);
+- }
+-};
+-
+-// if statement
+-struct lazy_if_
+-{
+- template <typename X, typename Y, typename Z>
+- struct result { typedef Y type; };
+-
+- template <typename X, typename Y, typename Z>
+- X operator()(X x, Y y, Z z) const
+- {
+- return x ? y : z;
+- }
+-};
+-
+-// wrapper for unary function
+-struct lazy_ufunc_
+-{
+- template <typename F, typename A1>
+- struct result { typedef A1 type; };
+-
+- template <typename F, typename A1>
+- A1 operator()(F f, A1 a1) const
+- {
+- return f(a1);
+- }
+-};
+-
+-// convert rad into deg
+-double deg(const double d)
+-{
+- return d*180.0/boost::math::constants::pi<double>();
+-};
+-
+-// convert deg into rad
+-double rad(const double d)
+-{
+- return d*boost::math::constants::pi<double>()/180;
+-};
+-
+-// the main grammar class
+-struct grammar:boost::spirit::qi::grammar<std::string::const_iterator, double(), boost::spirit::ascii::space_type>
+-{
+-
+- // symbol table for constants like "pi", e.g. image number and value
+- struct constant_ : boost::spirit::qi::symbols<char, double>
+- {
+- constant_(const ConstantMap constMap)
+- {
+- this->add("pi", boost::math::constants::pi<double>());
+- if(constMap.size()>0)
+- {
+- for(ConstantMap::const_iterator it=constMap.begin(); it!=constMap.end(); it++)
+- {
+- this->add(it->first, it->second);
+- };
+- };
+- };
+- };
+-
+- // symbol table for unary functions like "abs"
+- struct ufunc_ : boost::spirit::qi::symbols<char, double(*)(double) >
+- {
+- ufunc_()
+- {
+- this->add
+- ("abs" , (double (*)(double)) std::abs )
+- ("acos" , (double (*)(double)) std::acos )
+- ("asin" , (double (*)(double)) std::asin )
+- ("atan" , (double (*)(double)) std::atan )
+- ("ceil" , (double (*)(double)) std::ceil )
+- ("sin" , (double (*)(double)) std::sin )
+- ("cos" , (double (*)(double)) std::cos )
+- ("tan" , (double (*)(double)) std::tan )
+- ("exp" , (double (*)(double)) std::exp )
+- ("floor" , (double (*)(double)) std::floor)
+- ("sqrt" , (double (*)(double)) std::sqrt )
+- ("deg" , (double (*)(double)) deg )
+- ("rad" , (double (*)(double)) rad )
+- ;
+- }
+- } ufunc;
+-
+- boost::spirit::qi::rule<std::string::const_iterator, double(), boost::spirit::ascii::space_type> expression, term, factor, primary, compExpression, compTerm, numExpression;
+-
+- grammar(const ConstantMap constMap) : grammar::base_type(expression)
+- {
+- using boost::spirit::qi::real_parser;
+- using boost::spirit::qi::real_policies;
+- real_parser<double,real_policies<double> > real;
+-
+- using boost::spirit::qi::_1;
+- using boost::spirit::qi::_2;
+- using boost::spirit::qi::_3;
+- using boost::spirit::qi::no_case;
+- using boost::spirit::qi::_val;
+- struct constant_ constant(constMap);
+-
+- boost::phoenix::function<lazy_pow_> lazy_pow;
+- boost::phoenix::function<lazy_mod_> lazy_mod;
+- boost::phoenix::function<lazy_if_> lazy_if;
+- boost::phoenix::function<lazy_ufunc_> lazy_ufunc;
+-
+- expression =
+- (compExpression >> '\?' >> compExpression >> ':' >> compExpression) [_val = lazy_if(_1, _2, _3)]
+- | compExpression [_val=_1]
+- ;
+-
+- compExpression=
+- compTerm [_val=_1]
+- >> * ( ("&&" >> compTerm [_val = _val && _1] )
+- |("||" >> compTerm [_val = _val || _1] )
+- )
+- ;
+-
+- compTerm =
+- numExpression [_val = _1 ]
+- >>*( ( '<' >> numExpression [_val = _val < _1])
+- |( '>' >> numExpression [_val = _val > _1])
+- |( "<=" >> numExpression [_val = _val <= _1])
+- |( ">=" >> numExpression [_val = _val >= _1])
+- |( "==" >> numExpression [_val = _val == _1])
+- |( "!=" >> numExpression [_val = _val != _1])
+- )
+- ;
+-
+- numExpression =
+- term [_val = _1]
+- >> *( ('+' >> term [_val += _1])
+- | ('-' >> term [_val -= _1])
+- )
+- ;
+-
+- term =
+- factor [_val = _1]
+- >> *( ('*' >> factor [_val *= _1])
+- | ('/' >> factor [_val /= _1])
+- | ('%' >> factor [_val = lazy_mod(_val, _1)])
+- )
+- ;
+-
+- factor =
+- primary [_val = _1]
+- >> *( ('^' >> factor [_val = lazy_pow(_val, _1)]) )
+- ;
+-
+- primary =
+- real [_val = _1]
+- | '(' >> expression [_val = _1] >> ')'
+- | ('-' >> primary [_val = -_1])
+- | ('+' >> primary [_val = _1])
+- | no_case[constant] [_val = _1]
+- | (no_case[ufunc] >> '(' >> expression >> ')') [_val = lazy_ufunc(_1, _2) ]
+- ;
+-
+- };
+-};
+-
+-//template <typename ParserType, typename Iterator>
+-bool parse(std::string::const_iterator &iter,
+- std::string::const_iterator end,
+- const grammar &g,
+- double& result)
+-{
+- if(!boost::spirit::qi::phrase_parse(iter, end, g, boost::spirit::ascii::space, result))
+- {
+- return false;
+- };
+- // we check if the full string could parsed
+- return iter==end;
+-}
+-
+-// the function which exposes the interface to external
+-// version without pre-defined constants
+-bool ParseExpression(const std::string& expression, double& result)
+-{
+- ConstantMap constants;
+- return ParseExpression(expression, result, constants);
+-};
+-
+-// version with pre-defined constants
+-bool ParseExpression(const std::string& expression, double& result, const ConstantMap& constants)
+-{
+- grammar g(constants);
+- std::string::const_iterator it=expression.begin();
+- return parse(it, expression.end(), g, result);
+-};
+-
+-} // namespace
++// -*- c-basic-offset: 4 -*-
++
++/** @file ParseExp.cpp
++ *
++ * @brief functions to parse expressions from strings
++ *
++ * @author T. Modes
++ *
++ */
++
++/* This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public
++ * License as published by the Free Software Foundation; either
++ * version 2 of the License, or (at your option) any later version.
++ *
++ * This software is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ * General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public
++ * License along with this software; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ *
++ */
++
++// implementation is based on blog at
++// http://agentzlerich.blogspot.de/2011/06/using-boost-spirit-21-to-evaluate.html
++// modified to Hugins need
++// added if statement
++
++#include "ParseExp.h"
++
++#include <limits>
++#include <iterator>
++
++#define BOOST_SPIRIT_USE_PHOENIX_V3 1
++#include <boost/spirit/version.hpp>
++#if !defined(SPIRIT_VERSION) || SPIRIT_VERSION < 0x2010
++#error "At least Spirit version 2.1 required"
++#endif
++#include <boost/math/constants/constants.hpp>
++#include <boost/spirit/include/phoenix.hpp>
++#include <boost/spirit/include/qi.hpp>
++
++namespace Parser
++{
++
++// helper classes to implement operators
++
++//power function
++struct lazy_pow_
++{
++ typedef double result_type;
++
++ double operator()(double x, double y) const
++ {
++ return std::pow(x, y);
++ }
++};
++
++// modulus for double values
++struct lazy_mod_
++{
++ typedef double result_type;
++
++ double operator()(double x, double y) const
++ {
++ return std::fmod(x,y);
++ }
++};
++
++// if statement
++struct lazy_if_
++{
++ typedef double result_type;
++
++ double operator()(double x, double y, double z) const
++ {
++ return (std::fabs(x)>1e-5) ? y : z;
++ }
++};
++
++// wrapper for unary function
++struct lazy_ufunc_
++{
++ typedef double result_type;
++
++ double operator()(double (*f)(double), double a1) const
++ {
++ return f(a1);
++ }
++};
++
++// convert rad into deg
++const double deg(const double d)
++{
++ return d*180.0/boost::math::constants::pi<double>();
++};
++
++// convert deg into rad
++const double rad(const double d)
++{
++ return d*boost::math::constants::pi<double>()/180;
++};
++
++// the main grammar class
++struct grammar:boost::spirit::qi::grammar<std::string::const_iterator, double(), boost::spirit::ascii::space_type>
++{
++
++ // symbol table for constants like "pi", e.g. image number and value
++ struct constant_ : boost::spirit::qi::symbols<char, double>
++ {
++ constant_(const ConstantMap constMap)
++ {
++ this->add("pi", boost::math::constants::pi<double>());
++ if (constMap.size()>0)
++ {
++ for (ConstantMap::const_iterator it = constMap.begin(); it != constMap.end(); it++)
++ {
++ this->add(it->first, it->second);
++ };
++ };
++ };
++ };
++
++ // symbol table for unary functions like "abs"
++ struct ufunc_ : boost::spirit::qi::symbols<char, double(*)(double) >
++ {
++ ufunc_()
++ {
++ this->add
++ ("abs", (double(*)(double)) std::abs)
++ ("acos", (double(*)(double)) std::acos)
++ ("asin", (double(*)(double)) std::asin)
++ ("atan", (double(*)(double)) std::atan)
++ ("ceil", (double(*)(double)) std::ceil)
++ ("sin", (double(*)(double)) std::sin)
++ ("cos", (double(*)(double)) std::cos)
++ ("tan", (double(*)(double)) std::tan)
++ ("exp", (double(*)(double)) std::exp)
++ ("floor", (double(*)(double)) std::floor)
++ ("sqrt", (double(*)(double)) std::sqrt)
++ ("deg", (double(*)(double)) deg)
++ ("rad", (double(*)(double)) rad)
++ ;
++ }
++ } ufunc;
++
++ boost::spirit::qi::rule<std::string::const_iterator, double(), boost::spirit::ascii::space_type> expression, term, factor, primary, compExpression, compTerm, numExpression;
++
++ grammar(const ConstantMap constMap) : grammar::base_type(expression)
++ {
++ using boost::spirit::qi::real_parser;
++ using boost::spirit::qi::real_policies;
++ real_parser<double, real_policies<double> > real;
++
++ using boost::spirit::qi::_1;
++ using boost::spirit::qi::_2;
++ using boost::spirit::qi::_3;
++ using boost::spirit::qi::no_case;
++ using boost::spirit::qi::_val;
++ struct constant_ constant(constMap);
++
++ boost::phoenix::function<lazy_pow_> lazy_pow;
++ boost::phoenix::function<lazy_mod_> lazy_mod;
++ boost::phoenix::function<lazy_if_> lazy_if;
++ boost::phoenix::function<lazy_ufunc_> lazy_ufunc;
++
++ expression =
++ (compExpression >> '\?' >> compExpression >> ':' >> compExpression)[_val = lazy_if(_1, _2, _3)]
++ | compExpression[_val = _1]
++ ;
++
++ compExpression =
++ compTerm[_val = _1]
++ >> *(("&&" >> compTerm[_val = _val && _1])
++ | ("||" >> compTerm[_val = _val || _1])
++ )
++ ;
++
++ compTerm =
++ numExpression[_val = _1]
++ >> *(('<' >> numExpression[_val = _val < _1])
++ | ('>' >> numExpression[_val = _val > _1])
++ | ("<=" >> numExpression[_val = _val <= _1])
++ | (">=" >> numExpression[_val = _val >= _1])
++ | ("==" >> numExpression[_val = _val == _1])
++ | ("!=" >> numExpression[_val = _val != _1])
++ )
++ ;
++
++ numExpression =
++ term[_val = _1]
++ >> *(('+' >> term[_val += _1])
++ | ('-' >> term[_val -= _1])
++ )
++ ;
++
++ term =
++ factor[_val = _1]
++ >> *(('*' >> factor[_val *= _1])
++ | ('/' >> factor[_val /= _1])
++ | ('%' >> factor[_val = lazy_mod(_val, _1)])
++ )
++ ;
++
++ factor =
++ primary[_val = _1]
++ >> *(('^' >> factor[_val = lazy_pow(_val, _1)]))
++ ;
++
++ primary =
++ real[_val = _1]
++ | '(' >> expression[_val = _1] >> ')'
++ | ('-' >> primary[_val = -_1])
++ | ('+' >> primary[_val = _1])
++ | no_case[constant][_val = _1]
++ | (no_case[ufunc] >> '(' >> expression >> ')')[_val = lazy_ufunc(_1, _2)]
++ ;
++
++ };
++};
++
++bool parse(std::string::const_iterator& iter,
++ std::string::const_iterator end,
++ const grammar& g,
++ double& result)
++{
++ if(!boost::spirit::qi::phrase_parse(iter, end, g, boost::spirit::ascii::space, result))
++ {
++ return false;
++ };
++ // we check if the full string could parsed
++ return iter==end;
++}
++
++// version with pre-defined constants
++bool ParseExpression(const std::string& expression, double& result, const ConstantMap& constants)
++{
++ grammar g(constants);
++ std::string::const_iterator it=expression.begin();
++ return parse(it, expression.end(), g, result);
++};
++
++} // namespace
+diff -r 917d117ba6b0 -r e237d6d1d873 src/tools/ParseExp.h
+--- a/src/tools/ParseExp.h Sun Dec 15 18:20:14 2013 +0100
++++ b/src/tools/ParseExp.h Sat Sep 13 11:22:39 2014 +0200
+@@ -33,8 +33,7 @@
+ {
+ typedef std::map<const char*, double> ConstantMap;
+
+-bool ParseExpression(const std::string& expression, double& result);
+-bool ParseExpression(const std::string& expression, double& result, const ConstantMap& constants);
++bool ParseExpression(const std::string& expression, double& result, const ConstantMap& constants=ConstantMap());
+
+ };
+
diff --git a/media-gfx/hugin/hugin-2014.0.0-r1.ebuild b/media-gfx/hugin/hugin-2014.0.0-r1.ebuild
index 284490e..8481afe 100644
--- a/media-gfx/hugin/hugin-2014.0.0-r1.ebuild
+++ b/media-gfx/hugin/hugin-2014.0.0-r1.ebuild
@@ -51,7 +51,10 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)
-PATCHES=( "${FILESDIR}"/${P}-lensfun-0.3.0.patch )
+PATCHES=(
+ "${FILESDIR}"/${P}-lensfun-0.3.0.patch
+ "${FILESDIR}"/${P}-ParseExp.patch
+)
pkg_setup() {
DOCS="authors.txt README TODO"
diff --git a/media-gfx/hugin/hugin-2014.0.0.ebuild b/media-gfx/hugin/hugin-2014.0.0.ebuild
index 527fd4e..05f7dff 100644
--- a/media-gfx/hugin/hugin-2014.0.0.ebuild
+++ b/media-gfx/hugin/hugin-2014.0.0.ebuild
@@ -51,7 +51,10 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)
-PATCHES=( "${FILESDIR}"/${P}-lensfun-0.3.0.patch )
+PATCHES=(
+ "${FILESDIR}"/${P}-lensfun-0.3.0.patch
+ "${FILESDIR}"/${P}-ParseExp.patch
+)
pkg_setup() {
DOCS="authors.txt README TODO"
^ permalink raw reply related [flat|nested] 9+ messages in thread* [gentoo-commits] dev/maekke:master commit in: media-gfx/hugin/files/, media-gfx/hugin/
@ 2013-12-17 21:01 Markus Meier
0 siblings, 0 replies; 9+ messages in thread
From: Markus Meier @ 2013-12-17 21:01 UTC (permalink / raw
To: gentoo-commits
commit: cd9bc5340e3b1f92171de975bf43ce12a8789271
Author: Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 17 20:36:32 2013 +0000
Commit: Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Tue Dec 17 20:36:32 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/maekke.git;a=commit;h=cd9bc534
sync with gentoo-x86
Package-Manager: portage-2.2.7
Manifest-Sign-Key: 072AD062
---
media-gfx/hugin/Manifest | 14 +++++---
media-gfx/hugin/files/hugin-2012.0.0-boost.patch | 40 ++++++++++++++++++++++
media-gfx/hugin/files/hugin-2012.0.0-perl.patch | 8 +++++
media-gfx/hugin/files/hugin-2013.0.0-boost.patch | 40 ++++++++++++++++++++++
...in-2013.0.0.ebuild => hugin-2012.0.0-r1.ebuild} | 18 ++++++++--
...in-2013.0.0.ebuild => hugin-2013.0.0-r1.ebuild} | 17 +++++++--
media-gfx/hugin/hugin-2013.0.0.ebuild | 17 +++++++--
.../{hugin-2013.0.0.ebuild => hugin-9999.ebuild} | 20 ++++++++---
8 files changed, 160 insertions(+), 14 deletions(-)
diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index c445286..7e5062b 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -3,15 +3,21 @@ Hash: SHA256
AUX hugin-2011.4.0-boost148.patch 1887 SHA256 1ca8641b8bc93c0391cb9596c2d977f8dd9e3345282dc26dad50b4d43820b87d SHA512 93106613b802d044befe705eef3bd385fd6dea5d44ccdea06952e02b740e2e5ac386b1c6a422fba5f1e4d53de274e7d3d0cac896fb65527946bb6cf4f6d8df9c WHIRLPOOL d4579a14e745b2e45e4d546f546deafd460a4265d074c452b995ccec8e56b5e3f9da41d3a603b5aecd1d8338536e6dc6230c355e682b9e855171a87ed8aa1004
AUX hugin-2011.4.0-gcc47.patch 1243 SHA256 ff1e2f55eb94e22546c3185cde458f51a503f91158456043018f09518652b49f SHA512 51c809d6e1d92f35ec98ba707717e09e1ea5c45e8c3efe5fb6fb35d775d1dc50ecb445171d0ca099b46e25fb891c52b2ee448f863264533e550ba5b5ab84acb6 WHIRLPOOL 0e6a7b1d2f33dace53c54fdc3aa5b743852752c4e935c2eee23603ece0a0a291a22cf68e2a7fa551b40130f4225260439ddd4968cb37ae11215fd5ee00547517
+AUX hugin-2012.0.0-boost.patch 1690 SHA256 024354bf8c6fea9cc113f8645224eb8402c4406e310db5b72b27c2d6bd188182 SHA512 78dbeb9e2e0450f354ea2920a8081f34024a512db6a2536508401db622be5cce292661b244788eebec9fb03c89c5c3b17c5c8eef7c6a9bde31cca78e68de416b WHIRLPOOL 42452ac88ad1fc0dd2d7a94c5ea0c412c9742c1a255943242614bad1f459aed46de44ef281f3d443dd4377549bef3f4dfd86561e2ebbf14f42b8d508e3c1dc82
+AUX hugin-2012.0.0-perl.patch 272 SHA256 2e21c6cbffe4d06a9a97787f22fbe6e6eff6130906c791d051cb7e1a6a05a92a SHA512 0f0e6d42012ae70ccf3ede51a24763f6e9cd6e46e7cc287c2a52b5b2753928dcda630568811a23d6cc5e836e11a9b3bec5202844a878e4ac58349ea379c7d9d8 WHIRLPOOL 82256829f4083bd043aa8105088a19bb0c04e7de9deb6802f33d1055f56663630437419a6b8830ff95a2904a9bc5ed74de1969aa45774723f650074db79bfcfb
+AUX hugin-2013.0.0-boost.patch 1690 SHA256 4a4e507546d344811f16390dcfc90f42d70807bc3ace8e7b1df3ceb9dea7cc30 SHA512 280d3555dc3774ccead2a962a8efd3a3942da296d6565185b9f84e79f03b9a6398e103357b80496b121fa07822fd1cfb9b580ef0c4da8fbaf6ddd7665d135cd7 WHIRLPOOL 60770064bb4fb292a4a12308ee4a004b6b114ada751cd713a2df061dc7670e0b0c7f39c50d3f6510f037a9e987a69f9e4aef645d6d9674dfc0306d4e155982fa
DIST hugin-2012.0.0.tar.bz2 11658665 SHA256 63dfd88ac90d3af4b958111db951bb7fbf2c66ad6b0246e6305403eb5de971b3 SHA512 acf97d383091eca300074a8e207ec5500a8b96a5116708a6ff23fb8f5359a77016867ee2ae21a4e40c4d07d056b5c27844c03c275ec29c0b604ecb31b73ee0a8 WHIRLPOOL d058639202aef1f6beb475bc8c170ac4269bf5050bfcbc48678ddde67188e12eb29c216b6ce8f79571c91ff43e271dac706bd4f432d3f640d549f87b371caa43
DIST hugin-2013.0.0.tar.bz2 11247583 SHA256 484e1ed58fa6fe4bae1f423967101549345bcca2653b992afbc0ed9ec0dbebd5 SHA512 dea1682c16991441278a881e5e0916ffdbe8e0012f0dcf45875ee97fe7dc698d4d98037916e63c9a651557adc45c89e4e350ad976fec020562bc17a31f608a86 WHIRLPOOL c3d8e175ff23c8761815406039a8027da327925f07a18b00bde4d457228a2562f30f5df3fb5dff17f8003f985d7b51ec39d557a064c7e228b09ff73473c41e6a
+EBUILD hugin-2012.0.0-r1.ebuild 2049 SHA256 cb39a7d878649efd2618760838198673f88f840aea76d7d30ccb3bf72f43d64c SHA512 05cac95f7ac060384d771478cce5a99cf000c8d6f07eb28667e2270cf1066a03f860b390d148916dc8eaab482d5f2d2852525ed74a601a063fd649a7092b63a5 WHIRLPOOL 3feb25b14ff281dd8130564f96207e864dcbe0ff7dfafef7007c1b2955b76f8bea447976c3e546587b11f07ec549aa51322cada2d3b5b9c06995857f95826ba1
EBUILD hugin-2012.0.0.ebuild 1648 SHA256 b49e5866a8ff84c4f5ff4781faa30d94d7fe945b29a217e663c66bc02b7cced6 SHA512 ff7bd929200b93a13dced894633370a5e1abe11d58e78d2001e71832342fe10478bd9c7d9c35da252b8520fd845d960fca1823e053e5afc72d2519ca7b1bc730 WHIRLPOOL 106f4eeed3afa6c4d4ee7c181ce8a2989e88e61511401105d36bc67544901598f31b882d0547e31db89fe5daeb249e435223ddb9985bc274b7c73864daba9421
-EBUILD hugin-2013.0.0.ebuild 1794 SHA256 a06dfde738464d830d9f8246aa4ab13df3b5a8bcc35c02efcb65d3b760ff2422 SHA512 d3b99d4693a89832314b1e3a1fb23a4b077b425b0052517e95dfa18acf1b199b9a1f5ea16f1c631b3d25f446b22f00d3c6b0baffb94ea6140c8d6ec91e4e18d8 WHIRLPOOL ca8bb472c82c9a651900b1124b8d1c3bf4ba5902b7f6b5e6fc95e055ce56f0ff0be18854182b55e7449e95a55135e903769afac86f767b21df7e24314ef7295a
+EBUILD hugin-2013.0.0-r1.ebuild 2013 SHA256 41b2bd664c23fa02120f9f6a3b99708a6689d7baa3c8d7af6d24342117987bae SHA512 ffaad36f9ec1011e2f3680819337c51b44b2bcb2524b992f83f083eb157e82a6eaccc9cb4db4e6e114701a22fdc79c190dc8590eed5172a6cd7cc1069fd560f0 WHIRLPOOL 05041965c9259a946d956abef31842052a264b2b31bed772f2a82b4d91a00b444c03ebe7d3ef1e34f5d993a4c7b67ddbb8d3a6e701d5d95479b32fdd112b8ef0
+EBUILD hugin-2013.0.0.ebuild 2028 SHA256 219a3d39e5e78520640b650a7381d0bec383df57f844f15d7ad6521a417187fe SHA512 7779781cd3a5ea86156cbec259e5d90fabfa5b35e8f67211a14689c856815931cb65e7890f01e456fb46536b27ad8376cdac018c543cbf94004eb02446b33472 WHIRLPOOL 5cbdcd6c90d34ea0133fa5639249337de127f7359c83b8c6dc1d585c53e733ddc56e07dcb4a0ac7783be54631969f185702b33bee63e4b1f6ff330f3277fc6d6
+EBUILD hugin-9999.ebuild 2002 SHA256 9f67d136b21e369889a128fb41b074f79a15a87b57b4786b8153a5860a1da61d SHA512 d8a3d0d0231e80f47e0cbe5e6fb9ba58b47bf72541572356ca17630963413b9c0e8c7f3eadaeed4a8ed3c99cee0a488d87b058064ddb1e3d0bdf74ec0b2fcf13 WHIRLPOOL 832a73fde63672b702884abf39fcf1b3086bdb9f7b95d2da87b39589ac5cb0d8331083fa0f70e5e609d31c0a7b9d7aa6e742fcd646a8934d35c42acbd8099dca
MISC metadata.xml 389 SHA256 6f26cd9c2b64a96c1c86a8a468a261af4cf4dfaa86b4d7ddcfaee1ca98314803 SHA512 29609682ab87309ae4c688476d73cb996f6f97fceecfb084343b9b371d28dc6bfcdd6034dc6086b4d1ebb6e37bba7840085fe126aef0e41a32454f7a9e4d231d WHIRLPOOL 180338c5e90a9340360500c879066385841c3a568559236095156dfb2fd8783e6971c0d4d72fe7f8cc07d53466a3b4b51525c0d58be572a226730e7451066e4e
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
-iEYEAREIAAYFAlJu40YACgkQkKaRLQcq0GIazACffnzwLJkCUQERw0YixGKYeHCP
-ibMAoKwzcOmeI8UK6EP4CJ86AFZznXCC
-=4/hM
+iEYEAREIAAYFAlKwtdAACgkQkKaRLQcq0GIjSQCfXl5huJh7uM3T1VlKnFCHRPMF
+NuYAoLHMAcL6iX0f1+WV+SWrvugsD1H5
+=Pa0B
-----END PGP SIGNATURE-----
diff --git a/media-gfx/hugin/files/hugin-2012.0.0-boost.patch b/media-gfx/hugin/files/hugin-2012.0.0-boost.patch
new file mode 100644
index 0000000..969b212
--- /dev/null
+++ b/media-gfx/hugin/files/hugin-2012.0.0-boost.patch
@@ -0,0 +1,40 @@
+ CMakeLists.txt | 19 +++++++++++--------
+ 1 file changed, 11 insertions(+), 8 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c2346f4..3b2a810 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -248,7 +248,7 @@ INCLUDE_DIRECTORIES(${PANO_INCLUDE_DIR})
+ # Now it is a cache variable you can edit in cmakesetup --TKS
+ #
+ IF( NOT Boost_root_suffix )
+- SET( Boost_root_suffix _1_41_0 CACHE STRING "suffix of boost root dir." FORCE )
++ SET( Boost_root_suffix _1_54_0 CACHE STRING "suffix of boost root dir." FORCE )
+ ENDIF( NOT Boost_root_suffix )
+
+ IF(WIN32)
+@@ -267,13 +267,16 @@ IF(WIN32)
+ set(BOOST_ROOT ${SOURCE_BASE_DIR}/boost${Boost_root_suffix})
+ endif(NOT BOOST_ROOT AND NOT $ENV{BOOST_ROOT} STREQUAL "")
+ ENDIF(WIN32)
+-FIND_PACKAGE(Boost 1.40 COMPONENTS thread date_time regex filesystem iostreams system signals)
+-IF (NOT Boost_FOUND)
+- IF(WIN32)
+- MESSAGE(FATAL_ERROR "Boost not found. Bad BOOST_ROOT? On windows, try editing Boost_root_suffix")
+- ELSE()
+- MESSAGE(FATAL_ERROR "Boost not found. Maybe wrong version. Hugin requires at least version 1.40")
+- ENDIF()
++FIND_PACKAGE(Boost 1.54 COMPONENTS thread date_time regex filesystem iostreams system)
++IF(NOT Boost_FOUND)
++ FIND_PACKAGE(Boost 1.44 COMPONENTS thread date_time regex filesystem iostreams system signals)
++ IF (NOT Boost_FOUND)
++ IF(WIN32)
++ MESSAGE(FATAL_ERROR "Boost not found. Bad BOOST_ROOT? On windows, try editing Boost_root_suffix")
++ ELSE()
++ MESSAGE(FATAL_ERROR "Boost not found. Maybe wrong version. Hugin requires at least version 1.44")
++ ENDIF()
++ ENDIF (NOT Boost_FOUND)
+ ENDIF (NOT Boost_FOUND)
+
+ INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
diff --git a/media-gfx/hugin/files/hugin-2012.0.0-perl.patch b/media-gfx/hugin/files/hugin-2012.0.0-perl.patch
new file mode 100644
index 0000000..55e2173
--- /dev/null
+++ b/media-gfx/hugin/files/hugin-2012.0.0-perl.patch
@@ -0,0 +1,8 @@
+--- hugin-2012.0.0/doc/deghosting_mask.pod~ 2013-09-08 14:09:57.614147518 +0400
++++ hugin-2012.0.0/doc/deghosting_mask.pod 2013-09-08 14:10:11.218147883 +0400
+@@ -1,3 +1,5 @@
++=encoding utf8
++
+ =head1 NAME
+
+ deghosting_mask - Creates mask for removing ghosting in images
diff --git a/media-gfx/hugin/files/hugin-2013.0.0-boost.patch b/media-gfx/hugin/files/hugin-2013.0.0-boost.patch
new file mode 100644
index 0000000..fa077b0
--- /dev/null
+++ b/media-gfx/hugin/files/hugin-2013.0.0-boost.patch
@@ -0,0 +1,40 @@
+ CMakeLists.txt | 19 +++++++++++--------
+ 1 file changed, 11 insertions(+), 8 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a6d88a4..3b1ced4 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -248,7 +248,7 @@ INCLUDE_DIRECTORIES(${PANO_INCLUDE_DIR})
+ # Now it is a cache variable you can edit in cmakesetup --TKS
+ #
+ IF( NOT Boost_root_suffix )
+- SET( Boost_root_suffix _1_41_0 CACHE STRING "suffix of boost root dir." FORCE )
++ SET( Boost_root_suffix _1_54_0 CACHE STRING "suffix of boost root dir." FORCE )
+ ENDIF( NOT Boost_root_suffix )
+
+ IF(WIN32)
+@@ -267,13 +267,16 @@ IF(WIN32)
+ set(BOOST_ROOT ${SOURCE_BASE_DIR}/boost${Boost_root_suffix})
+ endif(NOT BOOST_ROOT AND NOT $ENV{BOOST_ROOT} STREQUAL "")
+ ENDIF(WIN32)
+-FIND_PACKAGE(Boost 1.41 COMPONENTS thread date_time regex filesystem iostreams system signals)
+-IF (NOT Boost_FOUND)
+- IF(WIN32)
+- MESSAGE(FATAL_ERROR "Boost not found. Bad BOOST_ROOT? On windows, try editing Boost_root_suffix")
+- ELSE()
+- MESSAGE(FATAL_ERROR "Boost not found. Maybe wrong version. Hugin requires at least version 1.41")
+- ENDIF()
++FIND_PACKAGE(Boost 1.54 COMPONENTS thread date_time regex filesystem iostreams system)
++IF(NOT Boost_FOUND)
++ FIND_PACKAGE(Boost 1.44 COMPONENTS thread date_time regex filesystem iostreams system signals)
++ IF (NOT Boost_FOUND)
++ IF(WIN32)
++ MESSAGE(FATAL_ERROR "Boost not found. Bad BOOST_ROOT? On windows, try editing Boost_root_suffix")
++ ELSE()
++ MESSAGE(FATAL_ERROR "Boost not found. Maybe wrong version. Hugin requires at least version 1.44")
++ ENDIF()
++ ENDIF (NOT Boost_FOUND)
+ ENDIF (NOT Boost_FOUND)
+
+ INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
diff --git a/media-gfx/hugin/hugin-2013.0.0.ebuild b/media-gfx/hugin/hugin-2012.0.0-r1.ebuild
similarity index 80%
copy from media-gfx/hugin/hugin-2013.0.0.ebuild
copy to media-gfx/hugin/hugin-2012.0.0-r1.ebuild
index 5cee9a2..d75c62a 100644
--- a/media-gfx/hugin/hugin-2013.0.0.ebuild
+++ b/media-gfx/hugin/hugin-2012.0.0-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2012.0.0.ebuild,v 1.3 2013/01/04 10:56:03 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2012.0.0-r1.ebuild,v 1.2 2013/11/24 17:03:45 jlec Exp $
EAPI=5
WX_GTK_VER="2.8"
@@ -15,7 +15,7 @@ LICENSE="GPL-2 SIFT"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
-LANGS=" bg ca cs da de en_GB es eu fi fr hu it ja ko nl pl pt_BR ro ru sk sl sv uk zh_CN zh_TW"
+LANGS=" bg ca cs da de en_GB es fi fr hu it ja ko nl pl pt_BR ro ru sk sl sv uk zh_CN zh_TW"
IUSE="lapack python sift $(echo ${LANGS//\ /\ linguas_})"
CDEPEND="
@@ -33,6 +33,7 @@ CDEPEND="
media-libs/libpng:0=
media-libs/openexr:=
media-libs/tiff
+ sci-libs/flann
sys-libs/zlib
virtual/jpeg
x11-libs/wxGTK:2.8=[X,opengl,-odbc]
@@ -48,6 +49,11 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)
+PATCHES=(
+ "${FILESDIR}"/${P}-boost.patch
+ "${FILESDIR}"/${P}-perl.patch
+)
+
pkg_setup() {
DOCS="authors.txt README TODO"
mycmakeargs=(
@@ -57,6 +63,14 @@ pkg_setup() {
python-single-r1_pkg_setup
}
+src_prepare() {
+ sed \
+ -e 's:-O3::g' \
+ -i src/celeste/CMakeLists.txt || die
+ rm CMakeModules/{FindLAPACK,FindPkgConfig}.cmake || die
+ cmake-utils_src_prepare
+}
+
src_install() {
cmake-utils_src_install
python_optimize
diff --git a/media-gfx/hugin/hugin-2013.0.0.ebuild b/media-gfx/hugin/hugin-2013.0.0-r1.ebuild
similarity index 80%
copy from media-gfx/hugin/hugin-2013.0.0.ebuild
copy to media-gfx/hugin/hugin-2013.0.0-r1.ebuild
index 5cee9a2..f6bf04d 100644
--- a/media-gfx/hugin/hugin-2013.0.0.ebuild
+++ b/media-gfx/hugin/hugin-2013.0.0-r1.ebuild
@@ -1,8 +1,9 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2012.0.0.ebuild,v 1.3 2013/01/04 10:56:03 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2013.0.0-r1.ebuild,v 1.2 2013/12/08 12:11:57 jlec Exp $
EAPI=5
+
WX_GTK_VER="2.8"
PYTHON_COMPAT=( python{2_7,3_2,3_3} )
@@ -11,12 +12,13 @@ inherit base python-single-r1 wxwidgets versionator cmake-utils
DESCRIPTION="GUI for the creation & processing of panoramic images"
HOMEPAGE="http://hugin.sf.net"
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
LICENSE="GPL-2 SIFT"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
LANGS=" bg ca cs da de en_GB es eu fi fr hu it ja ko nl pl pt_BR ro ru sk sl sv uk zh_CN zh_TW"
-IUSE="lapack python sift $(echo ${LANGS//\ /\ linguas_})"
+IUSE="lapack python sift debug $(echo ${LANGS//\ /\ linguas_})"
CDEPEND="
!!dev-util/cocom
@@ -48,6 +50,8 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)
+PATCHES=( "${FILESDIR}"/${P}-boost.patch )
+
pkg_setup() {
DOCS="authors.txt README TODO"
mycmakeargs=(
@@ -57,6 +61,15 @@ pkg_setup() {
python-single-r1_pkg_setup
}
+src_prepare() {
+ sed \
+ -e 's:-O3::g' \
+ -i src/celeste/CMakeLists.txt || die
+ rm CMakeModules/{FindLAPACK,FindPkgConfig}.cmake || die
+
+ cmake-utils_src_prepare
+}
+
src_install() {
cmake-utils_src_install
python_optimize
diff --git a/media-gfx/hugin/hugin-2013.0.0.ebuild b/media-gfx/hugin/hugin-2013.0.0.ebuild
index 5cee9a2..51cf446 100644
--- a/media-gfx/hugin/hugin-2013.0.0.ebuild
+++ b/media-gfx/hugin/hugin-2013.0.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2012.0.0.ebuild,v 1.3 2013/01/04 10:56:03 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2013.0.0.ebuild,v 1.4 2013/11/25 00:12:02 patrick Exp $
EAPI=5
WX_GTK_VER="2.8"
@@ -11,12 +11,13 @@ inherit base python-single-r1 wxwidgets versionator cmake-utils
DESCRIPTION="GUI for the creation & processing of panoramic images"
HOMEPAGE="http://hugin.sf.net"
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
LICENSE="GPL-2 SIFT"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
LANGS=" bg ca cs da de en_GB es eu fi fr hu it ja ko nl pl pt_BR ro ru sk sl sv uk zh_CN zh_TW"
-IUSE="lapack python sift $(echo ${LANGS//\ /\ linguas_})"
+IUSE="lapack python sift debug $(echo ${LANGS//\ /\ linguas_})"
CDEPEND="
!!dev-util/cocom
@@ -33,6 +34,7 @@ CDEPEND="
media-libs/libpng:0=
media-libs/openexr:=
media-libs/tiff
+ sci-libs/flann
sys-libs/zlib
virtual/jpeg
x11-libs/wxGTK:2.8=[X,opengl,-odbc]
@@ -48,6 +50,8 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)
+PATCHES=( "${FILESDIR}"/${P}-boost.patch )
+
pkg_setup() {
DOCS="authors.txt README TODO"
mycmakeargs=(
@@ -57,6 +61,15 @@ pkg_setup() {
python-single-r1_pkg_setup
}
+src_prepare() {
+ sed \
+ -e 's:-O3::g' \
+ -i src/celeste/CMakeLists.txt || die
+ rm CMakeModules/{FindLAPACK,FindPkgConfig}.cmake || die
+
+ cmake-utils_src_prepare
+}
+
src_install() {
cmake-utils_src_install
python_optimize
diff --git a/media-gfx/hugin/hugin-2013.0.0.ebuild b/media-gfx/hugin/hugin-9999.ebuild
similarity index 76%
copy from media-gfx/hugin/hugin-2013.0.0.ebuild
copy to media-gfx/hugin/hugin-9999.ebuild
index 5cee9a2..637f9ec 100644
--- a/media-gfx/hugin/hugin-2013.0.0.ebuild
+++ b/media-gfx/hugin/hugin-9999.ebuild
@@ -1,19 +1,22 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2012.0.0.ebuild,v 1.3 2013/01/04 10:56:03 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-9999.ebuild,v 1.2 2013/11/24 17:03:45 jlec Exp $
EAPI=5
WX_GTK_VER="2.8"
PYTHON_COMPAT=( python{2_7,3_2,3_3} )
-inherit base python-single-r1 wxwidgets versionator cmake-utils
+inherit base mercurial python-single-r1 wxwidgets versionator cmake-utils
DESCRIPTION="GUI for the creation & processing of panoramic images"
HOMEPAGE="http://hugin.sf.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+SRC_URI=""
+EHG_REPO_URI="http://hg.code.sf.net/p/hugin/hugin"
+EHG_PROJECT="${PN}-${PN}"
+
LICENSE="GPL-2 SIFT"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS=""
LANGS=" bg ca cs da de en_GB es eu fi fr hu it ja ko nl pl pt_BR ro ru sk sl sv uk zh_CN zh_TW"
IUSE="lapack python sift $(echo ${LANGS//\ /\ linguas_})"
@@ -33,6 +36,7 @@ CDEPEND="
media-libs/libpng:0=
media-libs/openexr:=
media-libs/tiff
+ sci-libs/flann
sys-libs/zlib
virtual/jpeg
x11-libs/wxGTK:2.8=[X,opengl,-odbc]
@@ -57,6 +61,14 @@ pkg_setup() {
python-single-r1_pkg_setup
}
+src_prepare() {
+ sed \
+ -e 's:-O3::g' \
+ -i src/celeste/CMakeLists.txt || die
+ rm CMakeModules/{FindLAPACK,FindPkgConfig}.cmake || die
+ cmake-utils_src_prepare
+}
+
src_install() {
cmake-utils_src_install
python_optimize
^ permalink raw reply related [flat|nested] 9+ messages in thread* [gentoo-commits] dev/maekke:master commit in: media-gfx/hugin/files/, media-gfx/hugin/
@ 2012-11-18 16:21 Markus Meier
0 siblings, 0 replies; 9+ messages in thread
From: Markus Meier @ 2012-11-18 16:21 UTC (permalink / raw
To: gentoo-commits
commit: f4f07e960a28191258206a1f0a89d5a6e5d9485c
Author: Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 18 16:25:24 2012 +0000
Commit: Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Sun Nov 18 16:25:24 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/maekke.git;a=commit;h=f4f07e96
in tree
---
media-gfx/hugin/ChangeLog | 564 --------------------
media-gfx/hugin/Manifest | 24 -
.../hugin/files/hugin-2011.0.0_rc1-libpng15.patch | 275 ----------
.../hugin/files/hugin-2011.4.0-boost148.patch | 42 --
media-gfx/hugin/files/hugin-2011.4.0-gcc47.patch | 42 --
media-gfx/hugin/hugin-2011.0.0.ebuild | 61 ---
media-gfx/hugin/hugin-2011.2.0.ebuild | 66 ---
media-gfx/hugin/hugin-2011.4.0-r1.ebuild | 70 ---
media-gfx/hugin/hugin-2011.4.0.ebuild | 66 ---
media-gfx/hugin/hugin-2012.0.0.ebuild | 66 ---
media-gfx/hugin/metadata.xml | 11 -
11 files changed, 0 insertions(+), 1287 deletions(-)
diff --git a/media-gfx/hugin/ChangeLog b/media-gfx/hugin/ChangeLog
deleted file mode 100644
index f55752c..0000000
--- a/media-gfx/hugin/ChangeLog
+++ /dev/null
@@ -1,564 +0,0 @@
-# ChangeLog for media-gfx/hugin
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/ChangeLog,v 1.122 2012/06/30 21:36:05 dilfridge Exp $
-
-*hugin-2011.4.0-r1 (30 Jun 2012)
-
- 30 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
- +hugin-2011.4.0-r1.ebuild, +files/hugin-2011.4.0-boost148.patch,
- +files/hugin-2011.4.0-gcc47.patch:
- Add simple build fixes for gcc-4.7 and boost-1.48+ from upstream.
- Unfortunately boost-1.48 has an ugly bug with gcc-4.7 itself (bug 424319)
- which means we need boost-1.49.
-
- 05 May 2012; Jeff Horelick <jdhore@gentoo.org> hugin-2011.0.0.ebuild,
- hugin-2011.2.0.ebuild, hugin-2011.4.0.ebuild:
- dev-util/pkgconfig -> virtual/pkgconfig
-
-*hugin-2011.4.0 (18 Dec 2011)
-
- 18 Dec 2011; Markus Meier <maekke@gentoo.org> +hugin-2011.4.0.ebuild:
- version bump
-
- 17 Oct 2011; Markus Meier <maekke@gentoo.org> -hugin-2010.2.0.ebuild:
- old
-
- 17 Oct 2011; Kacper Kowalik <xarthisius@gentoo.org> hugin-2011.0.0.ebuild:
- ppc stable wrt #379089
-
-*hugin-2011.2.0 (02 Oct 2011)
-
- 02 Oct 2011; Markus Meier <maekke@gentoo.org> -hugin-2010.0.0.ebuild,
- -files/hugin-2010.0.0_rc1-libpng14.patch, -hugin-2010.4.0.ebuild,
- +hugin-2011.2.0.ebuild:
- version bump, remove old
-
- 15 Sep 2011; Andreas Schuerch <nativemad@gentoo.org> hugin-2011.0.0.ebuild:
- x86 stable, Thanks JD, bug 379089
-
- 18 Aug 2011; Tony Vroon <chainsaw@gentoo.org> hugin-2011.0.0.ebuild:
- Marked stable based on arch testing by Agostino "ago" Sarubbo in bug #379089.
-
- 05 Jul 2011; Markus Meier <maekke@gentoo.org> hugin-2010.0.0.ebuild,
- hugin-2010.2.0.ebuild, hugin-2010.4.0.ebuild, hugin-2011.0.0.ebuild:
- inherit cmake-utils last by Andrej Lajovic, bug #373683
-
- 24 Jun 2011; Brent Baude <ranger@gentoo.org> hugin-2010.2.0.ebuild:
- Marking hugin-2010.2.0 ppc for bug 347633
-
-*hugin-2011.0.0 (29 May 2011)
-
- 29 May 2011; Markus Meier <maekke@gentoo.org> -hugin-2011.0.0_rc1.ebuild,
- +hugin-2011.0.0.ebuild:
- version bump
-
- 20 May 2011; Markus Meier <maekke@gentoo.org> hugin-2011.0.0_rc1.ebuild:
- add ro to LANGS, update enblend version
-
- 18 May 2011; Tim Harder <radhermit@gentoo.org> hugin-2011.0.0_rc1.ebuild:
- Bump libpano13 dependency (bug #367917 by Daniel Neugebauer).
-
-*hugin-2011.0.0_rc1 (18 May 2011)
-
- 18 May 2011; Tim Harder <radhermit@gentoo.org> +hugin-2011.0.0_rc1.ebuild,
- +files/hugin-2011.0.0_rc1-libpng15.patch:
- Version bump to release candidate. Remove old post install message, bump to
- EAPI 4, apply patch for libpng-1.5 (bug #355885).
-
- 13 Feb 2011; Tim Harder <radhermit@gentoo.org> hugin-2010.0.0.ebuild,
- hugin-2010.2.0.ebuild, hugin-2010.4.0.ebuild:
- Depend on wxGTK with the X USE flag enabled (bug #354223 by Grygoriy
- Fuchedzhy).
-
-*hugin-2010.4.0 (01 Jan 2011)
-
- 01 Jan 2011; Markus Meier <maekke@gentoo.org> -hugin-2010.4.0_beta1.ebuild,
- -hugin-2010.4.0_beta2.ebuild, -hugin-2010.4.0_rc1.ebuild,
- -hugin-2010.4.0_rc3.ebuild, +hugin-2010.4.0.ebuild:
- version bump to 2010.4.0 final, remove beta/rc releases
-
-*hugin-2010.4.0_rc3 (28 Dec 2010)
-
- 28 Dec 2010; Markus Meier <maekke@gentoo.org> +hugin-2010.4.0_rc3.ebuild:
- version bump
-
-*hugin-2010.4.0_rc1 (25 Dec 2010)
-
- 25 Dec 2010; Markus Meier <maekke@gentoo.org> +hugin-2010.4.0_rc1.ebuild:
- version bump
-
- 05 Dec 2010; Markos Chandras <hwoarang@gentoo.org> hugin-2010.2.0.ebuild:
- Stable on amd64 wrt bug #347633
-
- 05 Dec 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
- hugin-2010.2.0.ebuild:
- x86 stable wrt bug #347633
-
-*hugin-2010.4.0_beta2 (04 Dec 2010)
-
- 04 Dec 2010; Markus Meier <maekke@gentoo.org> +hugin-2010.4.0_beta2.ebuild:
- version bump
-
-*hugin-2010.4.0_beta1 (27 Nov 2010)
-
- 27 Nov 2010; Markus Meier <maekke@gentoo.org> +hugin-2010.4.0_beta1.ebuild:
- version bump to 2010.4 beta1
-
- 08 Nov 2010; Markus Meier <maekke@gentoo.org> hugin-2010.0.0.ebuild,
- hugin-2010.2.0.ebuild:
- change jpeg dep to virtual/jpeg
-
-*hugin-2010.2.0 (13 Oct 2010)
-
- 13 Oct 2010; Markus Meier <maekke@gentoo.org>
- -hugin-2010.2.0_beta1.ebuild, -hugin-2010.2.0_beta2.ebuild,
- -hugin-2010.2.0_rc1.ebuild, -hugin-2010.2.0_rc2.ebuild,
- +hugin-2010.2.0.ebuild:
- version bump, remove prereleases
-
-*hugin-2010.2.0_rc2 (30 Sep 2010)
-
- 30 Sep 2010; Markus Meier <maekke@gentoo.org> +hugin-2010.2.0_rc2.ebuild:
- version bump
-
-*hugin-2010.2.0_rc1 (21 Sep 2010)
-
- 21 Sep 2010; Markus Meier <maekke@gentoo.org> +hugin-2010.2.0_rc1.ebuild:
- version bump
-
- 16 Sep 2010; Tomáš Chvátal <scarabeus@gentoo.org>
- hugin-2010.0.0.ebuild, hugin-2010.2.0_beta1.ebuild,
- hugin-2010.2.0_beta2.ebuild:
- virtual/glut -> media-libs/glut
-
-*hugin-2010.2.0_beta2 (05 Sep 2010)
-
- 05 Sep 2010; Markus Meier <maekke@gentoo.org>
- +hugin-2010.2.0_beta2.ebuild:
- version bump
-
-*hugin-2010.2.0_beta1 (18 Jul 2010)
-
- 18 Jul 2010; Markus Meier <maekke@gentoo.org>
- +hugin-2010.2.0_beta1.ebuild:
- version bump
-
- 27 May 2010; Markus Meier <maekke@gentoo.org> -hugin-2009.2.0.ebuild,
- -hugin-2009.4.0.ebuild:
- old
-
- 25 May 2010; Pacho Ramos <pacho@gentoo.org> hugin-2010.0.0.ebuild:
- stable amd64, bug 320411
-
- 24 May 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
- hugin-2010.0.0.ebuild:
- x86 stable wrt bug #320411
-
- 24 May 2010; <nixnut@gentoo.org> hugin-2010.0.0.ebuild:
- ppc stable #320411
-
- 28 Mar 2010; Markus Meier <maekke@gentoo.org> hugin-2010.0.0.ebuild:
- add pkgconfig to DEPEND by Nikoli in bug #311693
-
-*hugin-2010.0.0 (26 Mar 2010)
-
- 26 Mar 2010; Markus Meier <maekke@gentoo.org> -hugin-2010.0.0_rc1.ebuild,
- +hugin-2010.0.0.ebuild:
- bump to final 2010.0.0 release, remove rc version
-
- 10 Mar 2010; Samuli Suominen <ssuominen@gentoo.org>
- hugin-2010.0.0_rc1.ebuild, +files/hugin-2010.0.0_rc1-libpng14.patch:
- Fix building with libpng14.
-
-*hugin-2010.0.0_rc1 (07 Mar 2010)
-
- 07 Mar 2010; Markus Meier <maekke@gentoo.org> +hugin-2010.0.0_rc1.ebuild:
- version bump to 2010.0.0_rc1
-
- 17 Feb 2010; Markus Meier <maekke@gentoo.org> hugin-2009.4.0.ebuild:
- add virtual/glut to dependencies by Seerp in bug #305049
-
- 09 Jan 2010; Markus Meier <maekke@gentoo.org>
- -files/hugin-0.7.0-gcc44.patch, -files/hugin-0.7.0_rc2-as-needed.patch,
- -hugin-0.8.0.ebuild, -files/hugin-0.8.0_rc3-as-needed.patch,
- -files/hugin-0.8.0_rc4-use_system_cmake_findboost.patch:
- old
-
- 07 Jan 2010; Brent Baude <ranger@gentoo.org> hugin-2009.2.0.ebuild:
- Marking hugin-2009.2.0 ppc for bug 294316
-
- 20 Dec 2009; Olivier Crête <tester@gentoo.org> hugin-2009.2.0.ebuild:
- Stable on amd64, bug #294316
-
- 16 Dec 2009; Christian Faulhammer <fauli@gentoo.org>
- hugin-2009.2.0.ebuild:
- stable x86, bug 294316
-
-*hugin-2009.4.0 (16 Dec 2009)
-
- 16 Dec 2009; Markus Meier <maekke@gentoo.org> -hugin-2009.4.0_rc1.ebuild,
- -hugin-2009.4.0_rc2.ebuild, -hugin-2009.4.0_rc3.ebuild,
- +hugin-2009.4.0.ebuild:
- version bump to 2009.4.0 final release
-
-*hugin-2009.4.0_rc3 (02 Dec 2009)
-
- 02 Dec 2009; Markus Meier <maekke@gentoo.org> +hugin-2009.4.0_rc3.ebuild:
- version bump
-
- 25 Oct 2009; Markus Meier <maekke@gentoo.org> -hugin-0.7.0.ebuild:
- old
-
- 25 Oct 2009; Markus Meier <maekke@gentoo.org> hugin-0.8.0.ebuild:
- amd64/x86 stable, bug #284686
-
- 24 Oct 2009; nixnut <nixnut@gentoo.org> hugin-0.8.0.ebuild:
- ppc stable #284686
-
-*hugin-2009.4.0_rc2 (19 Oct 2009)
-
- 19 Oct 2009; Markus Meier <maekke@gentoo.org> +hugin-2009.4.0_rc2.ebuild:
- bump
-
-*hugin-2009.4.0_rc1 (11 Oct 2009)
-
- 11 Oct 2009; Markus Meier <maekke@gentoo.org> +hugin-2009.4.0_rc1.ebuild:
- version bump
-
-*hugin-2009.2.0 (30 Sep 2009)
-
- 30 Sep 2009; Markus Meier <maekke@gentoo.org>
- -hugin-2009.2.0_beta3.ebuild, +hugin-2009.2.0.ebuild,
- -files/hugin-2009.2.0_beta3-asneeded.patch:
- version bump to final 2009.02.0 release
-
- 29 Sep 2009; Markus Meier <maekke@gentoo.org> hugin-0.7.0.ebuild,
- hugin-0.8.0.ebuild, hugin-2009.2.0_beta3.ebuild:
- block dev-util/cocom due to a file collision wrt bug #280241
-
-*hugin-2009.2.0_beta3 (13 Sep 2009)
-
- 13 Sep 2009; Markus Meier <maekke@gentoo.org> hugin-0.7.0.ebuild,
- -hugin-0.7.0-r1.ebuild, +hugin-2009.2.0_beta3.ebuild,
- +files/hugin-2009.2.0_beta3-asneeded.patch:
- version bump, EAPI=2 for stable ebuild, remove old
-
- 01 Aug 2009; Markus Meier <maekke@gentoo.org> hugin-0.8.0.ebuild:
- tweak x11-libs/wxGTK dep for bug #279653 and bug #269689
-
-*hugin-0.8.0 (26 Jul 2009)
-
- 26 Jul 2009; Markus Meier <maekke@gentoo.org> -hugin-0.8.0_beta1.ebuild,
- -hugin-0.8.0_beta2.ebuild, -hugin-0.8.0_beta3.ebuild,
- -hugin-0.8.0_beta4.ebuild, -hugin-0.8.0_rc1.ebuild,
- -hugin-0.8.0_rc3.ebuild, -hugin-0.8.0_rc4.ebuild, -hugin-0.8.0_rc5.ebuild,
- +hugin-0.8.0.ebuild, -files/hugin-0.8.0_beta1-as-needed.patch,
- -files/hugin-0.8.0_rc3-unset_lapack.patch:
- bump to 0.8.0 final release
-
-*hugin-0.8.0_rc5 (09 Jul 2009)
-
- 09 Jul 2009; Markus Meier <maekke@gentoo.org> +hugin-0.8.0_rc5.ebuild:
- version bump (this will likely be the last rc)
-
- 28 Jun 2009; Tiziano Müller <dev-zero@gentoo.org> hugin-0.8.0_rc4.ebuild,
- +files/hugin-0.8.0_rc4-use_system_cmake_findboost.patch:
- Added patch to make it build with recent boost versions. Removed now
- unnecessary patch from stack. Added missing exiftool dependency.
-
-*hugin-0.8.0_rc4 (27 Jun 2009)
-
- 27 Jun 2009; Markus Meier <maekke@gentoo.org> +hugin-0.8.0_rc4.ebuild:
- version bump
-
- 19 Jun 2009; Tiziano Müller <dev-zero@gentoo.org> hugin-0.8.0_rc3.ebuild,
- +files/hugin-0.8.0_rc3-unset_lapack.patch:
- Added patch to unset LAPACK_LIBRARIES if lapack is not found, otherwise
- cmake sets it to NOTFOUND leading to an error.
-
-*hugin-0.8.0_rc3 (10 Jun 2009)
-
- 10 Jun 2009; Markus Meier <maekke@gentoo.org> +hugin-0.8.0_rc3.ebuild,
- +files/hugin-0.8.0_rc3-as-needed.patch:
- version bump to 0.8.0_rc3, with (experimental) lapack support
-
- 24 May 2009; Markus Meier <maekke@gentoo.org> hugin-0.7.0.ebuild,
- hugin-0.7.0-r1.ebuild, +files/hugin-0.7.0-gcc44.patch:
- fix building with gcc-4.4 by David Watzke, bug #270593
-
-*hugin-0.8.0_rc1 (07 May 2009)
-
- 07 May 2009; Markus Meier <maekke@gentoo.org> +hugin-0.8.0_rc1.ebuild:
- version bump
-
-*hugin-0.8.0_beta4 (01 May 2009)
-
- 01 May 2009; Markus Meier <maekke@gentoo.org> +hugin-0.8.0_beta4.ebuild:
- version bump
-
-*hugin-0.8.0_beta3 (04 Apr 2009)
-
- 04 Apr 2009; Markus Meier <maekke@gentoo.org> +hugin-0.8.0_beta3.ebuild:
- version bump to 0.8.0_beta3
-
- 19 Mar 2009; Markus Meier <maekke@gentoo.org> hugin-0.7.0.ebuild,
- hugin-0.7.0-r1.ebuild:
- assign RDEPEND
-
- 19 Mar 2009; Markus Meier <maekke@gentoo.org>
- -files/hugin-0.6.1-1_0.6.1-1.1.patch, -files/hugin-0.6.1-as-needed.patch,
- -files/hugin-0.6.1-gcc43.patch, -hugin-0.6.1-r2.ebuild:
- old
-
- 18 Mar 2009; Joseph Jezak <josejx@gentoo.org> hugin-0.7.0.ebuild:
- Marked ppc stable for bug #246827.
-
- 11 Mar 2009; Markus Meier <maekke@gentoo.org> hugin-0.8.0_beta2.ebuild:
- add en_GB language, fix IUSE assignement and raise libpano13 dep
-
-*hugin-0.8.0_beta2 (09 Mar 2009)
-
- 09 Mar 2009; Markus Meier <maekke@gentoo.org> +hugin-0.8.0_beta2.ebuild:
- bump to hugin-0.8.0_beta2
-
-*hugin-0.8.0_beta1 (25 Feb 2009)
-
- 25 Feb 2009; Markus Meier <maekke@gentoo.org>
- +files/hugin-0.8.0_beta1-as-needed.patch, +hugin-0.8.0_beta1.ebuild:
- bump to hugin-0.8.0_beta1
-
- 02 Dec 2008; <chainsaw@gentoo.org> hugin-0.7.0.ebuild,
- hugin-0.7.0-r1.ebuild:
- Add ~ppc keyword based on PowerBook6,7 testing by Christian "papillon81"
- Schmitt <chrschmitt@gmail.com>. Closes bug #234909.
-
- 28 Nov 2008; Markus Meier <maekke@gentoo.org>
- -files/hugin-0.7_beta4-insec-file.patch,
- -files/hugin-0.7_beta4-as-needed.patch, -hugin-0.7_beta4-r1.ebuild,
- hugin-0.7.0.ebuild, hugin-0.7.0-r1.ebuild:
- add missing media-gfx/exiv2 dependency for bug #248628; remove old
-
- 26 Nov 2008; Ryan Hill <dirtyepic@gentoo.org> hugin-0.7.0.ebuild:
- Call wxwidgets_pkg_setup.
-
- 22 Nov 2008; Markus Meier <maekke@gentoo.org> hugin-0.7.0.ebuild:
- amd64/x86 stable, bug #246827
-
- 08 Oct 2008; Markus Meier <maekke@gentoo.org> hugin-0.6.1-r2.ebuild:
- add missing x11-libs/gtk+ dep, bug #239698
-
- 06 Oct 2008; Markus Meier <maekke@gentoo.org> hugin-0.7.0-r1.ebuild:
- fix broken dep on dev-libs/boost, thanks to voyageur and Betelgeuse
-
-*hugin-0.7.0-r1 (06 Oct 2008)
-*hugin-0.7.0 (06 Oct 2008)
-
- 06 Oct 2008; Markus Meier <maekke@gentoo.org> -hugin-0.7.0_rc2.ebuild,
- -hugin-0.7.0_rc3.ebuild, -hugin-0.7.0_rc4.ebuild, -hugin-0.7.0_rc5.ebuild,
- -hugin-0.7.0_rc6.ebuild, +hugin-0.7.0.ebuild, +hugin-0.7.0-r1.ebuild:
- bump to 0.7.0 final release (-r1 is an EAPI=2 version of the ebuild, -r0
- is a stable candidate), remove old
-
-*hugin-0.7.0_rc6 (15 Sep 2008)
-
- 15 Sep 2008; Markus Meier <maekke@gentoo.org> +hugin-0.7.0_rc6.ebuild:
- bump to 0.7.0_rc6
-
-*hugin-0.7.0_rc5 (15 Sep 2008)
-
- 15 Sep 2008; Markus Meier <maekke@gentoo.org> +hugin-0.7.0_rc5.ebuild:
- bump to 0.7.0_rc5
-
-*hugin-0.7.0_rc4 (02 Sep 2008)
-
- 02 Sep 2008; Markus Meier <maekke@gentoo.org> +hugin-0.7.0_rc4.ebuild:
- bump to 0.7.0_rc4
-
-*hugin-0.7.0_rc3 (28 Aug 2008)
-
- 28 Aug 2008; Markus Meier <maekke@gentoo.org> +hugin-0.7.0_rc3.ebuild:
- bump to 0.7.0_rc3
-
- 18 Aug 2008; Markus Meier <maekke@gentoo.org>
- +files/hugin-0.7.0_rc2-as-needed.patch, hugin-0.7.0_rc2.ebuild:
- fix building with --as-needed, bug #235004
-
-*hugin-0.7.0_rc2 (16 Aug 2008)
-
- 16 Aug 2008; Markus Meier <maekke@gentoo.org> metadata.xml,
- +hugin-0.7.0_rc2.ebuild:
- bump to hugin-0.7.0_rc2; describe local use flags in metadata.xml
-
- 10 May 2008; Mike Frysinger <vapier@gentoo.org> hugin-0.7_beta4-r1.ebuild:
- Also apply gcc-4.3 patch to hugin-0.7_beta4-r1.
-
- 02 May 2008; Markus Meier <maekke@gentoo.org>
- +files/hugin-0.6.1-gcc43.patch, hugin-0.6.1-r2.ebuild:
- fix building with gcc-4.3 by Peter Alfredsen, bug #219783
-
- 16 Mar 2008; Markus Meier <maekke@gentoo.org> hugin-0.6.1-r2.ebuild:
- zip dep is also needed in hugin-0.6
-
- 09 Mar 2008; Markus Meier <maekke@gentoo.org> hugin-0.7_beta4-r1.ebuild:
- add app-arch/zip dep, bug #212808
-
- 12 Jan 2008; Markus Meier <maekke@gentoo.org>
- -files/hugin-0.5-gcc41.patch, -files/hugin-0.5_rc2-gcc4.patch,
- -hugin-0.5_rc1-r2.ebuild, -hugin-0.5.ebuild, -hugin-0.6.1.ebuild,
- -hugin-0.6.1-r1.ebuild:
- old
-
- 11 Jan 2008; nixnut <nixnut@gentoo.org> hugin-0.6.1-r2.ebuild:
- Stable on ppc wrt bug 205154
-
- 17 Dec 2007; Christian Faulhammer <opfer@gentoo.org>
- hugin-0.6.1-r2.ebuild:
- stable x86, bug 202095
-
- 16 Dec 2007; Samuli Suominen <drac@gentoo.org> hugin-0.6.1-r2.ebuild:
- amd64 stable wrt #180381
-
-*hugin-0.7_beta4-r1 (03 Dec 2007)
-*hugin-0.6.1-r2 (03 Dec 2007)
-
- 03 Dec 2007; Markus Meier <maekke@gentoo.org>
- +files/hugin-0.6.1-as-needed.patch,
- +files/hugin-0.7_beta4-as-needed.patch,
- +files/hugin-0.7_beta4-insec-file.patch, +hugin-0.6.1-r2.ebuild,
- -hugin-0.7_beta4.ebuild, +hugin-0.7_beta4-r1.ebuild:
- revision bump, fix as-needed (bug #180381), also fix security bug #195996
- for 0.7
-
- 14 Nov 2007; Peter Weller <welp@gentoo.org> hugin-0.6.1-r1.ebuild:
- Stable on amd64 wrt bug 195996
-
- 26 Oct 2007; Luca Barbato <lu_zero@gentoo.org> hugin-0.6.1-r1.ebuild:
- Marked ppc
-
- 26 Oct 2007; Markus Meier <maekke@gentoo.org> hugin-0.6.1-r1.ebuild:
- x86 stable, security bug #195996
-
-*hugin-0.6.1-r1 (25 Oct 2007)
-
- 25 Oct 2007; Luca Barbato <lu_zero@gentoo.org>
- +files/hugin-0.6.1-1_0.6.1-1.1.patch, +hugin-0.6.1-r1.ebuild:
- Security Fix, see bug #195996. Debian patch applied
-
- 13 Oct 2007; Ryan Hill <dirtyepic@gentoo.org> hugin-0.5_rc1-r2.ebuild,
- hugin-0.5.ebuild, hugin-0.6.1.ebuild, hugin-0.7_beta4.ebuild:
- Lock wxGTK to 2.6.
-
- 23 Jul 2007; Luca Barbato <lu_zero@gentoo.org> hugin-0.6.1.ebuild,
- hugin-0.7_beta4.ebuild:
- Fix the bad fix I committed before
-
- 15 Jul 2007; Luca Barbato <lu_zero@gentoo.org> hugin-0.6.1.ebuild,
- hugin-0.7_beta4.ebuild:
- make hugin build with newer boost, thanks to Jakub for the fix in bug #181414
-
- 30 Apr 2007; Marius Mauch <genone@gentoo.org> hugin-0.5_rc1-r2.ebuild,
- hugin-0.6.1.ebuild, hugin-0.7_beta4.ebuild:
- Replacing einfo with elog
-
- 16 Apr 2007; Christian Faulhammer <opfer@gentoo.org> hugin-0.6.1.ebuild:
- stable amd64, bug 173068
-
- 08 Apr 2007; Joseph Jezak <josejx@gentoo.org> hugin-0.6.1.ebuild:
- Marked ppc stable for bug #173068.
-
- 06 Apr 2007; Christian Faulhammer <opfer@gentoo.org> hugin-0.6.1.ebuild:
- stable x86, bug 173068
-
- 05 Apr 2007; Marcelo Goes <vanquirius@gentoo.org> hugin-0.6.1.ebuild,
- hugin-0.7_beta4.ebuild:
- Depend on >=media-gfx/enblend-2.4 if the enblend flag is set for bug 173418.
- Thanks to Nicolas Laurent <nicolas.mario at gmail dot com>.
-
-*hugin-0.7_beta4 (02 Apr 2007)
-
- 02 Apr 2007; Marcelo Goes <vanquirius@gentoo.org> +hugin-0.7_beta4.ebuild:
- Add 0.7_beta4 for bug 141617. In package.mask for now. Thanks again to
- people who contributed in the bug.
-
- 03 Mar 2007; Marcelo Goes <vanquirius@gentoo.org> hugin-0.6.1.ebuild:
- Improve einfo explanation for enblend and sift USE flags for bug 141617.
- Thanks to Tim Harder <thorium90 at gmail dot com>.
-
-*hugin-0.6.1 (23 Feb 2007)
-
- 23 Feb 2007; Marcelo Goes <vanquirius@gentoo.org> +hugin-0.6.1.ebuild:
- 0.6.1 version bump for bug 141617. Thanks to David Grant <davidgrant at
- gmail dot com>, Hal Engel <hvengel at astound dot net>, Tarmo Tanav <sn4ip3r
- at estprog dot ee>, Emmanuel Favre_Nicolin <manouchk at gmail dot com>, Paul
- Berens <pjb8774 at rit dot edu>, Johann Cardon <johann.cardon at free dot
- fr>, Patrick Huber <phuber at swisstech dot net>, Toon Verstraelen
- <Toon.Verstraelen at UGent dot be>, Paul de Vries <phsdv at tiscali dot fr>,
- Norman Thomas <news at hiroki dot de>, Christian Kanzian <christian.kanzian
- at gmx dot at>, Jorge Nerin <gentoo-bugs at redvip.homelinux dot net>, Tim
- Harder <thorium90 at gmail dot com>, Serge Gavrilov <serge at pdmi dot ras
- dot ru>, Andrew Wilchak <azdruid at gmail dot com>, Chris Mayo <mayo at
- clara dot co dot uk> and anyone I could have missed.
-
- 22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
- Transition to Manifest2.
-
- 24 Sep 2006; Olivier Crête <tester@gentoo.org> hugin-0.5.ebuild:
- Stable on amd64
-
- 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> hugin-0.5.ebuild:
- Stable on x86
-
- 20 Feb 2006; Mark Loeser <halcy0n@gentoo.org> metadata.xml:
- metadata.xml cleanup
-
- 15 Jan 2006; Mark Loeser <halcy0n@gentoo.org>
- +files/hugin-0.5-gcc41.patch, hugin-0.5.ebuild:
- Add dep on enblend, and also add patch to fix compilation with gcc-4.1
-
-*hugin-0.5 (18 Dec 2005)
-
- 18 Dec 2005; Mark Loeser <halcy0n@gentoo.org> -hugin-0.5_rc2.ebuild,
- +hugin-0.5.ebuild:
- Bump to 0.5; bug #115714, and clean out old versions
-
- 26 Nov 2005; Mark Loeser <halcy0n@gentoo.org>
- files/hugin-0.5_rc2-gcc4.patch:
- Fix gcc4 patch
-
- 19 Nov 2005; Mark Loeser <halcy0n@gentoo.org>
- +files/hugin-0.5_rc2-gcc4.patch, hugin-0.5_rc2.ebuild:
- Add patch to fix compilation with gcc4.
-
-*hugin-0.5_rc1-r2 (16 Oct 2005)
-
- 16 Oct 2005; Mark Loeser <halcy0n@gentoo.org> -hugin-0.5_rc1.ebuild,
- -hugin-0.5_rc1-r1.ebuild, +hugin-0.5_rc1-r2.ebuild:
- Fixing the default autopano executable. This ebuild also gets rid of the gtk2
- useflag
-
-*hugin-0.5_rc2 (01 Oct 2005)
-*hugin-0.5_rc1-r1 (01 Oct 2005)
-
- 01 Oct 2005; Mark Loeser <halcy0n@gentoo.org> +hugin-0.5_rc1-r1.ebuild,
- +hugin-0.5_rc2.ebuild:
- Remove gtk useflag, since gtk2 is the only available toolkit. Bump to _rc2.
- bug #107776
-
- 16 Sep 2005; Mark Loeser <halcy0n@gentoo.org> hugin-0.5_rc1.ebuild:
- Stable on x86
-
- 21 Aug 2005; Luis Medinas <metalgod@gentoo.org> hugin-0.5_rc1.ebuild:
- Added ~amd64 keywords. Closes bug #103254.
-
- 11 Aug 2005; David Holm <dholm@gentoo.org> hugin-0.5_rc1.ebuild:
- Added to ~ppc.
-
-*hugin-0.5_rc1 (10 Aug 2005)
-
- 10 Aug 2005; Mark Loeser <halcy0n@gentoo.org> +metadata.xml,
- +hugin-0.5_rc1.ebuild:
- Initial commit of hugin. Thanks to everyone on bug #48269
-
diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
deleted file mode 100644
index 028062e..0000000
--- a/media-gfx/hugin/Manifest
+++ /dev/null
@@ -1,24 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-AUX hugin-2011.0.0_rc1-libpng15.patch 11844 SHA256 48c05955b94a34bd5b96e560ebbeb0cdbce04f47fddde793f91c3a0bb37559a6 SHA512 bf57836d46d16528ea855334cb3aa0e6b7c1ce1d4a128a579cd5b4c9924063ca5755c0641d0e50f86c1dfdf0dccb93f93592abcf5b59d75314182ae443e71b1c WHIRLPOOL c5ae45c540a5e01fa171aacf36d487644cc8af3341d87540889e1ecac919d6daddb3aa1e872defadba933d879e592c28f18ac5496b09b37c61394e1fc803d340
-AUX hugin-2011.4.0-boost148.patch 1887 SHA256 1ca8641b8bc93c0391cb9596c2d977f8dd9e3345282dc26dad50b4d43820b87d SHA512 93106613b802d044befe705eef3bd385fd6dea5d44ccdea06952e02b740e2e5ac386b1c6a422fba5f1e4d53de274e7d3d0cac896fb65527946bb6cf4f6d8df9c WHIRLPOOL d4579a14e745b2e45e4d546f546deafd460a4265d074c452b995ccec8e56b5e3f9da41d3a603b5aecd1d8338536e6dc6230c355e682b9e855171a87ed8aa1004
-AUX hugin-2011.4.0-gcc47.patch 1243 SHA256 ff1e2f55eb94e22546c3185cde458f51a503f91158456043018f09518652b49f SHA512 51c809d6e1d92f35ec98ba707717e09e1ea5c45e8c3efe5fb6fb35d775d1dc50ecb445171d0ca099b46e25fb891c52b2ee448f863264533e550ba5b5ab84acb6 WHIRLPOOL 0e6a7b1d2f33dace53c54fdc3aa5b743852752c4e935c2eee23603ece0a0a291a22cf68e2a7fa551b40130f4225260439ddd4968cb37ae11215fd5ee00547517
-DIST hugin-2011.0.0.tar.bz2 11439430 SHA256 866273f6218d300a52c0148960681faa2c4e05383d97f868a2eb47b457b5f4fc SHA512 28cfe1e3d62dfbd4453696a4cffd082d8ae65fb7c0b92b9ef295ccd5d38c12e00ad24a6961a49a3a804ed8231b7363c38204d53965b563cf1e068b623a37ba5f WHIRLPOOL dd3c0b5c99c692cc9d67a1adec3925cba0734531c1152b5b1aafe3c6c66af1131ad0e56b97225897c8f28b3a7598f06f61a19994c18eb8262a436c72559ccc48
-DIST hugin-2011.2.0.tar.bz2 11506840 SHA256 bd9ef8d2f62c6dbcbadc2b9208cdcf6e4b6512760335c726b697bffd5e89b5be SHA512 00352855f5bf9d96580d100a83322f4bb374e89da418ae2a9e97653a0e3c1598c28cbaa99f310bdbdb955e637ffbd5f7d47810052e455a6ecbc752c4e8b1eac5 WHIRLPOOL 4cfe16fb5739620043ab8d18fe4562a4dbfcb7b7f892a203736640831825f2850e65e6c1914dae1785ef72e89c6168b81b333e725acd98d3e051f2f87416d6b2
-DIST hugin-2011.4.0.tar.bz2 11740410 SHA256 2e4b8eabdb243b24b2dd4a6af82a1a2a7451e2e749f84349f8cdfd8e9fa4ddae SHA512 13f2e1d72e1bc7e3c3871dd845ec3cd7aefe9dc1bf108808996b9dccdfff6a10a8dba2935f1a20c898385e97bdf8f08e9f77bb315e73ae5240eb594bfbc55803 WHIRLPOOL b7a4ee66029d3639f4314c853a92d60ca930353e6c2be624c0b05476435defab302f17e5ac27f48a5c4e7fd9f6eefd3ad088c0cc435abbbe5b7e66c8908d3f82
-DIST hugin-2012.0.0.tar.bz2 11658665 SHA256 63dfd88ac90d3af4b958111db951bb7fbf2c66ad6b0246e6305403eb5de971b3 SHA512 acf97d383091eca300074a8e207ec5500a8b96a5116708a6ff23fb8f5359a77016867ee2ae21a4e40c4d07d056b5c27844c03c275ec29c0b604ecb31b73ee0a8 WHIRLPOOL d058639202aef1f6beb475bc8c170ac4269bf5050bfcbc48678ddde67188e12eb29c216b6ce8f79571c91ff43e271dac706bd4f432d3f640d549f87b371caa43
-EBUILD hugin-2011.0.0.ebuild 1502 SHA256 c1fd7cc171286391d5153296294a7080d8ef39d8fe811d06f7d19212179730bf SHA512 5d0273ca9d39f67655d57ebc7ca3cd1a904ec81fb77e9ed484bbb13b192a8297a77fb403461f91ce7352b27b58c738ed4531db87e7438086263fea0c83ef200b WHIRLPOOL c551e6d746eb0cfac11befdb3e76752f43ddb79c81c8eb996b210af8deb2405703f503b2f2f4304d438b50b2dfb2f894ca5cda03dc38d0cbe07a2068709f7ccd
-EBUILD hugin-2011.2.0.ebuild 1612 SHA256 96753f2d1bb6f7922ffe8b53375e1b45e2f77042ea2619470e566a955b308774 SHA512 a576fbb76727e9475c823547692d0d3235232fef1099540d12d1d65d7a70d668938a9e08222abae6a79a1f7bcf0d546cee45b412f4a42e5e9cfa29f8c17bef52 WHIRLPOOL a58a09464c3c10eb821c4fd1ffecbb8ac0c04990ebbcccadd7fabef1e508814cecb4a898ce26b4ac9629d6378afb09ee708d2237d939155e570f8df217e2c3b5
-EBUILD hugin-2011.4.0-r1.ebuild 1685 SHA256 dd0e62f72a98f51382729f574f2b82d398f8b06e784d9fc75b95820d63a52c11 SHA512 e4792795d272462d14066a0ede99ca5e06a9049172d9473e7d1a1d7453ceeb6184d571890113bbe6773fd30f9c4689b6cf184cbfc04ba7ab69d5b1096e24e97a WHIRLPOOL 1d1d3aaba4099fccc32e6330370744109dba7704b5a77392fd6dcdb9110bce28448897b822cb9585fb5abc1469b4d773113745eca6d608a3ea93415a68f2a911
-EBUILD hugin-2011.4.0.ebuild 1618 SHA256 ca4b46f9a14fcbbc484930dcea4ee99e918654a206e8d395d4828b40fc7b53e8 SHA512 d6e6df54d4f497fa9e0d2284ad3670d71eec10e89501bdf4b02e1535b7bce2adc27a8c678b48a3b9a303aa0020e955d905cd5561c03d8566238e22b26bdbbf1a WHIRLPOOL 3546dd7dc3e944c763500e2dff0937be2c882083e46c6d4b0fe547a012a56e8a6c6b0278792bdfc7de00fd7419ced2cd37d9b4b17c3d13b0b413c5d0a09ac5a1
-EBUILD hugin-2012.0.0.ebuild 1623 SHA256 1d03966e607aef1e108d535352ad5edb7f711db72a8f15e7639eb2ff61ca20df SHA512 eca79efa4f694514775301d72f3826cbae435f28f4f9cbc92924d5df1eed99de307637905b871d116c4b85dc3a4d1984afe0f16c1741699c6cb1696f2f19e385 WHIRLPOOL 1be4f45b6e163b883e5ecc761ea1de803827450fe1e64ae02bb9517f17355e3d22dad4e737ab135f37ab89b50db05a87f35e13eabd15b48328a7ce17f517a12f
-MISC ChangeLog 19790 SHA256 e30347759975383295692d30b111d5486c69d557c0bcbaf5cfc5e6963d5f48a3 SHA512 dcaa056d34ff70e587a52c400f219964c715d60eb84cea10e4a60c56687e074e1796c507f591bcab59d7eca6c2db36e1c35d3a63c5f823213055a22d5bb7d312 WHIRLPOOL 00c130d5ef55b482ace424c45890b369c8b47267f679369498f8d1628e1a15962d35806b4f0e81079ef452e4467dad600c8c3e54b9698947d09e8536b4b87389
-MISC metadata.xml 389 SHA256 6f26cd9c2b64a96c1c86a8a468a261af4cf4dfaa86b4d7ddcfaee1ca98314803 SHA512 29609682ab87309ae4c688476d73cb996f6f97fceecfb084343b9b371d28dc6bfcdd6034dc6086b4d1ebb6e37bba7840085fe126aef0e41a32454f7a9e4d231d WHIRLPOOL 180338c5e90a9340360500c879066385841c3a568559236095156dfb2fd8783e6971c0d4d72fe7f8cc07d53466a3b4b51525c0d58be572a226730e7451066e4e
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iEYEAREIAAYFAlCoq9IACgkQkKaRLQcq0GKcRQCeLsgLQ05ebpMS4glmdPKyc2L8
-34EAn2WnM8I9txLi3Or9ma53CSEzocxR
-=VbpV
------END PGP SIGNATURE-----
diff --git a/media-gfx/hugin/files/hugin-2011.0.0_rc1-libpng15.patch b/media-gfx/hugin/files/hugin-2011.0.0_rc1-libpng15.patch
deleted file mode 100644
index 2752231..0000000
--- a/media-gfx/hugin/files/hugin-2011.0.0_rc1-libpng15.patch
+++ /dev/null
@@ -1,275 +0,0 @@
---- hugin-2011.0.0.orig/src/foreign/vigra/vigra_impex/png.cxx
-+++ hugin-2011.0.0/src/foreign/vigra/vigra_impex/png.cxx
-@@ -78,7 +75,7 @@
- static void PngError( png_structp png_ptr, png_const_charp error_msg )
- {
- png_error_message = std::string(error_msg);
-- longjmp( png_ptr->jmpbuf, 1 );
-+ longjmp( png_jmpbuf(png_ptr), 1 );
- }
-
- // called on non-fatal errors
-@@ -200,9 +197,9 @@
- // check if the file is a png file
- const unsigned int sig_size = 8;
- png_byte sig[sig_size];
-- std::fread( sig, sig_size, 1, file.get() );
-+ std::size_t readCount = std::fread( sig, sig_size, 1, file.get() );
- const int no_png = png_sig_cmp( sig, 0, sig_size );
-- vigra_precondition( !no_png, "given file is not a png file.");
-+ vigra_precondition( (readCount == 1) && !no_png, "given file is not a png file.");
-
- // create png read struct with user defined handlers
- png = png_create_read_struct( PNG_LIBPNG_VER_STRING, NULL,
-@@ -210,7 +207,7 @@
- vigra_postcondition( png != 0, "could not create the read struct." );
-
- // create info struct
-- if (setjmp(png->jmpbuf)) {
-+ if (setjmp(png_jmpbuf(png))) {
- png_destroy_read_struct( &png, &info, NULL );
- vigra_postcondition( false, png_error_message.insert(0, "error in png_create_info_struct(): ").c_str() );
- }
-@@ -218,14 +215,14 @@
- vigra_postcondition( info != 0, "could not create the info struct." );
-
- // init png i/o
-- if (setjmp(png->jmpbuf)) {
-+ if (setjmp(png_jmpbuf(png))) {
- png_destroy_read_struct( &png, &info, NULL );
- vigra_postcondition( false, png_error_message.insert(0, "error in png_init_io(): ").c_str() );
- }
- png_init_io( png, file.get() );
-
- // specify that the signature was already read
-- if (setjmp(png->jmpbuf)) {
-+ if (setjmp(png_jmpbuf(png))) {
- png_destroy_read_struct( &png, &info, NULL );
- vigra_postcondition( false, png_error_message.insert(0, "error in png_set_sig_bytes(): ").c_str() );
- }
-@@ -241,13 +238,13 @@
- void PngDecoderImpl::init()
- {
- // read all chunks up to the image data
-- if (setjmp(png->jmpbuf))
-+ if (setjmp(png_jmpbuf(png)))
- vigra_postcondition( false, png_error_message.insert(0, "error in png_read_info(): ").c_str() );
- png_read_info( png, info );
-
- // pull over the header fields
- int interlace_method, compression_method, filter_method;
-- if (setjmp(png->jmpbuf))
-+ if (setjmp(png_jmpbuf(png)))
- vigra_postcondition( false, png_error_message.insert(0, "error in png_get_IHDR(): ").c_str() );
- png_get_IHDR( png, info, &width, &height, &bit_depth, &color_type,
- &interlace_method, &compression_method, &filter_method );
-@@ -261,7 +258,7 @@
-
- // transform palette to rgb
- if ( color_type == PNG_COLOR_TYPE_PALETTE) {
-- if (setjmp(png->jmpbuf))
-+ if (setjmp(png_jmpbuf(png)))
- vigra_postcondition( false, png_error_message.insert(0, "error in png_palette_to_rgb(): ").c_str() );
- png_set_palette_to_rgb(png);
- color_type = PNG_COLOR_TYPE_RGB;
-@@ -270,15 +267,10 @@
-
- // expand gray values to at least one byte size
- if ( color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8 ) {
--#if (PNG_LIBPNG_VER >= 10400)
-- if (setjmp(png->jmpbuf))
-- vigra_postcondition( false,png_error_message.insert(0, "error in png_set_expand_gray_1_2_4_to_8(): ").c_str());
-+ if (setjmp(png_jmpbuf(png)))
-+ vigra_postcondition(false,
-+ png_error_message.insert(0, "error in png_set_expand_gray_1_2_4_to_8(): ").c_str());
- png_set_expand_gray_1_2_4_to_8(png);
--#else
-- if (setjmp(png->jmpbuf))
-- vigra_postcondition( false,png_error_message.insert(0, "error in png_set_gray_1_2_4_to_8(): ").c_str());
-- png_set_gray_1_2_4_to_8(png);
--#endif
- bit_depth = 8;
- }
-
-@@ -286,7 +278,7 @@
- #if 0
- // strip alpha channel
- if ( color_type & PNG_COLOR_MASK_ALPHA ) {
-- if (setjmp(png->jmpbuf))
-+ if (setjmp(png_jmpbuf(png)))
- vigra_postcondition( false, png_error_message.insert(0, "error in png_set_strip_alpha(): ").c_str() );
- png_set_strip_alpha(png);
- color_type ^= PNG_COLOR_MASK_ALPHA;
-@@ -317,8 +309,8 @@
- }
-
- // read resolution
-- x_resolution = png_get_x_pixels_per_meter( png, info ) / 254.0;
-- y_resolution = png_get_y_pixels_per_meter( png, info ) / 254.0;
-+ x_resolution = png_get_x_pixels_per_meter( png, info ) * 0.0254f;
-+ y_resolution = png_get_y_pixels_per_meter( png, info ) * 0.0254f;
-
- // read offset
- position.x = png_get_x_offset_pixels( png, info );
-@@ -328,9 +320,13 @@
- #if (PNG_LIBPNG_VER > 10008) && defined(PNG_READ_iCCP_SUPPORTED)
- char * dummyName;
- int dummyCompType;
-+#if (PNG_LIBPNG_VER < 10500)
- char * profilePtr;
-+#else
-+ png_byte * profilePtr;
-+#endif
- png_uint_32 profileLen;
-- if (info->valid & PNG_INFO_iCCP) {
-+ if (png_get_valid( png, info, PNG_INFO_iCCP )) {
- png_get_iCCP(png, info, &dummyName, &dummyCompType, &profilePtr, &profileLen) ;
- iccProfilePtr = (unsigned char *) profilePtr;
- iccProfileLength = profileLen;
-@@ -343,7 +339,7 @@
- // image gamma
- double image_gamma = 0.45455;
- if ( png_get_valid( png, info, PNG_INFO_gAMA ) ) {
-- if (setjmp(png->jmpbuf))
-+ if (setjmp(png_jmpbuf(png)))
- vigra_postcondition( false, png_error_message.insert(0, "error in png_get_gAMA(): ").c_str() );
- png_get_gAMA( png, info, &image_gamma );
- }
-@@ -352,26 +348,26 @@
- double screen_gamma = 2.2;
-
- // set gamma correction
-- if (setjmp(png->jmpbuf))
-+ if (setjmp(png_jmpbuf(png)))
- vigra_postcondition( false, png_error_message.insert(0, "error in png_set_gamma(): ").c_str() );
- png_set_gamma( png, screen_gamma, image_gamma );
- #endif
-
- // interlace handling, get number of read passes needed
-- if (setjmp(png->jmpbuf))
-+ if (setjmp(png_jmpbuf(png)))
- vigra_postcondition( false,png_error_message.insert(0, "error in png_set_interlace_handling(): ").c_str());
- n_interlace_passes = png_set_interlace_handling(png);
-
- // update png library state to reflect any changes that were made
-- if (setjmp(png->jmpbuf))
-+ if (setjmp(png_jmpbuf(png)))
- vigra_postcondition( false, png_error_message.insert(0, "error in png_read_update_info(): ").c_str() );
- png_read_update_info( png, info );
-
-- if (setjmp(png->jmpbuf))
-+ if (setjmp(png_jmpbuf(png)))
- vigra_postcondition( false,png_error_message.insert(0, "error in png_get_channels(): ").c_str());
- n_channels = png_get_channels(png, info);
-
-- if (setjmp(png->jmpbuf))
-+ if (setjmp(png_jmpbuf(png)))
- vigra_postcondition( false,png_error_message.insert(0, "error in png_get_rowbytes(): ").c_str());
- rowsize = png_get_rowbytes(png, info);
-
-@@ -381,9 +377,10 @@
-
- void PngDecoderImpl::nextScanline()
- {
-- for (int i=0; i < n_interlace_passes; i++) {
-- if (setjmp(png->jmpbuf))
-- vigra_postcondition( false,png_error_message.insert(0, "error in png_read_row(): ").c_str());
-+ if (setjmp(png_jmpbuf(png)))
-+ vigra_postcondition( false,png_error_message.insert(0, "error in png_read_row(): ").c_str());
-+ for (int i=0; i < n_interlace_passes; i++)
-+ {
- png_read_row(png, row_data.begin(), NULL);
- }
- }
-@@ -548,7 +545,7 @@
- vigra_postcondition( png != 0, "could not create the write struct." );
-
- // create info struct
-- if (setjmp(png->jmpbuf)) {
-+ if (setjmp(png_jmpbuf(png))) {
- png_destroy_write_struct( &png, &info );
- vigra_postcondition( false, png_error_message.insert(0, "error in png_info_struct(): ").c_str() );
- }
-@@ -559,7 +556,7 @@
- }
-
- // init png i/o
-- if (setjmp(png->jmpbuf)) {
-+ if (setjmp(png_jmpbuf(png))) {
- png_destroy_write_struct( &png, &info );
- vigra_postcondition( false, png_error_message.insert(0, "error in png_init_io(): ").c_str() );
- }
-@@ -574,7 +571,7 @@
- void PngEncoderImpl::finalize()
- {
- // write the IHDR
-- if (setjmp(png->jmpbuf))
-+ if (setjmp(png_jmpbuf(png)))
- vigra_postcondition( false, png_error_message.insert(0, "error in png_set_IHDR(): ").c_str() );
- png_set_IHDR( png, info, width, height, bit_depth, color_type,
- PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT,
-@@ -582,16 +579,16 @@
-
- // set resolution
- if (x_resolution > 0 && y_resolution > 0) {
-- if (setjmp(png->jmpbuf))
-+ if (setjmp(png_jmpbuf(png)))
- vigra_postcondition( false, png_error_message.insert(0, "error in png_set_pHYs(): ").c_str() );
-- png_set_pHYs(png, info, (png_uint_32) (x_resolution * 254 + 0.5),
-- (png_uint_32) (y_resolution * 254 + 0.5),
-+ png_set_pHYs(png, info, (png_uint_32) (x_resolution / 0.0254 + 0.5),
-+ (png_uint_32) (y_resolution / 0.0254 + 0.5),
- PNG_RESOLUTION_METER);
- }
-
- // set offset
- if (position.x > 0 && position.y > 0) {
-- if (setjmp(png->jmpbuf))
-+ if (setjmp(png_jmpbuf(png)))
- vigra_postcondition( false, png_error_message.insert(0, "error in png_set_oFFs(): ").c_str() );
- png_set_oFFs(png, info, position.x, position.y, PNG_OFFSET_PIXEL);
- }
-@@ -599,13 +596,17 @@
- #if (PNG_LIBPNG_VER > 10008) && defined(PNG_WRITE_iCCP_SUPPORTED)
- // set icc profile
- if (iccProfile.size() > 0) {
-- png_set_iCCP(png, info, "icc", 0,
-- (char *)iccProfile.begin(), iccProfile.size());
-+ png_set_iCCP(png, info, (png_charp)("icc"), 0,
-+#if (PNG_LIBPNG_VER < 10500)
-+ (png_charp)iccProfile.begin(), (png_uint_32)iccProfile.size());
-+#else
-+ (png_byte*)iccProfile.begin(), (png_uint_32)iccProfile.size());
-+#endif
- }
- #endif
-
- // write the info struct
-- if (setjmp(png->jmpbuf))
-+ if (setjmp(png_jmpbuf(png)))
- vigra_postcondition( false, png_error_message.insert(0, "error in png_write_info(): ").c_str() );
- png_write_info( png, info );
-
-@@ -637,10 +638,10 @@
- }
-
- // write the whole image
-- if (setjmp(png->jmpbuf))
-+ if (setjmp(png_jmpbuf(png)))
- vigra_postcondition( false, png_error_message.insert(0, "error in png_write_image(): ").c_str() );
- png_write_image( png, row_pointers.begin() );
-- if (setjmp(png->jmpbuf))
-+ if (setjmp(png_jmpbuf(png)))
- vigra_postcondition( false, png_error_message.insert(0, "error in png_write_end(): ").c_str() );
- png_write_end(png, info);
- }
-@@ -688,8 +689,7 @@
- pimpl->components = bands;
- }
-
-- void PngEncoder::setCompressionType( const std::string & comp,
-- int quality )
-+ void PngEncoder::setCompressionType( const std::string & /* comp */, int /* quality */)
- {
- // nothing is settable => do nothing
- }
diff --git a/media-gfx/hugin/files/hugin-2011.4.0-boost148.patch b/media-gfx/hugin/files/hugin-2011.4.0-boost148.patch
deleted file mode 100644
index 3c19cc7..0000000
--- a/media-gfx/hugin/files/hugin-2011.4.0-boost148.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-
-# HG changeset patch
-# User tmodes
-# Date 1324625694 -3600
-# Node ID 7f0674a26bdb85fbcc73f64c8a38d1b353910af7
-# Parent b873e1da31f0fdc4cf19f9630450d1735a040fbe
-Add namespace to compile with Boost 1.48
-
-diff -r b873e1da31f0 -r 7f0674a26bdb src/hugin_base/algorithms/optimizer/ImageGraph.cpp
---- a/src/hugin_base/algorithms/optimizer/ImageGraph.cpp Fri Dec 23 08:34:18 2011 +0100
-+++ b/src/hugin_base/algorithms/optimizer/ImageGraph.cpp Fri Dec 23 08:34:54 2011 +0100
-@@ -55,7 +55,7 @@
-
- CPGraphIndexMap index = get(boost::vertex_index, graph);
- bool found=false;
-- for (tie(ai, ai_end) = adjacent_vertices(it->image1Nr, graph);
-+ for (boost::tuples::tie(ai, ai_end) = adjacent_vertices(it->image1Nr, graph);
- ai != ai_end; ++ai)
- {
- if (index[*ai] == it->image2Nr) found = true;
-@@ -83,7 +83,7 @@
-
- CPGraphIndexMap index = get(boost::vertex_index, graph);
- bool found=false;
-- for (tie(ai, ai_end) = adjacent_vertices(i, graph);
-+ for (boost::tuples::tie(ai, ai_end) = adjacent_vertices(i, graph);
- ai != ai_end; ++ai)
- {
- if (index[*ai] == j) found = true;
-diff -r b873e1da31f0 -r 7f0674a26bdb src/hugin_base/algorithms/optimizer/PTOptimizer.h
---- a/src/hugin_base/algorithms/optimizer/PTOptimizer.h Fri Dec 23 08:34:18 2011 +0100
-+++ b/src/hugin_base/algorithms/optimizer/PTOptimizer.h Fri Dec 23 08:34:54 2011 +0100
-@@ -233,7 +233,7 @@
- // collect all optimized neighbours
- typename boost::graph_traits<CPGraph>::adjacency_iterator ai;
- typename boost::graph_traits<CPGraph>::adjacency_iterator ai_end;
-- for (tie(ai, ai_end) = adjacent_vertices(v, g);
-+ for (boost::tuples::tie(ai, ai_end) = adjacent_vertices(v, g);
- ai != ai_end; ++ai)
- {
- if (*ai != v) {
-
diff --git a/media-gfx/hugin/files/hugin-2011.4.0-gcc47.patch b/media-gfx/hugin/files/hugin-2011.4.0-gcc47.patch
deleted file mode 100644
index 9615ae4..0000000
--- a/media-gfx/hugin/files/hugin-2011.4.0-gcc47.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-
-# HG changeset patch
-# User Bruno Postle <bruno@postle.net>
-# Date 1328910737 0
-# Node ID c7ecd541dbd78bfa95dd495c7c4317bba81f4c3b
-# Parent 658ded2153f2773a7e193f48d612d95104495080
-Fixes for gcc-4.7.0
-
-diff -r 658ded2153f2 -r c7ecd541dbd7 src/celeste/Utilities.h
---- a/src/celeste/Utilities.h Sun Jan 01 13:23:39 2012 +0100
-+++ b/src/celeste/Utilities.h Fri Feb 10 21:52:17 2012 +0000
-@@ -33,6 +33,8 @@
- #include <stdio.h>
- #ifdef _WINDOWS
- #include "direct.h"
-+#else
-+#include <unistd.h>
- #endif
-
- using namespace std;
-diff -r 658ded2153f2 -r c7ecd541dbd7 src/foreign/zthread/include/zthread/Guard.h
---- a/src/foreign/zthread/include/zthread/Guard.h Sun Jan 01 13:23:39 2012 +0100
-+++ b/src/foreign/zthread/include/zthread/Guard.h Fri Feb 10 21:52:17 2012 +0000
-@@ -428,7 +428,7 @@
- template <class U, class V>
- Guard(Guard<U, V>& g) : LockHolder<LockType>(g) {
-
-- LockingPolicy::shareScope(*this, extract(g));
-+ LockingPolicy::shareScope(*this, this->extract(g));
-
- }
-
-@@ -458,7 +458,7 @@
- template <class U, class V>
- Guard(Guard<U, V>& g, LockType& lock) : LockHolder<LockType>(lock) {
-
-- LockingPolicy::transferScope(*this, extract(g));
-+ LockingPolicy::transferScope(*this, this->extract(g));
-
- }
-
-
diff --git a/media-gfx/hugin/hugin-2011.0.0.ebuild b/media-gfx/hugin/hugin-2011.0.0.ebuild
deleted file mode 100644
index 4162ccf..0000000
--- a/media-gfx/hugin/hugin-2011.0.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2011.0.0.ebuild,v 1.6 2012/05/05 07:00:18 jdhore Exp $
-
-EAPI=4
-WX_GTK_VER="2.8"
-
-inherit wxwidgets versionator cmake-utils
-
-DESCRIPTION="GUI for the creation & processing of panoramic images"
-HOMEPAGE="http://hugin.sf.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-LICENSE="GPL-2 SIFT"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-LANGS=" bg ca cs de en_GB es fi fr hu it ja ko nl pl pt_BR ro ru sk sl sv uk zh_CN zh_TW"
-IUSE="lapack sift $(echo ${LANGS//\ /\ linguas_})"
-
-CDEPEND="
- !!dev-util/cocom
- app-arch/zip
- >=dev-libs/boost-1.35.0-r5
- >=media-gfx/enblend-4.0
- media-gfx/exiv2
- media-libs/freeglut
- >=media-libs/libpano13-2.9.18
- media-libs/libpng
- media-libs/openexr
- media-libs/tiff
- sys-libs/zlib
- virtual/jpeg
- x11-libs/wxGTK:2.8[X,opengl,-odbc]
- lapack? ( virtual/lapack )
- sift? ( media-gfx/autopano-sift-C )"
-RDEPEND="${CDEPEND}
- media-libs/exiftool"
-DEPEND="${CDEPEND}
- virtual/pkgconfig"
-
-S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)
-
-PATCHES=( "${FILESDIR}"/${P}_rc1-libpng15.patch )
-
-pkg_setup() {
- DOCS="authors.txt README TODO"
- mycmakeargs=( $(cmake-utils_use_enable lapack LAPACK) )
-}
-
-src_install() {
- cmake-utils_src_install
-
- for lang in ${LANGS} ; do
- case ${lang} in
- ca) dir=ca_ES;;
- cs) dir=cs_CZ;;
- *) dir=${lang};;
- esac
- use linguas_${lang} || rm -r "${D}"/usr/share/locale/${dir}
- done
-}
diff --git a/media-gfx/hugin/hugin-2011.2.0.ebuild b/media-gfx/hugin/hugin-2011.2.0.ebuild
deleted file mode 100644
index b95d6d4..0000000
--- a/media-gfx/hugin/hugin-2011.2.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2011.2.0.ebuild,v 1.2 2012/05/05 07:00:18 jdhore Exp $
-
-EAPI=3
-WX_GTK_VER="2.8"
-PYTHON_DEPEND="python? 2:2.6 3"
-
-inherit python wxwidgets versionator cmake-utils
-
-DESCRIPTION="GUI for the creation & processing of panoramic images"
-HOMEPAGE="http://hugin.sf.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-LICENSE="GPL-2 SIFT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-LANGS=" bg ca cs da de en_GB es fi fr hu it ja ko nl pl pt_BR ro ru sk sl sv uk zh_CN zh_TW"
-IUSE="lapack python sift $(echo ${LANGS//\ /\ linguas_})"
-
-CDEPEND="
- !!dev-util/cocom
- app-arch/zip
- dev-cpp/tclap
- >=dev-libs/boost-1.35.0-r5
- dev-libs/zthread
- >=media-gfx/enblend-4.0
- media-gfx/exiv2
- media-libs/freeglut
- >=media-libs/libpano13-2.9.18
- media-libs/libpng
- media-libs/openexr
- media-libs/tiff
- sys-libs/zlib
- virtual/jpeg
- x11-libs/wxGTK:2.8[X,opengl,-odbc]
- lapack? ( virtual/lapack )
- sift? ( media-gfx/autopano-sift-C )"
-RDEPEND="${CDEPEND}
- media-libs/exiftool"
-DEPEND="${CDEPEND}
- virtual/pkgconfig
- python? ( >=dev-lang/swig-2.0.4 )"
-
-S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)
-
-pkg_setup() {
- DOCS="authors.txt README TODO"
- mycmakeargs=(
- $(cmake-utils_use_enable lapack LAPACK)
- $(cmake-utils_use_build python HSI)
- )
-}
-
-src_install() {
- cmake-utils_src_install
-
- for lang in ${LANGS} ; do
- case ${lang} in
- ca) dir=ca_ES;;
- cs) dir=cs_CZ;;
- *) dir=${lang};;
- esac
- use linguas_${lang} || rm -r "${D}"/usr/share/locale/${dir}
- done
-}
diff --git a/media-gfx/hugin/hugin-2011.4.0-r1.ebuild b/media-gfx/hugin/hugin-2011.4.0-r1.ebuild
deleted file mode 100644
index 4ba8629..0000000
--- a/media-gfx/hugin/hugin-2011.4.0-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2011.4.0-r1.ebuild,v 1.1 2012/06/30 21:36:05 dilfridge Exp $
-
-EAPI=3
-WX_GTK_VER="2.8"
-PYTHON_DEPEND="python? 2:2.6 3"
-
-inherit base python wxwidgets versionator cmake-utils
-
-DESCRIPTION="GUI for the creation & processing of panoramic images"
-HOMEPAGE="http://hugin.sf.net"
-SRC_URI="mirror://sourceforge/${PN}/${P/\.0_/}.tar.bz2"
-LICENSE="GPL-2 SIFT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-LANGS=" bg ca cs da de en_GB es fi fr hu it ja ko nl pl pt_BR ro ru sk sl sv uk zh_CN zh_TW"
-IUSE="lapack python sift $(echo ${LANGS//\ /\ linguas_})"
-
-CDEPEND="
- !!dev-util/cocom
- app-arch/zip
- dev-cpp/tclap
- >=dev-libs/boost-1.49.0-r1
- dev-libs/zthread
- >=media-gfx/enblend-4.0
- media-gfx/exiv2
- media-libs/freeglut
- >=media-libs/libpano13-2.9.18
- media-libs/libpng
- media-libs/openexr
- media-libs/tiff
- sys-libs/zlib
- virtual/jpeg
- x11-libs/wxGTK:2.8[X,opengl,-odbc]
- lapack? ( virtual/lapack )
- sift? ( media-gfx/autopano-sift-C )"
-RDEPEND="${CDEPEND}
- media-libs/exiftool"
-DEPEND="${CDEPEND}
- virtual/pkgconfig
- python? ( >=dev-lang/swig-2.0.4 )"
-
-S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)
-
-PATCHES=(
- "${FILESDIR}/${P}"-{boost148,gcc47}.patch
-)
-
-pkg_setup() {
- DOCS="authors.txt README TODO"
- mycmakeargs=(
- $(cmake-utils_use_enable lapack LAPACK)
- $(cmake-utils_use_build python HSI)
- )
-}
-
-src_install() {
- cmake-utils_src_install
-
- for lang in ${LANGS} ; do
- case ${lang} in
- ca) dir=ca_ES;;
- cs) dir=cs_CZ;;
- *) dir=${lang};;
- esac
- use linguas_${lang} || rm -r "${D}"/usr/share/locale/${dir}
- done
-}
diff --git a/media-gfx/hugin/hugin-2011.4.0.ebuild b/media-gfx/hugin/hugin-2011.4.0.ebuild
deleted file mode 100644
index aa5f29e..0000000
--- a/media-gfx/hugin/hugin-2011.4.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2011.4.0.ebuild,v 1.2 2012/05/05 07:00:18 jdhore Exp $
-
-EAPI=3
-WX_GTK_VER="2.8"
-PYTHON_DEPEND="python? 2:2.6 3"
-
-inherit python wxwidgets versionator cmake-utils
-
-DESCRIPTION="GUI for the creation & processing of panoramic images"
-HOMEPAGE="http://hugin.sf.net"
-SRC_URI="mirror://sourceforge/${PN}/${P/\.0_/}.tar.bz2"
-LICENSE="GPL-2 SIFT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-LANGS=" bg ca cs da de en_GB es fi fr hu it ja ko nl pl pt_BR ro ru sk sl sv uk zh_CN zh_TW"
-IUSE="lapack python sift $(echo ${LANGS//\ /\ linguas_})"
-
-CDEPEND="
- !!dev-util/cocom
- app-arch/zip
- dev-cpp/tclap
- >=dev-libs/boost-1.35.0-r5
- dev-libs/zthread
- >=media-gfx/enblend-4.0
- media-gfx/exiv2
- media-libs/freeglut
- >=media-libs/libpano13-2.9.18
- media-libs/libpng
- media-libs/openexr
- media-libs/tiff
- sys-libs/zlib
- virtual/jpeg
- x11-libs/wxGTK:2.8[X,opengl,-odbc]
- lapack? ( virtual/lapack )
- sift? ( media-gfx/autopano-sift-C )"
-RDEPEND="${CDEPEND}
- media-libs/exiftool"
-DEPEND="${CDEPEND}
- virtual/pkgconfig
- python? ( >=dev-lang/swig-2.0.4 )"
-
-S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)
-
-pkg_setup() {
- DOCS="authors.txt README TODO"
- mycmakeargs=(
- $(cmake-utils_use_enable lapack LAPACK)
- $(cmake-utils_use_build python HSI)
- )
-}
-
-src_install() {
- cmake-utils_src_install
-
- for lang in ${LANGS} ; do
- case ${lang} in
- ca) dir=ca_ES;;
- cs) dir=cs_CZ;;
- *) dir=${lang};;
- esac
- use linguas_${lang} || rm -r "${D}"/usr/share/locale/${dir}
- done
-}
diff --git a/media-gfx/hugin/hugin-2012.0.0.ebuild b/media-gfx/hugin/hugin-2012.0.0.ebuild
deleted file mode 100644
index d6f366f..0000000
--- a/media-gfx/hugin/hugin-2012.0.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2011.4.0-r1.ebuild,v 1.1 2012/06/30 21:36:05 dilfridge Exp $
-
-EAPI=3
-WX_GTK_VER="2.8"
-PYTHON_DEPEND="python? 2:2.6 3"
-
-inherit base python wxwidgets versionator cmake-utils
-
-DESCRIPTION="GUI for the creation & processing of panoramic images"
-HOMEPAGE="http://hugin.sf.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-LICENSE="GPL-2 SIFT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-LANGS=" bg ca cs da de en_GB es fi fr hu it ja ko nl pl pt_BR ro ru sk sl sv uk zh_CN zh_TW"
-IUSE="lapack python sift $(echo ${LANGS//\ /\ linguas_})"
-
-CDEPEND="
- !!dev-util/cocom
- app-arch/zip
- dev-cpp/tclap
- >=dev-libs/boost-1.49.0-r1
- dev-libs/zthread
- >=media-gfx/enblend-4.0
- media-gfx/exiv2
- media-libs/freeglut
- >=media-libs/libpano13-2.9.18
- media-libs/libpng
- media-libs/openexr
- media-libs/tiff
- sys-libs/zlib
- virtual/jpeg
- x11-libs/wxGTK:2.8[X,opengl,-odbc]
- lapack? ( virtual/lapack )
- sift? ( media-gfx/autopano-sift-C )"
-RDEPEND="${CDEPEND}
- media-libs/exiftool"
-DEPEND="${CDEPEND}
- virtual/pkgconfig
- python? ( >=dev-lang/swig-2.0.4 )"
-
-S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)
-
-pkg_setup() {
- DOCS="authors.txt README TODO"
- mycmakeargs=(
- $(cmake-utils_use_enable lapack LAPACK)
- $(cmake-utils_use_build python HSI)
- )
-}
-
-src_install() {
- cmake-utils_src_install
-
- for lang in ${LANGS} ; do
- case ${lang} in
- ca) dir=ca_ES;;
- cs) dir=cs_CZ;;
- *) dir=${lang};;
- esac
- use linguas_${lang} || rm -r "${D}"/usr/share/locale/${dir}
- done
-}
diff --git a/media-gfx/hugin/metadata.xml b/media-gfx/hugin/metadata.xml
deleted file mode 100644
index 1c5a459..0000000
--- a/media-gfx/hugin/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>graphics</herd>
- <longdescription>hugin is a panorama stitching program</longdescription>
- <use>
- <flag name='sift'>automatically align images with
- <pkg>media-gfx/autopano-sift</pkg> or
- <pkg>media-gfx/autopano-sift-C</pkg></flag>
- </use>
-</pkgmetadata>
^ permalink raw reply related [flat|nested] 9+ messages in thread* [gentoo-commits] dev/maekke:master commit in: media-gfx/hugin/files/, media-gfx/hugin/
@ 2012-07-26 20:17 Markus Meier
0 siblings, 0 replies; 9+ messages in thread
From: Markus Meier @ 2012-07-26 20:17 UTC (permalink / raw
To: gentoo-commits
commit: 07eaff1032bbf40d21df6397372938ea7af25977
Author: Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 25 20:41:27 2012 +0000
Commit: Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Wed Jul 25 20:41:27 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/maekke.git;a=commit;h=07eaff10
sync with main tree
---
media-gfx/hugin/ChangeLog | 22 +++++++++-
media-gfx/hugin/Manifest | 35 +++++++++++++---
.../hugin/files/hugin-2011.4.0-boost148.patch | 42 ++++++++++++++++++++
media-gfx/hugin/files/hugin-2011.4.0-gcc47.patch | 42 ++++++++++++++++++++
media-gfx/hugin/hugin-2011.0.0.ebuild | 6 +-
media-gfx/hugin/hugin-2011.2.0.ebuild | 6 +-
...011.4.0_rc1.ebuild => hugin-2011.4.0-r1.ebuild} | 14 ++++--
...2011.4.0_beta1.ebuild => hugin-2011.4.0.ebuild} | 6 +-
8 files changed, 150 insertions(+), 23 deletions(-)
diff --git a/media-gfx/hugin/ChangeLog b/media-gfx/hugin/ChangeLog
index 3ce0f62..f55752c 100644
--- a/media-gfx/hugin/ChangeLog
+++ b/media-gfx/hugin/ChangeLog
@@ -1,6 +1,24 @@
# ChangeLog for media-gfx/hugin
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/ChangeLog,v 1.119 2011/10/17 20:28:41 maekke Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/ChangeLog,v 1.122 2012/06/30 21:36:05 dilfridge Exp $
+
+*hugin-2011.4.0-r1 (30 Jun 2012)
+
+ 30 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+ +hugin-2011.4.0-r1.ebuild, +files/hugin-2011.4.0-boost148.patch,
+ +files/hugin-2011.4.0-gcc47.patch:
+ Add simple build fixes for gcc-4.7 and boost-1.48+ from upstream.
+ Unfortunately boost-1.48 has an ugly bug with gcc-4.7 itself (bug 424319)
+ which means we need boost-1.49.
+
+ 05 May 2012; Jeff Horelick <jdhore@gentoo.org> hugin-2011.0.0.ebuild,
+ hugin-2011.2.0.ebuild, hugin-2011.4.0.ebuild:
+ dev-util/pkgconfig -> virtual/pkgconfig
+
+*hugin-2011.4.0 (18 Dec 2011)
+
+ 18 Dec 2011; Markus Meier <maekke@gentoo.org> +hugin-2011.4.0.ebuild:
+ version bump
17 Oct 2011; Markus Meier <maekke@gentoo.org> -hugin-2010.2.0.ebuild:
old
diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index 817f671..ea6fa06 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -1,11 +1,32 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
AUX hugin-2011.0.0_rc1-libpng15.patch 11844 RMD160 6e922615911c816011ec7bb2cda8d2867a296d3b SHA1 e655023c0c7c2f96b3f5cd2d73bfa464276abd9e SHA256 48c05955b94a34bd5b96e560ebbeb0cdbce04f47fddde793f91c3a0bb37559a6
+AUX hugin-2011.4.0-boost148.patch 1887 RMD160 82ae6c91c1050999a91d81e77a283541c5b19bc4 SHA1 c45dd3cd686400341fb16072d1c60477fb7d67ec SHA256 1ca8641b8bc93c0391cb9596c2d977f8dd9e3345282dc26dad50b4d43820b87d
+AUX hugin-2011.4.0-gcc47.patch 1243 RMD160 b5511d5e6612c002a25659f8092e96fe3e2a5a12 SHA1 165a118045334343a5effe320a66b3a1ee63c32a SHA256 ff1e2f55eb94e22546c3185cde458f51a503f91158456043018f09518652b49f
DIST hugin-2011.0.0.tar.bz2 11439430 RMD160 1388980580ecba70a0d47597ddf06df9b85ab2b5 SHA1 22e1ad3846291a9bbe58570683e213921a6f0116 SHA256 866273f6218d300a52c0148960681faa2c4e05383d97f868a2eb47b457b5f4fc
DIST hugin-2011.2.0.tar.bz2 11506840 RMD160 6bd526c651adb986d7b2f21959c8c390727a9563 SHA1 79dfdac229b4e58f50c893c1238bdd0921ad9da6 SHA256 bd9ef8d2f62c6dbcbadc2b9208cdcf6e4b6512760335c726b697bffd5e89b5be
-DIST hugin-2011.4beta1.tar.bz2 11725685 RMD160 c6af43d1d704fe5b7b1179768d89f1fca96c43ba SHA1 89f6ea1f10fae589357bb51581008d7e8e66ed82 SHA256 b020a9156b4126e87b3b92e14c8013423fd301a682ff38a005fe05beb2d60392
-DIST hugin-2011.4rc1.tar.bz2 11740410 RMD160 2c274a742a41a37892cd8ff897dfba3ebc68aecc SHA1 21ec7331d5e196aca2a8771d3c9101dd181ad93b SHA256 2e4b8eabdb243b24b2dd4a6af82a1a2a7451e2e749f84349f8cdfd8e9fa4ddae
-EBUILD hugin-2011.0.0.ebuild 1507 RMD160 13b606f5056afe2929a5402d2348230e11821f79 SHA1 aafd1a381c4c401c206d81873ae833ffd50e95e5 SHA256 dc53a08d61737945e510ab7b8acec63ded870918c8b586859d11f345477911c4
-EBUILD hugin-2011.2.0.ebuild 1613 RMD160 655a418370413aed003aa4d7ff9933cd0d4b8f1c SHA1 d235abdf58a4ba3723ba4ce5ac009a1b84c61b7b SHA256 e03859cbe9f73a1321392237d026d834a70d2dbfbdaa272bb8520d7650bf479c
-EBUILD hugin-2011.4.0_beta1.ebuild 1619 RMD160 06b34358b45f97cafa53423f58f604d45984239e SHA1 e56673a67662e638d9911ec6d6e1a1c286eb16eb SHA256 cf04ad3416b3c1a5d2891d69845cee01ef71640f94e25e90f9b0393db3369dc1
-EBUILD hugin-2011.4.0_rc1.ebuild 1619 RMD160 06b34358b45f97cafa53423f58f604d45984239e SHA1 e56673a67662e638d9911ec6d6e1a1c286eb16eb SHA256 cf04ad3416b3c1a5d2891d69845cee01ef71640f94e25e90f9b0393db3369dc1
-MISC ChangeLog 19131 RMD160 b874257ac283100c4472ad12f8889c355194797a SHA1 86b0e6b9380f89727af5d6b9330bc2e76875af2d SHA256 4f2b40fff7fa01a57b4aea9065a63ff742c570e0e7a02d03b2526b3064b1dc6b
+DIST hugin-2011.4.0.tar.bz2 11740410 RMD160 2c274a742a41a37892cd8ff897dfba3ebc68aecc SHA1 21ec7331d5e196aca2a8771d3c9101dd181ad93b SHA256 2e4b8eabdb243b24b2dd4a6af82a1a2a7451e2e749f84349f8cdfd8e9fa4ddae
+EBUILD hugin-2011.0.0.ebuild 1502 RMD160 114c2045373d2308cc49bd7364e99ccdfe5c6a03 SHA1 7a27c65bfcafefb8b3c840691565018c20c7e00b SHA256 c1fd7cc171286391d5153296294a7080d8ef39d8fe811d06f7d19212179730bf
+EBUILD hugin-2011.2.0.ebuild 1612 RMD160 4863168607e3ba62bee3577215d1e3f4d6006cd2 SHA1 45a7ff5079582dc8b7f67cd2b2d5dce32c651af5 SHA256 96753f2d1bb6f7922ffe8b53375e1b45e2f77042ea2619470e566a955b308774
+EBUILD hugin-2011.4.0-r1.ebuild 1685 RMD160 f36a8531f941378dde9da379516727bf70e00cda SHA1 749e9fc954951a9827838e72ada414aee081d618 SHA256 dd0e62f72a98f51382729f574f2b82d398f8b06e784d9fc75b95820d63a52c11
+EBUILD hugin-2011.4.0.ebuild 1618 RMD160 c5371216ed22194fc064d0b9e352ad1a2501ef62 SHA1 8005387facefaddd9897d728b356a7943380ed44 SHA256 ca4b46f9a14fcbbc484930dcea4ee99e918654a206e8d395d4828b40fc7b53e8
+MISC ChangeLog 19790 RMD160 58f3bbb5ed5eb3cfaacf2f92bd2cce72ec8942fc SHA1 fc722b50b0284910dd9d3a08e668c1e10de12266 SHA256 e30347759975383295692d30b111d5486c69d557c0bcbaf5cfc5e6963d5f48a3
MISC metadata.xml 389 RMD160 245f5d872a463181d63366d6c76a82c87d020fd7 SHA1 a26b77c69d62bedb9789e79b5ca35f28fa56981d SHA256 6f26cd9c2b64a96c1c86a8a468a261af4cf4dfaa86b4d7ddcfaee1ca98314803
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCgAGBQJP73GdAAoJENwGBM22xffeSAUP/1YrYMhhDM+AG0q7a+OrCfDU
+Xlp3Max6Rw/oSgCJ4jlyCSt8PutFZz4nALocMeEOPLDEpjmyKlMSMHPuSqnprdPm
+DJubJe5FmZE9VQvOsLRRLAVHIbRvQhLhWK6Hf9MLYNwhQdZ+uUEYfkexuD27V/V9
+6DFV4RaLfomzICCfmMh09mt7xLypI0MeC7cbHxnxqW8WukVor2P30r6ZCVkTlX9x
+ybofqJWys2KHmHVBErRWtg6+rAs6Ke3BAWcu/8dme7S0xOgNNYkdh1Njp1BJqmro
+arEOCgKXYV51tdlRie+Pw8yNRyJi6Ycc9kLv+weimkE7CHGgYbRZYxK+NuDov4Mx
+k9uSc6JnbEKL2uHaYeOIV45TP9YisjPmbGysBYDxMguMO3xw3B6w34IavA80BBMl
++bFKcm0+o9COuIHgWn1aQdGQ/homKPtxeRQbJLKCOJ7icvkTbEhd344YSXUqxrd4
+ahapgjldS9xtmVU22oN/Mj+q+3Bt/sCzWkTsHOLzR8sKd1TIHHt3kUP2XhKJkHVK
+5huzHekfXh8NgkAU8hf2KBcWZYmTD2I+wQCME8PwWz/1GgEKe7IhyAerabjeJdnu
+dGtilQK3/CTljUd++u8PEUAjK8me8Bk0W8RhyDD5BkHwcKQF2WN27Fu1NYeg9VRc
+6NkN4TaHp6kWHxRtk0ch
+=HxSG
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/hugin/files/hugin-2011.4.0-boost148.patch b/media-gfx/hugin/files/hugin-2011.4.0-boost148.patch
new file mode 100644
index 0000000..3c19cc7
--- /dev/null
+++ b/media-gfx/hugin/files/hugin-2011.4.0-boost148.patch
@@ -0,0 +1,42 @@
+
+# HG changeset patch
+# User tmodes
+# Date 1324625694 -3600
+# Node ID 7f0674a26bdb85fbcc73f64c8a38d1b353910af7
+# Parent b873e1da31f0fdc4cf19f9630450d1735a040fbe
+Add namespace to compile with Boost 1.48
+
+diff -r b873e1da31f0 -r 7f0674a26bdb src/hugin_base/algorithms/optimizer/ImageGraph.cpp
+--- a/src/hugin_base/algorithms/optimizer/ImageGraph.cpp Fri Dec 23 08:34:18 2011 +0100
++++ b/src/hugin_base/algorithms/optimizer/ImageGraph.cpp Fri Dec 23 08:34:54 2011 +0100
+@@ -55,7 +55,7 @@
+
+ CPGraphIndexMap index = get(boost::vertex_index, graph);
+ bool found=false;
+- for (tie(ai, ai_end) = adjacent_vertices(it->image1Nr, graph);
++ for (boost::tuples::tie(ai, ai_end) = adjacent_vertices(it->image1Nr, graph);
+ ai != ai_end; ++ai)
+ {
+ if (index[*ai] == it->image2Nr) found = true;
+@@ -83,7 +83,7 @@
+
+ CPGraphIndexMap index = get(boost::vertex_index, graph);
+ bool found=false;
+- for (tie(ai, ai_end) = adjacent_vertices(i, graph);
++ for (boost::tuples::tie(ai, ai_end) = adjacent_vertices(i, graph);
+ ai != ai_end; ++ai)
+ {
+ if (index[*ai] == j) found = true;
+diff -r b873e1da31f0 -r 7f0674a26bdb src/hugin_base/algorithms/optimizer/PTOptimizer.h
+--- a/src/hugin_base/algorithms/optimizer/PTOptimizer.h Fri Dec 23 08:34:18 2011 +0100
++++ b/src/hugin_base/algorithms/optimizer/PTOptimizer.h Fri Dec 23 08:34:54 2011 +0100
+@@ -233,7 +233,7 @@
+ // collect all optimized neighbours
+ typename boost::graph_traits<CPGraph>::adjacency_iterator ai;
+ typename boost::graph_traits<CPGraph>::adjacency_iterator ai_end;
+- for (tie(ai, ai_end) = adjacent_vertices(v, g);
++ for (boost::tuples::tie(ai, ai_end) = adjacent_vertices(v, g);
+ ai != ai_end; ++ai)
+ {
+ if (*ai != v) {
+
diff --git a/media-gfx/hugin/files/hugin-2011.4.0-gcc47.patch b/media-gfx/hugin/files/hugin-2011.4.0-gcc47.patch
new file mode 100644
index 0000000..9615ae4
--- /dev/null
+++ b/media-gfx/hugin/files/hugin-2011.4.0-gcc47.patch
@@ -0,0 +1,42 @@
+
+# HG changeset patch
+# User Bruno Postle <bruno@postle.net>
+# Date 1328910737 0
+# Node ID c7ecd541dbd78bfa95dd495c7c4317bba81f4c3b
+# Parent 658ded2153f2773a7e193f48d612d95104495080
+Fixes for gcc-4.7.0
+
+diff -r 658ded2153f2 -r c7ecd541dbd7 src/celeste/Utilities.h
+--- a/src/celeste/Utilities.h Sun Jan 01 13:23:39 2012 +0100
++++ b/src/celeste/Utilities.h Fri Feb 10 21:52:17 2012 +0000
+@@ -33,6 +33,8 @@
+ #include <stdio.h>
+ #ifdef _WINDOWS
+ #include "direct.h"
++#else
++#include <unistd.h>
+ #endif
+
+ using namespace std;
+diff -r 658ded2153f2 -r c7ecd541dbd7 src/foreign/zthread/include/zthread/Guard.h
+--- a/src/foreign/zthread/include/zthread/Guard.h Sun Jan 01 13:23:39 2012 +0100
++++ b/src/foreign/zthread/include/zthread/Guard.h Fri Feb 10 21:52:17 2012 +0000
+@@ -428,7 +428,7 @@
+ template <class U, class V>
+ Guard(Guard<U, V>& g) : LockHolder<LockType>(g) {
+
+- LockingPolicy::shareScope(*this, extract(g));
++ LockingPolicy::shareScope(*this, this->extract(g));
+
+ }
+
+@@ -458,7 +458,7 @@
+ template <class U, class V>
+ Guard(Guard<U, V>& g, LockType& lock) : LockHolder<LockType>(lock) {
+
+- LockingPolicy::transferScope(*this, extract(g));
++ LockingPolicy::transferScope(*this, this->extract(g));
+
+ }
+
+
diff --git a/media-gfx/hugin/hugin-2011.0.0.ebuild b/media-gfx/hugin/hugin-2011.0.0.ebuild
index f609973..4162ccf 100644
--- a/media-gfx/hugin/hugin-2011.0.0.ebuild
+++ b/media-gfx/hugin/hugin-2011.0.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2011.0.0.ebuild,v 1.5 2011/10/17 19:00:41 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2011.0.0.ebuild,v 1.6 2012/05/05 07:00:18 jdhore Exp $
EAPI=4
WX_GTK_VER="2.8"
@@ -36,7 +36,7 @@ CDEPEND="
RDEPEND="${CDEPEND}
media-libs/exiftool"
DEPEND="${CDEPEND}
- dev-util/pkgconfig"
+ virtual/pkgconfig"
S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)
diff --git a/media-gfx/hugin/hugin-2011.2.0.ebuild b/media-gfx/hugin/hugin-2011.2.0.ebuild
index b20134d..b95d6d4 100644
--- a/media-gfx/hugin/hugin-2011.2.0.ebuild
+++ b/media-gfx/hugin/hugin-2011.2.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2011.2.0.ebuild,v 1.1 2011/10/02 21:33:47 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2011.2.0.ebuild,v 1.2 2012/05/05 07:00:18 jdhore Exp $
EAPI=3
WX_GTK_VER="2.8"
@@ -39,7 +39,7 @@ CDEPEND="
RDEPEND="${CDEPEND}
media-libs/exiftool"
DEPEND="${CDEPEND}
- dev-util/pkgconfig
+ virtual/pkgconfig
python? ( >=dev-lang/swig-2.0.4 )"
S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)
diff --git a/media-gfx/hugin/hugin-2011.4.0_rc1.ebuild b/media-gfx/hugin/hugin-2011.4.0-r1.ebuild
similarity index 81%
rename from media-gfx/hugin/hugin-2011.4.0_rc1.ebuild
rename to media-gfx/hugin/hugin-2011.4.0-r1.ebuild
index bfcc4c3..4ba8629 100644
--- a/media-gfx/hugin/hugin-2011.4.0_rc1.ebuild
+++ b/media-gfx/hugin/hugin-2011.4.0-r1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2011.2.0.ebuild,v 1.1 2011/10/02 21:33:47 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2011.4.0-r1.ebuild,v 1.1 2012/06/30 21:36:05 dilfridge Exp $
EAPI=3
WX_GTK_VER="2.8"
PYTHON_DEPEND="python? 2:2.6 3"
-inherit python wxwidgets versionator cmake-utils
+inherit base python wxwidgets versionator cmake-utils
DESCRIPTION="GUI for the creation & processing of panoramic images"
HOMEPAGE="http://hugin.sf.net"
@@ -22,7 +22,7 @@ CDEPEND="
!!dev-util/cocom
app-arch/zip
dev-cpp/tclap
- >=dev-libs/boost-1.35.0-r5
+ >=dev-libs/boost-1.49.0-r1
dev-libs/zthread
>=media-gfx/enblend-4.0
media-gfx/exiv2
@@ -39,11 +39,15 @@ CDEPEND="
RDEPEND="${CDEPEND}
media-libs/exiftool"
DEPEND="${CDEPEND}
- dev-util/pkgconfig
+ virtual/pkgconfig
python? ( >=dev-lang/swig-2.0.4 )"
S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)
+PATCHES=(
+ "${FILESDIR}/${P}"-{boost148,gcc47}.patch
+)
+
pkg_setup() {
DOCS="authors.txt README TODO"
mycmakeargs=(
diff --git a/media-gfx/hugin/hugin-2011.4.0_beta1.ebuild b/media-gfx/hugin/hugin-2011.4.0.ebuild
similarity index 89%
rename from media-gfx/hugin/hugin-2011.4.0_beta1.ebuild
rename to media-gfx/hugin/hugin-2011.4.0.ebuild
index bfcc4c3..aa5f29e 100644
--- a/media-gfx/hugin/hugin-2011.4.0_beta1.ebuild
+++ b/media-gfx/hugin/hugin-2011.4.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2011.2.0.ebuild,v 1.1 2011/10/02 21:33:47 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2011.4.0.ebuild,v 1.2 2012/05/05 07:00:18 jdhore Exp $
EAPI=3
WX_GTK_VER="2.8"
@@ -39,7 +39,7 @@ CDEPEND="
RDEPEND="${CDEPEND}
media-libs/exiftool"
DEPEND="${CDEPEND}
- dev-util/pkgconfig
+ virtual/pkgconfig
python? ( >=dev-lang/swig-2.0.4 )"
S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)
^ permalink raw reply related [flat|nested] 9+ messages in thread* [gentoo-commits] dev/maekke:master commit in: media-gfx/hugin/files/, media-gfx/hugin/
@ 2011-11-05 10:21 Markus Meier
0 siblings, 0 replies; 9+ messages in thread
From: Markus Meier @ 2011-11-05 10:21 UTC (permalink / raw
To: gentoo-commits
commit: 9802e89817c66e60b35ab70ba22745d96de72c25
Author: Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 5 10:22:16 2011 +0000
Commit: Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Sat Nov 5 10:22:16 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/maekke.git;a=commit;h=9802e898
bump to 2011.4.0_beta1
---
media-gfx/hugin/ChangeLog | 546 ++++++++++++++++++++
media-gfx/hugin/Manifest | 9 +
.../hugin/files/hugin-2011.0.0_rc1-libpng15.patch | 275 ++++++++++
media-gfx/hugin/hugin-2011.0.0.ebuild | 61 +++
media-gfx/hugin/hugin-2011.2.0.ebuild | 66 +++
media-gfx/hugin/hugin-2011.4.0_beta1.ebuild | 66 +++
media-gfx/hugin/metadata.xml | 11 +
7 files changed, 1034 insertions(+), 0 deletions(-)
diff --git a/media-gfx/hugin/ChangeLog b/media-gfx/hugin/ChangeLog
new file mode 100644
index 0000000..3ce0f62
--- /dev/null
+++ b/media-gfx/hugin/ChangeLog
@@ -0,0 +1,546 @@
+# ChangeLog for media-gfx/hugin
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/ChangeLog,v 1.119 2011/10/17 20:28:41 maekke Exp $
+
+ 17 Oct 2011; Markus Meier <maekke@gentoo.org> -hugin-2010.2.0.ebuild:
+ old
+
+ 17 Oct 2011; Kacper Kowalik <xarthisius@gentoo.org> hugin-2011.0.0.ebuild:
+ ppc stable wrt #379089
+
+*hugin-2011.2.0 (02 Oct 2011)
+
+ 02 Oct 2011; Markus Meier <maekke@gentoo.org> -hugin-2010.0.0.ebuild,
+ -files/hugin-2010.0.0_rc1-libpng14.patch, -hugin-2010.4.0.ebuild,
+ +hugin-2011.2.0.ebuild:
+ version bump, remove old
+
+ 15 Sep 2011; Andreas Schuerch <nativemad@gentoo.org> hugin-2011.0.0.ebuild:
+ x86 stable, Thanks JD, bug 379089
+
+ 18 Aug 2011; Tony Vroon <chainsaw@gentoo.org> hugin-2011.0.0.ebuild:
+ Marked stable based on arch testing by Agostino "ago" Sarubbo in bug #379089.
+
+ 05 Jul 2011; Markus Meier <maekke@gentoo.org> hugin-2010.0.0.ebuild,
+ hugin-2010.2.0.ebuild, hugin-2010.4.0.ebuild, hugin-2011.0.0.ebuild:
+ inherit cmake-utils last by Andrej Lajovic, bug #373683
+
+ 24 Jun 2011; Brent Baude <ranger@gentoo.org> hugin-2010.2.0.ebuild:
+ Marking hugin-2010.2.0 ppc for bug 347633
+
+*hugin-2011.0.0 (29 May 2011)
+
+ 29 May 2011; Markus Meier <maekke@gentoo.org> -hugin-2011.0.0_rc1.ebuild,
+ +hugin-2011.0.0.ebuild:
+ version bump
+
+ 20 May 2011; Markus Meier <maekke@gentoo.org> hugin-2011.0.0_rc1.ebuild:
+ add ro to LANGS, update enblend version
+
+ 18 May 2011; Tim Harder <radhermit@gentoo.org> hugin-2011.0.0_rc1.ebuild:
+ Bump libpano13 dependency (bug #367917 by Daniel Neugebauer).
+
+*hugin-2011.0.0_rc1 (18 May 2011)
+
+ 18 May 2011; Tim Harder <radhermit@gentoo.org> +hugin-2011.0.0_rc1.ebuild,
+ +files/hugin-2011.0.0_rc1-libpng15.patch:
+ Version bump to release candidate. Remove old post install message, bump to
+ EAPI 4, apply patch for libpng-1.5 (bug #355885).
+
+ 13 Feb 2011; Tim Harder <radhermit@gentoo.org> hugin-2010.0.0.ebuild,
+ hugin-2010.2.0.ebuild, hugin-2010.4.0.ebuild:
+ Depend on wxGTK with the X USE flag enabled (bug #354223 by Grygoriy
+ Fuchedzhy).
+
+*hugin-2010.4.0 (01 Jan 2011)
+
+ 01 Jan 2011; Markus Meier <maekke@gentoo.org> -hugin-2010.4.0_beta1.ebuild,
+ -hugin-2010.4.0_beta2.ebuild, -hugin-2010.4.0_rc1.ebuild,
+ -hugin-2010.4.0_rc3.ebuild, +hugin-2010.4.0.ebuild:
+ version bump to 2010.4.0 final, remove beta/rc releases
+
+*hugin-2010.4.0_rc3 (28 Dec 2010)
+
+ 28 Dec 2010; Markus Meier <maekke@gentoo.org> +hugin-2010.4.0_rc3.ebuild:
+ version bump
+
+*hugin-2010.4.0_rc1 (25 Dec 2010)
+
+ 25 Dec 2010; Markus Meier <maekke@gentoo.org> +hugin-2010.4.0_rc1.ebuild:
+ version bump
+
+ 05 Dec 2010; Markos Chandras <hwoarang@gentoo.org> hugin-2010.2.0.ebuild:
+ Stable on amd64 wrt bug #347633
+
+ 05 Dec 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+ hugin-2010.2.0.ebuild:
+ x86 stable wrt bug #347633
+
+*hugin-2010.4.0_beta2 (04 Dec 2010)
+
+ 04 Dec 2010; Markus Meier <maekke@gentoo.org> +hugin-2010.4.0_beta2.ebuild:
+ version bump
+
+*hugin-2010.4.0_beta1 (27 Nov 2010)
+
+ 27 Nov 2010; Markus Meier <maekke@gentoo.org> +hugin-2010.4.0_beta1.ebuild:
+ version bump to 2010.4 beta1
+
+ 08 Nov 2010; Markus Meier <maekke@gentoo.org> hugin-2010.0.0.ebuild,
+ hugin-2010.2.0.ebuild:
+ change jpeg dep to virtual/jpeg
+
+*hugin-2010.2.0 (13 Oct 2010)
+
+ 13 Oct 2010; Markus Meier <maekke@gentoo.org>
+ -hugin-2010.2.0_beta1.ebuild, -hugin-2010.2.0_beta2.ebuild,
+ -hugin-2010.2.0_rc1.ebuild, -hugin-2010.2.0_rc2.ebuild,
+ +hugin-2010.2.0.ebuild:
+ version bump, remove prereleases
+
+*hugin-2010.2.0_rc2 (30 Sep 2010)
+
+ 30 Sep 2010; Markus Meier <maekke@gentoo.org> +hugin-2010.2.0_rc2.ebuild:
+ version bump
+
+*hugin-2010.2.0_rc1 (21 Sep 2010)
+
+ 21 Sep 2010; Markus Meier <maekke@gentoo.org> +hugin-2010.2.0_rc1.ebuild:
+ version bump
+
+ 16 Sep 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+ hugin-2010.0.0.ebuild, hugin-2010.2.0_beta1.ebuild,
+ hugin-2010.2.0_beta2.ebuild:
+ virtual/glut -> media-libs/glut
+
+*hugin-2010.2.0_beta2 (05 Sep 2010)
+
+ 05 Sep 2010; Markus Meier <maekke@gentoo.org>
+ +hugin-2010.2.0_beta2.ebuild:
+ version bump
+
+*hugin-2010.2.0_beta1 (18 Jul 2010)
+
+ 18 Jul 2010; Markus Meier <maekke@gentoo.org>
+ +hugin-2010.2.0_beta1.ebuild:
+ version bump
+
+ 27 May 2010; Markus Meier <maekke@gentoo.org> -hugin-2009.2.0.ebuild,
+ -hugin-2009.4.0.ebuild:
+ old
+
+ 25 May 2010; Pacho Ramos <pacho@gentoo.org> hugin-2010.0.0.ebuild:
+ stable amd64, bug 320411
+
+ 24 May 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+ hugin-2010.0.0.ebuild:
+ x86 stable wrt bug #320411
+
+ 24 May 2010; <nixnut@gentoo.org> hugin-2010.0.0.ebuild:
+ ppc stable #320411
+
+ 28 Mar 2010; Markus Meier <maekke@gentoo.org> hugin-2010.0.0.ebuild:
+ add pkgconfig to DEPEND by Nikoli in bug #311693
+
+*hugin-2010.0.0 (26 Mar 2010)
+
+ 26 Mar 2010; Markus Meier <maekke@gentoo.org> -hugin-2010.0.0_rc1.ebuild,
+ +hugin-2010.0.0.ebuild:
+ bump to final 2010.0.0 release, remove rc version
+
+ 10 Mar 2010; Samuli Suominen <ssuominen@gentoo.org>
+ hugin-2010.0.0_rc1.ebuild, +files/hugin-2010.0.0_rc1-libpng14.patch:
+ Fix building with libpng14.
+
+*hugin-2010.0.0_rc1 (07 Mar 2010)
+
+ 07 Mar 2010; Markus Meier <maekke@gentoo.org> +hugin-2010.0.0_rc1.ebuild:
+ version bump to 2010.0.0_rc1
+
+ 17 Feb 2010; Markus Meier <maekke@gentoo.org> hugin-2009.4.0.ebuild:
+ add virtual/glut to dependencies by Seerp in bug #305049
+
+ 09 Jan 2010; Markus Meier <maekke@gentoo.org>
+ -files/hugin-0.7.0-gcc44.patch, -files/hugin-0.7.0_rc2-as-needed.patch,
+ -hugin-0.8.0.ebuild, -files/hugin-0.8.0_rc3-as-needed.patch,
+ -files/hugin-0.8.0_rc4-use_system_cmake_findboost.patch:
+ old
+
+ 07 Jan 2010; Brent Baude <ranger@gentoo.org> hugin-2009.2.0.ebuild:
+ Marking hugin-2009.2.0 ppc for bug 294316
+
+ 20 Dec 2009; Olivier Crête <tester@gentoo.org> hugin-2009.2.0.ebuild:
+ Stable on amd64, bug #294316
+
+ 16 Dec 2009; Christian Faulhammer <fauli@gentoo.org>
+ hugin-2009.2.0.ebuild:
+ stable x86, bug 294316
+
+*hugin-2009.4.0 (16 Dec 2009)
+
+ 16 Dec 2009; Markus Meier <maekke@gentoo.org> -hugin-2009.4.0_rc1.ebuild,
+ -hugin-2009.4.0_rc2.ebuild, -hugin-2009.4.0_rc3.ebuild,
+ +hugin-2009.4.0.ebuild:
+ version bump to 2009.4.0 final release
+
+*hugin-2009.4.0_rc3 (02 Dec 2009)
+
+ 02 Dec 2009; Markus Meier <maekke@gentoo.org> +hugin-2009.4.0_rc3.ebuild:
+ version bump
+
+ 25 Oct 2009; Markus Meier <maekke@gentoo.org> -hugin-0.7.0.ebuild:
+ old
+
+ 25 Oct 2009; Markus Meier <maekke@gentoo.org> hugin-0.8.0.ebuild:
+ amd64/x86 stable, bug #284686
+
+ 24 Oct 2009; nixnut <nixnut@gentoo.org> hugin-0.8.0.ebuild:
+ ppc stable #284686
+
+*hugin-2009.4.0_rc2 (19 Oct 2009)
+
+ 19 Oct 2009; Markus Meier <maekke@gentoo.org> +hugin-2009.4.0_rc2.ebuild:
+ bump
+
+*hugin-2009.4.0_rc1 (11 Oct 2009)
+
+ 11 Oct 2009; Markus Meier <maekke@gentoo.org> +hugin-2009.4.0_rc1.ebuild:
+ version bump
+
+*hugin-2009.2.0 (30 Sep 2009)
+
+ 30 Sep 2009; Markus Meier <maekke@gentoo.org>
+ -hugin-2009.2.0_beta3.ebuild, +hugin-2009.2.0.ebuild,
+ -files/hugin-2009.2.0_beta3-asneeded.patch:
+ version bump to final 2009.02.0 release
+
+ 29 Sep 2009; Markus Meier <maekke@gentoo.org> hugin-0.7.0.ebuild,
+ hugin-0.8.0.ebuild, hugin-2009.2.0_beta3.ebuild:
+ block dev-util/cocom due to a file collision wrt bug #280241
+
+*hugin-2009.2.0_beta3 (13 Sep 2009)
+
+ 13 Sep 2009; Markus Meier <maekke@gentoo.org> hugin-0.7.0.ebuild,
+ -hugin-0.7.0-r1.ebuild, +hugin-2009.2.0_beta3.ebuild,
+ +files/hugin-2009.2.0_beta3-asneeded.patch:
+ version bump, EAPI=2 for stable ebuild, remove old
+
+ 01 Aug 2009; Markus Meier <maekke@gentoo.org> hugin-0.8.0.ebuild:
+ tweak x11-libs/wxGTK dep for bug #279653 and bug #269689
+
+*hugin-0.8.0 (26 Jul 2009)
+
+ 26 Jul 2009; Markus Meier <maekke@gentoo.org> -hugin-0.8.0_beta1.ebuild,
+ -hugin-0.8.0_beta2.ebuild, -hugin-0.8.0_beta3.ebuild,
+ -hugin-0.8.0_beta4.ebuild, -hugin-0.8.0_rc1.ebuild,
+ -hugin-0.8.0_rc3.ebuild, -hugin-0.8.0_rc4.ebuild, -hugin-0.8.0_rc5.ebuild,
+ +hugin-0.8.0.ebuild, -files/hugin-0.8.0_beta1-as-needed.patch,
+ -files/hugin-0.8.0_rc3-unset_lapack.patch:
+ bump to 0.8.0 final release
+
+*hugin-0.8.0_rc5 (09 Jul 2009)
+
+ 09 Jul 2009; Markus Meier <maekke@gentoo.org> +hugin-0.8.0_rc5.ebuild:
+ version bump (this will likely be the last rc)
+
+ 28 Jun 2009; Tiziano Müller <dev-zero@gentoo.org> hugin-0.8.0_rc4.ebuild,
+ +files/hugin-0.8.0_rc4-use_system_cmake_findboost.patch:
+ Added patch to make it build with recent boost versions. Removed now
+ unnecessary patch from stack. Added missing exiftool dependency.
+
+*hugin-0.8.0_rc4 (27 Jun 2009)
+
+ 27 Jun 2009; Markus Meier <maekke@gentoo.org> +hugin-0.8.0_rc4.ebuild:
+ version bump
+
+ 19 Jun 2009; Tiziano Müller <dev-zero@gentoo.org> hugin-0.8.0_rc3.ebuild,
+ +files/hugin-0.8.0_rc3-unset_lapack.patch:
+ Added patch to unset LAPACK_LIBRARIES if lapack is not found, otherwise
+ cmake sets it to NOTFOUND leading to an error.
+
+*hugin-0.8.0_rc3 (10 Jun 2009)
+
+ 10 Jun 2009; Markus Meier <maekke@gentoo.org> +hugin-0.8.0_rc3.ebuild,
+ +files/hugin-0.8.0_rc3-as-needed.patch:
+ version bump to 0.8.0_rc3, with (experimental) lapack support
+
+ 24 May 2009; Markus Meier <maekke@gentoo.org> hugin-0.7.0.ebuild,
+ hugin-0.7.0-r1.ebuild, +files/hugin-0.7.0-gcc44.patch:
+ fix building with gcc-4.4 by David Watzke, bug #270593
+
+*hugin-0.8.0_rc1 (07 May 2009)
+
+ 07 May 2009; Markus Meier <maekke@gentoo.org> +hugin-0.8.0_rc1.ebuild:
+ version bump
+
+*hugin-0.8.0_beta4 (01 May 2009)
+
+ 01 May 2009; Markus Meier <maekke@gentoo.org> +hugin-0.8.0_beta4.ebuild:
+ version bump
+
+*hugin-0.8.0_beta3 (04 Apr 2009)
+
+ 04 Apr 2009; Markus Meier <maekke@gentoo.org> +hugin-0.8.0_beta3.ebuild:
+ version bump to 0.8.0_beta3
+
+ 19 Mar 2009; Markus Meier <maekke@gentoo.org> hugin-0.7.0.ebuild,
+ hugin-0.7.0-r1.ebuild:
+ assign RDEPEND
+
+ 19 Mar 2009; Markus Meier <maekke@gentoo.org>
+ -files/hugin-0.6.1-1_0.6.1-1.1.patch, -files/hugin-0.6.1-as-needed.patch,
+ -files/hugin-0.6.1-gcc43.patch, -hugin-0.6.1-r2.ebuild:
+ old
+
+ 18 Mar 2009; Joseph Jezak <josejx@gentoo.org> hugin-0.7.0.ebuild:
+ Marked ppc stable for bug #246827.
+
+ 11 Mar 2009; Markus Meier <maekke@gentoo.org> hugin-0.8.0_beta2.ebuild:
+ add en_GB language, fix IUSE assignement and raise libpano13 dep
+
+*hugin-0.8.0_beta2 (09 Mar 2009)
+
+ 09 Mar 2009; Markus Meier <maekke@gentoo.org> +hugin-0.8.0_beta2.ebuild:
+ bump to hugin-0.8.0_beta2
+
+*hugin-0.8.0_beta1 (25 Feb 2009)
+
+ 25 Feb 2009; Markus Meier <maekke@gentoo.org>
+ +files/hugin-0.8.0_beta1-as-needed.patch, +hugin-0.8.0_beta1.ebuild:
+ bump to hugin-0.8.0_beta1
+
+ 02 Dec 2008; <chainsaw@gentoo.org> hugin-0.7.0.ebuild,
+ hugin-0.7.0-r1.ebuild:
+ Add ~ppc keyword based on PowerBook6,7 testing by Christian "papillon81"
+ Schmitt <chrschmitt@gmail.com>. Closes bug #234909.
+
+ 28 Nov 2008; Markus Meier <maekke@gentoo.org>
+ -files/hugin-0.7_beta4-insec-file.patch,
+ -files/hugin-0.7_beta4-as-needed.patch, -hugin-0.7_beta4-r1.ebuild,
+ hugin-0.7.0.ebuild, hugin-0.7.0-r1.ebuild:
+ add missing media-gfx/exiv2 dependency for bug #248628; remove old
+
+ 26 Nov 2008; Ryan Hill <dirtyepic@gentoo.org> hugin-0.7.0.ebuild:
+ Call wxwidgets_pkg_setup.
+
+ 22 Nov 2008; Markus Meier <maekke@gentoo.org> hugin-0.7.0.ebuild:
+ amd64/x86 stable, bug #246827
+
+ 08 Oct 2008; Markus Meier <maekke@gentoo.org> hugin-0.6.1-r2.ebuild:
+ add missing x11-libs/gtk+ dep, bug #239698
+
+ 06 Oct 2008; Markus Meier <maekke@gentoo.org> hugin-0.7.0-r1.ebuild:
+ fix broken dep on dev-libs/boost, thanks to voyageur and Betelgeuse
+
+*hugin-0.7.0-r1 (06 Oct 2008)
+*hugin-0.7.0 (06 Oct 2008)
+
+ 06 Oct 2008; Markus Meier <maekke@gentoo.org> -hugin-0.7.0_rc2.ebuild,
+ -hugin-0.7.0_rc3.ebuild, -hugin-0.7.0_rc4.ebuild, -hugin-0.7.0_rc5.ebuild,
+ -hugin-0.7.0_rc6.ebuild, +hugin-0.7.0.ebuild, +hugin-0.7.0-r1.ebuild:
+ bump to 0.7.0 final release (-r1 is an EAPI=2 version of the ebuild, -r0
+ is a stable candidate), remove old
+
+*hugin-0.7.0_rc6 (15 Sep 2008)
+
+ 15 Sep 2008; Markus Meier <maekke@gentoo.org> +hugin-0.7.0_rc6.ebuild:
+ bump to 0.7.0_rc6
+
+*hugin-0.7.0_rc5 (15 Sep 2008)
+
+ 15 Sep 2008; Markus Meier <maekke@gentoo.org> +hugin-0.7.0_rc5.ebuild:
+ bump to 0.7.0_rc5
+
+*hugin-0.7.0_rc4 (02 Sep 2008)
+
+ 02 Sep 2008; Markus Meier <maekke@gentoo.org> +hugin-0.7.0_rc4.ebuild:
+ bump to 0.7.0_rc4
+
+*hugin-0.7.0_rc3 (28 Aug 2008)
+
+ 28 Aug 2008; Markus Meier <maekke@gentoo.org> +hugin-0.7.0_rc3.ebuild:
+ bump to 0.7.0_rc3
+
+ 18 Aug 2008; Markus Meier <maekke@gentoo.org>
+ +files/hugin-0.7.0_rc2-as-needed.patch, hugin-0.7.0_rc2.ebuild:
+ fix building with --as-needed, bug #235004
+
+*hugin-0.7.0_rc2 (16 Aug 2008)
+
+ 16 Aug 2008; Markus Meier <maekke@gentoo.org> metadata.xml,
+ +hugin-0.7.0_rc2.ebuild:
+ bump to hugin-0.7.0_rc2; describe local use flags in metadata.xml
+
+ 10 May 2008; Mike Frysinger <vapier@gentoo.org> hugin-0.7_beta4-r1.ebuild:
+ Also apply gcc-4.3 patch to hugin-0.7_beta4-r1.
+
+ 02 May 2008; Markus Meier <maekke@gentoo.org>
+ +files/hugin-0.6.1-gcc43.patch, hugin-0.6.1-r2.ebuild:
+ fix building with gcc-4.3 by Peter Alfredsen, bug #219783
+
+ 16 Mar 2008; Markus Meier <maekke@gentoo.org> hugin-0.6.1-r2.ebuild:
+ zip dep is also needed in hugin-0.6
+
+ 09 Mar 2008; Markus Meier <maekke@gentoo.org> hugin-0.7_beta4-r1.ebuild:
+ add app-arch/zip dep, bug #212808
+
+ 12 Jan 2008; Markus Meier <maekke@gentoo.org>
+ -files/hugin-0.5-gcc41.patch, -files/hugin-0.5_rc2-gcc4.patch,
+ -hugin-0.5_rc1-r2.ebuild, -hugin-0.5.ebuild, -hugin-0.6.1.ebuild,
+ -hugin-0.6.1-r1.ebuild:
+ old
+
+ 11 Jan 2008; nixnut <nixnut@gentoo.org> hugin-0.6.1-r2.ebuild:
+ Stable on ppc wrt bug 205154
+
+ 17 Dec 2007; Christian Faulhammer <opfer@gentoo.org>
+ hugin-0.6.1-r2.ebuild:
+ stable x86, bug 202095
+
+ 16 Dec 2007; Samuli Suominen <drac@gentoo.org> hugin-0.6.1-r2.ebuild:
+ amd64 stable wrt #180381
+
+*hugin-0.7_beta4-r1 (03 Dec 2007)
+*hugin-0.6.1-r2 (03 Dec 2007)
+
+ 03 Dec 2007; Markus Meier <maekke@gentoo.org>
+ +files/hugin-0.6.1-as-needed.patch,
+ +files/hugin-0.7_beta4-as-needed.patch,
+ +files/hugin-0.7_beta4-insec-file.patch, +hugin-0.6.1-r2.ebuild,
+ -hugin-0.7_beta4.ebuild, +hugin-0.7_beta4-r1.ebuild:
+ revision bump, fix as-needed (bug #180381), also fix security bug #195996
+ for 0.7
+
+ 14 Nov 2007; Peter Weller <welp@gentoo.org> hugin-0.6.1-r1.ebuild:
+ Stable on amd64 wrt bug 195996
+
+ 26 Oct 2007; Luca Barbato <lu_zero@gentoo.org> hugin-0.6.1-r1.ebuild:
+ Marked ppc
+
+ 26 Oct 2007; Markus Meier <maekke@gentoo.org> hugin-0.6.1-r1.ebuild:
+ x86 stable, security bug #195996
+
+*hugin-0.6.1-r1 (25 Oct 2007)
+
+ 25 Oct 2007; Luca Barbato <lu_zero@gentoo.org>
+ +files/hugin-0.6.1-1_0.6.1-1.1.patch, +hugin-0.6.1-r1.ebuild:
+ Security Fix, see bug #195996. Debian patch applied
+
+ 13 Oct 2007; Ryan Hill <dirtyepic@gentoo.org> hugin-0.5_rc1-r2.ebuild,
+ hugin-0.5.ebuild, hugin-0.6.1.ebuild, hugin-0.7_beta4.ebuild:
+ Lock wxGTK to 2.6.
+
+ 23 Jul 2007; Luca Barbato <lu_zero@gentoo.org> hugin-0.6.1.ebuild,
+ hugin-0.7_beta4.ebuild:
+ Fix the bad fix I committed before
+
+ 15 Jul 2007; Luca Barbato <lu_zero@gentoo.org> hugin-0.6.1.ebuild,
+ hugin-0.7_beta4.ebuild:
+ make hugin build with newer boost, thanks to Jakub for the fix in bug #181414
+
+ 30 Apr 2007; Marius Mauch <genone@gentoo.org> hugin-0.5_rc1-r2.ebuild,
+ hugin-0.6.1.ebuild, hugin-0.7_beta4.ebuild:
+ Replacing einfo with elog
+
+ 16 Apr 2007; Christian Faulhammer <opfer@gentoo.org> hugin-0.6.1.ebuild:
+ stable amd64, bug 173068
+
+ 08 Apr 2007; Joseph Jezak <josejx@gentoo.org> hugin-0.6.1.ebuild:
+ Marked ppc stable for bug #173068.
+
+ 06 Apr 2007; Christian Faulhammer <opfer@gentoo.org> hugin-0.6.1.ebuild:
+ stable x86, bug 173068
+
+ 05 Apr 2007; Marcelo Goes <vanquirius@gentoo.org> hugin-0.6.1.ebuild,
+ hugin-0.7_beta4.ebuild:
+ Depend on >=media-gfx/enblend-2.4 if the enblend flag is set for bug 173418.
+ Thanks to Nicolas Laurent <nicolas.mario at gmail dot com>.
+
+*hugin-0.7_beta4 (02 Apr 2007)
+
+ 02 Apr 2007; Marcelo Goes <vanquirius@gentoo.org> +hugin-0.7_beta4.ebuild:
+ Add 0.7_beta4 for bug 141617. In package.mask for now. Thanks again to
+ people who contributed in the bug.
+
+ 03 Mar 2007; Marcelo Goes <vanquirius@gentoo.org> hugin-0.6.1.ebuild:
+ Improve einfo explanation for enblend and sift USE flags for bug 141617.
+ Thanks to Tim Harder <thorium90 at gmail dot com>.
+
+*hugin-0.6.1 (23 Feb 2007)
+
+ 23 Feb 2007; Marcelo Goes <vanquirius@gentoo.org> +hugin-0.6.1.ebuild:
+ 0.6.1 version bump for bug 141617. Thanks to David Grant <davidgrant at
+ gmail dot com>, Hal Engel <hvengel at astound dot net>, Tarmo Tanav <sn4ip3r
+ at estprog dot ee>, Emmanuel Favre_Nicolin <manouchk at gmail dot com>, Paul
+ Berens <pjb8774 at rit dot edu>, Johann Cardon <johann.cardon at free dot
+ fr>, Patrick Huber <phuber at swisstech dot net>, Toon Verstraelen
+ <Toon.Verstraelen at UGent dot be>, Paul de Vries <phsdv at tiscali dot fr>,
+ Norman Thomas <news at hiroki dot de>, Christian Kanzian <christian.kanzian
+ at gmx dot at>, Jorge Nerin <gentoo-bugs at redvip.homelinux dot net>, Tim
+ Harder <thorium90 at gmail dot com>, Serge Gavrilov <serge at pdmi dot ras
+ dot ru>, Andrew Wilchak <azdruid at gmail dot com>, Chris Mayo <mayo at
+ clara dot co dot uk> and anyone I could have missed.
+
+ 22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
+ Transition to Manifest2.
+
+ 24 Sep 2006; Olivier Crête <tester@gentoo.org> hugin-0.5.ebuild:
+ Stable on amd64
+
+ 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> hugin-0.5.ebuild:
+ Stable on x86
+
+ 20 Feb 2006; Mark Loeser <halcy0n@gentoo.org> metadata.xml:
+ metadata.xml cleanup
+
+ 15 Jan 2006; Mark Loeser <halcy0n@gentoo.org>
+ +files/hugin-0.5-gcc41.patch, hugin-0.5.ebuild:
+ Add dep on enblend, and also add patch to fix compilation with gcc-4.1
+
+*hugin-0.5 (18 Dec 2005)
+
+ 18 Dec 2005; Mark Loeser <halcy0n@gentoo.org> -hugin-0.5_rc2.ebuild,
+ +hugin-0.5.ebuild:
+ Bump to 0.5; bug #115714, and clean out old versions
+
+ 26 Nov 2005; Mark Loeser <halcy0n@gentoo.org>
+ files/hugin-0.5_rc2-gcc4.patch:
+ Fix gcc4 patch
+
+ 19 Nov 2005; Mark Loeser <halcy0n@gentoo.org>
+ +files/hugin-0.5_rc2-gcc4.patch, hugin-0.5_rc2.ebuild:
+ Add patch to fix compilation with gcc4.
+
+*hugin-0.5_rc1-r2 (16 Oct 2005)
+
+ 16 Oct 2005; Mark Loeser <halcy0n@gentoo.org> -hugin-0.5_rc1.ebuild,
+ -hugin-0.5_rc1-r1.ebuild, +hugin-0.5_rc1-r2.ebuild:
+ Fixing the default autopano executable. This ebuild also gets rid of the gtk2
+ useflag
+
+*hugin-0.5_rc2 (01 Oct 2005)
+*hugin-0.5_rc1-r1 (01 Oct 2005)
+
+ 01 Oct 2005; Mark Loeser <halcy0n@gentoo.org> +hugin-0.5_rc1-r1.ebuild,
+ +hugin-0.5_rc2.ebuild:
+ Remove gtk useflag, since gtk2 is the only available toolkit. Bump to _rc2.
+ bug #107776
+
+ 16 Sep 2005; Mark Loeser <halcy0n@gentoo.org> hugin-0.5_rc1.ebuild:
+ Stable on x86
+
+ 21 Aug 2005; Luis Medinas <metalgod@gentoo.org> hugin-0.5_rc1.ebuild:
+ Added ~amd64 keywords. Closes bug #103254.
+
+ 11 Aug 2005; David Holm <dholm@gentoo.org> hugin-0.5_rc1.ebuild:
+ Added to ~ppc.
+
+*hugin-0.5_rc1 (10 Aug 2005)
+
+ 10 Aug 2005; Mark Loeser <halcy0n@gentoo.org> +metadata.xml,
+ +hugin-0.5_rc1.ebuild:
+ Initial commit of hugin. Thanks to everyone on bug #48269
+
diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
new file mode 100644
index 0000000..a4361ed
--- /dev/null
+++ b/media-gfx/hugin/Manifest
@@ -0,0 +1,9 @@
+AUX hugin-2011.0.0_rc1-libpng15.patch 11844 RMD160 6e922615911c816011ec7bb2cda8d2867a296d3b SHA1 e655023c0c7c2f96b3f5cd2d73bfa464276abd9e SHA256 48c05955b94a34bd5b96e560ebbeb0cdbce04f47fddde793f91c3a0bb37559a6
+DIST hugin-2011.0.0.tar.bz2 11439430 RMD160 1388980580ecba70a0d47597ddf06df9b85ab2b5 SHA1 22e1ad3846291a9bbe58570683e213921a6f0116 SHA256 866273f6218d300a52c0148960681faa2c4e05383d97f868a2eb47b457b5f4fc
+DIST hugin-2011.2.0.tar.bz2 11506840 RMD160 6bd526c651adb986d7b2f21959c8c390727a9563 SHA1 79dfdac229b4e58f50c893c1238bdd0921ad9da6 SHA256 bd9ef8d2f62c6dbcbadc2b9208cdcf6e4b6512760335c726b697bffd5e89b5be
+DIST hugin-2011.4beta1.tar.bz2 11725685 RMD160 c6af43d1d704fe5b7b1179768d89f1fca96c43ba SHA1 89f6ea1f10fae589357bb51581008d7e8e66ed82 SHA256 b020a9156b4126e87b3b92e14c8013423fd301a682ff38a005fe05beb2d60392
+EBUILD hugin-2011.0.0.ebuild 1507 RMD160 13b606f5056afe2929a5402d2348230e11821f79 SHA1 aafd1a381c4c401c206d81873ae833ffd50e95e5 SHA256 dc53a08d61737945e510ab7b8acec63ded870918c8b586859d11f345477911c4
+EBUILD hugin-2011.2.0.ebuild 1613 RMD160 655a418370413aed003aa4d7ff9933cd0d4b8f1c SHA1 d235abdf58a4ba3723ba4ce5ac009a1b84c61b7b SHA256 e03859cbe9f73a1321392237d026d834a70d2dbfbdaa272bb8520d7650bf479c
+EBUILD hugin-2011.4.0_beta1.ebuild 1619 RMD160 06b34358b45f97cafa53423f58f604d45984239e SHA1 e56673a67662e638d9911ec6d6e1a1c286eb16eb SHA256 cf04ad3416b3c1a5d2891d69845cee01ef71640f94e25e90f9b0393db3369dc1
+MISC ChangeLog 19131 RMD160 b874257ac283100c4472ad12f8889c355194797a SHA1 86b0e6b9380f89727af5d6b9330bc2e76875af2d SHA256 4f2b40fff7fa01a57b4aea9065a63ff742c570e0e7a02d03b2526b3064b1dc6b
+MISC metadata.xml 389 RMD160 245f5d872a463181d63366d6c76a82c87d020fd7 SHA1 a26b77c69d62bedb9789e79b5ca35f28fa56981d SHA256 6f26cd9c2b64a96c1c86a8a468a261af4cf4dfaa86b4d7ddcfaee1ca98314803
diff --git a/media-gfx/hugin/files/hugin-2011.0.0_rc1-libpng15.patch b/media-gfx/hugin/files/hugin-2011.0.0_rc1-libpng15.patch
new file mode 100644
index 0000000..2752231
--- /dev/null
+++ b/media-gfx/hugin/files/hugin-2011.0.0_rc1-libpng15.patch
@@ -0,0 +1,275 @@
+--- hugin-2011.0.0.orig/src/foreign/vigra/vigra_impex/png.cxx
++++ hugin-2011.0.0/src/foreign/vigra/vigra_impex/png.cxx
+@@ -78,7 +75,7 @@
+ static void PngError( png_structp png_ptr, png_const_charp error_msg )
+ {
+ png_error_message = std::string(error_msg);
+- longjmp( png_ptr->jmpbuf, 1 );
++ longjmp( png_jmpbuf(png_ptr), 1 );
+ }
+
+ // called on non-fatal errors
+@@ -200,9 +197,9 @@
+ // check if the file is a png file
+ const unsigned int sig_size = 8;
+ png_byte sig[sig_size];
+- std::fread( sig, sig_size, 1, file.get() );
++ std::size_t readCount = std::fread( sig, sig_size, 1, file.get() );
+ const int no_png = png_sig_cmp( sig, 0, sig_size );
+- vigra_precondition( !no_png, "given file is not a png file.");
++ vigra_precondition( (readCount == 1) && !no_png, "given file is not a png file.");
+
+ // create png read struct with user defined handlers
+ png = png_create_read_struct( PNG_LIBPNG_VER_STRING, NULL,
+@@ -210,7 +207,7 @@
+ vigra_postcondition( png != 0, "could not create the read struct." );
+
+ // create info struct
+- if (setjmp(png->jmpbuf)) {
++ if (setjmp(png_jmpbuf(png))) {
+ png_destroy_read_struct( &png, &info, NULL );
+ vigra_postcondition( false, png_error_message.insert(0, "error in png_create_info_struct(): ").c_str() );
+ }
+@@ -218,14 +215,14 @@
+ vigra_postcondition( info != 0, "could not create the info struct." );
+
+ // init png i/o
+- if (setjmp(png->jmpbuf)) {
++ if (setjmp(png_jmpbuf(png))) {
+ png_destroy_read_struct( &png, &info, NULL );
+ vigra_postcondition( false, png_error_message.insert(0, "error in png_init_io(): ").c_str() );
+ }
+ png_init_io( png, file.get() );
+
+ // specify that the signature was already read
+- if (setjmp(png->jmpbuf)) {
++ if (setjmp(png_jmpbuf(png))) {
+ png_destroy_read_struct( &png, &info, NULL );
+ vigra_postcondition( false, png_error_message.insert(0, "error in png_set_sig_bytes(): ").c_str() );
+ }
+@@ -241,13 +238,13 @@
+ void PngDecoderImpl::init()
+ {
+ // read all chunks up to the image data
+- if (setjmp(png->jmpbuf))
++ if (setjmp(png_jmpbuf(png)))
+ vigra_postcondition( false, png_error_message.insert(0, "error in png_read_info(): ").c_str() );
+ png_read_info( png, info );
+
+ // pull over the header fields
+ int interlace_method, compression_method, filter_method;
+- if (setjmp(png->jmpbuf))
++ if (setjmp(png_jmpbuf(png)))
+ vigra_postcondition( false, png_error_message.insert(0, "error in png_get_IHDR(): ").c_str() );
+ png_get_IHDR( png, info, &width, &height, &bit_depth, &color_type,
+ &interlace_method, &compression_method, &filter_method );
+@@ -261,7 +258,7 @@
+
+ // transform palette to rgb
+ if ( color_type == PNG_COLOR_TYPE_PALETTE) {
+- if (setjmp(png->jmpbuf))
++ if (setjmp(png_jmpbuf(png)))
+ vigra_postcondition( false, png_error_message.insert(0, "error in png_palette_to_rgb(): ").c_str() );
+ png_set_palette_to_rgb(png);
+ color_type = PNG_COLOR_TYPE_RGB;
+@@ -270,15 +267,10 @@
+
+ // expand gray values to at least one byte size
+ if ( color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8 ) {
+-#if (PNG_LIBPNG_VER >= 10400)
+- if (setjmp(png->jmpbuf))
+- vigra_postcondition( false,png_error_message.insert(0, "error in png_set_expand_gray_1_2_4_to_8(): ").c_str());
++ if (setjmp(png_jmpbuf(png)))
++ vigra_postcondition(false,
++ png_error_message.insert(0, "error in png_set_expand_gray_1_2_4_to_8(): ").c_str());
+ png_set_expand_gray_1_2_4_to_8(png);
+-#else
+- if (setjmp(png->jmpbuf))
+- vigra_postcondition( false,png_error_message.insert(0, "error in png_set_gray_1_2_4_to_8(): ").c_str());
+- png_set_gray_1_2_4_to_8(png);
+-#endif
+ bit_depth = 8;
+ }
+
+@@ -286,7 +278,7 @@
+ #if 0
+ // strip alpha channel
+ if ( color_type & PNG_COLOR_MASK_ALPHA ) {
+- if (setjmp(png->jmpbuf))
++ if (setjmp(png_jmpbuf(png)))
+ vigra_postcondition( false, png_error_message.insert(0, "error in png_set_strip_alpha(): ").c_str() );
+ png_set_strip_alpha(png);
+ color_type ^= PNG_COLOR_MASK_ALPHA;
+@@ -317,8 +309,8 @@
+ }
+
+ // read resolution
+- x_resolution = png_get_x_pixels_per_meter( png, info ) / 254.0;
+- y_resolution = png_get_y_pixels_per_meter( png, info ) / 254.0;
++ x_resolution = png_get_x_pixels_per_meter( png, info ) * 0.0254f;
++ y_resolution = png_get_y_pixels_per_meter( png, info ) * 0.0254f;
+
+ // read offset
+ position.x = png_get_x_offset_pixels( png, info );
+@@ -328,9 +320,13 @@
+ #if (PNG_LIBPNG_VER > 10008) && defined(PNG_READ_iCCP_SUPPORTED)
+ char * dummyName;
+ int dummyCompType;
++#if (PNG_LIBPNG_VER < 10500)
+ char * profilePtr;
++#else
++ png_byte * profilePtr;
++#endif
+ png_uint_32 profileLen;
+- if (info->valid & PNG_INFO_iCCP) {
++ if (png_get_valid( png, info, PNG_INFO_iCCP )) {
+ png_get_iCCP(png, info, &dummyName, &dummyCompType, &profilePtr, &profileLen) ;
+ iccProfilePtr = (unsigned char *) profilePtr;
+ iccProfileLength = profileLen;
+@@ -343,7 +339,7 @@
+ // image gamma
+ double image_gamma = 0.45455;
+ if ( png_get_valid( png, info, PNG_INFO_gAMA ) ) {
+- if (setjmp(png->jmpbuf))
++ if (setjmp(png_jmpbuf(png)))
+ vigra_postcondition( false, png_error_message.insert(0, "error in png_get_gAMA(): ").c_str() );
+ png_get_gAMA( png, info, &image_gamma );
+ }
+@@ -352,26 +348,26 @@
+ double screen_gamma = 2.2;
+
+ // set gamma correction
+- if (setjmp(png->jmpbuf))
++ if (setjmp(png_jmpbuf(png)))
+ vigra_postcondition( false, png_error_message.insert(0, "error in png_set_gamma(): ").c_str() );
+ png_set_gamma( png, screen_gamma, image_gamma );
+ #endif
+
+ // interlace handling, get number of read passes needed
+- if (setjmp(png->jmpbuf))
++ if (setjmp(png_jmpbuf(png)))
+ vigra_postcondition( false,png_error_message.insert(0, "error in png_set_interlace_handling(): ").c_str());
+ n_interlace_passes = png_set_interlace_handling(png);
+
+ // update png library state to reflect any changes that were made
+- if (setjmp(png->jmpbuf))
++ if (setjmp(png_jmpbuf(png)))
+ vigra_postcondition( false, png_error_message.insert(0, "error in png_read_update_info(): ").c_str() );
+ png_read_update_info( png, info );
+
+- if (setjmp(png->jmpbuf))
++ if (setjmp(png_jmpbuf(png)))
+ vigra_postcondition( false,png_error_message.insert(0, "error in png_get_channels(): ").c_str());
+ n_channels = png_get_channels(png, info);
+
+- if (setjmp(png->jmpbuf))
++ if (setjmp(png_jmpbuf(png)))
+ vigra_postcondition( false,png_error_message.insert(0, "error in png_get_rowbytes(): ").c_str());
+ rowsize = png_get_rowbytes(png, info);
+
+@@ -381,9 +377,10 @@
+
+ void PngDecoderImpl::nextScanline()
+ {
+- for (int i=0; i < n_interlace_passes; i++) {
+- if (setjmp(png->jmpbuf))
+- vigra_postcondition( false,png_error_message.insert(0, "error in png_read_row(): ").c_str());
++ if (setjmp(png_jmpbuf(png)))
++ vigra_postcondition( false,png_error_message.insert(0, "error in png_read_row(): ").c_str());
++ for (int i=0; i < n_interlace_passes; i++)
++ {
+ png_read_row(png, row_data.begin(), NULL);
+ }
+ }
+@@ -548,7 +545,7 @@
+ vigra_postcondition( png != 0, "could not create the write struct." );
+
+ // create info struct
+- if (setjmp(png->jmpbuf)) {
++ if (setjmp(png_jmpbuf(png))) {
+ png_destroy_write_struct( &png, &info );
+ vigra_postcondition( false, png_error_message.insert(0, "error in png_info_struct(): ").c_str() );
+ }
+@@ -559,7 +556,7 @@
+ }
+
+ // init png i/o
+- if (setjmp(png->jmpbuf)) {
++ if (setjmp(png_jmpbuf(png))) {
+ png_destroy_write_struct( &png, &info );
+ vigra_postcondition( false, png_error_message.insert(0, "error in png_init_io(): ").c_str() );
+ }
+@@ -574,7 +571,7 @@
+ void PngEncoderImpl::finalize()
+ {
+ // write the IHDR
+- if (setjmp(png->jmpbuf))
++ if (setjmp(png_jmpbuf(png)))
+ vigra_postcondition( false, png_error_message.insert(0, "error in png_set_IHDR(): ").c_str() );
+ png_set_IHDR( png, info, width, height, bit_depth, color_type,
+ PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT,
+@@ -582,16 +579,16 @@
+
+ // set resolution
+ if (x_resolution > 0 && y_resolution > 0) {
+- if (setjmp(png->jmpbuf))
++ if (setjmp(png_jmpbuf(png)))
+ vigra_postcondition( false, png_error_message.insert(0, "error in png_set_pHYs(): ").c_str() );
+- png_set_pHYs(png, info, (png_uint_32) (x_resolution * 254 + 0.5),
+- (png_uint_32) (y_resolution * 254 + 0.5),
++ png_set_pHYs(png, info, (png_uint_32) (x_resolution / 0.0254 + 0.5),
++ (png_uint_32) (y_resolution / 0.0254 + 0.5),
+ PNG_RESOLUTION_METER);
+ }
+
+ // set offset
+ if (position.x > 0 && position.y > 0) {
+- if (setjmp(png->jmpbuf))
++ if (setjmp(png_jmpbuf(png)))
+ vigra_postcondition( false, png_error_message.insert(0, "error in png_set_oFFs(): ").c_str() );
+ png_set_oFFs(png, info, position.x, position.y, PNG_OFFSET_PIXEL);
+ }
+@@ -599,13 +596,17 @@
+ #if (PNG_LIBPNG_VER > 10008) && defined(PNG_WRITE_iCCP_SUPPORTED)
+ // set icc profile
+ if (iccProfile.size() > 0) {
+- png_set_iCCP(png, info, "icc", 0,
+- (char *)iccProfile.begin(), iccProfile.size());
++ png_set_iCCP(png, info, (png_charp)("icc"), 0,
++#if (PNG_LIBPNG_VER < 10500)
++ (png_charp)iccProfile.begin(), (png_uint_32)iccProfile.size());
++#else
++ (png_byte*)iccProfile.begin(), (png_uint_32)iccProfile.size());
++#endif
+ }
+ #endif
+
+ // write the info struct
+- if (setjmp(png->jmpbuf))
++ if (setjmp(png_jmpbuf(png)))
+ vigra_postcondition( false, png_error_message.insert(0, "error in png_write_info(): ").c_str() );
+ png_write_info( png, info );
+
+@@ -637,10 +638,10 @@
+ }
+
+ // write the whole image
+- if (setjmp(png->jmpbuf))
++ if (setjmp(png_jmpbuf(png)))
+ vigra_postcondition( false, png_error_message.insert(0, "error in png_write_image(): ").c_str() );
+ png_write_image( png, row_pointers.begin() );
+- if (setjmp(png->jmpbuf))
++ if (setjmp(png_jmpbuf(png)))
+ vigra_postcondition( false, png_error_message.insert(0, "error in png_write_end(): ").c_str() );
+ png_write_end(png, info);
+ }
+@@ -688,8 +689,7 @@
+ pimpl->components = bands;
+ }
+
+- void PngEncoder::setCompressionType( const std::string & comp,
+- int quality )
++ void PngEncoder::setCompressionType( const std::string & /* comp */, int /* quality */)
+ {
+ // nothing is settable => do nothing
+ }
diff --git a/media-gfx/hugin/hugin-2011.0.0.ebuild b/media-gfx/hugin/hugin-2011.0.0.ebuild
new file mode 100644
index 0000000..f609973
--- /dev/null
+++ b/media-gfx/hugin/hugin-2011.0.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2011.0.0.ebuild,v 1.5 2011/10/17 19:00:41 xarthisius Exp $
+
+EAPI=4
+WX_GTK_VER="2.8"
+
+inherit wxwidgets versionator cmake-utils
+
+DESCRIPTION="GUI for the creation & processing of panoramic images"
+HOMEPAGE="http://hugin.sf.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+LICENSE="GPL-2 SIFT"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+
+LANGS=" bg ca cs de en_GB es fi fr hu it ja ko nl pl pt_BR ro ru sk sl sv uk zh_CN zh_TW"
+IUSE="lapack sift $(echo ${LANGS//\ /\ linguas_})"
+
+CDEPEND="
+ !!dev-util/cocom
+ app-arch/zip
+ >=dev-libs/boost-1.35.0-r5
+ >=media-gfx/enblend-4.0
+ media-gfx/exiv2
+ media-libs/freeglut
+ >=media-libs/libpano13-2.9.18
+ media-libs/libpng
+ media-libs/openexr
+ media-libs/tiff
+ sys-libs/zlib
+ virtual/jpeg
+ x11-libs/wxGTK:2.8[X,opengl,-odbc]
+ lapack? ( virtual/lapack )
+ sift? ( media-gfx/autopano-sift-C )"
+RDEPEND="${CDEPEND}
+ media-libs/exiftool"
+DEPEND="${CDEPEND}
+ dev-util/pkgconfig"
+
+S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)
+
+PATCHES=( "${FILESDIR}"/${P}_rc1-libpng15.patch )
+
+pkg_setup() {
+ DOCS="authors.txt README TODO"
+ mycmakeargs=( $(cmake-utils_use_enable lapack LAPACK) )
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ for lang in ${LANGS} ; do
+ case ${lang} in
+ ca) dir=ca_ES;;
+ cs) dir=cs_CZ;;
+ *) dir=${lang};;
+ esac
+ use linguas_${lang} || rm -r "${D}"/usr/share/locale/${dir}
+ done
+}
diff --git a/media-gfx/hugin/hugin-2011.2.0.ebuild b/media-gfx/hugin/hugin-2011.2.0.ebuild
new file mode 100644
index 0000000..b20134d
--- /dev/null
+++ b/media-gfx/hugin/hugin-2011.2.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2011.2.0.ebuild,v 1.1 2011/10/02 21:33:47 maekke Exp $
+
+EAPI=3
+WX_GTK_VER="2.8"
+PYTHON_DEPEND="python? 2:2.6 3"
+
+inherit python wxwidgets versionator cmake-utils
+
+DESCRIPTION="GUI for the creation & processing of panoramic images"
+HOMEPAGE="http://hugin.sf.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+LICENSE="GPL-2 SIFT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+LANGS=" bg ca cs da de en_GB es fi fr hu it ja ko nl pl pt_BR ro ru sk sl sv uk zh_CN zh_TW"
+IUSE="lapack python sift $(echo ${LANGS//\ /\ linguas_})"
+
+CDEPEND="
+ !!dev-util/cocom
+ app-arch/zip
+ dev-cpp/tclap
+ >=dev-libs/boost-1.35.0-r5
+ dev-libs/zthread
+ >=media-gfx/enblend-4.0
+ media-gfx/exiv2
+ media-libs/freeglut
+ >=media-libs/libpano13-2.9.18
+ media-libs/libpng
+ media-libs/openexr
+ media-libs/tiff
+ sys-libs/zlib
+ virtual/jpeg
+ x11-libs/wxGTK:2.8[X,opengl,-odbc]
+ lapack? ( virtual/lapack )
+ sift? ( media-gfx/autopano-sift-C )"
+RDEPEND="${CDEPEND}
+ media-libs/exiftool"
+DEPEND="${CDEPEND}
+ dev-util/pkgconfig
+ python? ( >=dev-lang/swig-2.0.4 )"
+
+S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)
+
+pkg_setup() {
+ DOCS="authors.txt README TODO"
+ mycmakeargs=(
+ $(cmake-utils_use_enable lapack LAPACK)
+ $(cmake-utils_use_build python HSI)
+ )
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ for lang in ${LANGS} ; do
+ case ${lang} in
+ ca) dir=ca_ES;;
+ cs) dir=cs_CZ;;
+ *) dir=${lang};;
+ esac
+ use linguas_${lang} || rm -r "${D}"/usr/share/locale/${dir}
+ done
+}
diff --git a/media-gfx/hugin/hugin-2011.4.0_beta1.ebuild b/media-gfx/hugin/hugin-2011.4.0_beta1.ebuild
new file mode 100644
index 0000000..bfcc4c3
--- /dev/null
+++ b/media-gfx/hugin/hugin-2011.4.0_beta1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2011.2.0.ebuild,v 1.1 2011/10/02 21:33:47 maekke Exp $
+
+EAPI=3
+WX_GTK_VER="2.8"
+PYTHON_DEPEND="python? 2:2.6 3"
+
+inherit python wxwidgets versionator cmake-utils
+
+DESCRIPTION="GUI for the creation & processing of panoramic images"
+HOMEPAGE="http://hugin.sf.net"
+SRC_URI="mirror://sourceforge/${PN}/${P/\.0_/}.tar.bz2"
+LICENSE="GPL-2 SIFT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+LANGS=" bg ca cs da de en_GB es fi fr hu it ja ko nl pl pt_BR ro ru sk sl sv uk zh_CN zh_TW"
+IUSE="lapack python sift $(echo ${LANGS//\ /\ linguas_})"
+
+CDEPEND="
+ !!dev-util/cocom
+ app-arch/zip
+ dev-cpp/tclap
+ >=dev-libs/boost-1.35.0-r5
+ dev-libs/zthread
+ >=media-gfx/enblend-4.0
+ media-gfx/exiv2
+ media-libs/freeglut
+ >=media-libs/libpano13-2.9.18
+ media-libs/libpng
+ media-libs/openexr
+ media-libs/tiff
+ sys-libs/zlib
+ virtual/jpeg
+ x11-libs/wxGTK:2.8[X,opengl,-odbc]
+ lapack? ( virtual/lapack )
+ sift? ( media-gfx/autopano-sift-C )"
+RDEPEND="${CDEPEND}
+ media-libs/exiftool"
+DEPEND="${CDEPEND}
+ dev-util/pkgconfig
+ python? ( >=dev-lang/swig-2.0.4 )"
+
+S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)
+
+pkg_setup() {
+ DOCS="authors.txt README TODO"
+ mycmakeargs=(
+ $(cmake-utils_use_enable lapack LAPACK)
+ $(cmake-utils_use_build python HSI)
+ )
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ for lang in ${LANGS} ; do
+ case ${lang} in
+ ca) dir=ca_ES;;
+ cs) dir=cs_CZ;;
+ *) dir=${lang};;
+ esac
+ use linguas_${lang} || rm -r "${D}"/usr/share/locale/${dir}
+ done
+}
diff --git a/media-gfx/hugin/metadata.xml b/media-gfx/hugin/metadata.xml
new file mode 100644
index 0000000..1c5a459
--- /dev/null
+++ b/media-gfx/hugin/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>graphics</herd>
+ <longdescription>hugin is a panorama stitching program</longdescription>
+ <use>
+ <flag name='sift'>automatically align images with
+ <pkg>media-gfx/autopano-sift</pkg> or
+ <pkg>media-gfx/autopano-sift-C</pkg></flag>
+ </use>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 9+ messages in thread* [gentoo-commits] dev/maekke:master commit in: media-gfx/hugin/files/, media-gfx/hugin/
@ 2011-06-23 21:54 Markus Meier
0 siblings, 0 replies; 9+ messages in thread
From: Markus Meier @ 2011-06-23 21:54 UTC (permalink / raw
To: gentoo-commits
commit: 9dac4e598057ec030e79108e92fb18cc3fcb41cb
Author: Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 23 21:56:36 2011 +0000
Commit: Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Thu Jun 23 21:56:36 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/maekke.git;a=commit;h=9dac4e59
version bump
---
media-gfx/hugin/ChangeLog | 520 ++++++++++++++++++++
media-gfx/hugin/Manifest | 14 +
.../hugin/files/hugin-2010.0.0_rc1-libpng14.patch | 15 +
.../hugin/files/hugin-2011.0.0_rc1-libpng15.patch | 275 +++++++++++
media-gfx/hugin/hugin-2010.0.0.ebuild | 61 +++
media-gfx/hugin/hugin-2010.2.0.ebuild | 59 +++
media-gfx/hugin/hugin-2010.4.0.ebuild | 64 +++
media-gfx/hugin/hugin-2011.0.0.ebuild | 61 +++
media-gfx/hugin/hugin-2011.2.0_beta1.ebuild | 66 +++
media-gfx/hugin/metadata.xml | 11 +
10 files changed, 1146 insertions(+), 0 deletions(-)
diff --git a/media-gfx/hugin/ChangeLog b/media-gfx/hugin/ChangeLog
new file mode 100644
index 0000000..7c8c18a
--- /dev/null
+++ b/media-gfx/hugin/ChangeLog
@@ -0,0 +1,520 @@
+# ChangeLog for media-gfx/hugin
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/ChangeLog,v 1.112 2011/05/29 21:07:01 maekke Exp $
+
+*hugin-2011.0.0 (29 May 2011)
+
+ 29 May 2011; Markus Meier <maekke@gentoo.org> -hugin-2011.0.0_rc1.ebuild,
+ +hugin-2011.0.0.ebuild:
+ version bump
+
+ 20 May 2011; Markus Meier <maekke@gentoo.org> hugin-2011.0.0_rc1.ebuild:
+ add ro to LANGS, update enblend version
+
+ 18 May 2011; Tim Harder <radhermit@gentoo.org> hugin-2011.0.0_rc1.ebuild:
+ Bump libpano13 dependency (bug #367917 by Daniel Neugebauer).
+
+*hugin-2011.0.0_rc1 (18 May 2011)
+
+ 18 May 2011; Tim Harder <radhermit@gentoo.org> +hugin-2011.0.0_rc1.ebuild,
+ +files/hugin-2011.0.0_rc1-libpng15.patch:
+ Version bump to release candidate. Remove old post install message, bump to
+ EAPI 4, apply patch for libpng-1.5 (bug #355885).
+
+ 13 Feb 2011; Tim Harder <radhermit@gentoo.org> hugin-2010.0.0.ebuild,
+ hugin-2010.2.0.ebuild, hugin-2010.4.0.ebuild:
+ Depend on wxGTK with the X USE flag enabled (bug #354223 by Grygoriy
+ Fuchedzhy).
+
+*hugin-2010.4.0 (01 Jan 2011)
+
+ 01 Jan 2011; Markus Meier <maekke@gentoo.org> -hugin-2010.4.0_beta1.ebuild,
+ -hugin-2010.4.0_beta2.ebuild, -hugin-2010.4.0_rc1.ebuild,
+ -hugin-2010.4.0_rc3.ebuild, +hugin-2010.4.0.ebuild:
+ version bump to 2010.4.0 final, remove beta/rc releases
+
+*hugin-2010.4.0_rc3 (28 Dec 2010)
+
+ 28 Dec 2010; Markus Meier <maekke@gentoo.org> +hugin-2010.4.0_rc3.ebuild:
+ version bump
+
+*hugin-2010.4.0_rc1 (25 Dec 2010)
+
+ 25 Dec 2010; Markus Meier <maekke@gentoo.org> +hugin-2010.4.0_rc1.ebuild:
+ version bump
+
+ 05 Dec 2010; Markos Chandras <hwoarang@gentoo.org> hugin-2010.2.0.ebuild:
+ Stable on amd64 wrt bug #347633
+
+ 05 Dec 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+ hugin-2010.2.0.ebuild:
+ x86 stable wrt bug #347633
+
+*hugin-2010.4.0_beta2 (04 Dec 2010)
+
+ 04 Dec 2010; Markus Meier <maekke@gentoo.org> +hugin-2010.4.0_beta2.ebuild:
+ version bump
+
+*hugin-2010.4.0_beta1 (27 Nov 2010)
+
+ 27 Nov 2010; Markus Meier <maekke@gentoo.org> +hugin-2010.4.0_beta1.ebuild:
+ version bump to 2010.4 beta1
+
+ 08 Nov 2010; Markus Meier <maekke@gentoo.org> hugin-2010.0.0.ebuild,
+ hugin-2010.2.0.ebuild:
+ change jpeg dep to virtual/jpeg
+
+*hugin-2010.2.0 (13 Oct 2010)
+
+ 13 Oct 2010; Markus Meier <maekke@gentoo.org>
+ -hugin-2010.2.0_beta1.ebuild, -hugin-2010.2.0_beta2.ebuild,
+ -hugin-2010.2.0_rc1.ebuild, -hugin-2010.2.0_rc2.ebuild,
+ +hugin-2010.2.0.ebuild:
+ version bump, remove prereleases
+
+*hugin-2010.2.0_rc2 (30 Sep 2010)
+
+ 30 Sep 2010; Markus Meier <maekke@gentoo.org> +hugin-2010.2.0_rc2.ebuild:
+ version bump
+
+*hugin-2010.2.0_rc1 (21 Sep 2010)
+
+ 21 Sep 2010; Markus Meier <maekke@gentoo.org> +hugin-2010.2.0_rc1.ebuild:
+ version bump
+
+ 16 Sep 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+ hugin-2010.0.0.ebuild, hugin-2010.2.0_beta1.ebuild,
+ hugin-2010.2.0_beta2.ebuild:
+ virtual/glut -> media-libs/glut
+
+*hugin-2010.2.0_beta2 (05 Sep 2010)
+
+ 05 Sep 2010; Markus Meier <maekke@gentoo.org>
+ +hugin-2010.2.0_beta2.ebuild:
+ version bump
+
+*hugin-2010.2.0_beta1 (18 Jul 2010)
+
+ 18 Jul 2010; Markus Meier <maekke@gentoo.org>
+ +hugin-2010.2.0_beta1.ebuild:
+ version bump
+
+ 27 May 2010; Markus Meier <maekke@gentoo.org> -hugin-2009.2.0.ebuild,
+ -hugin-2009.4.0.ebuild:
+ old
+
+ 25 May 2010; Pacho Ramos <pacho@gentoo.org> hugin-2010.0.0.ebuild:
+ stable amd64, bug 320411
+
+ 24 May 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+ hugin-2010.0.0.ebuild:
+ x86 stable wrt bug #320411
+
+ 24 May 2010; <nixnut@gentoo.org> hugin-2010.0.0.ebuild:
+ ppc stable #320411
+
+ 28 Mar 2010; Markus Meier <maekke@gentoo.org> hugin-2010.0.0.ebuild:
+ add pkgconfig to DEPEND by Nikoli in bug #311693
+
+*hugin-2010.0.0 (26 Mar 2010)
+
+ 26 Mar 2010; Markus Meier <maekke@gentoo.org> -hugin-2010.0.0_rc1.ebuild,
+ +hugin-2010.0.0.ebuild:
+ bump to final 2010.0.0 release, remove rc version
+
+ 10 Mar 2010; Samuli Suominen <ssuominen@gentoo.org>
+ hugin-2010.0.0_rc1.ebuild, +files/hugin-2010.0.0_rc1-libpng14.patch:
+ Fix building with libpng14.
+
+*hugin-2010.0.0_rc1 (07 Mar 2010)
+
+ 07 Mar 2010; Markus Meier <maekke@gentoo.org> +hugin-2010.0.0_rc1.ebuild:
+ version bump to 2010.0.0_rc1
+
+ 17 Feb 2010; Markus Meier <maekke@gentoo.org> hugin-2009.4.0.ebuild:
+ add virtual/glut to dependencies by Seerp in bug #305049
+
+ 09 Jan 2010; Markus Meier <maekke@gentoo.org>
+ -files/hugin-0.7.0-gcc44.patch, -files/hugin-0.7.0_rc2-as-needed.patch,
+ -hugin-0.8.0.ebuild, -files/hugin-0.8.0_rc3-as-needed.patch,
+ -files/hugin-0.8.0_rc4-use_system_cmake_findboost.patch:
+ old
+
+ 07 Jan 2010; Brent Baude <ranger@gentoo.org> hugin-2009.2.0.ebuild:
+ Marking hugin-2009.2.0 ppc for bug 294316
+
+ 20 Dec 2009; Olivier Crête <tester@gentoo.org> hugin-2009.2.0.ebuild:
+ Stable on amd64, bug #294316
+
+ 16 Dec 2009; Christian Faulhammer <fauli@gentoo.org>
+ hugin-2009.2.0.ebuild:
+ stable x86, bug 294316
+
+*hugin-2009.4.0 (16 Dec 2009)
+
+ 16 Dec 2009; Markus Meier <maekke@gentoo.org> -hugin-2009.4.0_rc1.ebuild,
+ -hugin-2009.4.0_rc2.ebuild, -hugin-2009.4.0_rc3.ebuild,
+ +hugin-2009.4.0.ebuild:
+ version bump to 2009.4.0 final release
+
+*hugin-2009.4.0_rc3 (02 Dec 2009)
+
+ 02 Dec 2009; Markus Meier <maekke@gentoo.org> +hugin-2009.4.0_rc3.ebuild:
+ version bump
+
+ 25 Oct 2009; Markus Meier <maekke@gentoo.org> -hugin-0.7.0.ebuild:
+ old
+
+ 25 Oct 2009; Markus Meier <maekke@gentoo.org> hugin-0.8.0.ebuild:
+ amd64/x86 stable, bug #284686
+
+ 24 Oct 2009; nixnut <nixnut@gentoo.org> hugin-0.8.0.ebuild:
+ ppc stable #284686
+
+*hugin-2009.4.0_rc2 (19 Oct 2009)
+
+ 19 Oct 2009; Markus Meier <maekke@gentoo.org> +hugin-2009.4.0_rc2.ebuild:
+ bump
+
+*hugin-2009.4.0_rc1 (11 Oct 2009)
+
+ 11 Oct 2009; Markus Meier <maekke@gentoo.org> +hugin-2009.4.0_rc1.ebuild:
+ version bump
+
+*hugin-2009.2.0 (30 Sep 2009)
+
+ 30 Sep 2009; Markus Meier <maekke@gentoo.org>
+ -hugin-2009.2.0_beta3.ebuild, +hugin-2009.2.0.ebuild,
+ -files/hugin-2009.2.0_beta3-asneeded.patch:
+ version bump to final 2009.02.0 release
+
+ 29 Sep 2009; Markus Meier <maekke@gentoo.org> hugin-0.7.0.ebuild,
+ hugin-0.8.0.ebuild, hugin-2009.2.0_beta3.ebuild:
+ block dev-util/cocom due to a file collision wrt bug #280241
+
+*hugin-2009.2.0_beta3 (13 Sep 2009)
+
+ 13 Sep 2009; Markus Meier <maekke@gentoo.org> hugin-0.7.0.ebuild,
+ -hugin-0.7.0-r1.ebuild, +hugin-2009.2.0_beta3.ebuild,
+ +files/hugin-2009.2.0_beta3-asneeded.patch:
+ version bump, EAPI=2 for stable ebuild, remove old
+
+ 01 Aug 2009; Markus Meier <maekke@gentoo.org> hugin-0.8.0.ebuild:
+ tweak x11-libs/wxGTK dep for bug #279653 and bug #269689
+
+*hugin-0.8.0 (26 Jul 2009)
+
+ 26 Jul 2009; Markus Meier <maekke@gentoo.org> -hugin-0.8.0_beta1.ebuild,
+ -hugin-0.8.0_beta2.ebuild, -hugin-0.8.0_beta3.ebuild,
+ -hugin-0.8.0_beta4.ebuild, -hugin-0.8.0_rc1.ebuild,
+ -hugin-0.8.0_rc3.ebuild, -hugin-0.8.0_rc4.ebuild, -hugin-0.8.0_rc5.ebuild,
+ +hugin-0.8.0.ebuild, -files/hugin-0.8.0_beta1-as-needed.patch,
+ -files/hugin-0.8.0_rc3-unset_lapack.patch:
+ bump to 0.8.0 final release
+
+*hugin-0.8.0_rc5 (09 Jul 2009)
+
+ 09 Jul 2009; Markus Meier <maekke@gentoo.org> +hugin-0.8.0_rc5.ebuild:
+ version bump (this will likely be the last rc)
+
+ 28 Jun 2009; Tiziano Müller <dev-zero@gentoo.org> hugin-0.8.0_rc4.ebuild,
+ +files/hugin-0.8.0_rc4-use_system_cmake_findboost.patch:
+ Added patch to make it build with recent boost versions. Removed now
+ unnecessary patch from stack. Added missing exiftool dependency.
+
+*hugin-0.8.0_rc4 (27 Jun 2009)
+
+ 27 Jun 2009; Markus Meier <maekke@gentoo.org> +hugin-0.8.0_rc4.ebuild:
+ version bump
+
+ 19 Jun 2009; Tiziano Müller <dev-zero@gentoo.org> hugin-0.8.0_rc3.ebuild,
+ +files/hugin-0.8.0_rc3-unset_lapack.patch:
+ Added patch to unset LAPACK_LIBRARIES if lapack is not found, otherwise
+ cmake sets it to NOTFOUND leading to an error.
+
+*hugin-0.8.0_rc3 (10 Jun 2009)
+
+ 10 Jun 2009; Markus Meier <maekke@gentoo.org> +hugin-0.8.0_rc3.ebuild,
+ +files/hugin-0.8.0_rc3-as-needed.patch:
+ version bump to 0.8.0_rc3, with (experimental) lapack support
+
+ 24 May 2009; Markus Meier <maekke@gentoo.org> hugin-0.7.0.ebuild,
+ hugin-0.7.0-r1.ebuild, +files/hugin-0.7.0-gcc44.patch:
+ fix building with gcc-4.4 by David Watzke, bug #270593
+
+*hugin-0.8.0_rc1 (07 May 2009)
+
+ 07 May 2009; Markus Meier <maekke@gentoo.org> +hugin-0.8.0_rc1.ebuild:
+ version bump
+
+*hugin-0.8.0_beta4 (01 May 2009)
+
+ 01 May 2009; Markus Meier <maekke@gentoo.org> +hugin-0.8.0_beta4.ebuild:
+ version bump
+
+*hugin-0.8.0_beta3 (04 Apr 2009)
+
+ 04 Apr 2009; Markus Meier <maekke@gentoo.org> +hugin-0.8.0_beta3.ebuild:
+ version bump to 0.8.0_beta3
+
+ 19 Mar 2009; Markus Meier <maekke@gentoo.org> hugin-0.7.0.ebuild,
+ hugin-0.7.0-r1.ebuild:
+ assign RDEPEND
+
+ 19 Mar 2009; Markus Meier <maekke@gentoo.org>
+ -files/hugin-0.6.1-1_0.6.1-1.1.patch, -files/hugin-0.6.1-as-needed.patch,
+ -files/hugin-0.6.1-gcc43.patch, -hugin-0.6.1-r2.ebuild:
+ old
+
+ 18 Mar 2009; Joseph Jezak <josejx@gentoo.org> hugin-0.7.0.ebuild:
+ Marked ppc stable for bug #246827.
+
+ 11 Mar 2009; Markus Meier <maekke@gentoo.org> hugin-0.8.0_beta2.ebuild:
+ add en_GB language, fix IUSE assignement and raise libpano13 dep
+
+*hugin-0.8.0_beta2 (09 Mar 2009)
+
+ 09 Mar 2009; Markus Meier <maekke@gentoo.org> +hugin-0.8.0_beta2.ebuild:
+ bump to hugin-0.8.0_beta2
+
+*hugin-0.8.0_beta1 (25 Feb 2009)
+
+ 25 Feb 2009; Markus Meier <maekke@gentoo.org>
+ +files/hugin-0.8.0_beta1-as-needed.patch, +hugin-0.8.0_beta1.ebuild:
+ bump to hugin-0.8.0_beta1
+
+ 02 Dec 2008; <chainsaw@gentoo.org> hugin-0.7.0.ebuild,
+ hugin-0.7.0-r1.ebuild:
+ Add ~ppc keyword based on PowerBook6,7 testing by Christian "papillon81"
+ Schmitt <chrschmitt@gmail.com>. Closes bug #234909.
+
+ 28 Nov 2008; Markus Meier <maekke@gentoo.org>
+ -files/hugin-0.7_beta4-insec-file.patch,
+ -files/hugin-0.7_beta4-as-needed.patch, -hugin-0.7_beta4-r1.ebuild,
+ hugin-0.7.0.ebuild, hugin-0.7.0-r1.ebuild:
+ add missing media-gfx/exiv2 dependency for bug #248628; remove old
+
+ 26 Nov 2008; Ryan Hill <dirtyepic@gentoo.org> hugin-0.7.0.ebuild:
+ Call wxwidgets_pkg_setup.
+
+ 22 Nov 2008; Markus Meier <maekke@gentoo.org> hugin-0.7.0.ebuild:
+ amd64/x86 stable, bug #246827
+
+ 08 Oct 2008; Markus Meier <maekke@gentoo.org> hugin-0.6.1-r2.ebuild:
+ add missing x11-libs/gtk+ dep, bug #239698
+
+ 06 Oct 2008; Markus Meier <maekke@gentoo.org> hugin-0.7.0-r1.ebuild:
+ fix broken dep on dev-libs/boost, thanks to voyageur and Betelgeuse
+
+*hugin-0.7.0-r1 (06 Oct 2008)
+*hugin-0.7.0 (06 Oct 2008)
+
+ 06 Oct 2008; Markus Meier <maekke@gentoo.org> -hugin-0.7.0_rc2.ebuild,
+ -hugin-0.7.0_rc3.ebuild, -hugin-0.7.0_rc4.ebuild, -hugin-0.7.0_rc5.ebuild,
+ -hugin-0.7.0_rc6.ebuild, +hugin-0.7.0.ebuild, +hugin-0.7.0-r1.ebuild:
+ bump to 0.7.0 final release (-r1 is an EAPI=2 version of the ebuild, -r0
+ is a stable candidate), remove old
+
+*hugin-0.7.0_rc6 (15 Sep 2008)
+
+ 15 Sep 2008; Markus Meier <maekke@gentoo.org> +hugin-0.7.0_rc6.ebuild:
+ bump to 0.7.0_rc6
+
+*hugin-0.7.0_rc5 (15 Sep 2008)
+
+ 15 Sep 2008; Markus Meier <maekke@gentoo.org> +hugin-0.7.0_rc5.ebuild:
+ bump to 0.7.0_rc5
+
+*hugin-0.7.0_rc4 (02 Sep 2008)
+
+ 02 Sep 2008; Markus Meier <maekke@gentoo.org> +hugin-0.7.0_rc4.ebuild:
+ bump to 0.7.0_rc4
+
+*hugin-0.7.0_rc3 (28 Aug 2008)
+
+ 28 Aug 2008; Markus Meier <maekke@gentoo.org> +hugin-0.7.0_rc3.ebuild:
+ bump to 0.7.0_rc3
+
+ 18 Aug 2008; Markus Meier <maekke@gentoo.org>
+ +files/hugin-0.7.0_rc2-as-needed.patch, hugin-0.7.0_rc2.ebuild:
+ fix building with --as-needed, bug #235004
+
+*hugin-0.7.0_rc2 (16 Aug 2008)
+
+ 16 Aug 2008; Markus Meier <maekke@gentoo.org> metadata.xml,
+ +hugin-0.7.0_rc2.ebuild:
+ bump to hugin-0.7.0_rc2; describe local use flags in metadata.xml
+
+ 10 May 2008; Mike Frysinger <vapier@gentoo.org> hugin-0.7_beta4-r1.ebuild:
+ Also apply gcc-4.3 patch to hugin-0.7_beta4-r1.
+
+ 02 May 2008; Markus Meier <maekke@gentoo.org>
+ +files/hugin-0.6.1-gcc43.patch, hugin-0.6.1-r2.ebuild:
+ fix building with gcc-4.3 by Peter Alfredsen, bug #219783
+
+ 16 Mar 2008; Markus Meier <maekke@gentoo.org> hugin-0.6.1-r2.ebuild:
+ zip dep is also needed in hugin-0.6
+
+ 09 Mar 2008; Markus Meier <maekke@gentoo.org> hugin-0.7_beta4-r1.ebuild:
+ add app-arch/zip dep, bug #212808
+
+ 12 Jan 2008; Markus Meier <maekke@gentoo.org>
+ -files/hugin-0.5-gcc41.patch, -files/hugin-0.5_rc2-gcc4.patch,
+ -hugin-0.5_rc1-r2.ebuild, -hugin-0.5.ebuild, -hugin-0.6.1.ebuild,
+ -hugin-0.6.1-r1.ebuild:
+ old
+
+ 11 Jan 2008; nixnut <nixnut@gentoo.org> hugin-0.6.1-r2.ebuild:
+ Stable on ppc wrt bug 205154
+
+ 17 Dec 2007; Christian Faulhammer <opfer@gentoo.org>
+ hugin-0.6.1-r2.ebuild:
+ stable x86, bug 202095
+
+ 16 Dec 2007; Samuli Suominen <drac@gentoo.org> hugin-0.6.1-r2.ebuild:
+ amd64 stable wrt #180381
+
+*hugin-0.7_beta4-r1 (03 Dec 2007)
+*hugin-0.6.1-r2 (03 Dec 2007)
+
+ 03 Dec 2007; Markus Meier <maekke@gentoo.org>
+ +files/hugin-0.6.1-as-needed.patch,
+ +files/hugin-0.7_beta4-as-needed.patch,
+ +files/hugin-0.7_beta4-insec-file.patch, +hugin-0.6.1-r2.ebuild,
+ -hugin-0.7_beta4.ebuild, +hugin-0.7_beta4-r1.ebuild:
+ revision bump, fix as-needed (bug #180381), also fix security bug #195996
+ for 0.7
+
+ 14 Nov 2007; Peter Weller <welp@gentoo.org> hugin-0.6.1-r1.ebuild:
+ Stable on amd64 wrt bug 195996
+
+ 26 Oct 2007; Luca Barbato <lu_zero@gentoo.org> hugin-0.6.1-r1.ebuild:
+ Marked ppc
+
+ 26 Oct 2007; Markus Meier <maekke@gentoo.org> hugin-0.6.1-r1.ebuild:
+ x86 stable, security bug #195996
+
+*hugin-0.6.1-r1 (25 Oct 2007)
+
+ 25 Oct 2007; Luca Barbato <lu_zero@gentoo.org>
+ +files/hugin-0.6.1-1_0.6.1-1.1.patch, +hugin-0.6.1-r1.ebuild:
+ Security Fix, see bug #195996. Debian patch applied
+
+ 13 Oct 2007; Ryan Hill <dirtyepic@gentoo.org> hugin-0.5_rc1-r2.ebuild,
+ hugin-0.5.ebuild, hugin-0.6.1.ebuild, hugin-0.7_beta4.ebuild:
+ Lock wxGTK to 2.6.
+
+ 23 Jul 2007; Luca Barbato <lu_zero@gentoo.org> hugin-0.6.1.ebuild,
+ hugin-0.7_beta4.ebuild:
+ Fix the bad fix I committed before
+
+ 15 Jul 2007; Luca Barbato <lu_zero@gentoo.org> hugin-0.6.1.ebuild,
+ hugin-0.7_beta4.ebuild:
+ make hugin build with newer boost, thanks to Jakub for the fix in bug #181414
+
+ 30 Apr 2007; Marius Mauch <genone@gentoo.org> hugin-0.5_rc1-r2.ebuild,
+ hugin-0.6.1.ebuild, hugin-0.7_beta4.ebuild:
+ Replacing einfo with elog
+
+ 16 Apr 2007; Christian Faulhammer <opfer@gentoo.org> hugin-0.6.1.ebuild:
+ stable amd64, bug 173068
+
+ 08 Apr 2007; Joseph Jezak <josejx@gentoo.org> hugin-0.6.1.ebuild:
+ Marked ppc stable for bug #173068.
+
+ 06 Apr 2007; Christian Faulhammer <opfer@gentoo.org> hugin-0.6.1.ebuild:
+ stable x86, bug 173068
+
+ 05 Apr 2007; Marcelo Goes <vanquirius@gentoo.org> hugin-0.6.1.ebuild,
+ hugin-0.7_beta4.ebuild:
+ Depend on >=media-gfx/enblend-2.4 if the enblend flag is set for bug 173418.
+ Thanks to Nicolas Laurent <nicolas.mario at gmail dot com>.
+
+*hugin-0.7_beta4 (02 Apr 2007)
+
+ 02 Apr 2007; Marcelo Goes <vanquirius@gentoo.org> +hugin-0.7_beta4.ebuild:
+ Add 0.7_beta4 for bug 141617. In package.mask for now. Thanks again to
+ people who contributed in the bug.
+
+ 03 Mar 2007; Marcelo Goes <vanquirius@gentoo.org> hugin-0.6.1.ebuild:
+ Improve einfo explanation for enblend and sift USE flags for bug 141617.
+ Thanks to Tim Harder <thorium90 at gmail dot com>.
+
+*hugin-0.6.1 (23 Feb 2007)
+
+ 23 Feb 2007; Marcelo Goes <vanquirius@gentoo.org> +hugin-0.6.1.ebuild:
+ 0.6.1 version bump for bug 141617. Thanks to David Grant <davidgrant at
+ gmail dot com>, Hal Engel <hvengel at astound dot net>, Tarmo Tanav <sn4ip3r
+ at estprog dot ee>, Emmanuel Favre_Nicolin <manouchk at gmail dot com>, Paul
+ Berens <pjb8774 at rit dot edu>, Johann Cardon <johann.cardon at free dot
+ fr>, Patrick Huber <phuber at swisstech dot net>, Toon Verstraelen
+ <Toon.Verstraelen at UGent dot be>, Paul de Vries <phsdv at tiscali dot fr>,
+ Norman Thomas <news at hiroki dot de>, Christian Kanzian <christian.kanzian
+ at gmx dot at>, Jorge Nerin <gentoo-bugs at redvip.homelinux dot net>, Tim
+ Harder <thorium90 at gmail dot com>, Serge Gavrilov <serge at pdmi dot ras
+ dot ru>, Andrew Wilchak <azdruid at gmail dot com>, Chris Mayo <mayo at
+ clara dot co dot uk> and anyone I could have missed.
+
+ 22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
+ Transition to Manifest2.
+
+ 24 Sep 2006; Olivier Crête <tester@gentoo.org> hugin-0.5.ebuild:
+ Stable on amd64
+
+ 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> hugin-0.5.ebuild:
+ Stable on x86
+
+ 20 Feb 2006; Mark Loeser <halcy0n@gentoo.org> metadata.xml:
+ metadata.xml cleanup
+
+ 15 Jan 2006; Mark Loeser <halcy0n@gentoo.org>
+ +files/hugin-0.5-gcc41.patch, hugin-0.5.ebuild:
+ Add dep on enblend, and also add patch to fix compilation with gcc-4.1
+
+*hugin-0.5 (18 Dec 2005)
+
+ 18 Dec 2005; Mark Loeser <halcy0n@gentoo.org> -hugin-0.5_rc2.ebuild,
+ +hugin-0.5.ebuild:
+ Bump to 0.5; bug #115714, and clean out old versions
+
+ 26 Nov 2005; Mark Loeser <halcy0n@gentoo.org>
+ files/hugin-0.5_rc2-gcc4.patch:
+ Fix gcc4 patch
+
+ 19 Nov 2005; Mark Loeser <halcy0n@gentoo.org>
+ +files/hugin-0.5_rc2-gcc4.patch, hugin-0.5_rc2.ebuild:
+ Add patch to fix compilation with gcc4.
+
+*hugin-0.5_rc1-r2 (16 Oct 2005)
+
+ 16 Oct 2005; Mark Loeser <halcy0n@gentoo.org> -hugin-0.5_rc1.ebuild,
+ -hugin-0.5_rc1-r1.ebuild, +hugin-0.5_rc1-r2.ebuild:
+ Fixing the default autopano executable. This ebuild also gets rid of the gtk2
+ useflag
+
+*hugin-0.5_rc2 (01 Oct 2005)
+*hugin-0.5_rc1-r1 (01 Oct 2005)
+
+ 01 Oct 2005; Mark Loeser <halcy0n@gentoo.org> +hugin-0.5_rc1-r1.ebuild,
+ +hugin-0.5_rc2.ebuild:
+ Remove gtk useflag, since gtk2 is the only available toolkit. Bump to _rc2.
+ bug #107776
+
+ 16 Sep 2005; Mark Loeser <halcy0n@gentoo.org> hugin-0.5_rc1.ebuild:
+ Stable on x86
+
+ 21 Aug 2005; Luis Medinas <metalgod@gentoo.org> hugin-0.5_rc1.ebuild:
+ Added ~amd64 keywords. Closes bug #103254.
+
+ 11 Aug 2005; David Holm <dholm@gentoo.org> hugin-0.5_rc1.ebuild:
+ Added to ~ppc.
+
+*hugin-0.5_rc1 (10 Aug 2005)
+
+ 10 Aug 2005; Mark Loeser <halcy0n@gentoo.org> +metadata.xml,
+ +hugin-0.5_rc1.ebuild:
+ Initial commit of hugin. Thanks to everyone on bug #48269
+
diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
new file mode 100644
index 0000000..6098e40
--- /dev/null
+++ b/media-gfx/hugin/Manifest
@@ -0,0 +1,14 @@
+AUX hugin-2010.0.0_rc1-libpng14.patch 722 RMD160 83a65c1c8931490c339b87d8302495180750c17f SHA1 0396e246c4ec90aa21a7a0076836d8ebb4d052ed SHA256 2cd425ff1c6036e13b33b83d2772f7c4282fbfb8872c4402efb4e074318d295a
+AUX hugin-2011.0.0_rc1-libpng15.patch 11844 RMD160 6e922615911c816011ec7bb2cda8d2867a296d3b SHA1 e655023c0c7c2f96b3f5cd2d73bfa464276abd9e SHA256 48c05955b94a34bd5b96e560ebbeb0cdbce04f47fddde793f91c3a0bb37559a6
+DIST hugin-2010.0.0.tar.gz 12085453 RMD160 e2b03fe00a4a0242a1f3c4fd641cf8a3e312d516 SHA1 41eb7253aab12b913a5c9b6d9975d8652390dcb5 SHA256 ed30c5021709b8970a43f1e4c2295b5c899bc0fb87ffb63135a3c0ecde3bb523
+DIST hugin-2010.2.0.tar.gz 12412050 RMD160 c39d279bf95cdf5686e5994030bb4eb61ba285aa SHA1 f0676f28cd3fbebcf4086f55af7cf09566772899 SHA256 70fd1d5ffa017b3eb14e0760cd70185aab641aa343d129f9590826b01d5df2e2
+DIST hugin-2010.4.0.tar.bz2 11009978 RMD160 f97b8d37470443eb81c3e915e5f5efa91227b135 SHA1 47f25c0a8b97c27108e567bcd22203c87f268d07 SHA256 d45cc65df6b424ef5bf1c5d2cd99a360ecfda46688782c75f36dd5341cb9c38e
+DIST hugin-2011.0.0.tar.bz2 11439430 RMD160 1388980580ecba70a0d47597ddf06df9b85ab2b5 SHA1 22e1ad3846291a9bbe58570683e213921a6f0116 SHA256 866273f6218d300a52c0148960681faa2c4e05383d97f868a2eb47b457b5f4fc
+DIST hugin-2011.2.0_beta1.tar.bz2 11369710 RMD160 287a127f0c37ed305b86d8c3838b6c0b5c1fb5ce SHA1 ed32ac77b836bf0ae6aa43c8a368cf2df80e76ab SHA256 6ad6ed6a96d79f3b8862704f4f34cd792ab920fbaa68fd799142fb7ae6cab263
+EBUILD hugin-2010.0.0.ebuild 1500 RMD160 26b67785fc8c32833f361d842d157ff33674433d SHA1 94668bb4d6ec5429e879a56577cee24683d42ba9 SHA256 7c2f14d494b942a80e1d2eca0d0793d93bf6ecaebc8e5430f5c98e663a5cc87f
+EBUILD hugin-2010.2.0.ebuild 1459 RMD160 65f44050a6b79fcac57561f03a65fe8c4e984623 SHA1 bd4552e2c0a8ced25105261ae8306ce6f173d6fe SHA256 0ab6582890f6d5de0ce3c2236ef0b0141275ddedf2e25991090a4eafc7f683bc
+EBUILD hugin-2010.4.0.ebuild 1624 RMD160 a0c1421c4bb9eab86a29b83e76c8183c0511e901 SHA1 fb9c42d26fd72d9a222ef845a4a1886de7f70eb3 SHA256 fc37d11de993b11b199f9204daf543818da8db5bb08b2cec266d417542ba7508
+EBUILD hugin-2011.0.0.ebuild 1506 RMD160 df9dc8093168ae82965eaba5da69b82175280049 SHA1 9644f5644d43b9c5aea822b906b352302bc794f8 SHA256 fc2d0292c6b8c8c91463a64b0c8b796605e7805cbcbc99f1d6ac6942932775be
+EBUILD hugin-2011.2.0_beta1.ebuild 1610 RMD160 44dea6897aa770aaadc5b8a6c7177506a441ba51 SHA1 70624c8be33e91779ed5c634d3f746cb38fa66a2 SHA256 6ac2d3537aaf4eb645957a22948c09dd3b2d2c327ced7ef7ab7e285813131c89
+MISC ChangeLog 18141 RMD160 2eb9dc3258cc146dbd132c552abafda8f2a06bd6 SHA1 4a67f21683eac74307add5d01896e6667e65693a SHA256 cfdfc4b4a9bcc83ac7cec1bbfd83a5633430415e716707918904b55508bebab3
+MISC metadata.xml 389 RMD160 245f5d872a463181d63366d6c76a82c87d020fd7 SHA1 a26b77c69d62bedb9789e79b5ca35f28fa56981d SHA256 6f26cd9c2b64a96c1c86a8a468a261af4cf4dfaa86b4d7ddcfaee1ca98314803
diff --git a/media-gfx/hugin/files/hugin-2010.0.0_rc1-libpng14.patch b/media-gfx/hugin/files/hugin-2010.0.0_rc1-libpng14.patch
new file mode 100644
index 0000000..fdc0263
--- /dev/null
+++ b/media-gfx/hugin/files/hugin-2010.0.0_rc1-libpng14.patch
@@ -0,0 +1,15 @@
+http://repos.archlinux.org/wsvn/packages/hugin/trunk/libpng14.patch
+
+--- src/foreign/vigra/vigra_impex/png.cxx
++++ src/foreign/vigra/vigra_impex/png.cxx
+@@ -271,8 +271,8 @@
+ // expand gray values to at least one byte size
+ if ( color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8 ) {
+ if (setjmp(png->jmpbuf))
+- vigra_postcondition( false,png_error_message.insert(0, "error in png_set_gray_1_2_4_to_8(): ").c_str());
+- png_set_gray_1_2_4_to_8(png);
++ vigra_postcondition( false,png_error_message.insert(0, "error in png_set_expand_gray_1_2_4_to_8(): ").c_str());
++ png_set_expand_gray_1_2_4_to_8(png);
+ bit_depth = 8;
+ }
+
diff --git a/media-gfx/hugin/files/hugin-2011.0.0_rc1-libpng15.patch b/media-gfx/hugin/files/hugin-2011.0.0_rc1-libpng15.patch
new file mode 100644
index 0000000..2752231
--- /dev/null
+++ b/media-gfx/hugin/files/hugin-2011.0.0_rc1-libpng15.patch
@@ -0,0 +1,275 @@
+--- hugin-2011.0.0.orig/src/foreign/vigra/vigra_impex/png.cxx
++++ hugin-2011.0.0/src/foreign/vigra/vigra_impex/png.cxx
+@@ -78,7 +75,7 @@
+ static void PngError( png_structp png_ptr, png_const_charp error_msg )
+ {
+ png_error_message = std::string(error_msg);
+- longjmp( png_ptr->jmpbuf, 1 );
++ longjmp( png_jmpbuf(png_ptr), 1 );
+ }
+
+ // called on non-fatal errors
+@@ -200,9 +197,9 @@
+ // check if the file is a png file
+ const unsigned int sig_size = 8;
+ png_byte sig[sig_size];
+- std::fread( sig, sig_size, 1, file.get() );
++ std::size_t readCount = std::fread( sig, sig_size, 1, file.get() );
+ const int no_png = png_sig_cmp( sig, 0, sig_size );
+- vigra_precondition( !no_png, "given file is not a png file.");
++ vigra_precondition( (readCount == 1) && !no_png, "given file is not a png file.");
+
+ // create png read struct with user defined handlers
+ png = png_create_read_struct( PNG_LIBPNG_VER_STRING, NULL,
+@@ -210,7 +207,7 @@
+ vigra_postcondition( png != 0, "could not create the read struct." );
+
+ // create info struct
+- if (setjmp(png->jmpbuf)) {
++ if (setjmp(png_jmpbuf(png))) {
+ png_destroy_read_struct( &png, &info, NULL );
+ vigra_postcondition( false, png_error_message.insert(0, "error in png_create_info_struct(): ").c_str() );
+ }
+@@ -218,14 +215,14 @@
+ vigra_postcondition( info != 0, "could not create the info struct." );
+
+ // init png i/o
+- if (setjmp(png->jmpbuf)) {
++ if (setjmp(png_jmpbuf(png))) {
+ png_destroy_read_struct( &png, &info, NULL );
+ vigra_postcondition( false, png_error_message.insert(0, "error in png_init_io(): ").c_str() );
+ }
+ png_init_io( png, file.get() );
+
+ // specify that the signature was already read
+- if (setjmp(png->jmpbuf)) {
++ if (setjmp(png_jmpbuf(png))) {
+ png_destroy_read_struct( &png, &info, NULL );
+ vigra_postcondition( false, png_error_message.insert(0, "error in png_set_sig_bytes(): ").c_str() );
+ }
+@@ -241,13 +238,13 @@
+ void PngDecoderImpl::init()
+ {
+ // read all chunks up to the image data
+- if (setjmp(png->jmpbuf))
++ if (setjmp(png_jmpbuf(png)))
+ vigra_postcondition( false, png_error_message.insert(0, "error in png_read_info(): ").c_str() );
+ png_read_info( png, info );
+
+ // pull over the header fields
+ int interlace_method, compression_method, filter_method;
+- if (setjmp(png->jmpbuf))
++ if (setjmp(png_jmpbuf(png)))
+ vigra_postcondition( false, png_error_message.insert(0, "error in png_get_IHDR(): ").c_str() );
+ png_get_IHDR( png, info, &width, &height, &bit_depth, &color_type,
+ &interlace_method, &compression_method, &filter_method );
+@@ -261,7 +258,7 @@
+
+ // transform palette to rgb
+ if ( color_type == PNG_COLOR_TYPE_PALETTE) {
+- if (setjmp(png->jmpbuf))
++ if (setjmp(png_jmpbuf(png)))
+ vigra_postcondition( false, png_error_message.insert(0, "error in png_palette_to_rgb(): ").c_str() );
+ png_set_palette_to_rgb(png);
+ color_type = PNG_COLOR_TYPE_RGB;
+@@ -270,15 +267,10 @@
+
+ // expand gray values to at least one byte size
+ if ( color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8 ) {
+-#if (PNG_LIBPNG_VER >= 10400)
+- if (setjmp(png->jmpbuf))
+- vigra_postcondition( false,png_error_message.insert(0, "error in png_set_expand_gray_1_2_4_to_8(): ").c_str());
++ if (setjmp(png_jmpbuf(png)))
++ vigra_postcondition(false,
++ png_error_message.insert(0, "error in png_set_expand_gray_1_2_4_to_8(): ").c_str());
+ png_set_expand_gray_1_2_4_to_8(png);
+-#else
+- if (setjmp(png->jmpbuf))
+- vigra_postcondition( false,png_error_message.insert(0, "error in png_set_gray_1_2_4_to_8(): ").c_str());
+- png_set_gray_1_2_4_to_8(png);
+-#endif
+ bit_depth = 8;
+ }
+
+@@ -286,7 +278,7 @@
+ #if 0
+ // strip alpha channel
+ if ( color_type & PNG_COLOR_MASK_ALPHA ) {
+- if (setjmp(png->jmpbuf))
++ if (setjmp(png_jmpbuf(png)))
+ vigra_postcondition( false, png_error_message.insert(0, "error in png_set_strip_alpha(): ").c_str() );
+ png_set_strip_alpha(png);
+ color_type ^= PNG_COLOR_MASK_ALPHA;
+@@ -317,8 +309,8 @@
+ }
+
+ // read resolution
+- x_resolution = png_get_x_pixels_per_meter( png, info ) / 254.0;
+- y_resolution = png_get_y_pixels_per_meter( png, info ) / 254.0;
++ x_resolution = png_get_x_pixels_per_meter( png, info ) * 0.0254f;
++ y_resolution = png_get_y_pixels_per_meter( png, info ) * 0.0254f;
+
+ // read offset
+ position.x = png_get_x_offset_pixels( png, info );
+@@ -328,9 +320,13 @@
+ #if (PNG_LIBPNG_VER > 10008) && defined(PNG_READ_iCCP_SUPPORTED)
+ char * dummyName;
+ int dummyCompType;
++#if (PNG_LIBPNG_VER < 10500)
+ char * profilePtr;
++#else
++ png_byte * profilePtr;
++#endif
+ png_uint_32 profileLen;
+- if (info->valid & PNG_INFO_iCCP) {
++ if (png_get_valid( png, info, PNG_INFO_iCCP )) {
+ png_get_iCCP(png, info, &dummyName, &dummyCompType, &profilePtr, &profileLen) ;
+ iccProfilePtr = (unsigned char *) profilePtr;
+ iccProfileLength = profileLen;
+@@ -343,7 +339,7 @@
+ // image gamma
+ double image_gamma = 0.45455;
+ if ( png_get_valid( png, info, PNG_INFO_gAMA ) ) {
+- if (setjmp(png->jmpbuf))
++ if (setjmp(png_jmpbuf(png)))
+ vigra_postcondition( false, png_error_message.insert(0, "error in png_get_gAMA(): ").c_str() );
+ png_get_gAMA( png, info, &image_gamma );
+ }
+@@ -352,26 +348,26 @@
+ double screen_gamma = 2.2;
+
+ // set gamma correction
+- if (setjmp(png->jmpbuf))
++ if (setjmp(png_jmpbuf(png)))
+ vigra_postcondition( false, png_error_message.insert(0, "error in png_set_gamma(): ").c_str() );
+ png_set_gamma( png, screen_gamma, image_gamma );
+ #endif
+
+ // interlace handling, get number of read passes needed
+- if (setjmp(png->jmpbuf))
++ if (setjmp(png_jmpbuf(png)))
+ vigra_postcondition( false,png_error_message.insert(0, "error in png_set_interlace_handling(): ").c_str());
+ n_interlace_passes = png_set_interlace_handling(png);
+
+ // update png library state to reflect any changes that were made
+- if (setjmp(png->jmpbuf))
++ if (setjmp(png_jmpbuf(png)))
+ vigra_postcondition( false, png_error_message.insert(0, "error in png_read_update_info(): ").c_str() );
+ png_read_update_info( png, info );
+
+- if (setjmp(png->jmpbuf))
++ if (setjmp(png_jmpbuf(png)))
+ vigra_postcondition( false,png_error_message.insert(0, "error in png_get_channels(): ").c_str());
+ n_channels = png_get_channels(png, info);
+
+- if (setjmp(png->jmpbuf))
++ if (setjmp(png_jmpbuf(png)))
+ vigra_postcondition( false,png_error_message.insert(0, "error in png_get_rowbytes(): ").c_str());
+ rowsize = png_get_rowbytes(png, info);
+
+@@ -381,9 +377,10 @@
+
+ void PngDecoderImpl::nextScanline()
+ {
+- for (int i=0; i < n_interlace_passes; i++) {
+- if (setjmp(png->jmpbuf))
+- vigra_postcondition( false,png_error_message.insert(0, "error in png_read_row(): ").c_str());
++ if (setjmp(png_jmpbuf(png)))
++ vigra_postcondition( false,png_error_message.insert(0, "error in png_read_row(): ").c_str());
++ for (int i=0; i < n_interlace_passes; i++)
++ {
+ png_read_row(png, row_data.begin(), NULL);
+ }
+ }
+@@ -548,7 +545,7 @@
+ vigra_postcondition( png != 0, "could not create the write struct." );
+
+ // create info struct
+- if (setjmp(png->jmpbuf)) {
++ if (setjmp(png_jmpbuf(png))) {
+ png_destroy_write_struct( &png, &info );
+ vigra_postcondition( false, png_error_message.insert(0, "error in png_info_struct(): ").c_str() );
+ }
+@@ -559,7 +556,7 @@
+ }
+
+ // init png i/o
+- if (setjmp(png->jmpbuf)) {
++ if (setjmp(png_jmpbuf(png))) {
+ png_destroy_write_struct( &png, &info );
+ vigra_postcondition( false, png_error_message.insert(0, "error in png_init_io(): ").c_str() );
+ }
+@@ -574,7 +571,7 @@
+ void PngEncoderImpl::finalize()
+ {
+ // write the IHDR
+- if (setjmp(png->jmpbuf))
++ if (setjmp(png_jmpbuf(png)))
+ vigra_postcondition( false, png_error_message.insert(0, "error in png_set_IHDR(): ").c_str() );
+ png_set_IHDR( png, info, width, height, bit_depth, color_type,
+ PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT,
+@@ -582,16 +579,16 @@
+
+ // set resolution
+ if (x_resolution > 0 && y_resolution > 0) {
+- if (setjmp(png->jmpbuf))
++ if (setjmp(png_jmpbuf(png)))
+ vigra_postcondition( false, png_error_message.insert(0, "error in png_set_pHYs(): ").c_str() );
+- png_set_pHYs(png, info, (png_uint_32) (x_resolution * 254 + 0.5),
+- (png_uint_32) (y_resolution * 254 + 0.5),
++ png_set_pHYs(png, info, (png_uint_32) (x_resolution / 0.0254 + 0.5),
++ (png_uint_32) (y_resolution / 0.0254 + 0.5),
+ PNG_RESOLUTION_METER);
+ }
+
+ // set offset
+ if (position.x > 0 && position.y > 0) {
+- if (setjmp(png->jmpbuf))
++ if (setjmp(png_jmpbuf(png)))
+ vigra_postcondition( false, png_error_message.insert(0, "error in png_set_oFFs(): ").c_str() );
+ png_set_oFFs(png, info, position.x, position.y, PNG_OFFSET_PIXEL);
+ }
+@@ -599,13 +596,17 @@
+ #if (PNG_LIBPNG_VER > 10008) && defined(PNG_WRITE_iCCP_SUPPORTED)
+ // set icc profile
+ if (iccProfile.size() > 0) {
+- png_set_iCCP(png, info, "icc", 0,
+- (char *)iccProfile.begin(), iccProfile.size());
++ png_set_iCCP(png, info, (png_charp)("icc"), 0,
++#if (PNG_LIBPNG_VER < 10500)
++ (png_charp)iccProfile.begin(), (png_uint_32)iccProfile.size());
++#else
++ (png_byte*)iccProfile.begin(), (png_uint_32)iccProfile.size());
++#endif
+ }
+ #endif
+
+ // write the info struct
+- if (setjmp(png->jmpbuf))
++ if (setjmp(png_jmpbuf(png)))
+ vigra_postcondition( false, png_error_message.insert(0, "error in png_write_info(): ").c_str() );
+ png_write_info( png, info );
+
+@@ -637,10 +638,10 @@
+ }
+
+ // write the whole image
+- if (setjmp(png->jmpbuf))
++ if (setjmp(png_jmpbuf(png)))
+ vigra_postcondition( false, png_error_message.insert(0, "error in png_write_image(): ").c_str() );
+ png_write_image( png, row_pointers.begin() );
+- if (setjmp(png->jmpbuf))
++ if (setjmp(png_jmpbuf(png)))
+ vigra_postcondition( false, png_error_message.insert(0, "error in png_write_end(): ").c_str() );
+ png_write_end(png, info);
+ }
+@@ -688,8 +689,7 @@
+ pimpl->components = bands;
+ }
+
+- void PngEncoder::setCompressionType( const std::string & comp,
+- int quality )
++ void PngEncoder::setCompressionType( const std::string & /* comp */, int /* quality */)
+ {
+ // nothing is settable => do nothing
+ }
diff --git a/media-gfx/hugin/hugin-2010.0.0.ebuild b/media-gfx/hugin/hugin-2010.0.0.ebuild
new file mode 100644
index 0000000..8e48445
--- /dev/null
+++ b/media-gfx/hugin/hugin-2010.0.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2010.0.0.ebuild,v 1.8 2011/02/13 11:03:32 radhermit Exp $
+
+EAPI=2
+WX_GTK_VER="2.8"
+
+inherit cmake-utils wxwidgets versionator
+
+DESCRIPTION="GUI for the creation & processing of panoramic images"
+HOMEPAGE="http://hugin.sf.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+LICENSE="GPL-2 SIFT"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+
+LANGS=" bg ca cs de en_GB es fi fr hu it ja ko nl pl pt_BR ru sk sl sv uk zh_CN zh_TW"
+IUSE="lapack +sift $(echo ${LANGS//\ /\ linguas_})"
+
+CDEPEND="
+ !!dev-util/cocom
+ app-arch/zip
+ >=dev-libs/boost-1.35.0-r5
+ >=media-gfx/enblend-3.0_p20080807
+ media-gfx/exiv2
+ media-libs/freeglut
+ >=media-libs/libpano13-2.9.14
+ media-libs/libpng
+ media-libs/openexr
+ media-libs/tiff
+ sys-libs/zlib
+ virtual/jpeg
+ x11-libs/wxGTK:2.8[X,opengl,-odbc]
+ lapack? ( virtual/lapack )
+ sift? ( media-gfx/autopano-sift-C )"
+RDEPEND="${CDEPEND}
+ media-libs/exiftool"
+DEPEND="${CDEPEND}
+ dev-util/pkgconfig"
+
+S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)
+
+PATCHES=( "${FILESDIR}/${P}_rc1-libpng14.patch" )
+
+pkg_setup() {
+ DOCS="AUTHORS README TODO"
+ mycmakeargs="$(cmake-utils_use_enable lapack)"
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ for lang in ${LANGS} ; do
+ case ${lang} in
+ ca) dir=ca_ES;;
+ cs) dir=cs_CZ;;
+ *) dir=${lang};;
+ esac
+ use linguas_${lang} || rm -r "${D}"/usr/share/locale/${dir}
+ done
+}
diff --git a/media-gfx/hugin/hugin-2010.2.0.ebuild b/media-gfx/hugin/hugin-2010.2.0.ebuild
new file mode 100644
index 0000000..715ef39
--- /dev/null
+++ b/media-gfx/hugin/hugin-2010.2.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2010.2.0.ebuild,v 1.5 2011/02/13 11:03:32 radhermit Exp $
+
+EAPI=2
+WX_GTK_VER="2.8"
+
+inherit cmake-utils wxwidgets versionator
+
+DESCRIPTION="GUI for the creation & processing of panoramic images"
+HOMEPAGE="http://hugin.sf.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+LICENSE="GPL-2 SIFT"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+
+LANGS=" bg ca cs de en_GB es fi fr hu it ja ko nl pl pt_BR ru sk sl sv uk zh_CN zh_TW"
+IUSE="lapack +sift $(echo ${LANGS//\ /\ linguas_})"
+
+CDEPEND="
+ !!dev-util/cocom
+ app-arch/zip
+ >=dev-libs/boost-1.35.0-r5
+ >=media-gfx/enblend-3.0_p20080807
+ media-gfx/exiv2
+ media-libs/freeglut
+ >=media-libs/libpano13-2.9.17
+ media-libs/libpng
+ media-libs/openexr
+ media-libs/tiff
+ sys-libs/zlib
+ virtual/jpeg
+ x11-libs/wxGTK:2.8[X,opengl,-odbc]
+ lapack? ( virtual/lapack )
+ sift? ( media-gfx/autopano-sift-C )"
+RDEPEND="${CDEPEND}
+ media-libs/exiftool"
+DEPEND="${CDEPEND}
+ dev-util/pkgconfig"
+
+S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)
+
+pkg_setup() {
+ DOCS="AUTHORS README TODO"
+ mycmakeargs=( $(cmake-utils_use_enable lapack LAPACK) )
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ for lang in ${LANGS} ; do
+ case ${lang} in
+ ca) dir=ca_ES;;
+ cs) dir=cs_CZ;;
+ *) dir=${lang};;
+ esac
+ use linguas_${lang} || rm -r "${D}"/usr/share/locale/${dir}
+ done
+}
diff --git a/media-gfx/hugin/hugin-2010.4.0.ebuild b/media-gfx/hugin/hugin-2010.4.0.ebuild
new file mode 100644
index 0000000..fe86169
--- /dev/null
+++ b/media-gfx/hugin/hugin-2010.4.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2010.4.0.ebuild,v 1.2 2011/02/13 11:03:32 radhermit Exp $
+
+EAPI=2
+WX_GTK_VER="2.8"
+
+inherit cmake-utils wxwidgets versionator
+
+DESCRIPTION="GUI for the creation & processing of panoramic images"
+HOMEPAGE="http://hugin.sf.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+LICENSE="GPL-2 SIFT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+LANGS=" bg ca cs de en_GB es fi fr hu it ja ko nl pl pt_BR ru sk sl sv uk zh_CN zh_TW"
+IUSE="lapack sift $(echo ${LANGS//\ /\ linguas_})"
+
+CDEPEND="
+ !!dev-util/cocom
+ app-arch/zip
+ >=dev-libs/boost-1.35.0-r5
+ >=media-gfx/enblend-3.0_p20080807
+ media-gfx/exiv2
+ media-libs/freeglut
+ >=media-libs/libpano13-2.9.17
+ media-libs/libpng
+ media-libs/openexr
+ media-libs/tiff
+ sys-libs/zlib
+ virtual/jpeg
+ x11-libs/wxGTK:2.8[X,opengl,-odbc]
+ lapack? ( virtual/lapack )
+ sift? ( media-gfx/autopano-sift-C )"
+RDEPEND="${CDEPEND}
+ media-libs/exiftool"
+DEPEND="${CDEPEND}
+ dev-util/pkgconfig"
+
+S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)
+
+pkg_setup() {
+ DOCS="authors.txt README TODO"
+ mycmakeargs=( $(cmake-utils_use_enable lapack LAPACK) )
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ for lang in ${LANGS} ; do
+ case ${lang} in
+ ca) dir=ca_ES;;
+ cs) dir=cs_CZ;;
+ *) dir=${lang};;
+ esac
+ use linguas_${lang} || rm -r "${D}"/usr/share/locale/${dir}
+ done
+}
+
+pkg_postinst() {
+ elog "Please note that the sift USE-flag has been disabled by default"
+ elog "as hugin ships its own control point generator with 2010.4"
+}
diff --git a/media-gfx/hugin/hugin-2011.0.0.ebuild b/media-gfx/hugin/hugin-2011.0.0.ebuild
new file mode 100644
index 0000000..cbef828
--- /dev/null
+++ b/media-gfx/hugin/hugin-2011.0.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2011.0.0.ebuild,v 1.1 2011/05/29 21:07:01 maekke Exp $
+
+EAPI=4
+WX_GTK_VER="2.8"
+
+inherit cmake-utils wxwidgets versionator
+
+DESCRIPTION="GUI for the creation & processing of panoramic images"
+HOMEPAGE="http://hugin.sf.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+LICENSE="GPL-2 SIFT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+LANGS=" bg ca cs de en_GB es fi fr hu it ja ko nl pl pt_BR ro ru sk sl sv uk zh_CN zh_TW"
+IUSE="lapack sift $(echo ${LANGS//\ /\ linguas_})"
+
+CDEPEND="
+ !!dev-util/cocom
+ app-arch/zip
+ >=dev-libs/boost-1.35.0-r5
+ >=media-gfx/enblend-4.0
+ media-gfx/exiv2
+ media-libs/freeglut
+ >=media-libs/libpano13-2.9.18
+ media-libs/libpng
+ media-libs/openexr
+ media-libs/tiff
+ sys-libs/zlib
+ virtual/jpeg
+ x11-libs/wxGTK:2.8[X,opengl,-odbc]
+ lapack? ( virtual/lapack )
+ sift? ( media-gfx/autopano-sift-C )"
+RDEPEND="${CDEPEND}
+ media-libs/exiftool"
+DEPEND="${CDEPEND}
+ dev-util/pkgconfig"
+
+S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)
+
+PATCHES=( "${FILESDIR}"/${P}_rc1-libpng15.patch )
+
+pkg_setup() {
+ DOCS="authors.txt README TODO"
+ mycmakeargs=( $(cmake-utils_use_enable lapack LAPACK) )
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ for lang in ${LANGS} ; do
+ case ${lang} in
+ ca) dir=ca_ES;;
+ cs) dir=cs_CZ;;
+ *) dir=${lang};;
+ esac
+ use linguas_${lang} || rm -r "${D}"/usr/share/locale/${dir}
+ done
+}
diff --git a/media-gfx/hugin/hugin-2011.2.0_beta1.ebuild b/media-gfx/hugin/hugin-2011.2.0_beta1.ebuild
new file mode 100644
index 0000000..63af9ad
--- /dev/null
+++ b/media-gfx/hugin/hugin-2011.2.0_beta1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2011.0.0.ebuild,v 1.1 2011/05/29 21:07:01 maekke Exp $
+
+EAPI=3
+WX_GTK_VER="2.8"
+PYTHON_DEPEND="python? 2:2.6 3"
+
+inherit python cmake-utils wxwidgets versionator
+
+DESCRIPTION="GUI for the creation & processing of panoramic images"
+HOMEPAGE="http://hugin.sf.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+LICENSE="GPL-2 SIFT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+LANGS=" bg ca cs de en_GB es fi fr hu it ja ko nl pl pt_BR ro ru sk sl sv uk zh_CN zh_TW"
+IUSE="lapack python sift $(echo ${LANGS//\ /\ linguas_})"
+
+CDEPEND="
+ !!dev-util/cocom
+ app-arch/zip
+ dev-cpp/tclap
+ >=dev-libs/boost-1.35.0-r5
+ dev-libs/zthread
+ >=media-gfx/enblend-4.0
+ media-gfx/exiv2
+ media-libs/freeglut
+ >=media-libs/libpano13-2.9.18
+ media-libs/libpng
+ media-libs/openexr
+ media-libs/tiff
+ sys-libs/zlib
+ virtual/jpeg
+ x11-libs/wxGTK:2.8[X,opengl,-odbc]
+ lapack? ( virtual/lapack )
+ sift? ( media-gfx/autopano-sift-C )"
+RDEPEND="${CDEPEND}
+ media-libs/exiftool"
+DEPEND="${CDEPEND}
+ dev-util/pkgconfig
+ python? ( >=dev-lang/swig-2.0.4 )"
+
+S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)
+
+pkg_setup() {
+ DOCS="authors.txt README TODO"
+ mycmakeargs=(
+ $(cmake-utils_use_enable lapack LAPACK)
+ $(cmake-utils_use_build python HSI)
+ )
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ for lang in ${LANGS} ; do
+ case ${lang} in
+ ca) dir=ca_ES;;
+ cs) dir=cs_CZ;;
+ *) dir=${lang};;
+ esac
+ use linguas_${lang} || rm -r "${D}"/usr/share/locale/${dir}
+ done
+}
diff --git a/media-gfx/hugin/metadata.xml b/media-gfx/hugin/metadata.xml
new file mode 100644
index 0000000..1c5a459
--- /dev/null
+++ b/media-gfx/hugin/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>graphics</herd>
+ <longdescription>hugin is a panorama stitching program</longdescription>
+ <use>
+ <flag name='sift'>automatically align images with
+ <pkg>media-gfx/autopano-sift</pkg> or
+ <pkg>media-gfx/autopano-sift-C</pkg></flag>
+ </use>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 9+ messages in thread* [gentoo-commits] dev/maekke:master commit in: media-gfx/hugin/files/, media-gfx/hugin/
@ 2011-05-20 19:20 Markus Meier
0 siblings, 0 replies; 9+ messages in thread
From: Markus Meier @ 2011-05-20 19:20 UTC (permalink / raw
To: gentoo-commits
commit: 9faac36c61676dc1b7af9536482564645e5ed687
Author: Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Fri May 20 19:21:57 2011 +0000
Commit: Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Fri May 20 19:21:57 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/maekke.git;a=commit;h=9faac36c
rm, in tree
---
media-gfx/hugin/ChangeLog | 501 --------------------
media-gfx/hugin/Manifest | 23 -
.../hugin/files/hugin-2010.0.0_rc1-libpng14.patch | 15 -
media-gfx/hugin/hugin-2010.0.0.ebuild | 61 ---
media-gfx/hugin/hugin-2010.2.0.ebuild | 59 ---
media-gfx/hugin/hugin-2010.4.0.ebuild | 64 ---
media-gfx/hugin/hugin-2011.0.0_beta3.ebuild | 64 ---
media-gfx/hugin/hugin-2011.0.0_rc1.ebuild | 64 ---
media-gfx/hugin/metadata.xml | 11 -
9 files changed, 0 insertions(+), 862 deletions(-)
diff --git a/media-gfx/hugin/ChangeLog b/media-gfx/hugin/ChangeLog
deleted file mode 100644
index 23b8479..0000000
--- a/media-gfx/hugin/ChangeLog
+++ /dev/null
@@ -1,501 +0,0 @@
-# ChangeLog for media-gfx/hugin
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/ChangeLog,v 1.108 2011/02/13 11:03:32 radhermit Exp $
-
- 13 Feb 2011; Tim Harder <radhermit@gentoo.org> hugin-2010.0.0.ebuild,
- hugin-2010.2.0.ebuild, hugin-2010.4.0.ebuild:
- Depend on wxGTK with the X USE flag enabled (bug #354223 by Grygoriy
- Fuchedzhy).
-
-*hugin-2010.4.0 (01 Jan 2011)
-
- 01 Jan 2011; Markus Meier <maekke@gentoo.org> -hugin-2010.4.0_beta1.ebuild,
- -hugin-2010.4.0_beta2.ebuild, -hugin-2010.4.0_rc1.ebuild,
- -hugin-2010.4.0_rc3.ebuild, +hugin-2010.4.0.ebuild:
- version bump to 2010.4.0 final, remove beta/rc releases
-
-*hugin-2010.4.0_rc3 (28 Dec 2010)
-
- 28 Dec 2010; Markus Meier <maekke@gentoo.org> +hugin-2010.4.0_rc3.ebuild:
- version bump
-
-*hugin-2010.4.0_rc1 (25 Dec 2010)
-
- 25 Dec 2010; Markus Meier <maekke@gentoo.org> +hugin-2010.4.0_rc1.ebuild:
- version bump
-
- 05 Dec 2010; Markos Chandras <hwoarang@gentoo.org> hugin-2010.2.0.ebuild:
- Stable on amd64 wrt bug #347633
-
- 05 Dec 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
- hugin-2010.2.0.ebuild:
- x86 stable wrt bug #347633
-
-*hugin-2010.4.0_beta2 (04 Dec 2010)
-
- 04 Dec 2010; Markus Meier <maekke@gentoo.org> +hugin-2010.4.0_beta2.ebuild:
- version bump
-
-*hugin-2010.4.0_beta1 (27 Nov 2010)
-
- 27 Nov 2010; Markus Meier <maekke@gentoo.org> +hugin-2010.4.0_beta1.ebuild:
- version bump to 2010.4 beta1
-
- 08 Nov 2010; Markus Meier <maekke@gentoo.org> hugin-2010.0.0.ebuild,
- hugin-2010.2.0.ebuild:
- change jpeg dep to virtual/jpeg
-
-*hugin-2010.2.0 (13 Oct 2010)
-
- 13 Oct 2010; Markus Meier <maekke@gentoo.org>
- -hugin-2010.2.0_beta1.ebuild, -hugin-2010.2.0_beta2.ebuild,
- -hugin-2010.2.0_rc1.ebuild, -hugin-2010.2.0_rc2.ebuild,
- +hugin-2010.2.0.ebuild:
- version bump, remove prereleases
-
-*hugin-2010.2.0_rc2 (30 Sep 2010)
-
- 30 Sep 2010; Markus Meier <maekke@gentoo.org> +hugin-2010.2.0_rc2.ebuild:
- version bump
-
-*hugin-2010.2.0_rc1 (21 Sep 2010)
-
- 21 Sep 2010; Markus Meier <maekke@gentoo.org> +hugin-2010.2.0_rc1.ebuild:
- version bump
-
- 16 Sep 2010; Tomáš Chvátal <scarabeus@gentoo.org>
- hugin-2010.0.0.ebuild, hugin-2010.2.0_beta1.ebuild,
- hugin-2010.2.0_beta2.ebuild:
- virtual/glut -> media-libs/glut
-
-*hugin-2010.2.0_beta2 (05 Sep 2010)
-
- 05 Sep 2010; Markus Meier <maekke@gentoo.org>
- +hugin-2010.2.0_beta2.ebuild:
- version bump
-
-*hugin-2010.2.0_beta1 (18 Jul 2010)
-
- 18 Jul 2010; Markus Meier <maekke@gentoo.org>
- +hugin-2010.2.0_beta1.ebuild:
- version bump
-
- 27 May 2010; Markus Meier <maekke@gentoo.org> -hugin-2009.2.0.ebuild,
- -hugin-2009.4.0.ebuild:
- old
-
- 25 May 2010; Pacho Ramos <pacho@gentoo.org> hugin-2010.0.0.ebuild:
- stable amd64, bug 320411
-
- 24 May 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
- hugin-2010.0.0.ebuild:
- x86 stable wrt bug #320411
-
- 24 May 2010; <nixnut@gentoo.org> hugin-2010.0.0.ebuild:
- ppc stable #320411
-
- 28 Mar 2010; Markus Meier <maekke@gentoo.org> hugin-2010.0.0.ebuild:
- add pkgconfig to DEPEND by Nikoli in bug #311693
-
-*hugin-2010.0.0 (26 Mar 2010)
-
- 26 Mar 2010; Markus Meier <maekke@gentoo.org> -hugin-2010.0.0_rc1.ebuild,
- +hugin-2010.0.0.ebuild:
- bump to final 2010.0.0 release, remove rc version
-
- 10 Mar 2010; Samuli Suominen <ssuominen@gentoo.org>
- hugin-2010.0.0_rc1.ebuild, +files/hugin-2010.0.0_rc1-libpng14.patch:
- Fix building with libpng14.
-
-*hugin-2010.0.0_rc1 (07 Mar 2010)
-
- 07 Mar 2010; Markus Meier <maekke@gentoo.org> +hugin-2010.0.0_rc1.ebuild:
- version bump to 2010.0.0_rc1
-
- 17 Feb 2010; Markus Meier <maekke@gentoo.org> hugin-2009.4.0.ebuild:
- add virtual/glut to dependencies by Seerp in bug #305049
-
- 09 Jan 2010; Markus Meier <maekke@gentoo.org>
- -files/hugin-0.7.0-gcc44.patch, -files/hugin-0.7.0_rc2-as-needed.patch,
- -hugin-0.8.0.ebuild, -files/hugin-0.8.0_rc3-as-needed.patch,
- -files/hugin-0.8.0_rc4-use_system_cmake_findboost.patch:
- old
-
- 07 Jan 2010; Brent Baude <ranger@gentoo.org> hugin-2009.2.0.ebuild:
- Marking hugin-2009.2.0 ppc for bug 294316
-
- 20 Dec 2009; Olivier Crête <tester@gentoo.org> hugin-2009.2.0.ebuild:
- Stable on amd64, bug #294316
-
- 16 Dec 2009; Christian Faulhammer <fauli@gentoo.org>
- hugin-2009.2.0.ebuild:
- stable x86, bug 294316
-
-*hugin-2009.4.0 (16 Dec 2009)
-
- 16 Dec 2009; Markus Meier <maekke@gentoo.org> -hugin-2009.4.0_rc1.ebuild,
- -hugin-2009.4.0_rc2.ebuild, -hugin-2009.4.0_rc3.ebuild,
- +hugin-2009.4.0.ebuild:
- version bump to 2009.4.0 final release
-
-*hugin-2009.4.0_rc3 (02 Dec 2009)
-
- 02 Dec 2009; Markus Meier <maekke@gentoo.org> +hugin-2009.4.0_rc3.ebuild:
- version bump
-
- 25 Oct 2009; Markus Meier <maekke@gentoo.org> -hugin-0.7.0.ebuild:
- old
-
- 25 Oct 2009; Markus Meier <maekke@gentoo.org> hugin-0.8.0.ebuild:
- amd64/x86 stable, bug #284686
-
- 24 Oct 2009; nixnut <nixnut@gentoo.org> hugin-0.8.0.ebuild:
- ppc stable #284686
-
-*hugin-2009.4.0_rc2 (19 Oct 2009)
-
- 19 Oct 2009; Markus Meier <maekke@gentoo.org> +hugin-2009.4.0_rc2.ebuild:
- bump
-
-*hugin-2009.4.0_rc1 (11 Oct 2009)
-
- 11 Oct 2009; Markus Meier <maekke@gentoo.org> +hugin-2009.4.0_rc1.ebuild:
- version bump
-
-*hugin-2009.2.0 (30 Sep 2009)
-
- 30 Sep 2009; Markus Meier <maekke@gentoo.org>
- -hugin-2009.2.0_beta3.ebuild, +hugin-2009.2.0.ebuild,
- -files/hugin-2009.2.0_beta3-asneeded.patch:
- version bump to final 2009.02.0 release
-
- 29 Sep 2009; Markus Meier <maekke@gentoo.org> hugin-0.7.0.ebuild,
- hugin-0.8.0.ebuild, hugin-2009.2.0_beta3.ebuild:
- block dev-util/cocom due to a file collision wrt bug #280241
-
-*hugin-2009.2.0_beta3 (13 Sep 2009)
-
- 13 Sep 2009; Markus Meier <maekke@gentoo.org> hugin-0.7.0.ebuild,
- -hugin-0.7.0-r1.ebuild, +hugin-2009.2.0_beta3.ebuild,
- +files/hugin-2009.2.0_beta3-asneeded.patch:
- version bump, EAPI=2 for stable ebuild, remove old
-
- 01 Aug 2009; Markus Meier <maekke@gentoo.org> hugin-0.8.0.ebuild:
- tweak x11-libs/wxGTK dep for bug #279653 and bug #269689
-
-*hugin-0.8.0 (26 Jul 2009)
-
- 26 Jul 2009; Markus Meier <maekke@gentoo.org> -hugin-0.8.0_beta1.ebuild,
- -hugin-0.8.0_beta2.ebuild, -hugin-0.8.0_beta3.ebuild,
- -hugin-0.8.0_beta4.ebuild, -hugin-0.8.0_rc1.ebuild,
- -hugin-0.8.0_rc3.ebuild, -hugin-0.8.0_rc4.ebuild, -hugin-0.8.0_rc5.ebuild,
- +hugin-0.8.0.ebuild, -files/hugin-0.8.0_beta1-as-needed.patch,
- -files/hugin-0.8.0_rc3-unset_lapack.patch:
- bump to 0.8.0 final release
-
-*hugin-0.8.0_rc5 (09 Jul 2009)
-
- 09 Jul 2009; Markus Meier <maekke@gentoo.org> +hugin-0.8.0_rc5.ebuild:
- version bump (this will likely be the last rc)
-
- 28 Jun 2009; Tiziano Müller <dev-zero@gentoo.org> hugin-0.8.0_rc4.ebuild,
- +files/hugin-0.8.0_rc4-use_system_cmake_findboost.patch:
- Added patch to make it build with recent boost versions. Removed now
- unnecessary patch from stack. Added missing exiftool dependency.
-
-*hugin-0.8.0_rc4 (27 Jun 2009)
-
- 27 Jun 2009; Markus Meier <maekke@gentoo.org> +hugin-0.8.0_rc4.ebuild:
- version bump
-
- 19 Jun 2009; Tiziano Müller <dev-zero@gentoo.org> hugin-0.8.0_rc3.ebuild,
- +files/hugin-0.8.0_rc3-unset_lapack.patch:
- Added patch to unset LAPACK_LIBRARIES if lapack is not found, otherwise
- cmake sets it to NOTFOUND leading to an error.
-
-*hugin-0.8.0_rc3 (10 Jun 2009)
-
- 10 Jun 2009; Markus Meier <maekke@gentoo.org> +hugin-0.8.0_rc3.ebuild,
- +files/hugin-0.8.0_rc3-as-needed.patch:
- version bump to 0.8.0_rc3, with (experimental) lapack support
-
- 24 May 2009; Markus Meier <maekke@gentoo.org> hugin-0.7.0.ebuild,
- hugin-0.7.0-r1.ebuild, +files/hugin-0.7.0-gcc44.patch:
- fix building with gcc-4.4 by David Watzke, bug #270593
-
-*hugin-0.8.0_rc1 (07 May 2009)
-
- 07 May 2009; Markus Meier <maekke@gentoo.org> +hugin-0.8.0_rc1.ebuild:
- version bump
-
-*hugin-0.8.0_beta4 (01 May 2009)
-
- 01 May 2009; Markus Meier <maekke@gentoo.org> +hugin-0.8.0_beta4.ebuild:
- version bump
-
-*hugin-0.8.0_beta3 (04 Apr 2009)
-
- 04 Apr 2009; Markus Meier <maekke@gentoo.org> +hugin-0.8.0_beta3.ebuild:
- version bump to 0.8.0_beta3
-
- 19 Mar 2009; Markus Meier <maekke@gentoo.org> hugin-0.7.0.ebuild,
- hugin-0.7.0-r1.ebuild:
- assign RDEPEND
-
- 19 Mar 2009; Markus Meier <maekke@gentoo.org>
- -files/hugin-0.6.1-1_0.6.1-1.1.patch, -files/hugin-0.6.1-as-needed.patch,
- -files/hugin-0.6.1-gcc43.patch, -hugin-0.6.1-r2.ebuild:
- old
-
- 18 Mar 2009; Joseph Jezak <josejx@gentoo.org> hugin-0.7.0.ebuild:
- Marked ppc stable for bug #246827.
-
- 11 Mar 2009; Markus Meier <maekke@gentoo.org> hugin-0.8.0_beta2.ebuild:
- add en_GB language, fix IUSE assignement and raise libpano13 dep
-
-*hugin-0.8.0_beta2 (09 Mar 2009)
-
- 09 Mar 2009; Markus Meier <maekke@gentoo.org> +hugin-0.8.0_beta2.ebuild:
- bump to hugin-0.8.0_beta2
-
-*hugin-0.8.0_beta1 (25 Feb 2009)
-
- 25 Feb 2009; Markus Meier <maekke@gentoo.org>
- +files/hugin-0.8.0_beta1-as-needed.patch, +hugin-0.8.0_beta1.ebuild:
- bump to hugin-0.8.0_beta1
-
- 02 Dec 2008; <chainsaw@gentoo.org> hugin-0.7.0.ebuild,
- hugin-0.7.0-r1.ebuild:
- Add ~ppc keyword based on PowerBook6,7 testing by Christian "papillon81"
- Schmitt <chrschmitt@gmail.com>. Closes bug #234909.
-
- 28 Nov 2008; Markus Meier <maekke@gentoo.org>
- -files/hugin-0.7_beta4-insec-file.patch,
- -files/hugin-0.7_beta4-as-needed.patch, -hugin-0.7_beta4-r1.ebuild,
- hugin-0.7.0.ebuild, hugin-0.7.0-r1.ebuild:
- add missing media-gfx/exiv2 dependency for bug #248628; remove old
-
- 26 Nov 2008; Ryan Hill <dirtyepic@gentoo.org> hugin-0.7.0.ebuild:
- Call wxwidgets_pkg_setup.
-
- 22 Nov 2008; Markus Meier <maekke@gentoo.org> hugin-0.7.0.ebuild:
- amd64/x86 stable, bug #246827
-
- 08 Oct 2008; Markus Meier <maekke@gentoo.org> hugin-0.6.1-r2.ebuild:
- add missing x11-libs/gtk+ dep, bug #239698
-
- 06 Oct 2008; Markus Meier <maekke@gentoo.org> hugin-0.7.0-r1.ebuild:
- fix broken dep on dev-libs/boost, thanks to voyageur and Betelgeuse
-
-*hugin-0.7.0-r1 (06 Oct 2008)
-*hugin-0.7.0 (06 Oct 2008)
-
- 06 Oct 2008; Markus Meier <maekke@gentoo.org> -hugin-0.7.0_rc2.ebuild,
- -hugin-0.7.0_rc3.ebuild, -hugin-0.7.0_rc4.ebuild, -hugin-0.7.0_rc5.ebuild,
- -hugin-0.7.0_rc6.ebuild, +hugin-0.7.0.ebuild, +hugin-0.7.0-r1.ebuild:
- bump to 0.7.0 final release (-r1 is an EAPI=2 version of the ebuild, -r0
- is a stable candidate), remove old
-
-*hugin-0.7.0_rc6 (15 Sep 2008)
-
- 15 Sep 2008; Markus Meier <maekke@gentoo.org> +hugin-0.7.0_rc6.ebuild:
- bump to 0.7.0_rc6
-
-*hugin-0.7.0_rc5 (15 Sep 2008)
-
- 15 Sep 2008; Markus Meier <maekke@gentoo.org> +hugin-0.7.0_rc5.ebuild:
- bump to 0.7.0_rc5
-
-*hugin-0.7.0_rc4 (02 Sep 2008)
-
- 02 Sep 2008; Markus Meier <maekke@gentoo.org> +hugin-0.7.0_rc4.ebuild:
- bump to 0.7.0_rc4
-
-*hugin-0.7.0_rc3 (28 Aug 2008)
-
- 28 Aug 2008; Markus Meier <maekke@gentoo.org> +hugin-0.7.0_rc3.ebuild:
- bump to 0.7.0_rc3
-
- 18 Aug 2008; Markus Meier <maekke@gentoo.org>
- +files/hugin-0.7.0_rc2-as-needed.patch, hugin-0.7.0_rc2.ebuild:
- fix building with --as-needed, bug #235004
-
-*hugin-0.7.0_rc2 (16 Aug 2008)
-
- 16 Aug 2008; Markus Meier <maekke@gentoo.org> metadata.xml,
- +hugin-0.7.0_rc2.ebuild:
- bump to hugin-0.7.0_rc2; describe local use flags in metadata.xml
-
- 10 May 2008; Mike Frysinger <vapier@gentoo.org> hugin-0.7_beta4-r1.ebuild:
- Also apply gcc-4.3 patch to hugin-0.7_beta4-r1.
-
- 02 May 2008; Markus Meier <maekke@gentoo.org>
- +files/hugin-0.6.1-gcc43.patch, hugin-0.6.1-r2.ebuild:
- fix building with gcc-4.3 by Peter Alfredsen, bug #219783
-
- 16 Mar 2008; Markus Meier <maekke@gentoo.org> hugin-0.6.1-r2.ebuild:
- zip dep is also needed in hugin-0.6
-
- 09 Mar 2008; Markus Meier <maekke@gentoo.org> hugin-0.7_beta4-r1.ebuild:
- add app-arch/zip dep, bug #212808
-
- 12 Jan 2008; Markus Meier <maekke@gentoo.org>
- -files/hugin-0.5-gcc41.patch, -files/hugin-0.5_rc2-gcc4.patch,
- -hugin-0.5_rc1-r2.ebuild, -hugin-0.5.ebuild, -hugin-0.6.1.ebuild,
- -hugin-0.6.1-r1.ebuild:
- old
-
- 11 Jan 2008; nixnut <nixnut@gentoo.org> hugin-0.6.1-r2.ebuild:
- Stable on ppc wrt bug 205154
-
- 17 Dec 2007; Christian Faulhammer <opfer@gentoo.org>
- hugin-0.6.1-r2.ebuild:
- stable x86, bug 202095
-
- 16 Dec 2007; Samuli Suominen <drac@gentoo.org> hugin-0.6.1-r2.ebuild:
- amd64 stable wrt #180381
-
-*hugin-0.7_beta4-r1 (03 Dec 2007)
-*hugin-0.6.1-r2 (03 Dec 2007)
-
- 03 Dec 2007; Markus Meier <maekke@gentoo.org>
- +files/hugin-0.6.1-as-needed.patch,
- +files/hugin-0.7_beta4-as-needed.patch,
- +files/hugin-0.7_beta4-insec-file.patch, +hugin-0.6.1-r2.ebuild,
- -hugin-0.7_beta4.ebuild, +hugin-0.7_beta4-r1.ebuild:
- revision bump, fix as-needed (bug #180381), also fix security bug #195996
- for 0.7
-
- 14 Nov 2007; Peter Weller <welp@gentoo.org> hugin-0.6.1-r1.ebuild:
- Stable on amd64 wrt bug 195996
-
- 26 Oct 2007; Luca Barbato <lu_zero@gentoo.org> hugin-0.6.1-r1.ebuild:
- Marked ppc
-
- 26 Oct 2007; Markus Meier <maekke@gentoo.org> hugin-0.6.1-r1.ebuild:
- x86 stable, security bug #195996
-
-*hugin-0.6.1-r1 (25 Oct 2007)
-
- 25 Oct 2007; Luca Barbato <lu_zero@gentoo.org>
- +files/hugin-0.6.1-1_0.6.1-1.1.patch, +hugin-0.6.1-r1.ebuild:
- Security Fix, see bug #195996. Debian patch applied
-
- 13 Oct 2007; Ryan Hill <dirtyepic@gentoo.org> hugin-0.5_rc1-r2.ebuild,
- hugin-0.5.ebuild, hugin-0.6.1.ebuild, hugin-0.7_beta4.ebuild:
- Lock wxGTK to 2.6.
-
- 23 Jul 2007; Luca Barbato <lu_zero@gentoo.org> hugin-0.6.1.ebuild,
- hugin-0.7_beta4.ebuild:
- Fix the bad fix I committed before
-
- 15 Jul 2007; Luca Barbato <lu_zero@gentoo.org> hugin-0.6.1.ebuild,
- hugin-0.7_beta4.ebuild:
- make hugin build with newer boost, thanks to Jakub for the fix in bug #181414
-
- 30 Apr 2007; Marius Mauch <genone@gentoo.org> hugin-0.5_rc1-r2.ebuild,
- hugin-0.6.1.ebuild, hugin-0.7_beta4.ebuild:
- Replacing einfo with elog
-
- 16 Apr 2007; Christian Faulhammer <opfer@gentoo.org> hugin-0.6.1.ebuild:
- stable amd64, bug 173068
-
- 08 Apr 2007; Joseph Jezak <josejx@gentoo.org> hugin-0.6.1.ebuild:
- Marked ppc stable for bug #173068.
-
- 06 Apr 2007; Christian Faulhammer <opfer@gentoo.org> hugin-0.6.1.ebuild:
- stable x86, bug 173068
-
- 05 Apr 2007; Marcelo Goes <vanquirius@gentoo.org> hugin-0.6.1.ebuild,
- hugin-0.7_beta4.ebuild:
- Depend on >=media-gfx/enblend-2.4 if the enblend flag is set for bug 173418.
- Thanks to Nicolas Laurent <nicolas.mario at gmail dot com>.
-
-*hugin-0.7_beta4 (02 Apr 2007)
-
- 02 Apr 2007; Marcelo Goes <vanquirius@gentoo.org> +hugin-0.7_beta4.ebuild:
- Add 0.7_beta4 for bug 141617. In package.mask for now. Thanks again to
- people who contributed in the bug.
-
- 03 Mar 2007; Marcelo Goes <vanquirius@gentoo.org> hugin-0.6.1.ebuild:
- Improve einfo explanation for enblend and sift USE flags for bug 141617.
- Thanks to Tim Harder <thorium90 at gmail dot com>.
-
-*hugin-0.6.1 (23 Feb 2007)
-
- 23 Feb 2007; Marcelo Goes <vanquirius@gentoo.org> +hugin-0.6.1.ebuild:
- 0.6.1 version bump for bug 141617. Thanks to David Grant <davidgrant at
- gmail dot com>, Hal Engel <hvengel at astound dot net>, Tarmo Tanav <sn4ip3r
- at estprog dot ee>, Emmanuel Favre_Nicolin <manouchk at gmail dot com>, Paul
- Berens <pjb8774 at rit dot edu>, Johann Cardon <johann.cardon at free dot
- fr>, Patrick Huber <phuber at swisstech dot net>, Toon Verstraelen
- <Toon.Verstraelen at UGent dot be>, Paul de Vries <phsdv at tiscali dot fr>,
- Norman Thomas <news at hiroki dot de>, Christian Kanzian <christian.kanzian
- at gmx dot at>, Jorge Nerin <gentoo-bugs at redvip.homelinux dot net>, Tim
- Harder <thorium90 at gmail dot com>, Serge Gavrilov <serge at pdmi dot ras
- dot ru>, Andrew Wilchak <azdruid at gmail dot com>, Chris Mayo <mayo at
- clara dot co dot uk> and anyone I could have missed.
-
- 22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
- Transition to Manifest2.
-
- 24 Sep 2006; Olivier Crête <tester@gentoo.org> hugin-0.5.ebuild:
- Stable on amd64
-
- 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> hugin-0.5.ebuild:
- Stable on x86
-
- 20 Feb 2006; Mark Loeser <halcy0n@gentoo.org> metadata.xml:
- metadata.xml cleanup
-
- 15 Jan 2006; Mark Loeser <halcy0n@gentoo.org>
- +files/hugin-0.5-gcc41.patch, hugin-0.5.ebuild:
- Add dep on enblend, and also add patch to fix compilation with gcc-4.1
-
-*hugin-0.5 (18 Dec 2005)
-
- 18 Dec 2005; Mark Loeser <halcy0n@gentoo.org> -hugin-0.5_rc2.ebuild,
- +hugin-0.5.ebuild:
- Bump to 0.5; bug #115714, and clean out old versions
-
- 26 Nov 2005; Mark Loeser <halcy0n@gentoo.org>
- files/hugin-0.5_rc2-gcc4.patch:
- Fix gcc4 patch
-
- 19 Nov 2005; Mark Loeser <halcy0n@gentoo.org>
- +files/hugin-0.5_rc2-gcc4.patch, hugin-0.5_rc2.ebuild:
- Add patch to fix compilation with gcc4.
-
-*hugin-0.5_rc1-r2 (16 Oct 2005)
-
- 16 Oct 2005; Mark Loeser <halcy0n@gentoo.org> -hugin-0.5_rc1.ebuild,
- -hugin-0.5_rc1-r1.ebuild, +hugin-0.5_rc1-r2.ebuild:
- Fixing the default autopano executable. This ebuild also gets rid of the gtk2
- useflag
-
-*hugin-0.5_rc2 (01 Oct 2005)
-*hugin-0.5_rc1-r1 (01 Oct 2005)
-
- 01 Oct 2005; Mark Loeser <halcy0n@gentoo.org> +hugin-0.5_rc1-r1.ebuild,
- +hugin-0.5_rc2.ebuild:
- Remove gtk useflag, since gtk2 is the only available toolkit. Bump to _rc2.
- bug #107776
-
- 16 Sep 2005; Mark Loeser <halcy0n@gentoo.org> hugin-0.5_rc1.ebuild:
- Stable on x86
-
- 21 Aug 2005; Luis Medinas <metalgod@gentoo.org> hugin-0.5_rc1.ebuild:
- Added ~amd64 keywords. Closes bug #103254.
-
- 11 Aug 2005; David Holm <dholm@gentoo.org> hugin-0.5_rc1.ebuild:
- Added to ~ppc.
-
-*hugin-0.5_rc1 (10 Aug 2005)
-
- 10 Aug 2005; Mark Loeser <halcy0n@gentoo.org> +metadata.xml,
- +hugin-0.5_rc1.ebuild:
- Initial commit of hugin. Thanks to everyone on bug #48269
-
diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
deleted file mode 100644
index 2b5d897..0000000
--- a/media-gfx/hugin/Manifest
+++ /dev/null
@@ -1,23 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX hugin-2010.0.0_rc1-libpng14.patch 722 RMD160 83a65c1c8931490c339b87d8302495180750c17f SHA1 0396e246c4ec90aa21a7a0076836d8ebb4d052ed SHA256 2cd425ff1c6036e13b33b83d2772f7c4282fbfb8872c4402efb4e074318d295a
-DIST hugin-2010.0.0.tar.gz 12085453 RMD160 e2b03fe00a4a0242a1f3c4fd641cf8a3e312d516 SHA1 41eb7253aab12b913a5c9b6d9975d8652390dcb5 SHA256 ed30c5021709b8970a43f1e4c2295b5c899bc0fb87ffb63135a3c0ecde3bb523
-DIST hugin-2010.2.0.tar.gz 12412050 RMD160 c39d279bf95cdf5686e5994030bb4eb61ba285aa SHA1 f0676f28cd3fbebcf4086f55af7cf09566772899 SHA256 70fd1d5ffa017b3eb14e0760cd70185aab641aa343d129f9590826b01d5df2e2
-DIST hugin-2010.4.0.tar.bz2 11009978 RMD160 f97b8d37470443eb81c3e915e5f5efa91227b135 SHA1 47f25c0a8b97c27108e567bcd22203c87f268d07 SHA256 d45cc65df6b424ef5bf1c5d2cd99a360ecfda46688782c75f36dd5341cb9c38e
-DIST hugin-2011.0.0_beta3.tar.bz2 11075451 RMD160 5d247a41b2f3febd4067e7326be714db6b3c6cf6 SHA1 60f65a73c98986004ddacf5d4fee64dbab3e8166 SHA256 2fc658beec3f873db924fcc4e426799e1e6df9e3d37b760049ad55223f24479e
-DIST hugin-2011.0.0_rc1.tar.bz2 11478389 RMD160 885c584b12a12ef405453b4be68a5b5acc122cb9 SHA1 be8aa338705880dea5119662fe073ea06521440a SHA256 435a336ab62d639be518453dd500bc3cc7c4f3723fac3c14aecf4531867d7fb2
-EBUILD hugin-2010.0.0.ebuild 1500 RMD160 26b67785fc8c32833f361d842d157ff33674433d SHA1 94668bb4d6ec5429e879a56577cee24683d42ba9 SHA256 7c2f14d494b942a80e1d2eca0d0793d93bf6ecaebc8e5430f5c98e663a5cc87f
-EBUILD hugin-2010.2.0.ebuild 1459 RMD160 65f44050a6b79fcac57561f03a65fe8c4e984623 SHA1 bd4552e2c0a8ced25105261ae8306ce6f173d6fe SHA256 0ab6582890f6d5de0ce3c2236ef0b0141275ddedf2e25991090a4eafc7f683bc
-EBUILD hugin-2010.4.0.ebuild 1624 RMD160 a0c1421c4bb9eab86a29b83e76c8183c0511e901 SHA1 fb9c42d26fd72d9a222ef845a4a1886de7f70eb3 SHA256 fc37d11de993b11b199f9204daf543818da8db5bb08b2cec266d417542ba7508
-EBUILD hugin-2011.0.0_beta3.ebuild 1621 RMD160 6b7f36a1d167cc8a532ea2843d5dfde95b3d9e27 SHA1 bd05b079a51b912f4ba59f1393c8d22c7da9ec66 SHA256 13c37e7b969ffe3d7e565d73ef2c3bd032fcafbe1f28bffd037a630966cc1070
-EBUILD hugin-2011.0.0_rc1.ebuild 1617 RMD160 2a3bbc903e1e3e28812b0af1f8d84dffccb3180d SHA1 341ed397c9b3bd7d0926a64967a5f0f37a474543 SHA256 958495d5bed35362f08af2de74d82e307857693b4254c84728797f8ceab0a808
-MISC ChangeLog 17449 RMD160 4ec41dd55d4a6a465ac884e3bbb479007024acfb SHA1 88bb30c891b84ac0275b26fafc3e7e84ea87de7e SHA256 03b259c91aa42ac1fecdfa7d228221c16d3386016ea25f519f1cb638e51e66bc
-MISC metadata.xml 389 RMD160 245f5d872a463181d63366d6c76a82c87d020fd7 SHA1 a26b77c69d62bedb9789e79b5ca35f28fa56981d SHA256 6f26cd9c2b64a96c1c86a8a468a261af4cf4dfaa86b4d7ddcfaee1ca98314803
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk3UQdIACgkQkKaRLQcq0GLzhACggjXMw8wlap/c+9/yUD6kz2oY
-mtMAnjFirNIF5tN2JInBWDCSHw8c0AYe
-=TMfU
------END PGP SIGNATURE-----
diff --git a/media-gfx/hugin/files/hugin-2010.0.0_rc1-libpng14.patch b/media-gfx/hugin/files/hugin-2010.0.0_rc1-libpng14.patch
deleted file mode 100644
index fdc0263..0000000
--- a/media-gfx/hugin/files/hugin-2010.0.0_rc1-libpng14.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-http://repos.archlinux.org/wsvn/packages/hugin/trunk/libpng14.patch
-
---- src/foreign/vigra/vigra_impex/png.cxx
-+++ src/foreign/vigra/vigra_impex/png.cxx
-@@ -271,8 +271,8 @@
- // expand gray values to at least one byte size
- if ( color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8 ) {
- if (setjmp(png->jmpbuf))
-- vigra_postcondition( false,png_error_message.insert(0, "error in png_set_gray_1_2_4_to_8(): ").c_str());
-- png_set_gray_1_2_4_to_8(png);
-+ vigra_postcondition( false,png_error_message.insert(0, "error in png_set_expand_gray_1_2_4_to_8(): ").c_str());
-+ png_set_expand_gray_1_2_4_to_8(png);
- bit_depth = 8;
- }
-
diff --git a/media-gfx/hugin/hugin-2010.0.0.ebuild b/media-gfx/hugin/hugin-2010.0.0.ebuild
deleted file mode 100644
index 8e48445..0000000
--- a/media-gfx/hugin/hugin-2010.0.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2010.0.0.ebuild,v 1.8 2011/02/13 11:03:32 radhermit Exp $
-
-EAPI=2
-WX_GTK_VER="2.8"
-
-inherit cmake-utils wxwidgets versionator
-
-DESCRIPTION="GUI for the creation & processing of panoramic images"
-HOMEPAGE="http://hugin.sf.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="GPL-2 SIFT"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-LANGS=" bg ca cs de en_GB es fi fr hu it ja ko nl pl pt_BR ru sk sl sv uk zh_CN zh_TW"
-IUSE="lapack +sift $(echo ${LANGS//\ /\ linguas_})"
-
-CDEPEND="
- !!dev-util/cocom
- app-arch/zip
- >=dev-libs/boost-1.35.0-r5
- >=media-gfx/enblend-3.0_p20080807
- media-gfx/exiv2
- media-libs/freeglut
- >=media-libs/libpano13-2.9.14
- media-libs/libpng
- media-libs/openexr
- media-libs/tiff
- sys-libs/zlib
- virtual/jpeg
- x11-libs/wxGTK:2.8[X,opengl,-odbc]
- lapack? ( virtual/lapack )
- sift? ( media-gfx/autopano-sift-C )"
-RDEPEND="${CDEPEND}
- media-libs/exiftool"
-DEPEND="${CDEPEND}
- dev-util/pkgconfig"
-
-S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)
-
-PATCHES=( "${FILESDIR}/${P}_rc1-libpng14.patch" )
-
-pkg_setup() {
- DOCS="AUTHORS README TODO"
- mycmakeargs="$(cmake-utils_use_enable lapack)"
-}
-
-src_install() {
- cmake-utils_src_install
-
- for lang in ${LANGS} ; do
- case ${lang} in
- ca) dir=ca_ES;;
- cs) dir=cs_CZ;;
- *) dir=${lang};;
- esac
- use linguas_${lang} || rm -r "${D}"/usr/share/locale/${dir}
- done
-}
diff --git a/media-gfx/hugin/hugin-2010.2.0.ebuild b/media-gfx/hugin/hugin-2010.2.0.ebuild
deleted file mode 100644
index 715ef39..0000000
--- a/media-gfx/hugin/hugin-2010.2.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2010.2.0.ebuild,v 1.5 2011/02/13 11:03:32 radhermit Exp $
-
-EAPI=2
-WX_GTK_VER="2.8"
-
-inherit cmake-utils wxwidgets versionator
-
-DESCRIPTION="GUI for the creation & processing of panoramic images"
-HOMEPAGE="http://hugin.sf.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="GPL-2 SIFT"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-
-LANGS=" bg ca cs de en_GB es fi fr hu it ja ko nl pl pt_BR ru sk sl sv uk zh_CN zh_TW"
-IUSE="lapack +sift $(echo ${LANGS//\ /\ linguas_})"
-
-CDEPEND="
- !!dev-util/cocom
- app-arch/zip
- >=dev-libs/boost-1.35.0-r5
- >=media-gfx/enblend-3.0_p20080807
- media-gfx/exiv2
- media-libs/freeglut
- >=media-libs/libpano13-2.9.17
- media-libs/libpng
- media-libs/openexr
- media-libs/tiff
- sys-libs/zlib
- virtual/jpeg
- x11-libs/wxGTK:2.8[X,opengl,-odbc]
- lapack? ( virtual/lapack )
- sift? ( media-gfx/autopano-sift-C )"
-RDEPEND="${CDEPEND}
- media-libs/exiftool"
-DEPEND="${CDEPEND}
- dev-util/pkgconfig"
-
-S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)
-
-pkg_setup() {
- DOCS="AUTHORS README TODO"
- mycmakeargs=( $(cmake-utils_use_enable lapack LAPACK) )
-}
-
-src_install() {
- cmake-utils_src_install
-
- for lang in ${LANGS} ; do
- case ${lang} in
- ca) dir=ca_ES;;
- cs) dir=cs_CZ;;
- *) dir=${lang};;
- esac
- use linguas_${lang} || rm -r "${D}"/usr/share/locale/${dir}
- done
-}
diff --git a/media-gfx/hugin/hugin-2010.4.0.ebuild b/media-gfx/hugin/hugin-2010.4.0.ebuild
deleted file mode 100644
index fe86169..0000000
--- a/media-gfx/hugin/hugin-2010.4.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2010.4.0.ebuild,v 1.2 2011/02/13 11:03:32 radhermit Exp $
-
-EAPI=2
-WX_GTK_VER="2.8"
-
-inherit cmake-utils wxwidgets versionator
-
-DESCRIPTION="GUI for the creation & processing of panoramic images"
-HOMEPAGE="http://hugin.sf.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-LICENSE="GPL-2 SIFT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-LANGS=" bg ca cs de en_GB es fi fr hu it ja ko nl pl pt_BR ru sk sl sv uk zh_CN zh_TW"
-IUSE="lapack sift $(echo ${LANGS//\ /\ linguas_})"
-
-CDEPEND="
- !!dev-util/cocom
- app-arch/zip
- >=dev-libs/boost-1.35.0-r5
- >=media-gfx/enblend-3.0_p20080807
- media-gfx/exiv2
- media-libs/freeglut
- >=media-libs/libpano13-2.9.17
- media-libs/libpng
- media-libs/openexr
- media-libs/tiff
- sys-libs/zlib
- virtual/jpeg
- x11-libs/wxGTK:2.8[X,opengl,-odbc]
- lapack? ( virtual/lapack )
- sift? ( media-gfx/autopano-sift-C )"
-RDEPEND="${CDEPEND}
- media-libs/exiftool"
-DEPEND="${CDEPEND}
- dev-util/pkgconfig"
-
-S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)
-
-pkg_setup() {
- DOCS="authors.txt README TODO"
- mycmakeargs=( $(cmake-utils_use_enable lapack LAPACK) )
-}
-
-src_install() {
- cmake-utils_src_install
-
- for lang in ${LANGS} ; do
- case ${lang} in
- ca) dir=ca_ES;;
- cs) dir=cs_CZ;;
- *) dir=${lang};;
- esac
- use linguas_${lang} || rm -r "${D}"/usr/share/locale/${dir}
- done
-}
-
-pkg_postinst() {
- elog "Please note that the sift USE-flag has been disabled by default"
- elog "as hugin ships its own control point generator with 2010.4"
-}
diff --git a/media-gfx/hugin/hugin-2011.0.0_beta3.ebuild b/media-gfx/hugin/hugin-2011.0.0_beta3.ebuild
deleted file mode 100644
index a2cd162..0000000
--- a/media-gfx/hugin/hugin-2011.0.0_beta3.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2010.4.0.ebuild,v 1.2 2011/02/13 11:03:32 radhermit Exp $
-
-EAPI=2
-WX_GTK_VER="2.8"
-
-inherit cmake-utils wxwidgets versionator
-
-DESCRIPTION="GUI for the creation & processing of panoramic images"
-HOMEPAGE="http://hugin.sf.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-LICENSE="GPL-2 SIFT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-LANGS=" bg ca cs de en_GB es fi fr hu it ja ko nl pl pt_BR ro ru sk sl sv uk zh_CN zh_TW"
-IUSE="lapack sift $(echo ${LANGS//\ /\ linguas_})"
-
-CDEPEND="
- !!dev-util/cocom
- app-arch/zip
- >=dev-libs/boost-1.35.0-r5
- >=media-gfx/enblend-4.0
- media-gfx/exiv2
- media-libs/freeglut
- >=media-libs/libpano13-2.9.18_rc1
- media-libs/libpng
- media-libs/openexr
- media-libs/tiff
- sys-libs/zlib
- virtual/jpeg
- x11-libs/wxGTK:2.8[X,opengl,-odbc]
- lapack? ( virtual/lapack )
- sift? ( media-gfx/autopano-sift-C )"
-RDEPEND="${CDEPEND}
- media-libs/exiftool"
-DEPEND="${CDEPEND}
- dev-util/pkgconfig"
-
-S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)
-
-pkg_setup() {
- DOCS="authors.txt README TODO"
- mycmakeargs=( $(cmake-utils_use_enable lapack LAPACK) )
-}
-
-src_install() {
- cmake-utils_src_install
-
- for lang in ${LANGS} ; do
- case ${lang} in
- ca) dir=ca_ES;;
- cs) dir=cs_CZ;;
- *) dir=${lang};;
- esac
- use linguas_${lang} || rm -r "${D}"/usr/share/locale/${dir}
- done
-}
-
-pkg_postinst() {
- elog "Please note that the sift USE-flag has been disabled by default"
- elog "as hugin ships its own control point generator with 2010.4"
-}
diff --git a/media-gfx/hugin/hugin-2011.0.0_rc1.ebuild b/media-gfx/hugin/hugin-2011.0.0_rc1.ebuild
deleted file mode 100644
index f2a8eca..0000000
--- a/media-gfx/hugin/hugin-2011.0.0_rc1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2010.4.0.ebuild,v 1.2 2011/02/13 11:03:32 radhermit Exp $
-
-EAPI=2
-WX_GTK_VER="2.8"
-
-inherit cmake-utils wxwidgets versionator
-
-DESCRIPTION="GUI for the creation & processing of panoramic images"
-HOMEPAGE="http://hugin.sf.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-LICENSE="GPL-2 SIFT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-LANGS=" bg ca cs de en_GB es fi fr hu it ja ko nl pl pt_BR ro ru sk sl sv uk zh_CN zh_TW"
-IUSE="lapack sift $(echo ${LANGS//\ /\ linguas_})"
-
-CDEPEND="
- !!dev-util/cocom
- app-arch/zip
- >=dev-libs/boost-1.35.0-r5
- >=media-gfx/enblend-4.0
- media-gfx/exiv2
- media-libs/freeglut
- >=media-libs/libpano13-2.9.18
- media-libs/libpng
- media-libs/openexr
- media-libs/tiff
- sys-libs/zlib
- virtual/jpeg
- x11-libs/wxGTK:2.8[X,opengl,-odbc]
- lapack? ( virtual/lapack )
- sift? ( media-gfx/autopano-sift-C )"
-RDEPEND="${CDEPEND}
- media-libs/exiftool"
-DEPEND="${CDEPEND}
- dev-util/pkgconfig"
-
-S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)
-
-pkg_setup() {
- DOCS="authors.txt README TODO"
- mycmakeargs=( $(cmake-utils_use_enable lapack LAPACK) )
-}
-
-src_install() {
- cmake-utils_src_install
-
- for lang in ${LANGS} ; do
- case ${lang} in
- ca) dir=ca_ES;;
- cs) dir=cs_CZ;;
- *) dir=${lang};;
- esac
- use linguas_${lang} || rm -r "${D}"/usr/share/locale/${dir}
- done
-}
-
-pkg_postinst() {
- elog "Please note that the sift USE-flag has been disabled by default"
- elog "as hugin ships its own control point generator with 2010.4"
-}
diff --git a/media-gfx/hugin/metadata.xml b/media-gfx/hugin/metadata.xml
deleted file mode 100644
index 1c5a459..0000000
--- a/media-gfx/hugin/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>graphics</herd>
- <longdescription>hugin is a panorama stitching program</longdescription>
- <use>
- <flag name='sift'>automatically align images with
- <pkg>media-gfx/autopano-sift</pkg> or
- <pkg>media-gfx/autopano-sift-C</pkg></flag>
- </use>
-</pkgmetadata>
^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2015-11-07 6:37 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-10-02 21:37 [gentoo-commits] dev/maekke:master commit in: media-gfx/hugin/files/, media-gfx/hugin/ Markus Meier
-- strict thread matches above, loose matches on Subject: below --
2015-11-07 6:37 Markus Meier
2015-01-02 18:31 Markus Meier
2013-12-17 21:01 Markus Meier
2012-11-18 16:21 Markus Meier
2012-07-26 20:17 Markus Meier
2011-11-05 10:21 Markus Meier
2011-06-23 21:54 Markus Meier
2011-05-20 19:20 Markus Meier
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox