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

Package-Manager: portage-2.1.10.65/cvs/Linux x86_64

4 files changed, 140 insertions, 17 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/Manifest b/media-sound/qmmp/Manifest
index ef916441a2f7..9c9654c9fc87 100644
--- a/media-sound/qmmp/Manifest
+++ b/media-sound/qmmp/Manifest
@@ -1,7 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
-DIST qmmp-0.5.4.tar.bz2 708421 SHA256 6f95d1bb97cb1ef91b9d664f4d5ce013c6cc93f3aefb24cd64cf2500a525be0f
+AUX qmmp-0.6.1-enca.patch 521 SHA256 a0be596928fc5ea7b91a51f7e7dc4670df5831b8ae0b418051d7470a8b07f497 SHA512 303c004f2af24c39f40b609476668c06c832fb7e345e4bc1c142f9050f1767e2e65ed12b8c1cc47f4e566c26e70a38549910aa00af55e578c95e3cce5f510654 WHIRLPOOL d669c6269786369fdbd3baf1a99ed251b622e94af9e18ef7ac524bf9b2c05f18a7810e00b19ef327b0b53a9ab5f4dafceed1f70f01cff3762e6da9ca69b37d26
+DIST qmmp-0.5.4.tar.bz2 708421 SHA256 6f95d1bb97cb1ef91b9d664f4d5ce013c6cc93f3aefb24cd64cf2500a525be0f SHA512 98ce4e6dd55b0ccb3b740ff02f16847b66b7813b8f14e884514131a40c85fc3b52cabdc10b76662527c059dce66258a94a0956288b1c7ccb356b6952ecf96a21 WHIRLPOOL eaa360d4934fe1d1fd57d1ecd4199c139f5be418733d963f34d7c56d8e5e30113697b3b6f1e22c5aa61ab7d5ad2beed315259a2cd3fd8783519dd559905a9c8a
 DIST qmmp-0.5.5.tar.bz2 709008 SHA256 525d7528c58c885e45149f698125dfff6bedca0e9af979b2490e3f0b902943a6 SHA512 69f130112d5ec703d7cbd9b9b12862802698ba1e24541b5a1b8063f6d985497b81ea3a44311f63dcbfdb41988247ae54acb61fccfe5a484adb4e320dcd1b49f2 WHIRLPOOL 6f6d1e01fe0e321429c61dd395eb645c7f661711cca8c90ab88c735362bf8c5c4cb784905d89c519401d275a314eed3410ac725a914bbbdfc914eebcf4fdf60f
 DIST qmmp-0.5.6.tar.bz2 708987 SHA256 3ca6b1ebe0c985a153bc82db757de3032d3593fe9eb73397c51cf0954b66a889 SHA512 e83185c6ae952e9bab060c6e88885ebbe311e115255c88fa6bda5694d06bd6ace8e44010f27842dc8d04fdefd834acd7f874099673e6f55773af2e29b95f94b2 WHIRLPOOL 71c1b44c42a27c53e585cde5ebfe3d534077f5134613002455870aee5668811bfe1bd3c064344045e26c8ecb8f99fc2fa76910ed313c5f4229ff2ac081679cc1
 DIST qmmp-0.6.0.tar.bz2 772882 SHA256 4e2c9cdfd630bb90b2c92cb3e2f95ac4239c7cf8f91c47ca4a5038dd519755fe SHA512 63897d7b93a071a1b51a18063f453044013bee91c68b186e52a48aa08c84180a8914dcaf1b20fdb8554430fd99511485d4529608f1ae61704c7c0a591356be98 WHIRLPOOL 24e8e834d64bec8aef259309829cce3f0a17193d72c25fb98e7afb9af5a831fa388e652e44bea43b49e966620d8a928231c9749f13c4f39cb0aad728a2d2ea29
