diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2015-02-06 13:46:29 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2015-02-06 13:46:29 +0000 |
| commit | 940417b9f6b135efd1fe54212722b1b703130c22 (patch) | |
| tree | 9cd2b0d8098cf8af4861689c56768115312c1535 /media-sound/gejengel | |
| parent | Stable for amd64, wrt bug #539006 (diff) | |
| download | gentoo-2-940417b9f6b135efd1fe54212722b1b703130c22.tar.gz gentoo-2-940417b9f6b135efd1fe54212722b1b703130c22.tar.bz2 gentoo-2-940417b9f6b135efd1fe54212722b1b703130c22.zip | |
add patch to build with ffmpeg2, bug #536626
Signed-off-by: aballier@gentoo.org
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Diffstat (limited to 'media-sound/gejengel')
| -rw-r--r-- | media-sound/gejengel/ChangeLog | 6 | ||||
| -rw-r--r-- | media-sound/gejengel/files/gejengel-0.1.4-ffmpeg2.patch | 24 | ||||
| -rw-r--r-- | media-sound/gejengel/gejengel-0.1.4-r1.ebuild | 9 |
3 files changed, 34 insertions, 5 deletions
diff --git a/media-sound/gejengel/ChangeLog b/media-sound/gejengel/ChangeLog index c8ffb5e5e2ab..722ce35bf8ef 100644 --- a/media-sound/gejengel/ChangeLog +++ b/media-sound/gejengel/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-sound/gejengel # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/gejengel/ChangeLog,v 1.28 2015/01/31 13:09:58 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/gejengel/ChangeLog,v 1.29 2015/02/06 13:46:29 aballier Exp $ + + 06 Feb 2015; Alexis Ballier <aballier@gentoo.org> gejengel-0.1.4-r1.ebuild, + +files/gejengel-0.1.4-ffmpeg2.patch: + add patch to build with ffmpeg2, bug #536626 31 Jan 2015; Markos Chandras <hwoarang@gentoo.org> metadata.xml: Drop to maintainer-needed diff --git a/media-sound/gejengel/files/gejengel-0.1.4-ffmpeg2.patch b/media-sound/gejengel/files/gejengel-0.1.4-ffmpeg2.patch new file mode 100644 index 000000000000..b6850eb2e58d --- /dev/null +++ b/media-sound/gejengel/files/gejengel-0.1.4-ffmpeg2.patch @@ -0,0 +1,24 @@ +Index: gejengel-0.1.4/src/AudioDecoder/ffmpegdecoder.cpp +=================================================================== +--- gejengel-0.1.4.orig/src/AudioDecoder/ffmpegdecoder.cpp ++++ gejengel-0.1.4/src/AudioDecoder/ffmpegdecoder.cpp +@@ -28,6 +28,10 @@ extern "C" + #include <libavcodec/avcodec.h> + } + ++#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE ++#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio ++#endif ++ + using namespace std; + using namespace utils; + +@@ -71,7 +75,7 @@ void FFmpegDecoder::destroy() + + if (m_pFormatContext) + { +- av_close_input_file(m_pFormatContext); ++ avformat_close_input(&m_pFormatContext); + m_pFormatContext = NULL; + } + diff --git a/media-sound/gejengel/gejengel-0.1.4-r1.ebuild b/media-sound/gejengel/gejengel-0.1.4-r1.ebuild index 1c46b27c7557..56146bc548c2 100644 --- a/media-sound/gejengel/gejengel-0.1.4-r1.ebuild +++ b/media-sound/gejengel/gejengel-0.1.4-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/gejengel/gejengel-0.1.4-r1.ebuild,v 1.5 2013/06/22 16:54:58 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/gejengel/gejengel-0.1.4-r1.ebuild,v 1.6 2015/02/06 13:46:29 aballier Exp $ EAPI=4 inherit eutils multilib flag-o-matic @@ -22,7 +22,7 @@ RDEPEND="dev-cpp/gtkmm:2.4 media-gfx/graphicsmagick[imagemagick] ) mad? ( media-libs/libmad ) flac? ( media-libs/flac[cxx] ) - ffmpeg? ( virtual/ffmpeg ) + ffmpeg? ( >=virtual/ffmpeg-9 ) audioscrobbler? ( >=media-libs/lastfmlib-0.4 ) dbus? ( dev-libs/dbus-glib ) libnotify? ( x11-libs/libnotify ) @@ -40,7 +40,8 @@ src_prepare() { epatch "${FILESDIR}"/${P}-libnotify-0.7.patch \ "${FILESDIR}"/${P}-ffmpeg.patch \ "${FILESDIR}"/${P}-ffmpeg-1.patch \ - "${FILESDIR}"/${P}-libav9.patch + "${FILESDIR}"/${P}-libav9.patch \ + "${FILESDIR}"/${P}-ffmpeg2.patch # Remove Vesion and Encoding from the desktop file sed -i -e "/Version/d" -e "/Encoding/d" \ data/${PN}.desktop.in || die "sed failed" |