diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2013-06-22 16:54:58 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2013-06-22 16:54:58 +0000 |
| commit | 0574cad254875820d88b44b2e0afeb6006f5ef1b (patch) | |
| tree | 1479651ec2781d2cf38806082b37cc999a7a62ef /media-sound | |
| parent | Move to tree from KDE overlay, fix license (diff) | |
| download | gentoo-2-0574cad254875820d88b44b2e0afeb6006f5ef1b.tar.gz gentoo-2-0574cad254875820d88b44b2e0afeb6006f5ef1b.tar.bz2 gentoo-2-0574cad254875820d88b44b2e0afeb6006f5ef1b.zip | |
Fix build with libav9. Fixes bug#443220 and bug#473618.
(Portage version: 2.2.0_alpha184/cvs/Linux x86_64, signed Manifest commit with key 8EEE3BE8)
Diffstat (limited to 'media-sound')
| -rw-r--r-- | media-sound/gejengel/ChangeLog | 6 | ||||
| -rw-r--r-- | media-sound/gejengel/files/gejengel-0.1.4-libav9.patch | 21 | ||||
| -rw-r--r-- | media-sound/gejengel/gejengel-0.1.4-r1.ebuild | 6 |
3 files changed, 30 insertions, 3 deletions
diff --git a/media-sound/gejengel/ChangeLog b/media-sound/gejengel/ChangeLog index cb14c3aabca6..4e37797175ae 100644 --- a/media-sound/gejengel/ChangeLog +++ b/media-sound/gejengel/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-sound/gejengel # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/gejengel/ChangeLog,v 1.26 2013/01/24 13:42:37 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/gejengel/ChangeLog,v 1.27 2013/06/22 16:54:58 scarabeus Exp $ + + 22 Jun 2013; Tomáš Chvátal <scarabeus@gentoo.org> + +files/gejengel-0.1.4-libav9.patch, gejengel-0.1.4-r1.ebuild: + Fix build with libav9. Fixes bug#443220 and bug#473618. 24 Jan 2013; Alexis Ballier <aballier@gentoo.org> gejengel-0.1.4-r1.ebuild, +files/gejengel-0.1.4-ffmpeg-1.patch: diff --git a/media-sound/gejengel/files/gejengel-0.1.4-libav9.patch b/media-sound/gejengel/files/gejengel-0.1.4-libav9.patch new file mode 100644 index 000000000000..5529fb7308dc --- /dev/null +++ b/media-sound/gejengel/files/gejengel-0.1.4-libav9.patch @@ -0,0 +1,21 @@ +diff -urN gejengel-0.1.4.old/src/AudioDecoder/ffmpegdecoder.cpp gejengel-0.1.4/src/AudioDecoder/ffmpegdecoder.cpp +--- gejengel-0.1.4.old/src/AudioDecoder/ffmpegdecoder.cpp 2013-06-22 18:48:46.176890946 +0200 ++++ gejengel-0.1.4/src/AudioDecoder/ffmpegdecoder.cpp 2013-06-22 18:50:04.516888158 +0200 +@@ -88,7 +88,7 @@ + throw logic_error("Could not open input file: " + m_Filepath); + } + +- if (av_find_stream_info(m_pFormatContext) < 0) ++ if (avformat_find_stream_info(m_pFormatContext, NULL) < 0) + { + throw logic_error("Could not find stream information in " + m_Filepath); + } +@@ -134,7 +134,7 @@ + m_pFormatContext->flags |= AVFMT_FLAG_GENPTS; + m_pFormatContext->streams[m_AudioStream]->discard = AVDISCARD_DEFAULT; + +- if (avcodec_open(m_pAudioCodecContext, m_pAudioCodec) < 0) ++ if (avcodec_open2(m_pAudioCodecContext, m_pAudioCodec, NULL) < 0) + { + throw logic_error("Could not open audio codec for " + m_Filepath); + } diff --git a/media-sound/gejengel/gejengel-0.1.4-r1.ebuild b/media-sound/gejengel/gejengel-0.1.4-r1.ebuild index ec234a88d729..1c46b27c7557 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 # 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.4 2013/01/24 13:42:37 aballier Exp $ +# $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 $ EAPI=4 inherit eutils multilib flag-o-matic @@ -31,6 +31,7 @@ RDEPEND="dev-cpp/gtkmm:2.4 pulseaudio? ( media-sound/pulseaudio )" DEPEND="${RDEPEND} dev-libs/libxdg-basedir + dev-util/intltool >=sys-devel/automake-1.11" DOCS=( AUTHORS ChangeLog README TODO ) @@ -38,7 +39,8 @@ DOCS=( AUTHORS ChangeLog README TODO ) src_prepare() { epatch "${FILESDIR}"/${P}-libnotify-0.7.patch \ "${FILESDIR}"/${P}-ffmpeg.patch \ - "${FILESDIR}"/${P}-ffmpeg-1.patch + "${FILESDIR}"/${P}-ffmpeg-1.patch \ + "${FILESDIR}"/${P}-libav9.patch # Remove Vesion and Encoding from the desktop file sed -i -e "/Version/d" -e "/Encoding/d" \ data/${PN}.desktop.in || die "sed failed" |