| [proaudio] [1397] jack cleanups: |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/proaudio Archives
]
Revision: 1397
Author: gimpel
Date: 2008-12-16 12:56:17 +0100 (Tue, 16 Dec 2008)
Log Message:
-----------
jack cleanups:
* make tmpfs default (running without is pointless)
* remove portaudio support
* remove caps (nobody runs 2.4 kernels)
* fix doc
* add examples
.... like the ebuild in portage
Modified Paths:
--------------
trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/Manifest
trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.116.1.ebuild
trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-9999.ebuild
Removed Paths:
-------------
trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/files/jack-audio-connection-kit-transport.patch
trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/files/jack-transport-start-at-zero-fix.diff
trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.109.2-r2.ebuild
Modified: trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/Manifest 2008-12-16 00:19:26 UTC (rev 1396)
+++ trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/Manifest 2008-12-16 11:56:17 UTC (rev 1397)
@@ -1,13 +1,7 @@
AUX jack-audio-connection-kit-0.116.1-dbus.patch 930659 RMD160 08e38b0264eb9c0ed09438123cad7e61beeb2e31 SHA1 467b0e485861a7c81f133e67818aa84139889b8a SHA256 818a6182de4e23388fff3863627abdc4df58a976c4f924b10ab3502ae026b88f
AUX jack-audio-connection-kit-0.116.1-dbus_as-needed.patch 314 RMD160 77026765eb5fa7e97b6eb59e4c5f8c52288647de SHA1 60262c8cc412b17f0f2bbdd7fb49b870cc32710e SHA256 923efb309bc902e33a9d02b51f2cc1a0c1f4844d88c12236fb1fbf09066b5468
-AUX jack-audio-connection-kit-transport.patch 309 RMD160 7b7130dd922ed14988eb591059d643ece39f6757 SHA1 ed8f9d90ec62476643f41ff60735d4aaaee84886 SHA256 74f1d155f365deb1461d070b37ccd7836c32c521d31960a3f4e6c3f2e528bada
-AUX jack-transport-start-at-zero-fix.diff 1613 RMD160 aa2e1492841c4299647af812d68e9585ebd53b10 SHA1 9e18d8ed0fa755fcd4aa53e82693e03d71a94b7b SHA256 f836d29c3ee71624968e8befb3f9972c1906b926d4737e02499a6bec646b5a1f
-DIST jack-audio-connection-kit-0.109.2.tar.gz 831141 RMD160 1e382cf6751b4df3d5d4ea75be7ee94adbc7746a SHA1 5a23c9817fb72858d5bc7b3077224575140b7f55 SHA256 27a7a70e5be0dbcdd98ee1a505399e006e06b4f58fcd3b8cd25763aa7e43bfd4
DIST jack-audio-connection-kit-0.116.1.tar.gz 943593 RMD160 a13ab20b747d0cfd8551e5e2874fd249184078d0 SHA1 2fb1e4bcc3fe8cf18024d3ead93eb4e4fcef5e69 SHA256 da3e6133e4f0305d8a0759563b074722ab97894a81b8925a058bc4714f7e4fd9
-DIST jackdbus-patches-0.9.tar.bz2 39305 RMD160 0e9c348211684fa6b52261adca2c43ad1b5200db SHA1 342137f9763da9a2aebd818434515cf3cc41682d SHA256 c37fe0811b49da0dbaeb5fbc8ed7eddc47f514eda6b9dc662cff8f80847526f2
-DIST netjack-0.12.tar.bz2 28044 RMD160 13d13f2a66c891da243f9a286833554f680937ff SHA1 f850ed654d0f115065d96bee34d9f7c05e8c5725 SHA256 c443bcb6ec2b477c52cab2fca75aef80fe2c2c91499e45ffdbb1c28ffaa7ee60
-EBUILD jack-audio-connection-kit-0.109.2-r2.ebuild 4769 RMD160 0da7e08bf67145fc6f3b3379c463e32dc75eb04b SHA1 65f27fc56207e67716a57b566daf3d6184ba1a52 SHA256 d2cfa38406eb3ed863232c565abf6127984b59520ad1d9e00b4e0ca72aa1d972
-EBUILD jack-audio-connection-kit-0.116.1.ebuild 3948 RMD160 49043b85116d1cbed55797c0a24b654669d84706 SHA1 eff15192cb8f6cee0c3baa72df752872e7e126e9 SHA256 342440977ba7268af237d9ae984515e110ee26e50e4bef04965d129369c94808
-EBUILD jack-audio-connection-kit-9999.ebuild 4848 RMD160 f64941a574ef1717abd351b8edb5613279b90376 SHA1 8e82fecabff302ae0b514ae6fa29bec49207c881 SHA256 6a41d6cc692aa4d64b16b373f5d3dc12e7cba87381892ff7e930ff7b8fd6a6af
+EBUILD jack-audio-connection-kit-0.116.1.ebuild 2171 RMD160 f8bada66e6235a6ea8482edcb62186e4163af503 SHA1 7621e1e68f21fb9773048f29ff823c46c0432787 SHA256 ecad80982850d3799811d57387ab76ab751e1f60ebda32bd8ff34af0a7e31f6e
+EBUILD jack-audio-connection-kit-9999.ebuild 3040 RMD160 4fa6b103e85d7462d760748af8da44baa0e48b54 SHA1 a73f85ea12a6ec771816f4cb13d8f7c741d05454 SHA256 0a1b468faee1583942b2ecb682461019eaa8874df0426f331315acbd9b9a0ce0
MISC ChangeLog 3539 RMD160 b086e2d0d85010139008f643f1cff9a734edb3fc SHA1 cbf8a1a6526b0d6512001cf978ce67f1b47178c4 SHA256 37ff9acc8c3112600739b86c6e0c0310794675d18ab1b341c541d08e82f47922
MISC metadata.xml 268 RMD160 facc07bd885f20615a1f2555069329c642e1a566 SHA1 2456bdb8a218c9d477d2d6ee4bf158de070c7be4 SHA256 96629b266b743f566c29158d4498edeeb1cd6b1f0cd9629e42d4f10b4da82f89
Deleted: trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/files/jack-audio-connection-kit-transport.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/files/jack-audio-connection-kit-transport.patch 2008-12-16 00:19:26 UTC (rev 1396)
+++ trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/files/jack-audio-connection-kit-transport.patch 2008-12-16 11:56:17 UTC (rev 1397)
@@ -1,10 +0,0 @@
---- example-clients/transport.c 2005-06-02 13:31:18 -0500
-+++ example-clients/transport.c-new 2005-08-05 11:24:11 -0500
-@@ -26,6 +26,7 @@
- #include <string.h>
- #include <readline/readline.h>
- #include <readline/history.h>
-+#include <readline/chardefs.h>
- #include <jack/jack.h>
- #include <jack/transport.h>
-
Deleted: trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/files/jack-transport-start-at-zero-fix.diff
===================================================================
--- trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/files/jack-transport-start-at-zero-fix.diff 2008-12-16 00:19:26 UTC (rev 1396)
+++ trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/files/jack-transport-start-at-zero-fix.diff 2008-12-16 11:56:17 UTC (rev 1397)
@@ -1,49 +0,0 @@
-Index: jackd/transengine.c
-===================================================================
---- jackd/transengine.c (revision 1050)
-+++ jackd/transengine.c (working copy)
-@@ -395,6 +395,7 @@
- {
- jack_control_t *ectl = engine->control;
- transport_command_t cmd; /* latest transport command */
-+ int dont_trans_advance = FALSE;
-
- /* Promote pending_time to current_time. Maintain the usecs,
- * frame_rate and frame values, clients may not set them. */
-@@ -409,6 +410,10 @@
- if ((ectl->sync_remain == 0) ||
- (jack_sync_timeout(engine))) {
- ectl->transport_state = JackTransportRolling;
-+
-+ // dont advance the transport this is a statechange not seen
-+ // by the switch statement below
-+ dont_trans_advance = TRUE;
- VERBOSE (engine, "transport Rolling, %8.6f sec"
- " left for poll\n",
- (double) (ectl->sync_time_left / 1000000.0));
-@@ -468,7 +473,12 @@
- ectl->transport_state = JackTransportStarting;
- jack_sync_poll_start(engine);
- }
-+ } else if ( ! dont_trans_advance ) {
-+ // ok... no statechange happened go transport go...
-+ ectl->pending_time.frame =
-+ ectl->current_time.frame + ectl->buffer_size;
- }
-+
- break;
-
- default:
-@@ -476,12 +486,6 @@
- ectl->transport_state);
- }
-
-- /* Update timebase, if needed. */
-- if (ectl->transport_state == JackTransportRolling) {
-- ectl->pending_time.frame =
-- ectl->current_time.frame + ectl->buffer_size;
-- }
--
- /* See if an asynchronous position request arrived during the
- * last cycle. The request_time could change during the
- * guarded copy. If so, we use the newest request. */
Deleted: trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.109.2-r2.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.109.2-r2.ebuild 2008-12-16 00:19:26 UTC (rev 1396)
+++ trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.109.2-r2.ebuild 2008-12-16 11:56:17 UTC (rev 1397)
@@ -1,179 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit flag-o-matic eutils multilib linux-info autotools unipatch-001
-
-NETJACK="netjack-0.12"
-JACKDBUS="jackdbus-patches-0.9.tar.bz2"
-
-DESCRIPTION="A low-latency audio server"
-HOMEPAGE="http://www.jackaudio.org";
-SRC_URI="mirror://sourceforge/jackit/${P}.tar.gz
- netjack? ( mirror://sourceforge/netjack/${NETJACK}.tar.bz2 )
- dbus? ( http://download.tuxfamily.org/proaudio/distfiles/${JACKDBUS} )"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE="3dnow altivec alsa caps coreaudio cpudetection dbus doc debug jack-tmpfs mmx oss portaudio sse netjack freebob"
-
-RDEPEND="
- >=media-libs/libsndfile-1.0.0
- sys-libs/ncurses
- caps? ( sys-libs/libcap )
- portaudio? ( =media-libs/portaudio-18* )
- alsa? ( >=media-libs/alsa-lib-0.9.1 )
- dbus? ( sys-apps/dbus
- dev-python/dbus-python )
- freebob? ( sys-libs/libfreebob )"
-DEPEND="${RDEPEND}
- dev-util/pkgconfig
- doc? ( app-doc/doxygen )
- netjack? ( dev-util/scons )"
-
-pkg_setup() {
- if use caps; then
- if kernel_is 2 4 ; then
- einfo "will build jackstart for 2.4 kernel"
- else
- einfo "using compatibility symlink for jackstart"
- fi
- fi
-
- if use netjack; then
- einfo "including support for experimental netjack, see http://netjack.sourceforge.net/";
- fi
-}
-
-src_unpack() {
- unpack ${A}
-
- cd "${S}"
- epatch ${FILESDIR}/${PN}-transport.patch
- # jack transport patch from Torben Hohn
- epatch "${FILESDIR}/jack-transport-start-at-zero-fix.diff"
- # more fixes
- epatch "${FILESDIR}/${PN}-0.103.0-riceitdown.patch"
- epatch "${FILESDIR}/${PN}-0.103.0-ppc64fix.patch"
-
- # dbus patches from Nedko Arnaudov
- if use dbus; then
- UNIPATCH_LIST="${DISTDIR}/${JACKDBUS}"
- unipatch
- fi
-
- sed -i -e "s:include/nptl/:include/:g" configure.ac || die
- eautoreconf
-}
-
-src_compile() {
- local myconf
-
- sed -i "s/^CFLAGS=\$JACK_CFLAGS/CFLAGS=\"\$JACK_CFLAGS $(get-flag -march)\"/" configure
-
- use doc && myconf="--with-html-dir=/usr/share/doc/${PF}"
-
- if use jack-tmpfs; then
- myconf="${myconf} --with-default-tmpdir=/dev/shm"
- else
- 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 [[ ${CHOST} == *-darwin* ]] ; then
- append-flags -fno-common
- use altivec && append-flags -force_cpusubtype_ALL \
- -maltivec -mabi=altivec -mhard-float -mpowerpc-gfxopt
- fi
-
- # CPU Detection (dynsimd) uses asm routines which requires 3dnow, mmx and sse.
- # Also, without -O2 it will not compile as well.
- # we test if it is present before enabling the configure flag.
- if use cpudetection ; then
- if (! grep 3dnow /proc/cpuinfo >/dev/null) ; then
- ewarn "Can't build cpudetection (dynsimd) without cpu 3dnow support. see bug #136565."
- elif (! grep sse /proc/cpuinfo >/dev/null) ; then
- ewarn "Can't build cpudetection (dynsimd) without cpu sse support. see bug #136565."
- elif (! grep mmx /proc/cpuinfo >/dev/null) ; then
- ewarn "Can't build cpudetection (dynsimd) without cpu mmx support. see bug #136565."
- else
- einfo "Enabling cpudetection (dynsimd). Adding -mmmx, -msse, -m3dnow and -O2 to CFLAGS."
- myconf="${myconf} --enable-dynsimd"
-
- filter-flags -O*
- append-flags -mmmx -msse -m3dnow -O2
- fi
- fi
-
- econf \
- $(use_enable freebob) \
- $(use_enable altivec) \
- $(use_enable alsa) \
- $(use_enable caps capabilities) $(use_enable caps stripped-jackd) \
- $(use_enable coreaudio) \
- $(use_enable debug) \
- $(use_enable doc html-docs) \
- $(use_enable mmx) \
- $(use_enable oss) \
- $(use_enable portaudio) \
- $(use_enable sse) \
- $(use_enable 3dnow dynsimd) \
- --disable-dependency-tracking \
- ${myconf} || die "configure failed"
- emake || die "compilation failed"
-
- if use caps && kernel_is 2 4 ; then
- einfo "Building jackstart for 2.4 kernel"
- cd "${S}"/jackd
- emake jackstart || die "jackstart build failed."
- fi
-
- if use netjack; then
- cd "${WORKDIR}/${NETJACK}"
- scons jack_source_dir="${S}"
- fi
-
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "install failed"
-
- if use caps; then
- if kernel_is 2 4 ; then
- cd "${S}/jackd"
- dobin jackstart
- else
- dosym /usr/bin/jackd /usr/bin/jackstart
- fi
- fi
-
- if ! use jack-tmpfs; then
- keepdir /var/run/jack
- chmod 4777 ${D}/var/run/jack
- fi
-
- if use doc; then
- mv ${D}/usr/share/doc/${PF}/reference/html \
- ${D}/usr/share/doc/${PF}/
-
- insinto /usr/share/doc/${PF}
- doins -r "${S}/example-clients"
- else
- rm -rf ${D}/usr/share/doc
- fi
-
- rm -rf ${D}/usr/share/doc/${PF}/reference
-
- if use netjack; then
- cd "${WORKDIR}/${NETJACK}"
- dobin alsa_in
- dobin alsa_out
- dobin jacknet_client
- insinto /usr/$(get_libdir)/jack
- doins jack_net.so
- fi
-}
Modified: trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.116.1.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.116.1.ebuild 2008-12-16 00:19:26 UTC (rev 1396)
+++ trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.116.1.ebuild 2008-12-16 11:56:17 UTC (rev 1397)
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-inherit flag-o-matic eutils multilib linux-info autotools
+inherit flag-o-matic eutils multilib autotools
DESCRIPTION="A low-latency audio server"
HOMEPAGE="http://www.jackaudio.org";
@@ -11,15 +11,13 @@
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="3dnow altivec alsa caps celt coreaudio cpudetection dbus doc debug ieee1394 jack-tmpfs mmx netjack oss portaudio sse freebob"
+IUSE="3dnow altivec alsa celt coreaudio cpudetection dbus doc debug examples ieee1394 mmx netjack oss sse freebob"
RDEPEND="
>=media-libs/libsndfile-1.0.0
sys-libs/ncurses
- caps? ( sys-libs/libcap )
celt? ( >=media-libs/celt-0.5.0 )
dbus? ( sys-apps/dbus )
- portaudio? ( =media-libs/portaudio-18* )
alsa? ( >=media-libs/alsa-lib-0.9.1 )
freebob? ( sys-libs/libfreebob )
ieee1394? ( media-libs/libffado )
@@ -28,17 +26,6 @@
dev-util/pkgconfig
doc? ( app-doc/doxygen )"
-pkg_setup() {
- if use caps; then
- if kernel_is 2 4 ; then
- einfo "will build jackstart for 2.4 kernel"
- else
- ewarn "USE=\"caps\" is unneded on Linux 2.6 kernels!"
- einfo "Anyways, compiling it and using compatibility symlink for jackstart"
- fi
- fi
-}
-
src_unpack() {
unpack ${A}
cd "${S}"
@@ -55,91 +42,41 @@
# installed
local myconf="--with-html-dir=/usr/share/doc/${PF}"
- if use jack-tmpfs; then
- myconf="${myconf} --with-default-tmpdir=/dev/shm"
- else
- 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 [[ ${CHOST} == *-darwin* ]] ; then
- append-flags -fno-common
- use altivec && append-flags -force_cpusubtype_ALL \
- -maltivec -mabi=altivec -mhard-float -mpowerpc-gfxopt
- fi
-
# CPU Detection (dynsimd) uses asm routines which requires 3dnow, mmx and sse.
- # Also, without -O2 it will not compile as well.
- # we test if it is present before enabling the configure flag.
- if use cpudetection ; then
- if (! grep 3dnow /proc/cpuinfo >/dev/null) ; then
- ewarn "Can't build cpudetection (dynsimd) without cpu 3dnow support. see bug #136565."
- elif (! grep sse /proc/cpuinfo >/dev/null) ; then
- ewarn "Can't build cpudetection (dynsimd) without cpu sse support. see bug #136565."
- elif (! grep mmx /proc/cpuinfo >/dev/null) ; then
- ewarn "Can't build cpudetection (dynsimd) without cpu mmx support. see bug #136565."
- else
- einfo "Enabling cpudetection (dynsimd). Adding -mmmx, -msse, -m3dnow and -O2 to CFLAGS."
- myconf="${myconf} --enable-dynsimd"
-
- filter-flags -O*
- append-flags -mmmx -msse -m3dnow -O2
- fi
+ if use cpudetection && use 3dnow && use mmx && use sse ; then
+ einfo "Enabling cpudetection (dynsimd). Adding -mmmx, -msse, -m3dnow and -O2 to CFLAGS."
+ myconf="${myconf} --enable-dynsimd"
+ append-flags -mmmx -msse -m3dnow -O2
fi
+ use doc || export ac_cv_prog_HAVE_DOXYGEN=false
+
econf \
$(use_enable freebob) \
$(use_enable ieee1394 firewire) \
$(use_enable altivec) \
$(use_enable alsa) \
- $(use_enable caps capabilities) $(use_enable caps stripped-jackd) \
$(use_enable coreaudio) \
$(use_enable debug) \
$(use_enable mmx) \
$(use_enable oss) \
- $(use_enable portaudio) \
$(use_enable sse) \
- $(use_enable 3dnow dynsimd) \
--disable-dependency-tracking \
+ --with-default-tmpdir=/dev/shm \
${myconf} || die "configure failed"
emake || die "compilation failed"
-
- if use caps && kernel_is 2 4 ; then
- einfo "Building jackstart for 2.4 kernel"
- cd "${S}"/jackd
- emake jackstart || die "jackstart build failed."
- fi
}
src_install() {
emake DESTDIR="${D}" install || die "install failed"
+ dodoc AUTHORS TODO README
- if use caps; then
- if kernel_is 2 4 ; then
- cd "${S}/jackd"
- dobin jackstart
- else
- dosym /usr/bin/jackd /usr/bin/jackstart
- fi
- fi
-
- if ! use jack-tmpfs; then
- keepdir /var/run/jack
- chmod 4777 ${D}/var/run/jack
- fi
-
- if use doc; then
- mv ${D}/usr/share/doc/${PF}/reference/html \
- ${D}/usr/share/doc/${PF}/
-
+ if use examples; then
insinto /usr/share/doc/${PF}
doins -r "${S}/example-clients"
- else
- rm -rf ${D}/usr/share/doc
fi
-
- rm -rf ${D}/usr/share/doc/${PF}/reference
}
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-12-16 00:19:26 UTC (rev 1396)
+++ trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-9999.ebuild 2008-12-16 11:56:17 UTC (rev 1397)
@@ -19,22 +19,18 @@
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
KEYWORDS=""
-IUSE="3dnow altivec alsa caps celt coreaudio cpudetection doc debug jack-tmpfs
-mmx oss portaudio sse netjack freebob ieee1394 jackdmp"
+IUSE="3dnow altivec alsa celt coreaudio cpudetection doc debug examples mmx oss sse netjack freebob ieee1394 jackdmp"
RDEPEND="!jackdmp? (
>=media-libs/libsndfile-1.0.0
sys-libs/ncurses
- caps? ( sys-libs/libcap )
celt? ( >=media-libs/celt-0.5.0 )
- portaudio? ( =media-libs/portaudio-18* )
alsa? ( >=media-libs/alsa-lib-0.9.1 )
- dbus? ( sys-apps/dbus
- dev-python/dbus-python )
freebob? ( sys-libs/libfreebob !media-libs/libffado )
ieee1394? ( media-libs/libffado !sys-libs/libfreebob )
netjack? ( media-libs/libsamplerate )
!media-sound/jackdmp )"
+ #dbus? ( sys-apps/dbus )
DEPEND="${RDEPEND}
!jackdmp? (
@@ -51,15 +47,6 @@
sleep 3
return # no more to do
fi
-
- if use caps; then
- if kernel_is 2 4 ; then
- einfo "will build jackstart for 2.4 kernel"
- else
- ewarn "USE=\"caps\" is unneded on Linux 2.6 kernels!"
- einfo "Anyways, compiling it and using compatibility symlink for jackstart"
- fi
- fi
}
src_unpack() {
@@ -88,64 +75,33 @@
local myconf="--with-html-dir=/usr/share/doc/${PF}"
- if use jack-tmpfs; then
- myconf="${myconf} --with-default-tmpdir=/dev/shm"
- else
- 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 [[ ${CHOST} == *-darwin* ]] ; then
- append-flags -fno-common
- use altivec && append-flags -force_cpusubtype_ALL \
- -maltivec -mabi=altivec -mhard-float -mpowerpc-gfxopt
- fi
-
# CPU Detection (dynsimd) uses asm routines which requires 3dnow, mmx and sse.
- # Also, without -O2 it will not compile as well.
- # we test if it is present before enabling the configure flag.
- if use cpudetection ; then
- if (! grep 3dnow /proc/cpuinfo >/dev/null) ; then
- ewarn "Can't build cpudetection (dynsimd) without cpu 3dnow support. see bug #136565."
- elif (! grep sse /proc/cpuinfo >/dev/null) ; then
- ewarn "Can't build cpudetection (dynsimd) without cpu sse support. see bug #136565."
- elif (! grep mmx /proc/cpuinfo >/dev/null) ; then
- ewarn "Can't build cpudetection (dynsimd) without cpu mmx support. see bug #136565."
- else
- einfo "Enabling cpudetection (dynsimd). Adding -mmmx, -msse, -m3dnow and -O2 to CFLAGS."
- myconf="${myconf} --enable-dynsimd"
-
- filter-flags -O*
- append-flags -mmmx -msse -m3dnow -O2
- fi
+ if use cpudetection && use 3dnow && use mmx && use sse ; then
+ einfo "Enabling cpudetection (dynsimd). Adding -mmmx, -msse, -m3dnow and -O2 to CFLAGS."
+ myconf="${myconf} --enable-dynsimd"
+ append-flags -mmmx -msse -m3dnow -O2
fi
+
+ use doc || export ac_cv_prog_HAVE_DOXYGEN=false
econf \
$(use_enable ieee1394 firewire) \
$(use_enable freebob) \
$(use_enable altivec) \
$(use_enable alsa) \
- $(use_enable caps capabilities) $(use_enable caps stripped-jackd) \
$(use_enable coreaudio) \
$(use_enable debug) \
- $(use_enable doc html-docs) \
$(use_enable mmx) \
$(use_enable oss) \
- $(use_enable portaudio) \
$(use_enable sse) \
- $(use_enable 3dnow dynsimd) \
--disable-dependency-tracking \
+ --with-default-tmpdir=/dev/shm \
${myconf} || die "configure failed"
emake || die "compilation failed"
-
- if use caps && kernel_is 2 4 ; then
- einfo "Building jackstart for 2.4 kernel"
- cd "${S}"/jackd
- emake jackstart || die "jackstart build failed."
- fi
}
src_install() {
@@ -155,30 +111,10 @@
fi
emake DESTDIR="${D}" install || die "install failed"
+ dodoc AUTHORS TODO README
- if use caps; then
- if kernel_is 2 4 ; then
- cd "${S}/jackd"
- dobin jackstart
- else
- dosym /usr/bin/jackd /usr/bin/jackstart
- fi
- fi
-
- if ! use jack-tmpfs; then
- keepdir /var/run/jack
- chmod 4777 ${D}/var/run/jack
- fi
-
- if use doc; then
- mv ${D}/usr/share/doc/${PF}/reference/html \
- ${D}/usr/share/doc/${PF}/
-
+ if use examples; then
insinto /usr/share/doc/${PF}
doins -r "${S}/example-clients"
- else
- rm -rf ${D}/usr/share/doc
fi
-
- rm -rf ${D}/usr/share/doc/${PF}/reference
}