| [proaudio] [2899] media-sound/jack-audio-connection-kit: jack2 version bump ( refer to ChangeLog) |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/proaudio Archives
]
Revision: 2899
Author: lilrc
Date: 2014-11-26 16:48:57 +0100 (Wed, 26 Nov 2014)
Log Message:
-----------
media-sound/jack-audio-connection-kit: jack2 version bump (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-2.9999.ebuild
trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/metadata.xml
trunk/overlays/proaudio/profiles/package.mask
Added Paths:
-----------
trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-1.9.10.ebuild
Removed Paths:
-------------
trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/files/jack-1.9.9.5-opus_custom.patch
trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/files/jack2-no-self-connect-1.9.9.5.patch
trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-1.9.9.5-r1.ebuild
trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-1.9.9.5-r2.ebuild
trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-2.9999-r1.ebuild
Modified: trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/ChangeLog 2014-11-04 08:25:37 UTC (rev 2898)
+++ trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/ChangeLog 2014-11-26 15:48:57 UTC (rev 2899)
@@ -1,7 +1,25 @@
# ChangeLog for media-sound/jack-audio-connection-kit
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*jack-audio-connection-kit-1.9.10 (26 Nov 2014)
+
+ 26 Nov 2014; Karl Linden (lilrc) <lilrc@xxxxxxxxxxxxxxxxxxxxx>
+ -jack-audio-connection-kit-1.9.9.5-r1.ebuild,
+ -jack-audio-connection-kit-1.9.9.5-r2.ebuild,
+ +jack-audio-connection-kit-1.9.10.ebuild,
+ jack-audio-connection-kit-2.9999.ebuild,
+ -jack-audio-connection-kit-2.9999-r1.ebuild,
+ -files/jack-1.9.9.5-opus_custom.patch,
+ -files/jack2-no-self-connect-1.9.9.5.patch, metadata.xml:
+ version bump for jack2
+ make ebuilds more identic (to ease maintenance)
+ remove no longer necessary patches
+ remove mixed use flag
+ remove freebob support
+ remove masks from package.mask
+ fixes #183, thanks luo.mai
+
17 Jan 2014; Dominique Michel <dominique_libre@xxxxxxxxxxxxxxxxxxxxx>
metadata.xml,
jack-audio-connection-kit-1.9999.ebuild,
Modified: trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/Manifest 2014-11-04 08:25:37 UTC (rev 2898)
+++ trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/Manifest 2014-11-26 15:48:57 UTC (rev 2899)
@@ -1,20 +1,16 @@
-AUX jack-1.9.9.5-opus_custom.patch 876 SHA256 84a278391aa2a5017292c6ed9338a6fd89e03cd9a56b299872ee000780f18680 SHA512 24b176d0005535fefb4087632ea8ca6b19c40b800aa14040dba5b34eb3595facc21d25537ac8983f11dccc201affc4c9c3dc548766389b4ab0ffa4df2367c6ea WHIRLPOOL 21b3e13ce0abbef215363c438912e56f78ff1d670ea3b6e9d015f15b85ae91714c23a9d69656edaca86fa3724fd18a4180aae0257d808a2012cce55fe5db04c6
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
-AUX jack2-no-self-connect-1.9.9.5.patch 19308 SHA256 4e7fa1fb68025f68df7fe8c690fb8253b1f810a72f4cb72d34451126f14028e5 SHA512 35c9404087f4f3a93923b70dc2d7fa51fa70b5f9c877818cc8de64cf2121a015eb2247e2babc0b2edee1a65fd3d076f36d80b894ea38c6ad959ab14d1d4efe38 WHIRLPOOL e06d2b651cef8206056bd139698a420df489c68148f4063c674442ec482e06af4701f7f72fc6d17c4733d54a7715e44882ccbcc17019f168229b16e1d9b5daa6
-DIST jack-1.9.9.5.tar.bz2 4673914 SHA256 65ef5acceabb1ebd4ac8c437be47a522292e3c2a1f7bfa656de7392d9351ebbd SHA512 173a10943c98cb17f0041216cc24ce03d5e147f27be121fdf66c4e9d21ba8bf125a1749b985cacffb075618d92025231eb047c754d33d777275373d010a85e27 WHIRLPOOL c6ec9ab4ed29ad67364b4ea3c74bc0bcfb9590fe778820be6a9c5247ecb7f6dc3d894599ce6ac7c27a4243fd77308b4345c2479d1567927247df233165bd6641
+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.9.5-r1.ebuild 1711 SHA256 189a4439f9a9a4cd768c8c161bae7fcde64c4ef800bd6a242f19f13f752eaba0 SHA512 74dd56b3c22330c6a7ae08ae3a05df64b6ae2d093cdacfb303769736853338e6f5401ac2ebe4b925e02fb6c4164c4f6ed0daf6a5732588be7e728636fab937de WHIRLPOOL 5f6c758dfff15cebf708b471d4cf59637e7bb50209c296b0f8b46200baefe29fbb2591244254b8d141d7a376fcdad62d3e15c2c8f9d7adf76a89eb38b0e96087
-EBUILD jack-audio-connection-kit-1.9.9.5-r2.ebuild 2642 SHA256 171f4ae9220499242701bafc3a4ce16f809e4929a8ed49e1637351c8a8e343ac SHA512 51de6e18269a76eb1324425ec075bf9bff820415e2aaf918329a0ef47f4820f8faad3a06b8ccfcb1ba0ef317da062f8263c44d35bcac7bbf3121db4f29a0cb4d WHIRLPOOL 0c05592828f3419d858b9f82464f93b0737fbf163e1c6d4dcaa49280489aacd0ba3109e56795e40bf6e804b806263208a76d202c9d788b9b8530e0f7cc905aa3
+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-r1.ebuild 2553 SHA256 6015fb05705b12d82742aa1ad70d0f14c56c3d29c75e28fe9d1927e26a4be8b1 SHA512 1327f79d13850483a360005d69a40826241560f96f70b915da7ca9762296399a022e96dd3c966616e503654d12ec2c48796d25c4bc30cd41d3f3b21d204c24e9 WHIRLPOOL 66c57a389b66855b2c82ff3b9819eef7510c9aee466171cf9aa82b26f0308c57fa3a73a7671b6f71de02bb5ed056a90b745e4a9fa53c99dacced709047f84dba
-EBUILD jack-audio-connection-kit-2.9999.ebuild 1654 SHA256 038607120050fdab02458accc0ea407a0aeaafcc50de679e0467feb711fbb822 SHA512 e09a376b912748231c8dd5e88d20ea81aa7af4fdd6f1ec86529c0a44e1ee21b3e804ab51bfaaa2326fb4a2d14a10252af940374ef603a78c10b1f709adfce564 WHIRLPOOL 0f3abf3e8015707e417e93bcbe6adecd04fafef3bf0e471fd4f83403ec379b9e35f7c1bac059c2c60f979a9825e44a69114d50b175c874a391746e3d1331146f
-MISC ChangeLog 15294 SHA256 72569f34fe2385d778ce5c5b6a7060ddbb862422a08c54c98b9b61924e625d35 SHA512 206e555037dc3f8ec8545195b4fc1500b6a51760ed6b82f76373034257619014ee5efa3b69cea5c2289f6e695cdeabcf16056ed837f674050aa215f90e7172b5 WHIRLPOOL 45644f31405a419f67129bfae75b58a12571aba75578ec05712ebb7f40fdb11b3cf2b73458e45934d29db101856513fa34a868c8c27512426195c1eed2efb2cf
-MISC metadata.xml 1071 SHA256 cd2698ec957e25e00f38839ddaf103121713909a75e2cd040a449425b274cc07 SHA512 6dd7d6434056170864ef6d17ed738b34156830f892c31438ae4865fb10fb693c114e7e7fc21ca965eac69a7aed3c43d26f073a21063945605803da41ec71d95b WHIRLPOOL 088752ddcf3b51d546b00f8ca5c874b202ac95869480ae681331f764bd4ae0915481d9afd8625feab5667523e2df6b33d59c16cc168fbfa1ff798aee50bddca7
+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
Deleted: trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/files/jack-1.9.9.5-opus_custom.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/files/jack-1.9.9.5-opus_custom.patch 2014-11-04 08:25:37 UTC (rev 2898)
+++ trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/files/jack-1.9.9.5-opus_custom.patch 2014-11-26 15:48:57 UTC (rev 2899)
@@ -1,26 +0,0 @@
-commit 44aa9319ea920f12e139cb00f6c9df9529f6bb0a
-Author: Adrian Knoth <adi@xxxxxxxxxxxxxxxxxxxxx>
-Date: Sun Jan 6 20:34:56 2013 +0100
-
- wscript: Set HAVE_OPUS=0 if custom headers are missing
-
- As reported by Peter Nelson, waf's check_cfg sets HAVE_OPUS=1 if the
- pkg-config check is successful, however, the code requires OPUS custom
- headers.
-
- So if a dev package without custom headers is installed, explicitly
- reset HAVE_OPUS to 0 to fix the FTBFS.
-
-diff --git a/wscript b/wscript
-index 568dcf6..02d59c3 100644
---- a/wscript
-+++ b/wscript
-@@ -179,6 +179,8 @@ def configure(conf):
- if conf.check_cc(header_name='opus/opus_custom.h', mandatory=False):
- conf.define('HAVE_OPUS', 1)
- conf.env['WITH_OPUS'] = True
-+ else:
-+ conf.define('HAVE_OPUS', 0)
-
-
- conf.env['LIB_PTHREAD'] = ['pthread']
Deleted: trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/files/jack2-no-self-connect-1.9.9.5.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/files/jack2-no-self-connect-1.9.9.5.patch 2014-11-04 08:25:37 UTC (rev 2898)
+++ trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/files/jack2-no-self-connect-1.9.9.5.patch 2014-11-26 15:48:57 UTC (rev 2899)
@@ -1,470 +0,0 @@
-diff --git a/common/JackConstants.h b/common/JackConstants.h
-index 59f6b6d..eb97a9a 100644
---- a/common/JackConstants.h
-+++ b/common/JackConstants.h
-@@ -82,4 +82,6 @@
- #define EMPTY 0xFFFD
- #define FREE 0xFFFC
-
-+#define JACK_DEFAULT_SELF_CONNECT_MODE JackSelfConnectIgnoreAll
-+
- #endif
-diff --git a/common/JackControlAPI.cpp b/common/JackControlAPI.cpp
-index 3cc1141..c4d8168 100644
---- a/common/JackControlAPI.cpp
-+++ b/common/JackControlAPI.cpp
-@@ -47,6 +47,13 @@
-
- using namespace Jack;
-
-+#define SELF_CONNECT_MODE_ALLOW_CHAR ' '
-+#define SELF_CONNECT_MODE_FAIL_EXTERNAL_ONLY_CHAR 'E'
-+#define SELF_CONNECT_MODE_IGNORE_EXTERNAL_ONLY_CHAR 'e'
-+#define SELF_CONNECT_MODE_FAIL_ALL_CHAR 'A'
-+#define SELF_CONNECT_MODE_IGNORE_ALL_CHAR 'a'
-+#define SELF_CONNECT_MODES_COUNT 5
-+
- struct jackctl_server
- {
- JSList * drivers;
-@@ -94,6 +101,12 @@ struct jackctl_server
- /* bool, synchronous or asynchronous engine mode */
- union jackctl_parameter_value sync;
- union jackctl_parameter_value default_sync;
-+
-+ /* char enum, self connect mode mode */
-+ union jackctl_parameter_value self_connect_mode;
-+ union jackctl_parameter_value default_self_connect_mode;
-+ jack_driver_param_value_enum_t self_connect_mode_possible_values[SELF_CONNECT_MODES_COUNT];
-+ jack_driver_param_constraint_desc_t self_connect_mode_constraint;
- };
-
- struct jackctl_driver
-@@ -869,6 +882,40 @@ SERVER_EXPORT jackctl_server_t * jackctl_server_create(
- goto fail_free_parameters;
- }
-
-+ server_ptr->self_connect_mode_constraint.flags = JACK_CONSTRAINT_FLAG_STRICT | JACK_CONSTRAINT_FLAG_FAKE_VALUE;
-+ server_ptr->self_connect_mode_constraint.constraint.enumeration.count = SELF_CONNECT_MODES_COUNT;
-+ server_ptr->self_connect_mode_constraint.constraint.enumeration.possible_values_array = server_ptr->self_connect_mode_possible_values;
-+
-+ server_ptr->self_connect_mode_possible_values[0].value.c = SELF_CONNECT_MODE_ALLOW_CHAR;
-+ strcpy(server_ptr->self_connect_mode_possible_values[0].short_desc, "Don't restrict self connect requests");
-+
-+ server_ptr->self_connect_mode_possible_values[1].value.c = SELF_CONNECT_MODE_FAIL_EXTERNAL_ONLY_CHAR ;
-+ strcpy(server_ptr->self_connect_mode_possible_values[1].short_desc, "Fail self connect requests to external ports only");
-+
-+ server_ptr->self_connect_mode_possible_values[2].value.c = SELF_CONNECT_MODE_IGNORE_EXTERNAL_ONLY_CHAR;
-+ strcpy(server_ptr->self_connect_mode_possible_values[2].short_desc, "Ignore self connect requests to external ports only");
-+
-+ server_ptr->self_connect_mode_possible_values[3].value.c = SELF_CONNECT_MODE_FAIL_ALL_CHAR;
-+ strcpy(server_ptr->self_connect_mode_possible_values[3].short_desc, "Fail all self connect requests");
-+
-+ server_ptr->self_connect_mode_possible_values[4].value.c = SELF_CONNECT_MODE_IGNORE_ALL_CHAR;
-+ strcpy(server_ptr->self_connect_mode_possible_values[4].short_desc, "Ignore all self connect requests");
-+
-+ value.c = SELF_CONNECT_MODE_ALLOW_CHAR;
-+ if (jackctl_add_parameter(
-+ &server_ptr->parameters,
-+ "self-connect-mode",
-+ "Self connect mode.",
-+ "Whether JACK clients are allowed to connect their own ports",
-+ JackParamChar,
-+ &server_ptr->self_connect_mode,
-+ &server_ptr->default_self_connect_mode,
-+ value,
-+ &server_ptr->self_connect_mode_constraint) == NULL)
-+ {
-+ goto fail_free_parameters;
-+ }
-+
- JackServerGlobals::on_device_acquire = on_device_acquire;
- JackServerGlobals::on_device_release = on_device_release;
-
-@@ -953,6 +1000,7 @@ jackctl_server_open(
- jackctl_server *server_ptr,
- jackctl_driver *driver_ptr)
- {
-+ JackSelfConnectMode self_connect_mode;
- JSList * paramlist = NULL;
-
- try {
-@@ -986,6 +1034,27 @@ jackctl_server_open(
- server_ptr->client_timeout.i = 500; /* 0.5 sec; usable when non realtime. */
- }
-
-+ switch (server_ptr->self_connect_mode.c)
-+ {
-+ case SELF_CONNECT_MODE_ALLOW_CHAR:
-+ self_connect_mode = JackSelfConnectAllow;
-+ break;
-+ case SELF_CONNECT_MODE_FAIL_EXTERNAL_ONLY_CHAR:
-+ self_connect_mode = JackSelfConnectFailExternalOnly;
-+ break;
-+ case SELF_CONNECT_MODE_IGNORE_EXTERNAL_ONLY_CHAR:
-+ self_connect_mode = JackSelfConnectIgnoreExternalOnly;
-+ break;
-+ case SELF_CONNECT_MODE_FAIL_ALL_CHAR:
-+ self_connect_mode = JackSelfConnectFailAll;
-+ break;
-+ case SELF_CONNECT_MODE_IGNORE_ALL_CHAR:
-+ self_connect_mode = JackSelfConnectIgnoreAll;
-+ break;
-+ default:
-+ self_connect_mode = JACK_DEFAULT_SELF_CONNECT_MODE;
-+ }
-+
- /* check port max value before allocating server */
- if (server_ptr->port_max.ui > PORT_NUM_MAX) {
- jack_error("Jack server started with too much ports %d (when port max can be %d)", server_ptr->port_max.ui, PORT_NUM_MAX);
-@@ -1002,6 +1071,7 @@ jackctl_server_open(
- server_ptr->port_max.ui,
- server_ptr->verbose.b,
- (jack_timer_type_t)server_ptr->clock_source.ui,
-+ self_connect_mode,
- server_ptr->name.str);
- if (server_ptr->engine == NULL)
- {
-diff --git a/common/JackEngine.cpp b/common/JackEngine.cpp
-index 43b50b3..5bdb5b5 100644
---- a/common/JackEngine.cpp
-+++ b/common/JackEngine.cpp
-@@ -38,13 +38,15 @@ namespace Jack
-
- JackEngine::JackEngine(JackGraphManager* manager,
- JackSynchro* table,
-- JackEngineControl* control)
-+ JackEngineControl* control,
-+ JackSelfConnectMode self_connect_mode)
- : JackLockAble(control->fServerName),
- fSignal(control->fServerName)
- {
- fGraphManager = manager;
- fSynchroTable = table;
- fEngineControl = control;
-+ fSelfConnectMode = self_connect_mode;
- for (int i = 0; i < CLIENT_NUM; i++) {
- fClientTable[i] = NULL;
- }
-@@ -816,10 +818,10 @@ int JackEngine::ClientDeactivate(int refnum)
-
- // First disconnect all ports
- for (int i = 0; (i < PORT_NUM_FOR_CLIENT) && (input_ports[i] != EMPTY); i++) {
-- PortDisconnect(refnum, input_ports[i], ALL_PORTS);
-+ PortDisconnect(-1, input_ports[i], ALL_PORTS);
- }
- for (int i = 0; (i < PORT_NUM_FOR_CLIENT) && (output_ports[i] != EMPTY); i++) {
-- PortDisconnect(refnum, output_ports[i], ALL_PORTS);
-+ PortDisconnect(-1, output_ports[i], ALL_PORTS);
- }
-
- // Then issue port registration notification
-@@ -875,7 +877,7 @@ int JackEngine::PortUnRegister(int refnum, jack_port_id_t port_index)
- JackClientInterface* client = fClientTable[refnum];
-
- // Disconnect port ==> notification is sent
-- PortDisconnect(refnum, port_index, ALL_PORTS);
-+ PortDisconnect(-1, port_index, ALL_PORTS);
-
- if (fGraphManager->ReleasePort(refnum, port_index) == 0) {
- if (client->GetClientControl()->fActive) {
-@@ -887,6 +889,72 @@ int JackEngine::PortUnRegister(int refnum, jack_port_id_t port_index)
- }
- }
-
-+// this check is to prevent apps to self connect to other apps
-+// TODO: make this work with multiple clients per app
-+int JackEngine::CheckPortsConnect(int refnum, jack_port_id_t src, jack_port_id_t dst)
-+{
-+ JackPort* src_port = fGraphManager->GetPort(src);
-+ JackPort* dst_port = fGraphManager->GetPort(dst);
-+
-+ jack_log("CheckPortsConnect(caller = %d, src = %d, dst = %d)", refnum, src_port->GetRefNum(), dst_port->GetRefNum());
-+
-+ int src_self = src_port->GetRefNum() == refnum ? 1 : 0;
-+ int dst_self = dst_port->GetRefNum() == refnum ? 1 : 0;
-+
-+ jack_log("src_self is %s", src_self ? "true" : "false");
-+ jack_log("dst_self is %s", dst_self ? "true" : "false");
-+
-+ // 0 means client is connecting other client ports (i.e. control app patchbay functionality)
-+ // 1 means client is connecting its own port to port of other client (i.e. self hooking into system app)
-+ // 2 means client is connecting its own ports (i.e. for app internal functionality)
-+ // TODO: Make this check an engine option and more tweakable (return error or success)
-+ // MAYBE: make the engine option changable on the fly and expose it through client or control API
-+
-+ switch (fSelfConnectMode)
-+ {
-+ case JackSelfConnectFailExternalOnly:
-+ if (src_self + dst_self == 1)
-+ {
-+ jack_info("rejecting port self connect request to external port (%s -> %s)", src_port->GetName(), dst_port->GetName());
-+ return -1;
-+ }
-+
-+ return 1;
-+
-+ case JackSelfConnectIgnoreExternalOnly:
-+ if (src_self + dst_self == 1)
-+ {
-+ jack_info("ignoring port self connect request to external port (%s -> %s)", src_port->GetName(), dst_port->GetName());
-+ return 0;
-+ }
-+
-+ return 1;
-+
-+ case JackSelfConnectFailAll:
-+ if (src_self + dst_self != 0)
-+ {
-+ jack_info("rejecting port self connect request (%s -> %s)", src_port->GetName(), dst_port->GetName());
-+ return -1;
-+ }
-+
-+ return 1;
-+
-+ case JackSelfConnectIgnoreAll:
-+ if (src_self + dst_self != 0)
-+ {
-+ jack_info("ignoring port self connect request (%s -> %s)", src_port->GetName(), dst_port->GetName());
-+ return 0;
-+ }
-+
-+ return 1;
-+
-+ case JackSelfConnectAllow: // fix warning
-+ return 1;
-+ }
-+
-+ return 1;
-+}
-+
- int JackEngine::PortConnect(int refnum, const char* src, const char* dst)
- {
- jack_log("JackEngine::PortConnect src = %s dst = %s", src, dst);
-@@ -927,7 +995,12 @@ int JackEngine::PortConnect(int refnum, jack_port_id_t src, jack_port_id_t dst)
- return -1;
- }
-
-- int res = fGraphManager->Connect(src, dst);
-+ int res = CheckPortsConnect(refnum, src, dst);
-+ if (res != 1) {
-+ return res;
-+ }
-+
-+ res = fGraphManager->Connect(src, dst);
- if (res == 0) {
- NotifyPortConnect(src, dst, true);
- }
-@@ -970,15 +1043,21 @@ int JackEngine::PortDisconnect(int refnum, jack_port_id_t src, jack_port_id_t ds
- }
-
- return ret;
-- } else if (fGraphManager->CheckPorts(src, dst) < 0) {
-- return -1;
-- } else if (fGraphManager->Disconnect(src, dst) == 0) {
-- // Notifications
-- NotifyPortConnect(src, dst, false);
-- return 0;
-- } else {
-+ }
-+
-+ if (fGraphManager->CheckPorts(src, dst) < 0) {
- return -1;
- }
-+
-+ int res = CheckPortsConnect(refnum, src, dst);
-+ if (res != 1) {
-+ return res;
-+ }
-+
-+ res = fGraphManager->Disconnect(src, dst);
-+ if (res == 0)
-+ NotifyPortConnect(src, dst, false);
-+ return res;
- }
-
- int JackEngine::PortRename(int refnum, jack_port_id_t port, const char* name)
-diff --git a/common/JackEngine.h b/common/JackEngine.h
-index ebd3eb1..3393e1c 100644
---- a/common/JackEngine.h
-+++ b/common/JackEngine.h
-@@ -49,6 +49,7 @@ class SERVER_EXPORT JackEngine : public JackLockAble
-
- JackGraphManager* fGraphManager;
- JackEngineControl* fEngineControl;
-+ JackSelfConnectMode fSelfConnectMode;
- JackClientInterface* fClientTable[CLIENT_NUM];
- JackSynchro* fSynchroTable;
- JackServerNotifyChannel fChannel; /*! To communicate between the RT thread and server */
-@@ -94,9 +95,11 @@ class SERVER_EXPORT JackEngine : public JackLockAble
- return (refnum >= 0 && refnum < CLIENT_NUM && fClientTable[refnum] != NULL);
- }
-
-+ int CheckPortsConnect(int refnum, jack_port_id_t src, jack_port_id_t dst);
-+
- public:
-
-- JackEngine(JackGraphManager* manager, JackSynchro* table, JackEngineControl* controler);
-+ JackEngine(JackGraphManager* manager, JackSynchro* table, JackEngineControl* controler, JackSelfConnectMode self_connect_mode);
- ~JackEngine();
-
- int Open();
-diff --git a/common/JackLockedEngine.h b/common/JackLockedEngine.h
-index a1dc807..a02c83c 100644
---- a/common/JackLockedEngine.h
-+++ b/common/JackLockedEngine.h
-@@ -83,8 +83,8 @@ class SERVER_EXPORT JackLockedEngine
-
- public:
-
-- JackLockedEngine(JackGraphManager* manager, JackSynchro* table, JackEngineControl* controler):
-- fEngine(manager, table, controler)
-+ JackLockedEngine(JackGraphManager* manager, JackSynchro* table, JackEngineControl* controler, JackSelfConnectMode self_connect_mode):
-+ fEngine(manager, table, controler, self_connect_mode)
- {}
- ~JackLockedEngine()
- {}
-diff --git a/common/JackServer.cpp b/common/JackServer.cpp
-index b7e7639..5247104 100644
---- a/common/JackServer.cpp
-+++ b/common/JackServer.cpp
-@@ -37,7 +37,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- namespace Jack
- {
-
--JackServer::JackServer(bool sync, bool temporary, int timeout, bool rt, int priority, int port_max, bool verbose, jack_timer_type_t clock, const char* server_name)
-+JackServer::JackServer(bool sync, bool temporary, int timeout, bool rt, int priority, int port_max, bool verbose, jack_timer_type_t clock, JackSelfConnectMode self_connect_mode, const char* server_name)
- {
- if (rt) {
- jack_info("JACK server starting in realtime mode with priority %ld", priority);
-@@ -47,7 +47,7 @@ JackServer::JackServer(bool sync, bool temporary, int timeout, bool rt, int prio
-
- fGraphManager = JackGraphManager::Allocate(port_max);
- fEngineControl = new JackEngineControl(sync, temporary, timeout, rt, priority, verbose, clock, server_name);
-- fEngine = new JackLockedEngine(fGraphManager, GetSynchroTable(), fEngineControl);
-+ fEngine = new JackLockedEngine(fGraphManager, GetSynchroTable(), fEngineControl, self_connect_mode);
-
- // A distinction is made between the threaded freewheel driver and the
- // regular freewheel driver because the freewheel driver needs to run in
-diff --git a/common/JackServer.h b/common/JackServer.h
-index 0403272..f288d05 100644
---- a/common/JackServer.h
-+++ b/common/JackServer.h
-@@ -64,7 +64,7 @@ class SERVER_EXPORT JackServer
-
- public:
-
-- JackServer(bool sync, bool temporary, int timeout, bool rt, int priority, int port_max, bool verbose, jack_timer_type_t clock, const char* server_name);
-+ JackServer(bool sync, bool temporary, int timeout, bool rt, int priority, int port_max, bool verbose, jack_timer_type_t clock, JackSelfConnectMode self_connect_mode, const char* server_name);
- ~JackServer();
-
- int Open(jack_driver_desc_t* driver_desc, JSList* driver_params);
-diff --git a/common/JackServerGlobals.cpp b/common/JackServerGlobals.cpp
-index 21feb7f..a10d7f2 100644
---- a/common/JackServerGlobals.cpp
-+++ b/common/JackServerGlobals.cpp
-@@ -48,10 +48,11 @@ int JackServerGlobals::Start(const char* server_name,
- int priority,
- int port_max,
- int verbose,
-- jack_timer_type_t clock)
-+ jack_timer_type_t clock,
-+ JackSelfConnectMode self_connect_mode)
- {
- jack_log("Jackdmp: sync = %ld timeout = %ld rt = %ld priority = %ld verbose = %ld ", sync, time_out_ms, rt, priority, verbose);
-- new JackServer(sync, temporary, time_out_ms, rt, priority, port_max, verbose, clock, server_name); // Will setup fInstance and fUserCount globals
-+ new JackServer(sync, temporary, time_out_ms, rt, priority, port_max, verbose, clock, self_connect_mode, server_name); // Will setup fInstance and fUserCount globals
- int res = fInstance->Open(driver_desc, driver_params);
- return (res < 0) ? res : fInstance->Start();
- }
-@@ -335,7 +336,7 @@ bool JackServerGlobals::Init()
- free(argv[i]);
- }
-
-- int res = Start(server_name, driver_desc, master_driver_params, sync, temporary, client_timeout, realtime, realtime_priority, port_max, verbose_aux, clock_source);
-+ int res = Start(server_name, driver_desc, master_driver_params, sync, temporary, client_timeout, realtime, realtime_priority, port_max, verbose_aux, clock_source, JACK_DEFAULT_SELF_CONNECT_MODE);
- if (res < 0) {
- jack_error("Cannot start server... exit");
- Delete();
-diff --git a/common/JackServerGlobals.h b/common/JackServerGlobals.h
-index 69b8979..47e9460 100644
---- a/common/JackServerGlobals.h
-+++ b/common/JackServerGlobals.h
-@@ -61,7 +61,8 @@ struct SERVER_EXPORT JackServerGlobals
- int priority,
- int port_max,
- int verbose,
-- jack_timer_type_t clock);
-+ jack_timer_type_t clock,
-+ JackSelfConnectMode self_connect_mode);
- static void Stop();
- static void Delete();
- };
-diff --git a/common/JackTypes.h b/common/JackTypes.h
-index b4bad8d..a5a883e 100644
---- a/common/JackTypes.h
-+++ b/common/JackTypes.h
-@@ -55,4 +55,14 @@ typedef enum {
- Finished,
- } jack_client_state_t;
-
-+
-+enum JackSelfConnectMode
-+{
-+ JackSelfConnectAllow,
-+ JackSelfConnectFailExternalOnly,
-+ JackSelfConnectIgnoreExternalOnly,
-+ JackSelfConnectFailAll,
-+ JackSelfConnectIgnoreAll,
-+};
-+
- #endif
-diff --git a/common/Jackdmp.cpp b/common/Jackdmp.cpp
-index 2aec190..b793c2a 100644
---- a/common/Jackdmp.cpp
-+++ b/common/Jackdmp.cpp
-@@ -184,8 +184,8 @@ int main(int argc, char** argv)
- jackctl_driver_t * master_driver_ctl;
- jackctl_driver_t * loopback_driver_ctl = NULL;
- int replace_registry = 0;
--
- const char *options = "-d:X:I:P:uvshVrRL:STFl:t:mn:p:"
-+ "a:"
- #ifdef __linux__
- "c:"
- #endif
-@@ -215,6 +215,7 @@ int main(int argc, char** argv)
- { "version", 0, 0, 'V' },
- { "silent", 0, 0, 's' },
- { "sync", 0, 0, 'S' },
-+ { "autoconnect", 1, 0, 'a' },
- { 0, 0, 0, 0 }
- };
-
-@@ -277,6 +278,26 @@ int main(int argc, char** argv)
- break;
- #endif
-
-+ case 'a':
-+ param = jackctl_get_parameter(server_parameters, "self-connect-mode");
-+ if (param != NULL) {
-+ bool value_valid = false;
-+ for (uint32_t k=0; k<jackctl_parameter_get_enum_constraints_count( param ); k++ ) {
-+ value = jackctl_parameter_get_enum_constraint_value( param, k );
-+ if( value.c == optarg[0] )
-+ value_valid = true;
-+ }
-+
-+ if( value_valid ) {
-+ value.c = optarg[0];
-+ jackctl_parameter_set_value(param, &value);
-+ } else {
-+ usage(stdout);
-+ goto destroy_server;
-+ }
-+ }
-+ break;
-+
- case 'd':
- master_driver_name = optarg;
- break;
Copied: trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-1.9.10.ebuild (from rev 2898, trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-1.9.9.5-r2.ebuild)
===================================================================
--- trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-1.9.10.ebuild (rev 0)
+++ trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-1.9.10.ebuild 2014-11-26 15:48:57 UTC (rev 2899)
@@ -0,0 +1,98 @@
+# Copyright 1999-2014 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
+inherit eutils python-single-r1 waf-utils multilib-minimal
+
+DESCRIPTION="Jackdmp jack implemention for multi-processor machine"
+HOMEPAGE="http://jackaudio.org/";
+
+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";
+ KEYWORDS="~amd64 ~ppc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="alsa celt dbus debug doc ieee1394 opus pam"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# Remove when multilib libffado is available.
+REQUIRED_USE="${REQUIRED_USE} amd64? ( abi_x86_32? ( !ieee1394 ) )"
+
+RDEPEND="media-libs/libsamplerate[${MULTILIB_USEDEP}]
+ >=media-libs/libsndfile-1.0.0[${MULTILIB_USEDEP}]
+ ${PYTHON_DEPS}
+ alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+ celt? ( media-libs/celt[${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(-)] )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ doc? ( app-doc/doxygen )"
+RDEPEND="${RDEPEND}
+ dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
+ pam? ( sys-auth/realtime-base )"
+
+[[ "${PV}" = "2.9999" ]] || S="${WORKDIR}/jack-${PV}"
+
+DOCS=( ChangeLog README README_NETJACK2 TODO )
+
+src_unpack() {
+ if [[ "${PV}" = "2.9999" ]]; then
+ git-2_src_unpack
+ else
+ default
+ fi
+}
+
+src_prepare() {
+ default
+ multilib_copy_sources
+}
+
+multilib_src_configure() {
+ local mywafconfargs=(
+ $(usex alsa --alsa "")
+ $(usex dbus --dbus --classic)
+ $(usex debug --debug "")
+ $(usex ieee1394 --firewire "")
+ )
+
+ WAF_BINARY="${BUILD_DIR}"/waf waf-utils_src_configure \
+ ${mywafconfargs[@]}
+}
+
+multilib_src_compile() {
+ WAF_BINARY="${BUILD_DIR}"/waf waf-utils_src_compile
+
+ if multilib_is_native_abi && use doc; then
+ doxygen || die "doxygen failed"
+ fi
+}
+
+multilib_src_install() {
+ multilib_is_native_abi && use doc && \
+ HTML_DOCS=( "${BUILD_DIR}"/html/ )
+ WAF_BINARY="${BUILD_DIR}"/waf waf-utils_src_install
+}
+
+multilib_src_install_all() {
+ python_fix_shebang "${ED}"
+}
Deleted: trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-1.9.9.5-r1.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-1.9.9.5-r1.ebuild 2014-11-04 08:25:37 UTC (rev 2898)
+++ trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-1.9.9.5-r1.ebuild 2014-11-26 15:48:57 UTC (rev 2899)
@@ -1,75 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-inherit eutils python-single-r1 waf-utils
-
-RESTRICT="mirror"
-DESCRIPTION="Jackdmp jack implemention for multi-processor machine"
-HOMEPAGE="http://www.jackaudio.org";
-SRC_URI="https://dl.dropbox.com/u/28869550/jack-${PV}.tar.bz2";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="alsa dbus debug doc freebob ieee1394 mixed"
-
-RDEPEND="media-libs/libsamplerate
- >=media-libs/libsndfile-1.0.0
- alsa? ( >=media-libs/alsa-lib-0.9.1 )
- dbus? ( sys-apps/dbus )
- freebob? ( sys-libs/libfreebob !media-libs/libffado )
- ieee1394? ( media-libs/libffado !sys-libs/libfreebob )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- doc? ( app-doc/doxygen )"
-RDEPEND="${RDEPEND}
- dbus? ( dev-python/dbus-python )"
-
-S="${WORKDIR}/jack-${PV}"
-
-PATCHES=(
- "${FILESDIR}/jack2-no-self-connect-1.9.9.5.patch"
- "${FILESDIR}/jack-1.9.9.5-opus_custom.patch"
-)
-
-DOCS=( ChangeLog README README_NETJACK2 TODO )
-
-pkg_pretend() {
- if use mixed; then
- ewarn 'You are about to build with "mixed" use flag.'
- ewarn 'The build will probably fail.'
- ewarn 'This is a known issue and a fix is coming eventually.'
- fi
-}
-
-src_configure() {
- local mywafconfargs=(
- $(usex alsa --alsa "")
- $(usex dbus --dbus --classic)
- $(usex debug --debug "")
- $(usex freebob --freebob "")
- $(usex ieee1394 --firewire "")
- $(usex mixed --mixed "")
- )
-
- waf-utils_src_configure ${mywafconfargs[@]}
-}
-
-src_compile() {
- waf-utils_src_compile
-
- if use doc; then
- doxygen || die "doxygen failed"
- fi
-}
-
-src_install() {
- use doc && HTML_DOCS=( html/ )
- waf-utils_src_install
-
- python_fix_shebang "${ED}"
-}
Deleted: trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-1.9.9.5-r2.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-1.9.9.5-r2.ebuild 2014-11-04 08:25:37 UTC (rev 2898)
+++ trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-1.9.9.5-r2.ebuild 2014-11-26 15:48:57 UTC (rev 2899)
@@ -1,97 +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 mixed features in the build system are not used. We let the
-# multilib eclasses do all the work.
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-inherit eutils python-single-r1 waf-utils multilib-minimal
-
-RESTRICT="mirror"
-DESCRIPTION="Jackdmp jack implemention for multi-processor machine"
-HOMEPAGE="http://www.jackaudio.org";
-SRC_URI="https://dl.dropbox.com/u/28869550/jack-${PV}.tar.bz2";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="alsa celt dbus debug doc ieee1394 opus"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# Remove when multilib dbus is available.
-REQUIRED_USE="${REQUIRED_USE} amd64? ( abi_x86_32? ( !dbus ) )"
-
-# Remove when multilib libffado is available.
-REQUIRED_USE="${REQUIRED_USE} amd64? ( abi_x86_32? ( !ieee1394 ) )"
-
-RDEPEND="media-libs/libsamplerate[${MULTILIB_USEDEP}]
- >=media-libs/libsndfile-1.0.0[${MULTILIB_USEDEP}]
- ${PYTHON_DEPS}
- alsa? ( >=media-libs/alsa-lib-0.9.1[${MULTILIB_USEDEP}] )
- celt? ( media-libs/celt[${MULTILIB_USEDEP}] )
- dbus? ( sys-apps/dbus )
- 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(-)] )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- doc? ( app-doc/doxygen )"
-RDEPEND="${RDEPEND}
- dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/jack-${PV}"
-
-PATCHES=(
- "${FILESDIR}/jack2-no-self-connect-1.9.9.5.patch"
- "${FILESDIR}/jack-1.9.9.5-opus_custom.patch"
-)
-
-DOCS=( ChangeLog README README_NETJACK2 TODO )
-
-src_prepare() {
- default
- multilib_copy_sources
-}
-
-multilib_src_configure() {
- local mywafconfargs=(
- $(usex alsa --alsa "")
- $(usex dbus --dbus --classic)
- $(usex debug --debug "")
- $(usex ieee1394 --firewire "")
- )
-
- WAF_BINARY="${BUILD_DIR}"/waf waf-utils_src_configure \
- ${mywafconfargs[@]}
-}
-
-multilib_src_compile() {
- WAF_BINARY="${BUILD_DIR}"/waf waf-utils_src_compile
-
- if multilib_is_native_abi && use doc; then
- doxygen || die "doxygen failed"
- fi
-}
-
-multilib_src_install() {
- multilib_is_native_abi && use doc && HTML_DOCS=( html/ )
-
- WAF_BINARY="${BUILD_DIR}"/waf waf-utils_src_install
-}
-
-multilib_src_install_all() {
- python_fix_shebang "${ED}"
-}
Deleted: trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-2.9999-r1.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-2.9999-r1.ebuild 2014-11-04 08:25:37 UTC (rev 2898)
+++ trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-2.9999-r1.ebuild 2014-11-26 15:48:57 UTC (rev 2899)
@@ -1,94 +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 mixed features in the build system are not used. We let the
-# multilib eclasses do all the work.
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-inherit eutils git-2 python-single-r1 waf-utils multilib-minimal
-
-DESCRIPTION="Jackdmp jack implemention for multi-processor machine"
-HOMEPAGE="http://jackaudio.org/";
-
-EGIT_REPO_URI="git://github.com/jackaudio/jack2.git"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="alsa celt debug doc dbus ieee1394 opus pam"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# Remove when multilib dbus is available.
-REQUIRED_USE="${REQUIRED_USE} amd64? ( abi_x86_32? ( !dbus ) )"
-
-# Remove when multilib libffado is available.
-REQUIRED_USE="${REQUIRED_USE} amd64? ( abi_x86_32? ( !ieee1394 ) )"
-
-RDEPEND="media-libs/libsamplerate[${MULTILIB_USEDEP}]
- >=media-libs/libsndfile-1.0.0[${MULTILIB_USEDEP}]
- ${PYTHON_DEPS}
- alsa? ( >=media-libs/alsa-lib-1.0.24[${MULTILIB_USEDEP}] )
- celt? ( media-libs/celt[${MULTILIB_USEDEP}] )
- dbus? ( sys-apps/dbus )
- 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(-)] )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- doc? ( app-doc/doxygen )"
-RDEPEND="${RDEPEND}
- dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
- pam? ( sys-auth/realtime-base )"
-
-DOCS=( ChangeLog README README_NETJACK2 TODO )
-
-src_unpack() {
- git-2_src_unpack
-}
-
-src_prepare() {
- default
- multilib_copy_sources
-}
-
-multilib_src_configure() {
- local mywafconfargs=(
- $(usex alsa --alsa "")
- $(usex dbus --dbus --classic)
- $(usex debug --debug "")
- $(usex ieee1394 --firewire "")
- )
-
- WAF_BINARY="${BUILD_DIR}"/waf waf-utils_src_configure \
- ${mywafconfargs[@]}
-}
-
-multilib_src_compile() {
- WAF_BINARY="${BUILD_DIR}"/waf waf-utils_src_compile
-
- if multilib_is_native_abi && use doc; then
- doxygen || die "doxygen failed"
- fi
-}
-
-multilib_src_install() {
- multilib_is_native_abi && use doc && HTML_DOCS=( "${BUILD_DIR}"/html/ )
- WAF_BINARY="${BUILD_DIR}"/waf waf-utils_src_install
-}
-
-multilib_src_install_all() {
- 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 2014-11-04 08:25:37 UTC (rev 2898)
+++ trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-2.9999.ebuild 2014-11-26 15:48:57 UTC (rev 2899)
@@ -1,74 +1,98 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 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 )
-inherit eutils git-2 python-single-r1 waf-utils
+[[ "${PV}" = "2.9999" ]] && inherit git-2
+inherit eutils python-single-r1 waf-utils multilib-minimal
DESCRIPTION="Jackdmp jack implemention for multi-processor machine"
HOMEPAGE="http://jackaudio.org/";
-EGIT_REPO_URI="git://github.com/jackaudio/jack2.git"
+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";
+ KEYWORDS="~amd64 ~ppc ~x86"
+fi
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS=""
-IUSE="alsa debug doc dbus freebob ieee1394 mixed opus pam"
+IUSE="alsa celt dbus debug doc ieee1394 opus pam"
-RDEPEND="media-libs/libsamplerate
- >=media-libs/libsndfile-1.0.0
- alsa? ( >=media-libs/alsa-lib-1.0.24 )
- dbus? ( sys-apps/dbus )
- freebob? ( sys-libs/libfreebob !media-libs/libffado )
- ieee1394? ( media-libs/libffado !sys-libs/libfreebob )
- opus? ( media-libs/opus[custom-modes] )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# Remove when multilib libffado is available.
+REQUIRED_USE="${REQUIRED_USE} amd64? ( abi_x86_32? ( !ieee1394 ) )"
+
+RDEPEND="media-libs/libsamplerate[${MULTILIB_USEDEP}]
+ >=media-libs/libsndfile-1.0.0[${MULTILIB_USEDEP}]
+ ${PYTHON_DEPS}
+ alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+ celt? ( media-libs/celt[${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(-)] )"
DEPEND="${RDEPEND}
virtual/pkgconfig
doc? ( app-doc/doxygen )"
RDEPEND="${RDEPEND}
- dbus? ( dev-python/dbus-python )
+ dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
pam? ( sys-auth/realtime-base )"
+[[ "${PV}" = "2.9999" ]] || S="${WORKDIR}/jack-${PV}"
+
DOCS=( ChangeLog README README_NETJACK2 TODO )
-pkg_pretend() {
- if use mixed; then
- ewarn 'You are about to build with "mixed" use flag.'
- ewarn 'The build will probably fail.'
- ewarn 'This is a known issue and a fix is coming eventually.'
+src_unpack() {
+ if [[ "${PV}" = "2.9999" ]]; then
+ git-2_src_unpack
+ else
+ default
fi
}
-src_unpack() {
- git-2_src_unpack
+src_prepare() {
+ default
+ multilib_copy_sources
}
-src_configure() {
+multilib_src_configure() {
local mywafconfargs=(
$(usex alsa --alsa "")
$(usex dbus --dbus --classic)
$(usex debug --debug "")
- $(usex freebob --freebob "")
$(usex ieee1394 --firewire "")
- $(usex mixed --mixed "")
)
- waf-utils_src_configure ${mywafconfargs[@]}
+ WAF_BINARY="${BUILD_DIR}"/waf waf-utils_src_configure \
+ ${mywafconfargs[@]}
}
-src_compile() {
- waf-utils_src_compile
+multilib_src_compile() {
+ WAF_BINARY="${BUILD_DIR}"/waf waf-utils_src_compile
- if use doc; then
+ if multilib_is_native_abi && use doc; then
doxygen || die "doxygen failed"
fi
}
-src_install() {
- use doc && HTML_DOCS=( html/ )
- waf-utils_src_install
+multilib_src_install() {
+ multilib_is_native_abi && use doc && \
+ HTML_DOCS=( "${BUILD_DIR}"/html/ )
+ WAF_BINARY="${BUILD_DIR}"/waf waf-utils_src_install
+}
+multilib_src_install_all() {
python_fix_shebang "${ED}"
}
Modified: trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/metadata.xml
===================================================================
--- trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/metadata.xml 2014-11-04 08:25:37 UTC (rev 2898)
+++ trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/metadata.xml 2014-11-26 15:48:57 UTC (rev 2899)
@@ -12,7 +12,6 @@
<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="mixed">build with 32/64 bits mixed mode</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>
Modified: trunk/overlays/proaudio/profiles/package.mask
===================================================================
--- trunk/overlays/proaudio/profiles/package.mask 2014-11-04 08:25:37 UTC (rev 2898)
+++ trunk/overlays/proaudio/profiles/package.mask 2014-11-26 15:48:57 UTC (rev 2899)
@@ -12,9 +12,7 @@
# under active developement.
=media-libs/portaudio-9999-r1
=media-sound/jack-audio-connection-kit-0.121.3-r2
-=media-sound/jack-audio-connection-kit-1.9.9.5-r2
=media-sound/jack-audio-connection-kit-1.9999-r1
-=media-sound/jack-audio-connection-kit-2.9999-r1
# Dominique Michel <dominique@xxxxxxxxxxxxx> 09 Mar (2013)
# Pld qt3 version, need bump to a qt4 version or removing