Add patch from pld-linux to build with latest ffmpeg releases. bug #435856

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

4 files changed, 57 insertions, 13 deletions

diff --git a/media-libs/chromaprint/ChangeLog b/media-libs/chromaprint/ChangeLog
index 8f23738a8cba..98836ec95776 100644
--- a/media-libs/chromaprint/ChangeLog
+++ b/media-libs/chromaprint/ChangeLog
@@ -1,6 +1,10 @@
 # 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.4 2012/09/21 04:51:13 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/chromaprint/ChangeLog,v 1.5 2012/11/08 11:11:52 aballier Exp $
+
+  08 Nov 2012; Alexis Ballier <aballier@gentoo.org> chromaprint-0.7.ebuild,
+  +files/chromaprint-0.7-ffmpeg.patch:
+  Add patch from pld-linux to build with latest ffmpeg releases. bug #435856
 
 *chromaprint-0.7 (21 Sep 2012)
 
diff --git a/media-libs/chromaprint/Manifest b/media-libs/chromaprint/Manifest
index abd918c3474c..d80d5fb536a3 100644
--- a/media-libs/chromaprint/Manifest
+++ b/media-libs/chromaprint/Manifest
@@ -2,20 +2,17 @@
 Hash: SHA256
 
 AUX chromaprint-0.7-boost.patch 208 SHA256 db07c765c365dac7498d4565ba6d62828637084e5ceee23f2559b0d9ffb60996 SHA512 c060e022f8b8be11a54f751b4a6c5de902db0c8a8b75f697b1a18b7e285e015ba0affebc1c57e7202eac9292502bf7bc91594e0a19bcac5cbe1ca35d03cfd292 WHIRLPOOL 8a6e249ccd4099a4e48798155d6b7cb3b7d4c36f4a7060696e6502dbd1610ce253872fc0949b6cf19cad48cc877cabbb272e2159ee44a14cd6aef7646da53ad2
+AUX chromaprint-0.7-ffmpeg.patch 1459 SHA256 368b09b0f46bdf1d72fcf17f496e1161fd401eda78832c57b873062ba88c167b SHA512 2f618aefbb7675c1c2e42e16f259ef2964cdd712f3ec6f572111a512ddbd4c973cecc3426ba67603b3640d6856b8591b1047a548550ec71a80688358a2d8745a WHIRLPOOL b9c8a5589e00c36735c9bed7aa7ea162fb581c9f9d55c07f7f985b3aac39962df964f94191e5846914d5a77bd1bf50b32e46b369d8508d0c4e36db00706b74a1
 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
+EBUILD chromaprint-0.7.ebuild 1238 SHA256 cca1d09cb7408595c2bb4f279657f1ed6b4abe6cdfed155c943f80a337771b5b SHA512 e90197c6a4bac157f9d369e848965d4b06774c89fe2d9fd742be1d5273b72ee4f6deec5a86f2eadfd8c18d3c24825b9257ed28eb227a5a0b7e8a07da08aa6fd8 WHIRLPOOL d7c91e03c3135d73291f85ab852022520a437c50c15fcb046577db2a17eb12999da3513198516369713a9c95997579978dc0266644e089ee54f397ef0504b334
+MISC ChangeLog 1061 SHA256 94f91c9c39a511ef93255e4130adaab0953c247f714eee2c0475bf21b3c197e5 SHA512 4bd3ad24de57185a2a056380f2e92bd4e45320b0b67721c56d319bd606b2c286a27b5c8939058e571f2091d11f1f1f6767d3ca394a14b270d3dfb73c14cd87e5 WHIRLPOOL 6bb245a0f01669edea509c33951048428895fc7268808cf4007f92288ff9bf7a3ee60bd85b457867ab9fedb76b2b283c00da5c62d7464df7b9d282eb3896d259
 MISC metadata.xml 252 SHA256 855e5677de39364e4a8d58f4c1e5128ca6e16ef1f554368534fabab23e94909e SHA512 3ebc4ad794f88d61d7f42d9087d773daeb6db9427356f2ac80406d18b5fa3210fd400464045b52d666ca6648dae28b8a005a610242885917d416f094a15f24c1 WHIRLPOOL d066dbbf45f21b28466457a3ae78dc797550bd7994c3a0e590374dc3e754199d893a07b5e4b7138be590acbbc8d1c0431c71282be9f7f35fa24dc58564344bec
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQW/JOAAoJEEqz6FtPBkyjgNoIAJPbRGot2DmkhcpmDX0rlFjD
-47SXK0Z8MYvI+eaidP1mmte/dsTJ5GnwQcptsnJeZ4aBGsp8eZwNnGTntLZKE76w
-JIaefKHHisKvwLlegLPDRILXLe4yARvVilC6nKFV+j0TjqlnlvDVcZ0QVnXfJTXY
-Dzift/xrrkZZvOYybWhcTIOaE++JJu3+Xp91VACA6dvi94mji6hv4yHZRpJmwy4h
-JFCOiYnvxdC50Hn+7uyTJG1iv+9eRiZYKAHF5OQn2SE6tQVCeYenpF1YWsiYajhT
-68Gt2nRM/9IOddjrvRHyzDAlFlZwDHvqXtiueKPYaYWcE6NgcK22iHqNmTPuyzQ=
-=PtoG
+iEYEAREIAAYFAlCbk3oACgkQvFcC4BYPU0ozyACfQ2RFORwGxsYuXfvgZQs/rAxg
+Oy4An0MbOM52IeE13CVMmWkdJR1AKPP9
+=D1Fu
 -----END PGP SIGNATURE-----
