version bump

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

4 files changed, 140 insertions, 6 deletions

diff --git a/media-sound/sonic-visualiser/ChangeLog b/media-sound/sonic-visualiser/ChangeLog
index 5b5cdbeabad1..cb3c3245df94 100644
--- a/media-sound/sonic-visualiser/ChangeLog
+++ b/media-sound/sonic-visualiser/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/sonic-visualiser
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/sonic-visualiser/ChangeLog,v 1.16 2009/10/12 07:53:08 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sonic-visualiser/ChangeLog,v 1.17 2009/11/04 10:26:12 aballier Exp $
+
+*sonic-visualiser-1.7.1 (04 Nov 2009)
+
+  04 Nov 2009; Alexis Ballier <aballier@gentoo.org>
+  +sonic-visualiser-1.7.1.ebuild,
+  +files/sonic-visualiser-1.7.1-liboggz11.patch:
+  version bump
 
 *sonic-visualiser-1.7 (12 Oct 2009)
 
diff --git a/media-sound/sonic-visualiser/Manifest b/media-sound/sonic-visualiser/Manifest
index c2ebd54b611b..c54fd16ad130 100644
--- a/media-sound/sonic-visualiser/Manifest
+++ b/media-sound/sonic-visualiser/Manifest
@@ -2,16 +2,19 @@
 Hash: SHA1
 
 AUX sonic-visualiser-1.6-gcc44.patch 892 RMD160 36183fc89c5045f12788146c879b43deadf33c5e SHA1 664f0da9db43adff51c2031d572ac5784e314afb SHA256 6aca63bf62d2dee0e6c247692b9b23e2feb70ceb6e76604307f6dd69fee0acad
+AUX sonic-visualiser-1.7.1-liboggz11.patch 1675 RMD160 dcba641395f5d24a55fed0c7ab10360e6744474e SHA1 8327d803362f44486cf863c720c5206caa95ab04 SHA256 b0d97830ec0054bc6dd9ac06427ca3796b17d5212a85895dcc125e70ede001d9
 DIST sonic-visualiser-1.6.tar.bz2 1351382 RMD160 ce32c9b790025db3d11c2d46fe5801c5c86dd93d SHA1 6a84ee27cd360db50dea62479713a353b708e14b SHA256 c58932712c5f334f99b18477647ee58b583b50d6a47277a5952246ab8ec278b5
+DIST sonic-visualiser-1.7.1.tar.bz2 1367179 RMD160 0986d15f0f504f9011b11a7becd055df593ea5f7 SHA1 0a510fc46bf792f17aca48e8bfc4e96ea9441de0 SHA256 e13c93d5203b22fd054d5cbcea91529a690e05c38b427c574ba721aa9d1b4986
 DIST sonic-visualiser-1.7.tar.bz2 1356255 RMD160 c9bf6bb432db8ffa41b0ac1e47cefc32cdd09ed5 SHA1 7cb7dfa514136957c6d33744239d60c021273768 SHA256 ab477eb12393d88980d7f885b397dbbd1f048d407f4f037a827a98d955acc967
 EBUILD sonic-visualiser-1.6.ebuild 2411 RMD160 3db46c61ed59579a2f9729493e41df208afd2036 SHA1 eefd13ae8c4e8f5d3699a3084a0ea9cc94d6ef9f SHA256 15eeb85ae7ec76e1fe63f5cea947f29a6dc06640bacfb02c590293be26243a68
+EBUILD sonic-visualiser-1.7.1.ebuild 2465 RMD160 2de64fedfbb33249b917149cb1a7c459f619b3e0 SHA1 7c726bac2ee0e4c685123c77d4c031c735abe995 SHA256 90eeee89aee44f47a757ebe93ab16772a0287e3adef98b2f8e711e259d212ac4
 EBUILD sonic-visualiser-1.7.ebuild 2376 RMD160 61a4370ba2d6564e061d67f5afa0ae77085ca79d SHA1 1561b899a2e8f5139292cc9427e3ee21c137e572 SHA256 c4f363ae2d07d3aa34acb16d243b1e7e126811cc47439af565c7f85663dfd602
