From 69b8872434ee02448dffaae9b3d1708ff01d7e54 Mon Sep 17 00:00:00 2001 From: Eldad Zack Date: Sun, 8 Oct 2006 03:01:56 +0000 Subject: [PATCH] Version bump, added cpudetection useflag (see bug #136565). Package-Manager: portage-2.1.2_pre2-r5 --- .../jack-audio-connection-kit/ChangeLog | 9 +- .../jack-audio-connection-kit/Manifest | 30 ++-- .../digest-jack-audio-connection-kit-0.102.20 | 6 + ...ack-audio-connection-kit-0.101.1-r1.ebuild | 17 +- .../jack-audio-connection-kit-0.102.20.ebuild | 155 ++++++++++++++++++ 5 files changed, 202 insertions(+), 15 deletions(-) create mode 100644 media-sound/jack-audio-connection-kit/files/digest-jack-audio-connection-kit-0.102.20 create mode 100644 media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.102.20.ebuild diff --git a/media-sound/jack-audio-connection-kit/ChangeLog b/media-sound/jack-audio-connection-kit/ChangeLog index f1c37a6f1c55..0f45132bbc63 100644 --- a/media-sound/jack-audio-connection-kit/ChangeLog +++ b/media-sound/jack-audio-connection-kit/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-sound/jack-audio-connection-kit # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/jack-audio-connection-kit/ChangeLog,v 1.75 2006/10/08 01:59:09 eldad Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/jack-audio-connection-kit/ChangeLog,v 1.76 2006/10/08 03:01:56 eldad Exp $ + +*jack-audio-connection-kit-0.102.20 (08 Oct 2006) + + 08 Oct 2006; Eldad Zack + jack-audio-connection-kit-0.101.1-r1.ebuild, + +jack-audio-connection-kit-0.102.20.ebuild: + Version bump, added cpudetection useflag (see bug #136565). 08 Oct 2006; Eldad Zack -jack-audio-connection-kit-0.100.7-r2.ebuild, diff --git a/media-sound/jack-audio-connection-kit/Manifest b/media-sound/jack-audio-connection-kit/Manifest index 6dadcd020626..6a7b78ff894c 100644 --- a/media-sound/jack-audio-connection-kit/Manifest +++ b/media-sound/jack-audio-connection-kit/Manifest @@ -34,12 +34,17 @@ MD5 8e9c72734364a9d7e4a6d781e13beec8 files/jack-audio-connection-kit-transport.p RMD160 7b7130dd922ed14988eb591059d643ece39f6757 files/jack-audio-connection-kit-transport.patch 309 SHA256 74f1d155f365deb1461d070b37ccd7836c32c521d31960a3f4e6c3f2e528bada files/jack-audio-connection-kit-transport.patch 309 DIST jack-audio-connection-kit-0.101.1.tar.gz 724598 RMD160 54bcb565419f032715a90ff79b056003e2fe7fef SHA1 0cd4c82402c944df83bad7110128020dad4772bc SHA256 4f0e89a83aaaf5b125389135ee4f321b22ffef19003749c138eb54974e2f5533 +DIST jack-audio-connection-kit-0.102.20.tar.gz 761792 RMD160 5a343fa8c54f629418f3e21165870d7e8a75a4a6 SHA1 97255192331f1189a9879d78b1aecbb42468dcf2 SHA256 e4506a9f46cd6fa4896e76482f17b7bddeeda3eb35add176d6db479e5c4f8530 DIST jack-audio-connection-kit-0.99.0.tar.gz 722399 DIST netjack-0.12rc1.tar.bz2 25634 RMD160 4d41929aedb80a64964641f0de1e6a806b071015 SHA1 489b91ac0ef9e2b16c5f9698396585e566ec072e SHA256 631ffe87f3631495bde730069b2529da668ab5993d6574dafbb60e50b5b9497e -EBUILD jack-audio-connection-kit-0.101.1-r1.ebuild 3915 RMD160 65c6ef8237e92615c31f1abb421ebff419fd8cab SHA1 044eb92810c617683c545535522e5f13f879bb88 SHA256 bcb83d1c935d24a59dd19ef9bfd0d498125245182141833c232b72caa053ad39 -MD5 623289e4c28b241d0c7fe4650cee1a7e jack-audio-connection-kit-0.101.1-r1.ebuild 3915 -RMD160 65c6ef8237e92615c31f1abb421ebff419fd8cab jack-audio-connection-kit-0.101.1-r1.ebuild 3915 -SHA256 bcb83d1c935d24a59dd19ef9bfd0d498125245182141833c232b72caa053ad39 jack-audio-connection-kit-0.101.1-r1.ebuild 3915 +EBUILD jack-audio-connection-kit-0.101.1-r1.ebuild 4300 RMD160 4a32979fa2b3f3525400c6d09c85e76f8c472907 SHA1 ca104b6948905ffcd8d19126699708a10f6446b1 SHA256 2900e7cc982181a2d6134d5be6d4b9d56b2aeb8d050a5c0efcf3f91fcb2b8bca +MD5 980a1293189c3bb5173e800a0e4b2bf0 jack-audio-connection-kit-0.101.1-r1.ebuild 4300 +RMD160 4a32979fa2b3f3525400c6d09c85e76f8c472907 jack-audio-connection-kit-0.101.1-r1.ebuild 4300 +SHA256 2900e7cc982181a2d6134d5be6d4b9d56b2aeb8d050a5c0efcf3f91fcb2b8bca jack-audio-connection-kit-0.101.1-r1.ebuild 4300 +EBUILD jack-audio-connection-kit-0.102.20.ebuild 3909 RMD160 b92dded1b23e100de7449c3b85f853dbf5d10f17 SHA1 1c49d9a1dac6cea2b295892158bb59a90af985a8 SHA256 a1bdffee5a8421f3ee660f152703b3e8e6a02de855c26a5c8bb383a200cfcf2f +MD5 2cb27455f556ed627ed61fefc3753cc0 jack-audio-connection-kit-0.102.20.ebuild 3909 +RMD160 b92dded1b23e100de7449c3b85f853dbf5d10f17 jack-audio-connection-kit-0.102.20.ebuild 3909 +SHA256 a1bdffee5a8421f3ee660f152703b3e8e6a02de855c26a5c8bb383a200cfcf2f jack-audio-connection-kit-0.102.20.ebuild 3909 EBUILD jack-audio-connection-kit-0.99.0-r1.ebuild 2164 RMD160 e5a3b41c07889666058d30e4d7defed1eaa21d1e SHA1 3569f8790ced89ab65bd51e564090700373a82d8 SHA256 55038c72d39440d099aa59ea867388100c3412bf8062784922d97c88cc2108c6 MD5 bf3a20e6745f25d827cdb826b19e2031 jack-audio-connection-kit-0.99.0-r1.ebuild 2164 RMD160 e5a3b41c07889666058d30e4d7defed1eaa21d1e jack-audio-connection-kit-0.99.0-r1.ebuild 2164 @@ -52,10 +57,10 @@ EBUILD jack-audio-connection-kit-0.99.0-r3.ebuild 2271 RMD160 ea8ec47268d472e2d9 MD5 3169635fb6706e22dde19c9dfdfd5ec7 jack-audio-connection-kit-0.99.0-r3.ebuild 2271 RMD160 ea8ec47268d472e2d9e9b7af39714f59e3dfc428 jack-audio-connection-kit-0.99.0-r3.ebuild 2271 SHA256 5ce1a5fad4a8c2a47a2bb9358be569ef5ba2c41b01835d4777af51ecab36e28b jack-audio-connection-kit-0.99.0-r3.ebuild 2271 -MISC ChangeLog 15292 RMD160 1ddc2b7ce705f012f72aa8a8742b4834a6bc8057 SHA1 40b0fce911c9511327260827fbfa16d080d9800f SHA256 f3692ab2657ec9b79f3b1b3f9471314da6772d5d3c607982e44fcf472e44e9c3 -MD5 394d168a8f0a65f019440f4d1fda27b3 ChangeLog 15292 -RMD160 1ddc2b7ce705f012f72aa8a8742b4834a6bc8057 ChangeLog 15292 -SHA256 f3692ab2657ec9b79f3b1b3f9471314da6772d5d3c607982e44fcf472e44e9c3 ChangeLog 15292 +MISC ChangeLog 15544 RMD160 6c053afce1be96e3edf3c5ab1fa869612f44147a SHA1 a67eb8d375e81d555dfc3d32622449a3368c6876 SHA256 5ca2710f2c28c82e52ec87ae08c6cb006b1804e3c50f558fd8c50c678310cd95 +MD5 918d1e6edd4d35a0fd558752a68b3921 ChangeLog 15544 +RMD160 6c053afce1be96e3edf3c5ab1fa869612f44147a ChangeLog 15544 +SHA256 5ca2710f2c28c82e52ec87ae08c6cb006b1804e3c50f558fd8c50c678310cd95 ChangeLog 15544 MISC metadata.xml 219 RMD160 7c971450acee367dfd576743077328e522a982dc SHA1 ec1d8eab4fee11c2086a21084b524d469e6d0cfa SHA256 dd0469dcffd4d616ef0e4ec7ef32c671b34dedc3c3a7cb483f51ee83e595e5e7 MD5 3103176adc3a8955e78da40e62e109a9 metadata.xml 219 RMD160 7c971450acee367dfd576743077328e522a982dc metadata.xml 219 @@ -63,6 +68,9 @@ SHA256 dd0469dcffd4d616ef0e4ec7ef32c671b34dedc3c3a7cb483f51ee83e595e5e7 metadata MD5 30000081e16205caa955f5985c5608a6 files/digest-jack-audio-connection-kit-0.101.1-r1 548 RMD160 3c71125a686b8a1ff2bcfbf31c92cf4fb7dcf282 files/digest-jack-audio-connection-kit-0.101.1-r1 548 SHA256 d2578952da3c148173e19902d72835c0df6ee99802dc60dc753e9a4253bb519d files/digest-jack-audio-connection-kit-0.101.1-r1 548 +MD5 aa324e5998889b467b6d99edc3494c9e files/digest-jack-audio-connection-kit-0.102.20 551 +RMD160 c4de433dd2efd446192d70adb4ddbcb868bc9ce0 files/digest-jack-audio-connection-kit-0.102.20 551 +SHA256 ff89e6dbbfa8b33de1e1fc1d1abc83a60d257a8c7daa7268469fd026974e897f files/digest-jack-audio-connection-kit-0.102.20 551 MD5 e1e0561e8f67b2f527014a57f5eb7a05 files/digest-jack-audio-connection-kit-0.99.0-r1 84 RMD160 50b3c2bd1e9091937b776dbac651947ae1aa50c4 files/digest-jack-audio-connection-kit-0.99.0-r1 84 SHA256 488972326ad883aaff81ae045429f986515c0db45bc90c91a22f2e279d940eef files/digest-jack-audio-connection-kit-0.99.0-r1 84 @@ -75,7 +83,7 @@ SHA256 488972326ad883aaff81ae045429f986515c0db45bc90c91a22f2e279d940eef files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux) -iD8DBQFFKFuBT+MN7JbqCpMRAvTTAKCEYLBh3lv+oF1a9TyG34JWvKoivgCcCvfy -TGkdRqsIYR24ShptuNf7HM8= -=NfWX +iD8DBQFFKGpBT+MN7JbqCpMRAp0xAJ4+lMTUi5KZ2/KfLRlGhHlOYCy2iQCff/Bs +EBYDlYDTzEnpdYKoGa2wFWY= +=hntE -----END PGP SIGNATURE----- diff --git a/media-sound/jack-audio-connection-kit/files/digest-jack-audio-connection-kit-0.102.20 b/media-sound/jack-audio-connection-kit/files/digest-jack-audio-connection-kit-0.102.20 new file mode 100644 index 000000000000..6248a6fc8f25 --- /dev/null +++ b/media-sound/jack-audio-connection-kit/files/digest-jack-audio-connection-kit-0.102.20 @@ -0,0 +1,6 @@ +MD5 d6881555a8b4c923b4ec706832f0d776 jack-audio-connection-kit-0.102.20.tar.gz 761792 +RMD160 5a343fa8c54f629418f3e21165870d7e8a75a4a6 jack-audio-connection-kit-0.102.20.tar.gz 761792 +SHA256 e4506a9f46cd6fa4896e76482f17b7bddeeda3eb35add176d6db479e5c4f8530 jack-audio-connection-kit-0.102.20.tar.gz 761792 +MD5 0f09c9f641609c71ca24a3b9b337a017 netjack-0.12rc1.tar.bz2 25634 +RMD160 4d41929aedb80a64964641f0de1e6a806b071015 netjack-0.12rc1.tar.bz2 25634 +SHA256 631ffe87f3631495bde730069b2529da668ab5993d6574dafbb60e50b5b9497e netjack-0.12rc1.tar.bz2 25634 diff --git a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.101.1-r1.ebuild b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.101.1-r1.ebuild index acc31d1d4bfa..8d34b6c19d23 100644 --- a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.101.1-r1.ebuild +++ b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.101.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # 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.101.1-r1.ebuild,v 1.3 2006/08/12 15:00:43 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.101.1-r1.ebuild,v 1.4 2006/10/08 03:01:56 eldad Exp $ inherit flag-o-matic eutils multilib @@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/jackit/${P}.tar.gz http://netjack.sourceforge.net/ LICENSE="GPL-2 LGPL-2.1" SLOT="0" KEYWORDS="~amd64 ~arm ~ppc ~ppc-macos ~ppc64 ~sh ~sparc ~x86" -IUSE="altivec alsa caps coreaudio doc debug jack-tmpfs mmx oss portaudio sndfile sse netjack" +IUSE="altivec alsa caps coreaudio doc debug jack-tmpfs mmx oss portaudio sndfile sse netjack cpudetection" RDEPEND="dev-util/pkgconfig sndfile? ( >=media-libs/libsndfile-1.0.0 ) @@ -85,6 +85,17 @@ src_compile() { -maltivec -mabi=altivec -mhard-float -mpowerpc-gfxopt fi + # CPU Detection (dynsimd) uses asm routines which requires 3dnow. + # 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." + else + einfo "Enabling cpudetection (dynsimd)" + myconf="${myconf} --enable-dynsimd" + fi + fi + use sndfile && \ export SNDFILE_CFLAGS="-I/usr/include" \ export SNDFILE_LIBS="-L/usr/$(get_libdir) -lsndfile" @@ -99,7 +110,7 @@ src_compile() { $(use_enable mmx) \ $(use_enable oss) \ $(use_enable portaudio) \ - $(use_enable sse) $(use_enable sse dynsimd) \ + $(use_enable sse) \ --with-pic \ ${myconf} || die "configure failed" emake || die "compilation failed" diff --git a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.102.20.ebuild b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.102.20.ebuild new file mode 100644 index 000000000000..927970e7a413 --- /dev/null +++ b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.102.20.ebuild @@ -0,0 +1,155 @@ +# Copyright 1999-2006 Gentoo Foundation +# 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.102.20.ebuild,v 1.1 2006/10/08 03:01:56 eldad Exp $ + +inherit flag-o-matic eutils multilib + +NETJACK=netjack-0.12rc1 + +DESCRIPTION="A low-latency audio server" +HOMEPAGE="http://www.jackaudio.org" +SRC_URI="mirror://sourceforge/jackit/${P}.tar.gz http://netjack.sourceforge.net/${NETJACK}.tar.bz2" + +LICENSE="GPL-2 LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ppc ~ppc-macos ~ppc64 ~sh ~sparc ~x86" +IUSE="altivec alsa caps coreaudio doc debug jack-tmpfs mmx oss portaudio sndfile sse netjack cpudetection" + +RDEPEND="dev-util/pkgconfig + sndfile? ( >=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 ) + !media-sound/jack-cvs" + +DEPEND="${RDEPEND} + doc? ( app-doc/doxygen ) + netjack? ( dev-util/scons )" + +pkg_setup() { + if ! use sndfile ; then + ewarn "sndfile not in USE flags. jack_rec will not be installed!" + fi + + if use caps; then + if [[ "${KV:0:3}" == "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} + use netjack && unpack ${NETJACK}.tar.bz2 + cd ${S} + + epatch ${FILESDIR}/${PN}-transport.patch +} + +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 userland_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. + # 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." + else + einfo "Enabling cpudetection (dynsimd)" + myconf="${myconf} --enable-dynsimd" + fi + fi + + use sndfile && \ + export SNDFILE_CFLAGS="-I/usr/include" \ + export SNDFILE_LIBS="-L/usr/$(get_libdir) -lsndfile" + + econf \ + $(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) \ + --with-pic \ + ${myconf} || die "configure failed" + emake || die "compilation failed" + + if use caps && [[ "${KV:0:3}" == "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() { + make DESTDIR=${D} datadir=/usr/share/doc install || die + + if use caps; then + if [[ "${KV:0:3}" == "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/lib/jack + doins jack_net.so + fi +} -- 2.26.2