added a patch that fixes compilation issues. version bump. fixes bug #75986.

9 files changed, 166 insertions, 25 deletions

diff --git a/media-sound/muse/ChangeLog b/media-sound/muse/ChangeLog
index 385631981363..c6907d9f502b 100644
--- a/media-sound/muse/ChangeLog
+++ b/media-sound/muse/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-sound/muse
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/muse/ChangeLog,v 1.13 2004/12/19 06:10:01 eradicator Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/muse/ChangeLog,v 1.14 2005/01/21 21:29:29 luckyduck Exp $
+
+*muse-0.9.1 (21 Jan 2005)
+
+  21 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  +files/muse-0.9.1-include.patch, +files/muse-0.9.1-miscfixes.patch,
+  +muse-0.9.1.ebuild:
+  added a patch that fixes compilation issues. version bump. fixes bug #75986.
+  thanks to Diego Pettenò <dgp85@users.sourceforge.net>
 
   18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org> muse-0.9.ebuild:
   Stable sparc.
diff --git a/media-sound/muse/Manifest b/media-sound/muse/Manifest
index 3a0afe0cf215..251dde6e6903 100644
--- a/media-sound/muse/Manifest
+++ b/media-sound/muse/Manifest
@@ -1,20 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 8c5ed8fab2a305bb023e26616dc79b02 ChangeLog 1508
+MD5 92720495f557964f0ed682102113bf9e muse-0.9.ebuild 1208
+MD5 da84149aaa0d49db3463359f7dcf1ae7 muse-0.9.1.ebuild 1277
+MD5 9f498ff5588bada98a349b751484d339 muse-0.7.2.ebuild 1683
+MD5 56ccc8924a2ab5abe876d352b5d13b6b ChangeLog 1815
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 1afcc83cba22580b142a0134ae1c3589 muse-0.7.2.ebuild 1684
-MD5 6e32eed19f4306b008de826143295b13 muse-0.8.1-r1.ebuild 1153
-MD5 8fb17446b52f3611203e914061ca102a muse-0.9.ebuild 1209
-MD5 c8ff39e0c7d648cde748b5bc727f8622 files/digest-muse-0.7.2 62
+MD5 5002f92e5fd0f22e6ef9a03ff8333157 muse-0.8.1-r1.ebuild 1154
+MD5 4ae600228fc21c5df407174af307f157 files/muse-0.9.1-miscfixes.patch 1914
+MD5 e3cdfa1976dbb65fae01a6e45ed737f8 files/muse-0.9-locale-Makefile.patch 267
+MD5 7c0ac892f30b155f79f3588857ab378f files/muse-0.9.1-include.patch 549
+MD5 ca45a20943701e9471058cb047e25b9a files/muse-0.8.1-strings.patch 7870
 MD5 db2be964bea7450de6d4cbfb7f071c34 files/digest-muse-0.8.1-r1 62
+MD5 c8ff39e0c7d648cde748b5bc727f8622 files/digest-muse-0.7.2 62
+MD5 7163bb4ec5bd71ef481511af79dfe698 files/digest-muse-0.9.1 63
 MD5 45c92a3f89ef7adfee831d69fe5ea32f files/digest-muse-0.9 61
