From 837038c3b7d839affeea51f5472bca0b96a0326c508a119c353d2e7e88cbcd02 Mon Sep 17 00:00:00 2001 From: Antonio Larrosa Date: Wed, 15 Dec 2021 13:47:33 +0000 Subject: [PATCH 1/3] Accepting request 940736 from home:Vogtinator:branches:multimedia:libs - Use %autosetup, apply patches unconditionally - Hard depend on wireplumber-audio if pipewire-pulseaudio is installed OBS-URL: https://build.opensuse.org/request/show/940736 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/wireplumber?expand=0&rev=14 --- wireplumber.changes | 6 ++++++ wireplumber.spec | 24 ++++++++++-------------- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/wireplumber.changes b/wireplumber.changes index 3fd2dac..d025f7f 100644 --- a/wireplumber.changes +++ b/wireplumber.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Dec 11 16:54:56 UTC 2021 - Fabian Vogt + +- Use %autosetup, apply patches unconditionally +- Hard depend on wireplumber-audio if pipewire-pulseaudio is installed + ------------------------------------------------------------------- Thu Dec 9 12:08:45 UTC 2021 - Antonio Larrosa diff --git a/wireplumber.spec b/wireplumber.spec index 58733f0..24c1a64 100644 --- a/wireplumber.spec +++ b/wireplumber.spec @@ -1,7 +1,7 @@ # # spec file for package wireplumber # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -41,8 +41,9 @@ BuildRequires: pipewire >= 0.3.32 #!BuildIgnore: pipewire-session-manager BuildRequires: pipewire-spa-plugins-0_2 BuildRequires: pkgconfig +BuildRequires: python3-base +BuildRequires: python3-lxml BuildRequires: xmltoman -BuildRequires: pkgconfig(lua5.3) BuildRequires: pkgconfig(alsa) BuildRequires: pkgconfig(bluez) BuildRequires: pkgconfig(dbus-1) @@ -66,14 +67,13 @@ BuildRequires: pkgconfig(libpulse) BuildRequires: pkgconfig(libsystemd) BuildRequires: pkgconfig(libudev) BuildRequires: pkgconfig(libva) +BuildRequires: pkgconfig(lua5.3) BuildRequires: pkgconfig(sbc) BuildRequires: pkgconfig(sdl2) BuildRequires: pkgconfig(sndfile) BuildRequires: pkgconfig(systemd) BuildRequires: pkgconfig(vulkan) BuildRequires: pkgconfig(x11) -BuildRequires: python3-base -BuildRequires: python3-lxml Requires: pipewire >= 0.3.32 %if 0%{?suse_version} <= 1500 BuildRequires: gcc9 @@ -82,6 +82,8 @@ BuildRequires: gcc9-c++ BuildRequires: gcc-c++ %endif Provides: pipewire-session-manager +# Setup ALSA devices if pipewire handles pulseaudio connections. +Requires: (%{name}-audio if pipewire-pulseaudio) %description WirePlumber is a modular session / policy manager for PipeWire and @@ -92,11 +94,10 @@ external tools for managing PipeWire. %package audio Summary: Session / policy manager implementation for PipeWire (audio support) Group: Development/Libraries/C and C++ -Requires: %{name} = %{version} Requires: %{libwireplumber} = %{version} +Requires: %{name} = %{version} Conflicts: pulseaudio Recommends: pipewire-pulseaudio -Supplements: (pipewire-pulseaudio and wireplumber) %description audio WirePlumber is a modular session / policy manager for PipeWire and @@ -109,8 +110,8 @@ This package enables the use of alsa devices in PipeWire. %package devel Summary: Session / policy manager implementation for PipeWire Group: Development/Libraries/C and C++ -Requires: %{name} = %{version} Requires: %{libwireplumber} = %{version} +Requires: %{name} = %{version} %description devel WirePlumber is a modular session / policy manager for PipeWire and @@ -146,15 +147,10 @@ This package provides the GObject Introspection bindings for the wireplumber shared library. %prep -%setup -q -%patch0 -p1 -%patch1 -p1 -%if %{pkg_vcmp meson < 0.56.0} -%patch100 -p1 -%endif +%autosetup -p1 pushd src/config/main.lua.d -python3 %{SOURCE1} +python3 %{SOURCE1} rm 90-enable-all.lua popd From ff35319413ac22cb9f23ac9f26f915f2061153d79a36da787c1020155e08052c Mon Sep 17 00:00:00 2001 From: Antonio Larrosa Date: Wed, 15 Dec 2021 17:45:52 +0000 Subject: [PATCH 2/3] Accepting request 940769 from home:alarrosa:branches:multimedia:libs - Remove many dependencies which aren't really needed OBS-URL: https://build.opensuse.org/request/show/940769 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/wireplumber?expand=0&rev=15 --- wireplumber.changes | 5 +++++ wireplumber.spec | 34 +++++++++------------------------- 2 files changed, 14 insertions(+), 25 deletions(-) diff --git a/wireplumber.changes b/wireplumber.changes index d025f7f..d1b0b70 100644 --- a/wireplumber.changes +++ b/wireplumber.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Dec 15 13:48:27 UTC 2021 - Antonio Larrosa + +- Remove many dependencies which aren't really needed + ------------------------------------------------------------------- Sat Dec 11 16:54:56 UTC 2021 - Fabian Vogt diff --git a/wireplumber.spec b/wireplumber.spec index 24c1a64..565422b 100644 --- a/wireplumber.spec +++ b/wireplumber.spec @@ -16,6 +16,7 @@ # +%define pipewire_minimum_version 0.3.32 %define apiver 0.4 %define apiver_str 0_4 %define sover 0 @@ -32,49 +33,32 @@ Source1: split-config-file.py Patch0: 0001-m-reserve-device-replace-the-hash-table-key-on-new-insert.patch Patch1: 0002-policy-node-wait-for-nodes-when-we-become-unlinked.patch Patch100: reduce-meson-required-version.patch -BuildRequires: cmake +# docs BuildRequires: doxygen -BuildRequires: fdupes BuildRequires: graphviz +BuildRequires: python3-lxml +# /docs +BuildRequires: cmake +BuildRequires: fdupes BuildRequires: meson >= 0.54.0 -BuildRequires: pipewire >= 0.3.32 +BuildRequires: pipewire >= %{pipewire_minimum_version} #!BuildIgnore: pipewire-session-manager -BuildRequires: pipewire-spa-plugins-0_2 +BuildRequires: pipewire-spa-plugins-0_2 >= %{pipewire_minimum_version} BuildRequires: pkgconfig BuildRequires: python3-base BuildRequires: python3-lxml BuildRequires: xmltoman -BuildRequires: pkgconfig(alsa) -BuildRequires: pkgconfig(bluez) BuildRequires: pkgconfig(dbus-1) -BuildRequires: pkgconfig(gio-2.0) BuildRequires: pkgconfig(gio-unix-2.0) BuildRequires: pkgconfig(glib-2.0) >= 2.62.0 BuildRequires: pkgconfig(gmodule-2.0) BuildRequires: pkgconfig(gobject-2.0) >= 2.62 BuildRequires: pkgconfig(gobject-introspection-1.0) -BuildRequires: pkgconfig(gstreamer-1.0) -BuildRequires: pkgconfig(gstreamer-allocators-1.0) -BuildRequires: pkgconfig(gstreamer-audio-1.0) -BuildRequires: pkgconfig(gstreamer-plugins-base-1.0) -BuildRequires: pkgconfig(gstreamer-video-1.0) -BuildRequires: pkgconfig(jack) >= 1.9.10 -BuildRequires: pkgconfig(libavcodec) -BuildRequires: pkgconfig(libavfilter) -BuildRequires: pkgconfig(libavformat) BuildRequires: pkgconfig(libpipewire-0.3) >= 0.3.32 -BuildRequires: pkgconfig(libpulse) BuildRequires: pkgconfig(libsystemd) -BuildRequires: pkgconfig(libudev) -BuildRequires: pkgconfig(libva) BuildRequires: pkgconfig(lua5.3) -BuildRequires: pkgconfig(sbc) -BuildRequires: pkgconfig(sdl2) -BuildRequires: pkgconfig(sndfile) BuildRequires: pkgconfig(systemd) -BuildRequires: pkgconfig(vulkan) -BuildRequires: pkgconfig(x11) -Requires: pipewire >= 0.3.32 +Requires: pipewire >= %{pipewire_minimum_version} %if 0%{?suse_version} <= 1500 BuildRequires: gcc9 BuildRequires: gcc9-c++ From d52394b2b8c919fc41969b6008e9588042f41518308546cc9bb64b9d63c65d69 Mon Sep 17 00:00:00 2001 From: Antonio Larrosa Date: Wed, 15 Dec 2021 17:46:42 +0000 Subject: [PATCH 3/3] Accepting request 940772 from home:alarrosa:branches:multimedia:libs - Remove many build dependencies which aren't really needed OBS-URL: https://build.opensuse.org/request/show/940772 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/wireplumber?expand=0&rev=16 --- wireplumber.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wireplumber.changes b/wireplumber.changes index d1b0b70..633f1d7 100644 --- a/wireplumber.changes +++ b/wireplumber.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Wed Dec 15 13:48:27 UTC 2021 - Antonio Larrosa -- Remove many dependencies which aren't really needed +- Remove many build dependencies which aren't really needed ------------------------------------------------------------------- Sat Dec 11 16:54:56 UTC 2021 - Fabian Vogt