Fixed compilation with ffpmeg-2 when "tools" USE flag is enabled (bug #472966)

Package-Manager: portage-2.2.8/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

4 files changed, 40 insertions, 20 deletions

diff --git a/media-libs/chromaprint/ChangeLog b/media-libs/chromaprint/ChangeLog
index d7bc5cff7167..5ddd0663246b 100644
--- a/media-libs/chromaprint/ChangeLog
+++ b/media-libs/chromaprint/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/chromaprint
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/chromaprint/ChangeLog,v 1.13 2013/11/24 10:50:14 jlec Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/chromaprint/ChangeLog,v 1.14 2014/01/14 10:06:53 polynomial-c Exp $
+
+  14 Jan 2014; Lars Wendler <polynomial-c@gentoo.org> chromaprint-1.1.ebuild,
+  +files/chromaprint-1.1-ffmpeg2.patch:
+  Fixed compilation with ffpmeg-2 when "tools" USE flag is enabled (bug
+  #472966).
 
 *chromaprint-1.1 (24 Nov 2013)
 
diff --git a/media-libs/chromaprint/Manifest b/media-libs/chromaprint/Manifest
index 35636c2795c9..05504fc3fda0 100644
--- a/media-libs/chromaprint/Manifest
+++ b/media-libs/chromaprint/Manifest
@@ -1,33 +1,34 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+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
 AUX chromaprint-1.0-libav9.patch 371 SHA256 2aaa94f74e27d53e2ac63510a92a3222f9787a70db6c5eaa8f537e855f335e64 SHA512 6c17b4d5e32ca2fbf7b925b3e1788899e65c15835906b1dea87a5e3b9a03b02ec53c073ccda225bad55dc055d850aa8bfddaf250c6fcc3e5dcf50ba3e3428b5f WHIRLPOOL 75ab25f6d64a54a4b4dfb63f35a98076bb8ddeb73cc8ced887bb246ee98c008de80c78f51f49f850b24430ec6237daeb21629ddde57cedab268f234a3bd526b4
+AUX chromaprint-1.1-ffmpeg2.patch 265 SHA256 eff742dc39339d95eee2fad53b0e092c40d76c297d112e9ceed3053b726a2d87 SHA512 67bd4ceb2a7dea3f20f5d59159909a30990b3883424bc852c6b81193260ed2a345556cea451acea968cb2795b874de07edb32449b30ca05de8fab1b15735bc77 WHIRLPOOL a56c6e95aff43e69b47c15cc02e47028508b99bef8d9dd1034ea7065c674f3edf8643ab871542c4e43a75acdaa5520e998562622da3b5fc1f0cb466fb54fd224
 AUX chromaprint-1.1-gtest.patch 3954 SHA256 d8d6a0028f5e2ea3d3eb5eedc391a27398b4ab904d19c58a720d45c8900bd8a1 SHA512 adbbfd9a8456751b4071d78cad1a67c4d11dcbb0f74dfefcbf6e92505c6543f81df316b2e43b927ac98405b054b1dba74658610c226e40e26184d4e927099fa3 WHIRLPOOL cfc8d69aa81bb36467d002da1f5175011ca0408cae7458bdaf6861676e679e98292b1e64fdb43895dda5b67e05c010a92164aaaaeddae13f5b482511a37fc721
 DIST chromaprint-0.6.tar.gz 542366 SHA256 5d9b82da226450c14e43482371a1b2a178e2604ab5b2e9259f33b1b461ee9d63
 DIST chromaprint-0.7.tar.gz 543811 SHA256 4e52c3fd443c91a5c429557753d4ba3f9d31d183810412c0d8600892f3975501 SHA512 2ac03f80888d6c12dd05c20adc82e0f2c9e6bf5edc099d7c7b719b8cb353151fb04b78f5c7bca672d5fe8357a791e86fdea7b6952a0d64c346c079548ebfcd38 WHIRLPOOL 34c5cb7c38dc0e4924e068ff0a695e571fdd2233046ef6ea84e9e0e27e6bf9f5eaedceb79c2f8120e9ac6eb30ace3bc9e15ba59027cd498426e7f94536e2da84
 DIST chromaprint-1.1.tar.gz 542360 SHA256 6b14d7ea4964581b73bd3f8038c8857c01e446421c1ae99cbbf64de26b47cd12 SHA512 3d439dfca979e2babc8d2c171b5cb36fd0a5d3b7475e02a0f8bae436f7096e189674b640119f0dccf7cc2cd214bd8674d46b018952f1e3e93ddc0ba19b5155f9 WHIRLPOOL 726c7710f7bd1c138d7ebd1de263a0e214cbd79faf60e35034a60cfd68a9d3b4e52fc1cc93ce4dc7d39683e3a5ac1d7e9bd6c8046cdb5cece83b9c2fbf4971b5
 EBUILD chromaprint-0.6.ebuild 1134 SHA256 4b2ed6b676f99cdb6a6f32eacab5905bcff46022b021089547bcaf819c5193a5 SHA512 fbaffe79a2ca6ccf6bc2d24ac07366086a5ddce4a68a593603af0dacd8910040bcf516e1e8425e09e76bf2dec910ae2598894a45b37fd931aeb27e496bfac352 WHIRLPOOL c4f400a10e8a30b3b27b74642ff502186860502a736156a540fc2be3e7910596692458dd491060ff047b052b58a36884a3dd8a93b9ca8d28a359531332462ddc
 EBUILD chromaprint-0.7.ebuild 1276 SHA256 5aa22287d247accc075ee32bf17460a60d2ef9c3de3db66e47479388fa5177fc SHA512 56ec2635e3fada5a487f5ec97455d634c052683a2471cb54124d3a7472b5e3fa08607327d5c993394125b164f9d010d76e954994d2ffcda0e57625556c0aed64 WHIRLPOOL 6c095488c20f3bcc4eff52c3970b0175403a55c11f0b2bad69b4d3a4eac562596073230aab5f7d6f895a594184b035f82899b1f87325a19c5bf2f4cd82af5178
-EBUILD chromaprint-1.1.ebuild 1264 SHA256 a175d3dfb573f050a10d80b56ecb50649013d516d7948b5bc445aa267db80ef1 SHA512 a1438c4ce9ce0cbb93196d5716da7635dfc985adfdf79593732a67c99d1883b1d3e219b9084c307dc686d40ebf2a38031ca596c62d6f4ae34cfe76a62cbdec39 WHIRLPOOL 7b7f3b8790d54531aec8d0569473f4ef756638aadd3d99d12b9c447f213e3d2dc7ee5694f427a5fcda0f903a3bd142d307319c21b926d59d3e4cd80c8cd5d1da
-MISC ChangeLog 2140 SHA256 f70a1d4366ccfc78500c358c098b67f00a459bfa5bdcb5bcf70edc8013cb155a SHA512 ececcff0cc332d7e45bad004e7828aab37e2696e5777efb709f98f8b10e9803ccf352d975809b642361d9f8f08f4a8a9427ba73e7d84902fa115acf178f85a01 WHIRLPOOL c06c63ead81082fdf424d795b6d25062b6f76d52c4aa07d1d6a6db117c64a0d9f45614b5ec9f02d3ddd38947224bb645979c5ef94e186090bf21d194c04f6d1d
+EBUILD chromaprint-1.1.ebuild 1306 SHA256 00d6d0e1898ca0757b1e8063bca3be9d480f2508a62e684350436664e75510a5 SHA512 a6fdd5155116003d9a4985adaec714ef41145b157c92327a8b5b4e775a4358e0fb314ce9b9a2206941d128a1bed945641950cbab1e6c3b16c65a62dab68671a5 WHIRLPOOL e3ea80785f65e200e931b1a1e78b7f11bc70b9fa40468175bb21028cf1ef6d18c4775a9f579982c86824de1b4269e270e36b501a4d9ca8fed2d5919dcb753a16
+MISC ChangeLog 2351 SHA256 65b8c3859ba93dafd3a2470b9e508535ac8380eea4772dce99469358f5542c7c SHA512 eb270a11a16d406d6bf66749e45ae6d1b8309acce6b20312dc03893d34863fc88e7914c8812583763c85a0f34a6694f0e26612924716243099f4359ef1bd3a7d WHIRLPOOL 9ab094d8217b74ce1c8c508d758fae222396d8cf1cc80cb1719992aeff5f798d11f340ab5999d80a16a04a1028e4635ffca601bdc907c1e40fe90461e5058818
 MISC metadata.xml 252 SHA256 3fe938dfdd28a5ae7ef32e2bcccd22a40d4498e9ce0b0cd8b44c0c45c4a8366c SHA512 d47ca10c747b2caa9249c6a931476beacb5d615f126a64d0ebbb03a254c3382457cc5c08d29c61c388818d84407db9458f98cb69c10d8f632bb18ed5c67d2daf WHIRLPOOL eeb84a851b4debdefcaa73bdf06b8f17494b79210ecf4f1a65b3d499848dd3b5dd8319fb6590b4b6cd8ef34d818829b689ae33d26a6d733b1070975d99847f39
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSkdnnAAoJELnU8jG9FVirGjQQAJewmYhFJMCM7hC3goaDbArh
-aebcSHL07mHCZ+GB4LNbL0ox43Uh1nWGSAm9uzQef4CioPp0Hewzsvf8d1CmU9Hn
-80pUJu4lmHHolKoEVGiHtrQmuWEzIBPuqVrF4RNuxDT8O+D9HcZtCU1SSUK2Qw+M
-zia9WvtAWIxQMrsDpeO1Aoe83ycSW94fQfKVmZeC7TORHfPmBMtDB+eY23liWx7E
-t1Hz6O94KuQ6KzE5OcfpzQN+1gb2ryOfS085XDVDev3/paK2KMh1ud4nHaH/gOv6
-WqF8kFXr5UDUc6sHdYldcs9VLOtKz1FjcPg5cTnNKmhnaWlCCtr1OrO7ZsgfuXnu
-fHPvZUl/XXhJ5S4DWfmBfVf7I+dcP4bqtHPGt1GPEA8Ft4OM9avs1nrPHQOwK4Qr
-4aoXZAE0jihQHMxcmDVF9zGCtv5TCvhM/8sRPsKbGR3ylHpYyPoo2px6bTp9yNOd
-I8oRdw7v9WMT6MYlW3ypHB75419JMthDBwYZnaR2aMVR6Keeuj0weRqVixOndhr9
-5X1RSqZcjgEc8WTL4aZGUd/FDTd+iK65MeQht53mEz592oFO+IQ638ipVsXgX6vh
-u1BSeoPQwkN9odWcgRLtRab4Dj7ClhC3e+ve1hkqBe+EdoN9NxhWg2HP2gR1GYXW
-9NRhR1s+yXMbfth4QDE0
-=JFU+
+iQIcBAEBCAAGBQJS1Qw+AAoJEPiazRVxLXTFyMUP/it1cqlNplQvPvGJ9vivXFQe
+lujJbemY0t8yvoIxcXJyt5qChLRpMS66GQNpgUZzubwAEv355m6GoZnXObAUEsZW
+Knr2XBb8X9Y4Apcl1Q407tAncDFd/UaY/+W4x8E4pHHXeUxyvEium9OX3p4r7srQ
+uREolVnjzoQMmFLbY9sgrxa0ZGg9pU5jUDWuipUd3ld82R72XhGf/PQ/IwQXk/7y
+qRDu9EsYRMoA4kaBRfkKXDTdaMCkPZbWDmmcFzZBfLWwF+HychXk13oSR7nwPTxB
+SUp0l1/Yd5q+OhgQ9r91dikilvqkO59tMKC3fNWSJ7ufkycugVihayQhX+v9orqa
+6UYc7FFykG2HdmOaWl7JDndRBRpzlixoaMG5ego0LhSR9dsnv4zdWTzM2tco5KsB
+0UFNZMRS5Rt2z3WRr0QJ4D0spuiqBj4h6UEa+uMlI3AQjNnX1WCBN0lVvIoAzmiI
+ouLJ42OyMMkEzNLek0WyrpAj66bMxz59FUZQNO0BOQ/qdkY9Jrd7UnNrCvRJkIDV
+osBnZA5J4m6+lILO9t7x4syl02b95RFPard5M/BqsZ6mloqLkyn3gJCc5IXhmXLi
+Z3mdV2T/cyEU3v4THOKllfOZ28X19QdeTEqKsigE2BD/AFKFFmF0IUZS6vysO/u+
+Qqeg8rVYC0ZpwWxCb5Yl
+=WAQF
 -----END PGP SIGNATURE-----
diff --git a/media-libs/chromaprint/chromaprint-1.1.ebuild b/media-libs/chromaprint/chromaprint-1.1.ebuild
index c57d0b8c1e93..986f6119acff 100644
--- a/media-libs/chromaprint/chromaprint-1.1.ebuild
+++ b/media-libs/chromaprint/chromaprint-1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/chromaprint/chromaprint-1.1.ebuild,v 1.1 2013/11/24 10:47:39 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/chromaprint/chromaprint-1.1.ebuild,v 1.2 2014/01/14 10:06:53 polynomial-c Exp $
 
 EAPI=5
 
@@ -31,6 +31,7 @@ DOCS="NEWS.txt README.txt"
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.7-ffmpeg.patch
 	"${FILESDIR}"/${P}-gtest.patch
+	"${FILESDIR}"/${P}-ffmpeg2.patch
 )
 
 src_configure() {
diff --git a/media-libs/chromaprint/files/chromaprint-1.1-ffmpeg2.patch b/media-libs/chromaprint/files/chromaprint-1.1-ffmpeg2.patch
new file mode 100644
index 000000000000..2a68de3105dc
--- /dev/null
+++ b/media-libs/chromaprint/files/chromaprint-1.1-ffmpeg2.patch
@@ -0,0 +1,13 @@
+--- chromaprint-1.1/src/ext/ffmpeg_decoder.h
++++ chromaprint-1.1/src/ext/ffmpeg_decoder.h
+@@ -28,6 +28,10 @@
+ }
+ #include "audio_consumer.h"
+ 
++#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE
++#  define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000
++#endif
++
+ class Decoder
+ {
+ public: