Added patch to make it build with recent boost versions. Removed now unnecessary patch from stack. Added missing exiftool dependency.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 139 insertions, 20 deletions

diff --git a/media-gfx/hugin/ChangeLog b/media-gfx/hugin/ChangeLog
index 4896599a548c..6a528075fd2d 100644
--- a/media-gfx/hugin/ChangeLog
+++ b/media-gfx/hugin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/hugin
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/ChangeLog,v 1.66 2009/06/27 12:20:14 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/ChangeLog,v 1.67 2009/06/28 22:33:59 dev-zero Exp $
+
+  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)
 
diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index 5cb5f2ad4292..10bdc7536a28 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -1,11 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX hugin-0.7.0-gcc44.patch 1037 RMD160 3c5d67abfd507199db909de33368f487cea47c4f SHA1 1d2091be6006bb088b20f7e3aa119521b47cab32 SHA256 622513fc0280498006c3978a06cadced9085a3adadc0720b33cbbafc62d7575c
 AUX hugin-0.7.0_rc2-as-needed.patch 1522 RMD160 fe9cad07ed8426d8b435ab5ef1f06a2b689cb544 SHA1 961d26b6000da8e297620acb759f6495183cb031 SHA256 f7f8d8f177f5edf8654f1769bc51155ccc5e2bd5b8ab6664f265eff9b6588077
 AUX hugin-0.8.0_beta1-as-needed.patch 2077 RMD160 ebcf7007101213055b1b28d1cf5e317cca2ceb47 SHA1 0415a41ea5fef56610ffcfa627f4f05c8ccb7f95 SHA256 51ae48fcf577b6f421c3a43e033fedb24b9f1f94433ddb8b8103c188a6d657ad
 AUX hugin-0.8.0_rc3-as-needed.patch 1523 RMD160 0d64c91f887f701d6f8ba65cb825031bf628c9e6 SHA1 eb4be65d07fc5c6d99aa70a3e9b4c8f561507105 SHA256 e1241263ca0cbbf62bc6103c96f26bccd3d1febbefb1827dd3c173109a037a72
 AUX hugin-0.8.0_rc3-unset_lapack.patch 296 RMD160 f5baed0b7e95f1863578365580fab0627494d8a4 SHA1 f779083f1ee747548f62c3c58dabbad572561625 SHA256 fae400582e732f0e2915050c1fc6aced9bbf7b8fe6ac5636a7691951a6c641e2
+AUX hugin-0.8.0_rc4-use_system_cmake_findboost.patch 4712 RMD160 4c33e7980ff1a9f49af2d73348c09e88bc671af5 SHA1 a4ab66c9e805be2e47a959a128e097a0e4a00aac SHA256 825aa017e4ca080de4d8d9c899aca78d9f0f089377d0b74b5d43e69e2c71fd66
 DIST hugin-0.7.0.tar.gz 6074207 RMD160 a64875d9b86dbc54b3959fdb54fbd77b5a16a119 SHA1 6452ddc4e4d7a67b8e84d0a52a9c536664a62abf SHA256 8e31fad113d60881c229d0eaf9c9971cbc0082a7148014b6980f3f92fedf7959
 DIST hugin-0.8.0_beta1.tar.gz 10850459 RMD160 95f41f6777d98bb2d2d1e2d94346047195909785 SHA1 d9817ed92e3146edc189496dd4576cbf8e59544c SHA256 16158c6d80c134a5b86757beb82cb8434ce37d40469d369c145e236f54391aa9
 DIST hugin-0.8.0_beta2.tar.gz 11694265 RMD160 fea939c0c4301f905fc22eeaf52db589efcf36f9 SHA1 03bcc65c3b8de8c2459a7572ec0015b62f8671b4 SHA256 3a9fe96ffc39ac7e7d9281e358674be4c1fe6a4c3da9248225d86a65484f0e77
