Version bump. -sparc, -amd64. Direct to stable as the old version no longer compiles.

8 files changed, 129 insertions, 53 deletions

diff --git a/media-sound/jmax/ChangeLog b/media-sound/jmax/ChangeLog
index bafb2be0be7c..05fe483cbb42 100644
--- a/media-sound/jmax/ChangeLog
+++ b/media-sound/jmax/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-sound/jmax
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/jmax/ChangeLog,v 1.6 2004/06/25 00:07:27 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/jmax/ChangeLog,v 1.7 2004/07/09 02:38:51 eradicator Exp $
+
+*jmax-4.1.0 (08 Jul 2004)
+
+  08 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> jmax-4.0.2.ebuild,
+  jmax-4.1.0.ebuild, files/jmax-4.1.0-gcc34.patch,
+  files/jmax-4.1.0-otherArch.patch:
+  Version bump. -sparc, -amd64. Direct to stable as the old version no longer
+  compiles.
 
   05 May 2004; Jeremy Huddleston <eradicator@gentoo.org> jmax-4.0.2.ebuild:
   emake -j1 becasue of bug #47978.
diff --git a/media-sound/jmax/Manifest b/media-sound/jmax/Manifest
index 3fe74a24d470..ea09b63d64e7 100644
--- a/media-sound/jmax/Manifest
+++ b/media-sound/jmax/Manifest
@@ -1,5 +1,8 @@
-MD5 8ca2b366f3f2180809c96d121e79d883 jmax-4.0.2.ebuild 1044
 MD5 1a96d3369d774ede4eff577296a84778 ChangeLog 684
+MD5 8ca2b366f3f2180809c96d121e79d883 jmax-4.0.2.ebuild 1044
 MD5 3be4f6e757e3057184136a002b0165f9 metadata.xml 221
-MD5 ce7938192f9fef7f13fa7fe709c6f3ad files/jmax-4.0.2-work_with_recent_alsa-lib.patch 991
+MD5 c72289dca99d76e91665a83c859842de jmax-4.1.0.ebuild 1366
 MD5 52b60310d899a94c7402ebed98ca9c71 files/digest-jmax-4.0.2 63