-MD5 ca45a20943701e9471058cb047e25b9a files/muse-0.8.1-strings.patch 7870
-MD5 e3cdfa1976dbb65fae01a6e45ed737f8 files/muse-0.9-locale-Makefile.patch 267
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBxRtDArHZZzCEUG0RAuryAJ9xSZJS8V3Wz2kWokh88bSw1RYaHgCfQmvu
-/2f6us7jXHizgZFORGjVqBI=
-=QgS+
------END PGP SIGNATURE-----
diff --git a/media-sound/muse/files/digest-muse-0.9.1 b/media-sound/muse/files/digest-muse-0.9.1
new file mode 100644
index 000000000000..9f7e515e933f
--- /dev/null
+++ b/media-sound/muse/files/digest-muse-0.9.1
@@ -0,0 +1 @@
+MD5 94d9df3851e7aace1ba944fa4763a830 MuSE-0.9.1.tar.gz 1406110
diff --git a/media-sound/muse/files/muse-0.9.1-include.patch b/media-sound/muse/files/muse-0.9.1-include.patch
new file mode 100644
index 000000000000..ec76f4c2ffd4
--- /dev/null
+++ b/media-sound/muse/files/muse-0.9.1-include.patch
@@ -0,0 +1,21 @@
+--- src/inchannels.cpp.orig	2005-01-08 18:19:33.805672152 +0100
++++ src/inchannels.cpp		2005-01-08 18:24:42.329769360 +0100
+@@ -30,6 +30,7 @@
+ #include <sys/types.h>
+ #include <sys/wait.h>
+ #include <signal.h>
++#include <errno.h>
+ 
+ /* mixing and audioprocessing algorithms*/
+ #include <audioproc.h>
+
+--- src/pipe.cpp.orig	2005-01-08 18:50:27.093929512 +0100
++++ src/pipe.cpp	2005-01-08 18:50:48.758635976 +0100
+@@ -31,7 +31,7 @@
+ #include <pipe.h>
+ #include <jutils.h>
+ #include <config.h>
+-
++#include <math.h>
+ 
+ #define MIN(a,b) (a<=b) ? a : b; 
diff --git a/media-sound/muse/files/muse-0.9.1-miscfixes.patch b/media-sound/muse/files/muse-0.9.1-miscfixes.patch
new file mode 100644
index 000000000000..b08677de7380
--- /dev/null
+++ b/media-sound/muse/files/muse-0.9.1-miscfixes.patch
@@ -0,0 +1,61 @@
+diff -u MuSE-0.9.1/src/pipe.cpp MuSE-0.9.1-fixed/src/pipe.cpp
+--- MuSE-0.9.1/src/pipe.cpp	2005-01-20 15:07:37.659868128 +0100
++++ MuSE-0.9.1-fixed/src/pipe.cpp	2005-01-20 15:03:48.514703488 +0100
+@@ -225,9 +225,9 @@
+       (data, start,
+        blk / read_copy_cb->src_samplesize);
+     
+-    (char*)start += blk;
++    start = (int*)( (char*)start + blk );
+     len -= blk;
+-    (char*)data += blk;
++    data = (int*)( (char*)data + blk );
+     worklen -= blk;
+     if ((end!=buffer) && (start==bufferEnd))
+       start = buffer;
+@@ -238,8 +238,8 @@
+ 	(data, start,
+ 	 len / read_copy_cb->src_samplesize);
+       
+-      (char*)data += len;
+-      (char*)start += len;
++      data = (int*)( (char*)data + len );
++      start = (int*)( (char*)start + len );
+       worklen -= len;
+       if ((end!=buffer) && (start==bufferEnd))
+ 	start = buffer;
+@@ -304,9 +304,9 @@
+       (end, data,
+        blk / write_copy_cb->dst_samplesize);
+ 
+-      (char*)end += blk;
++      end = (int*)( (char*)end + blk );
+       len -= blk;
+-      (char*)data += blk;
++      data = (int*)( (char*)data + blk );
+       worklen -= blk;
+       if ((start!=buffer)
+ 	  && (end==bufferEnd))
+@@ -318,8 +318,8 @@
+ 	(end, data,
+ 	 len / write_copy_cb->dst_samplesize);
+ 
+-      (char*)data += len;
+-      (char*)end += len;
++      data = (int*)( (char*)data + len );
++      end = (int*)( (char*)end + len );
+       worklen -= len;
+       
+       if ((start!=buffer)
+diff -u MuSE-0.9.1/src/radiosched.cpp MuSE-0.9.1-fixed/src/radiosched.cpp
+--- MuSE-0.9.1/src/radiosched.cpp	2004-12-15 19:18:06.000000000 +0100
++++ MuSE-0.9.1-fixed/src/radiosched.cpp	2005-01-20 15:04:28.541618472 +0100
+@@ -762,7 +762,7 @@
+ parse_xml_sched_file( sched_rec_callb callb, void *udata, sched_rec *sr )
+ {
+     gchar *buf=NULL; 
+-	guint len;
++	gsize len;
+ 	xml_user_data calldata = {callb, udata, sr};
+ 	
+ 	g_file_get_contents(sched_file_path(), &buf, &len, NULL); 
diff --git a/media-sound/muse/muse-0.7.2.ebuild b/media-sound/muse/muse-0.7.2.ebuild
index 8359b4256fd0..926e91bd4059 100644
--- a/media-sound/muse/muse-0.7.2.ebuild
+++ b/media-sound/muse/muse-0.7.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/muse/muse-0.7.2.ebuild,v 1.7 2004/07/01 10:59:28 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/muse/muse-0.7.2.ebuild,v 1.8 2005/01/21 21:29:29 luckyduck Exp $
 
 IUSE="ncurses oggvorbis X"
 
diff --git a/media-sound/muse/muse-0.8.1-r1.ebuild b/media-sound/muse/muse-0.8.1-r1.ebuild
index 2d81f54fb676..434361207d97 100644
--- a/media-sound/muse/muse-0.8.1-r1.ebuild
+++ b/media-sound/muse/muse-0.8.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/muse/muse-0.8.1-r1.ebuild,v 1.3 2004/06/25 00:14:33 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/muse/muse-0.8.1-r1.ebuild,v 1.4 2005/01/21 21:29:29 luckyduck Exp $
 
 inherit eutils
 
diff --git a/media-sound/muse/muse-0.9.1.ebuild b/media-sound/muse/muse-0.9.1.ebuild
new file mode 100644
index 000000000000..2f6f47ed6eb4
--- /dev/null
+++ b/media-sound/muse/muse-0.9.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/muse/muse-0.9.1.ebuild,v 1.1 2005/01/21 21:29:29 luckyduck Exp $
+
+IUSE="ncurses gtk debug"
+
+inherit eutils
+
+MY_P=${PN/muse/MuSE}-${PV}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="Multiple Streaming Engine, an icecast source streamer"
+SRC_URI="ftp://ftp.dyne.org/muse/releases/${MY_P}.tar.gz"
+HOMEPAGE="http://muse.dyne.org/"
+
+KEYWORDS="~ppc sparc x86"
+SLOT="0"
+LICENSE="GPL-2"
+
+DEPEND="media-sound/lame
+	media-libs/libvorbis
+	sys-libs/zlib
+	sys-apps/sed
+	ncurses? ( sys-libs/ncurses )
+	gtk? ( =x11-libs/gtk+-1*
+	>=dev-libs/glib-1 )"
+RESTRICT="nomirror"
+
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-include.patch
+	epatch ${FILESDIR}/${P}-miscfixes.patch
+}
+
+src_compile() {
+	econf \
+	`use_with gtk x` \
+	`use_with ncurses rubik` \
+	`use_enable debug` || die "econf failed"
+
+	emake CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS} -fpermissive" || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+	rm -rf ${D}/usr/doc
+	dodoc AUTHORS ChangeLog NEWS README TODO KNOWN-BUGS USAGE
+}
+
+pkg_postinst() {
+	einfo
+	einfo "You may want to have a look at /usr/share/doc/${PF}/README.gz for more info."
+	einfo
+}
diff --git a/media-sound/muse/muse-0.9.ebuild b/media-sound/muse/muse-0.9.ebuild
index cea128ec97ab..83b97d184840 100644
--- a/media-sound/muse/muse-0.9.ebuild
+++ b/media-sound/muse/muse-0.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/muse/muse-0.9.ebuild,v 1.6 2004/12/19 06:10:01 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/muse/muse-0.9.ebuild,v 1.7 2005/01/21 21:29:29 luckyduck Exp $
 
 IUSE="ncurses gtk debug"