-MISC ChangeLog 2523 RMD160 7febfeac643d7a2277e7cf53f86d1d93173c5d80 SHA1 d553cee1e7d9d22ac42baeb6a1568a06b0c88c7d SHA256 6b28402621fa1f158f04a5600a86080f1241cbc3103101eaabb937d07b9c7936
+MISC ChangeLog 2713 RMD160 52c7a9600cb9d1e27a769bfe98751eac5192e698 SHA1 5cf476dabb9ecfb64d26d8c23fd7ac05b37415f3 SHA256 79d652b641d21ba359846149018d463749d36b33c90305c67f7c391ff6a46313
 MISC metadata.xml 251 RMD160 6ef519c0c383e28234a231081c2594d4e9039639 SHA1 dc30854be192995bbd477c3ba7b393fe1ab25263 SHA256 48e0a6cccf2eef677daecb7242cd93052641d8eb8b5cb445dfa19fec5eb93242
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.13 (GNU/Linux)
 
-iEYEARECAAYFAkrS4GoACgkQvFcC4BYPU0oo/gCeI1aJvukA4HPsRY6ajwA93gae
-2skAoLeQWdAk0hhN5bMwUea2kuV9q4H9
-=h7Of
+iEYEARECAAYFAkrxVskACgkQvFcC4BYPU0pqKwCgo1d7trul+k1mZPkKLC75pjxr
+qdYAnipFMe4LgMqlqs1tGhySq8wabjR2
+=bTN6
 -----END PGP SIGNATURE-----
