Revision: 2936
Author: lilrc
Date: 2015-04-09 19:39:34 +0200 (Thu, 09 Apr 2015)
Log Message:
-----------
media-sound/jack-audio-connection-kit: multiple fixes and improvements, refer
to ChangeLog
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-1.9.10.ebuild
trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-1.9999.ebuild
trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-2.9999.ebuild
trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/metadata.xml
Added Paths:
-----------
trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.121.3-r2.ebuild
trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.124.1.ebuild
Removed Paths:
-------------
trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/files/jack-audio-connection-kit-0.121.3-respect-march.patch
trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/files/jack-audio-connection-kit-2.9999-link-fix.patch
trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.121.3-r1.ebuild
trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.121.3-r2.ebuild
trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.121.3.ebuild
trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-1.9999-r1.ebuild
Modified:
trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/ChangeLog
2015-04-05 16:47:44 UTC (rev 2935)
+++ trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/ChangeLog
2015-04-09 17:39:34 UTC (rev 2936)
@@ -1,7 +1,45 @@
# ChangeLog for media-sound/jack-audio-connection-kit
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*jack-audio-connection-kit-0.124.1 (09 Apr 2015)
+
+ 09 Apr 2015; Karl Linden (lilrc) <[email protected]>
+ -jack-audio-connection-kit-0.121.3.ebuild,
+ -jack-audio-connection-kit-0.121.3-r1.ebuild,
+ -jack-audio-connection-kit-0.121.3-r2.ebuild,
+ +jack-audio-connection-kit-0.124.1.ebuild,
+ jack-audio-connection-kit-1.9.10.ebuild,
+ jack-audio-connection-kit-1.9999.ebuild,
+ -jack-audio-connection-kit-1.9999-r1.ebuild,
+ jack-audio-connection-kit-2.9999.ebuild,
+ -files/jack-audio-connection-kit-0.121.3-respect-march.patch,
+ -files/jack-audio-connection-kit-2.9999-link-fix.patch, metadata.xml:
+ migrate to cpu_flags_x86_* (repoman payment)
+ move to git-r3
+ slot-depend where possible (repoman payment)
+ drop blocker on old non-existing emul-linux-x86-soundlibs
+ make ebuilds more similar to ease maintenance
+ version bump to 0.124.1
+ remove old ebuilds
+ remove revisioned live ebuilds
+ drop march patch
+ remove old fix link patch
+ jack1 fixes
+ drop netjack use flag
+ depend on sys-libs/db
+ depend on readline insted of ncurses
+ also depend on expat and PYTHON_DEPS if dbus enabled
+ replace warning with REQUIRED_USE
+ unconditionally pass --disable-mmx and --disable-sse since no conditional
+ assembly is toggled
+ use REQUIRED_USE for cpudetection
+ never ever pass --enable-optimize
+ install docs
+ jack2 fixes
+ PYTHON_REQ_USE="threads(+)" as required by waf-utils.eclass
+ drop version specifiers for libsdnfile
+
*jack-audio-connection-kit-1.9.10 (26 Nov 2014)
26 Nov 2014; Karl Linden (lilrc) <[email protected]>
Modified: trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/Manifest
2015-04-05 16:47:44 UTC (rev 2935)
+++ trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/Manifest
2015-04-09 17:39:34 UTC (rev 2936)
@@ -1,16 +1,13 @@
-AUX jack-audio-connection-kit-0.121.3-respect-march.patch 851 SHA256
c6672bf67344e504bbcd89a9d225859b27f2c881a215b4141320a0ebdcae0ef8 SHA512
6e32c54b621a497a9ac60ce47f93552d1fcfca4dd04cc8aee84ec944119cd2d1c5af247b1d0fd49a529a57fd88890fd7330a3339c385f6487aba7887590ae4b3
WHIRLPOOL
af42755267e038d6d5bdadbc84ab473f518cefd80d124a04803bd583d52f08dfe3e3e8c10e66402a195904acad95a06e4ad7ea8a283f23003d1603e981aa16e0
-AUX jack-audio-connection-kit-2.9999-link-fix.patch 383 SHA256
32bdd416a1fb6586c361967c4095f75155c71c6bdc99a590b302e96c8e7690f9 SHA512
7c338195d67e6d6d412d6cd5f604a5e0254cdb5df192e874460965e9d61817f19e700ce2ae2a5f046d2b8c14b3b003e3dc8657f26511237ccc856fe2a06c3184
WHIRLPOOL
81f4894606f5876f186c6738bf8d6999b16b414bc6d294e0a0a52af517f5f16cce6646232c9efd1b24fe26de1534528e23d67ddb28298bee3be87fd56e002fbc
AUX jack-audio-connection-kit-freebsd.patch 496 SHA256
7834f5ec198f8e69e2ac119fc2c4ee349ed7e38d003e473fcb41257e7b605df8 SHA512
7c0cf60ddd3d07e12e036082ab10299308d1e112c6190d008a739ab0374c8ecf9e2dcb703055a58f8098e5187044e2351a1786271cecdeae23cbed72e6d68cd6
WHIRLPOOL
3d11baf0f4ebe0613c378d79efcb6b81f94c28e9070471b9a496dda5f0ba90a2eac1e789a621d7ec5d109f018a7f67b0adbd53bbce9e059f3e18b04ca4fb7cd1
AUX jack-audio-connection-kit-sparc-cpuinfo.patch 659 SHA256
256d48109d32ce8af89042401508392fbb90c499d4cf8b056104dc1a47522fe5 SHA512
c5964413c99fb1dd20dfe52dd40f857dab1cef123b26f74500e2f5607eda870b563595d39c4e4e0684428971e7295c847253d045b2d9ba0183f358630cfa9888
WHIRLPOOL
01d88bfce0394628fab10c48a4b80f0a025b741c5785f05bd22658fd95594e472439f569a450043cf7cc53700149d0d8b785bb7adc74711474fd3f6bcbc6d66f
DIST jack-1.9.10.tar.bz2 6201921 SHA256
5bc6336e6ac9799e3cb241915e2ba5d01b030589bbb2afae39579a59ef0f2f56 SHA512
d64d233c2d626a4ae635f009a7209c2c8740c7959988d282e733b5fc663c168301a2aa2b517dff80f44cb25417aeb5ccca87da5c24616dadf38d69a6cb307e7c
WHIRLPOOL
25bf91a6351f30e3a264e672ab37418ee444cde17b3fbe8aa9c7a967b80486397dfa1a9b6000fc99bc4ea1a77d4f3a69152d7abc36528dd49e86d063687a2f34
DIST jack-audio-connection-kit-0.121.3-dbus.patch 337061 SHA256
da12003ed4528a09d8109ecc7e75f539f0173b23832a1d993800473f1f1d25fd SHA512
9be280a24d59d35bab07da75be407f0790fd36657bfb54d24522337f2a2bc15d6e8a9f88347ff3215ed3e6b32ab827c4e203f5435fefe30c456d638169524192
WHIRLPOOL
37b6a58c5103ff23e606e3dfd0b5ec2630b86f88ddb964635050555e64aa4ab687205e8e29add29659f36866d036098bb7d6128e230349adfd096c06cc641709
DIST jack-audio-connection-kit-0.121.3.tar.gz 1083545 SHA256
b7095d3deabeecd19772b37241e89c6c79de6afd6c031ba7567513cfe51beafa SHA512
57323393d5209baefe73cc0cd9a0e818b1cfd260cf9aa36cd6ad800252e22e3ddb7fc46649c54b8e840696878147c2d06c8d39fd7300b5bb92aeb69f44ed710f
WHIRLPOOL
a256cfb7c3546cb06d6003313802b02812d8da9c13671be9b0341a10442cd348a8b3f7fe65e8d27cc47b4e29ded799fa6cc0efa51d81d01f342c7c8eefbc9c55
-EBUILD jack-audio-connection-kit-0.121.3-r1.ebuild 2225 SHA256
fc3372933519603f27a794270e5a8e574822329d1ed7788b7f9d9ba57b1f6eb4 SHA512
4286c8252151cc18e5493734a4fa13cb4bf4501e6ddd023cca83e1d16e1b26f3bfc9583a1c92bd578bc58d77c799949899ca5faea64797243f13bb8dcdcd9792
WHIRLPOOL
d226ce3fc6137f7b891c8bc464f7928bd465b2e6a528ca9f9b96e59485992b38e4455ba930bb888a60a67ad7a8b808799f97a6dec6cefe0d751c8d03a8f93979
-EBUILD jack-audio-connection-kit-0.121.3-r2.ebuild 3261 SHA256
352c9037c7092a0f7157867e579ad7e23433b22799a73f2f35506659c3ad3cb7 SHA512
23756b5ab910822e1888fc2071ca8005c6a781139d41b83bb88d2e7ddc0c5166d27a55e95a6474eb9d326e2c330921ce57351cd2bdd8aef4652b6a849d6f415c
WHIRLPOOL
29ad08f196907cefb4e648c19b4babc7123c99e6eb749e9e2348cfa926c7ecb0380b9ec68c02a431cbc3be300ca75b2be812266e28d7d0cf190d97e1aee373f5
-EBUILD jack-audio-connection-kit-0.121.3.ebuild 2096 SHA256
3a7e32a387fb164f98a4560dec91c2146d84293832631ab51eb193d764f7ad70 SHA512
54d6fbd1ea9a4747fdd58bf90aecb87c80a812ff95992e0bd8ae42d0fc929d202248cd8e554f0e2d94150077e1160daf8321f733989ed687f062db40896a23a6
WHIRLPOOL
288352e28631240e9053c230e54fa572e66bc05f527dd3ffcd2ab7afb0980f296f0502999e8d8f36b38f9175520837a168d12608cff04d990615f38aa1681ea5
-EBUILD jack-audio-connection-kit-1.9.10.ebuild 2481 SHA256
5fb96e829046ae5ef60358776fe4e8929703218fb418cbbd1c76532ea047252d SHA512
93603c8b8f21bfa13c64374e63a276731c727cf4824961364b34b4611731e051d75ab32c9796ad88ff335720bc119cffaa300b7a6e43737a8ae513b2ce7a0c1b
WHIRLPOOL
a7b4f8b328390d4277d629d00dbf4856d107ce941d443af065d497df28acd0a40e742ee05f160715dc43d225648d0a1da42cab7539e1b13d3e99edab6e653534
-EBUILD jack-audio-connection-kit-1.9999-r1.ebuild 3192 SHA256
55f04dddb4ee4f352e22156c8fd161bac21ab44437a8e938ba70d9426d3c9629 SHA512
98aed5fee9f08daefe7e305acce40ed9c7ad1c7212677ad89a78866cc4bdc5791d0e63600b65744808a4fdfdb2c3bf5af13db67360ffb6e1574fe93711d2b2aa
WHIRLPOOL
6f0e9c61f6d1eef69993517b3188a1f92bc07d6c48a146beaf941f942a9c5a9bfec7ac7e6ea06899ff2077fafa025c2bd5b6385e3fd033b8c9236dbdfd03790f
-EBUILD jack-audio-connection-kit-1.9999.ebuild 2020 SHA256
dd228e41ec0cce3d3ad2d40c74d511d83afc30943230336252994624e371ebb1 SHA512
82fcf173d58794c30981ea08b5dfd69ba4f716b73cf758c8c95b041d37f8ff7305a95d1855a44a4be4676640df64538dc4ca03bf847993be6b9cb87837637ca3
WHIRLPOOL
e8e9fc2c844f253128562738aaea8c9ab771d62e41dce7e635686239a8d7afa447eead96742091256f018c52c97af7329b92935d1b35ef4b5cd236ceb5d6eb52
-EBUILD jack-audio-connection-kit-2.9999.ebuild 2481 SHA256
5fb96e829046ae5ef60358776fe4e8929703218fb418cbbd1c76532ea047252d SHA512
93603c8b8f21bfa13c64374e63a276731c727cf4824961364b34b4611731e051d75ab32c9796ad88ff335720bc119cffaa300b7a6e43737a8ae513b2ce7a0c1b
WHIRLPOOL
a7b4f8b328390d4277d629d00dbf4856d107ce941d443af065d497df28acd0a40e742ee05f160715dc43d225648d0a1da42cab7539e1b13d3e99edab6e653534
-MISC ChangeLog 15963 SHA256
feee8b2cbd975d5121df4550bcd70fc7e69e1e0c6fffcac8685f8d67af205028 SHA512
365dd5cf22a78ab63eaefdde889877e486a31498a635ac0a2df75c01f25e07651cf11ba54b101780496f9ca1d908c093940778bc68c4f51a69b695e213ba56ad
WHIRLPOOL
4e9baf417a04e886f54ed7edcc1f821aed8159332017da8fc5c85de6136bc138b537fc4d3508e61a015dee685bca6d7753f0fd953653963da3367ff19f58c056
-MISC metadata.xml 1010 SHA256
38e4d6c2c9195d1911f9c50ed85bebb861d13e2937b1a7e6ceb64bd13ac331e0 SHA512
aeb1850f2761c8fef66430e9d25518d51ba1a5813caaa98cb797c529655c9010cdf4618fa355a140286da12094210953ecee0b3eeca653dc69f0ac17c7aa3127
WHIRLPOOL
b504005f51bf9d82a32dc4296daf677e02eebbc57510d61497f2a0f4f9708ae0b1c13e39ba2b24f7bbd8d09d478d404d5bae9134ae851d8d81173ecdb26f4d77
+DIST jack-audio-connection-kit-0.124.1.tar.gz 1113456 SHA256
eb42df6065576f08feeeb60cb9355dce4eb53874534ad71534d7aa31bae561d6 SHA512
9c885da516f2ca246edba94db26c851229d063f1557ea91ec76ca57d675a510d16cc4baad5adb316cf46aaaa8b8d7579b484a53b9a803b34fc9bb34c983a8fe2
WHIRLPOOL
41232400d99a72b29a75f4d781c373a7f453c704a52b0a669cab71296574881b0a99b21b86628d02db8c3d7a64bec6a259ae1ba0a4c721867e19283139cee824
+EBUILD jack-audio-connection-kit-0.121.3-r2.ebuild 3239 SHA256
b953a066c094cdc9378883470d46fc36b2b06d11af30261b204976f539448f0c SHA512
e0d301d03cc46bfb7db58b8fe3ee8dffacdd752504c4067f3f7e0544d56d509ba4a8e99b7b136157790fe1f691e6187cf077581ad5bc5b00d47ed54c958fb33c
WHIRLPOOL
5f7d9a6faf0193665e90ed01ed64d91eacedfb933bc8d80b637f80be47726834e3961e6eb03289da20ff70ba13f4bce8dbe4cf1ddfc53e96789eb48bd34c03eb
+EBUILD jack-audio-connection-kit-0.124.1.ebuild 3660 SHA256
059cd9a9a36a6cd7ece4456aa1e562c381158f1ff515f916189986d48c9d26a7 SHA512
15da72f324c50974a5d5ef1e22a99fc59f0ec6ed2ee8606682195af22bb4d19b6681f00ce7c8b466893d19aee2a3cf348fb94a40dff7a1f36eda2a16dc277f3c
WHIRLPOOL
545ae26cfd2c25a7249e4a3647da1d1f003ebb2a79e3587f676e3d8f96d4e5b9820fc27c2ed2ea16522f28656376265a9c12ea5c51dbd20b8fa5aafba7f0f841
+EBUILD jack-audio-connection-kit-1.9.10.ebuild 2563 SHA256
74f9ba837d3bedc83303f7d92f47cade4b34ed83428556f6e6c8b721be6cb7c8 SHA512
8506fe14323a814b730f862441f64b8c448d89cfa9658d876913af3c8346bfa4209ce523e2e8fa349890e9329333bba10486b8147f8a338bd61e303b284768ce
WHIRLPOOL
bfaec16f964976432b0e9f6848f7add8890d6b344ef32ececf09902d11a99c7394a95064411d473da365376db55b75623daa31ff58525771da686bb06ba4957c
+EBUILD jack-audio-connection-kit-1.9999.ebuild 3570 SHA256
9e20b4b4a6d4ea89c579e63780a213900327a11b37fb18d082e17c6c5cb079fa SHA512
27e5ea763869df00558955901f979f7285ed2b930cd840a191b37ed9ef9b0c5903f9b3ac02bd1136899c004a1f17835980acb74c32553eb291a75edf8706e5d7
WHIRLPOOL
5f88d2e960712861de43fd0cdcf42d67b15cdc832cd829e753d12a57453b13a9028928caa525ffaf798f80c184eeab0f10717796d9b725d2cb17257d0fd8c961
+EBUILD jack-audio-connection-kit-2.9999.ebuild 2563 SHA256
74f9ba837d3bedc83303f7d92f47cade4b34ed83428556f6e6c8b721be6cb7c8 SHA512
8506fe14323a814b730f862441f64b8c448d89cfa9658d876913af3c8346bfa4209ce523e2e8fa349890e9329333bba10486b8147f8a338bd61e303b284768ce
WHIRLPOOL
bfaec16f964976432b0e9f6848f7add8890d6b344ef32ececf09902d11a99c7394a95064411d473da365376db55b75623daa31ff58525771da686bb06ba4957c
+MISC ChangeLog 17442 SHA256
bae03bb4873e0338fa04d9abfb17ea9951f28fcff184594b2c2c6cc9eba29902 SHA512
2f56360799869c2f07ce30c0529df53cb51600a5f4fc295bc1eacf6a17e0a8df0e2594afd870cbbe791314f774465b91ebb2748cc237ceed42af035a5007cc16
WHIRLPOOL
88493d5b9b2c7fed53014afe4907b30b53517cc20d9b694074e4cbb01c6552feac9ce5c4d5536b5da73bda38ba6e6b8d7df56e3da7530ea00d318e349a6c00ed
+MISC metadata.xml 893 SHA256
ee04698dfbde7b9b1141f56e518821962ef104cd27b93d6e2b8efa73e458c563 SHA512
d0d867ab465bf31e4216eb5fdd7f7cf607cf61297bf8de8def0daebacb5d0ce9ca80fed56d9ba4c0bae6b8b157d39416746749e4257a39fc70d7a046e85e8b85
WHIRLPOOL
59b8dfc4436af903ca30b11f0a96439a6558283a589ba2a6eb78fa5749cef30cd8121cc4f5a383b73ef07a22fadd3d4987b33491d9d85398a073a271bda8b47b
Deleted:
trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/files/jack-audio-connection-kit-0.121.3-respect-march.patch
===================================================================
---
trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/files/jack-audio-connection-kit-0.121.3-respect-march.patch
2015-04-05 16:47:44 UTC (rev 2935)
+++
trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/files/jack-audio-connection-kit-0.121.3-respect-march.patch
2015-04-09 17:39:34 UTC (rev 2936)
@@ -1,24 +0,0 @@
-diff -Naur jack-audio-connection-kit-0.121.3.orig/configure.ac
jack-audio-connection-kit-0.121.3/configure.ac
---- jack-audio-connection-kit-0.121.3.orig/configure.ac 2011-09-28
15:09:59.000000000 +0200
-+++ jack-audio-connection-kit-0.121.3/configure.ac 2013-03-17
20:26:24.169593017 +0100
-@@ -468,20 +468,6 @@
- dnl as the CPU type. we miss out on some possible optimizations as
- dnl a result. oh well.
- dnl
--
-- if test x$with_cpu_target != x ; then
-- JACK_OPT_CFLAGS="-march=$with_cpu_target"
-- else
-- if test "$build_cpu" = "i586"; then
-- JACK_OPT_CFLAGS="-march=i586 "
-- elif test "$build_cpu" = "i686"; then
-- JACK_OPT_CFLAGS="-march=i686"
-- elif test "$build_cpu" = "x86_64"; then
-- JACK_OPT_CFLAGS="-march=k8"
-- else
-- :
-- fi
-- fi
-
- dnl
- dnl do not add h/w specific flags if asked to let compiler
Deleted:
trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/files/jack-audio-connection-kit-2.9999-link-fix.patch
===================================================================
---
trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/files/jack-audio-connection-kit-2.9999-link-fix.patch
2015-04-05 16:47:44 UTC (rev 2935)
+++
trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/files/jack-audio-connection-kit-2.9999-link-fix.patch
2015-04-09 17:39:34 UTC (rev 2936)
@@ -1,12 +0,0 @@
-diff --git a/wscript b/wscript
-index e8d9a8b..d6d7529 100644
---- a/wscript
-+++ b/wscript
-@@ -229,6 +229,7 @@ def configure(conf):
- svnrev = m.group(1)
-
- conf.env.append_unique('LINKFLAGS', ['-lm', '-lstdc++'])
-+ conf.env.append_unique('LINKFLAGS', ['-Wl,--copy-dt-needed-entries'])
-
- if Options.options.mixed == True:
- env_variant2 = conf.env.copy()
Deleted:
trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.121.3-r1.ebuild
===================================================================
---
trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.121.3-r1.ebuild
2015-04-05 16:47:44 UTC (rev 2935)
+++
trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.121.3-r1.ebuild
2015-04-09 17:39:34 UTC (rev 2936)
@@ -1,87 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-
-AUTOTOOLS_AUTORECONF="1"
-PYTHON_COMPAT=( python2_7 )
-inherit autotools-utils eutils flag-o-matic python-single-r1
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="mirror"
-DESCRIPTION="A low-latency audio server"
-HOMEPAGE="http://www.jackaudio.org";
-SRC_URI="http://www.jackaudio.org/downloads/${P}.tar.gz
- http://nedko.arnaudov.name/soft/jack/dbus/${P}-dbus.patch";
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="3dnow alsa altivec coreaudio cpudetection dbus debug doc examples
freebob ieee1394 mmx oss pam sse"
-
-RDEPEND="media-libs/libsamplerate
- >=media-libs/libsndfile-1.0.0
- sys-libs/ncurses
- alsa? ( >=media-libs/alsa-lib-1.0.18 )
- dbus? ( sys-apps/dbus )
- freebob? ( sys-libs/libfreebob )
- ieee1394? ( media-libs/libffado )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- doc? ( app-doc/doxygen )"
-RDEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- pam? ( sys-auth/realtime-base )"
-
-PATCHES=(
- "${FILESDIR}/${PN}-sparc-cpuinfo.patch"
- "${FILESDIR}/${PN}-freebsd.patch"
- "${FILESDIR}/${P}-respect-march.patch"
- "${DISTDIR}/${P}-dbus.patch"
-)
-
-src_configure() {
- local myeconfargs=(
- $(use_enable altivec)
- $(use_enable alsa)
- $(use_enable coreaudio)
- $(use_enable dbus)
- $(use_enable debug)
- $(use_enable freebob)
- $(use_enable ieee1394 firewire)
- $(use_enable mmx)
- $(use_enable oss)
- $(use_enable sse)
- --disable-portaudio
- --with-html-dir=/usr/share/doc/${PF}
- )
-
- # CPU Detection (dynsimd) uses asm routines which requires 3dnow, mmx
and sse.
- if use cpudetection && use 3dnow && use mmx && use sse ; then
- einfo "Enabling cpudetection (dynsimd). Adding -mmmx, -msse,
-m3dnow and -O2 to CFLAGS."
- myeconfargs+=( --enable-dynsimd )
- append-flags -mmmx -msse -m3dnow -O2
- fi
-
- # Neither SSE nor MMX will be used if --enable-optimize is not given
- if use mmx || use sse; then
- myeconfargs+=( --enable-optimize )
- fi
-
- use doc || export ac_cv_prog_HAVE_DOXYGEN=false
-
- autotools-utils_src_configure
-}
-
-src_install() {
- autotools-utils_src_install
-
- if use examples; then
- insinto /usr/share/doc/${PF}
- doins -r "${S}/example-clients"
- fi
-
- python_fix_shebang "${ED}"
-}
Deleted:
trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.121.3-r2.ebuild
===================================================================
---
trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.121.3-r2.ebuild
2015-04-05 16:47:44 UTC (rev 2935)
+++
trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.121.3-r2.ebuild
2015-04-09 17:39:34 UTC (rev 2936)
@@ -1,111 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-# == THIS IS WORK IN PROGRESS ==
-# [TODO]
-# * sys-apps/dbus should be sys-apps/dbus[${MULTILIB_USEDEP}] when dbus
-# has been migrated to mulilib eclasses.
-# * When libffado has been migrated to multilib eclasses
-# media-libs/libffado should be
-# media-libs/libffado[${MULTILIB_USEDEP}]
-# [NOTE]
-# The build won't fail if dbus or ffado is requested. It will just
-# compile the 32-bit library without those features. I don't know how
-# that will work out.
-
-EAPI="5"
-
-AUTOTOOLS_AUTORECONF="1"
-PYTHON_COMPAT=( python2_7 )
-inherit autotools-multilib eutils flag-o-matic python-single-r1
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="mirror"
-DESCRIPTION="A low-latency audio server"
-HOMEPAGE="http://www.jackaudio.org";
-SRC_URI="http://www.jackaudio.org/downloads/${P}.tar.gz
- http://nedko.arnaudov.name/soft/jack/dbus/${P}-dbus.patch";
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="3dnow alsa altivec celt coreaudio cpudetection dbus debug doc examples
ieee1394 mmx oss pam sse"
-
-RDEPEND="media-libs/libsamplerate[${MULTILIB_USEDEP}]
- >=media-libs/libsndfile-1.0.0
- sys-libs/ncurses
- alsa? ( >=media-libs/alsa-lib-1.0.18[${MULTILIB_USEDEP}] )
- celt? ( media-libs/celt[${MULTILIB_USEDEP}] )
- dbus? ( sys-apps/dbus )
- ieee1394? ( media-libs/libffado )
- abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r7
-
!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- doc? ( app-doc/doxygen )"
-RDEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
- pam? ( sys-auth/realtime-base )"
-
-PATCHES=(
- "${FILESDIR}/${PN}-sparc-cpuinfo.patch"
- "${FILESDIR}/${PN}-freebsd.patch"
- "${FILESDIR}/${P}-respect-march.patch"
- "${DISTDIR}/${P}-dbus.patch"
-)
-
-pkg_setup() {
- ewarn "You are about to install a very experimental ebuild!"
- ewarn "If you emerge this ebuild with USE='dbus' or USE='ieee1394'"
- ewarn "in conjunction with ABI_X86='32' and you are on amd64 you"
- ewarn "might experience some strange and yet unknown things"
- ewarn "happening."
- ewarn "You have been warned."
- python-single-r1_pkg_setup
-}
-
-src_configure() {
- local myeconfargs=(
- $(use_enable altivec)
- $(use_enable alsa)
- $(use_enable coreaudio)
- $(use_enable dbus)
- $(use_enable debug)
- $(use_enable ieee1394 firewire)
- $(use_enable mmx)
- $(use_enable oss)
- $(use_enable sse)
- --disable-portaudio
- --with-html-dir=/usr/share/doc/${PF}
- )
-
- # CPU Detection (dynsimd) uses asm routines which requires 3dnow, mmx
and sse.
- if use cpudetection && use 3dnow && use mmx && use sse ; then
- einfo "Enabling cpudetection (dynsimd). Adding -mmmx, -msse,
-m3dnow and -O2 to CFLAGS."
- myeconfargs+=( --enable-dynsimd )
- append-flags -mmmx -msse -m3dnow -O2
- fi
-
- # Neither SSE nor MMX will be used if --enable-optimize is not given
- if use mmx || use sse; then
- myeconfargs+=( --enable-optimize )
- fi
-
- use doc || export ac_cv_prog_HAVE_DOXYGEN=false
-
- autotools-multilib_src_configure
-}
-
-src_install() {
- autotools-multilib_src_install
-
- if use examples; then
- insinto /usr/share/doc/${PF}
- doins -r "${S}/example-clients"
- fi
-
- python_fix_shebang "${ED}"
-}
Copied:
trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.121.3-r2.ebuild
(from rev 2933,
trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.121.3-r2.ebuild)
===================================================================
---
trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.121.3-r2.ebuild
(rev 0)
+++
trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.121.3-r2.ebuild
2015-04-09 17:39:34 UTC (rev 2936)
@@ -0,0 +1,139 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+
+HAVE_DBUS_PATCH=1
+
+AUTOTOOLS_AUTORECONF=1
+
+if [[ ${HAVE_DBUS_PATCH} ]]; then
+ PYTHON_COMPAT=( python2_7 )
+ inherit python-single-r1
+fi
+
+if [[ "${PV}" = "1.9999" ]]; then
+ inherit git-r3
+fi
+
+inherit autotools-utils eutils flag-o-matic multilib-minimal
+
+RESTRICT="mirror"
+DESCRIPTION="A low-latency audio server"
+HOMEPAGE="http://www.jackaudio.org";
+
+if [[ "${PV}" = "1.9999" ]]; then
+ EGIT_REPO_URI="git://github.com/jackaudio/jack1.git"
+ KEYWORDS=""
+else
+ SRC_URI="http://www.jackaudio.org/downloads/${P}.tar.gz";
+ KEYWORDS="~amd64 ~ppc ~x86"
+fi
+
+if [[ ${HAVE_DBUS_PATCH} ]]; then
+ SRC_URI="${SRC_URI}
http://nedko.arnaudov.name/soft/jack/dbus/${P}-dbus.patch";
+fi
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+
+IUSE="alsa altivec celt coreaudio cpu_flags_x86_3dnow cpu_flags_x86_mmx
+ cpu_flags_x86_sse cpudetection debug doc examples ieee1394 oss pam"
+
+REQUIRED_USE="cpudetection? (
+ cpu_flags_x86_3dnow
+ cpu_flags_x86_mmx
+ cpu_flags_x86_sse
+)"
+
+if [[ ${HAVE_DBUS_PATCH} ]]; then
+ IUSE="${IUSE} dbus"
+ REQUIRED_USE="dbus? ( ${PYTHON_REQUIRED_USE} )"
+fi
+
+# FIXME: multilib libffado
+REQUIRED_USE="${REQUIRED_USE} amd64? ( abi_x86_32? ( !ieee1394 ) )"
+
+# FIXME: multilib libffado
+# FIXME: automagic deps: readline, samplerate, sndfile, celt
+CDEPEND="media-libs/libsamplerate[${MULTILIB_USEDEP}]
+ media-libs/libsndfile
+ sys-libs/readline:0
+ alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+ celt? ( media-libs/celt:0[${MULTILIB_USEDEP}] )
+ ieee1394? ( media-libs/libffado )
+ abi_x86_32? ( !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
+if [[ ${HAVE_DBUS_PATCH} ]]; then
+ CDEPEND="${CDEPEND}
+ dbus? (
+ dev-libs/expat
+ sys-apps/dbus
+ )"
+fi
+
+DEPEND="${CDEPEND}
+ virtual/pkgconfig
+ doc? ( app-doc/doxygen )"
+RDEPEND="${CDEPEND}
+ pam? ( sys-auth/realtime-base )"
+if [[ ${HAVE_DBUS_PATCH} ]]; then
+ RDEPEND="${RDEPEND}
+ dbus? (
+ ${PYTHON_DEPS}
+ dev-python/dbus-python[${PYTHON_USEDEP}]
+ )"
+fi
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-freebsd.patch
+ "${FILESDIR}"/${PN}-sparc-cpuinfo.patch
+)
+
+[[ ${HAVE_DBUS_PATCH} ]] && PATCHES+=( "${DISTDIR}/${P}-dbus.patch" )
+
+multilib_src_configure() {
+ # --enable-mmx and --enable-sse only appends mmx and sse CFLAGS
+ local myeconfargs=(
+ --disable-mmx
+ --disable-portaudio
+ --disable-sse
+ --with-html-dir=/usr/share/doc/${PF}
+ $(use_enable alsa)
+ $(use_enable altivec)
+ $(use_enable coreaudio)
+ $(use_enable cpudetection dynsimd)
+ $(use_enable debug)
+ $(use_enable ieee1394 firewire)
+ $(use_enable oss)
+ )
+
+ [[ ${HAVE_DBUS_PATCH} ]] && myeconfargs+=( $(use_enable dbus) )
+
+ if use cpudetection; then
+ einfo "Enabling cpudetection (dynsimd). Adding -mmmx, -msse,
-m3dnow and -O2 to CFLAGS."
+ append-flags -mmmx -msse -m3dnow -O2
+ fi
+
+ multilib_is_native_abi && use doc || export
ac_cv_prog_HAVE_DOXYGEN=false
+
+ autotools-utils_src_configure
+}
+
+multilib_src_compile() {
+ autotools-utils_src_compile
+}
+
+multilib_src_install() {
+ autotools-utils_src_install
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ if use examples; then
+ insinto /usr/share/doc/${PF}
+ doins -r "${S}/example-clients"
+ fi
+
+ [[ ${HAVE_DBUS_PATCH} ]] && use dbus && python_fix_shebang "${ED}"
+}
Deleted:
trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.121.3.ebuild
===================================================================
---
trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.121.3.ebuild
2015-04-05 16:47:44 UTC (rev 2935)
+++
trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.121.3.ebuild
2015-04-09 17:39:34 UTC (rev 2936)
@@ -1,81 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-
-AUTOTOOLS_AUTORECONF="1"
-inherit autotools-utils eutils flag-o-matic
-
-RESTRICT="mirror"
-DESCRIPTION="A low-latency audio server"
-HOMEPAGE="http://www.jackaudio.org";
-SRC_URI="http://www.jackaudio.org/downloads/${P}.tar.gz
- http://nedko.arnaudov.name/soft/jack/dbus/${P}-dbus.patch";
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="3dnow alsa altivec coreaudio cpudetection dbus debug doc examples
freebob ieee1394 mmx oss pam sse"
-
-RDEPEND=">=media-libs/libsndfile-1.0.0
- sys-libs/ncurses
- alsa? ( >=media-libs/alsa-lib-1.0.18 )
- dbus? ( sys-apps/dbus )
- freebob? ( sys-libs/libfreebob )
- ieee1394? ( media-libs/libffado )
- media-libs/libsamplerate"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- doc? ( app-doc/doxygen )"
-RDEPEND="${RDEPEND}
- pam? ( sys-auth/realtime-base )"
-
-PATCHES=(
- "${FILESDIR}/${PN}-sparc-cpuinfo.patch"
- "${FILESDIR}/${PN}-freebsd.patch"
- "${FILESDIR}/${P}-respect-march.patch"
- "${DISTDIR}/${P}-dbus.patch"
-)
-
-src_configure() {
- local myeconfargs=(
- $(use_enable altivec)
- $(use_enable alsa)
- $(use_enable coreaudio)
- $(use_enable dbus)
- $(use_enable debug)
- $(use_enable freebob)
- $(use_enable ieee1394 firewire)
- $(use_enable mmx)
- $(use_enable oss)
- $(use_enable sse)
- --disable-portaudio
- --with-html-dir=/usr/share/doc/${PF}
- )
-
- # CPU Detection (dynsimd) uses asm routines which requires 3dnow, mmx
and sse.
- if use cpudetection && use 3dnow && use mmx && use sse ; then
- einfo "Enabling cpudetection (dynsimd). Adding -mmmx, -msse,
-m3dnow and -O2 to CFLAGS."
- myeconfargs+=( --enable-dynsimd )
- append-flags -mmmx -msse -m3dnow -O2
- fi
-
- # Neither SSE nor MMX will be used if --enable-optimize is not given
- if use mmx || use sse; then
- myeconfargs+=( --enable-optimize )
- fi
-
- use doc || export ac_cv_prog_HAVE_DOXYGEN=false
-
- autotools-utils_src_configure
-}
-
-src_install() {
- autotools-utils_src_install
-
- if use examples; then
- insinto /usr/share/doc/${PF}
- doins -r "${S}/example-clients"
- fi
-}
Copied:
trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.124.1.ebuild
(from rev 2933,
trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.121.3-r2.ebuild)
===================================================================
---
trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.124.1.ebuild
(rev 0)
+++
trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.124.1.ebuild
2015-04-09 17:39:34 UTC (rev 2936)
@@ -0,0 +1,154 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+
+# HAVE_DBUS_PATCH=1
+
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_IN_SOURCE_BUILD=1 # FIXME: upstream bug
+
+if [[ ${HAVE_DBUS_PATCH} ]]; then
+ PYTHON_COMPAT=( python2_7 )
+ inherit python-single-r1
+fi
+
+if [[ "${PV}" = "1.9999" ]]; then
+ inherit git-r3
+fi
+
+inherit autotools-utils eutils flag-o-matic multilib-minimal
+
+RESTRICT="mirror"
+DESCRIPTION="A low-latency audio server"
+HOMEPAGE="http://www.jackaudio.org";
+
+if [[ "${PV}" = "1.9999" ]]; then
+ EGIT_REPO_URI="git://github.com/jackaudio/jack1.git"
+ KEYWORDS=""
+else
+ SRC_URI="http://www.jackaudio.org/downloads/${P}.tar.gz";
+ KEYWORDS="~amd64 ~ppc ~x86"
+fi
+
+if [[ ${HAVE_DBUS_PATCH} ]]; then
+ SRC_URI="${SRC_URI}
http://nedko.arnaudov.name/soft/jack/dbus/${P}-dbus.patch";
+fi
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+
+IUSE="alsa altivec celt coreaudio cpu_flags_x86_3dnow cpu_flags_x86_sse
+ cpu_flags_x86_sse2 cpudetection debug doc examples ieee1394 oss pam
zalsa"
+
+REQUIRED_USE="cpudetection? (
+ cpu_flags_x86_3dnow
+ cpu_flags_x86_sse
+ cpu_flags_x86_sse2
+)"
+
+if [[ ${HAVE_DBUS_PATCH} ]]; then
+ IUSE="${IUSE} dbus"
+ REQUIRED_USE="dbus? ( ${PYTHON_REQUIRED_USE} )"
+fi
+
+# FIXME: multilib libffado
+REQUIRED_USE="${REQUIRED_USE} amd64? ( abi_x86_32? ( !ieee1394 ) )"
+
+# FIXME: multilib libffado
+# FIXME: automagic deps: readline, samplerate, sndfile, celt
+CDEPEND="media-libs/libsamplerate[${MULTILIB_USEDEP}]
+ media-libs/libsndfile
+ sys-libs/db:=[${MULTILIB_USEDEP}]
+ sys-libs/readline:0
+ alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+ celt? ( media-libs/celt:0[${MULTILIB_USEDEP}] )
+ ieee1394? ( media-libs/libffado )
+ zalsa? (
+ media-libs/zita-alsa-pcmi
+ media-libs/zita-resampler
+ )
+ abi_x86_32? ( !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
+if [[ ${HAVE_DBUS_PATCH} ]]; then
+ CDEPEND="${CDEPEND}
+ dbus? (
+ dev-libs/expat
+ sys-apps/dbus
+ )"
+fi
+
+DEPEND="${CDEPEND}
+ virtual/pkgconfig
+ doc? ( app-doc/doxygen )"
+RDEPEND="${CDEPEND}
+ pam? ( sys-auth/realtime-base )"
+if [[ ${HAVE_DBUS_PATCH} ]]; then
+ RDEPEND="${RDEPEND}
+ dbus? (
+ ${PYTHON_DEPS}
+ dev-python/dbus-python[${PYTHON_USEDEP}]
+ )"
+fi
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-freebsd.patch
+ "${FILESDIR}"/${PN}-sparc-cpuinfo.patch
+)
+
+[[ ${HAVE_DBUS_PATCH} ]] && PATCHES+=( "${DISTDIR}/${P}-dbus.patch" )
+
+# FIXME: out-of-source build
+src_prepare() {
+ autotools-utils_src_prepare
+ multilib_copy_sources
+}
+
+multilib_src_configure() {
+ # --enable-sse only appends sse CFLAGS
+ local myeconfargs=(
+ --disable-portaudio
+ --disable-sse
+ --with-html-dir=/usr/share/doc/${PF}
+ $(use_enable alsa)
+ $(use_enable altivec)
+ $(use_enable coreaudio)
+ $(use_enable cpudetection dynsimd)
+ $(use_enable debug)
+ $(use_enable ieee1394 firewire)
+ $(use_enable oss)
+ $(use_enable zalsa)
+ )
+
+ [[ ${HAVE_DBUS_PATCH} ]] && myeconfargs+=( $(use_enable dbus) )
+
+ if use cpudetection; then
+ einfo "Enabling cpudetection (dynsimd). Adding -msse, -msse2,
-m3dnow and -O2 to CFLAGS."
+ append-flags -msse -msse2 -m3dnow -O2
+ fi
+
+ multilib_is_native_abi && use doc || export
ac_cv_prog_HAVE_DOXYGEN=false
+
+ # FIXME: out-of-source build
+ ECONF_SOURCE="${BUILD_DIR}" autotools-utils_src_configure
+}
+
+multilib_src_compile() {
+ # FIXME: out-of-source build
+ ECONF_SOURCE="${BUILD_DIR}" autotools-utils_src_compile
+}
+
+multilib_src_install() {
+ # FIXME: out-of-source build
+ ECONF_SOURCE="${BUILD_DIR}" autotools-utils_src_install
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ if use examples; then
+ insinto /usr/share/doc/${PF}
+ doins -r "${S}/example-clients"
+ fi
+
+ [[ ${HAVE_DBUS_PATCH} ]] && use dbus && python_fix_shebang "${ED}"
+}
Modified:
trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-1.9.10.ebuild
===================================================================
---
trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-1.9.10.ebuild
2015-04-05 16:47:44 UTC (rev 2935)
+++
trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-1.9.10.ebuild
2015-04-09 17:39:34 UTC (rev 2936)
@@ -1,14 +1,12 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-# FIXME: Add [${MULTILIB_USEDEP}] to the libffado dependency when it
-# has been migrated to multilib eclasses
-
EAPI="5"
PYTHON_COMPAT=( python2_7 )
-[[ "${PV}" = "2.9999" ]] && inherit git-2
+PYTHON_REQ_USE="threads(+)"
+[[ "${PV}" = "2.9999" ]] && inherit git-r3
inherit eutils python-single-r1 waf-utils multilib-minimal
DESCRIPTION="Jackdmp jack implemention for multi-processor machine"
@@ -17,7 +15,6 @@
RESTRICT="mirror"
if [[ "${PV}" = "2.9999" ]]; then
EGIT_REPO_URI="git://github.com/jackaudio/jack2.git"
- SRC_URI=""
KEYWORDS=""
else
SRC_URI="https://dl.dropbox.com/u/28869550/jack-${PV}.tar.bz2";
@@ -30,19 +27,23 @@
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-# Remove when multilib libffado is available.
+# FIXME: multilib libffado
REQUIRED_USE="${REQUIRED_USE} amd64? ( abi_x86_32? ( !ieee1394 ) )"
+# FIXME: multilib libffado
+# FIXME: automagic deps: readline, samplerate, sndfile, celt, opus
+# FIXME: even though sndfile is just used for binaries, the check is flawed
+# making the build fail if multilib libsndfile is not found.
RDEPEND="media-libs/libsamplerate[${MULTILIB_USEDEP}]
- >=media-libs/libsndfile-1.0.0[${MULTILIB_USEDEP}]
+ media-libs/libsndfile[${MULTILIB_USEDEP}]
+ sys-libs/readline:0
${PYTHON_DEPS}
alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
- celt? ( media-libs/celt[${MULTILIB_USEDEP}] )
+ celt? ( media-libs/celt:0[${MULTILIB_USEDEP}] )
dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
ieee1394? ( media-libs/libffado )
opus? ( media-libs/opus[custom-modes,${MULTILIB_USEDEP}] )
- abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r7
-
!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
+ abi_x86_32? ( !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
DEPEND="${RDEPEND}
virtual/pkgconfig
doc? ( app-doc/doxygen )"
@@ -56,7 +57,7 @@
src_unpack() {
if [[ "${PV}" = "2.9999" ]]; then
- git-2_src_unpack
+ git-r3_src_unpack
else
default
fi
Deleted:
trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-1.9999-r1.ebuild
===================================================================
---
trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-1.9999-r1.ebuild
2015-04-05 16:47:44 UTC (rev 2935)
+++
trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-1.9999-r1.ebuild
2015-04-09 17:39:34 UTC (rev 2936)
@@ -1,105 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-# == THIS IS WORK IN PROGRESS ==
-# [TODO]
-# * When libffado has been migrated to multilib eclasses
-# media-libs/libffado should be
-# media-libs/libffado[${MULTILIB_USEDEP}]
-# * More testing is definitely needed because this revision incorporates
-# more changes to the 1.9999 ebuild than just multilib!
-# [NOTE]
-# The build won't fail if dbus or ffado is requested. It will just
-# compile the 32-bit library without those features. I don't know how
-# that will work out.
-
-# The build system fails with out of source builds. The sources thus
-# need to be copied so that an in source build can be done.
-
-EAPI="5"
-
-AUTOTOOLS_AUTORECONF="1"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-inherit autotools-utils eutils flag-o-matic git-2 multilib-minimal
-
-RESTRICT="mirror"
-DESCRIPTION="A low-latency audio server"
-HOMEPAGE="http://www.jackaudio.org";
-
-EGIT_REPO_URI="git://github.com/jackaudio/jack1.git"
-EGIT_HAS_SUBMODULES="example-clients"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS=""
-IUSE="3dnow altivec alsa celt coreaudio cpudetection doc debug examples mmx
oss sse netjack ieee1394 zalsa"
-
-RDEPEND=">=media-libs/libsndfile-1.0.0
- sys-libs/ncurses
- celt? ( media-libs/celt[${MULTILIB_USEDEP}] )
- alsa? ( >=media-libs/alsa-lib-0.9.1[${MULTILIB_USEDEP}] )
- ieee1394? ( media-libs/libffado )
- netjack? ( media-libs/libsamplerate[${MULTILIB_USEDEP}] )
- zalsa? ( media-libs/zita-alsa-pcmi
- media-libs/zita-resampler )
- abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r7
-
!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- doc? ( app-doc/doxygen )
- netjack? ( dev-util/scons )"
-
-pkg_setup() {
- ewarn "You are about to install a very experimental ebuild!"
- ewarn "If you emerge this ebuild with USE='ieee1394' in conjunction"
- ewarn "with ABI_X86='32' and you are on amd64 you might experience"
- ewarn "some strange and yet unknown things happening."
- ewarn "You have been warned."
-}
-
-src_prepare() {
- autotools-utils_src_prepare
- multilib_copy_sources
-}
-
-multilib_src_configure() {
- local myeconfargs=(
- --with-default-tmpdir=/dev/shm
- --with-html-dir=/usr/share/doc/${PF}
- $(use_enable alsa)
- $(use_enable altivec)
- $(use_enable coreaudio)
- $(use_enable debug)
- $(use_enable ieee1394 firewire)
- $(use_enable oss)
- $(use_enable sse)
- $(use_enable zalsa)
- )
-
- # CPU Detection (dynsimd) uses asm routines which requires 3dnow, mmx
and sse.
- if use cpudetection && use 3dnow && use mmx && use sse ; then
- einfo "Enabling cpudetection (dynsimd). Adding -mmmx, -msse,
-m3dnow and -O2 to CFLAGS."
- myeconfargs=( --enable-dynsimd )
- append-flags -mmmx -msse -m3dnow -O2
- fi
-
- multilib_is_native_abi && use doc || export
ac_cv_prog_HAVE_DOXYGEN=false
-
- ECONF_SOURCE="${BUILD_DIR}" autotools-utils_src_configure
-}
-
-multilib_src_compile() {
- ECONF_SOURCE="${BUILD_DIR}" autotools-utils_src_compile
-}
-
-multilib_src_install() {
- ECONF_SOURCE="${BUILD_DIR}" autotools-utils_src_install
-}
-
-multilib_src_install_all() {
- if use examples; then
- insinto /usr/share/doc/${PF}
- doins -r "${S}/example-clients"
- fi
-}
Modified:
trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-1.9999.ebuild
===================================================================
---
trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-1.9999.ebuild
2015-04-05 16:47:44 UTC (rev 2935)
+++
trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-1.9999.ebuild
2015-04-09 17:39:34 UTC (rev 2936)
@@ -1,76 +1,149 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="5"
-inherit flag-o-matic eutils multilib git-2 autotools
+# HAVE_DBUS_PATCH=1
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_IN_SOURCE_BUILD=1 # FIXME: upstream bug
+
+if [[ ${HAVE_DBUS_PATCH} ]]; then
+ PYTHON_COMPAT=( python2_7 )
+ inherit python-single-r1
+fi
+
+if [[ "${PV}" = "1.9999" ]]; then
+ inherit git-r3
+fi
+
+inherit autotools-utils eutils flag-o-matic multilib-minimal
+
RESTRICT="mirror"
DESCRIPTION="A low-latency audio server"
HOMEPAGE="http://www.jackaudio.org";
-EGIT_REPO_URI="git://github.com/jackaudio/jack1.git"
-EGIT_HAS_SUBMODULES="example-clients"
+if [[ "${PV}" = "1.9999" ]]; then
+ EGIT_REPO_URI="git://github.com/jackaudio/jack1.git"
+ KEYWORDS=""
+else
+ SRC_URI="http://www.jackaudio.org/downloads/${P}.tar.gz";
+ KEYWORDS="~amd64 ~ppc ~x86"
+fi
+if [[ ${HAVE_DBUS_PATCH} ]]; then
+ SRC_URI="${SRC_URI}
http://nedko.arnaudov.name/soft/jack/dbus/${P}-dbus.patch";
+fi
+
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
-KEYWORDS=""
-IUSE="3dnow altivec alsa celt coreaudio cpudetection doc debug examples mmx
oss sse netjack freebob ieee1394 zalsa"
-RDEPEND=">=media-libs/libsndfile-1.0.0
- sys-libs/ncurses
- celt? ( >=media-libs/celt-0.5.0 )
- alsa? ( >=media-libs/alsa-lib-0.9.1 )
- freebob? ( sys-libs/libfreebob !media-libs/libffado )
- ieee1394? ( media-libs/libffado !sys-libs/libfreebob )
- netjack? ( media-libs/libsamplerate )
- zalsa? ( media-libs/zita-alsa-pcmi
- media-libs/zita-resampler )"
+IUSE="alsa altivec celt coreaudio cpu_flags_x86_3dnow cpu_flags_x86_sse
+ cpu_flags_x86_sse2 cpudetection debug doc examples ieee1394 oss pam
zalsa"
-DEPEND="${RDEPEND}
+REQUIRED_USE="cpudetection? (
+ cpu_flags_x86_3dnow
+ cpu_flags_x86_sse
+ cpu_flags_x86_sse2
+)"
+
+if [[ ${HAVE_DBUS_PATCH} ]]; then
+ IUSE="${IUSE} dbus"
+ REQUIRED_USE="dbus? ( ${PYTHON_REQUIRED_USE} )"
+fi
+
+# FIXME: multilib libffado
+REQUIRED_USE="${REQUIRED_USE} amd64? ( abi_x86_32? ( !ieee1394 ) )"
+
+# FIXME: multilib libffado
+# FIXME: automagic deps: readline, samplerate, sndfile, celt
+CDEPEND="media-libs/libsamplerate[${MULTILIB_USEDEP}]
+ media-libs/libsndfile
+ sys-libs/db:=[${MULTILIB_USEDEP}]
+ sys-libs/readline:0
+ alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+ celt? ( media-libs/celt:0[${MULTILIB_USEDEP}] )
+ ieee1394? ( media-libs/libffado )
+ zalsa? (
+ media-libs/zita-alsa-pcmi
+ media-libs/zita-resampler
+ )
+ abi_x86_32? ( !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
+if [[ ${HAVE_DBUS_PATCH} ]]; then
+ CDEPEND="${CDEPEND}
+ dbus? (
+ dev-libs/expat
+ sys-apps/dbus
+ )"
+fi
+
+DEPEND="${CDEPEND}
virtual/pkgconfig
- doc? ( app-doc/doxygen )
- netjack? ( dev-util/scons )"
+ doc? ( app-doc/doxygen )"
+RDEPEND="${CDEPEND}
+ pam? ( sys-auth/realtime-base )"
+if [[ ${HAVE_DBUS_PATCH} ]]; then
+ RDEPEND="${RDEPEND}
+ dbus? (
+ ${PYTHON_DEPS}
+ dev-python/dbus-python[${PYTHON_USEDEP}]
+ )"
+fi
+[[ ${HAVE_DBUS_PATCH} ]] && PATCHES=( "${DISTDIR}/${P}-dbus.patch" )
+
+# FIXME: out-of-source build
src_prepare() {
- eautoreconf
+ autotools-utils_src_prepare
+ multilib_copy_sources
}
-src_configure() {
- local myconf="--with-html-dir=/usr/share/doc/${PF}"
+multilib_src_configure() {
+ # --enable-sse only appends sse CFLAGS
+ local myeconfargs=(
+ --disable-portaudio
+ --disable-sse
+ --with-html-dir=/usr/share/doc/${PF}
+ $(use_enable alsa)
+ $(use_enable altivec)
+ $(use_enable coreaudio)
+ $(use_enable cpudetection dynsimd)
+ $(use_enable debug)
+ $(use_enable ieee1394 firewire)
+ $(use_enable oss)
+ $(use_enable zalsa)
+ )
- # CPU Detection (dynsimd) uses asm routines which requires 3dnow, mmx
and sse.
- 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
+ [[ ${HAVE_DBUS_PATCH} ]] && myeconfargs+=( $(use_enable dbus) )
+
+ if use cpudetection; then
+ einfo "Enabling cpudetection (dynsimd). Adding -msse, -msse2,
-m3dnow and -O2 to CFLAGS."
+ append-flags -msse -msse2 -m3dnow -O2
fi
- use doc || export ac_cv_prog_HAVE_DOXYGEN=false
+ multilib_is_native_abi && 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 coreaudio) \
- $(use_enable debug) \
- $(use_enable mmx) \
- $(use_enable oss) \
- $(use_enable sse) \
- $(use_enable zalsa) \
- --disable-dependency-tracking \
- --with-default-tmpdir=/dev/shm \
- ${myconf} || die "configure failed"
+ # FIXME: out-of-source build
+ ECONF_SOURCE="${BUILD_DIR}" autotools-utils_src_configure
}
-src_install() {
- emake DESTDIR="${D}" install || die "install failed"
- dodoc AUTHORS TODO README
+multilib_src_compile() {
+ # FIXME: out-of-source build
+ ECONF_SOURCE="${BUILD_DIR}" autotools-utils_src_compile
+}
+multilib_src_install() {
+ # FIXME: out-of-source build
+ ECONF_SOURCE="${BUILD_DIR}" autotools-utils_src_install
+}
+
+multilib_src_install_all() {
+ einstalldocs
if use examples; then
insinto /usr/share/doc/${PF}
doins -r "${S}/example-clients"
fi
+
+ [[ ${HAVE_DBUS_PATCH} ]] && use dbus && python_fix_shebang "${ED}"
}
Modified:
trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-2.9999.ebuild
===================================================================
---
trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-2.9999.ebuild
2015-04-05 16:47:44 UTC (rev 2935)
+++
trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-2.9999.ebuild
2015-04-09 17:39:34 UTC (rev 2936)
@@ -1,14 +1,12 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-# FIXME: Add [${MULTILIB_USEDEP}] to the libffado dependency when it
-# has been migrated to multilib eclasses
-
EAPI="5"
PYTHON_COMPAT=( python2_7 )
-[[ "${PV}" = "2.9999" ]] && inherit git-2
+PYTHON_REQ_USE="threads(+)"
+[[ "${PV}" = "2.9999" ]] && inherit git-r3
inherit eutils python-single-r1 waf-utils multilib-minimal
DESCRIPTION="Jackdmp jack implemention for multi-processor machine"
@@ -17,7 +15,6 @@
RESTRICT="mirror"
if [[ "${PV}" = "2.9999" ]]; then
EGIT_REPO_URI="git://github.com/jackaudio/jack2.git"
- SRC_URI=""
KEYWORDS=""
else
SRC_URI="https://dl.dropbox.com/u/28869550/jack-${PV}.tar.bz2";
@@ -30,19 +27,23 @@
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-# Remove when multilib libffado is available.
+# FIXME: multilib libffado
REQUIRED_USE="${REQUIRED_USE} amd64? ( abi_x86_32? ( !ieee1394 ) )"
+# FIXME: multilib libffado
+# FIXME: automagic deps: readline, samplerate, sndfile, celt, opus
+# FIXME: even though sndfile is just used for binaries, the check is flawed
+# making the build fail if multilib libsndfile is not found.
RDEPEND="media-libs/libsamplerate[${MULTILIB_USEDEP}]
- >=media-libs/libsndfile-1.0.0[${MULTILIB_USEDEP}]
+ media-libs/libsndfile[${MULTILIB_USEDEP}]
+ sys-libs/readline:0
${PYTHON_DEPS}
alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
- celt? ( media-libs/celt[${MULTILIB_USEDEP}] )
+ celt? ( media-libs/celt:0[${MULTILIB_USEDEP}] )
dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
ieee1394? ( media-libs/libffado )
opus? ( media-libs/opus[custom-modes,${MULTILIB_USEDEP}] )
- abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r7
-
!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
+ abi_x86_32? ( !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
DEPEND="${RDEPEND}
virtual/pkgconfig
doc? ( app-doc/doxygen )"
@@ -56,7 +57,7 @@
src_unpack() {
if [[ "${PV}" = "2.9999" ]]; then
- git-2_src_unpack
+ git-r3_src_unpack
else
default
fi
Modified:
trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/metadata.xml
===================================================================
--- trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/metadata.xml
2015-04-05 16:47:44 UTC (rev 2935)
+++ trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/metadata.xml
2015-04-09 17:39:34 UTC (rev 2936)
@@ -10,9 +10,7 @@
<flag name="coreaudio">Build the CoreAudio driver on Mac OS X
systems</flag>
<flag name="cpudetection">Enables runtime cpudetection</flag>
<flag name="dbus">Build jackdbus</flag>
- <flag name="freebob">enables support for older 'BeBoB'
ieee1394</flag>
<flag name="ieee1394">enables support for FFADO - 'BeBoB'</flag>
- <flag name="netjack">Build netjack</flag>
<flag name="opus">build with compression support using
media-libs/opus in netjack</flag>
<flag name="pam">Add basic realime configuration via
<pkg>sys-auth/realtime-base</pkg></flag>
<flag name="zalsa">Add multi device support via
<pkg>media-libs/ziza-alsa-pcmi</pkg> and
<pkg>media-libs/zita-resampler</pkg></flag>
