1 |
commit: 96203039ab3a9dba2c9bd332ce96d1a9174382a3 |
2 |
Author: Niklāvs Koļesņikovs <89q1r14hd <AT> relay <DOT> firefox <DOT> com> |
3 |
AuthorDate: Sun May 29 14:16:56 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon May 30 04:42:28 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96203039 |
7 |
|
8 |
media-video/wireplumber: clean up troublesome 0.4.10 ebuilds |
9 |
|
10 |
The original WirePlumber 0.4.10 as well as the 0.4.10-r2 ebuilds |
11 |
lack an important patch that can result in no devices being detected, |
12 |
when running with outdated Lua scripts/configuration. 0.4.10-r1 and |
13 |
-r3 ebuilds should not have that issue with -r1 being kept just in case |
14 |
if the newer one turns out to have some other issue due to backports. |
15 |
|
16 |
Signed-off-by: Niklāvs Koļesņikovs <89q1r14hd <AT> relay.firefox.com> |
17 |
Closes: https://github.com/gentoo/gentoo/pull/25675 |
18 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
19 |
|
20 |
.../wireplumber/wireplumber-0.4.10-r2.ebuild | 124 --------------------- |
21 |
media-video/wireplumber/wireplumber-0.4.10.ebuild | 118 -------------------- |
22 |
2 files changed, 242 deletions(-) |
23 |
|
24 |
diff --git a/media-video/wireplumber/wireplumber-0.4.10-r2.ebuild b/media-video/wireplumber/wireplumber-0.4.10-r2.ebuild |
25 |
deleted file mode 100644 |
26 |
index a3581508193e..000000000000 |
27 |
--- a/media-video/wireplumber/wireplumber-0.4.10-r2.ebuild |
28 |
+++ /dev/null |
29 |
@@ -1,124 +0,0 @@ |
30 |
-# Copyright 1999-2022 Gentoo Authors |
31 |
-# Distributed under the terms of the GNU General Public License v2 |
32 |
- |
33 |
-EAPI=8 |
34 |
- |
35 |
-LUA_COMPAT=( lua5-{3,4} ) |
36 |
- |
37 |
-inherit lua-single meson systemd |
38 |
- |
39 |
-if [[ ${PV} == 9999 ]]; then |
40 |
- EGIT_REPO_URI="https://gitlab.freedesktop.org/pipewire/${PN}.git" |
41 |
- EGIT_BRANCH="master" |
42 |
- inherit git-r3 |
43 |
-else |
44 |
- SRC_URI="https://gitlab.freedesktop.org/pipewire/${PN}/-/archive/${PV}/${P}.tar.gz" |
45 |
- KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" |
46 |
-fi |
47 |
- |
48 |
-DESCRIPTION="Replacement for pipewire-media-session" |
49 |
-HOMEPAGE="https://gitlab.freedesktop.org/pipewire/wireplumber" |
50 |
- |
51 |
-LICENSE="MIT" |
52 |
-SLOT="0/0.4" |
53 |
-IUSE="elogind system-service systemd test" |
54 |
- |
55 |
-REQUIRED_USE=" |
56 |
- ${LUA_REQUIRED_USE} |
57 |
- ?? ( elogind systemd ) |
58 |
- system-service? ( systemd ) |
59 |
-" |
60 |
- |
61 |
-RESTRICT="!test? ( test )" |
62 |
- |
63 |
-# introspection? ( dev-libs/gobject-introspection ) is valid but likely only used for doc building |
64 |
-BDEPEND=" |
65 |
- dev-libs/glib |
66 |
- dev-util/gdbus-codegen |
67 |
- dev-util/glib-utils |
68 |
- sys-devel/gettext |
69 |
-" |
70 |
- |
71 |
-DEPEND=" |
72 |
- ${LUA_DEPS} |
73 |
- >=dev-libs/glib-2.62 |
74 |
- >=media-video/pipewire-0.3.48:= |
75 |
- virtual/libc |
76 |
- virtual/libintl |
77 |
- elogind? ( sys-auth/elogind ) |
78 |
- systemd? ( sys-apps/systemd ) |
79 |
-" |
80 |
- |
81 |
-# Any dev-lua/* deps get declared like this inside RDEPEND: |
82 |
-# $(lua_gen_cond_dep ' |
83 |
-# dev-lua/<NAME>[${LUA_USEDEP}] |
84 |
-# ') |
85 |
-RDEPEND="${DEPEND} |
86 |
- system-service? ( |
87 |
- acct-user/pipewire |
88 |
- acct-group/pipewire |
89 |
- ) |
90 |
-" |
91 |
- |
92 |
-DOCS=( {NEWS,README}.rst ) |
93 |
- |
94 |
-PATCHES=( |
95 |
- "${FILESDIR}"/${P}-m-lua-scripting-allow-converting-GValue-holding-NUL.patch |
96 |
- "${FILESDIR}"/${P}-alsa.lua-fix-device-name-deduplication-when-reserva.patch |
97 |
- "${FILESDIR}"/${P}-m-lua-scripting-fix-object-refcounting.patch |
98 |
-) |
99 |
- |
100 |
-src_configure() { |
101 |
- local emesonargs=( |
102 |
- -Ddoc=disabled # Ebuild not wired up yet (Sphinx, Doxygen?) |
103 |
- -Dintrospection=disabled # Only used for Sphinx doc generation |
104 |
- -Dsystem-lua=true # We always unbundle everything we can |
105 |
- -Dsystem-lua-version=$(ver_cut 1-2 $(lua_get_version)) |
106 |
- $(meson_feature elogind) |
107 |
- $(meson_feature systemd) |
108 |
- $(meson_use system-service systemd-system-service) |
109 |
- $(meson_use systemd systemd-user-service) |
110 |
- -Dsystemd-system-unit-dir=$(systemd_get_systemunitdir) |
111 |
- -Dsystemd-user-unit-dir=$(systemd_get_userunitdir) |
112 |
- $(meson_use test tests) |
113 |
- ) |
114 |
- |
115 |
- meson_src_configure |
116 |
-} |
117 |
- |
118 |
-src_install() { |
119 |
- meson_src_install |
120 |
- |
121 |
- # We copy the default config, so that Gentoo tools can pick up on any |
122 |
- # updates and /etc does not end up with stale overrides. |
123 |
- # If a reflinking CoW filesystem is used (e.g. Btrfs), then the files |
124 |
- # will not actually get stored twice until modified. |
125 |
- insinto /etc |
126 |
- doins -r ${ED}/usr/share/wireplumber |
127 |
-} |
128 |
- |
129 |
-pkg_postinst() { |
130 |
- if systemd_is_booted ; then |
131 |
- ewarn "pipewire-media-session.service is no longer installed. You must switch" |
132 |
- ewarn "to wireplumber.service user unit before your next logout/reboot:" |
133 |
- ewarn "systemctl --user disable pipewire-media-session.service" |
134 |
- ewarn "systemctl --user --force enable wireplumber.service" |
135 |
- else |
136 |
- ewarn "Switch to WirePlumber will happen the next time gentoo-pipewire-launcher" |
137 |
- ewarn "is started (a replacement for directly calling pipewire binary)." |
138 |
- ewarn |
139 |
- ewarn "Please ensure that ${EROOT}/etc/pipewire/pipewire.conf either does not exist" |
140 |
- ewarn "or, if it does exist, that any reference to" |
141 |
- ewarn "${EROOT}/usr/bin/pipewire-media-session is commented out (begins with a #)." |
142 |
- fi |
143 |
- if use system-service; then |
144 |
- ewarn |
145 |
- ewarn "WARNING: you have enabled the system-service USE flag, which installs" |
146 |
- ewarn "the system-wide systemd units that enable WirePlumber to run as a system" |
147 |
- ewarn "service. This is more than likely NOT what you want. You are strongly" |
148 |
- ewarn "advised not to enable this mode and instead stick with systemd user" |
149 |
- ewarn "units. The default configuration files will likely not work out of" |
150 |
- ewarn "box, and you are on your own with configuration." |
151 |
- ewarn |
152 |
- fi |
153 |
-} |
154 |
|
155 |
diff --git a/media-video/wireplumber/wireplumber-0.4.10.ebuild b/media-video/wireplumber/wireplumber-0.4.10.ebuild |
156 |
deleted file mode 100644 |
157 |
index 9bae3695faf2..000000000000 |
158 |
--- a/media-video/wireplumber/wireplumber-0.4.10.ebuild |
159 |
+++ /dev/null |
160 |
@@ -1,118 +0,0 @@ |
161 |
-# Copyright 1999-2022 Gentoo Authors |
162 |
-# Distributed under the terms of the GNU General Public License v2 |
163 |
- |
164 |
-EAPI=8 |
165 |
- |
166 |
-LUA_COMPAT=( lua5-{3,4} ) |
167 |
- |
168 |
-inherit lua-single meson systemd |
169 |
- |
170 |
-if [[ ${PV} == 9999 ]]; then |
171 |
- EGIT_REPO_URI="https://gitlab.freedesktop.org/pipewire/${PN}.git" |
172 |
- EGIT_BRANCH="master" |
173 |
- inherit git-r3 |
174 |
-else |
175 |
- SRC_URI="https://gitlab.freedesktop.org/pipewire/${PN}/-/archive/${PV}/${P}.tar.gz" |
176 |
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86" |
177 |
-fi |
178 |
- |
179 |
-DESCRIPTION="Replacement for pipewire-media-session" |
180 |
-HOMEPAGE="https://gitlab.freedesktop.org/pipewire/wireplumber" |
181 |
- |
182 |
-LICENSE="MIT" |
183 |
-SLOT="0/0.4" |
184 |
-IUSE="elogind system-service systemd test" |
185 |
- |
186 |
-REQUIRED_USE=" |
187 |
- ${LUA_REQUIRED_USE} |
188 |
- ?? ( elogind systemd ) |
189 |
- system-service? ( systemd ) |
190 |
-" |
191 |
- |
192 |
-RESTRICT="!test? ( test )" |
193 |
- |
194 |
-# introspection? ( dev-libs/gobject-introspection ) is valid but likely only used for doc building |
195 |
-BDEPEND=" |
196 |
- dev-libs/glib |
197 |
- dev-util/gdbus-codegen |
198 |
- dev-util/glib-utils |
199 |
- sys-devel/gettext |
200 |
-" |
201 |
- |
202 |
-DEPEND=" |
203 |
- ${LUA_DEPS} |
204 |
- >=dev-libs/glib-2.62 |
205 |
- >=media-video/pipewire-0.3.48:= |
206 |
- virtual/libc |
207 |
- virtual/libintl |
208 |
- elogind? ( sys-auth/elogind ) |
209 |
- systemd? ( sys-apps/systemd ) |
210 |
-" |
211 |
- |
212 |
-# Any dev-lua/* deps get declared like this inside RDEPEND: |
213 |
-# $(lua_gen_cond_dep ' |
214 |
-# dev-lua/<NAME>[${LUA_USEDEP}] |
215 |
-# ') |
216 |
-RDEPEND="${DEPEND} |
217 |
- system-service? ( |
218 |
- acct-user/pipewire |
219 |
- acct-group/pipewire |
220 |
- ) |
221 |
-" |
222 |
- |
223 |
-DOCS=( {NEWS,README}.rst ) |
224 |
- |
225 |
-src_configure() { |
226 |
- local emesonargs=( |
227 |
- -Ddoc=disabled # Ebuild not wired up yet (Sphinx, Doxygen?) |
228 |
- -Dintrospection=disabled # Only used for Sphinx doc generation |
229 |
- -Dsystem-lua=true # We always unbundle everything we can |
230 |
- -Dsystem-lua-version=$(ver_cut 1-2 $(lua_get_version)) |
231 |
- $(meson_feature elogind) |
232 |
- $(meson_feature systemd) |
233 |
- $(meson_use system-service systemd-system-service) |
234 |
- $(meson_use systemd systemd-user-service) |
235 |
- -Dsystemd-system-unit-dir=$(systemd_get_systemunitdir) |
236 |
- -Dsystemd-user-unit-dir=$(systemd_get_userunitdir) |
237 |
- $(meson_use test tests) |
238 |
- ) |
239 |
- |
240 |
- meson_src_configure |
241 |
-} |
242 |
- |
243 |
-src_install() { |
244 |
- meson_src_install |
245 |
- |
246 |
- # We copy the default config, so that Gentoo tools can pick up on any |
247 |
- # updates and /etc does not end up with stale overrides. |
248 |
- # If a reflinking CoW filesystem is used (e.g. Btrfs), then the files |
249 |
- # will not actually get stored twice until modified. |
250 |
- insinto /etc |
251 |
- doins -r ${ED}/usr/share/wireplumber |
252 |
-} |
253 |
- |
254 |
-pkg_postinst() { |
255 |
- if systemd_is_booted ; then |
256 |
- ewarn "pipewire-media-session.service is no longer installed. You must switch" |
257 |
- ewarn "to wireplumber.service user unit before your next logout/reboot:" |
258 |
- ewarn "systemctl --user disable pipewire-media-session.service" |
259 |
- ewarn "systemctl --user --force enable wireplumber.service" |
260 |
- else |
261 |
- ewarn "Switch to WirePlumber will happen the next time gentoo-pipewire-launcher" |
262 |
- ewarn "is started (a replacement for directly calling pipewire binary)." |
263 |
- ewarn |
264 |
- ewarn "Please ensure that ${EROOT}/etc/pipewire/pipewire.conf either does not exist" |
265 |
- ewarn "or, if it does exist, that any reference to" |
266 |
- ewarn "${EROOT}/usr/bin/pipewire-media-session is commented out (begins with a #)." |
267 |
- fi |
268 |
- if use system-service; then |
269 |
- ewarn |
270 |
- ewarn "WARNING: you have enabled the system-service USE flag, which installs" |
271 |
- ewarn "the system-wide systemd units that enable WirePlumber to run as a system" |
272 |
- ewarn "service. This is more than likely NOT what you want. You are strongly" |
273 |
- ewarn "advised not to enable this mode and instead stick with systemd user" |
274 |
- ewarn "units. The default configuration files will likely not work out of" |
275 |
- ewarn "box, and you are on your own with configuration." |
276 |
- ewarn |
277 |
- fi |
278 |
-} |