diff --git a/pipewire-0.3.74.tar.bz2 b/pipewire-0.3.74.tar.bz2 deleted file mode 100644 index 97138a3e62e59940999261ba467a76ca07e0b0f2..0000000000000000000000000000000000000000 Binary files a/pipewire-0.3.74.tar.bz2 and /dev/null differ diff --git a/pipewire-1.0.3.tar.bz2 b/pipewire-1.0.3.tar.bz2 new file mode 100644 index 0000000000000000000000000000000000000000..c936490b73043ff40f891bb6a45dafd8a5261e6b Binary files /dev/null and b/pipewire-1.0.3.tar.bz2 differ diff --git a/pipewire.spec b/pipewire.spec index bf67094a0155392cab67e0752ff4782e5ca61f55..a15504be4cde52d4edfffc31783b6b3df95b0f44 100644 --- a/pipewire.spec +++ b/pipewire.spec @@ -1,7 +1,7 @@ %define anolis_release 1 -%global majorversion 0 -%global minorversion 3 -%global microversion 74 +%global majorversion 1 +%global minorversion 0 +%global microversion 3 %global apiversion 0.3 %global spaversion 0.2 @@ -10,7 +10,6 @@ # Build conditions for various features %bcond_without alsa %bcond_without vulkan -%bcond_with media_session %bcond_without pulse %bcond_with jack %bcond_with jackserver_plugin @@ -25,15 +24,7 @@ Summary: Media Sharing Server License: MIT URL: https://%{name}.org/ Source0: https://gitlab.freedesktop.org/%{name}/%{name}/-/archive/%{version}/%{name}-%{version}.tar.bz2 - - -%if %{with media-session} -Source1: https://gitlab.freedesktop.org/%{name}/media-session/-/archive/%{ms_version}/media-session-%{ms_version}.tar.gz -%endif - -%if %{with media-session} -Patch1001: 0001-Build-media-session-from-local-tarbal.patch -%endif +Source1: pipewire.sysusers BuildRequires: gettext meson >= 0.49.0 gcc g++ doxygen python-docutils graphviz systemd BuildRequires: pkgconfig(libudev) pkgconfig(libmysofa) pkgconfig(dbus-1) pkgconfig(glib-2.0) >= 2.32 @@ -99,23 +90,6 @@ Requires: %{name}-libs = %{version}-%{release} %description utils This package contains command line utilities for the PipeWire media server. -%if %{with media_session} -%package media-session -Summary: PipeWire Media Session Manager -License: MIT -Conflicts: %{name} < 0.3.30-5 -Obsoletes: %{name}-libpulse < %{version} -Recommends: %{name} = %{version}-%{release} - -# Virtual Provides to support swapping between PipeWire session manager implementations -Provides: %{name}-session-manager -Conflicts: %{name}-session-manager - -%description media-session -This package contains the reference Media Session Manager for the PipeWire -media server. -%endif - %if %{with alsa} %package alsa Summary: PipeWire media server ALSA support @@ -243,20 +217,15 @@ This package contains documentation for the PipeWire media server. %prep %autosetup -n %{name}-%{version} -p1 -%if %{with media-session} -mkdir subprojects/packagefiles -install -m 0644 -p %{SOURCE1} subprojects/packagefiles/ -%endif - %build %meson \ -D audiotestsrc=disabled -D videotestsrc=disabled \ - -D bluez5-codec-lc3plus=disabled \ + -D bluez5-codec-lc3plus=disabled -D bluez5-codec-lc3=disabled \ -D docs=enabled -D man=enabled -D gstreamer=enabled -D systemd=enabled \ -D gstreamer-device-provider=disabled -D sdl2=disabled \ -D lv2=disabled \ -D volume=disabled -D bluez5-codec-aptx=disabled -D roc=disabled \ - %{!?with_media_session:-D session-managers=[]} \ + -D session-managers=[] \ %{!?with_jack:-D %{name}-jack=disabled} \ %{!?with_jackserver_plugin:-D jack=disabled} \ %{!?with_libcamera_plugin:-D libcamera=disabled} \ @@ -267,6 +236,7 @@ install -m 0644 -p %{SOURCE1} subprojects/packagefiles/ %meson_build %install +install -p -D -m 0644 %{SOURCE1} %{buildroot}%{_sysusersdir}/pipewire.conf %meson_install %if %{with jack} @@ -275,10 +245,6 @@ echo %{_libdir}/%{name}-%{apiversion}/jack/ > %{buildroot}%{_sysconfdir}/ld.so.c %else rm %{buildroot}%{_datadir}/%{name}/jack.conf -%if %{with media_session} -rm %{buildroot}%{_datadir}/%{name}/media-session.d/with-jack -%endif - %endif %if %{with alsa} @@ -288,10 +254,6 @@ install -m 0644 -p %{buildroot}%{_datadir}/alsa/alsa.conf.d/50-%{name}.conf \ install -m 0644 -p %{buildroot}%{_datadir}/alsa/alsa.conf.d/99-%{name}-default.conf \ %{buildroot}%{_sysconfdir}/alsa/conf.d/99-%{name}-default.conf -%if %{with media_session} -touch %{buildroot}%{_datadir}/%{name}/media-session.d/with-alsa -%endif - %endif %if ! %{with pulse} @@ -300,16 +262,9 @@ rm %{buildroot}%{_bindir}/%{name}-pulse rm %{buildroot}%{_userunitdir}/%{name}-pulse.* rm %{buildroot}%{_datadir}/%{name}/%{name}-pulse.conf -%if %{with media_session} -rm %{buildroot}%{_datadir}/%{name}/media-session.d/with-pulseaudio -%endif - %endif %find_lang %{name} -%if %{with media_session} -%find_lang media-session -%endif mkdir -p %{buildroot}%{_prefix}/lib/udev/rules.d mv -fv %{buildroot}/lib/udev/rules.d/90-%{name}-alsa.rules %{buildroot}%{_prefix}/lib/udev/rules.d @@ -323,10 +278,7 @@ echo "test failed" fi %pre -getent group %{name} >/dev/null || groupadd -r %{name} -getent passwd %{name} >/dev/null || \ - useradd -r -g %{name} -d %{_localstatedir}/run/%{name} -s /sbin/nologin -c "PipeWire System Daemon" %{name} -exit 0 +%sysusers_create_compat %{SOURCE1} %post %systemd_user_post %{name}.service @@ -342,22 +294,19 @@ systemctl --no-reload preset --global %{name}.socket >/dev/null 2>&1 || : %systemd_user_post %{name}-pulse.socket %endif -%if %{with media_session} -%post media-session -%systemd_user_post %{name}-media-session.service -%endif - %files %license LICENSE COPYING %{_userunitdir}/%{name}.* %{_userunitdir}/filter-chain.* %{_bindir}/%{name} %{_bindir}/%{name}-aes67 +%{_bindir}/%{name}-vulkan %{_bindir}/%{name}-avb %{_mandir}/man1/%{name}.1* %dir %{_datadir}/%{name}/ %{_datadir}/%{name}/%{name}-avb.conf %{_datadir}/%{name}/%{name}-aes67.conf +%{_datadir}/%{name}/%{name}-vulkan.conf %{_datadir}/%{name}/%{name}.conf %{_datadir}/%{name}/%{name}.conf.avail/10-rates.conf %{_datadir}/%{name}/%{name}.conf.avail/20-upmix.conf @@ -366,6 +315,7 @@ systemctl --no-reload preset --global %{name}.socket >/dev/null 2>&1 || : %{_datadir}/%{name}/minimal.conf %{_mandir}/man5/%{name}.conf.5* %config(noreplace) %{_sysconfdir}/security/limits.d/*.conf +%{_sysusersdir}/pipewire.conf %files libs -f %{name}.lang %license LICENSE COPYING @@ -396,6 +346,8 @@ systemctl --no-reload preset --global %{name}.socket >/dev/null 2>&1 || : %{_datadir}/%{name}/client.conf.avail/20-upmix.conf %{_datadir}/%{name}/client-rt.conf %{_datadir}/%{name}/client-rt.conf.avail/20-upmix.conf +%{_mandir}/man7/libpipewire-module-*.7* +%{_mandir}/man7/libpipewire-modules.7* %files devel %{_includedir}/spa-%{spaversion}/ @@ -407,28 +359,6 @@ systemctl --no-reload preset --global %{name}.socket >/dev/null 2>&1 || : %files gstreamer %{_libdir}/gstreamer-1.0/libgst%{name}.* -%if %{with media_session} -%files media-session -f media-session.lang -%{_bindir}/%{name}-media-session -%{_userunitdir}/%{name}-media-session.service -%dir %{_datadir}/%{name}/media-session.d/ -%{_datadir}/%{name}/media-session.d/alsa-monitor.conf -%{_datadir}/%{name}/media-session.d/bluez-monitor.conf -%{_datadir}/%{name}/media-session.d/media-session.conf -%{_datadir}/%{name}/media-session.d/v4l2-monitor.conf - -%if %{with alsa} -%{_datadir}/%{name}/media-session.d/with-alsa -%endif -%if %{with jack} -%{_datadir}/%{name}/media-session.d/with-jack -%endif -%if %{with pulse} -%{_datadir}/%{name}/media-session.d/with-pulseaudio -%endif - -%endif - %files utils %{_bindir}/pw-cat %{_bindir}/pw-cli @@ -458,7 +388,10 @@ systemctl --no-reload preset --global %{name}.socket >/dev/null 2>&1 || : %{_mandir}/man1/pw-cat.1* %{_mandir}/man1/pw-config.1* %{_mandir}/man1/pw-dot.1* +%{_mandir}/man1/pw-dump.1* +%{_mandir}/man1/pw-jack.1* %{_mandir}/man1/pw-link.1* +%{_mandir}/man1/pw-loopback.1* %{_mandir}/man1/pw-mon.1* %{_mandir}/man1/pw-metadata.1* %{_mandir}/man1/pw-mididump.1* @@ -509,6 +442,9 @@ systemctl --no-reload preset --global %{name}.socket >/dev/null 2>&1 || : %{_datadir}/%{name}/%{name}-pulse.conf %{_datadir}/%{name}/%{name}-pulse.conf.avail/20-upmix.conf %{_mandir}/man1/%{name}-pulse.1* +%{_mandir}/man5/%{name}-pulse.conf.5* +%{_mandir}/man7/pipewire-pulse-module-*.7* +%{_mandir}/man7/pipewire-pulse-modules.7* %{_userunitdir}/%{name}-pulse.* %endif @@ -523,6 +459,9 @@ systemctl --no-reload preset --global %{name}.socket >/dev/null 2>&1 || : %doc README.md %changelog +* Sat Feb 03 2024 Funda Wang - 1.0.3-1 +- New version 1.0.3 + * Wed Jul 12 2023 Funda Wang - 0.3.74-1 - New version 0.3.74 diff --git a/pipewire.sysusers b/pipewire.sysusers new file mode 100644 index 0000000000000000000000000000000000000000..1e08df10d32a2a01dfab7e3cdc0fc92cc8547078 --- /dev/null +++ b/pipewire.sysusers @@ -0,0 +1,2 @@ +#Type Name ID GECOS Home directory Shell +u pipewire - "PipeWire System Daemon" /run/pipewire -