Support libav9 api (fix bug 443250)

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64
Manifest-Sign-Key: 0x1191738E

4 files changed, 68 insertions, 7 deletions

diff --git a/media-libs/chromaprint/ChangeLog b/media-libs/chromaprint/ChangeLog
index 345ef85b5533..837c7b33995d 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.6 2012/12/12 16:25:32 ago Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/chromaprint/ChangeLog,v 1.7 2013/02/16 16:54:21 lu_zero Exp $
+
+  16 Feb 2013; Luca Barbato <lu_zero@gentoo.org> chromaprint-0.7.ebuild,
+  +files/chromaprint-0.7-libav9.patch:
+  Support libav9 api (fix bug 443250)
 
   12 Dec 2012; Agostino Sarubbo <ago@gentoo.org> chromaprint-0.7.ebuild:
   Add ~ppc, wrt bug #426340
diff --git a/media-libs/chromaprint/Manifest b/media-libs/chromaprint/Manifest
index 6e6d6b4ad9ca..70583c90f844 100644
--- a/media-libs/chromaprint/Manifest
+++ b/media-libs/chromaprint/Manifest
@@ -1,8 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+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
+AUX chromaprint-0.7-libav9.patch 1575 SHA256 a6371e223dcbecb3de61f0d4d2cf24990124812b6a02be54ce9e7647ec225b8e SHA512 661b5034c911aebed32d3a4dc3491890c91ed61e24f3d17330dd2d553edc29e16f7a82355906f16e61fa077f868884edeb40def1b4cb51cce9d24415b9f59eab WHIRLPOOL 911e899b3fe62c961090567d85810b4815ff334afeb975debb296b2a99a4f5f791c231135093f15461c58bb12d32141d00db0ed013984c008f204e9ff1276127
 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 1238 SHA256 775f29cad14480844aa1d60182b8b9155e98b44da78ab7e023d13a409a3cd858 SHA512 4b0acb08d19207c218b1b72855ec82b4db88519cb1f81e91d99f4136dff6e2bc1c3a6f72a094f0dbed8799b9e64a932cf7d2b9c7839fea8df17ce6e085fc9df8 WHIRLPOOL ab69749faf89641d9e4326bff9902128f0538b9d7fbc4c855616f371c13ac38f5dbe86b5cee0bc5abcf5d3ebb7d3262a31edf6fb47e215ee5258a6b48a7e9297
-MISC ChangeLog 1157 SHA256 ff1592afa5d83031a3f4234acb37f7cdb7d8adc13db568c7008116282a0bec02 SHA512 69392e607335ea45268bdc6898282866ea5b2eec42b98941e8cc307f4f877a884d2531ff4839c51791c0a79e0628e916dbd20d59dbfca11084bdac6ae3c8a32b WHIRLPOOL aec845f8821df6bec83570f6e5fd83420b8858c4635a58cefe6a370e8d012942c4af11ddc9f2b6e1e78822e20ce1002e2dd127f21da9376fa0bc6afe28d87289
+EBUILD chromaprint-0.7.ebuild 1282 SHA256 a94782b4c151ba1f92014f8548db7f83993208dc4bc90e6bb84a028cd006d015 SHA512 f3569e81ffbce6cb7ef453ce4fc641f56128708fd55e96e475146f4d274be8aee5b8a972282c0bce09d95eded61adbf53075ac20d50f138cded45bfe5825c3ae WHIRLPOOL be3e3be8299f14ea63deeba52936b47f9cdb11a41ea5a0818649a559305e89e0b9dca8c4e6c9e405fce56514ba73495b1d205bebbd1d058c6928fbe0cd03490c
+MISC ChangeLog 1312 SHA256 71f64fa2e3b8129d01eba47d54b34850624a0abbe476df73c6f872dadb8ca19f SHA512 5dae015b8d9748a2806fef4663d1f07a0690cc931be1df653720c10ba5dd83dea98f55a93231c96964b0f1749e8f9272fbf40dae51e771ef496912d2c69a50a9 WHIRLPOOL ad707e550acc8dd64758f8c9b19e39c1cbef23a742129c43da6f657291ed81434574748b087d477588a090119705b921f36fb0cc6217dbdf69de8ef610526b77
 MISC metadata.xml 252 SHA256 855e5677de39364e4a8d58f4c1e5128ca6e16ef1f554368534fabab23e94909e SHA512 3ebc4ad794f88d61d7f42d9087d773daeb6db9427356f2ac80406d18b5fa3210fd400464045b52d666ca6648dae28b8a005a610242885917d416f094a15f24c1 WHIRLPOOL d066dbbf45f21b28466457a3ae78dc797550bd7994c3a0e590374dc3e754199d893a07b5e4b7138be590acbbc8d1c0431c71282be9f7f35fa24dc58564344bec
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iF4EAREIAAYFAlEfuckACgkQcXOrnRGRc45HDgD/Zkh61Jv9GYajzEjtxufnVgq9
+Kp0Iizk96MoHPkfUEn4A/1vWe8Io4rALnoNBlcHC4inHKeCX1DY1q20Qyj4gFNmv
+=FTUf
+-----END PGP SIGNATURE-----
diff --git a/media-libs/chromaprint/chromaprint-0.7.ebuild b/media-libs/chromaprint/chromaprint-0.7.ebuild
index 848e935e9913..182536592bfb 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
+# Copyright 1999-2013 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.3 2012/12/12 16:25:32 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/chromaprint/chromaprint-0.7.ebuild,v 1.4 2013/02/16 16:54:21 lu_zero Exp $
 
 EAPI=4
 inherit cmake-utils
