Version bump, use gcc-4.3 patch

Package-Manager: portage-2.2_rc28/cvs/Linux x86_64

4 files changed, 100 insertions, 12 deletions

diff --git a/media-sound/qmmp/ChangeLog b/media-sound/qmmp/ChangeLog
index 4c294ec82e11..2c47de6d4a07 100644
--- a/media-sound/qmmp/ChangeLog
+++ b/media-sound/qmmp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/qmmp
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/qmmp/ChangeLog,v 1.6 2009/04/04 19:18:58 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qmmp/ChangeLog,v 1.7 2009/04/07 14:29:39 hwoarang Exp $
+
+*qmmp-0.2.4 (07 Apr 2009)
+
+  07 Apr 2009; Markos Chandras <hwoarang@gentoo.org>
+  +files/decoder_mad-gcc-4.3.patch, +qmmp-0.2.4.ebuild:
+  Version bump, use gcc-4.3 patch
 
   04 Apr 2009; Markus Meier <maekke@gentoo.org> qmmp-0.2.3-r1.ebuild:
   amd64/x86 stable, bug #263690
diff --git a/media-sound/qmmp/Manifest b/media-sound/qmmp/Manifest
index 70b63cb22045..93681edfc76a 100644
--- a/media-sound/qmmp/Manifest
+++ b/media-sound/qmmp/Manifest
@@ -1,16 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX decoder_mad-gcc-4.3.patch 823 RMD160 4bd668f6a7f0eeb6422bfa53a4cb818d2c8db87c SHA1 eede5dc2454d517ef7f0fef48b2febbc8c20d134 SHA256 48c41636b81e87ae54e58986d51951a7195a0ca828c76460f3f9319a56af8343
 AUX qmmp-0.2.3-fix-playlist-download.patch 2943 RMD160 57558ec0c833862ccbb6e1d7bf912c368eb21bdb SHA1 57b97aaed871df9f43293a86162903fd0079cfcf SHA256 ba6b7210999fe3779e6e1b137297e4f4c88158fd3b40104d8d268735dfd52b2f
 AUX qmmp-0.2.3-fix-xspf.patch 1223 RMD160 e49770d519e10d3f9ad80b4ba5c707112f7a5777 SHA1 3cac0f6882ec526ae6f6593b145e714eb7901b75 SHA256 e4bdd87aed7fc5f8ee1ffd57bc674595aff40c7826ec8a9fd20623b6229dd323
 DIST qmmp-0.2.3.tar.bz2 382224 RMD160 14dc9fdcf53ff52ac0e538ba1bf099db334301a5 SHA1 5269725e3ed608038d47e415ecf64d7e24693843 SHA256 cce0f421ec9f8c56eaa637b6c0330808ce23b09d03600c2be7c99c18edcc7162
+DIST qmmp-0.2.4.tar.bz2 383553 RMD160 7d25c7b3c5d4cf05d31d4adc3da62bc82c4e65dc SHA1 8296f5899088b61d8d965e5f38511d357b7b8383 SHA256 d1e1cc136c6574de5f14b54f33a70e56de05fe4c90facdb1812116107a58a399
 EBUILD qmmp-0.2.3-r1.ebuild 2130 RMD160 7a5c7c44e887d30db1a645687289d0c5683458bb SHA1 a69e969dfccd85f8bfa9243d927ed7cf6646ddf2 SHA256 e8a92e837441a75048b2332b17d012c271f91e1c1fe5aeab832d58ae480d0813