@@ -22,13 +20,6 @@ EBUILD hugin-0.8.0_beta3.ebuild 1330 RMD160 b7a6c9df3e24f399b2400270db1a18cace69
 EBUILD hugin-0.8.0_beta4.ebuild 1330 RMD160 0e6ccbcadaef2a8ddfe0db53b92b7a051127f79f SHA1 20e446ae54390f80b99b9f7815a16d7c790394dd SHA256 d6f43f41025aa3b2e4b5fba43d48db06742ba447eba4d81513926dc49a9b18e0
 EBUILD hugin-0.8.0_rc1.ebuild 1328 RMD160 7f7c21b9891d112da06c8c6878d73810cf9a61ff SHA1 0b5f7ea4b60bea9312bd5302649d269a0b9c6856 SHA256 dd38f8c529650347aa24539d378a1f2db646fc95aeb0885179c829641ce096a2
 EBUILD hugin-0.8.0_rc3.ebuild 1389 RMD160 a16c4b77883927ac47f1e9f76f8cf3e5e8055a30 SHA1 77e66c208fff1c2c019197c640c66776cd44828e SHA256 3a2bfd0036a3ba96c5ef07744dc4b9055c5cc9f2f02c3391c619a2c3f39d034b
-EBUILD hugin-0.8.0_rc4.ebuild 1478 RMD160 60740173e2a5214ab873b211bf282e8e6244de64 SHA1 9ea710b4fc7efa94cf2de69a86bf91527ce14fe2 SHA256 6f3e2ce31315407b70bbfbe8648e4b208073cc0699d62e8fd04214e8ee45af79
-MISC ChangeLog 10885 RMD160 c30d770484cd29711adca5c124d982db7ec3ea96 SHA1 b3a85ab96ba27da16f6a77c7fffc5ae99caac2d5 SHA256 11f85933b1b94d0d354ae7a5a02b9cf0c22f907e740d3453c04f1dc6484c37bf
+EBUILD hugin-0.8.0_rc4.ebuild 1611 RMD160 75b3eafe5274a866bab7c0021206dae4086b8f6a SHA1 453b25f55006e9bb0c9843dae44e8d9846cd3633 SHA256 fc7511f19984bf0f88a3a1e9ba20994ca7ff474f6ade15eaad02b09a37aff3d2
+MISC ChangeLog 11162 RMD160 3bf9a7abeff62df3c20957e869058c24d07bb854 SHA1 2ed6ce4d50e6c7af2888adb7f1ade5c10c402c9c SHA256 ca7a55c3f0c83820f31d55727f245a3e41d581f8deba3039a154fe05ab1e28ce
 MISC metadata.xml 389 RMD160 245f5d872a463181d63366d6c76a82c87d020fd7 SHA1 a26b77c69d62bedb9789e79b5ca35f28fa56981d SHA256 6f26cd9c2b64a96c1c86a8a468a261af4cf4dfaa86b4d7ddcfaee1ca98314803
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkpGDuEACgkQkKaRLQcq0GKjbACeM/NtIoqUuMOLzehDBFuGYN7U
-m0AAoK8MHbE+TVDt7l2kjy5u50cM8J8a
-=bc/u
------END PGP SIGNATURE-----
diff --git a/media-gfx/hugin/files/hugin-0.8.0_rc4-use_system_cmake_findboost.patch b/media-gfx/hugin/files/hugin-0.8.0_rc4-use_system_cmake_findboost.patch
new file mode 100644
index 000000000000..ceed7067a6d7
--- /dev/null
+++ b/media-gfx/hugin/files/hugin-0.8.0_rc4-use_system_cmake_findboost.patch
@@ -0,0 +1,116 @@
+diff -Naur hugin-0.8.0.orig/CMakeLists.txt hugin-0.8.0/CMakeLists.txt
+--- hugin-0.8.0.orig/CMakeLists.txt	2009-06-29 00:09:44.091649435 +0200
++++ hugin-0.8.0/CMakeLists.txt	2009-06-29 00:10:23.898439132 +0200
+@@ -89,8 +89,6 @@
+   # create the cache entry
+   SET( SOURCE_BASE_DIR ${work} CACHE FILEPATH "parent dir of hugin source root" )
+ 
+-  # search boost there
+-  SET(BOOST_DIR_SEARCH_USER ${SOURCE_BASE_DIR})
+   # wxWidgets
+   SET(wxWidgets_ROOT_DIR ${SOURCE_BASE_DIR}/wxWidgets-2.8.10)
+   # GLEW moved to FildGLEW.cmake module
+@@ -179,11 +177,10 @@
+ ## Boost
+ ##
+ 
+-SET(Boost_LIB_SUFFIX_DEBUG gd)
+-FIND_PACKAGE(Boost REQUIRED thread)
+-IF (NOT Boost_thread_FOUND)
+-  MESSAGE(FATAL_ERROR "boost thread library not found. If it is installed with a\nunrecognized suffix, specify it with -DBoost_LIB_SUFFIX=<suffix>")
+-ENDIF (NOT Boost_thread_FOUND)
++FIND_PACKAGE(Boost COMPONENTS thread)
++IF (NOT Boost_FOUND)
++  MESSAGE(FATAL_ERROR "boost thread library not found. If it is installed with a\nunrecognized suffix, specify it with -DBOOST_LIBRARYDIR=<librarydir> and -DBOOST_INCLUDEDIR=<includedir>")
++ENDIF (NOT Boost_FOUND)
+ 
+ INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
+ LINK_DIRECTORIES(${Boost_LIBRARY_DIRS})
+diff -Naur hugin-0.8.0.orig/src/CMakeLists.txt hugin-0.8.0/src/CMakeLists.txt
+--- hugin-0.8.0.orig/src/CMakeLists.txt	2009-06-29 00:09:44.024975006 +0200
++++ hugin-0.8.0/src/CMakeLists.txt	2009-06-29 00:11:03.751660063 +0200
+@@ -15,11 +15,11 @@
+   IF(LAPACK_FOUND)

