[proaudio] [1174] Fixed jack-audio-connection-kit-9999.ebuild :

[ Thread Index | Date Index | More lists.tuxfamily.org/proaudio Archives ]


Revision: 1174
Author:   marcochapeau
Date:     2008-03-12 00:36:14 +0000 (Wed, 12 Mar 2008)

Log Message:
-----------
Fixed jack-audio-connection-kit-9999.ebuild :
* Netjack is now part of jack
* dbus disabled for now since it's not ready to work with current SVN

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-09 18:45:16 UTC (rev 1173)
+++ trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/ChangeLog	2008-03-12 00:36:14 UTC (rev 1174)
@@ -2,6 +2,10 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  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
+
   09 Mar 2008; Marc-Olivier Barre <marco@xxxxxxxxxxxxxxxx> jack-audio-connection-kit-9999.ebuild:
   * Removed the log patch since it's been applied in SVN
 

Modified: trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/Manifest	2008-03-09 18:45:16 UTC (rev 1173)
+++ trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/Manifest	2008-03-12 00:36:14 UTC (rev 1174)
@@ -18,6 +18,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 4188 RMD160 23b314dfdb6deca18d66a501eb1d1c0320b0afa2 SHA1 e0dc92fedd55adf524d7e211065e9e37fce49de3 SHA256 d75c4aa2deef4528690a27fa4a0424c554993847b53eb01cf3f153735d6f47ff
-MISC ChangeLog 2282 RMD160 fb2498e08bf69f53956a18f4dd47003fc07dd7e3 SHA1 f84ad3900f635ee65b5b78676b2e35c480ff7f8e SHA256 99a96128d27579fc3989a956bbfed561037e23bd68f789462e08a6733a0160a4
+EBUILD jack-audio-connection-kit-9999.ebuild 4125 RMD160 a4d5b3ca01ef95c8c76c94c8241fdbf6050e595e SHA1 1a9c5931851c92c08a81c9939f04af422e196efe SHA256 4b8728ae8b994e40197a6d15971178efca9bd2781402d472f3183911b9325fd9
+MISC ChangeLog 2549 RMD160 a60d8830d9e199812e7c2d1dece0249a9029d19b SHA1 ba25f438cbdac2d4d5b1ed204bb23ebb2ffbf06f SHA256 4d4ab19c60205e5ae80e1e9bc9ef7d056864dec755c2550a850b3af443bd3f5f
 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-09 18:45:16 UTC (rev 1173)
+++ trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-9999.ebuild	2008-03-12 00:36:14 UTC (rev 1174)
@@ -4,22 +4,21 @@
 
 inherit flag-o-matic eutils multilib subversion autotools
 
-NETJACK="netjack-0.12"
-JACKDBUS="jackpatches-0.9"
+#NETJACK="netjack-0.12"
+#JACKDBUS="jackpatches-0.9"
 
 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="netjack? ( mirror://sourceforge/netjack/${NETJACK}.tar.bz2 )
+#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 dbus doc debug jack-tmpfs mmx oss sndfile netjack
-sse jackmidi freebob"
+IUSE="3dnow altivec alsa caps coreaudio doc debug jack-tmpfs mmx oss sndfile sse jackmidi freebob"
 
 RDEPEND="dev-util/pkgconfig
 	netjack? ( !media-sound/netjack )
@@ -27,11 +26,8 @@
 	sys-libs/ncurses
 	caps? ( sys-libs/libcap )
 	alsa? ( >=media-libs/alsa-lib-0.9.1 )
-	netjack? ( dev-util/scons )
 	jackmidi? ( media-libs/alsa-lib )
 	freebob? ( sys-libs/libfreebob )
-	dbus? ( sys-apps/dbus
-			dev-python/dbus-python )
 	!media-sound/jack-audio-connection-kit-svn"
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )"
@@ -53,8 +49,8 @@
 
 src_unpack() {
 	subversion_src_unpack
-	use netjack && cd ${WORKDIR} && unpack ${NETJACK}.tar.bz2
-	use dbus && cd ${WORKDIR} && unpack ${JACKDBUS}.tar.bz2
+#	use netjack && cd ${WORKDIR} && unpack ${NETJACK}.tar.bz2
+#	use dbus && cd ${WORKDIR} && unpack ${JACKDBUS}.tar.bz2
 	cd ${S}
 
 	epatch ${FILESDIR}/${PN}-transport.patch
@@ -63,10 +59,10 @@
 	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
 }
@@ -84,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
@@ -120,10 +116,10 @@
 		emake jackstart || die "jackstart build failed."
 	fi
 
-	if use netjack; then
-		cd "${WORKDIR}/${NETJACK}"
-		scons jack_source_dir=${S}
-	fi
+	#if use netjack; then
+	#	cd "${WORKDIR}/${NETJACK}"
+	#	scons jack_source_dir=${S}
+	#fi
 
 }
 
@@ -156,18 +152,18 @@
 
 	rm -rf ${D}/usr/share/doc/${PF}/reference
 
-	if use netjack; then
-		cd ${WORKDIR}/${NETJACK}
-		dobin alsa_in
-		dobin alsa_out
-		dobin jacknet_client
-
-		# why on earth doesn't get_libdir work here
-		if use amd64; then
-			insinto /usr/lib64/jack
-		else
-			insinto /usr/lib/jack
-		fi
-		doins jack_net.so
-	fi
+#	if use netjack; then
+#		cd ${WORKDIR}/${NETJACK}
+#		dobin alsa_in
+#		dobin alsa_out
+#		dobin jacknet_client
+#
+#		# why on earth doesn't get_libdir work here
+#		if use amd64; then
+#			insinto /usr/lib64/jack
+#		else
+#			insinto /usr/lib/jack
+#		fi
+#		doins jack_net.so
+#	fi
 }


Mail converted by MHonArc 2.6.19+ http://listengine.tuxfamily.org/