0.94.0 Stable x86. 0.98.1 version bump closes bug #48840.

5 files changed, 55 insertions, 7 deletions

diff --git a/media-sound/jack-audio-connection-kit/ChangeLog b/media-sound/jack-audio-connection-kit/ChangeLog
index 83135705d5fe..ddc1b27125dd 100644
--- a/media-sound/jack-audio-connection-kit/ChangeLog
+++ b/media-sound/jack-audio-connection-kit/ChangeLog
@@ -1,13 +1,14 @@
 # ChangeLog for media-sound/jack-audio-connection-kit
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/jack-audio-connection-kit/ChangeLog,v 1.31 2004/05/05 03:27:06 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/jack-audio-connection-kit/ChangeLog,v 1.32 2004/05/05 04:10:17 eradicator Exp $
 
-*jack-audio-connection-kit-0.98.0 (04 May 2004)
+*jack-audio-connection-kit-0.98.1 (04 May 2004)
 
   04 May 2004; Jeremy Huddleston <eradicator@gentoo.org>
   jack-audio-connection-kit-0.94.0.ebuild,
-  jack-audio-connection-kit-0.98.0.ebuild:
-  0.94.0 Stable x86. 0.98.0 version bump closes bug #48840.
+  jack-audio-connection-kit-0.98.1.ebuild,
+  files/jack-audio-connection-kit-0.98.1-configure.patch:
+  0.94.0 Stable x86. 0.98.1 version bump closes bug #48840.
 
   20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
   jack-audio-connection-kit-0.90.1-r1.ebuild,
diff --git a/media-sound/jack-audio-connection-kit/Manifest b/media-sound/jack-audio-connection-kit/Manifest
index 98122d8cd3dd..7ed85e7d6aa8 100644
--- a/media-sound/jack-audio-connection-kit/Manifest
+++ b/media-sound/jack-audio-connection-kit/Manifest
@@ -1,12 +1,13 @@
 MD5 28b845d9af8d3321de46c6e7413d8c29 jack-audio-connection-kit-0.91.1.ebuild 1792
-MD5 8ea1bbb7947aafe1dc0596191f5d28a6 jack-audio-connection-kit-0.98.0.ebuild 1777
 MD5 6166812f51037172b8d124de52724787 jack-audio-connection-kit-0.94.0.ebuild 1777
 MD5 9a77443268788deccb0f6a15293ff206 jack-audio-connection-kit-0.80.0.ebuild 1805
 MD5 4d3758d26f57b360125116691a38e199 jack-audio-connection-kit-0.90.1-r1.ebuild 1811
+MD5 9432b4927e2bf2e5abc7eec1d4310ab7 jack-audio-connection-kit-0.98.1.ebuild 1831
 MD5 ab7f93f0fb8fc7663fc00bebe5a31509 jack-audio-connection-kit-0.90.1.ebuild 1702
 MD5 4e0fa1a1c041afa36f7ee7637670cdec ChangeLog 7553
 MD5 bf663ce8a92c2873735ff360edf99f5a metadata.xml 220
 MD5 dcf18370c825d7fc7b1f5894ea8609c3 jack-audio-connection-kit-0.75.0.ebuild 1542
+MD5 b5dc5c728b1bdc6c5ebf5e54dc3ca246 files/jack-audio-connection-kit-0.98.1-configure.patch 1459
 MD5 0ad8a4c606e807460bce497d044044ef files/jack-audio-connection-kit-doc-option.patch 1103
 MD5 b029501b88782a0cca9e2f3d64812e63 files/jack-audio-connection-kit-0.80.0-alsalib-fix.patch 575
 MD5 5623bf1f03c3aa5bbc1ba1c8fb82cdac files/digest-jack-audio-connection-kit-0.90.1-r1 84
@@ -16,3 +17,4 @@ MD5 5623bf1f03c3aa5bbc1ba1c8fb82cdac files/digest-jack-audio-connection-kit-0.90
 MD5 8c4ad67d3f17536a7da2b84c8eac4424 files/digest-jack-audio-connection-kit-0.91.1 84
 MD5 7d6d70bef836d5da076c9ad12bfc10cf files/digest-jack-audio-connection-kit-0.94.0 84
 MD5 d80a7330ec532db1623d4a7d79165126 files/digest-jack-audio-connection-kit-0.98.0 84