+     # need to specify boost thread library

+     set(common_libs huginbase

+-        ${Boost_thread_LIBRARIES} ${PANO_LIBRARIES} ${LAPACK_LIBRARIES} huginlevmar)

++        ${Boost_LIBRARIES} ${PANO_LIBRARIES} ${LAPACK_LIBRARIES} huginlevmar)

+   ELSE(LAPACK_FOUND)

+     # need to specify boost thread library

+     set(common_libs huginbase 

+-        ${Boost_thread_LIBRARIES} ${PANO_LIBRARIES} huginlevmar)

++        ${Boost_LIBRARIES} ${PANO_LIBRARIES} huginlevmar)

+   ENDIF(LAPACK_FOUND)

+ ENDIF (MSVC)

+ 

+diff -Naur hugin-0.8.0.orig/src/CMakeLists.txt.orig hugin-0.8.0/src/CMakeLists.txt.orig
+--- hugin-0.8.0.orig/src/CMakeLists.txt.orig	1970-01-01 01:00:00.000000000 +0100
++++ hugin-0.8.0/src/CMakeLists.txt.orig	2009-06-17 19:48:37.000000000 +0200
+@@ -0,0 +1,56 @@
++

++# define common sets of libraries, used by different subdirectories

++IF (MSVC)

++  IF(LAPACK_FOUND)

++    # boost_thread is linked automatically

++    # additionally link to our getopt

++    set(common_libs huginbase hugingetopt

++        ${PANO_LIBRARIES} ${LAPACK_LIBRARIES} huginlevmar)

++  ELSE(LAPACK_FOUND)

++    set(common_libs huginbase hugingetopt

++        ${PANO_LIBRARIES} huginlevmar)

++  ENDIF(LAPACK_FOUND)

++  include_directories( ${CMAKE_SOURCE_DIR}/src/foreign/getopt/include )

++ELSE (MSVC)

++  IF(LAPACK_FOUND)

++    # need to specify boost thread library

++    set(common_libs huginbase

++        ${Boost_thread_LIBRARIES} ${PANO_LIBRARIES} ${LAPACK_LIBRARIES} huginlevmar)

++  ELSE(LAPACK_FOUND)

++    # need to specify boost thread library

++    set(common_libs huginbase 

++        ${Boost_thread_LIBRARIES} ${PANO_LIBRARIES} huginlevmar)

++  ENDIF(LAPACK_FOUND)

++ENDIF (MSVC)

++

++set(image_libs huginvigraimpex ${OPENEXR_LIBRARIES} ${JPEG_LIBRARIES} ${TIFF_LIBRARIES}

++    ${PNG_LIBRARIES} ${ZLIB_LIBRARIES} ${EXIV2_LIBRARIES})

++

++add_subdirectory(celeste)

++add_subdirectory(foreign)

++add_subdirectory(hugin_base)

++add_subdirectory(tools)

++add_subdirectory(matchpoint)

++add_subdirectory(deghosting)

++

++# build vips stuff, only if vips was found

