fixed crash in enca_set_threshold, thanks to Linubie and Franz Fellner, wrt to bug #428364

(Portage version: 2.1.10.65/cvs/Linux x86_64)

3 files changed, 128 insertions, 1 deletions

diff --git a/media-sound/qmmp/ChangeLog b/media-sound/qmmp/ChangeLog
index ce33c6e60520..654e3fc4d8e2 100644
--- a/media-sound/qmmp/ChangeLog
+++ b/media-sound/qmmp/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/qmmp
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/qmmp/ChangeLog,v 1.87 2012/07/24 20:57:01 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qmmp/ChangeLog,v 1.88 2012/07/28 13:59:05 ago Exp $
+
+*qmmp-0.6.1-r1 (28 Jul 2012)
+
+  28 Jul 2012; Agostino Sarubbo <ago@gentoo.org> +files/qmmp-0.6.1-enca.patch,
+  +qmmp-0.6.1-r1.ebuild:
+  fixed crash in enca_set_threshold, thanks to Linubie and Franz Fellner, wrt to
+  bug #428364
 
 *qmmp-0.6.1 (24 Jul 2012)
 
diff --git a/media-sound/qmmp/files/qmmp-0.6.1-enca.patch b/media-sound/qmmp/files/qmmp-0.6.1-enca.patch
new file mode 100644
index 000000000000..51948af1ed46
--- /dev/null
+++ b/media-sound/qmmp/files/qmmp-0.6.1-enca.patch
@@ -0,0 +1,12 @@
+--- src/plugins/Transports/http/httpstreamreader.cpp.org	2012-07-28 06:32:07.721649381 +0200
++++ src/plugins/Transports/http/httpstreamreader.cpp	2012-07-28 06:32:22.261650751 +0200
+@@ -129,7 +129,8 @@
+     m_analyser = 0;
+     if(settings.value("use_enca", false).toBool())
+         m_analyser = enca_analyser_alloc(settings.value("enca_lang").toByteArray ().constData());
+-    enca_set_threshold(m_analyser, 1.38);
++    if(m_analyser)
++        enca_set_threshold(m_analyser, 1.38);
+ #endif
+     settings.endGroup();
+ }
diff --git a/media-sound/qmmp/qmmp-0.6.1-r1.ebuild b/media-sound/qmmp/qmmp-0.6.1-r1.ebuild
new file mode 100644
index 000000000000..fed11d1f40b3
--- /dev/null
+++ b/media-sound/qmmp/qmmp-0.6.1-r1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qmmp/qmmp-0.6.1-r1.ebuild,v 1.1 2012/07/28 13:59:05 ago Exp $
+
+EAPI="2"
+
+inherit cmake-utils
+[ "$PV" == "9999" ] && inherit subversion
+
+DESCRIPTION="Qt4-based audio player with winamp/xmms skins support"
+HOMEPAGE="http://qmmp.ylsoftware.com/index_en.php"
+if [ "$PV" != "9999" ]; then
+	SRC_URI="http://qmmp.ylsoftware.com/files/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~ppc ~x86"
+else
+	SRC_URI=""
+	ESVN_REPO_URI="http://qmmp.googlecode.com/svn/trunk/qmmp/"
+	KEYWORDS=""
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+# KEYWORDS further up
+IUSE="aac +alsa +dbus bs2b cdda cover crossfade enca ffmpeg flac jack game kde ladspa
+libsamplerate lyrics +mad midi mms modplug mplayer mpris musepack notifier oss
+projectm pulseaudio scrobbler sndfile stereo tray udev +vorbis wavpack"
+
+RDEPEND="x11-libs/qt-qt3support:4
+	media-libs/taglib
+	alsa? ( media-libs/alsa-lib )
+	bs2b? ( media-libs/libbs2b )
+	cdda? ( dev-libs/libcdio )
+	dbus? ( sys-apps/dbus )
+	aac? ( media-libs/faad2 )
+	enca? ( app-i18n/enca )
+	flac? ( media-libs/flac )
+	game? ( media-libs/game-music-emu )
+	ladspa? ( media-libs/ladspa-cmt )
+	libsamplerate? ( media-libs/libsamplerate )
+	mad? ( media-libs/libmad )
+	midi? ( media-sound/wildmidi )
+	mms? ( media-libs/libmms )
+	mplayer? ( || ( media-video/mplayer
+		media-video/mplayer2 )
+	)
+	musepack? ( >=media-sound/musepack-tools-444 )
+	modplug? ( >=media-libs/libmodplug-0.8.4 )
+	vorbis? ( media-libs/libvorbis
+		media-libs/libogg )
+	jack? ( media-sound/jack-audio-connection-kit
+		media-libs/libsamplerate )
+	ffmpeg? ( virtual/ffmpeg )
+	projectm? ( media-libs/libprojectm
+		x11-libs/qt-opengl:4 )
+	pulseaudio? ( >=media-sound/pulseaudio-0.9.9 )
+	wavpack? ( media-sound/wavpack )
+	scrobbler? ( net-misc/curl )
+	sndfile? ( media-libs/libsndfile )
+	udev? ( sys-fs/udisks:0 )"
+DEPEND="${RDEPEND}"
+
+DOCS="AUTHORS ChangeLog README"
+
+CMAKE_IN_SOURCE_BUILD="1"
+
+PATCHES=( "${FILESDIR}"/${P}-enca.patch )
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_use alsa)
+		$(cmake-utils_use_use aac)
+		$(cmake-utils_use_use bs2b)
+		$(cmake-utils_use_use cover)
+		$(cmake-utils_use_use cdda CDA)
+		$(cmake-utils_use_use crossfade)
+		$(cmake-utils_use_use dbus)
+		$(cmake-utils_use_use enca)
+		$(cmake-utils_use_use ffmpeg)
+		$(cmake-utils_use_use flac)
+		$(cmake-utils_use_use game GME)
+		-DUSE_HAL=OFF
+		$(cmake-utils_use_use jack)
+		$(cmake-utils_use_use kde KDENOTIFY)
+		$(cmake-utils_use_use ladspa)
+		$(cmake-utils_use_use lyrics)
+		$(cmake-utils_use_use mad)
+		$(cmake-utils_use_use midi MIDI_WILDMIDI)
+		$(cmake-utils_use_use mplayer)
+		$(cmake-utils_use_use mms)
+		$(cmake-utils_use_use modplug)
+		$(cmake-utils_use_use mpris)
+		$(cmake-utils_use_use musepack MPC)
+		$(cmake-utils_use_use notifier)
+		$(cmake-utils_use_use oss)
+		$(cmake-utils_use_use projectm)
+		$(cmake-utils_use_use pulseaudio PULSE)
+		$(cmake-utils_use_use scrobbler)
+		$(cmake-utils_use_use sndfile)
+		$(cmake-utils_use_use stereo)
+		$(cmake-utils_use_use tray STATICON)
+		$(cmake-utils_use_use udev UDISKS)
+		$(cmake-utils_use_use libsamplerate SRC)
+		$(cmake-utils_use_use vorbis)
+		$(cmake-utils_use_use wavpack)
+		)
+
+	cmake-utils_src_configure
+}