pool/pipewire
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1043200 from home:XRevan86

Browse Source 
- Update to version 0.3.63.

OBS-URL: https://build.opensuse.org/request/show/1043200
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/pipewire?expand=0&rev=93
This commit is contained in:
Antonio Larrosa 2022-12-16 06:21:22 +00:00 committed by Git OBS Bridge
parent 5583ce55b7
commit d62170e9ff
8 changed files with 203 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
0001-pulse-server-add-channel-map-in-echo-cancel-module.patch Normal file
View File

@ -0,0 +1,39 @@
From f7c49bbdde5f9f09270ac391990264a501761420 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Thu, 15 Dec 2022 13:12:47 +0100
Subject: [PATCH] pulse-server: add channel-map in echo-cancel module
---
.../module-protocol-pulse/modules/module-echo-cancel.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/src/modules/module-protocol-pulse/modules/module-echo-cancel.c b/src/modules/module-protocol-pulse/modules/module-echo-cancel.c
index 47dfa75bb..72e0095b5 100644
--- a/src/modules/module-protocol-pulse/modules/module-echo-cancel.c
+++ b/src/modules/module-protocol-pulse/modules/module-echo-cancel.c
@@ -70,6 +70,7 @@ static int module_echo_cancel_load(struct module *module)
const char *str;
char *args;
size_t size;
+ uint32_t i;
if ((f = open_memstream(&args, &size)) == NULL)
return -errno;
@@ -85,7 +86,13 @@ static int module_echo_cancel_load(struct module *module)
fprintf(f, " audio.rate = %u", data->info.rate);
if (data->info.channels != 0) {
fprintf(f, " audio.channels = %u", data->info.channels);
- /* TODO: convert channel positions to string */
+ if (!(data->info.flags & SPA_AUDIO_FLAG_UNPOSITIONED)) {
+ fprintf(f, " audio.position = [ ");
+ for (i = 0; i < data->info.channels; i++)
+ fprintf(f, "%s%s", i == 0 ? "" : ",",
+ channel_id2name(data->info.position[i]));
+ fprintf(f, " ]");
+ }
}
fprintf(f, " source.props = {");
pw_properties_serialize_dict(f, &data->source_props->dict, 0);
--
2.39.0

2
_service
View File

@ -3,7 +3,7 @@
<service name="obs_scm" mode="disabled"> <service name="obs_scm" mode="disabled">
<param name="scm">git</param> <param name="scm">git</param>
<param name="url">https://gitlab.freedesktop.org/pipewire/pipewire.git</param> <param name="url">https://gitlab.freedesktop.org/pipewire/pipewire.git</param>
<param name="revision">refs/tags/0.3.62</param> <param name="revision">refs/tags/0.3.63</param>
<param name="versionformat">@PARENT_TAG@</param> <param name="versionformat">@PARENT_TAG@</param>
<!-- <!--
<param name="revision">master</param> <param name="revision">master</param>

3
pipewire-0.3.62.obscpio
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d2c293cd3b24b60de83533bb49096c73b3fccce7b1e230f68c41beceb08af91d
size 11555853

3
pipewire-0.3.63.obscpio Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d79a10a9d418ef4ec4314e3e257f063990ad32970c708bfa1a28d403f1c244dc
size 11569677

39
pipewire.changes
View File

@ -1,3 +1,42 @@
-------------------------------------------------------------------
Thu Dec 15 17:37:52 UTC 2022 - Alexei Sorokin <sor.alexei@meowr.ru>
- Update to version 0.3.63:
* Highlights
- Fix a critical bug that causes audio distortion in some cases
when using AVX2.
- Fix a crash in mpv caused by deinit of PipeWire.
- Resample the convolver IR to match the graph samplerate for
better results.
- Many more small bugfixes and improvements.
* PipeWire
- Fix a segfault in the PipeWire deinit code triggered by mpv
in some cases.
- Fix docs about SPA_PLUGIN_DIR.
- Always dlclose by default (even under valgrind). Add an
option with PIPEWIRE_DLCLOSE to select alternative behaviour.
- Improve PIPEWIRE_DEBUG category handling.
* modules
- Resample the IR for the convolver when the IR samplerate and
graph rate don't match.
* SPA
- Handle spurious reads from timerfd gracefully.
- Fix potential stack-use-after-scope when starting Audacity.
- Fix distorted audio when using AVX2.
- Remove fallback to default channel map in channelmix.
- Improve sorting of MIDI events, use the same order as Ardour.
- Enable LFE downmixing by default.
- Make IEC958/AC3 and IEC958/DTS work better by enforcing a
fixed minimal buffering for the encoder to avoid stuttering.
* Pulse-Server
- Add a new pulse.cmd config section to execute pulse commands,
currently only for loading modules. This removes the
dependency on pactl.
- Improve debug of messages.
- Rebase reduce-meson-dependency.patch.
- Add patch to add channel-map in the echo-cancel module:
* 0001-pulse-server-add-channel-map-in-echo-cancel-module.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Dec 10 14:04:50 UTC 2022 - Predrag Ivanović <predivan@mts.rs> Sat Dec 10 14:04:50 UTC 2022 - Predrag Ivanović <predivan@mts.rs>

6
pipewire.obsinfo
View File

@ -1,4 +1,4 @@
name: pipewire name: pipewire
version: 0.3.62 version: 0.3.63
mtime: 1670581704 mtime: 1671094583
commit: 3a443b4e1c9730675c7de0453a6279ab9ee263fd commit: 5ff00f40b9d3ecfc38305edc27e9c2b01629802c

