1 |
commit: a5913c6b5fb3f70f6e660c98259abeb3457d2e64 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jul 31 03:34:39 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jul 31 03:34:39 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5913c6b |
7 |
|
8 |
media-libs/libpulse: drop 16.0-r1 |
9 |
|
10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
11 |
|
12 |
.../pulseaudio-16.0-fix-pactl-volume-command.patch | 55 ------ |
13 |
media-libs/libpulse/libpulse-16.0-r1.ebuild | 204 --------------------- |
14 |
2 files changed, 259 deletions(-) |
15 |
|
16 |
diff --git a/media-libs/libpulse/files/pulseaudio-16.0-fix-pactl-volume-command.patch b/media-libs/libpulse/files/pulseaudio-16.0-fix-pactl-volume-command.patch |
17 |
deleted file mode 100644 |
18 |
index 469aaa345102..000000000000 |
19 |
--- a/media-libs/libpulse/files/pulseaudio-16.0-fix-pactl-volume-command.patch |
20 |
+++ /dev/null |
21 |
@@ -1,55 +0,0 @@ |
22 |
-https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/commit/05c06afa58e30b7958e96766d1e917099c8a4041 |
23 |
- |
24 |
-From 05c06afa58e30b7958e96766d1e917099c8a4041 Mon Sep 17 00:00:00 2001 |
25 |
-From: Sean Greenslade <sean@××××××××××××××.com> |
26 |
-Date: Sat, 4 Jun 2022 00:24:49 -0700 |
27 |
-Subject: [PATCH] pactl: fix parsing of percentages with decimal points |
28 |
- |
29 |
-The logic for detecting which type of volume was given incorrectly interpreted |
30 |
-any value with a decimal as a VOL_LINEAR. It also could set multiple flags, |
31 |
-which would put the flags variable into an indeterminate state. Additionally, |
32 |
-the flags stack variable was uninitialized which could also lead to an |
33 |
-indeterminate flag state. |
34 |
- |
35 |
-Percentages are now prioritized over all other types, and only one type flag |
36 |
-can be set. |
37 |
---- |
38 |
- src/utils/pactl.c | 8 ++++---- |
39 |
- 1 file changed, 4 insertions(+), 4 deletions(-) |
40 |
- |
41 |
-diff --git a/src/utils/pactl.c b/src/utils/pactl.c |
42 |
-index 35163f277..2761ebaaf 100644 |
43 |
---- a/src/utils/pactl.c |
44 |
-+++ b/src/utils/pactl.c |
45 |
-@@ -2527,16 +2527,16 @@ static int parse_volume(const char *vol_spec, pa_volume_t *vol, enum volume_flag |
46 |
- vs = pa_xstrdup(vol_spec); |
47 |
- |
48 |
- *vol_flags = (pa_startswith(vs, "+") || pa_startswith(vs, "-")) ? VOL_RELATIVE : VOL_ABSOLUTE; |
49 |
-- if (strchr(vs, '.')) |
50 |
-- *vol_flags |= VOL_LINEAR; |
51 |
- if (pa_endswith(vs, "%")) { |
52 |
- *vol_flags |= VOL_PERCENT; |
53 |
- vs[strlen(vs)-1] = 0; |
54 |
- } |
55 |
-- if (pa_endswith(vs, "db") || pa_endswith(vs, "dB")) { |
56 |
-+ else if (pa_endswith(vs, "db") || pa_endswith(vs, "dB")) { |
57 |
- *vol_flags |= VOL_DECIBEL; |
58 |
- vs[strlen(vs)-2] = 0; |
59 |
- } |
60 |
-+ else if (strchr(vs, '.')) |
61 |
-+ *vol_flags |= VOL_LINEAR; |
62 |
- |
63 |
- atod_input = vs; |
64 |
- |
65 |
-@@ -2597,7 +2597,7 @@ static int parse_volumes(char *args[], unsigned n) { |
66 |
- |
67 |
- volume.channels = n; |
68 |
- for (i = 0; i < volume.channels; i++) { |
69 |
-- enum volume_flags flags; |
70 |
-+ enum volume_flags flags = 0; |
71 |
- |
72 |
- if (parse_volume(args[i], &volume.values[i], &flags) < 0) |
73 |
- return -1; |
74 |
--- |
75 |
-GitLab |
76 |
- |
77 |
|
78 |
diff --git a/media-libs/libpulse/libpulse-16.0-r1.ebuild b/media-libs/libpulse/libpulse-16.0-r1.ebuild |
79 |
deleted file mode 100644 |
80 |
index a134ac58d7b4..000000000000 |
81 |
--- a/media-libs/libpulse/libpulse-16.0-r1.ebuild |
82 |
+++ /dev/null |
83 |
@@ -1,204 +0,0 @@ |
84 |
-# Copyright 1999-2022 Gentoo Authors |
85 |
-# Distributed under the terms of the GNU General Public License v2 |
86 |
- |
87 |
-EAPI="7" |
88 |
- |
89 |
-MY_PV="${PV/_pre*}" |
90 |
-MY_P="pulseaudio-${MY_PV}" |
91 |
-inherit bash-completion-r1 gnome2-utils meson-multilib optfeature systemd udev |
92 |
- |
93 |
-DESCRIPTION="Libraries for PulseAudio clients" |
94 |
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/PulseAudio/" |
95 |
- |
96 |
-if [[ ${PV} = 9999 ]]; then |
97 |
- inherit git-r3 |
98 |
- EGIT_BRANCH="master" |
99 |
- EGIT_REPO_URI="https://gitlab.freedesktop.org/pulseaudio/pulseaudio" |
100 |
-else |
101 |
- SRC_URI="https://freedesktop.org/software/pulseaudio/releases/${MY_P}.tar.xz" |
102 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" |
103 |
-fi |
104 |
- |
105 |
-S="${WORKDIR}/${MY_P}" |
106 |
- |
107 |
-LICENSE="LGPL-2.1+" |
108 |
- |
109 |
-SLOT="0" |
110 |
-IUSE="+asyncns dbus doc +glib gtk selinux systemd test valgrind X" |
111 |
-RESTRICT="!test? ( test )" |
112 |
- |
113 |
-# NOTE: libpcre needed in some cases, bug #472228 |
114 |
-# TODO: libatomic_ops is only needed on some architectures and conditions, and then at runtime too |
115 |
-RDEPEND=" |
116 |
- dev-libs/libatomic_ops |
117 |
- >=media-libs/libsndfile-1.0.20[${MULTILIB_USEDEP}] |
118 |
- virtual/libc |
119 |
- asyncns? ( >=net-libs/libasyncns-0.1[${MULTILIB_USEDEP}] ) |
120 |
- dbus? ( >=sys-apps/dbus-1.4.12[${MULTILIB_USEDEP}] ) |
121 |
- glib? ( >=dev-libs/glib-2.28.0:2[${MULTILIB_USEDEP}] ) |
122 |
- gtk? ( x11-libs/gtk+:3 ) |
123 |
- selinux? ( sec-policy/selinux-pulseaudio ) |
124 |
- systemd? ( sys-apps/systemd:= ) |
125 |
- valgrind? ( dev-util/valgrind ) |
126 |
- X? ( |
127 |
- x11-libs/libX11[${MULTILIB_USEDEP}] |
128 |
- >=x11-libs/libxcb-1.6[${MULTILIB_USEDEP}] |
129 |
- ) |
130 |
- || ( |
131 |
- elibc_glibc? ( virtual/libc ) |
132 |
- dev-libs/libpcre:3 |
133 |
- ) |
134 |
- !<media-sound/pulseaudio-15.0-r100 |
135 |
-" |
136 |
- |
137 |
-DEPEND="${RDEPEND} |
138 |
- test? ( >=dev-libs/check-0.9.10 ) |
139 |
- X? ( x11-base/xorg-proto ) |
140 |
-" |
141 |
- |
142 |
-# pulseaudio ships a bundled xmltoman, which uses XML::Parser |
143 |
-BDEPEND=" |
144 |
- dev-lang/perl |
145 |
- dev-perl/XML-Parser |
146 |
- sys-devel/gettext |
147 |
- sys-devel/m4 |
148 |
- virtual/libiconv |
149 |
- virtual/libintl |
150 |
- virtual/pkgconfig |
151 |
- doc? ( app-doc/doxygen ) |
152 |
-" |
153 |
- |
154 |
-DOCS=( NEWS README ) |
155 |
- |
156 |
-# patches merged upstream, to be removed with 16.0 bump |
157 |
-PATCHES=( |
158 |
- "${FILESDIR}"/pulseaudio-16.0-fix-pactl-volume-command.patch |
159 |
-) |
160 |
- |
161 |
-src_prepare() { |
162 |
- default |
163 |
- |
164 |
- # disable autospawn by client |
165 |
- sed -i -e 's:; autospawn = yes:autospawn = no:g' src/pulse/client.conf.in || die |
166 |
- |
167 |
- gnome2_environment_reset |
168 |
-} |
169 |
- |
170 |
-multilib_src_configure() { |
171 |
- local emesonargs=( |
172 |
- --localstatedir="${EPREFIX}"/var |
173 |
- |
174 |
- -Ddaemon=false |
175 |
- -Dclient=true |
176 |
- $(meson_native_use_bool doc doxygen) |
177 |
- -Dgcov=false |
178 |
- # tests involve random modules, so just do them for the native # TODO: tests should run always |
179 |
- $(meson_native_use_bool test tests) |
180 |
- -Ddatabase=simple # Not used for non-daemon, simple database avoids external dep checks |
181 |
- -Dstream-restore-clear-old-devices=true |
182 |
- -Drunning-from-build-tree=false |
183 |
- |
184 |
- # Paths |
185 |
- -Dmodlibexecdir="${EPREFIX}/usr/$(get_libdir)/pulseaudio/modules" # Was $(get_libdir)/${P} |
186 |
- -Dsystemduserunitdir=$(systemd_get_userunitdir) |
187 |
- -Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d" |
188 |
- -Dbashcompletiondir="$(get_bashcompdir)" # Alternatively DEPEND on app-shells/bash-completion for pkg-config to provide the value |
189 |
- |
190 |
- # Optional features |
191 |
- -Dalsa=disabled |
192 |
- $(meson_feature asyncns) |
193 |
- -Davahi=disabled |
194 |
- -Dbluez5=disabled |
195 |
- -Dbluez5-gstreamer=disabled |
196 |
- -Dbluez5-native-headset=false |
197 |
- -Dbluez5-ofono-headset=false |
198 |
- $(meson_feature dbus) |
199 |
- -Delogind=disabled |
200 |
- -Dfftw=disabled |
201 |
- $(meson_feature glib) # WARNING: toggling this likely changes ABI |
202 |
- -Dgsettings=disabled |
203 |
- -Dgstreamer=disabled |
204 |
- $(meson_native_use_feature gtk) |
205 |
- -Dhal-compat=false |
206 |
- -Dipv6=true |
207 |
- -Djack=disabled |
208 |
- -Dlirc=disabled |
209 |
- -Dopenssl=disabled |
210 |
- -Dorc=disabled |
211 |
- -Doss-output=disabled |
212 |
- -Dsamplerate=disabled # Matches upstream |
213 |
- -Dsoxr=disabled |
214 |
- -Dspeex=disabled |
215 |
- $(meson_native_use_feature systemd) |
216 |
- -Dtcpwrap=disabled |
217 |
- -Dudev=disabled |
218 |
- $(meson_native_use_feature valgrind) |
219 |
- $(meson_feature X x11) |
220 |
- |
221 |
- # Echo cancellation |
222 |
- -Dadrian-aec=false |
223 |
- -Dwebrtc-aec=disabled |
224 |
- ) |
225 |
- |
226 |
- if multilib_is_native_abi; then |
227 |
- # Make padsp work for non-native ABI, supposedly only possible with glibc; |
228 |
- # this is used by /usr/bin/padsp that comes from native build, thus we need |
229 |
- # this argument for native build |
230 |
- if use elibc_glibc; then |
231 |
- emesonargs+=( -Dpulsedsp-location="${EPREFIX}"'/usr/\\$$LIB/pulseaudio' ) |
232 |
- fi |
233 |
- else |
234 |
- emesonargs+=( -Dman=false ) |
235 |
- if ! use elibc_glibc; then |
236 |
- # Non-glibc multilib is probably non-existent but just in case: |
237 |
- ewarn "padsp wrapper for OSS emulation will only work with native ABI applications!" |
238 |
- fi |
239 |
- fi |
240 |
- |
241 |
- meson_src_configure |
242 |
-} |
243 |
- |
244 |
-multilib_src_compile() { |
245 |
- meson_src_compile |
246 |
- |
247 |
- if multilib_is_native_abi; then |
248 |
- if use doc; then |
249 |
- einfo "Generating documentation ..." |
250 |
- meson_src_compile doxygen |
251 |
- fi |
252 |
- fi |
253 |
-} |
254 |
- |
255 |
-multilib_src_install() { |
256 |
- # The files referenced in the DOCS array do not exist in the multilib source directory, |
257 |
- # therefore clear the variable when calling the function that will access it. |
258 |
- DOCS= meson_src_install |
259 |
- |
260 |
- # Upstream installs 'pactl' if client is built, with all symlinks except for |
261 |
- # 'pulseaudio', 'pacmd' and 'pasuspender' which are installed if server is built. |
262 |
- # This trips QA warning, workaround: |
263 |
- # - install missing aliases in media-libs/libpulse (client build) |
264 |
- # - remove corresponding symlinks in media-sound/pulseaudio-daemonclient (server build) |
265 |
- bashcomp_alias pactl pulseaudio |
266 |
- bashcomp_alias pactl pacmd |
267 |
- bashcomp_alias pactl pasuspender |
268 |
- |
269 |
- if multilib_is_native_abi; then |
270 |
- if use doc; then |
271 |
- einfo "Installing documentation ..." |
272 |
- docinto html |
273 |
- dodoc -r doxygen/html/. |
274 |
- fi |
275 |
- fi |
276 |
-} |
277 |
- |
278 |
-multilib_src_install_all() { |
279 |
- einstalldocs |
280 |
- |
281 |
- find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die |
282 |
-} |
283 |
- |
284 |
-pkg_postinst() { |
285 |
- optfeature_header "PulseAudio can be enhanced by installing the following:" |
286 |
- use dbus && optfeature "restricted realtime capabilities via D-Bus" sys-auth/rtkit |
287 |
-} |