| 1 |
jlec 13/11/24 16:42:32 |
| 2 |
|
| 3 |
Modified: metadata.xml hugin-2013.0.0.ebuild ChangeLog |
| 4 |
Added: hugin-9999.ebuild hugin-2012.0.0-r1.ebuild |
| 5 |
Log: |
| 6 |
media-gfx/hugin: Backport fix for building with newer boost; Use system cmake modules to detect lapack; backport patch to use perl 5.16; fixes bugs #296510,300127,373387,374337,388149,404227,484238 |
| 7 |
|
| 8 |
(Portage version: 2.2.7/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key B9D4F231BD1558AB!) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.6 media-gfx/hugin/metadata.xml |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/hugin/metadata.xml?rev=1.6&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/hugin/metadata.xml?rev=1.6&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/hugin/metadata.xml?r1=1.5&r2=1.6 |
| 16 |
|
| 17 |
Index: metadata.xml |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/media-gfx/hugin/metadata.xml,v |
| 20 |
retrieving revision 1.5 |
| 21 |
retrieving revision 1.6 |
| 22 |
diff -u -r1.5 -r1.6 |
| 23 |
--- metadata.xml 19 Mar 2009 19:09:18 -0000 1.5 |
| 24 |
+++ metadata.xml 24 Nov 2013 16:42:32 -0000 1.6 |
| 25 |
@@ -1,11 +1,11 @@ |
| 26 |
<?xml version="1.0" encoding="UTF-8"?> |
| 27 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 28 |
<pkgmetadata> |
| 29 |
- <herd>graphics</herd> |
| 30 |
- <longdescription>hugin is a panorama stitching program</longdescription> |
| 31 |
- <use> |
| 32 |
- <flag name='sift'>automatically align images with |
| 33 |
+ <herd>graphics</herd> |
| 34 |
+ <longdescription>hugin is a panorama stitching program</longdescription> |
| 35 |
+ <use> |
| 36 |
+ <flag name="sift">automatically align images with |
| 37 |
<pkg>media-gfx/autopano-sift</pkg> or |
| 38 |
<pkg>media-gfx/autopano-sift-C</pkg></flag> |
| 39 |
- </use> |
| 40 |
+ </use> |
| 41 |
</pkgmetadata> |
| 42 |
|
| 43 |
|
| 44 |
|
| 45 |
1.2 media-gfx/hugin/hugin-2013.0.0.ebuild |
| 46 |
|
| 47 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/hugin/hugin-2013.0.0.ebuild?rev=1.2&view=markup |
| 48 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/hugin/hugin-2013.0.0.ebuild?rev=1.2&content-type=text/plain |
| 49 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/hugin/hugin-2013.0.0.ebuild?r1=1.1&r2=1.2 |
| 50 |
|
| 51 |
Index: hugin-2013.0.0.ebuild |
| 52 |
=================================================================== |
| 53 |
RCS file: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2013.0.0.ebuild,v |
| 54 |
retrieving revision 1.1 |
| 55 |
retrieving revision 1.2 |
| 56 |
diff -u -r1.1 -r1.2 |
| 57 |
--- hugin-2013.0.0.ebuild 28 Oct 2013 22:18:52 -0000 1.1 |
| 58 |
+++ hugin-2013.0.0.ebuild 24 Nov 2013 16:42:32 -0000 1.2 |
| 59 |
@@ -1,6 +1,6 @@ |
| 60 |
# Copyright 1999-2013 Gentoo Foundation |
| 61 |
# Distributed under the terms of the GNU General Public License v2 |
| 62 |
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2013.0.0.ebuild,v 1.1 2013/10/28 22:18:52 maekke Exp $ |
| 63 |
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2013.0.0.ebuild,v 1.2 2013/11/24 16:42:32 jlec Exp $ |
| 64 |
|
| 65 |
EAPI=5 |
| 66 |
WX_GTK_VER="2.8" |
| 67 |
@@ -11,12 +11,13 @@ |
| 68 |
DESCRIPTION="GUI for the creation & processing of panoramic images" |
| 69 |
HOMEPAGE="http://hugin.sf.net" |
| 70 |
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" |
| 71 |
+ |
| 72 |
LICENSE="GPL-2 SIFT" |
| 73 |
SLOT="0" |
| 74 |
KEYWORDS="~amd64 ~ppc ~x86" |
| 75 |
|
| 76 |
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" |
| 77 |
-IUSE="lapack python sift $(echo ${LANGS//\ /\ linguas_})" |
| 78 |
+IUSE="lapack python sift debug $(echo ${LANGS//\ /\ linguas_})" |
| 79 |
|
| 80 |
CDEPEND=" |
| 81 |
!!dev-util/cocom |
| 82 |
@@ -48,6 +49,8 @@ |
| 83 |
|
| 84 |
S=${WORKDIR}/${PN}-$(get_version_component_range 1-3) |
| 85 |
|
| 86 |
+PATCHES=( "${FILESDIR}"/${P}-boost.patch ) |
| 87 |
+ |
| 88 |
pkg_setup() { |
| 89 |
DOCS="authors.txt README TODO" |
| 90 |
mycmakeargs=( |
| 91 |
@@ -57,6 +60,14 @@ |
| 92 |
python-single-r1_pkg_setup |
| 93 |
} |
| 94 |
|
| 95 |
+src_prepare() { |
| 96 |
+ sed \ |
| 97 |
+ -e 's:-O3::g' \ |
| 98 |
+ -i src/celeste/CMakeLists.txt || die |
| 99 |
+ rm CMakeModules/{FindLAPACK,FindPkgConfig}.cmake || die |
| 100 |
+ cmake-utils_src_prepare |
| 101 |
+} |
| 102 |
+ |
| 103 |
src_install() { |
| 104 |
cmake-utils_src_install |
| 105 |
python_optimize |
| 106 |
|
| 107 |
|
| 108 |
|
| 109 |
1.135 media-gfx/hugin/ChangeLog |
| 110 |
|
| 111 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/hugin/ChangeLog?rev=1.135&view=markup |
| 112 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/hugin/ChangeLog?rev=1.135&content-type=text/plain |
| 113 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/hugin/ChangeLog?r1=1.134&r2=1.135 |
| 114 |
|
| 115 |
Index: ChangeLog |
| 116 |
=================================================================== |
| 117 |
RCS file: /var/cvsroot/gentoo-x86/media-gfx/hugin/ChangeLog,v |
| 118 |
retrieving revision 1.134 |
| 119 |
retrieving revision 1.135 |
| 120 |
diff -u -r1.134 -r1.135 |
| 121 |
--- ChangeLog 28 Oct 2013 22:18:52 -0000 1.134 |
| 122 |
+++ ChangeLog 24 Nov 2013 16:42:32 -0000 1.135 |
| 123 |
@@ -1,6 +1,17 @@ |
| 124 |
# ChangeLog for media-gfx/hugin |
| 125 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 126 |
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/ChangeLog,v 1.134 2013/10/28 22:18:52 maekke Exp $ |
| 127 |
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/ChangeLog,v 1.135 2013/11/24 16:42:32 jlec Exp $ |
| 128 |
+ |
| 129 |
+*hugin-9999 (24 Nov 2013) |
| 130 |
+*hugin-2012.0.0-r1 (24 Nov 2013) |
| 131 |
+ |
| 132 |
+ 24 Nov 2013; Justin Lecher <jlec@g.o> +hugin-2012.0.0-r1.ebuild, |
| 133 |
+ hugin-2013.0.0.ebuild, +hugin-9999.ebuild, +files/hugin-2012.0.0-boost.patch, |
| 134 |
+ +files/hugin-2012.0.0-perl.patch, +files/hugin-2013.0.0-boost.patch, |
| 135 |
+ metadata.xml: |
| 136 |
+ Backport fix for building with newer boost; Use system cmake modules to |
| 137 |
+ detect lapack; backport patch to use perl 5.16; fixes bugs |
| 138 |
+ #296510,300127,373387,374337,388149,404227,484238 |
| 139 |
|
| 140 |
*hugin-2013.0.0 (28 Oct 2013) |
| 141 |
|
| 142 |
|
| 143 |
|
| 144 |
|
| 145 |
1.1 media-gfx/hugin/hugin-9999.ebuild |
| 146 |
|
| 147 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/hugin/hugin-9999.ebuild?rev=1.1&view=markup |
| 148 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/hugin/hugin-9999.ebuild?rev=1.1&content-type=text/plain |
| 149 |
|
| 150 |
Index: hugin-9999.ebuild |
| 151 |
=================================================================== |
| 152 |
# Copyright 1999-2013 Gentoo Foundation |
| 153 |
# Distributed under the terms of the GNU General Public License v2 |
| 154 |
# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-9999.ebuild,v 1.1 2013/11/24 16:42:32 jlec Exp $ |
| 155 |
|
| 156 |
EAPI=5 |
| 157 |
WX_GTK_VER="2.8" |
| 158 |
PYTHON_COMPAT=( python{2_7,3_2,3_3} ) |
| 159 |
|
| 160 |
inherit base mercurial python-single-r1 wxwidgets versionator cmake-utils |
| 161 |
|
| 162 |
DESCRIPTION="GUI for the creation & processing of panoramic images" |
| 163 |
HOMEPAGE="http://hugin.sf.net" |
| 164 |
SRC_URI="" |
| 165 |
EHG_REPO_URI="http://hg.code.sf.net/p/hugin/hugin" |
| 166 |
EHG_PROJECT="${PN}-${PN}" |
| 167 |
|
| 168 |
LICENSE="GPL-2 SIFT" |
| 169 |
SLOT="0" |
| 170 |
KEYWORDS="" |
| 171 |
|
| 172 |
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" |
| 173 |
IUSE="lapack python sift $(echo ${LANGS//\ /\ linguas_})" |
| 174 |
|
| 175 |
CDEPEND=" |
| 176 |
!!dev-util/cocom |
| 177 |
app-arch/zip |
| 178 |
dev-cpp/tclap |
| 179 |
>=dev-libs/boost-1.49.0-r1:= |
| 180 |
dev-libs/zthread |
| 181 |
>=media-gfx/enblend-4.0 |
| 182 |
media-gfx/exiv2 |
| 183 |
media-libs/freeglut |
| 184 |
media-libs/glew:= |
| 185 |
media-libs/lensfun |
| 186 |
>=media-libs/libpano13-2.9.18 |
| 187 |
media-libs/libpng:0= |
| 188 |
media-libs/openexr:= |
| 189 |
media-libs/tiff |
| 190 |
sys-libs/zlib |
| 191 |
virtual/jpeg |
| 192 |
x11-libs/wxGTK:2.8=[X,opengl,-odbc] |
| 193 |
lapack? ( virtual/lapack ) |
| 194 |
sift? ( media-gfx/autopano-sift-C )" |
| 195 |
RDEPEND="${CDEPEND} |
| 196 |
media-libs/exiftool" |
| 197 |
DEPEND="${CDEPEND} |
| 198 |
virtual/pkgconfig |
| 199 |
python? ( ${PYTHON_DEPS} >=dev-lang/swig-2.0.4 )" |
| 200 |
|
| 201 |
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
| 202 |
|
| 203 |
S=${WORKDIR}/${PN}-$(get_version_component_range 1-3) |
| 204 |
|
| 205 |
pkg_setup() { |
| 206 |
DOCS="authors.txt README TODO" |
| 207 |
mycmakeargs=( |
| 208 |
$(cmake-utils_use_enable lapack LAPACK) |
| 209 |
$(cmake-utils_use_build python HSI) |
| 210 |
) |
| 211 |
python-single-r1_pkg_setup |
| 212 |
} |
| 213 |
|
| 214 |
src_prepare() { |
| 215 |
sed \ |
| 216 |
-e 's:-O3::g' \ |
| 217 |
-i src/celeste/CMakeLists.txt || die |
| 218 |
rm CMakeModules/{FindLAPACK,FindPkgConfig}.cmake || die |
| 219 |
cmake-utils_src_prepare |
| 220 |
} |
| 221 |
|
| 222 |
src_install() { |
| 223 |
cmake-utils_src_install |
| 224 |
python_optimize |
| 225 |
|
| 226 |
for lang in ${LANGS} ; do |
| 227 |
case ${lang} in |
| 228 |
ca) dir=ca_ES;; |
| 229 |
cs) dir=cs_CZ;; |
| 230 |
*) dir=${lang};; |
| 231 |
esac |
| 232 |
use linguas_${lang} || rm -r "${D}"/usr/share/locale/${dir} |
| 233 |
done |
| 234 |
} |
| 235 |
|
| 236 |
|
| 237 |
|
| 238 |
1.1 media-gfx/hugin/hugin-2012.0.0-r1.ebuild |
| 239 |
|
| 240 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/hugin/hugin-2012.0.0-r1.ebuild?rev=1.1&view=markup |
| 241 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/hugin/hugin-2012.0.0-r1.ebuild?rev=1.1&content-type=text/plain |
| 242 |
|
| 243 |
Index: hugin-2012.0.0-r1.ebuild |
| 244 |
=================================================================== |
| 245 |
# Copyright 1999-2013 Gentoo Foundation |
| 246 |
# Distributed under the terms of the GNU General Public License v2 |
| 247 |
# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2012.0.0-r1.ebuild,v 1.1 2013/11/24 16:42:32 jlec Exp $ |
| 248 |
|
| 249 |
EAPI=5 |
| 250 |
WX_GTK_VER="2.8" |
| 251 |
PYTHON_COMPAT=( python{2_7,3_2,3_3} ) |
| 252 |
|
| 253 |
inherit base python-single-r1 wxwidgets versionator cmake-utils |
| 254 |
|
| 255 |
DESCRIPTION="GUI for the creation & processing of panoramic images" |
| 256 |
HOMEPAGE="http://hugin.sf.net" |
| 257 |
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" |
| 258 |
LICENSE="GPL-2 SIFT" |
| 259 |
SLOT="0" |
| 260 |
KEYWORDS="~amd64 ~ppc ~x86" |
| 261 |
|
| 262 |
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" |
| 263 |
IUSE="lapack python sift $(echo ${LANGS//\ /\ linguas_})" |
| 264 |
|
| 265 |
CDEPEND=" |
| 266 |
!!dev-util/cocom |
| 267 |
app-arch/zip |
| 268 |
dev-cpp/tclap |
| 269 |
>=dev-libs/boost-1.49.0-r1:= |
| 270 |
dev-libs/zthread |
| 271 |
>=media-gfx/enblend-4.0 |
| 272 |
media-gfx/exiv2 |
| 273 |
media-libs/freeglut |
| 274 |
media-libs/glew:= |
| 275 |
media-libs/lensfun |
| 276 |
>=media-libs/libpano13-2.9.18 |
| 277 |
media-libs/libpng:0= |
| 278 |
media-libs/openexr:= |
| 279 |
media-libs/tiff |
| 280 |
sys-libs/zlib |
| 281 |
virtual/jpeg |
| 282 |
x11-libs/wxGTK:2.8=[X,opengl,-odbc] |
| 283 |
lapack? ( virtual/lapack ) |
| 284 |
sift? ( media-gfx/autopano-sift-C )" |
| 285 |
RDEPEND="${CDEPEND} |
| 286 |
media-libs/exiftool" |
| 287 |
DEPEND="${CDEPEND} |
| 288 |
virtual/pkgconfig |
| 289 |
python? ( ${PYTHON_DEPS} >=dev-lang/swig-2.0.4 )" |
| 290 |
|
| 291 |
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
| 292 |
|
| 293 |
S=${WORKDIR}/${PN}-$(get_version_component_range 1-3) |
| 294 |
|
| 295 |
PATCHES=( |
| 296 |
"${FILESDIR}"/${P}-boost.patch |
| 297 |
"${FILESDIR}"/${P}-perl.patch |
| 298 |
) |
| 299 |
|
| 300 |
pkg_setup() { |
| 301 |
DOCS="authors.txt README TODO" |
| 302 |
mycmakeargs=( |
| 303 |
$(cmake-utils_use_enable lapack LAPACK) |
| 304 |
$(cmake-utils_use_build python HSI) |
| 305 |
) |
| 306 |
python-single-r1_pkg_setup |
| 307 |
} |
| 308 |
|
| 309 |
src_prepare() { |
| 310 |
sed \ |
| 311 |
-e 's:-O3::g' \ |
| 312 |
-i src/celeste/CMakeLists.txt || die |
| 313 |
rm CMakeModules/{FindLAPACK,FindPkgConfig}.cmake || die |
| 314 |
cmake-utils_src_prepare |
| 315 |
} |
| 316 |
|
| 317 |
src_install() { |
| 318 |
cmake-utils_src_install |
| 319 |
python_optimize |
| 320 |
|
| 321 |
for lang in ${LANGS} ; do |
| 322 |
case ${lang} in |
| 323 |
ca) dir=ca_ES;; |
| 324 |
cs) dir=cs_CZ;; |
| 325 |
*) dir=${lang};; |
| 326 |
esac |
| 327 |
use linguas_${lang} || rm -r "${D}"/usr/share/locale/${dir} |
| 328 |
done |
| 329 |
} |
Archives