!13 Update version to 0.3.38
From: @dwl301 Reviewed-by: @zhang__3125 Signed-off-by: @zhang__3125
This commit is contained in:
commit
5959950d28
@ -1,45 +0,0 @@
|
|||||||
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
|
|
||||||
|
|
||||||
215
fix-bug-of-build-fails-on-16-17-test-support.patch
Normal file
215
fix-bug-of-build-fails-on-16-17-test-support.patch
Normal file
@ -0,0 +1,215 @@
|
|||||||
|
refers to:
|
||||||
|
https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/1710
|
||||||
|
tree merge:
|
||||||
|
https://gitlab.freedesktop.org/pipewire/pipewire/-/merge_requests/1005
|
||||||
|
https://gitlab.freedesktop.org/pipewire/pipewire/-/merge_requests/1009
|
||||||
|
https://gitlab.freedesktop.org/pipewire/pipewire/-/merge_requests/1076
|
||||||
|
|
||||||
|
diff --git a/test/test-logger.c b/test/test-logger.c
|
||||||
|
index 2e7820c..fde4642 100644
|
||||||
|
--- a/test/test-logger.c
|
||||||
|
+++ b/test/test-logger.c
|
||||||
|
@@ -478,6 +478,7 @@ PWTEST(logger_journal)
|
||||||
|
}
|
||||||
|
|
||||||
|
sd_journal_seek_tail(journal);
|
||||||
|
+ sd_journal_next(journal);
|
||||||
|
|
||||||
|
spa_logt_info(iface, &topic, "MARK\n");
|
||||||
|
while ((rc = sd_journal_next(journal)) > 0) {
|
||||||
|
@@ -555,6 +556,7 @@ PWTEST(logger_journal_chain)
|
||||||
|
}
|
||||||
|
|
||||||
|
sd_journal_seek_tail(journal);
|
||||||
|
+ sd_journal_next(journal);
|
||||||
|
|
||||||
|
spa_logt_info(iface, &topic, "MARK\n");
|
||||||
|
while ((rc = sd_journal_next(journal)) > 0) {
|
||||||
|
diff --git a/test/test-logger.c b/test/test-logger.c
|
||||||
|
index fde4642..338cd81 100644
|
||||||
|
--- a/test/test-logger.c
|
||||||
|
+++ b/test/test-logger.c
|
||||||
|
@@ -295,7 +295,7 @@ PWTEST(logger_debug_env_topic_all)
|
||||||
|
struct spa_log *default_logger = pw_log_get();
|
||||||
|
char *oldenv = getenv("PIPEWIRE_DEBUG");
|
||||||
|
char lvlstr[32];
|
||||||
|
- char *lvl = SPA_LOG_LEVEL_NONE;
|
||||||
|
+ char *lvl = "X";
|
||||||
|
|
||||||
|
if (oldenv)
|
||||||
|
oldenv = strdup(oldenv);
|
||||||
|
@@ -442,6 +442,45 @@ PWTEST(logger_topics)
|
||||||
|
return PWTEST_PASS;
|
||||||
|
}
|
||||||
|
|
||||||
|
+#ifdef HAVE_SYSTEMD
|
||||||
|
+static enum pwtest_result
|
||||||
|
+find_in_journal(sd_journal *journal, const char *needle, char *out, size_t out_sz)
|
||||||
|
+{
|
||||||
|
+ int rc;
|
||||||
|
+ int i;
|
||||||
|
+
|
||||||
|
+ /* We give ourselves up to a second for our message to appear */
|
||||||
|
+ for (i = 0; i < 10; i++) {
|
||||||
|
+ int activity = sd_journal_wait(journal, 100000);
|
||||||
|
+
|
||||||
|
+ pwtest_neg_errno_ok(activity);
|
||||||
|
+ switch (activity) {
|
||||||
|
+ case SD_JOURNAL_NOP:
|
||||||
|
+ break;
|
||||||
|
+ case SD_JOURNAL_INVALIDATE:
|
||||||
|
+ case SD_JOURNAL_APPEND:
|
||||||
|
+ while ((rc = sd_journal_next(journal)) > 0) {
|
||||||
|
+ char buffer[1024] = {0};
|
||||||
|
+ const char *d;
|
||||||
|
+ size_t l;
|
||||||
|
+ int r = sd_journal_get_data(journal, "MESSAGE", (const void **)&d, &l);
|
||||||
|
+ pwtest_neg_errno_ok(r);
|
||||||
|
+ spa_scnprintf(buffer, sizeof(buffer), "%.*s", (int) l, d);
|
||||||
|
+ if (strstr(buffer, needle)) {
|
||||||
|
+ spa_scnprintf(out, out_sz, "%s", buffer);
|
||||||
|
+ return PWTEST_PASS;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ pwtest_neg_errno_ok(rc);
|
||||||
|
+ break;
|
||||||
|
+ default:
|
||||||
|
+ break;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ return PWTEST_FAIL;
|
||||||
|
+}
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
PWTEST(logger_journal)
|
||||||
|
{
|
||||||
|
enum pwtest_result result = PWTEST_SKIP;
|
||||||
|
@@ -450,14 +489,15 @@ PWTEST(logger_journal)
|
||||||
|
void *iface;
|
||||||
|
struct spa_dict_item items[2];
|
||||||
|
struct spa_dict info;
|
||||||
|
- bool mark_line_found = false;
|
||||||
|
struct spa_log_topic topic = {
|
||||||
|
.version = 0,
|
||||||
|
.topic = "pwtest journal",
|
||||||
|
.level = SPA_LOG_LEVEL_DEBUG,
|
||||||
|
};
|
||||||
|
+ char buffer[1024] = {0};
|
||||||
|
sd_journal *journal;
|
||||||
|
int rc;
|
||||||
|
+ char token[64];
|
||||||
|
|
||||||
|
pw_init(0, NULL);
|
||||||
|
|
||||||
|
@@ -480,23 +520,12 @@ PWTEST(logger_journal)
|
||||||
|
sd_journal_seek_tail(journal);
|
||||||
|
sd_journal_next(journal);
|
||||||
|
|
||||||
|
- spa_logt_info(iface, &topic, "MARK\n");
|
||||||
|
- while ((rc = sd_journal_next(journal)) > 0) {
|
||||||
|
- char buffer[1024] = {0};
|
||||||
|
- const char *d;
|
||||||
|
- size_t l;
|
||||||
|
- int r = sd_journal_get_data(journal, "MESSAGE", (const void **)&d, &l);
|
||||||
|
- pwtest_neg_errno_ok(r);
|
||||||
|
- spa_scnprintf(buffer, sizeof(buffer), "%.*s", (int) l, d);
|
||||||
|
- if (strstr(buffer, "MARK")) {
|
||||||
|
- mark_line_found = true;
|
||||||
|
- pwtest_str_contains(buffer, "pwtest journal");
|
||||||
|
- }
|
||||||
|
- }
|
||||||
|
- pwtest_neg_errno_ok(rc);
|
||||||
|
- pwtest_bool_true(mark_line_found);
|
||||||
|
+ spa_scnprintf(token, sizeof(token), "MARK %s:%d", __func__, __LINE__);
|
||||||
|
+ spa_logt_info(iface, &topic, "%s", token);
|
||||||
|
|
||||||
|
- result = PWTEST_PASS;
|
||||||
|
+ result = find_in_journal(journal, token, buffer, sizeof(buffer));
|
||||||
|
+ pwtest_int_eq((int)result, PWTEST_PASS);
|
||||||
|
+ pwtest_str_contains(buffer, "pwtest journal");
|
||||||
|
|
||||||
|
cleanup:
|
||||||
|
sd_journal_close(journal);
|
||||||
|
@@ -526,6 +555,7 @@ PWTEST(logger_journal_chain)
|
||||||
|
};
|
||||||
|
sd_journal *journal;
|
||||||
|
int rc;
|
||||||
|
+ char token[64];
|
||||||
|
|
||||||
|
pw_init(0, NULL);
|
||||||
|
pwtest_mkstemp(fname);
|
||||||
|
@@ -558,27 +588,19 @@ PWTEST(logger_journal_chain)
|
||||||
|
sd_journal_seek_tail(journal);
|
||||||
|
sd_journal_next(journal);
|
||||||
|
|
||||||
|
- spa_logt_info(iface, &topic, "MARK\n");
|
||||||
|
- while ((rc = sd_journal_next(journal)) > 0) {
|
||||||
|
- char buffer[1024] = {0};
|
||||||
|
- const char *d;
|
||||||
|
- size_t l;
|
||||||
|
- int r = sd_journal_get_data(journal, "MESSAGE", (const void **)&d, &l);
|
||||||
|
- pwtest_neg_errno_ok(r);
|
||||||
|
- spa_scnprintf(buffer, sizeof(buffer), "%.*s", (int) l, d);
|
||||||
|
- if (strstr(buffer, "MARK")) {
|
||||||
|
- mark_line_found = true;
|
||||||
|
- pwtest_str_contains(buffer, "pwtest journal");
|
||||||
|
- }
|
||||||
|
- }
|
||||||
|
- pwtest_neg_errno_ok(rc);
|
||||||
|
- pwtest_bool_true(mark_line_found);
|
||||||
|
+ spa_scnprintf(token, sizeof(token), "MARK %s:%d", __func__, __LINE__);
|
||||||
|
+
|
||||||
|
+ spa_logt_info(iface, &topic, "%s", token);
|
||||||
|
+ result = find_in_journal(journal, token, buffer, sizeof(buffer));
|
||||||
|
+ pwtest_int_eq((int)result, PWTEST_PASS);
|
||||||
|
+ pwtest_str_contains(buffer, "pwtest journal");
|
||||||
|
|
||||||
|
/* Now check that the line is in the chained file logger too */
|
||||||
|
+ spa_memzero(buffer, sizeof(buffer));
|
||||||
|
mark_line_found = false;
|
||||||
|
fp = fopen(fname, "r");
|
||||||
|
while (fgets(buffer, sizeof(buffer), fp) != NULL) {
|
||||||
|
- if (strstr(buffer, "MARK")) {
|
||||||
|
+ if (strstr(buffer, token)) {
|
||||||
|
mark_line_found = true;
|
||||||
|
pwtest_ptr_null(strstr(buffer, SPA_ANSI_RESET));
|
||||||
|
pwtest_ptr_null(strstr(buffer, SPA_ANSI_RED));
|
||||||
|
diff --git a/test/pwtest.c b/test/pwtest.c
|
||||||
|
index 073014a..24a14f2 100644
|
||||||
|
--- a/test/pwtest.c
|
||||||
|
+++ b/test/pwtest.c
|
||||||
|
@@ -987,6 +987,12 @@ error:
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
+ for (size_t i = 0; i < SPA_N_ELEMENTS(t->logs); i++) {
|
||||||
|
+ char *e = pw_array_add(&t->logs[i], 1);
|
||||||
|
+ spa_assert_se(e);
|
||||||
|
+ *e = '\0';
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
close_pipes(read_fds);
|
||||||
|
close_pipes(write_fds);
|
||||||
|
|
||||||
|
diff --git a/test/test-logger.c b/test/test-logger.c
|
||||||
|
index 338cd81..a1b0ff0 100644
|
||||||
|
--- a/test/test-logger.c
|
||||||
|
+++ b/test/test-logger.c
|
||||||
|
@@ -24,6 +24,7 @@
|
||||||
|
|
||||||
|
#include "pwtest.h"
|
||||||
|
|
||||||
|
+#include <errno.h>
|
||||||
|
#include <fcntl.h>
|
||||||
|
#include <unistd.h>
|
||||||
|
|
||||||
|
@@ -464,6 +465,9 @@ find_in_journal(sd_journal *journal, const char *needle, char *out, size_t out_s
|
||||||
|
const char *d;
|
||||||
|
size_t l;
|
||||||
|
int r = sd_journal_get_data(journal, "MESSAGE", (const void **)&d, &l);
|
||||||
|
+ if (r == -ENOENT || r == -E2BIG || r == -EBADMSG)
|
||||||
|
+ continue;
|
||||||
|
+
|
||||||
|
pwtest_neg_errno_ok(r);
|
||||||
|
spa_scnprintf(buffer, sizeof(buffer), "%.*s", (int) l, d);
|
||||||
|
if (strstr(buffer, needle)) {
|
||||||
12
fix-missing-NAME-define-under-arm.patch
Normal file
12
fix-missing-NAME-define-under-arm.patch
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
diff -up pipewire-0.3.38/spa/plugins/support/cpu-arm.c.bak pipewire-0.3.38/spa/plugins/support/cpu-arm.c
|
||||||
|
--- pipewire-0.3.38/spa/plugins/support/cpu-arm.c.bak 2022-06-20 09:43:01.381000000 +0000
|
||||||
|
+++ pipewire-0.3.38/spa/plugins/support/cpu-arm.c 2022-06-20 09:42:41.645000000 +0000
|
||||||
|
@@ -28,6 +28,8 @@
|
||||||
|
|
||||||
|
#include <spa/utils/string.h>
|
||||||
|
|
||||||
|
+#define NAME "cpu-arm"
|
||||||
|
+
|
||||||
|
#define MAX_BUFFER 4096
|
||||||
|
|
||||||
|
static char *get_cpuinfo_line(char *cpuinfo, const char *tag)
|
||||||
Binary file not shown.
BIN
pipewire-0.3.38.tar.gz
Normal file
BIN
pipewire-0.3.38.tar.gz
Normal file
Binary file not shown.
136
pipewire.spec
136
pipewire.spec
@ -2,7 +2,7 @@
|
|||||||
%global spaversion 0.2
|
%global spaversion 0.2
|
||||||
%global systemd 1
|
%global systemd 1
|
||||||
%global minorversion 3
|
%global minorversion 3
|
||||||
%global microversion 15
|
%global microversion 38
|
||||||
%global soversion 0
|
%global soversion 0
|
||||||
%global multilib_archs x86_64
|
%global multilib_archs x86_64
|
||||||
%global libversion %{soversion}.%(bash -c '((intversion = (%{minorversion} * 100) + %{microversion})); echo ${intversion}').0
|
%global libversion %{soversion}.%(bash -c '((intversion = (%{minorversion} * 100) + %{microversion})); echo ${intversion}').0
|
||||||
@ -12,21 +12,21 @@
|
|||||||
%global enable_pulse 0
|
%global enable_pulse 0
|
||||||
%global enable_vulkan 0
|
%global enable_vulkan 0
|
||||||
|
|
||||||
|
|
||||||
Name: pipewire
|
Name: pipewire
|
||||||
Version: 0.3.15
|
Version: 0.3.38
|
||||||
Release: 6
|
Release: 1
|
||||||
Summary: Multimedia processing graphs
|
Summary: Multimedia processing graphs
|
||||||
License: LGPLv2+
|
License: LGPLv2+
|
||||||
URL: https://pipewire.org/
|
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
|
||||||
|
Patch01: fix-bug-of-build-fails-on-16-17-test-support.patch
|
||||||
|
Patch02: fix-missing-NAME-define-under-arm.patch
|
||||||
|
|
||||||
Patch0: 0001-protocol-native-do-version-check-on-HELLO.patch
|
BuildRequires: meson gcc g++ pkgconf-pkg-config libudev-devel dbus-devel glib2-devel pipewire-gstreamer
|
||||||
|
|
||||||
BuildRequires: meson gcc pkgconf-pkg-config libudev-devel dbus-devel glib2-devel
|
|
||||||
BuildRequires: gstreamer1-devel gstreamer1-plugins-base-devel systemd-devel vulkan-loader-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: alsa-lib-devel libv4l-devel doxygen xmltoman graphviz sbc-devel libsndfile-devel
|
||||||
BuildRequires: bluez-devel SDL2-devel jack-audio-connection-kit-devel
|
BuildRequires: bluez-devel SDL2-devel jack-audio-connection-kit-devel python3-docutils
|
||||||
|
BuildRequires: webrtc-audio-processing-devel libldac-devel libusbx-devel
|
||||||
|
|
||||||
Requires(pre): shadow-utils
|
Requires(pre): shadow-utils
|
||||||
Requires: systemd >= 184 rtkit
|
Requires: systemd >= 184 rtkit
|
||||||
@ -66,7 +66,7 @@ Requires: %{name}-libs%{?_isa} = %{version}-%{release}
|
|||||||
|
|
||||||
%description utils
|
%description utils
|
||||||
This package contains command line utilities for the PipeWire media server.
|
This package contains command line utilities for the PipeWire media server.
|
||||||
|
|
||||||
%if 0%{?enable_alsa}
|
%if 0%{?enable_alsa}
|
||||||
%package alsa
|
%package alsa
|
||||||
Summary: PipeWire media server ALSA support
|
Summary: PipeWire media server ALSA support
|
||||||
@ -167,56 +167,56 @@ This package provides a PulseAudio implementation based on PipeWire
|
|||||||
%autosetup -T -b0 -n %{name}-%{version} -p1
|
%autosetup -T -b0 -n %{name}-%{version} -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%meson -D docs=true -D man=true -D gstreamer=true -D systemd=true \
|
%meson \
|
||||||
-D jack=false -D pipewire-jack=false \
|
-D docs=enabled -D man=enabled -D gstreamer=enabled -D systemd=enabled \
|
||||||
-D pipewire-pulseaudio=false \
|
-D jack=disabled -D pipewire-jack=disabled \
|
||||||
-D vulkan=false
|
-D vulkan=disabled -D gstreamer-device-provider=disabled -D sdl2=disabled \
|
||||||
|
-D audiotestsrc=disabled -D videotestsrc=disabled \
|
||||||
|
-D volume=disabled -D bluez5-codec-aptx=disabled -D roc=disabled \
|
||||||
|
-D libcamera=disabled -D jack-devel=true -D pipewire-alsa=disabled \
|
||||||
|
-D bluez5-codec-aac=disabled -D echo-cancel-webrtc=disabled
|
||||||
%meson_build
|
%meson_build
|
||||||
|
|
||||||
%install
|
%install
|
||||||
%meson_install
|
%meson_install
|
||||||
|
|
||||||
%if 0%{?enable_jack}
|
%if 0%{?enable_jack}
|
||||||
mv %{buildroot}%{_libdir}/pipewire-%{apiversion}/jack/libjack.so.%{libversion} %{buildroot}%{_libdir}
|
mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d/
|
||||||
ln -sr %{buildroot}%{_libdir}/libjack.so.%{libversion} %{buildroot}%{_libdir}/pipewire-%{apiversion}/jack/libjack.so.%{libversion}
|
echo %{_libdir}/pipewire-%{apiversion}/jack/ > %{buildroot}%{_sysconfdir}/ld.so.conf.d/pipewire-jack-%{_arch}.conf
|
||||||
ln -s libjack.so.%{libversion} %{buildroot}%{_libdir}/libjack.so.0.1.0
|
%else
|
||||||
ln -s libjack.so.0.1.0 %{buildroot}%{_libdir}/libjack.so.0
|
rm %{buildroot}%{_datadir}/pipewire/jack.conf
|
||||||
mv %{buildroot}%{_libdir}/pipewire-%{apiversion}/jack/libjackserver.so.%{libversion} %{buildroot}%{_libdir}
|
rm %{buildroot}%{_datadir}/pipewire/media-session.d/with-jack
|
||||||
ln -sr %{buildroot}%{_libdir}/libjackserver.so.%{libversion} %{buildroot}%{_libdir}/pipewire-%{apiversion}/jack/libjackserver.so.%{libversion}
|
|
||||||
ln -s libjackserver.so.%{libversion} %{buildroot}%{_libdir}/libjackserver.so.0.1.0
|
|
||||||
ln -s libjackserver.so.0.1.0 %{buildroot}%{_libdir}/libjackserver.so.0
|
|
||||||
mv %{buildroot}%{_libdir}/pipewire-%{apiversion}/jack/libjacknet.so.%{libversion} %{buildroot}%{_libdir}
|
|
||||||
ln -sr %{buildroot}%{_libdir}/libjacknet.so.%{libversion} %{buildroot}%{_libdir}/pipewire-%{apiversion}/jack/libjacknet.so.%{libversion}
|
|
||||||
ln -s libjacknet.so.%{libversion} %{buildroot}%{_libdir}/libjacknet.so.0.1.0
|
|
||||||
ln -s libjacknet.so.0.1.0 %{buildroot}%{_libdir}/libjacknet.so.0
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%if 0%{?enable_pulse}
|
|
||||||
mv %{buildroot}%{_libdir}/pipewire-%{apiversion}/pulse/libpulse.so.%{libversion} %{buildroot}%{_libdir}
|
|
||||||
ln -sr %{buildroot}%{_libdir}/libpulse.so.%{libversion} %{buildroot}%{_libdir}/pipewire-%{apiversion}/pulse/libpulse.so.%{libversion}
|
|
||||||
ln -s libpulse.so.%{libversion} %{buildroot}%{_libdir}/libpulse.so.0
|
|
||||||
mv %{buildroot}%{_libdir}/pipewire-%{apiversion}/pulse/libpulse-simple.so.%{libversion} %{buildroot}%{_libdir}
|
|
||||||
ln -sr %{buildroot}%{_libdir}/libpulse-simple.so.%{libversion} %{buildroot}%{_libdir}/pipewire-%{apiversion}/pulse/libpulse-simple.so.%{libversion}
|
|
||||||
ln -s libpulse-simple.so.%{libversion} %{buildroot}%{_libdir}/libpulse-simple.so.0
|
|
||||||
mv %{buildroot}%{_libdir}/pipewire-%{apiversion}/pulse/libpulse-mainloop-glib.so.%{libversion} %{buildroot}%{_libdir}
|
|
||||||
ln -sr %{buildroot}%{_libdir}/libpulse-mainloop-glib.so.%{libversion} %{buildroot}%{_libdir}/pipewire-%{apiversion}/pulse/libpulse-mainloop-glib.so.%{libversion}
|
|
||||||
ln -s libpulse-mainloop-glib.so.%{libversion} %{buildroot}%{_libdir}/libpulse-mainloop-glib.so.0
|
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
mkdir %{buildroot}%{_userunitdir}/sockets.target.wants
|
# If the PulseAudio replacement isn't being offered, delete the files
|
||||||
ln -s ../pipewire.socket %{buildroot}%{_userunitdir}/sockets.target.wants/pipewire.socket
|
rm %{buildroot}%{_bindir}/pipewire-pulse
|
||||||
|
rm %{buildroot}%{_userunitdir}/pipewire-pulse.*
|
||||||
|
rm %{buildroot}%{_datadir}/pipewire/media-session.d/with-pulseaudio
|
||||||
|
rm %{buildroot}%{_datadir}/pipewire/pipewire-pulse.conf
|
||||||
|
|
||||||
mkdir -p %{buildroot}%{_sysconfdir}/alsa/conf.d/
|
# rm media_session related
|
||||||
cp %{buildroot}%{_datadir}/alsa/alsa.conf.d/50-pipewire.conf \
|
rm %{buildroot}%{_datadir}/pipewire/media-session.d/alsa-monitor.conf
|
||||||
%{buildroot}%{_sysconfdir}/alsa/conf.d/50-pipewire.conf
|
rm %{buildroot}%{_datadir}/pipewire/media-session.d/bluez-monitor.conf
|
||||||
cp %{buildroot}%{_datadir}/alsa/alsa.conf.d/99-pipewire-default.conf \
|
rm %{buildroot}%{_datadir}/pipewire/media-session.d/media-session.conf
|
||||||
%{buildroot}%{_sysconfdir}/alsa/conf.d/99-pipewire-default.conf
|
rm %{buildroot}%{_datadir}/pipewire/media-session.d/v4l2-monitor.conf
|
||||||
|
rm %{buildroot}%{_datadir}/spa-0.2/bluez5/bluez-hardware.conf
|
||||||
|
|
||||||
|
# We don't start the media session with systemd yet
|
||||||
|
rm %{buildroot}%{_userunitdir}/pipewire-media-session.*
|
||||||
|
|
||||||
|
%find_lang %{name}
|
||||||
|
|
||||||
|
# upstream should use udev.pc
|
||||||
mkdir -p %{buildroot}%{_prefix}/lib/udev/rules.d
|
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
|
mv -fv %{buildroot}/lib/udev/rules.d/90-pipewire-alsa.rules %{buildroot}%{_prefix}/lib/udev/rules.d
|
||||||
|
|
||||||
|
|
||||||
%check
|
%check
|
||||||
%meson_test
|
%meson_test || TESTS_ERROR=$?
|
||||||
|
if [ "${TESTS_ERROR}" != "" ]; then
|
||||||
|
echo "test failed"
|
||||||
|
%{!?tests_nonfatal:exit $TESTS_ERROR}
|
||||||
|
fi
|
||||||
|
|
||||||
%pre
|
%pre
|
||||||
getent group pipewire >/dev/null || groupadd -r pipewire
|
getent group pipewire >/dev/null || groupadd -r pipewire
|
||||||
@ -224,7 +224,21 @@ getent passwd pipewire >/dev/null || \
|
|||||||
useradd -r -g pipewire -d %{_localstatedir}/run/pipewire -s /sbin/nologin -c "PipeWire System Daemon" pipewire
|
useradd -r -g pipewire -d %{_localstatedir}/run/pipewire -s /sbin/nologin -c "PipeWire System Daemon" pipewire
|
||||||
exit 0
|
exit 0
|
||||||
|
|
||||||
%ldconfig_scriptlets
|
%post
|
||||||
|
%systemd_user_post pipewire.service
|
||||||
|
%systemd_user_post pipewire.socket
|
||||||
|
|
||||||
|
%triggerun -- %{name} < 0.3.6-2
|
||||||
|
# This is for upgrades from previous versions which had a static symlink.
|
||||||
|
# The %%post scriptlet above only does anything on initial package installation.
|
||||||
|
# Remove before F33.
|
||||||
|
systemctl --no-reload preset --global pipewire.socket >/dev/null 2>&1 || :
|
||||||
|
|
||||||
|
%if 0%{?enable_pulse}
|
||||||
|
%post pulseaudio
|
||||||
|
%systemd_user_post pipewire-pulse.service
|
||||||
|
%systemd_user_post pipewire-pulse.socket
|
||||||
|
%endif
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
@ -233,15 +247,10 @@ exit 0
|
|||||||
%{_bindir}/pipewire
|
%{_bindir}/pipewire
|
||||||
%{_bindir}/pipewire-media-session
|
%{_bindir}/pipewire-media-session
|
||||||
%{_userunitdir}/pipewire.*
|
%{_userunitdir}/pipewire.*
|
||||||
%{_userunitdir}/sockets.target.wants/pipewire.socket
|
%{_datadir}/pipewire/pipewire.conf
|
||||||
%dir %{_sysconfdir}/pipewire/
|
%{_datadir}/pipewire/filter-chain/*.conf
|
||||||
%{_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
|
|
||||||
|
|
||||||
%files libs
|
%files libs -f %{name}.lang
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
%license LICENSE COPYING
|
%license LICENSE COPYING
|
||||||
%{_libdir}/libpipewire-%{apiversion}.so.*
|
%{_libdir}/libpipewire-%{apiversion}.so.*
|
||||||
@ -263,6 +272,8 @@ exit 0
|
|||||||
%if 0%{?enable_vulkan}
|
%if 0%{?enable_vulkan}
|
||||||
%{_libdir}/spa-%{spaversion}/vulkan/
|
%{_libdir}/spa-%{spaversion}/vulkan/
|
||||||
%endif
|
%endif
|
||||||
|
%{_datadir}/pipewire/client.conf
|
||||||
|
%{_datadir}/pipewire/client-rt.conf
|
||||||
|
|
||||||
%files gstreamer
|
%files gstreamer
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
@ -275,7 +286,6 @@ exit 0
|
|||||||
%{_bindir}/pw-mididump
|
%{_bindir}/pw-mididump
|
||||||
%{_bindir}/pw-midiplay
|
%{_bindir}/pw-midiplay
|
||||||
%{_bindir}/pw-midirecord
|
%{_bindir}/pw-midirecord
|
||||||
%{_bindir}/pw-cli
|
|
||||||
%{_bindir}/pw-dot
|
%{_bindir}/pw-dot
|
||||||
%{_bindir}/pw-cat
|
%{_bindir}/pw-cat
|
||||||
%{_bindir}/pw-play
|
%{_bindir}/pw-play
|
||||||
@ -283,8 +293,8 @@ exit 0
|
|||||||
%{_bindir}/pw-record
|
%{_bindir}/pw-record
|
||||||
%{_bindir}/pw-reserve
|
%{_bindir}/pw-reserve
|
||||||
%{_mandir}/man1/pw-mon.1*
|
%{_mandir}/man1/pw-mon.1*
|
||||||
%{_mandir}/man1/pw-cli.1*
|
|
||||||
%{_mandir}/man1/pw-cat.1*
|
%{_mandir}/man1/pw-cat.1*
|
||||||
|
%{_mandir}/man1/pw-cli.1*
|
||||||
%{_mandir}/man1/pw-dot.1*
|
%{_mandir}/man1/pw-dot.1*
|
||||||
%{_mandir}/man1/pw-metadata.1*
|
%{_mandir}/man1/pw-metadata.1*
|
||||||
%{_mandir}/man1/pw-mididump.1*
|
%{_mandir}/man1/pw-mididump.1*
|
||||||
@ -293,6 +303,11 @@ exit 0
|
|||||||
%{_bindir}/spa-inspect
|
%{_bindir}/spa-inspect
|
||||||
%{_bindir}/spa-monitor
|
%{_bindir}/spa-monitor
|
||||||
%{_bindir}/spa-resample
|
%{_bindir}/spa-resample
|
||||||
|
%{_bindir}/pw-dsdplay
|
||||||
|
%{_bindir}/pw-dump
|
||||||
|
%{_bindir}/pw-link
|
||||||
|
%{_bindir}/pw-loopback
|
||||||
|
%{_bindir}/spa-json-dump
|
||||||
|
|
||||||
%if 0%{?enable_alsa}
|
%if 0%{?enable_alsa}
|
||||||
%files alsa
|
%files alsa
|
||||||
@ -301,8 +316,6 @@ exit 0
|
|||||||
%{_libdir}/alsa-lib/libasound_module_ctl_pipewire.so
|
%{_libdir}/alsa-lib/libasound_module_ctl_pipewire.so
|
||||||
%{_datadir}/alsa/alsa.conf.d/50-pipewire.conf
|
%{_datadir}/alsa/alsa.conf.d/50-pipewire.conf
|
||||||
%{_datadir}/alsa/alsa.conf.d/99-pipewire-default.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
|
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if 0%{?enable_jack}
|
%if 0%{?enable_jack}
|
||||||
@ -313,7 +326,7 @@ exit 0
|
|||||||
%{_libdir}/pipewire-%{apiversion}/jack/libjack.so*
|
%{_libdir}/pipewire-%{apiversion}/jack/libjack.so*
|
||||||
%{_libdir}/pipewire-%{apiversion}/jack/libjacknet.so*
|
%{_libdir}/pipewire-%{apiversion}/jack/libjacknet.so*
|
||||||
%{_libdir}/pipewire-%{apiversion}/jack/libjackserver.so*
|
%{_libdir}/pipewire-%{apiversion}/jack/libjackserver.so*
|
||||||
|
|
||||||
%files libjack
|
%files libjack
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
%{_libdir}/libjack.so.*
|
%{_libdir}/libjack.so.*
|
||||||
@ -340,7 +353,7 @@ exit 0
|
|||||||
%{_libdir}/pipewire-%{apiversion}/pulse/libpulse.so*
|
%{_libdir}/pipewire-%{apiversion}/pulse/libpulse.so*
|
||||||
%{_libdir}/pipewire-%{apiversion}/pulse/libpulse-simple.so*
|
%{_libdir}/pipewire-%{apiversion}/pulse/libpulse-simple.so*
|
||||||
%{_libdir}/pipewire-%{apiversion}/pulse/libpulse-mainloop-glib.so*
|
%{_libdir}/pipewire-%{apiversion}/pulse/libpulse-mainloop-glib.so*
|
||||||
|
|
||||||
%files libpulse
|
%files libpulse
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
%{_libdir}/libpulse.so.*
|
%{_libdir}/libpulse.so.*
|
||||||
@ -356,6 +369,9 @@ exit 0
|
|||||||
%{_datadir}/doc/pipewire/html/*
|
%{_datadir}/doc/pipewire/html/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Jun 20 2022 wenlong ding <wenlong.ding@turbolinux.com.cn> - 0.3.38-1
|
||||||
|
- Update version to 0.3.38
|
||||||
|
|
||||||
* Wed Apr 13 2022 liuyumeng <liuyumeng5@h-partners.comm> - 0.3.15-6
|
* Wed Apr 13 2022 liuyumeng <liuyumeng5@h-partners.comm> - 0.3.15-6
|
||||||
- delete redundant buildrequires
|
- delete redundant buildrequires
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user