Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/tap-reverbed/files/, media-sound/tap-reverbed/
Date: Mon, 28 Dec 2020 14:16:10
Message-Id: 1609164938.ef3a89f0fd63f5515029bdb7c55be88716578cc4.soap@gentoo
1 commit: ef3a89f0fd63f5515029bdb7c55be88716578cc4
2 Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
3 AuthorDate: Mon Dec 28 14:15:38 2020 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Mon Dec 28 14:15:38 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef3a89f0
7
8 media-sound/tap-reverbed: Port to EAPI 7
9
10 Closes: https://bugs.gentoo.org/707858
11 Package-Manager: Portage-3.0.9, Repoman-3.0.1
12 Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
13 Signed-off-by: David Seifert <soap <AT> gentoo.org>
14
15 .../files/tap-reverbed-0-fno-common.patch | 65 ++++++++++++++++++++++
16 media-sound/tap-reverbed/tap-reverbed-0-r1.ebuild | 24 ++++----
17 2 files changed, 79 insertions(+), 10 deletions(-)
18
19 diff --git a/media-sound/tap-reverbed/files/tap-reverbed-0-fno-common.patch b/media-sound/tap-reverbed/files/tap-reverbed-0-fno-common.patch
20 new file mode 100644
21 index 00000000000..c01461f62f0
22 --- /dev/null
23 +++ b/media-sound/tap-reverbed/files/tap-reverbed-0-fno-common.patch
24 @@ -0,0 +1,65 @@
25 +--- a/src/ports.c
26 ++++ b/src/ports.c
27 +@@ -37,6 +37,16 @@
28 + #define LIST_WIDTH 200
29 + #define LIST_HEIGHT 100
30 +
31 ++extern unsigned long sample_rate;
32 ++extern jack_client_t * client;
33 ++extern const char ** ports_in;
34 ++extern const char ** ports_out;
35 ++
36 ++extern jack_port_t * in_L_port;
37 ++extern jack_port_t * in_R_port;
38 ++extern jack_port_t * out_L_port;
39 ++extern jack_port_t * out_R_port;
40 ++
41 +
42 + extern GtkWidget * ports_button;
43 +
44 +--- a/src/sound.c
45 ++++ b/src/sound.c
46 +@@ -44,6 +44,16 @@
47 + */
48 + /* #define REVERBED_CALC_FLOAT */
49 +
50 ++unsigned long sample_rate;
51 ++jack_client_t * client;
52 ++const char ** ports_in;
53 ++const char ** ports_out;
54 ++
55 ++jack_port_t * in_L_port;
56 ++jack_port_t * in_R_port;
57 ++jack_port_t * out_L_port;
58 ++jack_port_t * out_R_port;
59 ++
60 +
61 + extern int client_running;
62 + extern REVTYPE * curr;
63 +--- a/src/sound.h
64 ++++ b/src/sound.h
65 +@@ -24,15 +24,15 @@
66 +
67 +
68 +
69 +-unsigned long sample_rate;
70 +-jack_client_t * client;
71 +-const char ** ports_in;
72 +-const char ** ports_out;
73 +-
74 +-jack_port_t * in_L_port;
75 +-jack_port_t * in_R_port;
76 +-jack_port_t * out_L_port;
77 +-jack_port_t * out_R_port;
78 ++extern unsigned long sample_rate;
79 ++extern jack_client_t * client;
80 ++extern const char ** ports_in;
81 ++extern const char ** ports_out;
82 ++
83 ++extern jack_port_t * in_L_port;
84 ++extern jack_port_t * in_R_port;
85 ++extern jack_port_t * out_L_port;
86 ++extern jack_port_t * out_R_port;
87 +
88 + void comp_coeffs(void);
89 + void load_revtype_data(void);
90
91 diff --git a/media-sound/tap-reverbed/tap-reverbed-0-r1.ebuild b/media-sound/tap-reverbed/tap-reverbed-0-r1.ebuild
92 index cb0e9050ffb..94d080247be 100644
93 --- a/media-sound/tap-reverbed/tap-reverbed-0-r1.ebuild
94 +++ b/media-sound/tap-reverbed/tap-reverbed-0-r1.ebuild
95 @@ -1,7 +1,7 @@
96 -# Copyright 1999-2016 Gentoo Foundation
97 +# Copyright 1999-2020 Gentoo Authors
98 # Distributed under the terms of the GNU General Public License v2
99
100 -EAPI=6
101 +EAPI=7
102
103 inherit autotools
104
105 @@ -13,17 +13,21 @@ SRC_URI="mirror://sourceforge/tap-plugins/${MY_P}.tar.gz"
106 LICENSE="GPL-2"
107 SLOT="0"
108 KEYWORDS="~amd64 ~ppc ~x86"
109 -IUSE=""
110
111 -RDEPEND="media-libs/ladspa-sdk
112 +RDEPEND="
113 + media-libs/ladspa-sdk
114 media-plugins/tap-plugins
115 - x11-libs/gtk+:2
116 - media-sound/jack-audio-connection-kit"
117 -DEPEND="${RDEPEND}
118 - virtual/pkgconfig"
119 + media-sound/jack-audio-connection-kit
120 + x11-libs/gtk+:2"
121 +DEPEND="${RDEPEND}"
122 +BDEPEND="virtual/pkgconfig"
123
124 -S=${WORKDIR}/${MY_P}
125 -PATCHES=( "${FILESDIR}/${PN}-flags.patch" )
126 +S="${WORKDIR}/${MY_P}"
127 +
128 +PATCHES=(
129 + "${FILESDIR}"/${PN}-flags.patch
130 + "${FILESDIR}"/${P}-fno-common.patch
131 +)
132
133 src_prepare() {
134 default