++# not ready for the general public yet

++IF(VIPS_FOUND)

++#  add_subdirectory(vips)

++ENDIF(VIPS_FOUND)

++

++# build gui only if wxWidgets was found

++IF(wxWidgets_FOUND)

++  INCLUDE(${wxWidgets_USE_FILE})

++  add_subdirectory(hugin1)

++

++  include_directories( ${CMAKE_SOURCE_DIR}/src/hugin1 )

++  # do we need to define _UNICODE on windows?

++  IF(WIN32)

++    IF ("${wxWidgets_CONFIGURATION}" STREQUAL "mswu")

++      ADD_DEFINITIONS("-D_UNICODE")

++    ENDIF("${wxWidgets_CONFIGURATION}" STREQUAL "mswu")

++  ENDIF(WIN32)

++ENDIF(wxWidgets_FOUND)

++

++add_subdirectory(translations)

+diff -Naur hugin-0.8.0.orig/src/hugin_base/CMakeLists.txt hugin-0.8.0/src/hugin_base/CMakeLists.txt
+--- hugin-0.8.0.orig/src/hugin_base/CMakeLists.txt	2009-06-29 00:13:41.115785087 +0200
++++ hugin-0.8.0/src/hugin_base/CMakeLists.txt	2009-06-29 00:10:23.901636391 +0200
+@@ -58,6 +58,7 @@
+ 
+ IF (${HUGIN_SHARED_LIBS})
+   add_library(huginbase SHARED ${HUGIN_BASE_SRC})
++  target_link_libraries(huginbase ${Boost_LIBRARIES})
+   set_target_properties(huginbase PROPERTIES VERSION ${HUGIN_LIB_VERSION})
+   install(TARGETS huginbase DESTINATION ${LIBDIR})
+ ELSE (${HUGIN_SHARED_LIBS})
diff --git a/media-gfx/hugin/hugin-0.8.0_rc4.ebuild b/media-gfx/hugin/hugin-0.8.0_rc4.ebuild
index 66959edc34c7..63d826782d46 100644
--- a/media-gfx/hugin/hugin-0.8.0_rc4.ebuild
+++ b/media-gfx/hugin/hugin-0.8.0_rc4.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-0.8.0_rc4.ebuild,v 1.1 2009/06/27 12:20:14 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-0.8.0_rc4.ebuild,v 1.2 2009/06/28 22:33:59 dev-zero Exp $
 
 EAPI="2"
 WX_GTK_VER="2.8"
 
-inherit cmake-utils wxwidgets versionator
+inherit base cmake-utils wxwidgets versionator
 
 DESCRIPTION="GUI for the creation & processing of panoramic images"
 HOMEPAGE="http://hugin.sf.net"
@@ -17,9 +17,8 @@ KEYWORDS="~amd64 ~ppc ~x86"
 LANGS=" bg ca cs de en_GB es fr hu it ja ko nl pl pt_BR ru sk sl sv uk zh_CN zh_TW"
 IUSE="lapack +sift $(echo ${LANGS//\ /\ linguas_})"
 
-DEPEND="
-	app-arch/zip
-	|| ( >=dev-libs/boost-1.34 =dev-libs/boost-1.33*[threads] )
+DEPEND="app-arch/zip
+	>=dev-libs/boost-1.35.0-r5
 	>=media-gfx/enblend-3.0_p20080807
 	media-gfx/exiv2
 	media-libs/jpeg
@@ -31,14 +30,22 @@ DEPEND="
 	x11-libs/wxGTK:2.8
 	lapack? ( virtual/lapack )
 	sift? ( media-gfx/autopano-sift-C )"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	media-libs/exiftool"
 
 S="${WORKDIR}/${PN}-$(get_version_component_range 1-3)"
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.8.0_rc3-as-needed.patch
-	"${FILESDIR}"/${PN}-0.8.0_rc3-unset_lapack.patch
+	"${FILESDIR}"/${P}-use_system_cmake_findboost.patch
 )
 
+src_prepare() {
+	base_src_prepare
+
+	# Remove faulty module and force usage of system cmake FindBoost
+	rm CMakeModules/FindBoost.cmake
+}
+
 pkg_setup() {
 	DOCS="AUTHORS README TODO"
 	mycmakeargs="$(cmake-utils_use_enable lapack)"