diff --git a/media-sound/sonic-visualiser/files/sonic-visualiser-1.7.1-liboggz11.patch b/media-sound/sonic-visualiser/files/sonic-visualiser-1.7.1-liboggz11.patch
new file mode 100644
index 000000000000..6f2842c35132
--- /dev/null
+++ b/media-sound/sonic-visualiser/files/sonic-visualiser-1.7.1-liboggz11.patch
@@ -0,0 +1,37 @@
+Index: sonic-visualiser-1.7.1/data/fileio/OggVorbisFileReader.cpp
+===================================================================
+--- sonic-visualiser-1.7.1.orig/data/fileio/OggVorbisFileReader.cpp
++++ sonic-visualiser-1.7.1/data/fileio/OggVorbisFileReader.cpp
+@@ -138,15 +138,15 @@ OggVorbisFileReader::DecodeThread::run()
+ } 
+ 
+ int
+-OggVorbisFileReader::readPacket(OGGZ *, ogg_packet *packet, long, void *data)
++OggVorbisFileReader::readPacket(OGGZ *, oggz_packet *packet, long, void *data)
+ {
+     OggVorbisFileReader *reader = (OggVorbisFileReader *)data;
+     FishSound *fs = reader->m_fishSound;
+ 
+-    fish_sound_prepare_truncation(fs, packet->granulepos, packet->e_o_s);
+-    fish_sound_decode(fs, packet->packet, packet->bytes);
++    fish_sound_prepare_truncation(fs, packet->op.granulepos, packet->op.e_o_s);
++    fish_sound_decode(fs, packet->op.packet, packet->op.bytes);
+ 
+-    reader->m_bytesRead += packet->bytes;
++    reader->m_bytesRead += packet->op.bytes;
+ 
+     // The number of bytes read by this function is smaller than
+     // the file size because of the packet headers
+Index: sonic-visualiser-1.7.1/data/fileio/OggVorbisFileReader.h
+===================================================================
+--- sonic-visualiser-1.7.1.orig/data/fileio/OggVorbisFileReader.h
++++ sonic-visualiser-1.7.1/data/fileio/OggVorbisFileReader.h
+@@ -82,7 +82,7 @@ protected:
+     bool m_cancelled;
+     int m_completion;
+  
+-    static int readPacket(OGGZ *, ogg_packet *, long, void *);
++    static int readPacket(OGGZ *, oggz_packet *, long, void *);
+     static int acceptFrames(FishSound *, float **, long, void *);
+ 
+     class DecodeThread : public Thread
diff --git a/media-sound/sonic-visualiser/sonic-visualiser-1.7.1.ebuild b/media-sound/sonic-visualiser/sonic-visualiser-1.7.1.ebuild
new file mode 100644
index 000000000000..2431c302326d
--- /dev/null
+++ b/media-sound/sonic-visualiser/sonic-visualiser-1.7.1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sonic-visualiser/sonic-visualiser-1.7.1.ebuild,v 1.1 2009/11/04 10:26:12 aballier Exp $
+
+EAPI=1
+
+inherit eutils qt4
+
+DESCRIPTION="Music audio files viewer and analiser"
+HOMEPAGE="http://www.sonicvisualiser.org/"
+SRC_URI="mirror://sourceforge/sv1/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="fftw id3tag jack mad ogg osc portaudio pulseaudio"
+
+RDEPEND="x11-libs/qt-core:4
+	x11-libs/qt-gui:4
+	media-libs/libsndfile
+	media-libs/libsamplerate
+	fftw? ( =sci-libs/fftw-3* )
+	app-arch/bzip2
+	>=media-libs/dssi-0.9.1
+	media-libs/raptor
+	media-libs/liblrdf
+	dev-libs/redland
+	media-libs/ladspa-sdk
+	osc? ( media-libs/liblo )
+	media-libs/speex
+	>=media-libs/vamp-plugin-sdk-2.0
+	media-libs/rubberband
+	jack? ( media-sound/jack-audio-connection-kit )
+	!pulseaudio? ( !portaudio? ( media-sound/jack-audio-connection-kit ) )
+	mad? ( media-libs/libmad )
+	id3tag? ( media-libs/libid3tag )
+	ogg? ( media-libs/libfishsound media-libs/liboggz )
+	portaudio? ( >=media-libs/portaudio-19_pre20071207 )
+	pulseaudio? ( media-sound/pulseaudio )"
+
+DEPEND="${RDEPEND}
+		>=dev-util/pkgconfig-0.9"
+
+pkg_setup() {
+	use !jack && use !pulseaudio && use !portaudio && ewarn "You must have at least one of: jack, pulseaudio, portaudio enabled. We will enable jack for you."
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	# remove crap
+	sed -i -e "s:-O3::" prf/sv.prf
+	has_version '>=media-libs/liboggz-1.1.0' && epatch "${FILESDIR}/${P}-liboggz11.patch"
+}
+
+sv_disable_opt() {
+	einfo "Disabling $1"
+	sed -i -e "s/ $1//" "${S}/prf/sv.prf" || die "failed to remove $1 support"
+}
+
+src_compile() {
+	(use jack || ( use !pulseaudio && use !portaudio)) || sv_disable_opt jack
+	use ogg || sv_disable_opt fishsound
+	use ogg || sv_disable_opt oggz
+	use mad || sv_disable_opt mad
+	use fftw || sv_disable_opt fftw3f
+	use fftw || sv_disable_opt fftw3
+	use id3tag || sv_disable_opt id3tag
+	use pulseaudio || sv_disable_opt libpulse
+	use portaudio || sv_disable_opt portaudio
+	use osc || sv_disable_opt liblo
+
+	eqmake4
+	emake || die "Compilation failed"
+}
+
+src_install() {
+	dobin sv/sonic-visualiser
+	dodoc README README.OSC
+	dodir /usr/share/${PN}
+	#install samples
+	insinto /usr/share/${PN}/samples
+	doins sv/samples/*
+	# desktop entry
+	newicon "sv/icons/sv-48x48.png" "${PN}.png"
+	make_desktop_entry "${PN}" "Sonic Visualiser" "${PN}"
+}