diff options
| author |   Markus Meier <maekke@gentoo.org> | 2014-10-10 20:12:04 +0000 |
|---|---|---|
| committer | Markus Meier <maekke@gentoo.org> | 2014-10-10 20:12:04 +0000 |
| commit | cdedb4830aa1b6fd94bcb79808620b0dc4730fb1 (patch) | |
| tree | 48f0f0484bcefc9cd0e87e5a35317a6af79bef7d /media-gfx/hugin | |
| parent | arm stable, bug #523900 (diff) | |
| download | gentoo-2-cdedb4830aa1b6fd94bcb79808620b0dc4730fb1.tar.gz gentoo-2-cdedb4830aa1b6fd94bcb79808620b0dc4730fb1.tar.bz2 gentoo-2-cdedb4830aa1b6fd94bcb79808620b0dc4730fb1.zip | |
version bump, fix building with media-libs/lensfun-0.3.0 by Francesco Riosa in bug #524700
(Portage version: 2.2.14_rc1/cvs/Linux x86_64, signed Manifest commit with key 072AD062)
Diffstat (limited to 'media-gfx/hugin')
| -rw-r--r-- | media-gfx/hugin/ChangeLog | 9 | ||||
| -rw-r--r-- | media-gfx/hugin/files/hugin-2014.0.0-lensfun-0.3.0.patch | 15 | ||||
| -rw-r--r-- | media-gfx/hugin/hugin-2014.0.0.ebuild (renamed from media-gfx/hugin/hugin-2014.0.0_rc4.ebuild) | 4 |
3 files changed, 26 insertions, 2 deletions
diff --git a/media-gfx/hugin/ChangeLog b/media-gfx/hugin/ChangeLog index bf145392386e..d8fcf5204232 100644 --- a/media-gfx/hugin/ChangeLog +++ b/media-gfx/hugin/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-gfx/hugin # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/ChangeLog,v 1.149 2014/09/27 11:33:09 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/ChangeLog,v 1.150 2014/10/10 20:12:04 maekke Exp $ + +*hugin-2014.0.0 (10 Oct 2014) + + 10 Oct 2014; Markus Meier <maekke@gentoo.org> -hugin-2014.0.0_rc4.ebuild, + +hugin-2014.0.0.ebuild, +files/hugin-2014.0.0-lensfun-0.3.0.patch: + version bump, fix building with media-libs/lensfun-0.3.0 by Francesco Riosa + in bug #524700 27 Sep 2014; Markus Meier <maekke@gentoo.org> hugin-2014.0.0_rc4.ebuild: call python eclass functions depending on USE=python, by Kent Fredric in bug 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 new file mode 100644 index 000000000000..f60e68663484 --- /dev/null +++ b/media-gfx/hugin/files/hugin-2014.0.0-lensfun-0.3.0.patch @@ -0,0 +1,15 @@ +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_rc4.ebuild b/media-gfx/hugin/hugin-2014.0.0.ebuild index 228cffd31e5b..5d4e69616a6e 100644 --- a/media-gfx/hugin/hugin-2014.0.0_rc4.ebuild +++ b/media-gfx/hugin/hugin-2014.0.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2014.0.0_rc4.ebuild,v 1.3 2014/09/27 11:33:09 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2014.0.0.ebuild,v 1.1 2014/10/10 20:12:04 maekke Exp $ EAPI=5 @@ -51,6 +51,8 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" S=${WORKDIR}/${PN}-$(get_version_component_range 1-3) +PATCHES=( "${FILESDIR}"/${P}-lensfun-0.3.0.patch ) + pkg_setup() { DOCS="authors.txt README TODO" mycmakeargs=( |