diff --git a/media-libs/chromaprint/chromaprint-0.7.ebuild b/media-libs/chromaprint/chromaprint-0.7.ebuild
index 00ab7426ae15..d71388cd1e8a 100644
--- a/media-libs/chromaprint/chromaprint-0.7.ebuild
+++ b/media-libs/chromaprint/chromaprint-0.7.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/chromaprint/chromaprint-0.7.ebuild,v 1.2 2012/11/08 11:11:52 aballier Exp $
 
 EAPI=4
 inherit cmake-utils
@@ -15,7 +15,7 @@ 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
+RDEPEND=">=virtual/ffmpeg-0.10
 	tools? ( >=media-libs/taglib-1.6 )"
 DEPEND="${RDEPEND}
 	test? (
@@ -26,7 +26,7 @@ DEPEND="${RDEPEND}
 
 DOCS="NEWS.txt README.txt"
 
-PATCHES=( "${FILESDIR}"/${P}-boost.patch )
+PATCHES=( "${FILESDIR}"/${P}-boost.patch "${FILESDIR}"/${P}-ffmpeg.patch )
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/media-libs/chromaprint/files/chromaprint-0.7-ffmpeg.patch b/media-libs/chromaprint/files/chromaprint-0.7-ffmpeg.patch
new file mode 100644
index 000000000000..f51e7794b6d8
--- /dev/null
+++ b/media-libs/chromaprint/files/chromaprint-0.7-ffmpeg.patch
@@ -0,0 +1,43 @@
+https://bugs.gentoo.org/show_bug.cgi?id=435856
+https://raw.github.com/pld-linux/chromaprint/master/chromaprint-ffmpeg.patch
+
+--- chromaprint-0.7/src/ext/ffmpeg_decoder.h.orig	2012-09-05 20:05:36.000000000 +0200
++++ chromaprint-0.7/src/ext/ffmpeg_decoder.h	2012-10-10 17:59:58.632685943 +0200
+@@ -80,7 +80,7 @@
+ 		avcodec_close(m_codec_ctx);
+ 	}
+ 	if (m_format_ctx) {
+-		av_close_input_file(m_format_ctx);
++		avformat_close_input(&m_format_ctx);
+ 	}
+ 	//av_audio_convert_free(m_convert_ctx);
+ 	av_free(m_buffer2);
+@@ -89,12 +89,12 @@
+ 
+ inline bool Decoder::Open()
+ {
+-	if (av_open_input_file(&m_format_ctx, m_file_name.c_str(), NULL, 0, NULL) != 0) {
++	if (avformat_open_input(&m_format_ctx, m_file_name.c_str(), NULL, NULL) != 0) {
+ 		m_error = "Couldn't open the file." + m_file_name;
+ 		return false;
+ 	}
+ 
+-	if (av_find_stream_info(m_format_ctx) < 0) {
++	if (avformat_find_stream_info(m_format_ctx, NULL) < 0) {
+ 		m_error = "Couldn't find stream information in the file.";
+ 		return false;
+ 	}
+@@ -129,11 +129,11 @@
+ 		return false;
+ 	}
+ 
+-	if (m_codec_ctx->sample_fmt != SAMPLE_FMT_S16) {
++	if (m_codec_ctx->sample_fmt != AV_SAMPLE_FMT_S16) {
+ 		m_error = "Unsupported sample format.\n";
+ 		return false;
+ 	}
+-	/*m_convert_ctx = av_audio_convert_alloc(SAMPLE_FMT_S16, 1,
++	/*m_convert_ctx = av_audio_convert_alloc(AV_SAMPLE_FMT_S16, 1,
+ 	                                       m_codec_ctx->sample_fmt, 1,
+ 										   NULL, 0);
+ 	if (!m_convert_ctx) {