Version bump (bug #434060) and fix tests build with boost-1.50 (bug #426534).

Package-Manager: portage-2.2.0_alpha128/cvs/Linux x86_64

4 files changed, 81 insertions, 14 deletions

diff --git a/media-libs/chromaprint/ChangeLog b/media-libs/chromaprint/ChangeLog
index bc8e0c720488..8f23738a8cba 100644
--- a/media-libs/chromaprint/ChangeLog
+++ b/media-libs/chromaprint/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/chromaprint
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/chromaprint/ChangeLog,v 1.3 2012/06/11 11:14:16 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/chromaprint/ChangeLog,v 1.4 2012/09/21 04:51:13 radhermit Exp $
+
+*chromaprint-0.7 (21 Sep 2012)
+
+  21 Sep 2012; Tim Harder <radhermit@gentoo.org> +chromaprint-0.7.ebuild,
+  +files/chromaprint-0.7-boost.patch:
+  Version bump (bug #434060) and fix tests build with boost-1.50 (bug #426534).
 
   11 Jun 2012; Agostino Sarubbo <ago@gentoo.org> chromaprint-0.6.ebuild:
   Stable for amd64, wrt bug #419947
diff --git a/media-libs/chromaprint/Manifest b/media-libs/chromaprint/Manifest
index cdcc66e9e3ae..abd918c3474c 100644
--- a/media-libs/chromaprint/Manifest
+++ b/media-libs/chromaprint/Manifest
@@ -1,18 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-DIST chromaprint-0.6.tar.gz 542366 RMD160 59fe70812bd814860ca845479540b9c59701ab9c SHA1 e8bcc1d0d8dfec86aa648b87ba3f69b6d589eae0 SHA256 5d9b82da226450c14e43482371a1b2a178e2604ab5b2e9259f33b1b461ee9d63
-EBUILD chromaprint-0.6.ebuild 1134 RMD160 9689133a509961411540a31ca956ddf70d181681 SHA1 ac6bdb8f83729592996229b9b300f5a7f4e8a221 SHA256 4b2ed6b676f99cdb6a6f32eacab5905bcff46022b021089547bcaf819c5193a5
-MISC ChangeLog 638 RMD160 5ad1c3fa537d597af3c5d24e658c9f98facd6ee0 SHA1 169cbb62d9bf976eb6b1395c69db97689f98e0f5 SHA256 bf656dbb36cf0bef4374025cdddd00ee528d61f80cff7738bee112c898387294
-MISC metadata.xml 252 RMD160 f055b3d7eb69fca707edd9ec7c0919114416118a SHA1 cbcef63189f401b6515d25da9de4e5d1f7e4f433 SHA256 855e5677de39364e4a8d58f4c1e5128ca6e16ef1f554368534fabab23e94909e
+AUX chromaprint-0.7-boost.patch 208 SHA256 db07c765c365dac7498d4565ba6d62828637084e5ceee23f2559b0d9ffb60996 SHA512 c060e022f8b8be11a54f751b4a6c5de902db0c8a8b75f697b1a18b7e285e015ba0affebc1c57e7202eac9292502bf7bc91594e0a19bcac5cbe1ca35d03cfd292 WHIRLPOOL 8a6e249ccd4099a4e48798155d6b7cb3b7d4c36f4a7060696e6502dbd1610ce253872fc0949b6cf19cad48cc877cabbb272e2159ee44a14cd6aef7646da53ad2
+DIST chromaprint-0.6.tar.gz 542366 SHA256 5d9b82da226450c14e43482371a1b2a178e2604ab5b2e9259f33b1b461ee9d63
+DIST chromaprint-0.7.tar.gz 543811 SHA256 4e52c3fd443c91a5c429557753d4ba3f9d31d183810412c0d8600892f3975501 SHA512 2ac03f80888d6c12dd05c20adc82e0f2c9e6bf5edc099d7c7b719b8cb353151fb04b78f5c7bca672d5fe8357a791e86fdea7b6952a0d64c346c079548ebfcd38 WHIRLPOOL 34c5cb7c38dc0e4924e068ff0a695e571fdd2233046ef6ea84e9e0e27e6bf9f5eaedceb79c2f8120e9ac6eb30ace3bc9e15ba59027cd498426e7f94536e2da84
+EBUILD chromaprint-0.6.ebuild 1134 SHA256 4b2ed6b676f99cdb6a6f32eacab5905bcff46022b021089547bcaf819c5193a5 SHA512 fbaffe79a2ca6ccf6bc2d24ac07366086a5ddce4a68a593603af0dacd8910040bcf516e1e8425e09e76bf2dec910ae2598894a45b37fd931aeb27e496bfac352 WHIRLPOOL c4f400a10e8a30b3b27b74642ff502186860502a736156a540fc2be3e7910596692458dd491060ff047b052b58a36884a3dd8a93b9ca8d28a359531332462ddc
+EBUILD chromaprint-0.7.ebuild 1206 SHA256 4345bf499ae24ba478a3a08fcfd9189c50bf2e48b7559ae28158b6aee816f7c7 SHA512 3a4b7c310eba074bd5a115ee1187bf2891c13dbe24ab54c63bbe26968017b7cd850fe7b67c6cda032fa4dc2ca2fe94c1aff236e1d0abd9d943473ad64e07bbf9 WHIRLPOOL 479e379110307ca7a646a58aca53786527af4125a2a96f2cbd94f65bcd517dbd15acffecf79d7a2d96532a1453028923758d17b27424cc339c0cd3695131ea96
+MISC ChangeLog 869 SHA256 1183ccb92d63522834f51f683378a14ddf923267e99312c400d4fe72bb4f3f52 SHA512 ca0a9c9f30f012606e628a55f10760992b90122b444150645fa58aeab26ed3c4fb6815a6a8b2d502f0b8cb6839a987b7a5b3c69bc9c97bc32ca5e5459c2bfa1e WHIRLPOOL a87c5af7bd67887d028d899bdfa7ba400b37ee8c51d9ab8d801fbad1e5942ad4f7e33ad834e6e25ea4103543ced6a037c020666a4554a439739c7d034a8337c2
+MISC metadata.xml 252 SHA256 855e5677de39364e4a8d58f4c1e5128ca6e16ef1f554368534fabab23e94909e SHA512 3ebc4ad794f88d61d7f42d9087d773daeb6db9427356f2ac80406d18b5fa3210fd400464045b52d666ca6648dae28b8a005a610242885917d416f094a15f24c1 WHIRLPOOL d066dbbf45f21b28466457a3ae78dc797550bd7994c3a0e590374dc3e754199d893a07b5e4b7138be590acbbc8d1c0431c71282be9f7f35fa24dc58564344bec
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCgAGBQJP1dMOAAoJEOTDgjZ80txd7hwIAIZsqFcJ/Lll2gs2iO7kwWzY
-QCeIJ4cI8Ph2aMHzyLpBwPKc8kqLMVgZ72eYsgEw3jDQ1oIXiewfWomWHxVOht/K
-IATrSqX3mPA0PIMXPIDnKoV1RU373ZI8F5+aeF1DvATOhRaOeH88IfIUnBZw8iz7
-Vzm7RG3suv9XBMhllblxSdrwUfSWysui76TqgQWnitYo69xjqZEkzIkwzjG2yjdU
-xTNchJ8w/cg+wGzBiXgrATvXJNhi9J4LDgPlnQDu0ICNzSw9zwjlTG1qoE4i0q5u
-9aKfQeFxPnt5Y7s81bMQl4IjRkcJ1PQ1Ueoqq69AWpmRi46uOMgKTmKgGvfl5wQ=
-=aNgk
+iQEcBAEBCAAGBQJQW/JOAAoJEEqz6FtPBkyjgNoIAJPbRGot2DmkhcpmDX0rlFjD
+47SXK0Z8MYvI+eaidP1mmte/dsTJ5GnwQcptsnJeZ4aBGsp8eZwNnGTntLZKE76w
+JIaefKHHisKvwLlegLPDRILXLe4yARvVilC6nKFV+j0TjqlnlvDVcZ0QVnXfJTXY
+Dzift/xrrkZZvOYybWhcTIOaE++JJu3+Xp91VACA6dvi94mji6hv4yHZRpJmwy4h
+JFCOiYnvxdC50Hn+7uyTJG1iv+9eRiZYKAHF5OQn2SE6tQVCeYenpF1YWsiYajhT
+68Gt2nRM/9IOddjrvRHyzDAlFlZwDHvqXtiueKPYaYWcE6NgcK22iHqNmTPuyzQ=
+=PtoG
 -----END PGP SIGNATURE-----
diff --git a/media-libs/chromaprint/chromaprint-0.7.ebuild b/media-libs/chromaprint/chromaprint-0.7.ebuild
new file mode 100644
index 000000000000..00ab7426ae15
--- /dev/null
+++ b/media-libs/chromaprint/chromaprint-0.7.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/chromaprint/chromaprint-0.7.ebuild,v 1.1 2012/09/21 04:51:13 radhermit Exp $
+
+EAPI=4
+inherit cmake-utils
+
+DESCRIPTION="A client-side library that implements a custom algorithm for extracting fingerprints"
+HOMEPAGE="http://acoustid.org/chromaprint"
+SRC_URI="mirror://github/lalinsky/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test tools"
+
+# note: use ffmpeg instead of fftw because it's recommended and required for tools
+RDEPEND=">=virtual/ffmpeg-0.6
+	tools? ( >=media-libs/taglib-1.6 )"
+DEPEND="${RDEPEND}
+	test? (
+		dev-cpp/gtest
+		dev-libs/boost
+	)
+	tools? ( dev-libs/boost )"
+
+DOCS="NEWS.txt README.txt"
+
+PATCHES=( "${FILESDIR}"/${P}-boost.patch )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_build tools EXAMPLES)
+		$(cmake-utils_use_build test TESTS)
+		$(cmake-utils_use_build tools)
+		-DWITH_AVFFT=ON
+		)
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	cd "${CMAKE_BUILD_DIR}" || die
+	emake check
+}
+
+src_install() {
+	cmake-utils_src_install
+	use tools && dobin "${CMAKE_BUILD_DIR}"/tools/fpcollect
+}
diff --git a/media-libs/chromaprint/files/chromaprint-0.7-boost.patch b/media-libs/chromaprint/files/chromaprint-0.7-boost.patch
new file mode 100644
index 000000000000..46df857689de
--- /dev/null
+++ b/media-libs/chromaprint/files/chromaprint-0.7-boost.patch
@@ -0,0 +1,8 @@
+--- chromaprint-0.7/tests/CMakeLists.txt
++++ chromaprint-0.7/tests/CMakeLists.txt
+@@ -1,4 +1,5 @@
+ include_directories(
++	${Boost_INCLUDE_DIRS}
+ 	${GTEST_INCLUDE_DIRS}
+ 	${CMAKE_CURRENT_SOURCE_DIR}/../src
+ )