[proaudio] [1178] * dbus patches for jack-audio-connection-kit ebuild active again for svn version

[subversion@xxxxxxxxxxxxx]

Revision: 1178
Author:   marcochapeau
Date:     2008-03-23 14:54:18 +0100 (Sun, 23 Mar 2008)

Log Message:
-----------
* dbus patches for jack-audio-connection-kit ebuild active again for svn version

Modified Paths:
--------------
    trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/ChangeLog
    trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/Manifest
    trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-9999.ebuild


Modified: trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/ChangeLog	2008-03-16 22:56:51 UTC (rev 1177)
+++ trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/ChangeLog	2008-03-23 13:54:18 UTC (rev 1178)
@@ -2,6 +2,9 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  23 Mar 2008; Marc-Olivier Barre <marco@xxxxxxxxxxxxxxxx> jack-audio-connection-kit-9999.ebuild:
+  * Reactivated dbus. jackpatches version 0.12.
+
   12 Mar 2008; Marc-Olivier Barre <marco@xxxxxxxxxxxxxxxx> jack-audio-connection-kit-9999.ebuild:
   * Removed dbus patch which will not work with SVN right now
   * Remove netjack since it has been implemented as an inprocess client and will be shipped with jack 1.0

Modified: trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/Manifest	2008-03-16 22:56:51 UTC (rev 1177)
+++ trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/Manifest	2008-03-23 13:54:18 UTC (rev 1178)
@@ -8,6 +8,7 @@
 DIST jack-audio-connection-kit-0.103.0.tar.gz 763244 RMD160 72e47ada90b3d2c391c2e712316a975ae2a13ece SHA1 e804189f3dc024dad37da4afb66a30fd9c92b2bf SHA256 a5d9fd696d7ee4a1c7679b5a688155bc1e0abbdf5f144d6762dbbee874df235f
 DIST jack-audio-connection-kit-0.109.0.tar.gz 830475 RMD160 a3aa1b0f2d92f6d8099c82725f844482f61e92b9 SHA1 dec4067ecafbb679d424fa8105560aff89afb99a SHA256 7068d67de58211271e0f61b2caa0a46b68fed885fef69076d0bedd5978013d34
 DIST jack-audio-connection-kit-0.109.2.tar.gz 831141 RMD160 1e382cf6751b4df3d5d4ea75be7ee94adbc7746a SHA1 5a23c9817fb72858d5bc7b3077224575140b7f55 SHA256 27a7a70e5be0dbcdd98ee1a505399e006e06b4f58fcd3b8cd25763aa7e43bfd4
+DIST jackpatches-0.11.tar.bz2 37522 RMD160 0293bc31c6a72c9256a0410d7b0775b32dae7c0c SHA1 85c5c7513b8f87b517ae0108a65e45642881088d SHA256 979b489bfc5b4a74bd3e9c0f28bb310a211f3f874fc8418babbd9b73dfd9ca94
 DIST jackpatches-0.9.tar.bz2 39494 RMD160 64b1070daf082cd7d18f94f86d8e8b54eb8b9a7c SHA1 23c2cd23430cdb9b5923084f0a0ecc56add1f0c0 SHA256 7f79816a50509b526c70e127adb703ffbd0d6e6a76d0e6f940451c6d7b25e123
 DIST netjack-0.11rc5.tar.bz2 23698 RMD160 528dc7d88452b920da55da5fa5caf675a17603c4 SHA1 5f73fab160e9e5e4bfa67152bdaaae3223e0777f SHA256 0cb2dd50b300bb6d5ba8c64901801f8a9ebf0b4430b8c58ef5d5e3f350c79dc7
 DIST netjack-0.12.tar.bz2 28044 RMD160 13d13f2a66c891da243f9a286833554f680937ff SHA1 f850ed654d0f115065d96bee34d9f7c05e8c5725 SHA256 c443bcb6ec2b477c52cab2fca75aef80fe2c2c91499e45ffdbb1c28ffaa7ee60
@@ -18,6 +19,6 @@
 EBUILD jack-audio-connection-kit-0.103.0.ebuild 4016 RMD160 e8e807988fb0ecc419ed51bedbcad17a51d43e13 SHA1 d625e691c61ea1e849d0c8dbe2c768324bc529d0 SHA256 8786bc424e9ffe2e2f6d7a7af9ee86e267a05c4b74364b28a483268e7bb69456
 EBUILD jack-audio-connection-kit-0.109.0.ebuild 4381 RMD160 b2d95df3ef485a113825770644646eb46d318456 SHA1 67e22a333e70046b2292a207f6a824045a936ae6 SHA256 ac7d94848ac2d3c84e2159096ba7b0a3044a93157ad5089b67cc4d0a9a37b0b2
 EBUILD jack-audio-connection-kit-0.109.2.ebuild 4350 RMD160 57d796dea6c3de68733dda6743cfc71ef582e79a SHA1 ec336ca357d312ec06ba0bafa031fcfc60eda12f SHA256 469ed13600d80b9155b9a72f18261a73ca4a44db5fcb3901fd164b658e7d3e6f
