Add a patch which allows us to set up an optional dependency on jack

3 files changed, 36 insertions, 7 deletions

diff --git a/kde-base/arts/ChangeLog b/kde-base/arts/ChangeLog
index 15aec5c252fc..1c6841b13c50 100644
--- a/kde-base/arts/ChangeLog
+++ b/kde-base/arts/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/arts
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/arts/ChangeLog,v 1.111 2004/08/22 16:32:48 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/arts/ChangeLog,v 1.112 2004/08/26 19:37:30 caleb Exp $
+
+  26 Aug 2004; Caleb Tennis <caleb@gentoo.org> arts-1.3.0.ebuild,
+  files/1.3.0-jack-configure.in.in.patch:
+  Add a patch which allows use to setup a dependency on jack
 
   22 Aug 2004; Tom Gall <tgall@gentoo.org> arts-1.3.0.ebiuld:
   stable on ppc64
diff --git a/kde-base/arts/arts-1.3.0.ebuild b/kde-base/arts/arts-1.3.0.ebuild
index af55374684bb..02d4ead83d40 100644
--- a/kde-base/arts/arts-1.3.0.ebuild
+++ b/kde-base/arts/arts-1.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/arts/arts-1.3.0.ebuild,v 1.2 2004/08/22 16:32:48 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/arts/arts-1.3.0.ebuild,v 1.3 2004/08/26 19:37:30 caleb Exp $
 
 inherit kde flag-o-matic eutils
 set-kdedir 3.3
@@ -12,11 +12,12 @@ SRC_URI="mirror://kde/stable/${PV/1.3.0/3.3}/src/${PN}-${PV}.tar.bz2"
 LICENSE="GPL-2 LGPL-2"
 SLOT="3.3"
 KEYWORDS="~x86 ~amd64 ppc64"
-IUSE="alsa oggvorbis esd artswrappersuid mad"
+IUSE="alsa oggvorbis esd artswrappersuid jack mad"
 
 DEPEND="alsa? ( media-libs/alsa-lib virtual/alsa )
 	oggvorbis? ( media-libs/libvorbis media-libs/libogg )
 	esd? ( media-sound/esound )
+	jack? ( media-sound/jack )
 	mad? ( media-libs/libmad media-libs/libid3tag )
 	media-libs/audiofile
 	>=dev-libs/glib-2
@@ -34,7 +35,9 @@ src_unpack() {
 	# for the configure.in.in patch, for some reason it's not automatically picked up
 	# rm -f $S/configure
 
-	cd ${S}
+	epatch ${FILESDIR}/1.3.0-jack-configure.in.in.patch
+
+	cd ${S} && make -f admin/Makefile.common
 	# use amd64 && epatch ${FILESDIR}/arts-${PV}-buffer.patch
 	# this patch fixes the high cpu usage of mp3 and vorbis
 	# epatch ${FILESDIR}/arts-vorbis-fix.dif
@@ -48,9 +51,7 @@ src_compile() {
 	#fix bug 41980
 	use sparc && filter-flags -fomit-frame-pointer
 
-	myconf="$myconf `use_enable alsa`"
-	myconf="$myconf `use_enable oggvorbis vorbis`"
-	myconf="$myconf `use_enable mad libmad`"
+	myconf="$myconf $(use_enable alsa) $(use_enable oggvorbis vorbis) $(use_enable mad libmad) $(use_enable jack)"
 
 	kde_src_compile
 }
diff --git a/kde-base/arts/files/1.3.0-jack-configure.in.in.patch b/kde-base/arts/files/1.3.0-jack-configure.in.in.patch
new file mode 100644
index 000000000000..aedfea48a479
--- /dev/null
+++ b/kde-base/arts/files/1.3.0-jack-configure.in.in.patch
@@ -0,0 +1,24 @@
+--- /var/tmp/portage/arts-1.3.0/work/arts-1.3.0/configure.in.in	2004-08-05 13:53:14.000000000 -0500
++++ configure.in.in	2004-08-26 14:15:51.901070600 -0500
+@@ -697,6 +697,12 @@
+ AC_SUBST(GLIB_LIBADD)
+ AC_SUBST(GLIB_LDFLAGS)
+ 
++dnl Check jack
++AC_ARG_ENABLE(jack,
++[  --disable-jack             disable support for Jack Audio Connection Kit],
++[arts_with_jack="$enableval"],[arts_with_jack=yes])
++
++if test "x$arts_with_jack" = "xyes"; then
+ AC_MSG_CHECKING(for Jack Audio Connection Kit)
+ if $PKG_CONFIG --atleast-version 0.90 jack >/dev/null 2>&1 ; then
+   JACK_CFLAGS="`$PKG_CONFIG --cflags jack`"
+@@ -708,6 +714,8 @@
+ else
+   AC_MSG_RESULT(not installed)
+ fi
++fi
++
+ AC_SUBST(JACK_CFLAGS)
+ AC_SUBST(JACK_LIBADD)
+ AC_SUBST(JACK_LDFLAGS)