diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2011-12-21 12:55:10 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2011-12-21 12:55:10 +0000 |
| commit | 2f638b366c9e2a043ef4a45d1505a4ecbfed0d54 (patch) | |
| tree | 3c705fc2962c0fd2fe101ae38ec73240038fa815 /media-sound | |
| parent | Add tools.jar to build classpath, thanks to Chewi for noticing. (diff) | |
| download | gentoo-2-2f638b366c9e2a043ef4a45d1505a4ecbfed0d54.tar.gz gentoo-2-2f638b366c9e2a043ef4a45d1505a4ecbfed0d54.tar.bz2 gentoo-2-2f638b366c9e2a043ef4a45d1505a4ecbfed0d54.zip | |
fix build with latest ffmpeg, bug #377991
(Portage version: 2.2.0_alpha81/cvs/Linux x86_64)
Diffstat (limited to 'media-sound')
| -rw-r--r-- | media-sound/gejengel/ChangeLog | 6 | ||||
| -rw-r--r-- | media-sound/gejengel/files/gejengel-0.1.4-ffmpeg.patch | 13 | ||||
| -rw-r--r-- | media-sound/gejengel/gejengel-0.1.4.ebuild | 5 |
3 files changed, 21 insertions, 3 deletions
diff --git a/media-sound/gejengel/ChangeLog b/media-sound/gejengel/ChangeLog index 8fbb7bad61e7..7576af8bdcbe 100644 --- a/media-sound/gejengel/ChangeLog +++ b/media-sound/gejengel/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-sound/gejengel # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/gejengel/ChangeLog,v 1.20 2011/11/11 20:26:09 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/gejengel/ChangeLog,v 1.21 2011/12/21 12:55:10 aballier Exp $ + + 21 Dec 2011; Alexis Ballier <aballier@gentoo.org> gejengel-0.1.4.ebuild, + +files/gejengel-0.1.4-ffmpeg.patch: + fix build with latest ffmpeg, bug #377991 11 Nov 2011; Samuli Suominen <ssuominen@gentoo.org> gejengel-0.1.4.ebuild: Remove libsexymm from dependencies wrt #381205 diff --git a/media-sound/gejengel/files/gejengel-0.1.4-ffmpeg.patch b/media-sound/gejengel/files/gejengel-0.1.4-ffmpeg.patch new file mode 100644 index 000000000000..658ff0ca675c --- /dev/null +++ b/media-sound/gejengel/files/gejengel-0.1.4-ffmpeg.patch @@ -0,0 +1,13 @@ +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 +@@ -104,7 +104,7 @@ void FFmpegDecoder::initializeAudio() + { + for(uint32_t i = 0; i < m_pFormatContext->nb_streams; ++i) + { +- if (m_pFormatContext->streams[i]->codec->codec_type == CODEC_TYPE_AUDIO) ++ if (m_pFormatContext->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO) + { + m_pAudioStream = m_pFormatContext->streams[i]; + m_AudioStream = i; diff --git a/media-sound/gejengel/gejengel-0.1.4.ebuild b/media-sound/gejengel/gejengel-0.1.4.ebuild index b8657e3718ce..387f763c526a 100644 --- a/media-sound/gejengel/gejengel-0.1.4.ebuild +++ b/media-sound/gejengel/gejengel-0.1.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 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.ebuild,v 1.7 2011/11/11 20:26:09 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/gejengel/gejengel-0.1.4.ebuild,v 1.8 2011/12/21 12:55:10 aballier Exp $ EAPI=4 inherit eutils multilib @@ -36,7 +36,8 @@ DEPEND="${RDEPEND} DOCS=( AUTHORS ChangeLog README TODO ) src_prepare() { - epatch "${FILESDIR}"/${P}-libnotify-0.7.patch + epatch "${FILESDIR}"/${P}-libnotify-0.7.patch \ + "${FILESDIR}"/${P}-ffmpeg.patch } src_configure() { |