@@ -26,7 +26,9 @@ DEPEND="${RDEPEND}
 
 DOCS="NEWS.txt README.txt"
 
-PATCHES=( "${FILESDIR}"/${P}-boost.patch "${FILESDIR}"/${P}-ffmpeg.patch )
+PATCHES=( "${FILESDIR}"/${P}-boost.patch
+		  "${FILESDIR}"/${P}-ffmpeg.patch
+		  "${FILESDIR}"/${P}-libav9.patch )
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/media-libs/chromaprint/files/chromaprint-0.7-libav9.patch b/media-libs/chromaprint/files/chromaprint-0.7-libav9.patch
new file mode 100644
index 000000000000..c52097056377
--- /dev/null
+++ b/media-libs/chromaprint/files/chromaprint-0.7-libav9.patch
@@ -0,0 +1,44 @@
+diff -burN chromaprint-0.7.orig//src/fft_lib_avfft.h chromaprint-0.7/src/fft_lib_avfft.h
+--- chromaprint-0.7.orig//src/fft_lib_avfft.h	2012-09-05 20:05:36.000000000 +0200
++++ chromaprint-0.7/src/fft_lib_avfft.h	2013-02-16 17:34:08.682624779 +0100
+@@ -25,6 +25,7 @@
+ extern "C" {
+ #include <libavcodec/avcodec.h>
+ #include <libavcodec/avfft.h>
++#include <libavutil/mem.h>
+ }
+ #include "combined_buffer.h"
+ 
+diff -burN chromaprint-0.7.orig/examples/fpcalc.c chromaprint-0.7/work/chromaprint-0.7/examples/fpcalc.c
+--- chromaprint-0.7.orig/examples/fpcalc.c	2012-09-05 20:05:36.000000000 +0200
++++ chromaprint-0.7/examples/fpcalc.c	2013-02-16 17:40:09.947611629 +0100
+@@ -42,7 +42,7 @@
+ 		goto done;
+ 	}
+ 
+-	if (av_find_stream_info(format_ctx) < 0) {
++	if (avformat_find_stream_info(format_ctx, NULL) < 0) {
+ 		fprintf(stderr, "ERROR: couldn't find stream information in the file\n");
+ 		goto done;
+ 	}
+@@ -65,7 +65,7 @@
+ 		goto done;
+ 	}
+ 
+-	if (avcodec_open(codec_ctx, codec) < 0) {
++	if (avcodec_open2(codec_ctx, codec, NULL) < 0) {
+ 		fprintf(stderr, "ERROR: couldn't open the codec\n");
+ 		goto done;
+ 	}
+diff -burN chromaprint-0.7.orig/src/ext/ffmpeg_decoder.h chromaprint-0.7/src/ext/ffmpeg_decoder.h
+--- chromaprint-0.7.orig/src/ext/ffmpeg_decoder.h	2013-02-16 17:49:06.799592088 +0100
++++ chromaprint-0.7/src/ext/ffmpeg_decoder.h	2013-02-16 17:49:54.037590369 +0100
+@@ -124,7 +124,7 @@
+ 		return false;
+ 	}
+ 
+-	if (avcodec_open(m_codec_ctx, codec) < 0) {
++	if (avcodec_open2(m_codec_ctx, codec, NULL) < 0) {
+ 		m_error = "Couldn't open the codec.";
+ 		return false;
+ 	}