pulseaudio: cleaning up
This commit is contained in:
parent
3fed4d64e0
commit
8e4bcb7b35
@ -1,5 +1,5 @@
|
||||
untrusted comment: verify with /etc/ports/opt.pub
|
||||
RWSE3ohX2g5d/YgmrHXo15b4GZCSgUIh56ucrJXzjTFuJUVL5GrkXjwoK7XsVFMQZ58ZQfmbjFE8xCC5jBlEJZcQ9mi+6+HErg0=
|
||||
SHA256 (Pkgfile) = 6c76e6361a101028403f633580b637808780cbc075de8415ddf071ba751ab34e
|
||||
RWSE3ohX2g5d/Y/XXg5d9vF3Hsn4AfFX4FmV5u8Vl4aTqygtc8iGcQritdMdqt2uX9eZmnVoGbiZfFMqVsXq4j5JUTduxd+0eAQ=
|
||||
SHA256 (Pkgfile) = 6b6a2f5e45c29b86a0d64a7fa8b6d349c40fe4919efbc947f437bf01bd4a8a54
|
||||
SHA256 (.footprint) = b5443a16e52ace852a54efa57daa78e8b80e75b6e3c487b209c4cf9043592ef9
|
||||
SHA256 (pulseaudio-15.0.tar.xz) = a40b887a3ba98cc26976eb11bdb6613988f145b19024d1b6555c6a03c9cba1a0
|
||||
|
@ -19,7 +19,10 @@ build() {
|
||||
meson setup $name-$version build $PKGMK_PULSEAUDIO \
|
||||
--prefix=/usr \
|
||||
--libexecdir=/usr/lib/$name \
|
||||
-D buildtype=plain \
|
||||
--buildtype=plain \
|
||||
--wrap-mode nodownload \
|
||||
-D b_lto=true \
|
||||
-D b_pie=true \
|
||||
-D udevrulesdir=/etc/udev/rules.d \
|
||||
-D database=gdbm \
|
||||
-D speex=enabled \
|
||||
|
@ -1,2 +1,2 @@
|
||||
#!/bin/sh
|
||||
[ -e /usr/share/glib-2.0/schemas/org.freedesktop.pulseaudio.gschema.xml ] && glib-compile-schemas /usr/share/glib-2.0/schemas
|
||||
[ -e /usr/share/glib-2.0/schemas/org.freedesktop.pulseaudio.gschema.xml ] && glib-compile-schemas /usr/share/glib-2.0/schemas || true
|
||||
|
@ -1,51 +0,0 @@
|
||||
From 58052e0e04ee1b5fdb1027ebc19717e7766825ec Mon Sep 17 00:00:00 2001
|
||||
From: "Igor V. Kovalenko" <igor.v.kovalenko@gmail.com>
|
||||
Date: Mon, 21 Jun 2021 02:32:41 +0300
|
||||
Subject: [PATCH] build-sys: meson: require GIO dependency for RTP-GStreamer
|
||||
|
||||
Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/584>
|
||||
---
|
||||
meson.build | 6 ++++--
|
||||
src/modules/meson.build | 2 +-
|
||||
2 files changed, 5 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/meson.build b/meson.build
|
||||
index fdd8bf655..61660b981 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -614,8 +614,9 @@ if dbus_dep.found()
|
||||
cdata.set('HAVE_DBUS', 1)
|
||||
endif
|
||||
|
||||
-gio_dep = dependency('gio-2.0', version : '>= 2.26.0', required : get_option('gsettings'))
|
||||
-if gio_dep.found()
|
||||
+gio_dep = dependency('gio-2.0', version : '>= 2.26.0')
|
||||
+if get_option('gsettings').enabled()
|
||||
+ assert(gio_dep.found(), 'GSettings support needs glib I/O library (GIO)')
|
||||
cdata.set('HAVE_GSETTINGS', 1)
|
||||
endif
|
||||
|
||||
@@ -760,6 +761,7 @@ gstrtp_dep = dependency('gstreamer-rtp-1.0', required : get_option('gstreamer'))
|
||||
|
||||
have_gstreamer = false
|
||||
if gst_dep.found() and gstapp_dep.found() and gstrtp_dep.found()
|
||||
+ assert(gio_dep.found(), 'GStreamer-based RTP needs glib I/O library (GIO)')
|
||||
have_gstreamer = true
|
||||
endif
|
||||
|
||||
diff --git a/src/modules/meson.build b/src/modules/meson.build
|
||||
index 9c498a4e1..e7db573b6 100644
|
||||
--- a/src/modules/meson.build
|
||||
+++ b/src/modules/meson.build
|
||||
@@ -161,7 +161,7 @@ if dbus_dep.found() and fftw_dep.found()
|
||||
]
|
||||
endif
|
||||
|
||||
-if gio_dep.found()
|
||||
+if get_option('gsettings').enabled() and gio_dep.found()
|
||||
subdir('gsettings')
|
||||
all_modules += [
|
||||
[ 'module-gsettings',
|
||||
--
|
||||
GitLab
|
||||
|
@ -1,89 +0,0 @@
|
||||
From c817dfb5a438055c98449a4a2f34eb4ec341ccde Mon Sep 17 00:00:00 2001
|
||||
From: "Igor V. Kovalenko" <igor.v.kovalenko@gmail.com>
|
||||
Date: Fri, 18 Jun 2021 20:48:12 +0300
|
||||
Subject: [PATCH] build-sys: meson: Require bluez dependency if bluez5 feature
|
||||
is enabled
|
||||
|
||||
Build breaks if bluez5 and bluez5-native-headset are both enabled
|
||||
but bluez headers are not available.
|
||||
|
||||
Fix this by changing `bluez5` to Meson feature requiring `bluez` dependency.
|
||||
|
||||
Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/583>
|
||||
---
|
||||
meson.build | 10 ++++++----
|
||||
meson_options.txt | 2 +-
|
||||
src/modules/bluetooth/meson.build | 2 +-
|
||||
src/modules/meson.build | 2 +-
|
||||
4 files changed, 9 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/meson.build b/meson.build
|
||||
index 61660b981..92ceef706 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -706,7 +706,9 @@ endif
|
||||
|
||||
sbc_dep = dependency('sbc', version : '>= 1.0', required : false)
|
||||
|
||||
-if get_option('bluez5')
|
||||
+bluez_dep = dependency('bluez', required : get_option('bluez5'))
|
||||
+
|
||||
+if bluez_dep.found()
|
||||
assert(dbus_dep.found(), 'BlueZ requires D-Bus support')
|
||||
assert(sbc_dep.found(), 'BlueZ requires SBC support')
|
||||
cdata.set('HAVE_SBC', 1)
|
||||
@@ -914,9 +916,9 @@ summary = [
|
||||
'Enable Async DNS: @0@'.format(asyncns_dep.found()),
|
||||
'Enable LIRC: @0@'.format(lirc_dep.found()),
|
||||
'Enable D-Bus: @0@'.format(dbus_dep.found()),
|
||||
- ' Enable BlueZ 5: @0@'.format(get_option('bluez5')),
|
||||
- ' Enable native headsets: @0@'.format(get_option('bluez5-native-headset')),
|
||||
- ' Enable ofono headsets: @0@'.format(get_option('bluez5-ofono-headset')),
|
||||
+ ' Enable BlueZ 5: @0@'.format(cdata.has('HAVE_BLUEZ_5')),
|
||||
+ ' Enable native headsets: @0@'.format(cdata.has('HAVE_BLUEZ_5_NATIVE_HEADSET')),
|
||||
+ ' Enable ofono headsets: @0@'.format(cdata.has('HAVE_BLUEZ_5_OFONO_HEADSET')),
|
||||
' Enable GStreamer based codecs: @0@'.format(have_bluez5_gstreamer),
|
||||
'Enable udev: @0@'.format(udev_dep.found()),
|
||||
' Enable HAL->udev compat: @0@'.format(get_option('hal-compat')),
|
||||
diff --git a/meson_options.txt b/meson_options.txt
|
||||
index cdb3c6787..bb41a42a7 100644
|
||||
--- a/meson_options.txt
|
||||
+++ b/meson_options.txt
|
||||
@@ -85,7 +85,7 @@ option('avahi',
|
||||
type : 'feature', value : 'auto',
|
||||
description : 'Optional Avahi support')
|
||||
option('bluez5',
|
||||
- type : 'boolean', value : 'true',
|
||||
+ type : 'feature', value : 'auto',
|
||||
description : 'Optional BlueZ 5 support')
|
||||
option('bluez5-gstreamer',
|
||||
type : 'feature', value: 'auto',
|
||||
diff --git a/src/modules/bluetooth/meson.build b/src/modules/bluetooth/meson.build
|
||||
index 99263bb5a..ca77ee6aa 100644
|
||||
--- a/src/modules/bluetooth/meson.build
|
||||
+++ b/src/modules/bluetooth/meson.build
|
||||
@@ -35,7 +35,7 @@ libbluez5_util = shared_library('bluez5-util',
|
||||
c_args : [pa_c_args, server_c_args],
|
||||
link_args : [nodelete_link_args],
|
||||
include_directories : [configinc, topinc],
|
||||
- dependencies : [libpulse_dep, libpulsecommon_dep, libpulsecore_dep, dbus_dep, sbc_dep, libintl_dep, bluez5_gst_dep, bluez5_gstapp_dep],
|
||||
+ dependencies : [libpulse_dep, libpulsecommon_dep, libpulsecore_dep, bluez_dep, dbus_dep, sbc_dep, libintl_dep, bluez5_gst_dep, bluez5_gstapp_dep],
|
||||
install : true,
|
||||
install_rpath : privlibdir,
|
||||
install_dir : modlibexecdir,
|
||||
diff --git a/src/modules/meson.build b/src/modules/meson.build
|
||||
index e7db573b6..be72c3b9b 100644
|
||||
--- a/src/modules/meson.build
|
||||
+++ b/src/modules/meson.build
|
||||
@@ -118,7 +118,7 @@ if avahi_dep.found()
|
||||
]
|
||||
endif
|
||||
|
||||
-if get_option('bluez5')
|
||||
+if cdata.has('HAVE_BLUEZ_5')
|
||||
subdir('bluetooth')
|
||||
all_modules += [
|
||||
[ 'module-bluetooth-discover', 'bluetooth/module-bluetooth-discover.c' ],
|
||||
--
|
||||
GitLab
|
||||
|
Loading…
Reference in New Issue
Block a user