!3 Upgrade to 0.3.15
From: @weijin-deng Reviewed-by: @dwl301 Signed-off-by: @dwl301
This commit is contained in:
openeuler-ci-bot
Gitee
commit
966a943d31
45
0001-protocol-native-do-version-check-on-HELLO.patch
Normal file
45
0001-protocol-native-do-version-check-on-HELLO.patch
Normal file
@ -0,0 +1,45 @@
|
||||
From b8c7b36d3b8be16593f554964cf2f852c21b5c2c Mon Sep 17 00:00:00 2001
|
||||
From: Wim Taymans <wtaymans@redhat.com>
|
||||
Date: Wed, 4 Nov 2020 16:12:25 +0100
|
||||
Subject: [PATCH] protocol-native: do version check on HELLO
|
||||
|
||||
Always do the version check on HELLO because the connection could
|
||||
have been moved from a v3 portal to a v0 client (like chrome)
|
||||
|
||||
Fixes #270
|
||||
---
|
||||
src/modules/module-protocol-native/connection.c | 4 +---
|
||||
1 file changed, 1 insertion(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/modules/module-protocol-native/connection.c b/src/modules/module-protocol-native/connection.c
|
||||
index 84fad68f..1807833a 100644
|
||||
--- a/src/modules/module-protocol-native/connection.c
|
||||
+++ b/src/modules/module-protocol-native/connection.c
|
||||
@@ -72,7 +72,6 @@ struct impl {
|
||||
|
||||
uint32_t version;
|
||||
size_t hdr_size;
|
||||
- unsigned int checked:1;
|
||||
};
|
||||
|
||||
/** \endcond */
|
||||
@@ -319,7 +318,7 @@ static int prepare_packet(struct pw_protocol_native_connection *conn, struct buf
|
||||
buf->msg.opcode = p[1] >> 24;
|
||||
len = p[1] & 0xffffff;
|
||||
|
||||
- if (!impl->checked) {
|
||||
+ if (buf->msg.id == 0 && buf->msg.opcode == 1) {
|
||||
if (p[3] >= 4) {
|
||||
pw_log_warn("old version detected");
|
||||
impl->version = 0;
|
||||
@@ -331,7 +330,6 @@ static int prepare_packet(struct pw_protocol_native_connection *conn, struct buf
|
||||
spa_hook_list_call(&conn->listener_list,
|
||||
struct pw_protocol_native_connection_events,
|
||||
start, 0, impl->version);
|
||||
- impl->checked = 1;
|
||||
}
|
||||
if (impl->version >= 3) {
|
||||
buf->msg.seq = p[2];
|
||||
--
|
||||
2.26.2
|
||||
|
||||
Binary file not shown.
BIN
pipewire-0.3.15.tar.gz
Normal file
BIN
pipewire-0.3.15.tar.gz
Normal file
Binary file not shown.
@ -1,25 +1,28 @@
|
||||
%global apiversion 0.2
|
||||
%global spaversion 0.1
|
||||
%global apiversion 0.3
|
||||
%global spaversion 0.2
|
||||
%global systemd 1
|
||||
%global multilib_archs x86_64
|
||||
|
||||
Name: pipewire
|
||||
Version: 0.2.7
|
||||
Version: 0.3.15
|
||||
Release: 1
|
||||
Summary: Multimedia processing graphs
|
||||
License: LGPLv2+
|
||||
URL: https://pipewire.org/
|
||||
Source0: https://github.com/PipeWire/pipewire/archive/%{version}/%{name}-%{version}.tar.gz
|
||||
Source0: https://github.com/pipewire/pipewire/archive/%{version}/%{name}-%{version}.tar.gz
|
||||
|
||||
BuildRequires: meson gcc pkgconf-pkg-config dbus-devel glib2-devel
|
||||
BuildRequires: gstreamer1-devel gstreamer1-plugins-base-devel systemd-devel
|
||||
BuildRequires: alsa-lib-devel libv4l-devel doxygen xmltoman graphviz sbc-devel
|
||||
Patch0: 0001-protocol-native-do-version-check-on-HELLO.patch
|
||||
|
||||
BuildRequires: meson gcc pkgconf-pkg-config libudev-devel dbus-devel glib2-devel gstreamer-devel
|
||||
BuildRequires: gstreamer1-devel gstreamer1-plugins-base-devel systemd-devel vulkan-loader-devel
|
||||
BuildRequires: alsa-lib-devel libv4l-devel doxygen xmltoman graphviz sbc-devel libsndfile-devel
|
||||
BuildRequires: bluez-devel SDL2-devel jack-audio-connection-kit-devel
|
||||
|
||||
Requires(pre): shadow-utils
|
||||
Requires: systemd >= 184 rtkit
|
||||
|
||||
Provides: %{name}-libs %{name}-utils
|
||||
Obsoletes: %{name}-libs %{name}-utils
|
||||
Obsoletes: %{name}-libs < %{version}-%{release} %{name}-utils < %{version}-%{release}
|
||||
|
||||
%description
|
||||
%{name} is a server and user space API to deal with multimedia
|
||||
@ -40,7 +43,7 @@ header files that can communicate with a %{name} media server.
|
||||
%autosetup -T -b0 -n %{name}-%{version} -p1
|
||||
|
||||
%build
|
||||
%meson -D docs=true -D man=true -D gstreamer=enabled -D systemd=true
|
||||
%meson -D docs=true -D man=true -D gstreamer=true -D systemd=true
|
||||
%meson_build
|
||||
|
||||
%install
|
||||
@ -49,6 +52,16 @@ header files that can communicate with a %{name} media server.
|
||||
mkdir %{buildroot}%{_userunitdir}/sockets.target.wants
|
||||
ln -s ../pipewire.socket %{buildroot}%{_userunitdir}/sockets.target.wants/pipewire.socket
|
||||
|
||||
mkdir -p %{buildroot}%{_sysconfdir}/alsa/conf.d/
|
||||
cp %{buildroot}%{_datadir}/alsa/alsa.conf.d/50-pipewire.conf \
|
||||
%{buildroot}%{_sysconfdir}/alsa/conf.d/50-pipewire.conf
|
||||
cp %{buildroot}%{_datadir}/alsa/alsa.conf.d/99-pipewire-default.conf \
|
||||
%{buildroot}%{_sysconfdir}/alsa/conf.d/99-pipewire-default.conf
|
||||
|
||||
mkdir -p %{buildroot}%{_prefix}/lib/udev/rules.d
|
||||
mv -fv %{buildroot}/lib/udev/rules.d/90-pipewire-alsa.rules %{buildroot}%{_prefix}/lib/udev/rules.d
|
||||
|
||||
|
||||
%check
|
||||
%meson_test
|
||||
|
||||
@ -62,33 +75,47 @@ exit 0
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%license LICENSE GPL LGPL
|
||||
%{_libdir}/spa/*
|
||||
%license LICENSE COPYING
|
||||
%{_libdir}/spa-0.2/*
|
||||
%{_libdir}/pipewire-%{apiversion}/*
|
||||
%{_libdir}/libpipewire-%{apiversion}.so.*
|
||||
%{_libdir}/gstreamer-1.0/libgstpipewire.*
|
||||
%{_libdir}/alsa-lib/libasound_module_*
|
||||
%{_bindir}/pipewire*
|
||||
%{_bindir}/pw-*
|
||||
%{_bindir}/spa-*
|
||||
%{_userunitdir}/pipewire.*
|
||||
%{_userunitdir}/sockets.target.wants/pipewire.socket
|
||||
%dir %{_sysconfdir}/pipewire/
|
||||
%{_sysconfdir}/pipewire/*
|
||||
%{_datadir}/alsa/alsa.conf.d/50-pipewire.conf
|
||||
%{_datadir}/alsa/alsa.conf.d/99-pipewire-default.conf
|
||||
%config(noreplace) %{_sysconfdir}/alsa/conf.d/50-pipewire.conf
|
||||
%config(noreplace) %{_sysconfdir}/alsa/conf.d/99-pipewire-default.conf
|
||||
%{_prefix}/lib/udev/rules.d/90-pipewire-alsa.rules
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root)
|
||||
%{_includedir}/pipewire/*
|
||||
%{_includedir}/spa/*
|
||||
%{_includedir}/pipewire-%{apiversion}/*
|
||||
%{_includedir}/spa-%{spaversion}/*
|
||||
%{_libdir}/libpipewire-%{apiversion}.so
|
||||
%{_libdir}/pkgconfig/*.pc
|
||||
|
||||
%files help
|
||||
%defattr(-,root,root)
|
||||
%doc README
|
||||
%doc README.md
|
||||
%{_mandir}/man1/*
|
||||
%{_mandir}/man5/*
|
||||
%{_datadir}/doc/pipewire/html/*
|
||||
%{_datadir}/alsa-card-profile/*
|
||||
|
||||
%changelog
|
||||
* Mon May 31 2021 weijin deng <weijin.deng@turbolinux.com.cn> - 0.3.15-1
|
||||
- Upgrade to 0.3.15
|
||||
- Update Version, Source0, BuildRequires, Obsoletes
|
||||
- Update stage 'build', 'install' and 'files'
|
||||
- Correct uncorrect date, add one patch
|
||||
|
||||
* Thu Jan 9 2020 openEuler Buildteam <buildteam@openeuler.org> - 0.2.7-1
|
||||
- update to 0.2.7
|
||||
|
||||
@ -104,5 +131,5 @@ exit 0
|
||||
- SUG:NA
|
||||
- DESC:change build requires of libv4l-devel to v4l-utils-devel
|
||||
|
||||
* Thu Aug 29 2018 openEuler Buildteam <buildteam@openeuler.org> - 0.2.2-2
|
||||
* Wed Aug 29 2018 openEuler Buildteam <buildteam@openeuler.org> - 0.2.2-2
|
||||
- Package init
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user