+MD5 1081e2f37f20874fb10b5a9c183df0b4 files/digest-jack-audio-connection-kit-0.98.1 84
diff --git a/media-sound/jack-audio-connection-kit/files/digest-jack-audio-connection-kit-0.98.1 b/media-sound/jack-audio-connection-kit/files/digest-jack-audio-connection-kit-0.98.1
new file mode 100644
index 000000000000..3df2e43f269f
--- /dev/null
+++ b/media-sound/jack-audio-connection-kit/files/digest-jack-audio-connection-kit-0.98.1
@@ -0,0 +1 @@
+MD5 6ebd659a431e75b841fa5e0c397372ee jack-audio-connection-kit-0.98.1.tar.gz 706100
diff --git a/media-sound/jack-audio-connection-kit/files/jack-audio-connection-kit-0.98.1-configure.patch b/media-sound/jack-audio-connection-kit/files/jack-audio-connection-kit-0.98.1-configure.patch
new file mode 100644
index 000000000000..69974111076c
--- /dev/null
+++ b/media-sound/jack-audio-connection-kit/files/jack-audio-connection-kit-0.98.1-configure.patch
@@ -0,0 +1,43 @@
+--- configure.in.orig	2004-04-20 16:28:13.000000000 -0700
++++ configure.in	2004-05-04 20:21:45.418353000 -0700
+@@ -149,8 +149,7 @@
+ 
+ JACK_CORE_CFLAGS="-I\$(top_builddir)/config -I\$(top_srcdir) \
+ -I\$(top_builddir) -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -Wall"
+-JACK_OPT_CFLAGS="$JACK_CORE_CFLAGS -g -march=pentium2 -mcpu=pentium4 -O3 \
+--ffast-math -funroll-loops -fprefetch-loop-arrays"
++JACK_OPT_CFLAGS="$JACK_CORE_CFLAGS -g -O3 -ffast-math -funroll-loops -fprefetch-loop-arrays"
+ JACK_CFLAGS="$JACK_CORE_CFLAGS $CFLAGS"
+ 
+ dnl
+@@ -514,10 +513,26 @@
+ fi
+ AC_SUBST(READLINE_DEPS)
+ 
+-# you need doxygen to make dist.
+-AC_CHECK_PROG(HAVE_DOXYGEN, doxygen, true, false)
+-if test $HAVE_DOXYGEN = "false"; then
+-             AC_MSG_WARN([*** doxygen not found, docs will not be built])
++AC_ARG_ENABLE(html-docs,
++	[  --enable-html-docs    build the html documentation (default yes)],
++        [ if test "x$enable_html_docs" != "xno" ; then
++                ENABLE_HTML_DOCS="yes"
++		AC_MSG_RESULT([JACK will build html docs])
++	else
++		AC_MSG_RESULT([JACK will not build html docs])
++	fi;
++        ], 
++	[ ENABLE_HTML_DOCS="yes"; ]
++)
++
++if test "$ENABLE_HTML_DOCS" == "yes" ; then
++	# you need doxygen to make dist.
++	AC_CHECK_PROG(HAVE_DOXYGEN, doxygen, true, false)
++	if test $HAVE_DOXYGEN == "false"; then
++		AC_MSG_ERROR([*** doxygen not found, unable to build docs.])
++	fi
++else
++	HAVE_DOXYGEN="false"
+ fi
+ 
+ AM_CONDITIONAL(HAVE_SNDFILE, $HAVE_SNDFILE)
diff --git a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.98.0.ebuild b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.98.1.ebuild
index 766c145c7897..9d0ef7f85646 100644
--- a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.98.0.ebuild
+++ b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.98.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.98.0.ebuild,v 1.1 2004/05/05 03:27:06 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.98.1.ebuild,v 1.1 2004/05/05 04:10:17 eradicator Exp $
 
 inherit flag-o-matic eutils
 
@@ -28,7 +28,8 @@ PROVIDE="virtual/jack"
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/${PN}-doc-option.patch
+	# Add doc option and fix --march=pentium2 in caps test
+	epatch ${FILESDIR}/${P}-configure.patch
 	autoconf || die "Couldn't regenerate configure file, failing"
 }