-MISC ChangeLog 1186 RMD160 585045c9854738345ce20e27fcdb4a0e2958315b SHA1 c8f624abed3682113f034b4715ee23879dd6db3c SHA256 5f23c0b9a5f038258524bf815f0580668d017f1b4c31a6821dbf9e05d0778dba
+EBUILD qmmp-0.2.4.ebuild 2085 RMD160 799807b37ed4c5bd5848105f8b60cb0467c7d0e2 SHA1 e62dab0b29507f35c3d5eab1e3d34eea0d8cfc1e SHA256 5fcba359b2893d1c3b70a99084a106dc5135c175d353728ed776fa2aa93dc88f
+MISC ChangeLog 1359 RMD160 3cf9b489b3388a5f2eaabcb56c07149d2b6760db SHA1 4f55cd580eb0f8eb84c01dacbe8a72da305f847b SHA256 b80f28fee0f75cabdee38f97da73d11548c6ec2daec17a758b532a4168855249
 MISC metadata.xml 316 RMD160 7a7a7ec2ffde8476e4f3b5d041d6029344f98c8a SHA1 587ef05d574b566494ad6cbb91aea571290487e2 SHA256 9ddbcd71e77874b34d4b0a197c86cf8712c381a7b3944dee6e827a650d39272c
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.10 (GNU/Linux)
-
-iEYEARECAAYFAknXsrkACgkQkKaRLQcq0GKTRACfeDKE+8SbUJ6E4uRvz7751O60
-6esAnj5r/T6lLIIsgbi2pGB7eS6t79W9
-=jQeR
------END PGP SIGNATURE-----
diff --git a/media-sound/qmmp/files/decoder_mad-gcc-4.3.patch b/media-sound/qmmp/files/decoder_mad-gcc-4.3.patch
new file mode 100644
index 000000000000..46ba04935e3b
--- /dev/null
+++ b/media-sound/qmmp/files/decoder_mad-gcc-4.3.patch
@@ -0,0 +1,15 @@
+Index: qmmp-0.2.4/src/plugins/Input/mad/decoder_mad.cpp
+===================================================================
+--- qmmp-0.2.4.orig/src/plugins/Input/mad/decoder_mad.cpp
++++ qmmp-0.2.4/src/plugins/Input/mad/decoder_mad.cpp
+@@ -264,8 +264,8 @@ bool DecoderMAD::findHeader()
+             if (stream.error == MAD_ERROR_LOSTSYNC)
+             {
+                 //skip ID3v2 tag
+-                uint tagSize = findID3v2((uchar *)stream.this_frame,
+-                                         (uint) stream.bufend - (uint) stream.this_frame);
++                ulong tagSize = findID3v2((uchar *)stream.this_frame,
++                                         (ulong) stream.bufend - (ulong) stream.this_frame);
+                 if (tagSize > 0)
+                 {
+                     mad_stream_skip(&stream, tagSize);
diff --git a/media-sound/qmmp/qmmp-0.2.4.ebuild b/media-sound/qmmp/qmmp-0.2.4.ebuild
new file mode 100644
index 000000000000..3a9461bedcad
--- /dev/null
+++ b/media-sound/qmmp/qmmp-0.2.4.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qmmp/qmmp-0.2.4.ebuild,v 1.1 2009/04/07 14:29:39 hwoarang Exp $
+
+EAPI="2"
+
+inherit cmake-utils
+
+DESCRIPTION="Qt4-based audio player with winamp/xmms skins support"
+HOMEPAGE="http://qmmp.ylsoftware.com/index_en.php"
+SRC_URI="http://qmmp.ylsoftware.com/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+alsa +dbus ffmpeg flac jack libsamplerate +mad modplug musepack oss
+	pulseaudio scrobbler sndfile +vorbis wavpack"
+
+RDEPEND="x11-libs/qt-gui:4
+	media-libs/taglib
+	media-sound/musepack-tools
+	alsa? ( media-libs/alsa-lib )
+	dbus? ( sys-apps/dbus )
+	flac? ( media-libs/flac )
+	libsamplerate? ( media-libs/libsamplerate )
+	mad? ( media-libs/libmad )
+	musepack? ( >=media-libs/libmpcdec-1.2.5 )
+	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? ( media-video/ffmpeg )
+	pulseaudio? ( >=media-sound/pulseaudio-0.9.9 )
+	wavpack? ( media-sound/wavpack )
+	scrobbler? ( net-misc/curl )
+	sndfile? ( media-libs/libsndfile )"
+DEPEND="${RDEPEND}"
+
+DOCS="AUTHORS ChangeLog README"
+
+PATCHES=(
+	"${FILESDIR}/decoder_mad-gcc-4.3.patch"
+)
+
+qmmp_use_enable() {
+	# uses completely non standard cmake options...
+	if use ${1}; then
+		echo "-DUSE_${2}:BOOL=TRUE"
+	else
+		echo "-DUSE_${2}:BOOL=FALSE"
+	fi
+}
+
+src_compile() {
+	mycmakeargs="${mycmakeargs}
+		$(qmmp_use_enable alsa ALSA)
+		$(qmmp_use_enable dbus DBUS)
+		$(qmmp_use_enable ffmpeg FFMPEG)
+		$(qmmp_use_enable flac FLAC)
+		$(qmmp_use_enable jack JACK)
+		$(qmmp_use_enable mad MAD)
+		$(qmmp_use_enable modplug MODPLUG)
+		$(qmmp_use_enable musepack MPC)
+		$(qmmp_use_enable oss OSS)
+		$(qmmp_use_enable pulseaudio PULSE)
+		$(qmmp_use_enable scrobbler SCROBBLER)
+		$(qmmp_use_enable sndfile SNDFILE)
+		$(qmmp_use_enable libsamplerate SRC)
+		$(qmmp_use_enable vorbis VORBIS)
+		$(qmmp_use_enable wavpack WAVPACK)"
+
+	cmake-utils_src_compile
+}