From 837038c3b7d839affeea51f5472bca0b96a0326c508a119c353d2e7e88cbcd02 Mon Sep 17 00:00:00 2001 From: Antonio Larrosa Date: Wed, 15 Dec 2021 13:47:33 +0000 Subject: [PATCH] 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