From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 8AABF1387B1 for ; Tue, 17 Dec 2013 21:02:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5F634E0A5A; Tue, 17 Dec 2013 21:01:59 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 90E73E0A4A for ; Tue, 17 Dec 2013 21:01:58 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8616433F57E for ; Tue, 17 Dec 2013 21:01:57 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 22F4B11024D for ; Tue, 17 Dec 2013 21:01:56 +0000 (UTC) From: "Markus Meier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Markus Meier" Message-ID: <1387312592.cd9bc5340e3b1f92171de975bf43ce12a8789271.maekke@gentoo> Subject: [gentoo-commits] dev/maekke:master commit in: media-gfx/hugin/files/, media-gfx/hugin/ X-VCS-Repository: dev/maekke X-VCS-Files: media-gfx/hugin/Manifest media-gfx/hugin/files/hugin-2012.0.0-boost.patch media-gfx/hugin/files/hugin-2012.0.0-perl.patch media-gfx/hugin/files/hugin-2013.0.0-boost.patch media-gfx/hugin/hugin-2012.0.0-r1.ebuild media-gfx/hugin/hugin-2013.0.0-r1.ebuild media-gfx/hugin/hugin-2013.0.0.ebuild media-gfx/hugin/hugin-9999.ebuild X-VCS-Directories: media-gfx/hugin/files/ media-gfx/hugin/ X-VCS-Committer: maekke X-VCS-Committer-Name: Markus Meier X-VCS-Revision: cd9bc5340e3b1f92171de975bf43ce12a8789271 X-VCS-Branch: master Date: Tue, 17 Dec 2013 21:01:56 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 0c630b63-2f98-42d7-bd4e-976044bd007c X-Archives-Hash: 2ffdafebae5dc5931c7b948fc3fe418e commit: cd9bc5340e3b1f92171de975bf43ce12a8789271 Author: Markus Meier gentoo org> AuthorDate: Tue Dec 17 20:36:32 2013 +0000 Commit: Markus Meier gentoo 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