+MD5 ce7938192f9fef7f13fa7fe709c6f3ad files/jmax-4.0.2-work_with_recent_alsa-lib.patch 991
+MD5 bc96e130e7d54a74caa5c39641d6e898 files/digest-jmax-4.1.0 125
+MD5 a2964306dfa904cce770a5be6a3492d0 files/jmax-4.1.0-otherArch.patch 651
diff --git a/media-sound/jmax/files/digest-jmax-4.0.2 b/media-sound/jmax/files/digest-jmax-4.0.2
deleted file mode 100644
index 964240056ace..000000000000
--- a/media-sound/jmax/files/digest-jmax-4.0.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2214ae9bd18cc609177c6769fd3491a8 jmax-4.0.2.tar.gz 2535358
diff --git a/media-sound/jmax/files/digest-jmax-4.1.0 b/media-sound/jmax/files/digest-jmax-4.1.0
new file mode 100644
index 000000000000..0ce27a498ce0
--- /dev/null
+++ b/media-sound/jmax/files/digest-jmax-4.1.0
@@ -0,0 +1,2 @@
+MD5 f60495ac644d037329f8733c4684a67d jmax-4.1.0.tar.gz 3045368
+MD5 1901ba3552c87f442b361a90a7e1ad37 jmax-m4-1.0.tar.bz2 7506
diff --git a/media-sound/jmax/files/jmax-4.1.0-gcc34.patch b/media-sound/jmax/files/jmax-4.1.0-gcc34.patch
new file mode 100644
index 000000000000..fb8fa39c00c5
--- /dev/null
+++ b/media-sound/jmax/files/jmax-4.1.0-gcc34.patch
@@ -0,0 +1,27 @@
+diff -Naur jmax-4.1.0.orig/client/cpp/src/Hashtable.h jmax-4.1.0/client/cpp/src/Hashtable.h
+--- jmax-4.1.0.orig/client/cpp/src/Hashtable.h	2002-11-18 23:56:42.000000000 -0800
++++ jmax-4.1.0/client/cpp/src/Hashtable.h	2004-07-08 14:32:14.325244414 -0700
+@@ -7,6 +7,8 @@
+ 
+ #include <iostream>
+ 
++using namespace std;
++
+ namespace ircam {
+ namespace fts {
+ namespace client {
+diff -Naur jmax-4.1.0.orig/packages/dtd/c/src/dtd_thread.h jmax-4.1.0/packages/dtd/c/src/dtd_thread.h
+--- jmax-4.1.0.orig/packages/dtd/c/src/dtd_thread.h	2003-07-22 09:10:50.000000000 -0700
++++ jmax-4.1.0/packages/dtd/c/src/dtd_thread.h	2004-07-08 14:31:23.965610486 -0700
+@@ -41,9 +41,9 @@
+     dtd_buffer_t* com_buffer;
+ 
+     /* index of buffer write by FTS */
+-    const int* const buffer_index;
++    const int* buffer_index;
+     /* eof flags set by dtd_thread */
+-    const int* const is_eof;
++    int* is_eof;
+ 
+     /* delay for nanosleep (see fts_thread_manager) */
+     int delay_ms;
diff --git a/media-sound/jmax/files/jmax-4.1.0-otherArch.patch b/media-sound/jmax/files/jmax-4.1.0-otherArch.patch
new file mode 100644
index 000000000000..106dc2c1153f
--- /dev/null
+++ b/media-sound/jmax/files/jmax-4.1.0-otherArch.patch
@@ -0,0 +1,19 @@
+diff -Naur jmax-4.1.0.orig/configure.in jmax-4.1.0/configure.in
+--- jmax-4.1.0.orig/configure.in	2004-03-04 08:25:14.000000000 -0800
++++ jmax-4.1.0/configure.in	2004-07-08 12:57:16.460227401 -0700
+@@ -202,7 +202,7 @@
+ case "$host" in
+ 
+ dnl GNU/Linux on an Intel or compatible
+-i*86-*-linux*|powerpc-*-linux-gnu)
++*-linux*)
+ PLATFORM=linux
+ CFLAGS="$CFLAGS -Wall -Wno-unused"
+ if test "$with_debug" != "yes"
+@@ -738,6 +738,4 @@
+ echo
+ echo "jMax will be compiled without standard sound support (ALSA or Jack)."
+ echo Note that you can try to use the DEPRECATED oss packages at your own risk.
+-echo Are you really sure you want to continue ?
+-read
+ fi
diff --git a/media-sound/jmax/jmax-4.0.2.ebuild b/media-sound/jmax/jmax-4.0.2.ebuild
deleted file mode 100644
index 231853ff9e0f..000000000000
--- a/media-sound/jmax/jmax-4.0.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/jmax/jmax-4.0.2.ebuild,v 1.5 2004/06/25 00:07:27 agriffis Exp $
-
-IUSE=""
-
-inherit eutils libtool
-
-DESCRIPTION="jMax is a visual programming environment for building interactive real-time music and multimedia applications."
-HOMEPAGE="http://freesoftware.ircam.fr/rubrique.php3?id_rubrique=2"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-RESTRICT="nomirror"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86"
-
-DEPEND=">=virtual/jre-1.4
-	media-libs/alsa-lib"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${P}-work_with_recent_alsa-lib.patch
-	elibtoolize
-}
-
-src_compile() {
-	econf
-
-	# -j2 fails.  See bug #47978
-	emake -j1
-}
-
-src_install () {
-	einstall || die "install failed"
-
-	dodoc AUTHORS ChangeLog JMAX-VERSION LICENCE.fr LICENSE LISEZMOI README
-}
-
-
-
-pkg_postinst() {
-	echo
-	einfo "To get started, have a look at the tutorials"
-	einfo "in /usr/share/jmax/tutorials/basics"
-	echo
-}
diff --git a/media-sound/jmax/jmax-4.1.0.ebuild b/media-sound/jmax/jmax-4.1.0.ebuild
new file mode 100644
index 000000000000..9fb77b42da8e
--- /dev/null
+++ b/media-sound/jmax/jmax-4.1.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/jmax/jmax-4.1.0.ebuild,v 1.1 2004/07/09 02:38:51 eradicator Exp $
+
+IUSE="alsa jack doc"
+
+inherit eutils libtool
+
+DESCRIPTION="jMax is a visual programming environment for building interactive real-time music and multimedia applications."
+HOMEPAGE="http://freesoftware.ircam.fr/rubrique.php3?id_rubrique=2"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+	 mirror://gentoo/jmax-m4-1.0.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+#-amd64, -sparc: 4.1.0: fts/linux.c has only code for ppc and ix86
+
+KEYWORDS="x86 -amd64 -sparc"
+
+RDEPEND=">=virtual/jre-1.4
+	jack? ( media-sound/jack-audio-connection-kit )
+	alsa? ( media-libs/alsa-lib )"
+
+DEPEND="${RDEPEND}
+	>=virtual/jdk-1.4
+	doc? ( app-doc/doxygen )
+	sys-devel/autoconf"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+
+	cd ${S}
+	unpack jmax-m4-1.0.tar.bz2
+	epatch ${FILESDIR}/${P}-otherArch.patch
+	epatch ${FILESDIR}/${P}-gcc34.patch
+
+	export WANT_AUTOMAKE=1.6
+	export WANT_AUTOCONF=2.5
+	touch INSTALL NEWS
+	aclocal -I m4 || die
+	automake # this will fail because of bad upstream Makefile.am
+	autoconf || die
+
+	elibtoolize
+}
+
+src_compile() {
+	econf
+
+	# -j2 fails.  See bug #47978
+	emake -j1
+}
+
+src_install () {
+	make DESTDIR="${D}" install || die
+
+	dodoc AUTHORS ChangeLog JMAX-VERSION LICENCE.fr LICENSE LISEZMOI README
+}
+
+
+
+pkg_postinst() {
+	echo
+	einfo "To get started, have a look at the tutorials"
+	einfo "in /usr/share/jmax/tutorials/basics"
+	echo
+}