Fix segfault with recent ffmpeg versions (bug #373423 by Mike MacDonald)

Package-Manager: portage-2.2.0_alpha43/cvs/Linux x86_64

4 files changed, 213 insertions, 12 deletions

diff --git a/media-sound/mpd/ChangeLog b/media-sound/mpd/ChangeLog
index d2c0f3f9432b..26249b22b53b 100644
--- a/media-sound/mpd/ChangeLog
+++ b/media-sound/mpd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/mpd
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.256 2011/06/25 17:47:22 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.257 2011/07/03 10:30:35 angelos Exp $
+
+*mpd-0.16.3-r1 (03 Jul 2011)
+
+  03 Jul 2011; Christoph Mende <angelos@gentoo.org> +mpd-0.16.3-r1.ebuild,
+  +files/mpd-0.16.3-ffmpeg.patch:
+  Fix segfault with recent ffmpeg versions (bug #373423 by Mike MacDonald)
 
   25 Jun 2011; Christoph Mende <angelos@gentoo.org> mpd-0.15.8.ebuild,
   mpd-0.15.15.ebuild, mpd-0.15.16.ebuild, mpd-0.16.2.ebuild, mpd-0.16.3.ebuild,
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index a48e1810ec7f..de737c19250e 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -1,7 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX 0.15.1-mpdconf.patch 2912 RMD160 6683618151f0f10dc94b5563a48be3729919ef08 SHA1 fc67f59f808d77332a20261525ca74bf1d67b228 SHA256 cacecca8580bce38f998a9f3fa867c274bb112a9af8c59b8dfcbd23a45d34523
+AUX mpd-0.16.3-ffmpeg.patch 800 RMD160 984a98f5f7bd6a412ebb993ac2be6765f94424c9 SHA1 802ee8a3f598d82538b68674af0f82150bf1c52d SHA256 b3958db44146f11bc1f99410284c30a2739915591e92704ed83ea389c222a121
 AUX mpd-0.16.conf.patch 2646 RMD160 746a65c8eeba996e6fffd561912b82ad81edb9cc SHA1 204d30b2439f49360810ba3790a03381e533ba6d SHA256 5994735065e0e4a8b9b0fbb7ff8219088b7015c573a379dfeacecdfe55834653
 AUX mpd.conf.patch 2566 RMD160 50cb8539749355f610b82b527ed1438f1e5d64b0 SHA1 82c5c3288a3318bb61625edfd266ee453c928109 SHA256 b73ec60d2766d86d78f9ba63d3e5973e8ffb3c1f412f450949bbd3e6dfcbf24f
 AUX mpd.init 824 RMD160 e58cc1644628fb931f5d8bd5726fdceebd29493d SHA1 72377bfa801f6bbcc5474c725303fd234a6bc148 SHA256 a6565c16ffd8ee69d63ead18c967e05abcab2eb64d9810c9f4711aef358cc048
@@ -15,13 +13,7 @@ EBUILD mpd-0.15.15.ebuild 4833 RMD160 859d911ea5db836142a0da2a6b6c8219f024de69 S
 EBUILD mpd-0.15.16.ebuild 4839 RMD160 4b3cf4b3db6212a0992e0dcf4d0fc54a8ef7116d SHA1 5e7a1b2bacd9fdb778658e8e89488f0032c3eb7f SHA256 75773c396c115123ebe91e242da866096d69356e4a702ed09cdee22c366ded85
 EBUILD mpd-0.15.8.ebuild 4882 RMD160 406585c67e2abbfcd9382bf8003e986b3cab4ad9 SHA1 689dd2fa032b79c270d33741d64f1a7b04fb1dba SHA256 3771dc288a179a1aa5cb4ee1aa2ae6cc8d43111abee6d457689552dc0bc50d11
 EBUILD mpd-0.16.2.ebuild 5443 RMD160 0b71c44256a0c93d670e1433aaa143cb9f22f17d SHA1 99e8f01fec018afe57d63063db7f68b0d50628f8 SHA256 a308b9d85183cb6fd5e9f87e02e60bd96e17dc50410a44456b602313188b4b01
+EBUILD mpd-0.16.3-r1.ebuild 5485 RMD160 f1456787e5fed6270b2cb44481bd9b20f07a1b32 SHA1 01290c08339d8d8d4db55042e2d4c03e6b0042d1 SHA256 2ab974d9933879c3b175afd8297677464919b8072f98421e87af393d805cf2d2
 EBUILD mpd-0.16.3.ebuild 5446 RMD160 f31ce378c915eecb19ce8a02e746a57963743401 SHA1 2fad6efa07b61a02c177c26a1d89caf6a367636d SHA256 8d1154dd89a9d97917e1b12efe93e10d8f74419dd31175c4eb246784dbd53bc3
-MISC ChangeLog 37186 RMD160 2f2b8fdad4a59e09324c2720a255eba989f7e1b8 SHA1 7edc8649a840a29cd8ee3e214c8b37395dd13397 SHA256 a1be4b599a30e3b38fc34083e826c14a238c7ab75fee613aa2256ce7bca39200
+MISC ChangeLog 37401 RMD160 898d31e353020c1dc526fc2cc59d268104b52a8d SHA1 ffb8183d00708e9518924aab015f27329629da54 SHA256 10b5ff63ae8aa02425b15d94f8d3a9536b60ae2e7ad3d0193ccf3066c1a03c65
 MISC metadata.xml 1522 RMD160 b201defb9a09c68c1754c0babddfffd2eb1e090a SHA1 14f708cab1e2802912802e8bd74fc68ecdc39b7f SHA256 5e148274f669b966cf88e9b5f99cd7a6db55b4f8f2e42c3c1128e394f33d6652
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iF4EAREIAAYFAk4GHzAACgkQmWq1bYTyC0M8WwD9FsB6HSsMMVumxBQJBddzljqD
-bOTWJ9tM/CJFGKVVufEBAKTzv5/n9WkvuU14//+cGEvqdXKVr8UibIGe1xXL55xp
-=e/h6
------END PGP SIGNATURE-----
diff --git a/media-sound/mpd/files/mpd-0.16.3-ffmpeg.patch b/media-sound/mpd/files/mpd-0.16.3-ffmpeg.patch
new file mode 100644
index 000000000000..a945a0a6ab33
--- /dev/null
+++ b/media-sound/mpd/files/mpd-0.16.3-ffmpeg.patch
@@ -0,0 +1,21 @@
+diff -ur mpd-0.16.3.orig/src/decoder/ffmpeg_decoder_plugin.c mpd-0.16.3/src/decoder/ffmpeg_decoder_plugin.c
+--- mpd-0.16.3.orig/src/decoder/ffmpeg_decoder_plugin.c	2011-06-04 17:36:33.000000000 +0300
++++ mpd-0.16.3/src/decoder/ffmpeg_decoder_plugin.c	2011-06-24 18:18:51.840218251 +0300
+@@ -321,7 +321,7 @@
+ 	}
+ 
+ 	//ffmpeg works with ours "fileops" helper
+-	AVFormatContext *format_context;
++	AVFormatContext *format_context = NULL;
+ 	if (av_open_input_stream(&format_context, stream->io, input->uri,
+ 				 input_format, NULL) != 0) {
+ 		g_warning("Open failed\n");
+@@ -470,7 +470,7 @@
+ 	if (stream == NULL)
+ 		return NULL;
+ 
+-	AVFormatContext *f;
++	AVFormatContext *f = NULL;
+ 	if (av_open_input_stream(&f, stream->io, is->uri,
+ 				 input_format, NULL) != 0) {
+ 		mpd_ffmpeg_stream_close(stream);
diff --git a/media-sound/mpd/mpd-0.16.3-r1.ebuild b/media-sound/mpd/mpd-0.16.3-r1.ebuild
new file mode 100644
index 000000000000..f9b25d2de8fd
--- /dev/null
+++ b/media-sound/mpd/mpd-0.16.3-r1.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.16.3-r1.ebuild,v 1.1 2011/07/03 10:30:35 angelos Exp $
+
+EAPI=4
+inherit eutils flag-o-matic linux-info multilib
+
+DESCRIPTION="The Music Player Daemon (mpd)"
+HOMEPAGE="http://www.musicpd.org"
+SRC_URI="mirror://sourceforge/musicpd/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="aac +alsa ao audiofile bzip2 cdio cue +curl debug +fifo +ffmpeg flac
+fluidsynth profile +id3tag inotify ipv6 jack lame lastfmradio libmms libsamplerate
++mad mikmod modplug mpg123 musepack +network ogg openal oss pipe pulseaudio sid
+sndfile sqlite tcpd twolame unicode vorbis wavpack wildmidi zeroconf zip"
+
+REQUIRED_USE="|| ( alsa ao fifo jack network openal oss pipe pulseaudio )
+	|| ( aac audiofile ffmpeg flac fluidsynth mad mikmod modplug mpg123 musepack
+			ogg flac sid vorbis wavpack wildmidi )
+	network? ( || ( audiofile flac lame twolame vorbis ) )
+	lastfmradio? ( curl )"
+
+RDEPEND="!<sys-cluster/mpich2-1.4_rc2
+	dev-libs/glib:2
+	aac? ( media-libs/faad2 )
+	alsa? ( media-sound/alsa-utils )
+	ao? ( media-libs/libao[alsa?,pulseaudio?] )
+	audiofile? ( media-libs/audiofile )
+	bzip2? ( app-arch/bzip2 )
+	cdio? ( dev-libs/libcdio )
+	cue? ( media-libs/libcue )
+	curl? ( net-misc/curl )
+	ffmpeg? ( virtual/ffmpeg )
+	flac? ( media-libs/flac[ogg?] )
+	fluidsynth? ( media-sound/fluidsynth )
+	network? ( >=media-libs/libshout-2
+		!lame? ( !vorbis? ( media-libs/libvorbis ) ) )
+	id3tag? ( media-libs/libid3tag )
+	jack? ( media-sound/jack-audio-connection-kit )
+	lame? ( network? ( media-sound/lame ) )
+	libmms? ( media-libs/libmms )
+	libsamplerate? ( media-libs/libsamplerate )
+	mad? ( media-libs/libmad )
+	mikmod? ( media-libs/libmikmod )
+	modplug? ( media-libs/libmodplug )
+	mpg123? ( >=media-sound/mpg123-1.12.2 )
+	musepack? ( media-sound/musepack-tools )
+	ogg? ( media-libs/libogg )
+	openal? ( media-libs/openal )
+	pulseaudio? ( media-sound/pulseaudio )
+	sid? ( media-libs/libsidplay:2 )
+	sndfile? ( media-libs/libsndfile )
+	sqlite? ( dev-db/sqlite:3 )
+	tcpd? ( sys-apps/tcp-wrappers )
+	twolame? ( media-sound/twolame )
+	vorbis? ( media-libs/libvorbis )
+	wavpack? ( media-sound/wavpack )
+	wildmidi? ( media-sound/wildmidi )
+	zeroconf? ( net-dns/avahi[dbus] )
+	zip? ( dev-libs/zziplib )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+pkg_setup() {
+	use network || ewarn "Icecast and Shoutcast streaming needs networking."
+	use fluidsynth && ewarn "Using fluidsynth is discouraged by upstream."
+
+	enewuser mpd "" "" "/var/lib/mpd" audio
+
+	if use inotify; then
+		CONFIG_CHECK="~INOTIFY_USER"
+		ERROR_INOTIFY_USER="${P} requires inotify in-kernel support."
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed"
+	epatch "${FILESDIR}"/${PN}-0.16.conf.patch \
+		"${FILESDIR}"/${P}-ffmpeg.patch
+}
+
+src_configure() {
+	local mpdconf="--enable-tcp --enable-un	--disable-documentation
+		--disable-ffado --disable-gme --enable-largefile
+		--disable-mvp --docdir=${EPREFIX}/usr/share/doc/${PF}"
+
+	if use network; then
+		mpdconf+=" --enable-shout $(use_enable vorbis vorbis-encoder)
+			--enable-httpd-output $(use_enable lame lame-encoder)
+			$(use_enable twolame twolame-encoder)
+			$(use_enable audiofile wave-encoder)"
+	else
+		mpdconf+=" --disable-shout --disable-vorbis-encoder
+			--disable-httpd-output --disable-lame-encoder
+			--disable-twolame-encoder --disable-wave-encoder"
+	fi
+
+	if use flac && use ogg; then
+		mpdconf+=" --enable-oggflac"
+	else
+		mpdconf+=" --disable-oggflac"
+	fi
+
+	append-lfs-flags
+	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders"
+
+	econf \
+		$(use_enable aac) \
+		$(use_enable alsa) \
+		$(use_enable ao) \
+		$(use_enable audiofile) \
+		$(use_enable bzip2) \
+		$(use_enable cdio iso9660) \
+		$(use_enable cue) \
+		$(use_enable curl) \
+		$(use_enable debug) \
+		$(use_enable ffmpeg) \
+		$(use_enable fifo) \
+		$(use_enable flac) \
+		$(use_enable fluidsynth) \
+		$(use_enable id3tag id3) \
+		$(use_enable inotify) \
+		$(use_enable ipv6) \
+		$(use_enable jack) \
+		$(use_enable lastfmradio lastfm) \
+		$(use_enable libmms mms) \
+		$(use_enable libsamplerate lsr) \
+		$(use_enable mad) \
+		$(use_enable mikmod) \
+		$(use_enable modplug) \
+		$(use_enable mpg123) \
+		$(use_enable musepack mpc) \
+		$(use_enable openal) \
+		$(use_enable oss) \
+		$(use_enable pipe pipe-output) \
+		$(use_enable profile gprof) \
+		$(use_enable pulseaudio pulse) \
+		$(use_enable sid sidplay) \
+		$(use_enable sndfile sndfile) \
+		$(use_enable sqlite) \
+		$(use_enable tcpd libwrap) \
+		$(use_enable vorbis) \
+		$(use_enable wavpack) \
+		$(use_enable wildmidi) \
+		$(use_enable zip zzip) \
+		$(use_with zeroconf zeroconf avahi) \
+		${mpdconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	insinto /etc
+	newins doc/mpdconf.dist mpd.conf
+
+	newinitd "${FILESDIR}"/mpd.init mpd
+
+	if use unicode; then
+		sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
+			"${D}"/etc/mpd.conf || die "sed failed"
+	fi
+
+	diropts -m0755 -o mpd -g audio
+	dodir /var/lib/mpd
+	keepdir /var/lib/mpd
+	dodir /var/lib/mpd/music
+	keepdir /var/lib/mpd/music
+	dodir /var/lib/mpd/playlists
+	keepdir /var/lib/mpd/playlists
+}
+
+pkg_postinst() {
+	elog "If you will be starting mpd via /etc/init.d/mpd, please make"
+	elog "sure that MPD's pid_file is unset."
+
+	# also change the homedir if the user has existed before
+	usermod -d "/var/lib/mpd" mpd
+}