@@ -10,24 +11,19 @@ EBUILD qmmp-0.5.4.ebuild 3203 SHA256 4db7dc56ccf0a39f9974765ea0cb362cb8cc6b70c37
 EBUILD qmmp-0.5.5.ebuild 3210 SHA256 062fef72531854e2d2cfd7641183073c585b7a8d015dd0313425425af04a02f7 SHA512 e117ce87330c5ec52f7bbf783a767fb42018e2778e11986923fea3918bd7d9f523da948d71be6f0d447bb0ab5974f8d9cd7b5f989cd92f647d128d576695f0b2 WHIRLPOOL dc6a7edc3a243fcb9c993f14fc723dbf0d8a04aba72dc1534898bd3c3d9164ed420da10e96a755c9cb0e8f8829e2afd8872c0756532fcc59ead6d90a3eb55a2c
 EBUILD qmmp-0.5.6.ebuild 3210 SHA256 5c4fee327729573494f020f605868bf6e173109d4a25f4e3b5c7e6f04ef8159b SHA512 0df33c05c9634a3cc3c99b4d4ad71c8b39f8c730b023aeb30523ee4474098c8fbd00ffec68e753df544505a003bd1f2a58e53bf07873a4d1683e66eca6b6b93c WHIRLPOOL df8d8ff9b271a63fad16d14ab6748dd42d68a20c1302850b9423a85b97c2f38f6aab95f5f47b1d7656b3cdecb93ada7b360bde03c37a6c79c36e571ec0b0895b
 EBUILD qmmp-0.6.0.ebuild 3210 SHA256 1df6d028ee6f576b6936a30befb5f89d998582f3d634aeea255f2bb4efd4db45 SHA512 8b6a8848836531b2745ca2a31de2b0a4dcdf438114fe3cd59024fb0ff017f559b603b31b928520cfcc27a78266296a1509b013bed12204225950cb30d7544cef WHIRLPOOL 898b3300c974f4c1a5b65692d969b592f690db2b31f1300c8eaa32fc006c9484d31c1a6a6732db0e23558d0630c3cd72a2e759b5088bd555e8cf578e11ddcce0
+EBUILD qmmp-0.6.1-r1.ebuild 3251 SHA256 16772f6352d1d44deb5ede3a34a88895f7509f93a6b73238245ce9f793634eab SHA512 aaa2d02fd5b0c936eb337fcd1195437fd8efd9fae1e35b9521287c55a91773f04b45bcedfb13cb19f65f6985a37967749961eea83aa9e91e7eb7ad85bfecda75 WHIRLPOOL e01cc94801d83b51e5c285cb3935dc35272d2fcc314839008dff71f766765938d7c0093cdc6e2ce00bfbfd360ad54ca88787b38b92aa1ca8c7214a47f3532dd7
 EBUILD qmmp-0.6.1.ebuild 3210 SHA256 7bccb5cdb29f653e56708745e5921b79defde1cc70a3530bdba42550e10411bb SHA512 dcef267f63e3c2bcafb392bb4f689b19f1d981d3b11db0146923de602246dcbf24565cb91edfb27929e6ddc50c3763be5241b1b373e640e0198ce8ed72801eeb WHIRLPOOL 0fe1d030ac241b513a8a3f7bc417e919196ef42f1da3a80b7c7f4ef3330280fb59a0152064746e9ffbd68e52d9889cfd22fc7c7c0d2c1b7135c0ddbee7864ed1
 EBUILD qmmp-9999.ebuild 3041 SHA256 68455126140dd9b60efc0f70f033934b953feb9fbf71b336037935c27c241f92 SHA512 f4acc58aad56a78edb61850cf7fdf6010c97623f4371a44ed919e82d55804b7957e16dc1b0609238e07e9ff08698c9e831a6fe3a5c7001e6331381c3707a5fec WHIRLPOOL ad85a8949975776349ff339a908c0358b586a247eed48aaa699bd4836ab1660d2ee0e0afb09a8a0e7fc23f4ca4d2e52e9156d6981be4d6d062ad7e0505234bf2
