Accepting request 1000951 from home:XRevan86
- Update to version 0.3.57. OBS-URL: https://build.opensuse.org/request/show/1000951 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/pipewire?expand=0&rev=74
This commit is contained in:
parent
d2866f1811
commit
e4eb30def8
@ -1,25 +0,0 @@
|
|||||||
From aaa015d0c0c66b64c7198a34ad3c4b43445667d2 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Wim Taymans <wtaymans@redhat.com>
|
|
||||||
Date: Tue, 19 Jul 2022 13:06:52 +0200
|
|
||||||
Subject: [PATCH 1/3] avb: fix compilation on big endian
|
|
||||||
|
|
||||||
---
|
|
||||||
spa/plugins/avb/avbtp/packets.h | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/spa/plugins/avb/avbtp/packets.h b/spa/plugins/avb/avbtp/packets.h
|
|
||||||
index 7047456bf..3d4a652ee 100644
|
|
||||||
--- a/spa/plugins/avb/avbtp/packets.h
|
|
||||||
+++ b/spa/plugins/avb/avbtp/packets.h
|
|
||||||
@@ -116,7 +116,7 @@ struct spa_avbtp_packet_aaf {
|
|
||||||
unsigned gv:1;
|
|
||||||
unsigned tv:1;
|
|
||||||
|
|
||||||
- uint8_t seq_number;
|
|
||||||
+ uint8_t seq_num;
|
|
||||||
|
|
||||||
unsigned _r2:7;
|
|
||||||
unsigned tu:1;
|
|
||||||
--
|
|
||||||
2.37.1
|
|
||||||
|
|
@ -1,25 +0,0 @@
|
|||||||
From 1a5ec4452fa21592eaeeb823ad95a1db6eb60376 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Wim Taymans <wtaymans@redhat.com>
|
|
||||||
Date: Tue, 19 Jul 2022 13:49:42 +0200
|
|
||||||
Subject: [PATCH 2/3] avb: fix compilation on big endian
|
|
||||||
|
|
||||||
---
|
|
||||||
src/modules/module-avb/aaf.h | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/src/modules/module-avb/aaf.h b/src/modules/module-avb/aaf.h
|
|
||||||
index cb4871ca6..b444ce251 100644
|
|
||||||
--- a/src/modules/module-avb/aaf.h
|
|
||||||
+++ b/src/modules/module-avb/aaf.h
|
|
||||||
@@ -35,7 +35,7 @@ struct avb_packet_aaf {
|
|
||||||
unsigned gv:1;
|
|
||||||
unsigned tv:1;
|
|
||||||
|
|
||||||
- uint8_t seq_number;
|
|
||||||
+ uint8_t seq_num;
|
|
||||||
|
|
||||||
unsigned _r2:7;
|
|
||||||
unsigned tu:1;
|
|
||||||
--
|
|
||||||
2.37.1
|
|
||||||
|
|
@ -1,25 +0,0 @@
|
|||||||
From f857fd46262b1a90ad94f86e34216a1a886d9463 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Wim Taymans <wtaymans@redhat.com>
|
|
||||||
Date: Tue, 19 Jul 2022 14:07:16 +0200
|
|
||||||
Subject: [PATCH 3/3] avb: fix compilation on big endian
|
|
||||||
|
|
||||||
---
|
|
||||||
src/modules/module-avb/iec61883.h | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/src/modules/module-avb/iec61883.h b/src/modules/module-avb/iec61883.h
|
|
||||||
index d3b3a7daa..6ca8724ad 100644
|
|
||||||
--- a/src/modules/module-avb/iec61883.h
|
|
||||||
+++ b/src/modules/module-avb/iec61883.h
|
|
||||||
@@ -37,7 +37,7 @@ struct avb_packet_iec61883 {
|
|
||||||
unsigned gv:1;
|
|
||||||
unsigned tv:1;
|
|
||||||
|
|
||||||
- uint8_t seq_number;
|
|
||||||
+ uint8_t seq_num;
|
|
||||||
|
|
||||||
unsigned _r2:7;
|
|
||||||
unsigned tu:1;
|
|
||||||
--
|
|
||||||
2.37.1
|
|
||||||
|
|
2
_service
2
_service
@ -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.56</param>
|
<param name="revision">refs/tags/0.3.57</param>
|
||||||
<param name="versionformat">@PARENT_TAG@</param>
|
<param name="versionformat">@PARENT_TAG@</param>
|
||||||
<!--
|
<!--
|
||||||
<param name="revision">master</param>
|
<param name="revision">master</param>
|
||||||
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:57dd685ce01faca2ec35788eacc6cf8af165274b7667dc0814cdd8c156b24c8d
|
|
||||||
size 11057165
|
|
3
pipewire-0.3.57.obscpio
Normal file
3
pipewire-0.3.57.obscpio
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:b8a4b9f8c72a44323def8c8bd17aa0ad3654904358e6e31473bb1d12c936e502
|
||||||
|
size 11163661
|
103
pipewire.changes
103
pipewire.changes
@ -1,3 +1,106 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Sep 2 10:10:53 UTC 2022 - Alexei Sorokin <sor.alexei@meowr.ru>
|
||||||
|
|
||||||
|
- Update to version 0.3.57:
|
||||||
|
* Highlights
|
||||||
|
- Support masking of conf.d/ files.
|
||||||
|
- Use org.freedesktop.portal.Realtime when available. This does
|
||||||
|
the correct PID/TID mappings to make realtime also work from
|
||||||
|
flatpaks.
|
||||||
|
- Fix rate adjustement logic in pulse-tunnel. This would cause
|
||||||
|
increasing delays and hickups when using tunnels.
|
||||||
|
- Add OPUS as a new vendor codec. Add OPUS-A2DP spec.
|
||||||
|
PipeWire can now send and reveive OPUS data over bluetooth.
|
||||||
|
- An AAC decoder was added so that PipeWire can now also
|
||||||
|
function as an A2DP AAC receiver.
|
||||||
|
- Fix some issues where the wrong samplerate was used.
|
||||||
|
- Fix rate match for sources. This fixes an error where
|
||||||
|
follower sources would generate many resync warnings.
|
||||||
|
- Many more bugfixes and improvements.
|
||||||
|
* PipeWire
|
||||||
|
- Support masking of conf.d/ files.
|
||||||
|
- Add some more debug info to memfd.
|
||||||
|
- Improve data-loop invoke method. Also flush pending items.
|
||||||
|
- Add a filter-chain systemd service file than can be used to
|
||||||
|
start custom filters placed in
|
||||||
|
~/.conf/pipewire/filter-chain.d/
|
||||||
|
- Improve triggered timestamps for remote nodes.
|
||||||
|
- Fix some potential cross compilation problems due to wrong
|
||||||
|
host_machine.
|
||||||
|
- Check return values of pw_getrandom().
|
||||||
|
* Tools
|
||||||
|
- Updates to pw-cli manpages.
|
||||||
|
- Remove the pw-cli dump command. It is mostly implemented as
|
||||||
|
part of wpctl status, pw-dump, pw-link, pw-top and others.
|
||||||
|
- Clean up resource in pw-cat correctly on errors.
|
||||||
|
* Modules
|
||||||
|
- Fix compilation of AVB on big-endian.
|
||||||
|
Enable AVB only on Linux.
|
||||||
|
- Use org.freedesktop.portal.Realtime when available. This does
|
||||||
|
the correct PID/TID mappings to make realtime also work from
|
||||||
|
flatpaks.
|
||||||
|
- Fix compilation of ROC module when headers are missing.
|
||||||
|
- Improve some error cleanup paths in protocol-native. Improve
|
||||||
|
connect and disconnect.
|
||||||
|
- Fix a potential crash in FFT unload in filter-chain.
|
||||||
|
- Implement PIPEWIRE_NOTIFICATION_FD for notification when the
|
||||||
|
socket is ready.
|
||||||
|
- Try to use rtkit if set_nice() fails.
|
||||||
|
- Fix rate adjustement logic in pulse-tunnel. This would cause
|
||||||
|
increasing delays and hickups when using tunnels.
|
||||||
|
- Handle disconnect in pulse-tunnel.
|
||||||
|
* Bluetooth
|
||||||
|
- Add OPUS as a new vendor codec. Add OPUS-A2DP spec.
|
||||||
|
PipeWire can now send and reveive OPUS data over bluetooth.
|
||||||
|
- An AAC decoder was added so that PipeWire can now also
|
||||||
|
function as an A2DP AAC receiver.
|
||||||
|
* SPA
|
||||||
|
- Tweak the resampler window function some more.
|
||||||
|
- Improve format convert performance in some fallback cases.
|
||||||
|
- Fix rounding in format conversion on ARM NEON.
|
||||||
|
- Fix libcamera build error.
|
||||||
|
- Fix some issues where the wrong samplerate was used.
|
||||||
|
- Don't wait for more samples that can fit in the ringbuffer
|
||||||
|
in ALSA.
|
||||||
|
- Improve buffer size handling in audioconvert, scale the
|
||||||
|
buffers based on the rate conversion and make things work
|
||||||
|
with really large rate conversions as well.
|
||||||
|
- Add more and better debug for ALSA devices.
|
||||||
|
- Improve channel mix: Filter FC and LFE when copying from a
|
||||||
|
different layout. Implement STEREO from FC. Avoid generating
|
||||||
|
REAR from FC in PSD mode.
|
||||||
|
- Fix rate match for sources. This fixes an error where
|
||||||
|
follower sources would generate many resynch warnings.
|
||||||
|
- Improve ALSA format negotiation. If the ALSA node is not
|
||||||
|
running and there was a previously configured format, close
|
||||||
|
and reopen the device to enumerate and accept all possible
|
||||||
|
formats again.
|
||||||
|
* ALSA
|
||||||
|
- The alsa plugin will now also save the volumes set with the
|
||||||
|
control API. This saves the volumes set with alsa-mixer, for
|
||||||
|
example.
|
||||||
|
* Pulse-server
|
||||||
|
- Flatpak apps with devices=all (Zoom) will now be granted
|
||||||
|
Manager permissions.
|
||||||
|
- Small tweaks to the amount of data sent to clients to work
|
||||||
|
around an issue in freerdp.
|
||||||
|
* JACK
|
||||||
|
- Clean up the transport correctly when closing a client.
|
||||||
|
- Match context properties in addition to node properties for
|
||||||
|
the jack client rules.
|
||||||
|
- Make sure to return an error when disconnected from the
|
||||||
|
server.
|
||||||
|
- Fix thread cast problem in jack_client_thread_id().
|
||||||
|
- Increase jack_client_name_size() length and make sure we have
|
||||||
|
space for the \0 byte.
|
||||||
|
- JACK clients from the same application will be added to the
|
||||||
|
same group so that they share the quantum and rate.
|
||||||
|
- Rebase reduce-meson-dependency.patch.
|
||||||
|
- Drop patches already included upstream:
|
||||||
|
* 0001-avb-fix-compilation-on-big-endian.patch
|
||||||
|
* 0002-avb-fix-compilation-on-big-endian.patch
|
||||||
|
* 0003-avb-fix-compilation-on-big-endian.patch
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Aug 1 12:07:38 UTC 2022 - Antonio Larrosa <alarrosa@suse.com>
|
Mon Aug 1 12:07:38 UTC 2022 - Antonio Larrosa <alarrosa@suse.com>
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
name: pipewire
|
name: pipewire
|
||||||
version: 0.3.56
|
version: 0.3.57
|
||||||
mtime: 1658216991
|
mtime: 1662107003
|
||||||
commit: f274e53d25ee8f483ac6fce9e516bb1830abe88b
|
commit: 49f1c2038fb7b5249affa56709b117a2a8603b52
|
||||||
|
@ -54,7 +54,7 @@
|
|||||||
%bcond_with aptx
|
%bcond_with aptx
|
||||||
|
|
||||||
Name: pipewire
|
Name: pipewire
|
||||||
Version: 0.3.56
|
Version: 0.3.57
|
||||||
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,12 +64,6 @@ 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-avb-fix-compilation-on-big-endian.patch
|
|
||||||
Patch1: 0001-avb-fix-compilation-on-big-endian.patch
|
|
||||||
# PATCH-FIX-UPSTREAM 0002-avb-fix-compilation-on-big-endian.patch
|
|
||||||
Patch2: 0002-avb-fix-compilation-on-big-endian.patch
|
|
||||||
# PATCH-FIX-UPSTREAM 0003-avb-fix-compilation-on-big-endian.patch
|
|
||||||
Patch3: 0003-avb-fix-compilation-on-big-endian.patch
|
|
||||||
BuildRequires: docutils
|
BuildRequires: docutils
|
||||||
BuildRequires: doxygen
|
BuildRequires: doxygen
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
@ -113,7 +107,7 @@ BuildRequires: pkgconfig(libavcodec)
|
|||||||
BuildRequires: pkgconfig(libavfilter)
|
BuildRequires: pkgconfig(libavfilter)
|
||||||
BuildRequires: pkgconfig(libavformat)
|
BuildRequires: pkgconfig(libavformat)
|
||||||
%if %{with libcamera}
|
%if %{with libcamera}
|
||||||
BuildRequires: pkgconfig(libcamera) >= 0.0.0+g3381.1db1e31e
|
BuildRequires: libcamera-devel >= 0.0.0+g3887.f1776100
|
||||||
%endif
|
%endif
|
||||||
BuildRequires: pkgconfig(libcanberra)
|
BuildRequires: pkgconfig(libcanberra)
|
||||||
BuildRequires: pkgconfig(libcap)
|
BuildRequires: pkgconfig(libcap)
|
||||||
@ -128,6 +122,7 @@ BuildRequires: pkgconfig(libusb-1.0)
|
|||||||
BuildRequires: pkgconfig(lilv-0)
|
BuildRequires: pkgconfig(lilv-0)
|
||||||
BuildRequires: pkgconfig(ncurses)
|
BuildRequires: pkgconfig(ncurses)
|
||||||
BuildRequires: pkgconfig(openssl)
|
BuildRequires: pkgconfig(openssl)
|
||||||
|
BuildRequires: pkgconfig(opus)
|
||||||
BuildRequires: pkgconfig(sbc)
|
BuildRequires: pkgconfig(sbc)
|
||||||
BuildRequires: pkgconfig(sdl2)
|
BuildRequires: pkgconfig(sdl2)
|
||||||
BuildRequires: pkgconfig(sndfile)
|
BuildRequires: pkgconfig(sndfile)
|
||||||
@ -340,9 +335,6 @@ This package provides a PulseAudio implementation based on PipeWire
|
|||||||
%if 0%{?sle_version} <= 150300
|
%if 0%{?sle_version} <= 150300
|
||||||
%patch0 -p1
|
%patch0 -p1
|
||||||
%endif
|
%endif
|
||||||
%patch1 -p1
|
|
||||||
%patch2 -p1
|
|
||||||
%patch3 -p1
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%if %{pkg_vcmp gcc < 8}
|
%if %{pkg_vcmp gcc < 8}
|
||||||
@ -528,6 +520,7 @@ fi
|
|||||||
%{_bindir}/pipewire-avb
|
%{_bindir}/pipewire-avb
|
||||||
%{_userunitdir}/pipewire.service
|
%{_userunitdir}/pipewire.service
|
||||||
%{_userunitdir}/pipewire.socket
|
%{_userunitdir}/pipewire.socket
|
||||||
|
%{_userunitdir}/filter-chain.service
|
||||||
%{_mandir}/man1/pipewire.1%{?ext_man}
|
%{_mandir}/man1/pipewire.1%{?ext_man}
|
||||||
%{_mandir}/man5/pipewire.conf.5%{?ext_man}
|
%{_mandir}/man5/pipewire.conf.5%{?ext_man}
|
||||||
%dir %{_datadir}/pipewire/
|
%dir %{_datadir}/pipewire/
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
Index: pipewire-0.3.56/doc/meson.build
|
Index: pipewire-0.3.57/doc/meson.build
|
||||||
===================================================================
|
===================================================================
|
||||||
--- pipewire-0.3.56.orig/doc/meson.build
|
--- pipewire-0.3.57.orig/doc/meson.build
|
||||||
+++ pipewire-0.3.56/doc/meson.build
|
+++ pipewire-0.3.57/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())
|
||||||
@ -102,10 +102,10 @@ Index: pipewire-0.3.56/doc/meson.build
|
|||||||
|
|
||||||
doxyfile = configure_file(input: 'Doxyfile.in',
|
doxyfile = configure_file(input: 'Doxyfile.in',
|
||||||
output: 'Doxyfile',
|
output: 'Doxyfile',
|
||||||
Index: pipewire-0.3.56/man/meson.build
|
Index: pipewire-0.3.57/man/meson.build
|
||||||
===================================================================
|
===================================================================
|
||||||
--- pipewire-0.3.56.orig/man/meson.build
|
--- pipewire-0.3.57.orig/man/meson.build
|
||||||
+++ pipewire-0.3.56/man/meson.build
|
+++ pipewire-0.3.57/man/meson.build
|
||||||
@@ -21,7 +21,7 @@ manpages = [
|
@@ -21,7 +21,7 @@ manpages = [
|
||||||
'pw-top.1.rst.in',
|
'pw-top.1.rst.in',
|
||||||
]
|
]
|
||||||
@ -115,13 +115,13 @@ Index: pipewire-0.3.56/man/meson.build
|
|||||||
manpages += 'pw-jack.1.rst.in'
|
manpages += 'pw-jack.1.rst.in'
|
||||||
endif
|
endif
|
||||||
|
|
||||||
Index: pipewire-0.3.56/meson.build
|
Index: pipewire-0.3.57/meson.build
|
||||||
===================================================================
|
===================================================================
|
||||||
--- pipewire-0.3.56.orig/meson.build
|
--- pipewire-0.3.57.orig/meson.build
|
||||||
+++ pipewire-0.3.56/meson.build
|
+++ pipewire-0.3.57/meson.build
|
||||||
@@ -1,7 +1,7 @@
|
@@ -1,7 +1,7 @@
|
||||||
project('pipewire', ['c' ],
|
project('pipewire', ['c' ],
|
||||||
version : '0.3.56',
|
version : '0.3.57',
|
||||||
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',
|
||||||
@ -139,7 +139,7 @@ Index: pipewire-0.3.56/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')
|
||||||
@@ -328,7 +328,7 @@ endforeach
|
@@ -333,7 +333,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')
|
||||||
|
|
||||||
@ -148,7 +148,7 @@ Index: pipewire-0.3.56/meson.build
|
|||||||
|
|
||||||
webrtc_dep = dependency('webrtc-audio-processing',
|
webrtc_dep = dependency('webrtc-audio-processing',
|
||||||
version : ['>= 0.2', '< 1.0'],
|
version : ['>= 0.2', '< 1.0'],
|
||||||
@@ -391,10 +391,10 @@ endforeach
|
@@ -396,10 +396,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
|
||||||
@ -161,7 +161,7 @@ Index: pipewire-0.3.56/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
|
||||||
@@ -403,17 +403,17 @@ subdir('po')
|
@@ -408,17 +408,17 @@ subdir('po')
|
||||||
subdir('spa')
|
subdir('spa')
|
||||||
subdir('src')
|
subdir('src')
|
||||||
|
|
||||||
@ -182,7 +182,7 @@ Index: pipewire-0.3.56/meson.build
|
|||||||
subdir('pipewire-v4l2')
|
subdir('pipewire-v4l2')
|
||||||
endif
|
endif
|
||||||
|
|
||||||
@@ -424,7 +424,7 @@ if alsa_dep.found()
|
@@ -429,7 +429,7 @@ if alsa_dep.found()
|
||||||
endif
|
endif
|
||||||
|
|
||||||
generate_manpages = false
|
generate_manpages = false
|
||||||
@ -191,7 +191,7 @@ Index: pipewire-0.3.56/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'))
|
||||||
@@ -445,20 +445,20 @@ endif
|
@@ -450,20 +450,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,
|
||||||
@ -219,7 +219,7 @@ Index: pipewire-0.3.56/meson.build
|
|||||||
|
|
||||||
devenv.set('GST_PLUGIN_PATH', builddir / 'src'/ 'gst')
|
devenv.set('GST_PLUGIN_PATH', builddir / 'src'/ 'gst')
|
||||||
|
|
||||||
@@ -470,4 +470,6 @@ devenv.set('LD_LIBRARY_PATH', builddir /
|
@@ -475,4 +475,6 @@ devenv.set('LD_LIBRARY_PATH', builddir /
|
||||||
|
|
||||||
devenv.set('PW_UNINSTALLED', '1')
|
devenv.set('PW_UNINSTALLED', '1')
|
||||||
|
|
||||||
@ -227,10 +227,10 @@ Index: pipewire-0.3.56/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
|
||||||
Index: pipewire-0.3.56/spa/meson.build
|
Index: pipewire-0.3.57/spa/meson.build
|
||||||
===================================================================
|
===================================================================
|
||||||
--- pipewire-0.3.56.orig/spa/meson.build
|
--- pipewire-0.3.57.orig/spa/meson.build
|
||||||
+++ pipewire-0.3.56/spa/meson.build
|
+++ pipewire-0.3.57/spa/meson.build
|
||||||
@@ -31,7 +31,7 @@ pkgconfig.generate(filebase : 'lib@0@'.f
|
@@ -31,7 +31,7 @@ pkgconfig.generate(filebase : 'lib@0@'.f
|
||||||
|
|
||||||
subdir('include')
|
subdir('include')
|
||||||
@ -240,7 +240,7 @@ Index: pipewire-0.3.56/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
|
||||||
@@ -82,6 +82,6 @@ endif
|
@@ -84,6 +84,6 @@ endif
|
||||||
|
|
||||||
subdir('tools')
|
subdir('tools')
|
||||||
subdir('tests')
|
subdir('tests')
|
||||||
@ -248,10 +248,10 @@ Index: pipewire-0.3.56/spa/meson.build
|
|||||||
+if (get_option('examples').enabled() or get_option('examples').auto())
|
+if (get_option('examples').enabled() or get_option('examples').auto())
|
||||||
subdir('examples')
|
subdir('examples')
|
||||||
endif
|
endif
|
||||||
Index: pipewire-0.3.56/spa/plugins/audioconvert/meson.build
|
Index: pipewire-0.3.57/spa/plugins/audioconvert/meson.build
|
||||||
===================================================================
|
===================================================================
|
||||||
--- pipewire-0.3.56.orig/spa/plugins/audioconvert/meson.build
|
--- pipewire-0.3.57.orig/spa/plugins/audioconvert/meson.build
|
||||||
+++ pipewire-0.3.56/spa/plugins/audioconvert/meson.build
|
+++ pipewire-0.3.57/spa/plugins/audioconvert/meson.build
|
||||||
@@ -146,7 +146,7 @@ foreach a : test_apps
|
@@ -146,7 +146,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'),
|
||||||
@ -270,10 +270,10 @@ Index: pipewire-0.3.56/spa/plugins/audioconvert/meson.build
|
|||||||
])
|
])
|
||||||
|
|
||||||
if installed_tests_enabled
|
if installed_tests_enabled
|
||||||
Index: pipewire-0.3.56/spa/plugins/audiomixer/meson.build
|
Index: pipewire-0.3.57/spa/plugins/audiomixer/meson.build
|
||||||
===================================================================
|
===================================================================
|
||||||
--- pipewire-0.3.56.orig/spa/plugins/audiomixer/meson.build
|
--- pipewire-0.3.57.orig/spa/plugins/audiomixer/meson.build
|
||||||
+++ pipewire-0.3.56/spa/plugins/audiomixer/meson.build
|
+++ pipewire-0.3.57/spa/plugins/audiomixer/meson.build
|
||||||
@@ -81,7 +81,7 @@ foreach a : test_apps
|
@@ -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'),
|
||||||
@ -292,10 +292,10 @@ Index: pipewire-0.3.56/spa/plugins/audiomixer/meson.build
|
|||||||
])
|
])
|
||||||
|
|
||||||
if installed_tests_enabled
|
if installed_tests_enabled
|
||||||
Index: pipewire-0.3.56/spa/plugins/bluez5/meson.build
|
Index: pipewire-0.3.57/spa/plugins/bluez5/meson.build
|
||||||
===================================================================
|
===================================================================
|
||||||
--- pipewire-0.3.56.orig/spa/plugins/bluez5/meson.build
|
--- pipewire-0.3.57.orig/spa/plugins/bluez5/meson.build
|
||||||
+++ pipewire-0.3.56/spa/plugins/bluez5/meson.build
|
+++ pipewire-0.3.57/spa/plugins/bluez5/meson.build
|
||||||
@@ -6,12 +6,12 @@ foreach dep: bluez5_deps
|
@@ -6,12 +6,12 @@ foreach dep: bluez5_deps
|
||||||
endforeach
|
endforeach
|
||||||
|
|
||||||
@ -343,19 +343,31 @@ Index: pipewire-0.3.56/spa/plugins/bluez5/meson.build
|
|||||||
|
|
||||||
-if get_option('bluez5-codec-lc3plus').allowed() and lc3plus_dep.found()
|
-if get_option('bluez5-codec-lc3plus').allowed() and lc3plus_dep.found()
|
||||||
+if (get_option('bluez5-codec-lc3plus').enabled() or get_option('bluez5-codec-lc3plus').auto()) and lc3plus_dep.found()
|
+if (get_option('bluez5-codec-lc3plus').enabled() or get_option('bluez5-codec-lc3plus').auto()) and lc3plus_dep.found()
|
||||||
lc3plus_args = codec_args
|
|
||||||
lc3plus_dep = [ lc3plus_dep ]
|
|
||||||
bluez_codec_lc3plus = shared_library('spa-codec-bluez5-lc3plus',
|
bluez_codec_lc3plus = shared_library('spa-codec-bluez5-lc3plus',
|
||||||
Index: pipewire-0.3.56/spa/plugins/meson.build
|
[ 'a2dp-codec-lc3plus.c', 'a2dp-codecs.c' ],
|
||||||
|
include_directories : [ configinc ],
|
||||||
|
@@ -120,7 +120,7 @@ if get_option('bluez5-codec-lc3plus').al
|
||||||
|
install_dir : spa_plugindir / 'bluez5')
|
||||||
|
endif
|
||||||
|
|
||||||
|
-if get_option('bluez5-codec-opus').allowed() and opus_dep.found()
|
||||||
|
+if (get_option('bluez5-codec-opus').enabled() or get_option('bluez5-codec-opus').auto()) and opus_dep.found()
|
||||||
|
opus_args = codec_args
|
||||||
|
opus_dep = [ opus_dep ]
|
||||||
|
bluez_codec_opus = shared_library('spa-codec-bluez5-opus',
|
||||||
|
Index: pipewire-0.3.57/spa/plugins/meson.build
|
||||||
===================================================================
|
===================================================================
|
||||||
--- pipewire-0.3.56.orig/spa/plugins/meson.build
|
--- pipewire-0.3.57.orig/spa/plugins/meson.build
|
||||||
+++ pipewire-0.3.56/spa/plugins/meson.build
|
+++ pipewire-0.3.57/spa/plugins/meson.build
|
||||||
@@ -1,19 +1,19 @@
|
@@ -1,19 +1,22 @@
|
||||||
if alsa_dep.found()
|
if alsa_dep.found()
|
||||||
subdir('alsa')
|
subdir('alsa')
|
||||||
endif
|
endif
|
||||||
-if get_option('avb').allowed()
|
-if get_option('avb').require(host_machine.system() == 'linux', error_message: 'AVB support is only available on Linux').allowed()
|
||||||
+if (get_option('avb').enabled() or get_option('avb').auto())
|
+if (get_option('avb').enabled() or get_option('avb').auto())
|
||||||
|
+ if (host_machine.system() != 'linux')
|
||||||
|
+ error('AVB support is only available on Linux')
|
||||||
|
+ endif
|
||||||
subdir('avb')
|
subdir('avb')
|
||||||
endif
|
endif
|
||||||
-if get_option('audioconvert').allowed()
|
-if get_option('audioconvert').allowed()
|
||||||
@ -375,7 +387,7 @@ Index: pipewire-0.3.56/spa/plugins/meson.build
|
|||||||
subdir('audiotestsrc')
|
subdir('audiotestsrc')
|
||||||
endif
|
endif
|
||||||
if bluez_dep.found()
|
if bluez_dep.found()
|
||||||
@@ -25,19 +25,19 @@ endif
|
@@ -25,19 +28,19 @@ endif
|
||||||
if jack_dep.found()
|
if jack_dep.found()
|
||||||
subdir('jack')
|
subdir('jack')
|
||||||
endif
|
endif
|
||||||
@ -400,10 +412,10 @@ Index: pipewire-0.3.56/spa/plugins/meson.build
|
|||||||
subdir('volume')
|
subdir('volume')
|
||||||
endif
|
endif
|
||||||
if vulkan_headers
|
if vulkan_headers
|
||||||
Index: pipewire-0.3.56/spa/plugins/support/meson.build
|
Index: pipewire-0.3.57/spa/plugins/support/meson.build
|
||||||
===================================================================
|
===================================================================
|
||||||
--- pipewire-0.3.56.orig/spa/plugins/support/meson.build
|
--- pipewire-0.3.57.orig/spa/plugins/support/meson.build
|
||||||
+++ pipewire-0.3.56/spa/plugins/support/meson.build
|
+++ pipewire-0.3.57/spa/plugins/support/meson.build
|
||||||
@@ -23,7 +23,7 @@ spa_support_lib = shared_library('spa-su
|
@@ -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)
|
||||||
@ -413,10 +425,10 @@ Index: pipewire-0.3.56/spa/plugins/support/meson.build
|
|||||||
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/'],
|
||||||
Index: pipewire-0.3.56/spa/tests/meson.build
|
Index: pipewire-0.3.57/spa/tests/meson.build
|
||||||
===================================================================
|
===================================================================
|
||||||
--- pipewire-0.3.56.orig/spa/tests/meson.build
|
--- pipewire-0.3.57.orig/spa/tests/meson.build
|
||||||
+++ pipewire-0.3.56/spa/tests/meson.build
|
+++ pipewire-0.3.57/spa/tests/meson.build
|
||||||
@@ -5,7 +5,7 @@ find = find_program('find', required: fa
|
@@ -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()
|
||||||
@ -435,10 +447,10 @@ Index: pipewire-0.3.56/spa/tests/meson.build
|
|||||||
]
|
]
|
||||||
)
|
)
|
||||||
|
|
||||||
Index: pipewire-0.3.56/src/daemon/meson.build
|
Index: pipewire-0.3.57/src/daemon/meson.build
|
||||||
===================================================================
|
===================================================================
|
||||||
--- pipewire-0.3.56.orig/src/daemon/meson.build
|
--- pipewire-0.3.57.orig/src/daemon/meson.build
|
||||||
+++ pipewire-0.3.56/src/daemon/meson.build
|
+++ pipewire-0.3.57/src/daemon/meson.build
|
||||||
@@ -18,9 +18,9 @@ conf_config.set('pulse_comment', '#')
|
@@ -18,9 +18,9 @@ conf_config.set('pulse_comment', '#')
|
||||||
|
|
||||||
conf_config_uninstalled = conf_config
|
conf_config_uninstalled = conf_config
|
||||||
@ -460,10 +472,10 @@ Index: pipewire-0.3.56/src/daemon/meson.build
|
|||||||
)
|
)
|
||||||
|
|
||||||
#desktop_file = i18n.merge_file(
|
#desktop_file = i18n.merge_file(
|
||||||
Index: pipewire-0.3.56/src/daemon/systemd/meson.build
|
Index: pipewire-0.3.57/src/daemon/systemd/meson.build
|
||||||
===================================================================
|
===================================================================
|
||||||
--- pipewire-0.3.56.orig/src/daemon/systemd/meson.build
|
--- pipewire-0.3.57.orig/src/daemon/systemd/meson.build
|
||||||
+++ pipewire-0.3.56/src/daemon/systemd/meson.build
|
+++ pipewire-0.3.57/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 (get_option('systemd-system-service').enabled() or get_option('systemd-system-service').auto())
|
+if (get_option('systemd-system-service').enabled() or get_option('systemd-system-service').auto())
|
||||||
@ -473,20 +485,20 @@ Index: pipewire-0.3.56/src/daemon/systemd/meson.build
|
|||||||
+if (get_option('systemd-user-service').enabled() or get_option('systemd-user-service').auto())
|
+if (get_option('systemd-user-service').enabled() or get_option('systemd-user-service').auto())
|
||||||
subdir('user')
|
subdir('user')
|
||||||
endif
|
endif
|
||||||
Index: pipewire-0.3.56/src/daemon/systemd/user/meson.build
|
Index: pipewire-0.3.57/src/daemon/systemd/user/meson.build
|
||||||
===================================================================
|
===================================================================
|
||||||
--- pipewire-0.3.56.orig/src/daemon/systemd/user/meson.build
|
--- pipewire-0.3.57.orig/src/daemon/systemd/user/meson.build
|
||||||
+++ pipewire-0.3.56/src/daemon/systemd/user/meson.build
|
+++ pipewire-0.3.57/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
|
||||||
Index: pipewire-0.3.56/src/gst/meson.build
|
Index: pipewire-0.3.57/src/gst/meson.build
|
||||||
===================================================================
|
===================================================================
|
||||||
--- pipewire-0.3.56.orig/src/gst/meson.build
|
--- pipewire-0.3.57.orig/src/gst/meson.build
|
||||||
+++ pipewire-0.3.56/src/gst/meson.build
|
+++ pipewire-0.3.57/src/gst/meson.build
|
||||||
@@ -8,7 +8,7 @@ pipewire_gst_sources = [
|
@@ -8,7 +8,7 @@ pipewire_gst_sources = [
|
||||||
'gstpipewiresrc.c',
|
'gstpipewiresrc.c',
|
||||||
]
|
]
|
||||||
@ -496,10 +508,10 @@ Index: pipewire-0.3.56/src/gst/meson.build
|
|||||||
pipewire_gst_sources += [ 'gstpipewiredeviceprovider.c' ]
|
pipewire_gst_sources += [ 'gstpipewiredeviceprovider.c' ]
|
||||||
endif
|
endif
|
||||||
|
|
||||||
Index: pipewire-0.3.56/src/meson.build
|
Index: pipewire-0.3.57/src/meson.build
|
||||||
===================================================================
|
===================================================================
|
||||||
--- pipewire-0.3.56.orig/src/meson.build
|
--- pipewire-0.3.57.orig/src/meson.build
|
||||||
+++ pipewire-0.3.56/src/meson.build
|
+++ pipewire-0.3.57/src/meson.build
|
||||||
@@ -3,10 +3,10 @@ subdir('pipewire')
|
@@ -3,10 +3,10 @@ subdir('pipewire')
|
||||||
subdir('daemon')
|
subdir('daemon')
|
||||||
subdir('tools')
|
subdir('tools')
|
||||||
@ -513,11 +525,11 @@ Index: pipewire-0.3.56/src/meson.build
|
|||||||
subdir('tests')
|
subdir('tests')
|
||||||
endif
|
endif
|
||||||
|
|
||||||
Index: pipewire-0.3.56/src/modules/meson.build
|
Index: pipewire-0.3.57/src/modules/meson.build
|
||||||
===================================================================
|
===================================================================
|
||||||
--- pipewire-0.3.56.orig/src/modules/meson.build
|
--- pipewire-0.3.57.orig/src/modules/meson.build
|
||||||
+++ pipewire-0.3.56/src/modules/meson.build
|
+++ pipewire-0.3.57/src/modules/meson.build
|
||||||
@@ -377,9 +377,9 @@ test('pw-test-protocol-native',
|
@@ -386,9 +386,9 @@ test('pw-test-protocol-native',
|
||||||
install_dir : installed_tests_execdir,
|
install_dir : installed_tests_execdir,
|
||||||
),
|
),
|
||||||
env : [
|
env : [
|
||||||
@ -530,20 +542,23 @@ Index: pipewire-0.3.56/src/modules/meson.build
|
|||||||
]
|
]
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -517,8 +517,7 @@ pipewire_module_fallback_sink = shared_l
|
@@ -527,8 +527,11 @@ pipewire_module_fallback_sink = shared_l
|
||||||
install_rpath: modules_install_dir,
|
|
||||||
dependencies : [mathlib, dl_lib, rt_lib, pipewire_dep],
|
dependencies : [mathlib, dl_lib, rt_lib, pipewire_dep],
|
||||||
)
|
)
|
||||||
-
|
|
||||||
-build_module_avb = get_option('avb').allowed()
|
-build_module_avb = get_option('avb').require(host_machine.system() == 'linux', error_message: 'AVB support is only available on Linux').allowed()
|
||||||
+build_module_avb = (get_option('avb').enabled() or get_option('avb').auto())
|
+build_module_avb = (get_option('avb').enabled() or get_option('avb').auto())
|
||||||
if build_module_avb
|
if build_module_avb
|
||||||
|
+if (host_machine.system() != 'linux')
|
||||||
|
+ error('AVB support is only available on Linux')
|
||||||
|
+endif
|
||||||
pipewire_module_avb = shared_library('pipewire-module-avb',
|
pipewire_module_avb = shared_library('pipewire-module-avb',
|
||||||
[ 'module-avb.c',
|
[ 'module-avb.c',
|
||||||
Index: pipewire-0.3.56/src/tests/meson.build
|
'module-avb/avb.c',
|
||||||
|
Index: pipewire-0.3.57/src/tests/meson.build
|
||||||
===================================================================
|
===================================================================
|
||||||
--- pipewire-0.3.56.orig/src/tests/meson.build
|
--- pipewire-0.3.57.orig/src/tests/meson.build
|
||||||
+++ pipewire-0.3.56/src/tests/meson.build
|
+++ pipewire-0.3.57/src/tests/meson.build
|
||||||
@@ -14,9 +14,9 @@ foreach a : test_apps
|
@@ -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),
|
||||||
@ -557,10 +572,10 @@ Index: pipewire-0.3.56/src/tests/meson.build
|
|||||||
])
|
])
|
||||||
|
|
||||||
if installed_tests_enabled
|
if installed_tests_enabled
|
||||||
Index: pipewire-0.3.56/src/tools/meson.build
|
Index: pipewire-0.3.57/src/tools/meson.build
|
||||||
===================================================================
|
===================================================================
|
||||||
--- pipewire-0.3.56.orig/src/tools/meson.build
|
--- pipewire-0.3.57.orig/src/tools/meson.build
|
||||||
+++ pipewire-0.3.56/src/tools/meson.build
|
+++ pipewire-0.3.57/src/tools/meson.build
|
||||||
@@ -32,7 +32,7 @@ if ncurses_dep.found()
|
@@ -32,7 +32,7 @@ if ncurses_dep.found()
|
||||||
endif
|
endif
|
||||||
|
|
||||||
@ -570,10 +585,10 @@ Index: pipewire-0.3.56/src/tools/meson.build
|
|||||||
build_pw_cat = true
|
build_pw_cat = true
|
||||||
|
|
||||||
pwcat_sources = [
|
pwcat_sources = [
|
||||||
Index: pipewire-0.3.56/test/meson.build
|
Index: pipewire-0.3.57/test/meson.build
|
||||||
===================================================================
|
===================================================================
|
||||||
--- pipewire-0.3.56.orig/test/meson.build
|
--- pipewire-0.3.57.orig/test/meson.build
|
||||||
+++ pipewire-0.3.56/test/meson.build
|
+++ pipewire-0.3.57/test/meson.build
|
||||||
@@ -14,8 +14,8 @@ pwtest_deps = [
|
@@ -14,8 +14,8 @@ pwtest_deps = [
|
||||||
]
|
]
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user