diff options
| author |   Lars Wendler <polynomial-c@gentoo.org> | 2014-01-14 10:06:53 +0000 |
|---|---|---|
| committer | Lars Wendler <polynomial-c@gentoo.org> | 2014-01-14 10:06:53 +0000 |
| commit | 058bbc9a987655bd1499da0562a585aac809d9fe (patch) | |
| tree | 617b0c12a227ea6b48d42b562390007a9618521e /media-libs/chromaprint | |
| parent | Version bump. (diff) | |
| download | gentoo-2-058bbc9a987655bd1499da0562a585aac809d9fe.tar.gz gentoo-2-058bbc9a987655bd1499da0562a585aac809d9fe.tar.bz2 gentoo-2-058bbc9a987655bd1499da0562a585aac809d9fe.zip | |
Fixed compilation with ffpmeg-2 when "tools" USE flag is enabled (bug #472966)
(Portage version: 2.2.8/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)
Diffstat (limited to 'media-libs/chromaprint')
| -rw-r--r-- | media-libs/chromaprint/ChangeLog | 9 | ||||
| -rw-r--r-- | media-libs/chromaprint/chromaprint-1.1.ebuild | 5 | ||||
| -rw-r--r-- | media-libs/chromaprint/files/chromaprint-1.1-ffmpeg2.patch | 13 |
3 files changed, 23 insertions, 4 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/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: |