-MISC ChangeLog 11675 SHA256 73b19de82a10737da962fdc11bc911711a30587bb86960865edf2e1bfb304501 SHA512 8cfbb42709b10759205c37bfb0e0d5cf014369d93ee13b0871d2bbd6f24ecab5ba4e87ccc22a0db11726491b1855e2cefa62232e9e42e56ad897bc8e11a97e86 WHIRLPOOL ae5973515555275eb8eebd69f89f60671e733cee6f31feba8ea937f01eb48cd077458e5415d3d9e2ee1a018d11799c758600e5775de7f84760894e4e9fc0e0d8
+MISC ChangeLog 11900 SHA256 ab46ffd4f8f289017478621854e49a3bb2154a1760e7a2c4e5f98bf1dc4d7068 SHA512 f25b51c3fd41aeb0764258f3db35f43769f47bd6f47d9208252f455c9de0edd19724b623361e4d9e39c71b00cc308878d7f83f34e03a33ebb6aa996a270cbb54 WHIRLPOOL 3feceb35fd79ef1fe2c95e13be205357f3a17e40816f605938b62ffe637ce7f9355f8658dde1014a15b31f5cb2ac15ca4869ef49b54b6c245297b32e0afe5668
 MISC metadata.xml 1136 SHA256 a377a91d1fc8233722ca0a95c3c81abd711e356c270cb8737829f2cc7021b575 SHA512 c6b6f654f143e797e6ade945b253f8e37ec9fda8adc482a23a152d1ccdb2afaadd3797a09db606dfa8b4375e9dfd6dd012156dc1d0f29be3b209e0fc99c13103 WHIRLPOOL 7742391dc0241c4ec33bc92d5732af4ac7e465c06bb7ee0dde0212fc56481d5b2690f54dcf95c86f21ade97f94c5ae409541253ffa8cb9b7a155b821e5bbb32c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQDwwjAAoJEPqDWhW0r/LCfY0P/j3gMIXVnsQ0O2mALOEg/lAN
-IbGlQsG7J5HOFjxlQTy5/n44ImURR6J0OWiZO6Nwv2GbiadBD5PBYfNKCVYlUIfU
-Jh2bDgvHp45/qqc+Tf5Dr9QkIuzywkv+GK806A9qAHflFBIZU454ioYoobnUqbv/
-nLLkXrP7wy3QXozblTyYpZn6cxGQhVGAMvrhSq81YCAYmG1oql4NUvm89g9SNj8w
-MBBTqolTS/PXRR+tMwQP3Vnzj6OYOXnr4r6FxXhOs05T00JDGF/33lH6vMwzt0NJ
-C8Jttkvpvj9FGiawOW4bdSU3ZvlQEp1Tk+yX71J4ZT6WNai0lDcHuW4Xbavyz5th
-L1Nb790lHc0vLzEN5NA9zUmNLjAFcL3PhKdIzSjEukU5Hxdap+dSMlnnelvVmRpi
-VPxqXm7TtcBCLW/Z7e5jtsHz6rXwhZCNoX8VpnEjqFg5DqPhpubeBMxylSU9kpdC
-zxXlQIT3FngoZFxO6GUypduqGbKkdJPP68gNQjt9/GAgT1pxZpdGGczwKUBIEQ+L
-UCYLzyX4gextXQHKeA101nN6hyDPjD6tVg/lFOsMrmxEiIYQqa/KyDuDEftmDJNN
-PiWQGAl90vB4diuQeYE69QB+bcd4nOtZQSDyZQbKAe14oOGyFOTs/F9Qk1eUXLVy
-e2QlpAk6fnlVmcvl6xpb
-=YQtj
+iQEcBAEBCgAGBQJQE/AzAAoJEOTDgjZ80txdcNIH/2wKmbL2akve7QmwJV3mXBte
+zcPOj3LI33YbDr4Ej+O8FG/QJsfuB+Bf0CqduHssQtlTPfVO+wgZ2mBVaOrGCg9c
+C3Ik69/DOynqdVrSSqvifFS0p3WzkvboZgBfs16dL9S0i/bkIpoPr5EyNR/FwYV1
+t438O7iJSrkTOGcDYLiboyDIP/l1z70y0qSdY9PbqInfPsH+TvS42rvCB3M2zV9k
+dPFmyBw6odCzZswp6pDNB5+McMntlESOyGErMwZz9nhCx8G3IZiH4pFHh6SNpKxL
+JtITzcMnzFu5gKiQvmrPnnauit97eNWsBuFCuY6yZ2sen+ds8TbWBVSl9uu1/3M=
+=uVbE
 -----END PGP SIGNATURE-----
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
+}