Accepting request 940768 from home:alarrosa:branches:multimedia:libs

- Remove the dependency on wireplumber-audio which was pulling in
  pulseaudio. We'll require wireplumber-audio directly from
  wireplumber.
- Remove pipewire-rpmlintrc since the filters don't apply anymore

- Merge the pipewire-spa-plugins-0_2 and pipewire-modules
  packages into the libpipewire package just as the fedora packages
  do and simplify the filelist a bit by using some recursive
  listing instead of explicitly listing all files.

OBS-URL: https://build.opensuse.org/request/show/940768
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/pipewire?expand=0&rev=35
This commit is contained in:
Antonio Larrosa 2021-12-15 17:45:45 +00:00 committed by Git OBS Bridge
parent 8fe3069ea1
commit 4e90874530
3 changed files with 59 additions and 150 deletions

View File

@ -1,4 +0,0 @@
# .so files in pipewire-libjack and pipewire-libpulse aren't
# really devel files
addFilter("devel-file-in-non-devel-package.*/jack/libjack")
addFilter("devel-file-in-non-devel-package.*/pulse/libpulse")

View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Wed Dec 15 13:28:10 UTC 2021 - Antonio Larrosa <alarrosa@suse.com>
- Remove the dependency on wireplumber-audio which was pulling in
pulseaudio. We'll require wireplumber-audio directly from
wireplumber.
- Remove pipewire-rpmlintrc since the filters don't apply anymore
-------------------------------------------------------------------
Wed Dec 15 13:27:44 UTC 2021 - Antonio Larrosa <alarrosa@suse.com>
- Merge the pipewire-spa-plugins-0_2 and pipewire-modules
packages into the libpipewire package just as the fedora packages
do and simplify the filelist a bit by using some recursive
listing instead of explicitly listing all files.
-------------------------------------------------------------------
Mon Dec 13 10:33:29 UTC 2021 - Antonio Larrosa <alarrosa@suse.com>

View File

