From c40b90174ece28270096bb88ce75b0b2fedf598edc48474ebe75317bd1d1923a Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 8 Jul 2022 12:02:09 +0000 Subject: [PATCH] Accepting request 987881 from openSUSE:Factory Revert to 0.4.10 OBS-URL: https://build.opensuse.org/request/show/987881 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/wireplumber?expand=0&rev=14 --- _service | 5 ++- reduce-meson-required-version.patch | 10 ++--- split-config-file.py | 20 +++++---- wireplumber-0.4.10.obscpio | 3 ++ wireplumber-0.4.11.obscpio | 3 -- wireplumber.changes | 70 ----------------------------- wireplumber.obsinfo | 6 +-- wireplumber.spec | 8 +--- 8 files changed, 27 insertions(+), 98 deletions(-) create mode 100644 wireplumber-0.4.10.obscpio delete mode 100644 wireplumber-0.4.11.obscpio diff --git a/_service b/_service index b8c0ee0..db469b1 100644 --- a/_service +++ b/_service @@ -3,10 +3,11 @@ git https://gitlab.freedesktop.org/pipewire/wireplumber.git - 0.4.11 + enable + 0.4.10 @PARENT_TAG@ diff --git a/reduce-meson-required-version.patch b/reduce-meson-required-version.patch index 514e290..b44e155 100644 --- a/reduce-meson-required-version.patch +++ b/reduce-meson-required-version.patch @@ -4,13 +4,13 @@ Subject: Reduce the minimum required meson version With this, we can build wireplumber in SLE 15 SP3/Leap 15.3 which only have meson 0.54 -Index: wireplumber-0.4.11/meson.build +Index: wireplumber-0.4.10/meson.build =================================================================== ---- wireplumber-0.4.11.orig/meson.build -+++ wireplumber-0.4.11/meson.build +--- wireplumber-0.4.10.orig/meson.build ++++ wireplumber-0.4.10/meson.build @@ -1,7 +1,7 @@ project('wireplumber', ['c'], - version : '0.4.11', + version : '0.4.10', license : 'MIT', - meson_version : '>= 0.59.0', + meson_version : '>= 0.54.0', @@ -18,7 +18,7 @@ Index: wireplumber-0.4.11/meson.build 'warning_level=1', 'buildtype=debugoptimized', @@ -42,7 +42,11 @@ spa_dep = dependency('libspa-0.2', versi - pipewire_dep = dependency('libpipewire-0.3', version: '>= 0.3.52') + pipewire_dep = dependency('libpipewire-0.3', version: '>= 0.3.48') mathlib = cc.find_library('m') threads_dep = dependency('threads') -libintl_dep = dependency('intl') diff --git a/split-config-file.py b/split-config-file.py index 019df47..fc8c28c 100644 --- a/split-config-file.py +++ b/split-config-file.py @@ -2,20 +2,22 @@ import hashlib import sys -def sha256_from_data(data): - hash_sha256 = hashlib.sha256() - hash_sha256.update(data) - return hash_sha256.hexdigest() + +def md5FromData(data): + hash_md5 = hashlib.md5() + hash_md5.update(data) + return hash_md5.hexdigest() + contents = open('90-enable-all.lua', 'r', encoding='utf-8').read() -sha256sum = sha256_from_data(contents.encode('utf-8')) -expected_sha256sum = 'cb9f05eb3b4959b84e94a67867645130f2bc0aa761eb864d227890aea310ab74' +md5sum = md5FromData(contents.encode('utf-8')) +expected_md5sum = '74b508b1be26ae58d3e851d3abebc009' -if sha256sum != expected_sha256sum: +if md5sum != expected_md5sum: print('The script has to be updated for new changes in 90-enable-all.lua') - print(f'File sha256sum: {sha256sum}') - print(f'expected sha256sum: {expected_sha256sum}') + print(f'File md5sum: {md5sum}') + print(f'expected md5sum: {expected_md5sum}') sys.exit(1) content_sections = contents.split('\n\n') diff --git a/wireplumber-0.4.10.obscpio b/wireplumber-0.4.10.obscpio new file mode 100644 index 0000000..55d6cc3 --- /dev/null +++ b/wireplumber-0.4.10.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ad91eeeaf477c628eda5afc8360c9edc7c6740e2b0eedaa8f385253267b8fc9d +size 2078732 diff --git a/wireplumber-0.4.11.obscpio b/wireplumber-0.4.11.obscpio deleted file mode 100644 index b8c3422..0000000 --- a/wireplumber-0.4.11.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9c12a9e7e1749fedf931f5fa6a7596d7ca2c4eaaed3668725cd6ecfe3730f7d8 -size 2116620 diff --git a/wireplumber.changes b/wireplumber.changes index a123de3..c842fb8 100644 --- a/wireplumber.changes +++ b/wireplumber.changes @@ -1,73 +1,3 @@ -------------------------------------------------------------------- -Tue Jul 5 15:13:07 UTC 2022 - Alexei Sorokin - -- Update to version 0.4.11: - * Changes - - The libcamera monitor is now enabled by default, so if the - libcamera source is enabled in PipeWire, cameras discovered - with the libcamera API will be available out of the box. - This is safe to use alongside V4L2, as long as the user does - not try to use the same camera over different APIs at the - same time. - - Libcamera and V4L2 nodes now get assigned a - `priority.session` number; V4L2 nodes get a higher priority - by default, so the default camera is going to be /dev/video0 - over V4L2, unless changed with `wpctl`. - - Libcamera nodes now get a user-friendly description based on - their location (e.g. built-in front camera). Additionally, - V4L2 nodes now have a "(V4L2)" string appended to their - description in order to be distinguished from the libcamera - ones. - - 50-alsa-config.lua now has a section where you can set - properties that will only be applied if WirePlumber is - running in a virtual machine. By default it now sets - `api.alsa.period-size = 256` and `api.alsa.headroom = 8192`. - * Fixes - - The "enabled" properties in the config files are now "true" - by default when they are not defined. This fixes backwards - compatibility with older configuration files. - - Fixed device name deduplication in the alsa monitor, when - device reservation is enabled. - - Reverted a previous fix that makes it possible again to get - a glitch when changing default nodes while also changing the - profile (GNOME Settings). - The fix was causing other problems and the issue will be - addressed differently in the future. - - Fixed an issue that would prevent applications from being - moved to a recently plugged USB headset. - - Fixed an issue where wireplumber would automatically link - control ports, if they are enabled, to audio ports, - effectively breaking audio. - - The policy now always considers the profile of a device that - was previously selected by the user, if it is available, when - deciding which profile to activate. - - A few documentation fixes. - * Tools - - wpctl now has a `get-volume` command for easier scripting of - volume controls. - - wpctl now supports relative steps and percentage-based steps - in `set-volume`. - - wpctl now also prints link states. - - wpctl can now `inspect` metadata objects without showing - critical warnings. - * Library - - A new WpDBus API was added to maintain a single D-Bus - connection among modules that need one. - - WpCore now has a method to get the virtual machine type, if - WirePlumber is running in a virtual machine. - - WpSpaDevice now has a - `wp_spa_device_new_managed_object_iterator()` method. - - WpSpaJson now has a `wp_spa_json_to_string()` method that - returns a newly allocated string with the correct size of the string token. - - WpLink now has a `WP_LINK_FEATURE_ESTABLISHED` that allows - the caller to wait until the link is in the PAUSED or ACTIVE - state. This transparently now enables watching links for - negotiation or allocation errors and failing gracefully - instead of keeping dead link objects around. - * Misc - - The Lua subproject was bumped to version 5.4.4. -- Rebase reduce-meson-required-version.patch - ------------------------------------------------------------------- Tue May 10 14:39:24 UTC 2022 - Alexei Sorokin diff --git a/wireplumber.obsinfo b/wireplumber.obsinfo index 9ae4f7e..4288429 100644 --- a/wireplumber.obsinfo +++ b/wireplumber.obsinfo @@ -1,4 +1,4 @@ name: wireplumber -version: 0.4.11 -mtime: 1657027335 -commit: 80b3559963f0ad40a7bfa6c23b0098275c0b5ebe +version: 0.4.10 +mtime: 1652193117 +commit: 3400acd0db95fefdda7595d20466c095902d8997 diff --git a/wireplumber.spec b/wireplumber.spec index 62907be..6ef16f4 100644 --- a/wireplumber.spec +++ b/wireplumber.spec @@ -16,13 +16,13 @@ # -%define pipewire_minimum_version 0.3.52 +%define pipewire_minimum_version 0.3.48 %define apiver 0.4 %define apiver_str 0_4 %define sover 0 %define libwireplumber libwireplumber-%{apiver_str}-%{sover} Name: wireplumber -Version: 0.4.11 +Version: 0.4.10 Release: 0 Summary: Session / policy manager implementation for PipeWire License: MIT @@ -38,11 +38,7 @@ BuildRequires: graphviz # /docs BuildRequires: cmake BuildRequires: fdupes -%if 0%{?sle_version} == 150300 BuildRequires: meson >= 0.54.0 -%else -BuildRequires: meson >= 0.59.0 -%endif BuildRequires: pipewire >= %{pipewire_minimum_version} BuildRequires: pipewire-spa-plugins-0_2 >= %{pipewire_minimum_version} BuildRequires: pkgconfig