5
pipewire.spec
View File

@ -54,7 +54,7 @@
%bcond_with aptx %bcond_with aptx
Name: pipewire Name: pipewire
Version: 0.3.62 Version: 0.3.63
Release: 0 Release: 0
Summary: A Multimedia Framework designed to be an audio and video server and more Summary: A Multimedia Framework designed to be an audio and video server and more
License: MIT License: MIT
@ -64,6 +64,8 @@ Source0: %{name}-%{version}.tar.xz
Source99: baselibs.conf Source99: baselibs.conf
# PATCH-FIX-OPENSUSE reduce-meson-dependency.patch # PATCH-FIX-OPENSUSE reduce-meson-dependency.patch
Patch0: reduce-meson-dependency.patch Patch0: reduce-meson-dependency.patch
# PATCH-FIX-UPSTREAM 0001-pulse-server-add-channel-map-in-echo-cancel-module.patch
Patch1: 0001-pulse-server-add-channel-map-in-echo-cancel-module.patch
BuildRequires: docutils BuildRequires: docutils
BuildRequires: doxygen BuildRequires: doxygen
BuildRequires: fdupes BuildRequires: fdupes
@ -335,6 +337,7 @@ This package provides a PulseAudio implementation based on PipeWire
%if 0%{?suse_version} <= 1500 && 0%{?sle_version} <= 150300 %if 0%{?suse_version} <= 1500 && 0%{?sle_version} <= 150300
%patch0 -p1 %patch0 -p1
%endif %endif
%patch1 -p1
%build %build
%if %{pkg_vcmp gcc < 8} %if %{pkg_vcmp gcc < 8}

209
reduce-meson-dependency.patch
View File