@ -60,7 +60,6 @@ License: MIT
Group: Development/Libraries/C and C++
URL: https://pipewire.org/
Source0: %{name}-%{version}.tar.xz
Source1: %{name}-rpmlintrc
Source99: baselibs.conf
BuildRequires: docutils
@ -131,8 +130,6 @@ Requires: %{name}-spa-plugins-%{spa_ver_str} = %{version}
Requires: %{name}-spa-tools = %{version}
Requires: %{name}-tools = %{version}
Suggests: wireplumber
# This tries to ensure the user either uses pulseaudio or wireplumber enables the audio in pipewire
Requires: ((wireplumber-audio or pulseaudio) if wireplumber)
%{?systemd_ordering}
%description
@ -150,6 +147,12 @@ Some of its features include:
Summary: A Multimedia Framework designed to be an audio and video server and more
Group: System/Libraries
Recommends: pipewire >= %{version}
Provides: pipewire-modules = %{version}
Conflicts: pipewire-modules < %{version}
Obsoletes: pipewire-modules < %{version}
Provides: pipewire-spa-plugins-%{spa_ver_str} = %{version}
Conflicts: pipewire-spa-plugins-%{spa_ver_str} < %{version}
Obsoletes: pipewire-spa-plugins-%{spa_ver_str} < %{version}
%description -n %{libpipewire}
PipeWire is a server and user space API to deal with multimedia pipelines.
@ -190,7 +193,7 @@ This package provides the PipeWire replacement libraries for libjack.
%package libjack-%{apiver_str}-devel
Summary: Development files for %{name}-libjack-%{apiver_str}
Group: Development/Libraries/C and C++
Requires: %{name}-libjack-%{apiver_str}
Requires: %{name}-libjack-%{apiver_str} = %{version}
Conflicts: libjack-devel
%description libjack-%{apiver_str}-devel
@ -232,46 +235,6 @@ SPA or Simple Plugin API is a plugin API.
This package provides spa-inspect and spa-monitor tools.
%package modules
Summary: Modules For PipeWire, A Multimedia Framework
Group: Productivity/Multimedia/Other
Requires: pipewire = %{version}
%description modules
PipeWire is a server and user space API to deal with multimedia pipelines.
The framework is used to build a modular daemon that can be configured to:
* Be a low-latency audio server with features like pulseaudio and/or jack;
* A video capture server that can manage hardware video capture devices
and provide access to them;
* A central hub where video can be made available for other applications
such as the gnome-shell screencast API.
%package spa-plugins-%{spa_ver_str}
Summary: Plugins For PipeWire SPA
Group: Productivity/Multimedia/Other
Requires: pipewire = %{version}
%description spa-plugins-%{spa_ver_str}
PipeWire is a server and user space API to deal with multimedia pipelines.
Some of its features include:
* Unlimited input/output ports;
* Per port format enumeration and negotiation;
* Enumeration/configuration of per port parameters;
* Application controlled buffer allocation with option to let the plugin
Allocate memory;
* Arbitrary buffer metadata;
* Buffers are passed around by id which is very fast and avoids the need
for refcounting;
* Synchronous and asynchronous processing;
* All api is designed to work without any allocations;
* Arbirary input/output behaviour.
This package provides plugins for extending PipeWire SPA's functionality.
%package devel
Summary: Development Files For PipeWire, A Multimedia Framework
Group: Development/Libraries/C and C++
@ -513,6 +476,42 @@ fi
%{_libdir}/libpipewire-%{apiver}.so.*
%{_udevrulesdir}/90-pipewire-alsa.rules
%dir %{_libdir}/pipewire-%{apiver}
%{_libdir}/pipewire-%{apiver}/libpipewire-module-*.so
%dir %{_libdir}/pipewire-%{apiver}/v4l2/
%{_libdir}/pipewire-%{apiver}/v4l2/libpw-v4l2.so
%dir %{_datadir}/alsa-card-profile/
%dir %{_datadir}/alsa-card-profile/mixer/
%{_datadir}/alsa-card-profile/mixer/*
%dir %{_datadir}/pipewire/filter-chain/
%{_datadir}/pipewire/filter-chain/*.conf
%dir %{_libdir}/spa-%{spa_ver}/
%{_libdir}/spa-%{spa_ver}/alsa/
%{_libdir}/spa-%{spa_ver}/audioconvert/
%{_libdir}/spa-%{spa_ver}/audiomixer/
%{_libdir}/spa-%{spa_ver}/bluez5/
%{_libdir}/spa-%{spa_ver}/control/
%{_libdir}/spa-%{spa_ver}/volume/
%{_libdir}/spa-%{spa_ver}/ffmpeg/
%{_libdir}/spa-%{spa_ver}/jack/
%if %{with libcamera}
%{_libdir}/spa-%{spa_ver}/libcamera/
%endif
%{_libdir}/spa-%{spa_ver}/support/
%{_libdir}/spa-%{spa_ver}/v4l2/
%{_libdir}/spa-%{spa_ver}/videoconvert/
%if %{with_vulkan}
%{_libdir}/spa-%{spa_ver}/vulkan/
%endif
%{_libdir}/spa-%{spa_ver}/audiotestsrc/
%{_libdir}/spa-%{spa_ver}/videotestsrc/
%{_libdir}/spa-%{spa_ver}/test/
%dir %{_datadir}/spa-%{spa_ver}/
%dir %{_datadir}/spa-%{spa_ver}/bluez5/
%{_datadir}/spa-%{spa_ver}/bluez5/bluez-hardware.conf
%files libjack-%{apiver_str}
%dir %{_libdir}/pipewire-%{apiver}/jack
%{_libdir}/pipewire-%{apiver}/jack/libjack.so.*
@ -573,108 +572,6 @@ fi
%{_bindir}/spa-resample
%{_bindir}/spa-json-dump
%files modules
%dir %{_libdir}/pipewire-%{apiver}
%{_libdir}/pipewire-%{apiver}/libpipewire-module-access.so
%{_libdir}/pipewire-%{apiver}/libpipewire-module-adapter.so
%{_libdir}/pipewire-%{apiver}/libpipewire-module-client-device.so
%{_libdir}/pipewire-%{apiver}/libpipewire-module-client-node.so
%{_libdir}/pipewire-%{apiver}/libpipewire-module-echo-cancel.so
%{_libdir}/pipewire-%{apiver}/libpipewire-module-link-factory.so
%{_libdir}/pipewire-%{apiver}/libpipewire-module-loopback.so
%{_libdir}/pipewire-%{apiver}/libpipewire-module-metadata.so
%{_libdir}/pipewire-%{apiver}/libpipewire-module-portal.so
%{_libdir}/pipewire-%{apiver}/libpipewire-module-profiler.so
%{_libdir}/pipewire-%{apiver}/libpipewire-module-protocol-native.so
%{_libdir}/pipewire-%{apiver}/libpipewire-module-protocol-pulse.so
%{_libdir}/pipewire-%{apiver}/libpipewire-module-protocol-simple.so
%{_libdir}/pipewire-%{apiver}/libpipewire-module-raop-discover.so
%{_libdir}/pipewire-%{apiver}/libpipewire-module-raop-sink.so
%{_libdir}/pipewire-%{apiver}/libpipewire-module-rtkit.so
%{_libdir}/pipewire-%{apiver}/libpipewire-module-session-manager.so
%{_libdir}/pipewire-%{apiver}/libpipewire-module-spa-device-factory.so
%{_libdir}/pipewire-%{apiver}/libpipewire-module-spa-device.so
%{_libdir}/pipewire-%{apiver}/libpipewire-module-spa-node-factory.so
%{_libdir}/pipewire-%{apiver}/libpipewire-module-spa-node.so
%{_libdir}/pipewire-%{apiver}/libpipewire-module-filter-chain.so
%{_libdir}/pipewire-%{apiver}/libpipewire-module-pulse-tunnel.so
%{_libdir}/pipewire-%{apiver}/libpipewire-module-zeroconf-discover.so
%{_libdir}/pipewire-%{apiver}/libpipewire-module-rt.so
%dir %{_libdir}/pipewire-%{apiver}/v4l2/
%{_libdir}/pipewire-%{apiver}/v4l2/libpw-v4l2.so
%dir %{_datadir}/alsa-card-profile/
%dir %{_datadir}/alsa-card-profile/mixer/
%{_datadir}/alsa-card-profile/mixer/*
%dir %{_datadir}/pipewire/filter-chain/
%{_datadir}/pipewire/filter-chain/demonic.conf
%{_datadir}/pipewire/filter-chain/sink-dolby-surround.conf
%{_datadir}/pipewire/filter-chain/sink-eq6.conf
%{_datadir}/pipewire/filter-chain/sink-matrix-spatialiser.conf
%{_datadir}/pipewire/filter-chain/sink-virtual-surround-5.1-kemar.conf
%{_datadir}/pipewire/filter-chain/sink-virtual-surround-7.1-hesuvi.conf
%{_datadir}/pipewire/filter-chain/source-rnnoise.conf
%files spa-plugins-%{spa_ver_str}
%{_libdir}/spa-%{spa_ver}/alsa/libspa-alsa.so
%{_libdir}/spa-%{spa_ver}/audioconvert/libspa-audioconvert.so
%{_libdir}/spa-%{spa_ver}/audiomixer/libspa-audiomixer.so
%{_libdir}/spa-%{spa_ver}/bluez5/libspa-bluez5.so
%if %{with aac}
%{_libdir}/spa-%{spa_ver}/bluez5/libspa-codec-bluez5-aac.so
%endif
%if %{with aptx}
%{_libdir}/spa-%{spa_ver}/bluez5/libspa-codec-bluez5-aptx.so
%endif
%{_libdir}/spa-%{spa_ver}/bluez5/libspa-codec-bluez5-faststream.so
%if %{with_ldacBT}
%{_libdir}/spa-%{spa_ver}/bluez5/libspa-codec-bluez5-ldac.so
%endif
%{_libdir}/spa-%{spa_ver}/bluez5/libspa-codec-bluez5-sbc.so
%{_libdir}/spa-%{spa_ver}/control/libspa-control.so
%{_libdir}/spa-%{spa_ver}/ffmpeg/libspa-ffmpeg.so
%{_libdir}/spa-%{spa_ver}/jack/libspa-jack.so
%if %{with libcamera}
%{_libdir}/spa-%{spa_ver}/libcamera/libspa-libcamera.so
%endif
%{_libdir}/spa-%{spa_ver}/support/libspa-dbus.so
%{_libdir}/spa-%{spa_ver}/support/libspa-journal.so
%{_libdir}/spa-%{spa_ver}/support/libspa-support.so
%{_libdir}/spa-%{spa_ver}/v4l2/libspa-v4l2.so
%{_libdir}/spa-%{spa_ver}/videoconvert/libspa-videoconvert.so
%if %{with_vulkan}
%{_libdir}/spa-%{spa_ver}/vulkan/libspa-vulkan.so
%endif
%{_libdir}/spa-%{spa_ver}/audiotestsrc/libspa-audiotestsrc.so
%{_libdir}/spa-%{spa_ver}/test/libspa-test.so
%{_libdir}/spa-%{spa_ver}/videotestsrc/libspa-videotestsrc.so
%{_libdir}/spa-%{spa_ver}/volume/libspa-volume.so
%dir %{_libdir}/spa-%{spa_ver}/
%dir %{_libdir}/spa-%{spa_ver}/alsa/
%dir %{_libdir}/spa-%{spa_ver}/audioconvert/
%dir %{_libdir}/spa-%{spa_ver}/audiomixer/
%dir %{_libdir}/spa-%{spa_ver}/bluez5/
%dir %{_libdir}/spa-%{spa_ver}/control/
%dir %{_libdir}/spa-%{spa_ver}/volume/
%dir %{_libdir}/spa-%{spa_ver}/ffmpeg/
%dir %{_libdir}/spa-%{spa_ver}/jack/
%if %{with libcamera}
%dir %{_libdir}/spa-%{spa_ver}/libcamera/
%endif
%dir %{_libdir}/spa-%{spa_ver}/support/
%dir %{_libdir}/spa-%{spa_ver}/v4l2/
%dir %{_libdir}/spa-%{spa_ver}/videoconvert/
%if %{with_vulkan}
%dir %{_libdir}/spa-%{spa_ver}/vulkan/
%endif
%dir %{_libdir}/spa-%{spa_ver}/audiotestsrc/
%dir %{_libdir}/spa-%{spa_ver}/videotestsrc/
%dir %{_libdir}/spa-%{spa_ver}/test/
%dir %{_datadir}/spa-%{spa_ver}/
%dir %{_datadir}/spa-%{spa_ver}/bluez5/
%{_datadir}/spa-%{spa_ver}/bluez5/bluez-hardware.conf
%files devel
%{_libdir}/libpipewire-%{apiver}.so
%{_libdir}/pkgconfig/libpipewire-%{apiver}.pc