Gentoo Archives: gentoo-commits

From: Thomas Deutschmann <whissi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/pulseaudio/, media-sound/pulseaudio/files/
Date: Mon, 21 Jun 2021 00:27:02
Message-Id: 1624235215.5484b21ca35d648b6c92b4f6cbf5f460268ae3c3.whissi@gentoo
1 commit: 5484b21ca35d648b6c92b4f6cbf5f460268ae3c3
2 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jun 21 00:26:33 2021 +0000
4 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
5 CommitDate: Mon Jun 21 00:26:55 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5484b21c
7
8 media-sound/pulseaudio: fix building with USE=-glib
9
10 Package-Manager: Portage-3.0.20, Repoman-3.0.3
11 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
12
13 ...dio-14.99.2-require-GIO-for-RTP-GStreamer.patch | 36 ++++++++++++++++++++++
14 .../pulseaudio/pulseaudio-14.99.2_pre.ebuild | 2 ++
15 2 files changed, 38 insertions(+)
16
17 diff --git a/media-sound/pulseaudio/files/pulseaudio-14.99.2-require-GIO-for-RTP-GStreamer.patch b/media-sound/pulseaudio/files/pulseaudio-14.99.2-require-GIO-for-RTP-GStreamer.patch
18 new file mode 100644
19 index 00000000000..dfce2488156
20 --- /dev/null
21 +++ b/media-sound/pulseaudio/files/pulseaudio-14.99.2-require-GIO-for-RTP-GStreamer.patch
22 @@ -0,0 +1,36 @@
23 +From fe25df45d5742f20a225e9d9cd790156a7f05943 Mon Sep 17 00:00:00 2001
24 +From: "Igor V. Kovalenko" <igor.v.kovalenko@×××××.com>
25 +Date: Mon, 21 Jun 2021 02:32:41 +0300
26 +Subject: [PATCH] build-sys: meson: require GIO dependency for RTP-GStreamer
27 +
28 +---
29 + meson.build | 6 ++++--
30 + 1 file changed, 4 insertions(+), 2 deletions(-)
31 +
32 +diff --git a/meson.build b/meson.build
33 +index fdd8bf655..61660b981 100644
34 +--- a/meson.build
35 ++++ b/meson.build
36 +@@ -614,8 +614,9 @@ if dbus_dep.found()
37 + cdata.set('HAVE_DBUS', 1)
38 + endif
39 +
40 +-gio_dep = dependency('gio-2.0', version : '>= 2.26.0', required : get_option('gsettings'))
41 +-if gio_dep.found()
42 ++gio_dep = dependency('gio-2.0', version : '>= 2.26.0')
43 ++if get_option('gsettings').enabled()
44 ++ assert(gio_dep.found(), 'GSettings support needs glib I/O library (GIO)')
45 + cdata.set('HAVE_GSETTINGS', 1)
46 + endif
47 +
48 +@@ -760,6 +761,7 @@ gstrtp_dep = dependency('gstreamer-rtp-1.0', required : get_option('gstreamer'))
49 +
50 + have_gstreamer = false
51 + if gst_dep.found() and gstapp_dep.found() and gstrtp_dep.found()
52 ++ assert(gio_dep.found(), 'GStreamer-based RTP needs glib I/O library (GIO)')
53 + have_gstreamer = true
54 + endif
55 +
56 +--
57 +GitLab
58 +
59
60 diff --git a/media-sound/pulseaudio/pulseaudio-14.99.2_pre.ebuild b/media-sound/pulseaudio/pulseaudio-14.99.2_pre.ebuild
61 index aa307be1068..203ebb43b87 100644
62 --- a/media-sound/pulseaudio/pulseaudio-14.99.2_pre.ebuild
63 +++ b/media-sound/pulseaudio/pulseaudio-14.99.2_pre.ebuild
64 @@ -164,6 +164,8 @@ DOCS=( NEWS README )
65
66 S="${WORKDIR}/${MY_P}"
67
68 +PATCHES=( "${FILESDIR}"/${MY_P}-require-GIO-for-RTP-GStreamer.patch )
69 +
70 src_prepare() {
71 default