diff options
Diffstat (limited to 'media-gfx/hugin')
| -rw-r--r-- | media-gfx/hugin/ChangeLog | 8 | ||||
| -rw-r--r-- | media-gfx/hugin/Manifest | 29 | ||||
| -rw-r--r-- | media-gfx/hugin/files/digest-hugin-0.6.1-r1 | 3 | ||||
| -rw-r--r-- | media-gfx/hugin/files/hugin-0.6.1-1_0.6.1-1.1.patch | 36 | ||||
| -rw-r--r-- | media-gfx/hugin/hugin-0.6.1-r1.ebuild | 71 |
5 files changed, 132 insertions, 15 deletions
diff --git a/media-gfx/hugin/ChangeLog b/media-gfx/hugin/ChangeLog index 4cb2eb58c981..98896272573d 100644 --- a/media-gfx/hugin/ChangeLog +++ b/media-gfx/hugin/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-gfx/hugin # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/ChangeLog,v 1.26 2007/10/13 00:06:49 dirtyepic Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/ChangeLog,v 1.27 2007/10/25 23:51:40 lu_zero Exp $ + +*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: diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest index 6da8b9b4ad0d..c9e013cbb64a 100644 --- a/media-gfx/hugin/Manifest +++ b/media-gfx/hugin/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX hugin-0.5-gcc41.patch 1667 RMD160 a6afa33f05f712e013d5e3c8bd566e1df6d96344 SHA1 b87d27f45f85a1e4372b5379a8997ad60c2e8eef SHA256 3c07a0df02d5b9655327f64494fac05835920150fbd99c669c7265247f3fa66c MD5 b8fcbff3c90dbf2257a5414317c33d32 files/hugin-0.5-gcc41.patch 1667 RMD160 a6afa33f05f712e013d5e3c8bd566e1df6d96344 files/hugin-0.5-gcc41.patch 1667 @@ -9,6 +6,10 @@ AUX hugin-0.5_rc2-gcc4.patch 1356 RMD160 a4ae253c5fe37bd575148fec94f497a145f9ff4 MD5 6cf4d590cbb78ac98c424c8d58d1cc4f files/hugin-0.5_rc2-gcc4.patch 1356 RMD160 a4ae253c5fe37bd575148fec94f497a145f9ff46 files/hugin-0.5_rc2-gcc4.patch 1356 SHA256 7af013d7eedfce78f0c9e21ab5e76fdd14bf4baff8f5df767a873b800c59ab86 files/hugin-0.5_rc2-gcc4.patch 1356 +AUX hugin-0.6.1-1_0.6.1-1.1.patch 1165 RMD160 bc94d52e292329626d340fa3a88cfe3e9145faa5 SHA1 7d1adad2026d159f0d9d451338d1b08e306f9c9b SHA256 aee92c6eb7c36683719994b82758a6cfcae4470f92d3aa837a523b3e7e01e044 +MD5 fe4c32a9ab295fc79f4e9e6694da8812 files/hugin-0.6.1-1_0.6.1-1.1.patch 1165 +RMD160 bc94d52e292329626d340fa3a88cfe3e9145faa5 files/hugin-0.6.1-1_0.6.1-1.1.patch 1165 +SHA256 aee92c6eb7c36683719994b82758a6cfcae4470f92d3aa837a523b3e7e01e044 files/hugin-0.6.1-1_0.6.1-1.1.patch 1165 DIST hugin-0.5.tar.gz 2264996 RMD160 f9504ed501db3ca02830eb0e3d3329d27bb98f93 SHA1 721dfe916179abae106fae5ae9daac58aa01262f SHA256 28b49663ea52ff73b61453a6b397c99b704844d6147f316f961327532f9ca1fc DIST hugin-0.5_rc1.tar.bz2 1499912 RMD160 58cdf41d3494fefa6d33692bda2cf90f3389ab0e SHA1 7e22969d2e983339de236acfb9ee55ba83e258f2 SHA256 56c72ae9bcb09f191d64b33e8b0137530f0053edd811a652a0277e9aa872184f DIST hugin-0.6.1.tar.bz2 2151921 RMD160 4d5c1fa47f0bbe0ce452cab90443d7bd4b6e602a SHA1 b3581e316a6be182be13524b4e9c3758c7ed4b2e SHA256 18546d42ef15154246d5b84ebde847aa2cf003c6305cc64a17cc5396db346ae7 @@ -21,6 +22,10 @@ EBUILD hugin-0.5_rc1-r2.ebuild 1480 RMD160 c2364a6fe7857794514c85cbda16c644bb1c2 MD5 b5d49e2daf14696e0e516832ff40c759 hugin-0.5_rc1-r2.ebuild 1480 RMD160 c2364a6fe7857794514c85cbda16c644bb1c2474 hugin-0.5_rc1-r2.ebuild 1480 SHA256 171b598f8aeff62ea3e84be8414861164c9d5f4d4cbd60ce5365b57606506830 hugin-0.5_rc1-r2.ebuild 1480 +EBUILD hugin-0.6.1-r1.ebuild 1938 RMD160 f67800c2eeefd07a25578c9d41b55acd164127d0 SHA1 324cb6f599d93d6c226b1595d21bba69864b56c6 SHA256 6e7db73d446c952d2506983cd20928421ae71072ac00ec485bd7fff7b8cbd733 +MD5 91e30cb53e2ffcd76fd0022e43fe671d hugin-0.6.1-r1.ebuild 1938 +RMD160 f67800c2eeefd07a25578c9d41b55acd164127d0 hugin-0.6.1-r1.ebuild 1938 +SHA256 6e7db73d446c952d2506983cd20928421ae71072ac00ec485bd7fff7b8cbd733 hugin-0.6.1-r1.ebuild 1938 EBUILD hugin-0.6.1.ebuild 1879 RMD160 a1a1f12cb4aeb582030c8c9c0d5bd4cd0e724bc9 SHA1 8042d1b56fac9a89115cabf78484d4872fc2a43a SHA256 fd22bba7c9ef3bc1bc4b7db8fe189ff275e72715295d14db4f5f7a22ad05d799 MD5 2b0154b53553fe4c7465f44ecbc64e74 hugin-0.6.1.ebuild 1879 RMD160 a1a1f12cb4aeb582030c8c9c0d5bd4cd0e724bc9 hugin-0.6.1.ebuild 1879 @@ -29,10 +34,10 @@ EBUILD hugin-0.7_beta4.ebuild 1885 RMD160 ff899b1557bdf88420f4b15eecc1041940c8e0 MD5 77c3ca31608a7e82d72346cb8b8d534e hugin-0.7_beta4.ebuild 1885 RMD160 ff899b1557bdf88420f4b15eecc1041940c8e00e hugin-0.7_beta4.ebuild 1885 SHA256 4481c2957dbf8a6e34b28667fb056520f2a692506edf6390781c56453630d467 hugin-0.7_beta4.ebuild 1885 -MISC ChangeLog 4750 RMD160 1f5ef9919eaa06cba1640c592092d9b148dce857 SHA1 4bac43ea0f295ae1447b7a7b0ce78d04e28ad49d SHA256 ec52ac74b9886058aa010aa65815d581f7ec08830d9c550d1d0915f4bed6db07 -MD5 f2631e89e3c756bc366de678cfaef2dd ChangeLog 4750 -RMD160 1f5ef9919eaa06cba1640c592092d9b148dce857 ChangeLog 4750 -SHA256 ec52ac74b9886058aa010aa65815d581f7ec08830d9c550d1d0915f4bed6db07 ChangeLog 4750 +MISC ChangeLog 4947 RMD160 bd180b03f78aec28393a1a69a07383aa799b1bc3 SHA1 f83c82d00ff8780c912db8d21af497ecb51c02d4 SHA256 2b60c5174d890f62cdf2fd1104218d68dca6b7dc68e54a129eab3be8d78634b2 +MD5 cf54e7b404957f25ba20e5bba4f43c2b ChangeLog 4947 +RMD160 bd180b03f78aec28393a1a69a07383aa799b1bc3 ChangeLog 4947 +SHA256 2b60c5174d890f62cdf2fd1104218d68dca6b7dc68e54a129eab3be8d78634b2 ChangeLog 4947 MISC metadata.xml 236 RMD160 f8f179a11afc01f8e313241a5ff129266e0d8d15 SHA1 5543141f83e3d81465f35765ded5f03793238b59 SHA256 4d5e945742c9cf9cf794711f013e75fc4c1ce10e70d4ff34045c507f8b5bb1d9 MD5 24cd90963c4b50ead2d24c441915c512 metadata.xml 236 RMD160 f8f179a11afc01f8e313241a5ff129266e0d8d15 metadata.xml 236 @@ -46,13 +51,9 @@ SHA256 6ca496574678c42197076fd873246ad628c38878414fa6d3b981739fe16f326e files/di MD5 eb5933467fba2004fe34a8195c54e098 files/digest-hugin-0.6.1 241 RMD160 0004abe8ad89b244f346527bc58a8ee62c929625 files/digest-hugin-0.6.1 241 SHA256 e89ebf11a469fffb6c02edf31e750f51da534a89769885fcafd78ce28a9e6f0c files/digest-hugin-0.6.1 241 +MD5 eb5933467fba2004fe34a8195c54e098 files/digest-hugin-0.6.1-r1 241 +RMD160 0004abe8ad89b244f346527bc58a8ee62c929625 files/digest-hugin-0.6.1-r1 241 +SHA256 e89ebf11a469fffb6c02edf31e750f51da534a89769885fcafd78ce28a9e6f0c files/digest-hugin-0.6.1-r1 241 MD5 d2a264bbc38bda5a00441f33fe59514c files/digest-hugin-0.7_beta4 253 RMD160 439f779452c802d996b113177e667ac635066209 files/digest-hugin-0.7_beta4 253 SHA256 cd4111e99c415e01322ce7c3a97d4fac0ca3e0476f03dd3531b3a218d7c7f560 files/digest-hugin-0.7_beta4 253 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.7 (GNU/Linux) - -iD8DBQFHEAwgiqiDRvmkBmIRAgvzAJ0YGbawLpGf5rbE0aYPivRhAEXGFgCgr96F -jNgjyJQyprumlhQ27r9Kyy8= -=u27p ------END PGP SIGNATURE----- diff --git a/media-gfx/hugin/files/digest-hugin-0.6.1-r1 b/media-gfx/hugin/files/digest-hugin-0.6.1-r1 new file mode 100644 index 000000000000..f1c1d678e694 --- /dev/null +++ b/media-gfx/hugin/files/digest-hugin-0.6.1-r1 @@ -0,0 +1,3 @@ +MD5 46bc3136d42acbabab837128ff471507 hugin-0.6.1.tar.bz2 2151921 +RMD160 4d5c1fa47f0bbe0ce452cab90443d7bd4b6e602a hugin-0.6.1.tar.bz2 2151921 +SHA256 18546d42ef15154246d5b84ebde847aa2cf003c6305cc64a17cc5396db346ae7 hugin-0.6.1.tar.bz2 2151921 diff --git a/media-gfx/hugin/files/hugin-0.6.1-1_0.6.1-1.1.patch b/media-gfx/hugin/files/hugin-0.6.1-1_0.6.1-1.1.patch new file mode 100644 index 000000000000..cd098f07e3c1 --- /dev/null +++ b/media-gfx/hugin/files/hugin-0.6.1-1_0.6.1-1.1.patch @@ -0,0 +1,36 @@ +--- hugin-0.6.1.orig/src/hugin/AutoCtrlPointCreator.cpp ++++ hugin-0.6.1/src/hugin/AutoCtrlPointCreator.cpp +@@ -224,8 +224,7 @@ + wxSetWorkingDirectory(apDir); + } + #endif +- +- wxString ptofile(wxT("autopano_result_tempfile.pto")); ++ wxString ptofile = wxFileName::CreateTempFileName(wxT("ap_res")); + autopanoArgs.Replace(wxT("%o"), ptofile); + wxString tmp; + tmp.Printf(wxT("%d"), nFeatures); +@@ -415,7 +414,7 @@ + imgNr++; + } + +- wxString ptofile(wxT("autopano_result_tempfile")); ++ wxString ptofile = wxFileName::CreateTempFileName(wxT("ap_res")); + autopanoArgs.Replace(wxT("%o"), ptofile); + wxString tmp; + tmp.Printf(wxT("%d"), nFeatures); +only in patch2: +unchanged: +--- hugin-0.6.1.orig/src/Panorama/PTOptimise.cpp ++++ hugin-0.6.1/src/Panorama/PTOptimise.cpp +@@ -36,8 +36,8 @@ + #include <boost/property_map.hpp> + #include <boost/graph/graph_utility.hpp> + +-#define DEBUG_WRITE_OPTIM_OUTPUT +-#define DEBUG_WRITE_OPTIM_OUTPUT_FILE "hugin_debug_optim_results.txt" ++//#define DEBUG_WRITE_OPTIM_OUTPUT ++//#define DEBUG_WRITE_OPTIM_OUTPUT_FILE "hugin_debug_optim_results.txt" + + using namespace std; + using namespace PT; diff --git a/media-gfx/hugin/hugin-0.6.1-r1.ebuild b/media-gfx/hugin/hugin-0.6.1-r1.ebuild new file mode 100644 index 000000000000..63b876365226 --- /dev/null +++ b/media-gfx/hugin/hugin-0.6.1-r1.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-0.6.1-r1.ebuild,v 1.1 2007/10/25 23:51:40 lu_zero Exp $ + +inherit wxwidgets eutils + +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" +IUSE="unicode debug enblend sift" + +DEPEND=">=media-libs/libpano12-2.8.4 + >=dev-libs/boost-1.30.0 + =x11-libs/wxGTK-2.6* + sys-libs/zlib + media-libs/libpng + media-libs/jpeg + media-libs/tiff + enblend? ( >=media-gfx/enblend-2.4 ) + sift? ( media-gfx/autopano-sift )" + +pkg_setup() { + if ! built_with_use --missing true dev-libs/boost threads ; then + local msg="Build dev-libs/boost with USE=threads" + eerror "$msg" + die "$msg" + fi + if ! use enblend; then + elog "It is recommended to emerge this package with the" + elog "enblend use flag to install media-gfx/enblend" + elog "that blends the seams between images in a panorama." + fi + if ! use sift; then + elog "It is recommended to emerge this package with the" + elog "sift use flag to install media-gfx/autopano-sift" + elog "that produces control points between images in a" + elog "panorama." + fi +} + +src_unpack() { + unpack ${A} + + sed -i -e 's/autopanog\.exe/autopanog/' "${S}"/src/include/hugin/config_defaults.h + cd "${S}" + epatch "${FILESDIR}/${P}-1_0.6.1-1.1.patch" +} + +src_compile() { + export WX_GTK_VER="2.6" + + if use unicode; then + need-wxwidgets unicode || die "Emerge wxGTK with unicode in USE" + else + need-wxwidgets gtk2 || die "Emerge wxGTK with gtk2 in USE" + fi + + myconf="`use_with unicode` + `use_enable debug`" + + econf --with-wx-config="${WX_CONFIG}" ${myconf} || die "configure failed" + emake || die "compiling failed" +} + +src_install() { + make install DESTDIR="${D}" || die + dodoc AUTHORS BUGS README TODO +} |