1 |
commit: 851145859f1181a157d68226ab5f56c5c7be31fe |
2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Nov 2 20:53:44 2019 +0000 |
4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Nov 2 20:54:05 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85114585 |
7 |
|
8 |
media-sound/jack-{1.9.13-r1,9999}: bug #699124 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/699124 |
11 |
Package-Manager: Portage-2.3.78, Repoman-2.3.17 |
12 |
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> |
13 |
|
14 |
.../jack2/{jack2-9999.ebuild => jack2-1.9.13-r1.ebuild} | 17 ++++++++++------- |
15 |
media-sound/jack2/jack2-9999.ebuild | 4 +++- |
16 |
media-sound/jack2/metadata.xml | 1 + |
17 |
3 files changed, 14 insertions(+), 8 deletions(-) |
18 |
|
19 |
diff --git a/media-sound/jack2/jack2-9999.ebuild b/media-sound/jack2/jack2-1.9.13-r1.ebuild |
20 |
similarity index 84% |
21 |
copy from media-sound/jack2/jack2-9999.ebuild |
22 |
copy to media-sound/jack2/jack2-1.9.13-r1.ebuild |
23 |
index 45dd8b8c38a..8232a61efb4 100644 |
24 |
--- a/media-sound/jack2/jack2-9999.ebuild |
25 |
+++ b/media-sound/jack2/jack2-1.9.13-r1.ebuild |
26 |
@@ -3,7 +3,7 @@ |
27 |
|
28 |
EAPI=6 |
29 |
|
30 |
-PYTHON_COMPAT=( python3_5 python3_6 python3_7 ) |
31 |
+PYTHON_COMPAT=( python2_7 python3_5 python3_6 python3_7 ) |
32 |
PYTHON_REQ_USE="threads(+)" |
33 |
inherit python-single-r1 waf-utils multilib-minimal |
34 |
|
35 |
@@ -23,12 +23,13 @@ fi |
36 |
|
37 |
LICENSE="GPL-2" |
38 |
SLOT="2" |
39 |
-IUSE="alsa +classic dbus doc ieee1394 libsamplerate opus pam readline sndfile" |
40 |
+IUSE="alsa +classic dbus doc ieee1394 libsamplerate metadata opus pam readline sndfile" |
41 |
|
42 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE} |
43 |
+REQUIRED_USE=" |
44 |
+ ${PYTHON_REQUIRED_USE} |
45 |
|| ( classic dbus )" |
46 |
|
47 |
-COMMON_DEPEND="${PYTHON_DEPS} |
48 |
+CDEPEND="${PYTHON_DEPS} |
49 |
media-libs/libsamplerate |
50 |
media-libs/libsndfile |
51 |
sys-libs/readline:0= |
52 |
@@ -38,16 +39,17 @@ COMMON_DEPEND="${PYTHON_DEPS} |
53 |
sys-apps/dbus[${MULTILIB_USEDEP}] |
54 |
) |
55 |
ieee1394? ( media-libs/libffado:=[${MULTILIB_USEDEP}] ) |
56 |
+ metadata? ( sys-libs/db ) |
57 |
opus? ( media-libs/opus[custom-modes,${MULTILIB_USEDEP}] )" |
58 |
-DEPEND="${COMMON_DEPEND} |
59 |
+DEPEND="${CDEPEND} |
60 |
virtual/pkgconfig |
61 |
doc? ( app-doc/doxygen )" |
62 |
-RDEPEND="${COMMON_DEPEND} |
63 |
+RDEPEND="${CDEPEND} |
64 |
dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] ) |
65 |
pam? ( sys-auth/realtime-base ) |
66 |
!media-sound/jack-audio-connection-kit:0" |
67 |
|
68 |
-DOCS=( AUTHORS.rst ChangeLog.rst README.rst README_NETJACK2 ) |
69 |
+DOCS=( ChangeLog.rst README.rst README_NETJACK2 ) |
70 |
|
71 |
src_prepare() { |
72 |
default |
73 |
@@ -61,6 +63,7 @@ multilib_src_configure() { |
74 |
$(usex classic --classic "") |
75 |
--alsa=$(usex alsa yes no) |
76 |
--celt=no |
77 |
+ --db=$(usex metadata yes no) |
78 |
--doxygen=$(multilib_native_usex doc yes no) |
79 |
--firewire=$(usex ieee1394 yes no) |
80 |
--iio=no |
81 |
|
82 |
diff --git a/media-sound/jack2/jack2-9999.ebuild b/media-sound/jack2/jack2-9999.ebuild |
83 |
index 45dd8b8c38a..4e310216955 100644 |
84 |
--- a/media-sound/jack2/jack2-9999.ebuild |
85 |
+++ b/media-sound/jack2/jack2-9999.ebuild |
86 |
@@ -23,7 +23,7 @@ fi |
87 |
|
88 |
LICENSE="GPL-2" |
89 |
SLOT="2" |
90 |
-IUSE="alsa +classic dbus doc ieee1394 libsamplerate opus pam readline sndfile" |
91 |
+IUSE="alsa +classic dbus doc ieee1394 libsamplerate metadata opus pam readline sndfile" |
92 |
|
93 |
REQUIRED_USE="${PYTHON_REQUIRED_USE} |
94 |
|| ( classic dbus )" |
95 |
@@ -38,6 +38,7 @@ COMMON_DEPEND="${PYTHON_DEPS} |
96 |
sys-apps/dbus[${MULTILIB_USEDEP}] |
97 |
) |
98 |
ieee1394? ( media-libs/libffado:=[${MULTILIB_USEDEP}] ) |
99 |
+ metadata? ( sys-libs/db ) |
100 |
opus? ( media-libs/opus[custom-modes,${MULTILIB_USEDEP}] )" |
101 |
DEPEND="${COMMON_DEPEND} |
102 |
virtual/pkgconfig |
103 |
@@ -61,6 +62,7 @@ multilib_src_configure() { |
104 |
$(usex classic --classic "") |
105 |
--alsa=$(usex alsa yes no) |
106 |
--celt=no |
107 |
+ --db=$(usex metadata yes no) |
108 |
--doxygen=$(multilib_native_usex doc yes no) |
109 |
--firewire=$(usex ieee1394 yes no) |
110 |
--iio=no |
111 |
|
112 |
diff --git a/media-sound/jack2/metadata.xml b/media-sound/jack2/metadata.xml |
113 |
index 7956a5fa461..61e6667c2b4 100644 |
114 |
--- a/media-sound/jack2/metadata.xml |
115 |
+++ b/media-sound/jack2/metadata.xml |
116 |
@@ -10,6 +10,7 @@ |
117 |
</upstream> |
118 |
<use> |
119 |
<flag name="classic">Enable building of jackd</flag> |
120 |
+ <flag name="metadata">Enable metadata API</flag> |
121 |
<flag name="pam">Add basic realtime configuration via <pkg>sys-auth/realtime-base</pkg></flag> |
122 |
</use> |
123 |
</pkgmetadata> |