-EBUILD jack-audio-connection-kit-9999.ebuild 4125 RMD160 a4d5b3ca01ef95c8c76c94c8241fdbf6050e595e SHA1 1a9c5931851c92c08a81c9939f04af422e196efe SHA256 4b8728ae8b994e40197a6d15971178efca9bd2781402d472f3183911b9325fd9
-MISC ChangeLog 2549 RMD160 a60d8830d9e199812e7c2d1dece0249a9029d19b SHA1 ba25f438cbdac2d4d5b1ed204bb23ebb2ffbf06f SHA256 4d4ab19c60205e5ae80e1e9bc9ef7d056864dec755c2550a850b3af443bd3f5f
+EBUILD jack-audio-connection-kit-9999.ebuild 4131 RMD160 a803fc7b531ea21bbb1a97e571b4fa088e0685c5 SHA1 4801b00e13b931a4d8dda36d06f35c18c1c5b725 SHA256 331c32d1fb4d3ddee3d3f282e1565670f5e0d46ca8dc70ce0f908cfcb6f91048
+MISC ChangeLog 2696 RMD160 0428981e9ff843ec8aed2418dddc512317fa02d9 SHA1 2266929e2c25859355d946c602e061de514c810b SHA256 e4c613fdb4db033616bf254cf8f2629202bd42d2a6213d78674dc151a9865a60
 MISC metadata.xml 268 RMD160 facc07bd885f20615a1f2555069329c642e1a566 SHA1 2456bdb8a218c9d477d2d6ee4bf158de070c7be4 SHA256 96629b266b743f566c29158d4498edeeb1cd6b1f0cd9629e42d4f10b4da82f89

Modified: trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-9999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-9999.ebuild	2008-03-16 22:56:51 UTC (rev 1177)
+++ trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-9999.ebuild	2008-03-23 13:54:18 UTC (rev 1178)
@@ -5,20 +5,21 @@
 inherit flag-o-matic eutils multilib subversion autotools
 
 #NETJACK="netjack-0.12"
-#JACKDBUS="jackpatches-0.9"
+JACKDBUS="jackpatches-0.11"
 
 RESTRICT="nostrip nomirror"
 DESCRIPTION="A low-latency audio server"
 HOMEPAGE="http://www.jackaudio.org";
 #SRC_URI="netjack? ( mirror://sourceforge/netjack/${NETJACK}.tar.bz2 )
-#dbus? ( http://dl.sharesource.org/jack/${JACKDBUS}.tar.bz2 )"
+SRC_URI="dbus? ( http://dl.sharesource.org/jack/${JACKDBUS}.tar.bz2 )"
 
 ESVN_REPO_URI="http://subversion.jackaudio.org/jack/trunk/jack";
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS=""
-IUSE="3dnow altivec alsa caps coreaudio doc debug jack-tmpfs mmx oss sndfile sse jackmidi freebob"
+IUSE="3dnow altivec alsa caps coreaudio doc debug jack-tmpfs mmx oss sndfile sse
+jackmidi freebob dbus"
 
 RDEPEND="dev-util/pkgconfig
 	netjack? ( !media-sound/netjack )
@@ -59,19 +60,18 @@
 	epatch "${FILESDIR}/jack-transport-start-at-zero-fix.diff"
 
 	# dbus patches from Nedko Arnaudov
-#	if use dbus; then
-#		epatch "../${JACKDBUS}/dbus.patch"
-#	epatch "../${JACKDBUS}/watchdog-fix-on-driver-load-fail.patch"
-#	fi
+	if use dbus; then
+		epatch "../${JACKDBUS}/dbus.patch"
+		epatch "../${JACKDBUS}/watchdog-fix-on-driver-load-fail.patch"
+	fi
 	sed -i -e "s:include/nptl/:include/:g" configure.ac || die
 	eautoreconf
+	sed -i "s/^CFLAGS=\$JACK_CFLAGS/CFLAGS=\"\$JACK_CFLAGS $(get-flag -march)\"/" configure || die
 }
 
 src_compile() {
 	local myconf
 
-	sed -i "s/^CFLAGS=\$JACK_CFLAGS/CFLAGS=\"\$JACK_CFLAGS $(get-flag -march)\"/" configure || die
-
 	use doc && myconf="--with-html-dir=/usr/share/doc/${PF}"
 
 	if use jack-tmpfs; then
@@ -80,9 +80,9 @@
 		myconf="${myconf} --with-default-tmpdir=/var/run/jack"
 	fi
 
-	#if use dbus; then
-	#	myconf="${myconf} --enable-dbus --enable-pkg-config-dbus-service-dir"
-	#fi
+	if use dbus; then
+		myconf="${myconf} --enable-dbus --enable-pkg-config-dbus-service-dir"
+	fi
 
 	if use userland_Darwin ; then
 		append-flags -fno-common