@ -1,6 +1,7 @@
diff -Naur pipewire-0.3.62/doc/meson.build pipewire-0.3.62.new/doc/meson.build Index: pipewire-0.3.63/doc/meson.build
--- pipewire-0.3.62/doc/meson.build 2022-12-09 10:28:24.000000000 +0000 ===================================================================
+++ pipewire-0.3.62.new/doc/meson.build 2022-12-10 13:39:45.122679346 +0000 --- pipewire-0.3.63.orig/doc/meson.build
+++ pipewire-0.3.63/doc/meson.build
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
doxyfile_conf = configuration_data() doxyfile_conf = configuration_data()
doxyfile_conf.set('PACKAGE_NAME', meson.project_name()) doxyfile_conf.set('PACKAGE_NAME', meson.project_name())
@ -12,7 +13,7 @@ diff -Naur pipewire-0.3.62/doc/meson.build pipewire-0.3.62.new/doc/meson.build
dot_found = find_program('dot', required: false).found() dot_found = find_program('dot', required: false).found()
summary({'dot (used with doxygen)': dot_found}, bool_yn: true, section: 'Optional programs') summary({'dot (used with doxygen)': dot_found}, bool_yn: true, section: 'Optional programs')
@@ -48,35 +48,35 @@ @@ -48,35 +48,35 @@ extra_docs = [
inputs = [] inputs = []
foreach extra : extra_docs foreach extra : extra_docs
@ -61,7 +62,7 @@ diff -Naur pipewire-0.3.62/doc/meson.build pipewire-0.3.62.new/doc/meson.build
] ]
# Example files (in order from simple to esoteric) # Example files (in order from simple to esoteric)
@@ -116,13 +116,25 @@ @@ -116,13 +116,25 @@ input_dirs += [ 'doc/examples.dox' ]
man_doxygen = [] man_doxygen = []
man_subpages = [] man_subpages = []
@ -90,7 +91,7 @@ diff -Naur pipewire-0.3.62/doc/meson.build pipewire-0.3.62.new/doc/meson.build
manfile = configure_file(input: 'manpage.dox.in', manfile = configure_file(input: 'manpage.dox.in',
output: filename, output: filename,
configuration: manconf) configuration: manconf)
@@ -141,8 +153,8 @@ @@ -141,8 +153,8 @@ input_dirs += [ 'doc/pipewire-tools.dox'
doxyfile_conf.set('inputs', ' '.join(inputs + input_dirs)) doxyfile_conf.set('inputs', ' '.join(inputs + input_dirs))
doxyfile_conf.set('cssfiles', ' '.join(cssfiles)) doxyfile_conf.set('cssfiles', ' '.join(cssfiles))
doxyfile_conf.set('path_prefixes', ' '.join(path_prefixes)) doxyfile_conf.set('path_prefixes', ' '.join(path_prefixes))
@ -101,10 +102,11 @@ diff -Naur pipewire-0.3.62/doc/meson.build pipewire-0.3.62.new/doc/meson.build
doxyfile = configure_file(input: 'Doxyfile.in', doxyfile = configure_file(input: 'Doxyfile.in',
output: 'Doxyfile', output: 'Doxyfile',
diff -Naur pipewire-0.3.62/man/meson.build pipewire-0.3.62.new/man/meson.build Index: pipewire-0.3.63/man/meson.build
--- pipewire-0.3.62/man/meson.build 2022-12-09 10:28:24.000000000 +0000 ===================================================================
+++ pipewire-0.3.62.new/man/meson.build 2022-12-10 13:39:45.126679340 +0000 --- pipewire-0.3.63.orig/man/meson.build
@@ -21,7 +21,7 @@ +++ pipewire-0.3.63/man/meson.build
@@ -21,7 +21,7 @@ manpages = [
'pw-top.1.rst.in', 'pw-top.1.rst.in',
] ]
@ -113,19 +115,20 @@ diff -Naur pipewire-0.3.62/man/meson.build pipewire-0.3.62.new/man/meson.build
manpages += 'pw-jack.1.rst.in' manpages += 'pw-jack.1.rst.in'
endif endif
diff -Naur pipewire-0.3.62/meson.build pipewire-0.3.62.new/meson.build Index: pipewire-0.3.63/meson.build
--- pipewire-0.3.62/meson.build 2022-12-09 10:28:24.000000000 +0000 ===================================================================
+++ pipewire-0.3.62.new/meson.build 2022-12-10 13:41:33.450512558 +0000 --- pipewire-0.3.63.orig/meson.build
+++ pipewire-0.3.63/meson.build
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
project('pipewire', ['c' ], project('pipewire', ['c' ],
version : '0.3.62', version : '0.3.63',
license : [ 'MIT', 'LGPL-2.1-or-later', 'GPL-2.0-only' ], license : [ 'MIT', 'LGPL-2.1-or-later', 'GPL-2.0-only' ],
- meson_version : '>= 0.59.0', - meson_version : '>= 0.59.0',
+ meson_version : '>= 0.54.0', + meson_version : '>= 0.54.0',
default_options : [ 'warning_level=3', default_options : [ 'warning_level=3',
'c_std=gnu11', 'c_std=gnu11',
'cpp_std=c++17', 'cpp_std=c++17',
@@ -236,8 +236,8 @@ @@ -236,8 +236,8 @@ includes_inc = include_directories('incl
pipewire_inc = include_directories('src') pipewire_inc = include_directories('src')
makedata = configuration_data() makedata = configuration_data()
@ -136,7 +139,7 @@ diff -Naur pipewire-0.3.62/meson.build pipewire-0.3.62.new/meson.build
makedata.set('VERSION', pipewire_version) makedata.set('VERSION', pipewire_version)
if version_arr.length() == 4 if version_arr.length() == 4
makedata.set('TAG', 'HEAD') makedata.set('TAG', 'HEAD')
@@ -337,7 +337,7 @@ @@ -337,7 +337,7 @@ endforeach
gst_dp_found = gst_dep.length() > 0 gst_dp_found = gst_dep.length() > 0
summary({'gstreamer-device-provider': gst_dp_found}, bool_yn: true, section: 'Backend') summary({'gstreamer-device-provider': gst_dp_found}, bool_yn: true, section: 'Backend')
@ -145,7 +148,7 @@ diff -Naur pipewire-0.3.62/meson.build pipewire-0.3.62.new/meson.build
webrtc_dep = dependency('webrtc-audio-processing', webrtc_dep = dependency('webrtc-audio-processing',
version : ['>= 0.2', '< 1.0'], version : ['>= 0.2', '< 1.0'],
@@ -400,10 +400,10 @@ @@ -400,10 +400,10 @@ endforeach
installed_tests_metadir = pipewire_datadir / 'installed-tests' / pipewire_name installed_tests_metadir = pipewire_datadir / 'installed-tests' / pipewire_name
installed_tests_execdir = pipewire_libexecdir / 'installed-tests' / pipewire_name installed_tests_execdir = pipewire_libexecdir / 'installed-tests' / pipewire_name
@ -158,7 +161,7 @@ diff -Naur pipewire-0.3.62/meson.build pipewire-0.3.62.new/meson.build
gstack = find_program('gstack', required : false) gstack = find_program('gstack', required : false)
cdata.set('HAVE_GSTACK', gstack.found()) cdata.set('HAVE_GSTACK', gstack.found())
endif endif
@@ -412,17 +412,17 @@ @@ -412,17 +412,17 @@ subdir('po')
subdir('spa') subdir('spa')
subdir('src') subdir('src')
@ -179,7 +182,7 @@ diff -Naur pipewire-0.3.62/meson.build pipewire-0.3.62.new/meson.build
subdir('pipewire-v4l2') subdir('pipewire-v4l2')
endif endif
@@ -433,7 +433,7 @@ @@ -433,7 +433,7 @@ if alsa_dep.found()
endif endif
generate_manpages = false generate_manpages = false
@ -188,7 +191,7 @@ diff -Naur pipewire-0.3.62/meson.build pipewire-0.3.62.new/meson.build
rst2man = find_program('rst2man', required: false) rst2man = find_program('rst2man', required: false)
if not rst2man.found() if not rst2man.found()
rst2man = find_program('rst2man.py', required: get_option('man')) rst2man = find_program('rst2man.py', required: get_option('man'))
@@ -454,20 +454,20 @@ @@ -454,20 +454,20 @@ endif
setenv = find_program('pw-uninstalled.sh') setenv = find_program('pw-uninstalled.sh')
run_target('pw-uninstalled', run_target('pw-uninstalled',
command : [setenv, command : [setenv,
@ -216,7 +219,7 @@ diff -Naur pipewire-0.3.62/meson.build pipewire-0.3.62.new/meson.build
devenv.set('GST_PLUGIN_PATH', builddir / 'src'/ 'gst') devenv.set('GST_PLUGIN_PATH', builddir / 'src'/ 'gst')
@@ -479,4 +479,6 @@ @@ -479,4 +479,6 @@ devenv.set('LD_LIBRARY_PATH', builddir /
devenv.set('PW_UNINSTALLED', '1') devenv.set('PW_UNINSTALLED', '1')
@ -224,10 +227,11 @@ diff -Naur pipewire-0.3.62/meson.build pipewire-0.3.62.new/meson.build
+if meson.version().version_compare('>=0.58.0') +if meson.version().version_compare('>=0.58.0')
+ meson.add_devenv(devenv) + meson.add_devenv(devenv)
+endif +endif
diff -Naur pipewire-0.3.62/spa/meson.build pipewire-0.3.62.new/spa/meson.build Index: pipewire-0.3.63/spa/meson.build
--- pipewire-0.3.62/spa/meson.build 2022-12-09 10:28:24.000000000 +0000 ===================================================================
+++ pipewire-0.3.62.new/spa/meson.build 2022-12-10 13:39:45.126679340 +0000 --- pipewire-0.3.63.orig/spa/meson.build
@@ -31,7 +31,7 @@ +++ pipewire-0.3.63/spa/meson.build
@@ -31,7 +31,7 @@ pkgconfig.generate(filebase : 'lib@0@'.f
subdir('include') subdir('include')
@ -236,7 +240,7 @@ diff -Naur pipewire-0.3.62/spa/meson.build pipewire-0.3.62.new/spa/meson.build
udevrulesdir = get_option('udevrulesdir') udevrulesdir = get_option('udevrulesdir')
if udevrulesdir == '' if udevrulesdir == ''
# absolute path, otherwise meson prepends the prefix # absolute path, otherwise meson prepends the prefix
@@ -66,7 +66,7 @@ @@ -66,7 +66,7 @@ if get_option('spa-plugins').allowed()
summary({'Opus': opus_dep.found()}, bool_yn: true, section: 'Bluetooth audio codecs') summary({'Opus': opus_dep.found()}, bool_yn: true, section: 'Bluetooth audio codecs')
lc3_dep = dependency('lc3', required : get_option('bluez5-codec-lc3')) lc3_dep = dependency('lc3', required : get_option('bluez5-codec-lc3'))
summary({'LC3': lc3_dep.found()}, bool_yn: true, section: 'Bluetooth audio codecs') summary({'LC3': lc3_dep.found()}, bool_yn: true, section: 'Bluetooth audio codecs')
@ -245,7 +249,7 @@ diff -Naur pipewire-0.3.62/spa/meson.build pipewire-0.3.62.new/spa/meson.build
mm_dep = dependency('ModemManager', version : '>= 1.10.0', required : get_option('bluez5-backend-native-mm')) mm_dep = dependency('ModemManager', version : '>= 1.10.0', required : get_option('bluez5-backend-native-mm'))
summary({'ModemManager': mm_dep.found()}, bool_yn: true, section: 'Bluetooth backends') summary({'ModemManager': mm_dep.found()}, bool_yn: true, section: 'Bluetooth backends')
endif endif
@@ -90,6 +90,6 @@ @@ -90,6 +90,6 @@ endif
subdir('tools') subdir('tools')
subdir('tests') subdir('tests')
@ -253,10 +257,11 @@ diff -Naur pipewire-0.3.62/spa/meson.build pipewire-0.3.62.new/spa/meson.build
+if not get_option('examples').disabled() +if not get_option('examples').disabled()
subdir('examples') subdir('examples')
endif endif
diff -Naur pipewire-0.3.62/spa/plugins/audioconvert/meson.build pipewire-0.3.62.new/spa/plugins/audioconvert/meson.build Index: pipewire-0.3.63/spa/plugins/audioconvert/meson.build
--- pipewire-0.3.62/spa/plugins/audioconvert/meson.build 2022-12-09 10:28:24.000000000 +0000 ===================================================================
+++ pipewire-0.3.62.new/spa/plugins/audioconvert/meson.build 2022-12-10 13:39:45.130679334 +0000 --- pipewire-0.3.63.orig/spa/plugins/audioconvert/meson.build
@@ -148,7 +148,7 @@ +++ pipewire-0.3.63/spa/plugins/audioconvert/meson.build
@@ -148,7 +148,7 @@ foreach a : test_apps
install : installed_tests_enabled, install : installed_tests_enabled,
install_dir : installed_tests_execdir / 'audioconvert'), install_dir : installed_tests_execdir / 'audioconvert'),
env : [ env : [
@ -265,7 +270,7 @@ diff -Naur pipewire-0.3.62/spa/plugins/audioconvert/meson.build pipewire-0.3.62.
]) ])
if installed_tests_enabled if installed_tests_enabled
@@ -178,7 +178,7 @@ @@ -178,7 +178,7 @@ foreach a : benchmark_apps
install : installed_tests_enabled, install : installed_tests_enabled,
install_dir : installed_tests_execdir / 'audioconvert'), install_dir : installed_tests_execdir / 'audioconvert'),
env : [ env : [
@ -274,10 +279,11 @@ diff -Naur pipewire-0.3.62/spa/plugins/audioconvert/meson.build pipewire-0.3.62.
]) ])
if installed_tests_enabled if installed_tests_enabled
diff -Naur pipewire-0.3.62/spa/plugins/audiomixer/meson.build pipewire-0.3.62.new/spa/plugins/audiomixer/meson.build Index: pipewire-0.3.63/spa/plugins/audiomixer/meson.build
--- pipewire-0.3.62/spa/plugins/audiomixer/meson.build 2022-12-09 10:28:24.000000000 +0000 ===================================================================
+++ pipewire-0.3.62.new/spa/plugins/audiomixer/meson.build 2022-12-10 13:39:45.130679334 +0000 --- pipewire-0.3.63.orig/spa/plugins/audiomixer/meson.build
@@ -81,7 +81,7 @@ +++ pipewire-0.3.63/spa/plugins/audiomixer/meson.build
@@ -81,7 +81,7 @@ foreach a : test_apps
install : installed_tests_enabled, install : installed_tests_enabled,
install_dir : installed_tests_execdir / 'audiomixer'), install_dir : installed_tests_execdir / 'audiomixer'),
env : [ env : [
@ -286,7 +292,7 @@ diff -Naur pipewire-0.3.62/spa/plugins/audiomixer/meson.build pipewire-0.3.62.ne
]) ])
if installed_tests_enabled if installed_tests_enabled
@@ -110,7 +110,7 @@ @@ -110,7 +110,7 @@ foreach a : benchmark_apps
install : installed_tests_enabled, install : installed_tests_enabled,
install_dir : installed_tests_execdir / 'audiomixer'), install_dir : installed_tests_execdir / 'audiomixer'),
env : [ env : [
@ -295,10 +301,11 @@ diff -Naur pipewire-0.3.62/spa/plugins/audiomixer/meson.build pipewire-0.3.62.ne
]) ])
if installed_tests_enabled if installed_tests_enabled
diff -Naur pipewire-0.3.62/spa/plugins/bluez5/meson.build pipewire-0.3.62.new/spa/plugins/bluez5/meson.build Index: pipewire-0.3.63/spa/plugins/bluez5/meson.build
--- pipewire-0.3.62/spa/plugins/bluez5/meson.build 2022-12-09 10:28:24.000000000 +0000 ===================================================================
+++ pipewire-0.3.62.new/spa/plugins/bluez5/meson.build 2022-12-10 13:39:45.130679334 +0000 --- pipewire-0.3.63.orig/spa/plugins/bluez5/meson.build
@@ -6,13 +6,13 @@ +++ pipewire-0.3.63/spa/plugins/bluez5/meson.build
@@ -6,13 +6,13 @@ foreach dep: bluez5_deps
endforeach endforeach
cdata.set('HAVE_BLUEZ_5_BACKEND_NATIVE', cdata.set('HAVE_BLUEZ_5_BACKEND_NATIVE',
@ -319,7 +326,7 @@ diff -Naur pipewire-0.3.62/spa/plugins/bluez5/meson.build pipewire-0.3.62.new/sp
cdata.set('HAVE_BLUEZ_5_HCI', dependency('bluez', version: '< 6', required: false).found()) cdata.set('HAVE_BLUEZ_5_HCI', dependency('bluez', version: '< 6', required: false).found())
bluez5_sources = [ bluez5_sources = [
@@ -35,7 +35,7 @@ @@ -35,7 +35,7 @@ bluez5_data = ['bluez-hardware.conf']
install_data(bluez5_data, install_dir : spa_datadir / 'bluez5') install_data(bluez5_data, install_dir : spa_datadir / 'bluez5')
@ -328,7 +335,7 @@ diff -Naur pipewire-0.3.62/spa/plugins/bluez5/meson.build pipewire-0.3.62.new/sp
if libusb_dep.found() if libusb_dep.found()
bluez5_deps += libusb_dep bluez5_deps += libusb_dep
endif endif
@@ -46,11 +46,11 @@ @@ -46,11 +46,11 @@ if get_option('bluez5-backend-hsp-native
bluez5_sources += ['backend-native.c', 'upower.c'] bluez5_sources += ['backend-native.c', 'upower.c']
endif endif
@ -342,7 +349,7 @@ diff -Naur pipewire-0.3.62/spa/plugins/bluez5/meson.build pipewire-0.3.62.new/sp
bluez5_sources += ['backend-hsphfpd.c'] bluez5_sources += ['backend-hsphfpd.c']
endif endif
@@ -115,7 +115,7 @@ @@ -115,7 +115,7 @@ if ldac_dep.found()
install_dir : spa_plugindir / 'bluez5') install_dir : spa_plugindir / 'bluez5')
endif endif
@ -351,7 +358,7 @@ diff -Naur pipewire-0.3.62/spa/plugins/bluez5/meson.build pipewire-0.3.62.new/sp
bluez_codec_lc3plus = shared_library('spa-codec-bluez5-lc3plus', bluez_codec_lc3plus = shared_library('spa-codec-bluez5-lc3plus',
[ 'a2dp-codec-lc3plus.c', 'media-codecs.c' ], [ 'a2dp-codec-lc3plus.c', 'media-codecs.c' ],
include_directories : [ configinc ], include_directories : [ configinc ],
@@ -125,7 +125,7 @@ @@ -125,7 +125,7 @@ if get_option('bluez5-codec-lc3plus').al
install_dir : spa_plugindir / 'bluez5') install_dir : spa_plugindir / 'bluez5')
endif endif
@ -360,7 +367,7 @@ diff -Naur pipewire-0.3.62/spa/plugins/bluez5/meson.build pipewire-0.3.62.new/sp
opus_args = codec_args opus_args = codec_args
opus_dep = [ opus_dep ] opus_dep = [ opus_dep ]
bluez_codec_opus = shared_library('spa-codec-bluez5-opus', bluez_codec_opus = shared_library('spa-codec-bluez5-opus',
@@ -137,7 +137,7 @@ @@ -137,7 +137,7 @@ if get_option('bluez5-codec-opus').allow
install_dir : spa_plugindir / 'bluez5') install_dir : spa_plugindir / 'bluez5')
endif endif
@ -369,9 +376,10 @@ diff -Naur pipewire-0.3.62/spa/plugins/bluez5/meson.build pipewire-0.3.62.new/sp
bluez_codec_lc3 = shared_library('spa-codec-bluez5-lc3', bluez_codec_lc3 = shared_library('spa-codec-bluez5-lc3',
[ 'bap-codec-lc3.c', 'media-codecs.c' ], [ 'bap-codec-lc3.c', 'media-codecs.c' ],
include_directories : [ configinc ], include_directories : [ configinc ],
diff -Naur pipewire-0.3.62/spa/plugins/meson.build pipewire-0.3.62.new/spa/plugins/meson.build Index: pipewire-0.3.63/spa/plugins/meson.build
--- pipewire-0.3.62/spa/plugins/meson.build 2022-12-09 10:28:24.000000000 +0000 ===================================================================
+++ pipewire-0.3.62.new/spa/plugins/meson.build 2022-12-10 13:39:45.130679334 +0000 --- pipewire-0.3.63.orig/spa/plugins/meson.build
+++ pipewire-0.3.63/spa/plugins/meson.build
@@ -1,19 +1,22 @@ @@ -1,19 +1,22 @@
if alsa_dep.found() if alsa_dep.found()
subdir('alsa') subdir('alsa')
@ -400,7 +408,7 @@ diff -Naur pipewire-0.3.62/spa/plugins/meson.build pipewire-0.3.62.new/spa/plugi
subdir('audiotestsrc') subdir('audiotestsrc')
endif endif
if bluez_dep.found() if bluez_dep.found()
@@ -25,19 +28,19 @@ @@ -25,19 +28,19 @@ endif
if jack_dep.found() if jack_dep.found()
subdir('jack') subdir('jack')
endif endif
@ -425,10 +433,11 @@ diff -Naur pipewire-0.3.62/spa/plugins/meson.build pipewire-0.3.62.new/spa/plugi
subdir('volume') subdir('volume')
endif endif
if vulkan_headers if vulkan_headers
diff -Naur pipewire-0.3.62/spa/plugins/support/meson.build pipewire-0.3.62.new/spa/plugins/support/meson.build Index: pipewire-0.3.63/spa/plugins/support/meson.build
--- pipewire-0.3.62/spa/plugins/support/meson.build 2022-12-09 10:28:24.000000000 +0000 ===================================================================
+++ pipewire-0.3.62.new/spa/plugins/support/meson.build 2022-12-10 13:39:45.130679334 +0000 --- pipewire-0.3.63.orig/spa/plugins/support/meson.build
@@ -23,7 +23,7 @@ +++ pipewire-0.3.63/spa/plugins/support/meson.build
@@ -23,7 +23,7 @@ spa_support_lib = shared_library('spa-su
install_dir : spa_plugindir / 'support') install_dir : spa_plugindir / 'support')
spa_support_dep = declare_dependency(link_with: spa_support_lib) spa_support_dep = declare_dependency(link_with: spa_support_lib)
@ -437,10 +446,11 @@ diff -Naur pipewire-0.3.62/spa/plugins/support/meson.build pipewire-0.3.62.new/s
evl_inc = include_directories('/usr/evl/include') evl_inc = include_directories('/usr/evl/include')
evl_lib = cc.find_library('evl', evl_lib = cc.find_library('evl',
dirs: ['/usr/evl/lib/'], dirs: ['/usr/evl/lib/'],
diff -Naur pipewire-0.3.62/spa/tests/meson.build pipewire-0.3.62.new/spa/tests/meson.build Index: pipewire-0.3.63/spa/tests/meson.build
--- pipewire-0.3.62/spa/tests/meson.build 2022-12-09 10:28:24.000000000 +0000 ===================================================================
+++ pipewire-0.3.62.new/spa/tests/meson.build 2022-12-10 13:39:45.130679334 +0000 --- pipewire-0.3.63.orig/spa/tests/meson.build
@@ -5,7 +5,7 @@ +++ pipewire-0.3.63/spa/tests/meson.build
@@ -5,7 +5,7 @@ find = find_program('find', required: fa
summary({'find (for header testing)': find.found()}, bool_yn: true, section: 'Optional programs') summary({'find (for header testing)': find.found()}, bool_yn: true, section: 'Optional programs')
if find.found() if find.found()
spa_headers = run_command(find, spa_headers = run_command(find,
@ -449,7 +459,7 @@ diff -Naur pipewire-0.3.62/spa/tests/meson.build pipewire-0.3.62.new/spa/tests/m
'-name', '*.h', '-name', '*.h',
'-not', '-name', 'type-info.h', '-not', '-name', 'type-info.h',
'-type', 'f', '-type', 'f',
@@ -41,7 +41,7 @@ @@ -41,7 +41,7 @@ foreach a : benchmark_apps
install_dir : installed_tests_execdir, install_dir : installed_tests_execdir,
), ),
env : [ env : [
@ -458,10 +468,11 @@ diff -Naur pipewire-0.3.62/spa/tests/meson.build pipewire-0.3.62.new/spa/tests/m
] ]
) )
diff -Naur pipewire-0.3.62/src/daemon/meson.build pipewire-0.3.62.new/src/daemon/meson.build Index: pipewire-0.3.63/src/daemon/meson.build
--- pipewire-0.3.62/src/daemon/meson.build 2022-12-09 10:28:24.000000000 +0000 ===================================================================
+++ pipewire-0.3.62.new/src/daemon/meson.build 2022-12-10 13:39:45.130679334 +0000 --- pipewire-0.3.63.orig/src/daemon/meson.build
@@ -18,9 +18,9 @@ +++ pipewire-0.3.63/src/daemon/meson.build
@@ -18,9 +18,9 @@ conf_config.set('pulse_comment', '#')
conf_config_uninstalled = conf_config conf_config_uninstalled = conf_config
conf_config_uninstalled.set('pipewire_path', conf_config_uninstalled.set('pipewire_path',
@ -473,7 +484,7 @@ diff -Naur pipewire-0.3.62/src/daemon/meson.build pipewire-0.3.62.new/src/daemon
conf_config_uninstalled.set('pulse_comment', '') conf_config_uninstalled.set('pulse_comment', '')
build_ms = 'media-session' in get_option('session-managers') build_ms = 'media-session' in get_option('session-managers')
@@ -116,7 +116,7 @@ @@ -116,7 +116,7 @@ custom_target('pipewire-uninstalled',
install: false, install: false,
input: pipewire_exec, input: pipewire_exec,
output: 'pipewire-uninstalled', output: 'pipewire-uninstalled',
@ -482,9 +493,10 @@ diff -Naur pipewire-0.3.62/src/daemon/meson.build pipewire-0.3.62.new/src/daemon
) )
#desktop_file = i18n.merge_file( #desktop_file = i18n.merge_file(
diff -Naur pipewire-0.3.62/src/daemon/systemd/meson.build pipewire-0.3.62.new/src/daemon/systemd/meson.build Index: pipewire-0.3.63/src/daemon/systemd/meson.build
--- pipewire-0.3.62/src/daemon/systemd/meson.build 2022-12-09 10:28:24.000000000 +0000 ===================================================================
+++ pipewire-0.3.62.new/src/daemon/systemd/meson.build 2022-12-10 13:39:45.130679334 +0000 --- pipewire-0.3.63.orig/src/daemon/systemd/meson.build
+++ pipewire-0.3.63/src/daemon/systemd/meson.build
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
-if get_option('systemd-system-service').allowed() -if get_option('systemd-system-service').allowed()
+if not get_option('systemd-system-service').disabled() +if not get_option('systemd-system-service').disabled()
@ -494,19 +506,21 @@ diff -Naur pipewire-0.3.62/src/daemon/systemd/meson.build pipewire-0.3.62.new/sr
+if not get_option('systemd-user-service').disabled() +if not get_option('systemd-user-service').disabled()
subdir('user') subdir('user')
endif endif
diff -Naur pipewire-0.3.62/src/daemon/systemd/user/meson.build pipewire-0.3.62.new/src/daemon/systemd/user/meson.build Index: pipewire-0.3.63/src/daemon/systemd/user/meson.build
--- pipewire-0.3.62/src/daemon/systemd/user/meson.build 2022-12-09 10:28:24.000000000 +0000 ===================================================================
+++ pipewire-0.3.62.new/src/daemon/systemd/user/meson.build 2022-12-10 13:39:45.134679328 +0000 --- pipewire-0.3.63.orig/src/daemon/systemd/user/meson.build
+++ pipewire-0.3.63/src/daemon/systemd/user/meson.build
@@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
-systemd_user_services_dir = systemd.get_variable('systemduserunitdir', pkgconfig_define : [ 'prefix', prefix]) -systemd_user_services_dir = systemd.get_variable('systemduserunitdir', pkgconfig_define : [ 'prefix', prefix])
+#systemd_user_services_dir = systemd.get_variable('systemduserunitdir', pkgconfig_define : [ 'prefix', prefix]) +#systemd_user_services_dir = systemd.get_variable('systemduserunitdir', pkgconfig_define : [ 'prefix', prefix])
if get_option('systemd-user-unit-dir') != '' if get_option('systemd-user-unit-dir') != ''
systemd_user_services_dir = get_option('systemd-user-unit-dir') systemd_user_services_dir = get_option('systemd-user-unit-dir')
endif endif
diff -Naur pipewire-0.3.62/src/gst/meson.build pipewire-0.3.62.new/src/gst/meson.build Index: pipewire-0.3.63/src/gst/meson.build
--- pipewire-0.3.62/src/gst/meson.build 2022-12-09 10:28:24.000000000 +0000 ===================================================================
+++ pipewire-0.3.62.new/src/gst/meson.build 2022-12-10 13:39:45.134679328 +0000 --- pipewire-0.3.63.orig/src/gst/meson.build
@@ -8,7 +8,7 @@ +++ pipewire-0.3.63/src/gst/meson.build
@@ -8,7 +8,7 @@ pipewire_gst_sources = [
'gstpipewiresrc.c', 'gstpipewiresrc.c',
] ]
@ -515,10 +529,11 @@ diff -Naur pipewire-0.3.62/src/gst/meson.build pipewire-0.3.62.new/src/gst/meson
pipewire_gst_sources += [ 'gstpipewiredeviceprovider.c' ] pipewire_gst_sources += [ 'gstpipewiredeviceprovider.c' ]
endif endif
diff -Naur pipewire-0.3.62/src/meson.build pipewire-0.3.62.new/src/meson.build Index: pipewire-0.3.63/src/meson.build
--- pipewire-0.3.62/src/meson.build 2022-12-09 10:28:24.000000000 +0000 ===================================================================
+++ pipewire-0.3.62.new/src/meson.build 2022-12-10 13:39:45.134679328 +0000 --- pipewire-0.3.63.orig/src/meson.build
@@ -3,10 +3,10 @@ +++ pipewire-0.3.63/src/meson.build
@@ -3,10 +3,10 @@ subdir('pipewire')
subdir('daemon') subdir('daemon')
subdir('tools') subdir('tools')
subdir('modules') subdir('modules')
@ -531,10 +546,11 @@ diff -Naur pipewire-0.3.62/src/meson.build pipewire-0.3.62.new/src/meson.build
subdir('tests') subdir('tests')
endif endif
diff -Naur pipewire-0.3.62/src/modules/meson.build pipewire-0.3.62.new/src/modules/meson.build Index: pipewire-0.3.63/src/modules/meson.build
--- pipewire-0.3.62/src/modules/meson.build 2022-12-09 10:28:24.000000000 +0000 ===================================================================
+++ pipewire-0.3.62.new/src/modules/meson.build 2022-12-10 13:39:45.134679328 +0000 --- pipewire-0.3.63.orig/src/modules/meson.build
@@ -401,9 +401,9 @@ +++ pipewire-0.3.63/src/modules/meson.build
@@ -402,9 +402,9 @@ test('pw-test-protocol-native',
install_dir : installed_tests_execdir, install_dir : installed_tests_execdir,
), ),
env : [ env : [
@ -547,7 +563,7 @@ diff -Naur pipewire-0.3.62/src/modules/meson.build pipewire-0.3.62.new/src/modul
] ]
) )
@@ -560,8 +560,11 @@ @@ -561,8 +561,11 @@ pipewire_module_fallback_sink = shared_l
dependencies : [mathlib, dl_lib, rt_lib, pipewire_dep], dependencies : [mathlib, dl_lib, rt_lib, pipewire_dep],
) )
@ -560,10 +576,11 @@ diff -Naur pipewire-0.3.62/src/modules/meson.build pipewire-0.3.62.new/src/modul
pipewire_module_avb = shared_library('pipewire-module-avb', pipewire_module_avb = shared_library('pipewire-module-avb',
[ 'module-avb.c', [ 'module-avb.c',
'module-avb/avb.c', 'module-avb/avb.c',
diff -Naur pipewire-0.3.62/src/tests/meson.build pipewire-0.3.62.new/src/tests/meson.build Index: pipewire-0.3.63/src/tests/meson.build
--- pipewire-0.3.62/src/tests/meson.build 2022-12-09 10:28:24.000000000 +0000 ===================================================================
+++ pipewire-0.3.62.new/src/tests/meson.build 2022-12-10 13:39:45.134679328 +0000 --- pipewire-0.3.63.orig/src/tests/meson.build
@@ -14,9 +14,9 @@ +++ pipewire-0.3.63/src/tests/meson.build
@@ -14,9 +14,9 @@ foreach a : test_apps
install : installed_tests_enabled, install : installed_tests_enabled,
install_dir : installed_tests_execdir), install_dir : installed_tests_execdir),
env : [ env : [
@ -576,10 +593,11 @@ diff -Naur pipewire-0.3.62/src/tests/meson.build pipewire-0.3.62.new/src/tests/m
]) ])
if installed_tests_enabled if installed_tests_enabled
diff -Naur pipewire-0.3.62/src/tools/meson.build pipewire-0.3.62.new/src/tools/meson.build Index: pipewire-0.3.63/src/tools/meson.build
--- pipewire-0.3.62/src/tools/meson.build 2022-12-09 10:28:24.000000000 +0000 ===================================================================
+++ pipewire-0.3.62.new/src/tools/meson.build 2022-12-10 13:39:45.134679328 +0000 --- pipewire-0.3.63.orig/src/tools/meson.build
@@ -32,7 +32,7 @@ +++ pipewire-0.3.63/src/tools/meson.build
@@ -32,7 +32,7 @@ if ncurses_dep.found()
endif endif
build_pw_cat = false build_pw_cat = false
@ -588,10 +606,11 @@ diff -Naur pipewire-0.3.62/src/tools/meson.build pipewire-0.3.62.new/src/tools/m
build_pw_cat = true build_pw_cat = true
pwcat_sources = [ pwcat_sources = [
diff -Naur pipewire-0.3.62/test/meson.build pipewire-0.3.62.new/test/meson.build Index: pipewire-0.3.63/test/meson.build
--- pipewire-0.3.62/test/meson.build 2022-12-09 10:28:24.000000000 +0000 ===================================================================
+++ pipewire-0.3.62.new/test/meson.build 2022-12-10 13:39:45.134679328 +0000 --- pipewire-0.3.63.orig/test/meson.build
@@ -14,8 +14,8 @@ +++ pipewire-0.3.63/test/meson.build
@@ -14,8 +14,8 @@ pwtest_deps = [
] ]
pwtest_c_args = [ pwtest_c_args = [