import CS pipewire-0.3.67-2.el9

This commit is contained in:
eabdullin 2023-09-21 19:52:47 +00:00
parent 424fcd8548
commit 63c0245004
7 changed files with 791 additions and 377 deletions

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/pipewire-0.3.47.tar.gz SOURCES/pipewire-0.3.67.tar.gz

View File

@ -1 +1 @@
ed5ba7b20d34b615240528539199349a7e6efa5e SOURCES/pipewire-0.3.47.tar.gz 9b31e710fb6e2d36a5d431c5ab59fbcfba7e3e82 SOURCES/pipewire-0.3.67.tar.gz

View File

@ -1,276 +0,0 @@
From 768eb72fa8eb5a4597adc60d2649cf2e5f564247 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Fri, 18 Feb 2022 10:27:40 +0100
Subject: [PATCH] Revert "treewide: meson.build: use feature.allowed()"
This reverts commit cc7305351202424a2800425d86ae9c9b72aefa15.
---
man/meson.build | 2 +-
meson.build | 14 +++++++-------
spa/meson.build | 4 ++--
spa/plugins/bluez5/meson.build | 18 +++++++++---------
spa/plugins/meson.build | 18 +++++++++---------
spa/plugins/support/meson.build | 2 +-
src/daemon/systemd/meson.build | 4 ++--
src/gst/meson.build | 2 +-
src/meson.build | 4 ++--
src/tools/meson.build | 2 +-
10 files changed, 35 insertions(+), 35 deletions(-)
diff --git a/man/meson.build b/man/meson.build
index 54d1c5eca..8e6e7dbe4 100644
--- a/man/meson.build
+++ b/man/meson.build
@@ -19,7 +19,7 @@ manpages = [
'pw-profiler.1.rst.in',
]
-if get_option('pipewire-jack').allowed()
+if not get_option('pipewire-jack').disabled()
manpages += 'pw-jack.1.rst.in'
endif
diff --git a/meson.build b/meson.build
index 3c88c2427..b033059e9 100644
--- a/meson.build
+++ b/meson.build
@@ -336,7 +336,7 @@ endforeach
gst_dp_found = gst_dep.length() > 0
summary({'gstreamer-device-provider': gst_dp_found}, bool_yn: true, section: 'Backend')
-cdata.set('HAVE_GSTREAMER_DEVICE_PROVIDER', get_option('gstreamer-device-provider').allowed())
+cdata.set('HAVE_GSTREAMER_DEVICE_PROVIDER', not get_option('gstreamer-device-provider').disabled())
webrtc_dep = dependency('webrtc-audio-processing',
version : ['>= 0.2', '< 1.0'],
@@ -382,10 +382,10 @@ cdata.set('HAVE_LILV', lilv_lib.found())
installed_tests_metadir = pipewire_datadir / 'installed-tests' / pipewire_name
installed_tests_execdir = pipewire_libexecdir / 'installed-tests' / pipewire_name
-installed_tests_enabled = get_option('installed_tests').allowed()
+installed_tests_enabled = not get_option('installed_tests').disabled()
installed_tests_template = files('template.test.in')
-if get_option('tests').allowed()
+if not get_option('tests').disabled()
gstack = find_program('gstack', required : false)
cdata.set('HAVE_GSTACK', gstack.found())
endif
@@ -394,17 +394,17 @@ subdir('po')
subdir('spa')
subdir('src')
-if get_option('tests').allowed()
+if not get_option('tests').disabled()
subdir('test')
endif
configure_file(output : 'config.h',
configuration : cdata)
-if get_option('pipewire-jack').allowed()
+if not get_option('pipewire-jack').disabled()
subdir('pipewire-jack')
endif
-if get_option('pipewire-v4l2').allowed()
+if not get_option('pipewire-v4l2').disabled()
subdir('pipewire-v4l2')
endif
@@ -415,7 +415,7 @@ if alsa_dep.found()
endif
generate_manpages = false
-if get_option('man').allowed()
+if not get_option('man').disabled()
rst2man = find_program('rst2man', required: false)
if not rst2man.found()
rst2man = find_program('rst2man.py', required: get_option('man'))
diff --git a/spa/meson.build b/spa/meson.build
index 1931d35b1..2404748df 100644
--- a/spa/meson.build
+++ b/spa/meson.build
@@ -31,7 +31,7 @@ pkgconfig.generate(filebase : 'lib@0@'.format(spa_name),
subdir('include')
-if get_option('spa-plugins').allowed()
+if not get_option('spa-plugins').disabled()
udevrulesdir = get_option('udevrulesdir')
if udevrulesdir == ''
# absolute path, otherwise meson prepends the prefix
@@ -74,6 +74,6 @@ endif
subdir('tools')
subdir('tests')
-if get_option('examples').allowed()
+if not get_option('examples').disabled()
subdir('examples')
endif
diff --git a/spa/plugins/bluez5/meson.build b/spa/plugins/bluez5/meson.build
index 4567b67dd..7a1e12ec7 100644
--- a/spa/plugins/bluez5/meson.build
+++ b/spa/plugins/bluez5/meson.build
@@ -6,12 +6,12 @@ foreach dep: bluez5_deps
endforeach
cdata.set('HAVE_BLUEZ_5_BACKEND_NATIVE',
- get_option('bluez5-backend-hsp-native').allowed() or
- get_option('bluez5-backend-hfp-native').allowed())
-cdata.set('HAVE_BLUEZ_5_BACKEND_HSP_NATIVE', get_option('bluez5-backend-hsp-native').allowed())
-cdata.set('HAVE_BLUEZ_5_BACKEND_HFP_NATIVE', get_option('bluez5-backend-hfp-native').allowed())
-cdata.set('HAVE_BLUEZ_5_BACKEND_OFONO', get_option('bluez5-backend-ofono').allowed())
-cdata.set('HAVE_BLUEZ_5_BACKEND_HSPHFPD', get_option('bluez5-backend-hsphfpd').allowed())
+ not get_option('bluez5-backend-hsp-native').disabled() or
+ not get_option('bluez5-backend-hfp-native').disabled())
+cdata.set('HAVE_BLUEZ_5_BACKEND_HSP_NATIVE', not get_option('bluez5-backend-hsp-native').disabled())
+cdata.set('HAVE_BLUEZ_5_BACKEND_HFP_NATIVE', not get_option('bluez5-backend-hfp-native').disabled())
+cdata.set('HAVE_BLUEZ_5_BACKEND_OFONO', not get_option('bluez5-backend-ofono').disabled())
+cdata.set('HAVE_BLUEZ_5_BACKEND_HSPHFPD', not get_option('bluez5-backend-hsphfpd').disabled())
cdata.set('HAVE_BLUEZ_5_HCI', dependency('bluez', version: '< 6', required: false).found())
bluez5_sources = [
@@ -34,18 +34,18 @@ bluez5_data = ['bluez-hardware.conf']
install_data(bluez5_data, install_dir : spa_datadir / 'bluez5')
-if get_option('bluez5-backend-hsp-native').allowed() or get_option('bluez5-backend-hfp-native').allowed()
+if not get_option('bluez5-backend-hsp-native').disabled() or not get_option('bluez5-backend-hfp-native').disabled()
if libusb_dep.found()
bluez5_deps += libusb_dep
endif
bluez5_sources += ['backend-native.c']
endif
-if get_option('bluez5-backend-ofono').allowed()
+if not get_option('bluez5-backend-ofono').disabled()
bluez5_sources += ['backend-ofono.c']
endif
-if get_option('bluez5-backend-hsphfpd').allowed()
+if not get_option('bluez5-backend-hsphfpd').disabled()
bluez5_sources += ['backend-hsphfpd.c']
endif
diff --git a/spa/plugins/meson.build b/spa/plugins/meson.build
index fcf007aa9..0b581b29b 100644
--- a/spa/plugins/meson.build
+++ b/spa/plugins/meson.build
@@ -1,16 +1,16 @@
if alsa_dep.found()
subdir('alsa')
endif
-if get_option('audioconvert').allowed()
+if not get_option('audioconvert').disabled()
subdir('audioconvert')
endif
-if get_option('audiomixer').allowed()
+if not get_option('audiomixer').disabled()
subdir('audiomixer')
endif
-if get_option('control').allowed()
+if not get_option('control').disabled()
subdir('control')
endif
-if get_option('audiotestsrc').allowed()
+if not get_option('audiotestsrc').disabled()
subdir('audiotestsrc')
endif
if bluez_dep.found()
@@ -22,19 +22,19 @@ endif
if jack_dep.found()
subdir('jack')
endif
-if get_option('support').allowed()
+if not get_option('support').disabled()
subdir('support')
endif
-if get_option('test').allowed()
+if not get_option('test').disabled()
subdir('test')
endif
-if get_option('videoconvert').allowed()
+if not get_option('videoconvert').disabled()
subdir('videoconvert')
endif
-if get_option('videotestsrc').allowed()
+if not get_option('videotestsrc').disabled()
subdir('videotestsrc')
endif
-if get_option('volume').allowed()
+if not get_option('volume').disabled()
subdir('volume')
endif
if vulkan_headers
diff --git a/spa/plugins/support/meson.build b/spa/plugins/support/meson.build
index 1672d38df..b810b283c 100644
--- a/spa/plugins/support/meson.build
+++ b/spa/plugins/support/meson.build
@@ -23,7 +23,7 @@ spa_support_lib = shared_library('spa-support',
install_dir : spa_plugindir / 'support')
spa_support_dep = declare_dependency(link_with: spa_support_lib)
-if get_option('evl').allowed()
+if not get_option('evl').disabled()
evl_inc = include_directories('/usr/evl/include')
evl_lib = cc.find_library('evl',
dirs: ['/usr/evl/lib/'],
diff --git a/src/daemon/systemd/meson.build b/src/daemon/systemd/meson.build
index 482a44c4b..89ad2f6dc 100644
--- a/src/daemon/systemd/meson.build
+++ b/src/daemon/systemd/meson.build
@@ -1,6 +1,6 @@
-if get_option('systemd-system-service').allowed()
+if not get_option('systemd-system-service').disabled()
subdir('system')
endif
-if get_option('systemd-user-service').allowed()
+if not get_option('systemd-user-service').disabled()
subdir('user')
endif
diff --git a/src/gst/meson.build b/src/gst/meson.build
index fd552f6cb..709dc0f1c 100644
--- a/src/gst/meson.build
+++ b/src/gst/meson.build
@@ -8,7 +8,7 @@ pipewire_gst_sources = [
'gstpipewiresrc.c',
]
-if get_option('gstreamer-device-provider').allowed()
+if not get_option('gstreamer-device-provider').disabled()
pipewire_gst_sources += [ 'gstpipewiredeviceprovider.c' ]
endif
diff --git a/src/meson.build b/src/meson.build
index cefc329eb..2fb73fd59 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -3,10 +3,10 @@ subdir('pipewire')
subdir('daemon')
subdir('tools')
subdir('modules')
-if get_option('examples').allowed()
+if not get_option('examples').disabled()
subdir('examples')
endif
-if get_option('tests').allowed()
+if not get_option('tests').disabled()
subdir('tests')
endif
diff --git a/src/tools/meson.build b/src/tools/meson.build
index 02514c253..038231fcd 100644
--- a/src/tools/meson.build
+++ b/src/tools/meson.build
@@ -34,7 +34,7 @@ if ncurses_dep.found()
endif
build_pw_cat = false
-if get_option('pw-cat').allowed() and sndfile_dep.found()
+if not get_option('pw-cat').disabled() and sndfile_dep.found()
build_pw_cat = true
pwcat_sources = [
--
2.34.1

View File

@ -1,25 +0,0 @@
From 753e97fe5823aa441b996015f44ddba3e400855d Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Fri, 18 Feb 2022 10:18:30 +0100
Subject: [PATCH] meson: drop required version
---
meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index 440845e37..3c88c2427 100644
--- a/meson.build
+++ b/meson.build
@@ -1,7 +1,7 @@
project('pipewire', ['c' ],
version : '0.3.47',
license : [ 'MIT', 'LGPL-2.1-or-later', 'GPL-2.0-only' ],
- meson_version : '>= 0.59.0',
+ meson_version : '>= 0.58.2',
default_options : [ 'warning_level=3',
'c_std=gnu99',
'cpp_std=c++17',
--
2.34.1

View File

@ -0,0 +1,619 @@
From d64136204aa986774910a89fec7b2a3ff9ca4e6d Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Mon, 31 Jul 2023 13:07:10 +0200
Subject: [PATCH] v4l2: don't set inotify on /dev
Doing inotify on /dev is not a good idea because we will be woken up by
a lot of unrelated events.
There is a report of a performance regression on some IO benchmark
because of lock contention within the fsnotify subsystem due to this.
Instead, just watch for attribute changes on the /dev/videoX files
directly. We are only interested in attribute changes, udev should
notify us when the file is added or removed.
---
spa/plugins/v4l2/v4l2-udev.c | 307 +++++++++++++++++------------------
1 file changed, 153 insertions(+), 154 deletions(-)
diff --git a/spa/plugins/v4l2/v4l2-udev.c b/spa/plugins/v4l2/v4l2-udev.c
index ff5433e08..fbba351b8 100644
--- a/spa/plugins/v4l2/v4l2-udev.c
+++ b/spa/plugins/v4l2/v4l2-udev.c
@@ -53,8 +53,10 @@
#define ACTION_DISABLE 2
struct device {
+ struct impl *impl;
uint32_t id;
struct udev_device *dev;
+ struct spa_source notify;
unsigned int accessible:1;
unsigned int ignored:1;
unsigned int emitted:1;
@@ -79,66 +81,79 @@ struct impl {
uint32_t n_devices;
struct spa_source source;
- struct spa_source notify;
};
-static int impl_udev_open(struct impl *this)
+static int stop_inotify(struct device *dev);
+static int start_inotify(struct device *dev);
+
+static int impl_udev_open(struct impl *impl)
{
- if (this->udev == NULL) {
- this->udev = udev_new();
- if (this->udev == NULL)
+ if (impl->udev == NULL) {
+ impl->udev = udev_new();
+ if (impl->udev == NULL)
return -ENOMEM;
}
return 0;
}
-static int impl_udev_close(struct impl *this)
+static int impl_udev_close(struct impl *impl)
{
- if (this->udev != NULL)
- udev_unref(this->udev);
- this->udev = NULL;
+ if (impl->udev != NULL)
+ udev_unref(impl->udev);
+ impl->udev = NULL;
return 0;
}
-static struct device *add_device(struct impl *this, uint32_t id, struct udev_device *dev)
+static struct device *add_device(struct impl *impl, uint32_t id, struct udev_device *dev)
{
struct device *device;
- if (this->n_devices >= MAX_DEVICES)
+ if (impl->n_devices >= MAX_DEVICES)
return NULL;
- device = &this->devices[this->n_devices++];
+ device = &impl->devices[impl->n_devices++];
spa_zero(*device);
+ device->impl = impl;
+ device->notify.fd = -1;
device->id = id;
udev_device_ref(dev);
device->dev = dev;
+ start_inotify(device);
return device;
}
-static struct device *find_device(struct impl *this, uint32_t id)
+static struct device *find_device(struct impl *impl, uint32_t id)
{
uint32_t i;
- for (i = 0; i < this->n_devices; i++) {
- if (this->devices[i].id == id)
- return &this->devices[i];
+ for (i = 0; i < impl->n_devices; i++) {
+ if (impl->devices[i].id == id)
+ return &impl->devices[i];
}
return NULL;
}
-static void remove_device(struct impl *this, struct device *device)
+static void clear_device(struct device *device)
+{
+ stop_inotify(device);
+ if (device->dev)
+ udev_device_unref(device->dev);
+}
+
+static void remove_device(struct device *device)
{
- udev_device_unref(device->dev);
- *device = this->devices[--this->n_devices];
+ struct impl *impl = device->impl;
+ clear_device(device);
+ *device = impl->devices[--impl->n_devices];
}
-static void clear_devices(struct impl *this)
+static void clear_devices(struct impl *impl)
{
uint32_t i;
- for (i = 0; i < this->n_devices; i++)
- udev_device_unref(this->devices[i].dev);
- this->n_devices = 0;
+ for (i = 0; i < impl->n_devices; i++)
+ clear_device(&impl->devices[i]);
+ impl->n_devices = 0;
}
-static uint32_t get_device_id(struct impl *this, struct udev_device *dev)
+static uint32_t get_device_id(struct impl *impl, struct udev_device *dev)
{
const char *str;
@@ -234,8 +249,9 @@ static void unescape(const char *src, char *dst)
*d = 0;
}
-static int emit_object_info(struct impl *this, struct device *device)
+static int emit_object_info(struct device *device)
{
+ struct impl *impl = device->impl;
struct spa_device_object_info info;
uint32_t id = device->id;
struct udev_device *dev = device->dev;
@@ -334,54 +350,55 @@ static int emit_object_info(struct impl *this, struct device *device)
items[n_items++] = SPA_DICT_ITEM_INIT(SPA_KEY_DEVICE_CAPABILITIES, str);
}
info.props = &SPA_DICT_INIT(items, n_items);
- spa_device_emit_object_info(&this->hooks, id, &info);
+ spa_device_emit_object_info(&impl->hooks, id, &info);
device->emitted = true;
return 1;
}
-static bool check_access(struct impl *this, struct device *device)
+static bool check_access(struct device *device)
{
char path[128];
snprintf(path, sizeof(path), "/dev/video%u", device->id);
device->accessible = access(path, R_OK|W_OK) >= 0;
- spa_log_debug(this->log, "%s accessible:%u", path, device->accessible);
+ spa_log_debug(device->impl->log, "%s accessible:%u", path, device->accessible);
return device->accessible;
}
-static void process_device(struct impl *this, uint32_t action, struct udev_device *dev)
+static void process_device(struct impl *impl, uint32_t action, struct udev_device *dev)
{
uint32_t id;
struct device *device;
bool emitted;
- if ((id = get_device_id(this, dev)) == SPA_ID_INVALID)
+ if ((id = get_device_id(impl, dev)) == SPA_ID_INVALID)
return;
- device = find_device(this, id);
+ device = find_device(impl, id);
if (device && device->ignored)
return;
switch (action) {
case ACTION_ADD:
if (device == NULL)
- device = add_device(this, id, dev);
+ device = add_device(impl, id, dev);
if (device == NULL)
return;
- if (!check_access(this, device))
+ if (!check_access(device))
return;
- emit_object_info(this, device);
+ else
+ emit_object_info(device);
break;
case ACTION_REMOVE:
if (device == NULL)
return;
emitted = device->emitted;
- remove_device(this, device);
+ remove_device(device);
if (emitted)
- spa_device_emit_object_info(&this->hooks, id, NULL);
+ spa_device_emit_object_info(&impl->hooks, id, NULL);
break;
case ACTION_DISABLE:
@@ -389,27 +406,16 @@ static void process_device(struct impl *this, uint32_t action, struct udev_devic
return;
if (device->emitted) {
device->emitted = false;
- spa_device_emit_object_info(&this->hooks, id, NULL);
+ spa_device_emit_object_info(&impl->hooks, id, NULL);
}
break;
}
}
-static int stop_inotify(struct impl *this)
-{
- if (this->notify.fd == -1)
- return 0;
- spa_log_info(this->log, "stop inotify");
- spa_loop_remove_source(this->main_loop, &this->notify);
- close(this->notify.fd);
- this->notify.fd = -1;
- return 0;
-}
-
static void impl_on_notify_events(struct spa_source *source)
{
- bool deleted = false;
- struct impl *this = source->data;
+ struct device *dev = source->data;
+ struct impl *impl = dev->impl;
union {
unsigned char name[sizeof(struct inotify_event) + NAME_MAX + 1];
struct inotify_event e; /* for appropriate alignment */
@@ -430,143 +436,138 @@ static void impl_on_notify_events(struct spa_source *source)
for (p = &buf; p < e;
p = SPA_PTROFF(p, sizeof(struct inotify_event) + event->len, void)) {
- unsigned int id;
- struct device *device;
event = (const struct inotify_event *) p;
if ((event->mask & IN_ATTRIB)) {
bool access;
- if (sscanf(event->name, "video%u", &id) != 1)
- continue;
- if ((device = find_device(this, id)) == NULL)
- continue;
- access = check_access(this, device);
- if (access && !device->emitted)
- process_device(this, ACTION_ADD, device->dev);
- else if (!access && device->emitted)
- process_device(this, ACTION_DISABLE, device->dev);
+ access = check_access(dev);
+ if (access && !dev->emitted)
+ process_device(impl, ACTION_ADD, dev->dev);
+ else if (!access && dev->emitted)
+ process_device(impl, ACTION_DISABLE, dev->dev);
}
- /* /dev/ might have been removed */
- if ((event->mask & (IN_DELETE_SELF | IN_MOVE_SELF)))
- deleted = true;
}
}
- if (deleted)
- stop_inotify(this);
}
-static int start_inotify(struct impl *this)
+static int start_inotify(struct device *dev)
{
+ struct impl *impl = dev->impl;
int res, notify_fd;
+ char name[32];
- if (this->notify.fd != -1)
+ if (dev->notify.fd != -1)
return 0;
if ((notify_fd = inotify_init1(IN_CLOEXEC | IN_NONBLOCK)) < 0)
return -errno;
- res = inotify_add_watch(notify_fd, "/dev",
- IN_ATTRIB | IN_CLOSE_WRITE | IN_DELETE_SELF | IN_MOVE_SELF);
+ snprintf(name, sizeof(name), "/dev/video%u", dev->id);
+
+ res = inotify_add_watch(notify_fd, name, IN_ATTRIB | IN_CLOSE_WRITE);
if (res < 0) {
res = -errno;
close(notify_fd);
if (res == -ENOENT) {
- spa_log_debug(this->log, "/dev/ does not exist yet");
+ spa_log_debug(impl->log, "%s does not exist yet", name);
return 0;
}
- spa_log_error(this->log, "inotify_add_watch() failed: %s", spa_strerror(res));
+ spa_log_error(impl->log, "inotify_add_watch() failed: %s", spa_strerror(res));
return res;
}
- spa_log_info(this->log, "start inotify");
- this->notify.func = impl_on_notify_events;
- this->notify.data = this;
- this->notify.fd = notify_fd;
- this->notify.mask = SPA_IO_IN | SPA_IO_ERR;
+ spa_log_info(impl->log, "start inotify for %s", name);
+ dev->notify.func = impl_on_notify_events;
+ dev->notify.data = dev;
+ dev->notify.fd = notify_fd;
+ dev->notify.mask = SPA_IO_IN | SPA_IO_ERR;
- spa_loop_add_source(this->main_loop, &this->notify);
+ spa_loop_add_source(impl->main_loop, &dev->notify);
return 0;
}
+static int stop_inotify(struct device *dev)
+{
+ struct impl *impl = dev->impl;
+ if (dev->notify.fd == -1)
+ return 0;
+ spa_log_info(impl->log, "stop inotify for /dev/video%u", dev->id);
+ spa_loop_remove_source(impl->main_loop, &dev->notify);
+ close(dev->notify.fd);
+ dev->notify.fd = -1;
+ return 0;
+}
+
static void impl_on_fd_events(struct spa_source *source)
{
- struct impl *this = source->data;
+ struct impl *impl = source->data;
struct udev_device *dev;
const char *action;
- dev = udev_monitor_receive_device(this->umonitor);
+ dev = udev_monitor_receive_device(impl->umonitor);
if (dev == NULL)
return;
if ((action = udev_device_get_action(dev)) == NULL)
action = "change";
- spa_log_debug(this->log, "action %s", action);
-
- start_inotify(this);
+ spa_log_debug(impl->log, "action %s", action);
if (spa_streq(action, "add") ||
spa_streq(action, "change")) {
- process_device(this, ACTION_ADD, dev);
+ process_device(impl, ACTION_ADD, dev);
} else if (spa_streq(action, "remove")) {
- process_device(this, ACTION_REMOVE, dev);
+ process_device(impl, ACTION_REMOVE, dev);
}
udev_device_unref(dev);
}
-static int start_monitor(struct impl *this)
+static int start_monitor(struct impl *impl)
{
- int res;
-
- if (this->umonitor != NULL)
+ if (impl->umonitor != NULL)
return 0;
- this->umonitor = udev_monitor_new_from_netlink(this->udev, "udev");
- if (this->umonitor == NULL)
+ impl->umonitor = udev_monitor_new_from_netlink(impl->udev, "udev");
+ if (impl->umonitor == NULL)
return -ENOMEM;
- udev_monitor_filter_add_match_subsystem_devtype(this->umonitor,
+ udev_monitor_filter_add_match_subsystem_devtype(impl->umonitor,
"video4linux", NULL);
- udev_monitor_enable_receiving(this->umonitor);
-
- this->source.func = impl_on_fd_events;
- this->source.data = this;
- this->source.fd = udev_monitor_get_fd(this->umonitor);
- this->source.mask = SPA_IO_IN | SPA_IO_ERR;
+ udev_monitor_enable_receiving(impl->umonitor);
- spa_log_debug(this->log, "monitor %p", this->umonitor);
- spa_loop_add_source(this->main_loop, &this->source);
+ impl->source.func = impl_on_fd_events;
+ impl->source.data = impl;
+ impl->source.fd = udev_monitor_get_fd(impl->umonitor);
+ impl->source.mask = SPA_IO_IN | SPA_IO_ERR;
- if ((res = start_inotify(this)) < 0)
- return res;
+ spa_log_debug(impl->log, "monitor %p", impl->umonitor);
+ spa_loop_add_source(impl->main_loop, &impl->source);
return 0;
}
-static int stop_monitor(struct impl *this)
+static int stop_monitor(struct impl *impl)
{
- if (this->umonitor == NULL)
+ if (impl->umonitor == NULL)
return 0;
- clear_devices (this);
-
- spa_loop_remove_source(this->main_loop, &this->source);
- udev_monitor_unref(this->umonitor);
- this->umonitor = NULL;
+ clear_devices(impl);
- stop_inotify(this);
+ spa_loop_remove_source(impl->main_loop, &impl->source);
+ udev_monitor_unref(impl->umonitor);
+ impl->umonitor = NULL;
return 0;
}
-static int enum_devices(struct impl *this)
+static int enum_devices(struct impl *impl)
{
struct udev_enumerate *enumerate;
struct udev_list_entry *devices;
- enumerate = udev_enumerate_new(this->udev);
+ enumerate = udev_enumerate_new(impl->udev);
if (enumerate == NULL)
return -ENOMEM;
@@ -577,11 +578,11 @@ static int enum_devices(struct impl *this)
devices = udev_list_entry_get_next(devices)) {
struct udev_device *dev;
- dev = udev_device_new_from_syspath(this->udev, udev_list_entry_get_name(devices));
+ dev = udev_device_new_from_syspath(impl->udev, udev_list_entry_get_name(devices));
if (dev == NULL)
continue;
- process_device(this, ACTION_ADD, dev);
+ process_device(impl, ACTION_ADD, dev);
udev_device_unref(dev);
}
@@ -596,24 +597,24 @@ static const struct spa_dict_item device_info_items[] = {
{ SPA_KEY_API_UDEV_MATCH, "video4linux" },
};
-static void emit_device_info(struct impl *this, bool full)
+static void emit_device_info(struct impl *impl, bool full)
{
- uint64_t old = full ? this->info.change_mask : 0;
+ uint64_t old = full ? impl->info.change_mask : 0;
if (full)
- this->info.change_mask = this->info_all;
- if (this->info.change_mask) {
- this->info.props = &SPA_DICT_INIT_ARRAY(device_info_items);
- spa_device_emit_info(&this->hooks, &this->info);
- this->info.change_mask = old;
+ impl->info.change_mask = impl->info_all;
+ if (impl->info.change_mask) {
+ impl->info.props = &SPA_DICT_INIT_ARRAY(device_info_items);
+ spa_device_emit_info(&impl->hooks, &impl->info);
+ impl->info.change_mask = old;
}
}
static void impl_hook_removed(struct spa_hook *hook)
{
- struct impl *this = hook->priv;
- if (spa_hook_list_is_empty(&this->hooks)) {
- stop_monitor(this);
- impl_udev_close(this);
+ struct impl *impl = hook->priv;
+ if (spa_hook_list_is_empty(&impl->hooks)) {
+ stop_monitor(impl);
+ impl_udev_close(impl);
}
}
@@ -622,29 +623,29 @@ impl_device_add_listener(void *object, struct spa_hook *listener,
const struct spa_device_events *events, void *data)
{
int res;
- struct impl *this = object;
+ struct impl *impl = object;
struct spa_hook_list save;
- spa_return_val_if_fail(this != NULL, -EINVAL);
+ spa_return_val_if_fail(impl != NULL, -EINVAL);
spa_return_val_if_fail(events != NULL, -EINVAL);
- if ((res = impl_udev_open(this)) < 0)
+ if ((res = impl_udev_open(impl)) < 0)
return res;
- spa_hook_list_isolate(&this->hooks, &save, listener, events, data);
+ spa_hook_list_isolate(&impl->hooks, &save, listener, events, data);
- emit_device_info(this, true);
+ emit_device_info(impl, true);
- if ((res = enum_devices(this)) < 0)
+ if ((res = enum_devices(impl)) < 0)
return res;
- if ((res = start_monitor(this)) < 0)
+ if ((res = start_monitor(impl)) < 0)
return res;
- spa_hook_list_join(&this->hooks, &save);
+ spa_hook_list_join(&impl->hooks, &save);
listener->removed = impl_hook_removed;
- listener->priv = this;
+ listener->priv = impl;
return 0;
}
@@ -656,15 +657,15 @@ static const struct spa_device_methods impl_device = {
static int impl_get_interface(struct spa_handle *handle, const char *type, void **interface)
{
- struct impl *this;
+ struct impl *impl;
spa_return_val_if_fail(handle != NULL, -EINVAL);
spa_return_val_if_fail(interface != NULL, -EINVAL);
- this = (struct impl *) handle;
+ impl = (struct impl *) handle;
if (spa_streq(type, SPA_TYPE_INTERFACE_Device))
- *interface = &this->device;
+ *interface = &impl->device;
else
return -ENOENT;
@@ -673,9 +674,9 @@ static int impl_get_interface(struct spa_handle *handle, const char *type, void
static int impl_clear(struct spa_handle *handle)
{
- struct impl *this = (struct impl *) handle;
- stop_monitor(this);
- impl_udev_close(this);
+ struct impl *impl = (struct impl *) handle;
+ stop_monitor(impl);
+ impl_udev_close(impl);
return 0;
}
@@ -693,7 +694,7 @@ impl_init(const struct spa_handle_factory *factory,
const struct spa_support *support,
uint32_t n_support)
{
- struct impl *this;
+ struct impl *impl;
spa_return_val_if_fail(factory != NULL, -EINVAL);
spa_return_val_if_fail(handle != NULL, -EINVAL);
@@ -701,27 +702,25 @@ impl_init(const struct spa_handle_factory *factory,
handle->get_interface = impl_get_interface;
handle->clear = impl_clear;
- this = (struct impl *) handle;
- this->notify.fd = -1;
-
- this->log = spa_support_find(support, n_support, SPA_TYPE_INTERFACE_Log);
- this->main_loop = spa_support_find(support, n_support, SPA_TYPE_INTERFACE_Loop);
+ impl = (struct impl *) handle;
+ impl->log = spa_support_find(support, n_support, SPA_TYPE_INTERFACE_Log);
+ impl->main_loop = spa_support_find(support, n_support, SPA_TYPE_INTERFACE_Loop);
- if (this->main_loop == NULL) {
- spa_log_error(this->log, "a main-loop is needed");
+ if (impl->main_loop == NULL) {
+ spa_log_error(impl->log, "a main-loop is needed");
return -EINVAL;
}
- spa_hook_list_init(&this->hooks);
+ spa_hook_list_init(&impl->hooks);
- this->device.iface = SPA_INTERFACE_INIT(
+ impl->device.iface = SPA_INTERFACE_INIT(
SPA_TYPE_INTERFACE_Device,
SPA_VERSION_DEVICE,
- &impl_device, this);
+ &impl_device, impl);
- this->info = SPA_DEVICE_INFO_INIT();
- this->info_all = SPA_DEVICE_CHANGE_MASK_FLAGS |
+ impl->info = SPA_DEVICE_INFO_INIT();
+ impl->info_all = SPA_DEVICE_CHANGE_MASK_FLAGS |
SPA_DEVICE_CHANGE_MASK_PROPS;
- this->info.flags = 0;
+ impl->info.flags = 0;
return 0;
}
--
2.41.0

View File

@ -1,59 +0,0 @@
From 26e63ca2e1d71491cd4e459b8890607b4a4bdd83 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Fri, 18 Feb 2022 10:14:11 +0100
Subject: [PATCH] jack: allow build on old meson of jack.pc
Warn about reduced functionality.
---
pipewire-jack/src/meson.build | 32 ++++++++++++++++++++------------
1 file changed, 20 insertions(+), 12 deletions(-)
diff --git a/pipewire-jack/src/meson.build b/pipewire-jack/src/meson.build
index bb1a7f0e9..4dfae3d39 100644
--- a/pipewire-jack/src/meson.build
+++ b/pipewire-jack/src/meson.build
@@ -69,21 +69,29 @@ pipewire_jacknet = shared_library('jacknet',
if get_option('jack-devel') == true
if meson.version().version_compare('<0.59.0')
- error(
+ warning(
'''
- Before version 0.59.0 Meson creates a wrong jack pkg-config file.
- For that reason this is now an error. Please update Meson,
- if you want to have JACK development files.
+ Before version 0.59.0 Meson creates a wrong jack pkg-config file
+ for server development. Please update Meson, if you want to have
+ JACK development files for server.
''')
- endif
- pkgconfig.generate(filebase : 'jack',
- libraries : [pipewire_jack, pipewire_jackserver],
- name : 'jack',
- description : 'PipeWire JACK API',
- version : '1.9.17',
- extra_cflags : '-D_REENTRANT',
- unescaped_variables: ['server_libs=-L${libdir} -ljackserver', 'jack_implementation=pipewire'])
+ pkgconfig.generate(filebase : 'jack',
+ libraries : [pipewire_jack, pipewire_jackserver],
+ name : 'jack',
+ description : 'PipeWire JACK API',
+ version : '1.9.17',
+ extra_cflags : '-D_REENTRANT',
+ variables: ['server_libs=-L${libdir} -ljackserver', 'jack_implementation=pipewire'])
+ else
+ pkgconfig.generate(filebase : 'jack',
+ libraries : [pipewire_jack, pipewire_jackserver],
+ name : 'jack',
+ description : 'PipeWire JACK API',
+ version : '1.9.17',
+ extra_cflags : '-D_REENTRANT',
+ unescaped_variables: ['server_libs=-L${libdir} -ljackserver', 'jack_implementation=pipewire'])
+ endif
endif
if sdl_dep.found()
--
2.34.1

View File

@ -1,11 +1,12 @@
%global majorversion 0 %global majorversion 0
%global minorversion 3 %global minorversion 3
%global microversion 47 %global microversion 67
%global apiversion 0.3 %global apiversion 0.3
%global spaversion 0.2 %global spaversion 0.2
%global soversion 0 %global soversion 0
%global libversion %{soversion}.%(bash -c '((intversion = (%{minorversion} * 100) + %{microversion})); echo ${intversion}').0 %global libversion %{soversion}.%(bash -c '((intversion = (%{minorversion} * 100) + %{microversion})); echo ${intversion}').0
%global ms_version 0.4.2
# For rpmdev-bumpspec and releng automation # For rpmdev-bumpspec and releng automation
%global baserelease 2 %global baserelease 2
@ -23,7 +24,12 @@
# Build conditions for various features # Build conditions for various features
%bcond_without alsa %bcond_without alsa
%bcond_without vulkan %bcond_without vulkan
%bcond_without v4l2
%if (0%{?fedora} && 0%{?fedora} < 35)
%bcond_without media_session
%else
%bcond_with media_session
%endif
# Features disabled for RHEL 8 # Features disabled for RHEL 8
%if 0%{?rhel} && 0%{?rhel} < 9 %if 0%{?rhel} && 0%{?rhel} < 9
@ -48,6 +54,8 @@
%bcond_without libcamera_plugin %bcond_without libcamera_plugin
%endif %endif
%bcond_without v4l2
Name: pipewire Name: pipewire
Summary: Media Sharing Server Summary: Media Sharing Server
Version: %{majorversion}.%{minorversion}.%{microversion} Version: %{majorversion}.%{minorversion}.%{microversion}
@ -60,21 +68,24 @@ Source0: https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/%{git
Source0: https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/%{version}/pipewire-%{version}.tar.gz Source0: https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/%{version}/pipewire-%{version}.tar.gz
%endif %endif
%if %{with media-session}
Source1: https://gitlab.freedesktop.org/pipewire/media-session/-/archive/%{ms_version}/media-session-%{ms_version}.tar.gz
%endif
## upstream patches ## upstream patches
Patch0001: 0001-v4l2-don-t-set-inotify-on-dev.patch
## upstreamable patches ## upstreamable patches
## fedora patches ## fedora patches
%if %{with media-session}
Patch1001: 0001-Build-media-session-from-local-tarbal.patch
%endif
## rhel patches ## rhel patches
### Allow Meson < 0.59.0 to work for pipewire-jack
### N.B.: Remove this patch once Meson is upgraded in RHEL
Patch50001: pipewire-jack-allow-old-meson.patch
Patch50002: 0001-meson-drop-required-version.patch
Patch50003: 0001-Revert-treewide-meson.build-use-feature.allowed.patch
BuildRequires: gettext BuildRequires: gettext
BuildRequires: meson >= 0.49.0 BuildRequires: meson >= 0.59.0
BuildRequires: gcc BuildRequires: gcc
BuildRequires: g++ BuildRequires: g++
BuildRequires: pkgconfig BuildRequires: pkgconfig
@ -97,6 +108,7 @@ BuildRequires: pkgconfig(fdk-aac)
BuildRequires: pkgconfig(vulkan) BuildRequires: pkgconfig(vulkan)
%endif %endif
BuildRequires: pkgconfig(bluez) BuildRequires: pkgconfig(bluez)
BuildRequires: systemd
BuildRequires: systemd-devel BuildRequires: systemd-devel
BuildRequires: alsa-lib-devel BuildRequires: alsa-lib-devel
BuildRequires: libv4l-devel BuildRequires: libv4l-devel
@ -109,9 +121,19 @@ BuildRequires: ncurses-devel
BuildRequires: pulseaudio-libs-devel BuildRequires: pulseaudio-libs-devel
BuildRequires: avahi-devel BuildRequires: avahi-devel
BuildRequires: pkgconfig(webrtc-audio-processing) >= 0.2 BuildRequires: pkgconfig(webrtc-audio-processing) >= 0.2
BuildRequires: libusb-devel BuildRequires: libusb1-devel
#BuildRequires: libunwind-devel
BuildRequires: readline-devel BuildRequires: readline-devel
#BuildRequires: lilv-devel
BuildRequires: openssl-devel
BuildRequires: libcanberra-devel BuildRequires: libcanberra-devel
#BuildRequires: roc-toolkit-devel
#BuildRequires: openfec-devel
BuildRequires: libuv-devel
BuildRequires: speexdsp-devel
#BuildRequires: sox-devel
#BuildRequires: libmysofa-devel
Requires(pre): shadow-utils Requires(pre): shadow-utils
Requires: %{name}-libs%{?_isa} = %{version}-%{release} Requires: %{name}-libs%{?_isa} = %{version}-%{release}
@ -170,6 +192,24 @@ 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 %{with media_session}
%package media-session
Summary: PipeWire Media Session Manager
License: MIT
Recommends: %{name}%{?_isa} = %{version}-%{release}
Obsoletes: %{name}-libpulse < %{version}-%{release}
# before 0.3.30-5 the session manager was in the main pipewire package
Conflicts: %{name}%{?_isa} < 0.3.30-5
# Virtual Provides to support swapping between PipeWire session manager implementations
Provides: pipewire-session-manager
Conflicts: pipewire-session-manager
%description media-session
This package contains the reference Media Session Manager for the
PipeWire media server.
%endif
%if %{with alsa} %if %{with alsa}
%package alsa %package alsa
Summary: PipeWire media server ALSA support Summary: PipeWire media server ALSA support
@ -194,7 +234,6 @@ This package contains an ALSA plugin for the PipeWire media server.
Summary: PipeWire JACK implementation Summary: PipeWire JACK implementation
License: MIT License: MIT
Recommends: %{name}%{?_isa} = %{version}-%{release} Recommends: %{name}%{?_isa} = %{version}-%{release}
Requires: %{name}-libjack%{?_isa} = %{version}-%{release}
Conflicts: jack-audio-connection-kit Conflicts: jack-audio-connection-kit
Conflicts: jack-audio-connection-kit-dbus Conflicts: jack-audio-connection-kit-dbus
# Fixed jack subpackages # Fixed jack subpackages
@ -306,16 +345,32 @@ This package contains an LD_PRELOAD library that redirects v4l2 applications to
PipeWire. PipeWire.
%endif %endif
%package module-x11
Summary: PipeWire media server x11 support
License: MIT
Recommends: %{name}%{?_isa} = %{version}-%{release}
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
%description module-x11
This package contains X11 bell support for PipeWire.
%prep %prep
%autosetup -p1 %{?snapdate:-n %{name}-%{gitcommit}} %autosetup -p1 %{?snapdate:-n %{name}-%{gitcommit}}
%if %{with media-session}
mkdir subprojects/packagefiles
cp %{SOURCE1} subprojects/packagefiles/
%endif
%build %build
%meson \ %meson \
-D docs=enabled -D man=enabled -D gstreamer=enabled -D systemd=enabled \ -D docs=enabled -D man=enabled -D gstreamer=enabled -D systemd=enabled \
-D gstreamer-device-provider=disabled -D sdl2=disabled \ -D gstreamer-device-provider=disabled -D sdl2=disabled \
-D audiotestsrc=disabled -D videotestsrc=disabled \ -D audiotestsrc=disabled -D videotestsrc=disabled \
-D volume=disabled -D bluez5-codec-aptx=disabled -D roc=disabled \ -D volume=disabled -D bluez5-codec-aptx=disabled \
-D raop=disabled -D lv2=disabled \ -D bluez5-codec-lc3plus=disabled -D roc=disabled -D x11-xfixes=disabled \
-D lv2=disabled -D libmysofa=disabled \
%ifarch s390x %ifarch s390x
-D bluez5-codec-ldac=disabled \ -D bluez5-codec-ldac=disabled \
%endif %endif
@ -325,7 +380,8 @@ PipeWire.
%{!?with_libcamera_plugin:-D libcamera=disabled} \ %{!?with_libcamera_plugin:-D libcamera=disabled} \
%{?with_jack:-D jack-devel=true} \ %{?with_jack:-D jack-devel=true} \
%{!?with_alsa:-D pipewire-alsa=disabled} \ %{!?with_alsa:-D pipewire-alsa=disabled} \
%{?with_vulkan:-D vulkan=enabled} %{?with_vulkan:-D vulkan=enabled} \
%{nil}
%meson_build %meson_build
%install %install
@ -337,6 +393,10 @@ echo %{_libdir}/pipewire-%{apiversion}/jack/ > %{buildroot}%{_sysconfdir}/ld.so.
%else %else
rm %{buildroot}%{_datadir}/pipewire/jack.conf rm %{buildroot}%{_datadir}/pipewire/jack.conf
%if %{with media_session}
rm %{buildroot}%{_datadir}/pipewire/media-session.d/with-jack
%endif
%endif %endif
%if %{with alsa} %if %{with alsa}
@ -345,6 +405,11 @@ cp %{buildroot}%{_datadir}/alsa/alsa.conf.d/50-pipewire.conf \
%{buildroot}%{_sysconfdir}/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 \ cp %{buildroot}%{_datadir}/alsa/alsa.conf.d/99-pipewire-default.conf \
%{buildroot}%{_sysconfdir}/alsa/conf.d/99-pipewire-default.conf %{buildroot}%{_sysconfdir}/alsa/conf.d/99-pipewire-default.conf
%if %{with media_session}
touch %{buildroot}%{_datadir}/pipewire/media-session.d/with-alsa
%endif
%endif %endif
%if ! %{with pulse} %if ! %{with pulse}
@ -352,9 +417,17 @@ cp %{buildroot}%{_datadir}/alsa/alsa.conf.d/99-pipewire-default.conf \
rm %{buildroot}%{_bindir}/pipewire-pulse rm %{buildroot}%{_bindir}/pipewire-pulse
rm %{buildroot}%{_userunitdir}/pipewire-pulse.* rm %{buildroot}%{_userunitdir}/pipewire-pulse.*
rm %{buildroot}%{_datadir}/pipewire/pipewire-pulse.conf rm %{buildroot}%{_datadir}/pipewire/pipewire-pulse.conf
%if %{with media_session}
rm %{buildroot}%{_datadir}/pipewire/media-session.d/with-pulseaudio
%endif
%endif %endif
%find_lang %{name} %find_lang %{name}
%if %{with media_session}
%find_lang media-session
%endif
# upstream should use udev.pc # upstream should use udev.pc
mkdir -p %{buildroot}%{_prefix}/lib/udev/rules.d mkdir -p %{buildroot}%{_prefix}/lib/udev/rules.d
@ -390,23 +463,89 @@ systemctl --no-reload preset --global pipewire.socket >/dev/null 2>&1 || :
%systemd_user_post pipewire-pulse.socket %systemd_user_post pipewire-pulse.socket
%endif %endif
%if %{with media_session}
%post media-session
%systemd_user_post pipewire-media-session.service
%endif
%files %files
%license LICENSE COPYING %license LICENSE COPYING
%doc README.md %doc README.md NEWS
%{_userunitdir}/pipewire.* %{_userunitdir}/pipewire.*
%{_userunitdir}/filter-chain.*
%{_bindir}/pipewire %{_bindir}/pipewire
%{_bindir}/pipewire-avb
%{_bindir}/pipewire-aes67
%{_mandir}/man1/pipewire.1* %{_mandir}/man1/pipewire.1*
%dir %{_datadir}/pipewire/ %dir %{_datadir}/pipewire/
%{_datadir}/pipewire/pipewire.conf %{_datadir}/pipewire/pipewire.conf
%{_datadir}/pipewire/minimal.conf %{_datadir}/pipewire/minimal.conf
%{_datadir}/pipewire/filter-chain.conf
%{_datadir}/pipewire/filter-chain/*.conf %{_datadir}/pipewire/filter-chain/*.conf
%{_datadir}/pipewire/pipewire-avb.conf
%{_datadir}/pipewire/pipewire-aes67.conf
%{_mandir}/man5/pipewire.conf.5* %{_mandir}/man5/pipewire.conf.5*
%config(noreplace) %{_sysconfdir}/security/limits.d/*.conf
%if %{with media_session}
%files media-session -f media-session.lang
%{_bindir}/pipewire-media-session
%{_userunitdir}/pipewire-media-session.service
%dir %{_datadir}/pipewire/media-session.d/
%{_datadir}/pipewire/media-session.d/alsa-monitor.conf
%{_datadir}/pipewire/media-session.d/bluez-monitor.conf
%{_datadir}/pipewire/media-session.d/media-session.conf
%{_datadir}/pipewire/media-session.d/v4l2-monitor.conf
%if %{with alsa}
%{_datadir}/pipewire/media-session.d/with-alsa
%endif
%if %{with jack}
%{_datadir}/pipewire/media-session.d/with-jack
%endif
%if %{with pulse}
%{_datadir}/pipewire/media-session.d/with-pulseaudio
%endif
%endif
%files libs -f %{name}.lang %files libs -f %{name}.lang
%license LICENSE COPYING %license LICENSE COPYING
%doc README.md %doc README.md
%{_libdir}/libpipewire-%{apiversion}.so.* %{_libdir}/libpipewire-%{apiversion}.so.*
%{_libdir}/pipewire-%{apiversion}/libpipewire-*.so %{_libdir}/pipewire-%{apiversion}/libpipewire-module-access.so
%{_libdir}/pipewire-%{apiversion}/libpipewire-module-adapter.so
%{_libdir}/pipewire-%{apiversion}/libpipewire-module-avb.so
%{_libdir}/pipewire-%{apiversion}/libpipewire-module-client-device.so
%{_libdir}/pipewire-%{apiversion}/libpipewire-module-client-node.so
%{_libdir}/pipewire-%{apiversion}/libpipewire-module-combine-stream.so
%{_libdir}/pipewire-%{apiversion}/libpipewire-module-echo-cancel.so
%{_libdir}/pipewire-%{apiversion}/libpipewire-module-fallback-sink.so
%{_libdir}/pipewire-%{apiversion}/libpipewire-module-filter-chain.so
%{_libdir}/pipewire-%{apiversion}/libpipewire-module-link-factory.so
%{_libdir}/pipewire-%{apiversion}/libpipewire-module-loopback.so
%{_libdir}/pipewire-%{apiversion}/libpipewire-module-metadata.so
%{_libdir}/pipewire-%{apiversion}/libpipewire-module-pipe-tunnel.so
%{_libdir}/pipewire-%{apiversion}/libpipewire-module-portal.so
%{_libdir}/pipewire-%{apiversion}/libpipewire-module-profiler.so
%{_libdir}/pipewire-%{apiversion}/libpipewire-module-protocol-native.so
%{_libdir}/pipewire-%{apiversion}/libpipewire-module-protocol-pulse.so
%{_libdir}/pipewire-%{apiversion}/libpipewire-module-protocol-simple.so
%{_libdir}/pipewire-%{apiversion}/libpipewire-module-pulse-tunnel.so
%{_libdir}/pipewire-%{apiversion}/libpipewire-module-raop-discover.so
%{_libdir}/pipewire-%{apiversion}/libpipewire-module-raop-sink.so
#%{_libdir}/pipewire-%{apiversion}/libpipewire-module-roc-sink.so
#%{_libdir}/pipewire-%{apiversion}/libpipewire-module-roc-source.so
%{_libdir}/pipewire-%{apiversion}/libpipewire-module-rtkit.so
%{_libdir}/pipewire-%{apiversion}/libpipewire-module-rtp-sink.so
%{_libdir}/pipewire-%{apiversion}/libpipewire-module-rtp-source.so
%{_libdir}/pipewire-%{apiversion}/libpipewire-module-rt.so
%{_libdir}/pipewire-%{apiversion}/libpipewire-module-session-manager.so
%{_libdir}/pipewire-%{apiversion}/libpipewire-module-spa-device-factory.so
%{_libdir}/pipewire-%{apiversion}/libpipewire-module-spa-device.so
%{_libdir}/pipewire-%{apiversion}/libpipewire-module-spa-node-factory.so
%{_libdir}/pipewire-%{apiversion}/libpipewire-module-spa-node.so
%{_libdir}/pipewire-%{apiversion}/libpipewire-module-zeroconf-discover.so
%dir %{_datadir}/alsa-card-profile/ %dir %{_datadir}/alsa-card-profile/
%dir %{_datadir}/alsa-card-profile/mixer/ %dir %{_datadir}/alsa-card-profile/mixer/
%{_datadir}/alsa-card-profile/mixer/paths/ %{_datadir}/alsa-card-profile/mixer/paths/
@ -419,6 +558,7 @@ systemctl --no-reload preset --global pipewire.socket >/dev/null 2>&1 || :
%{_libdir}/spa-%{spaversion}/alsa/ %{_libdir}/spa-%{spaversion}/alsa/
%{_libdir}/spa-%{spaversion}/audioconvert/ %{_libdir}/spa-%{spaversion}/audioconvert/
%{_libdir}/spa-%{spaversion}/audiomixer/ %{_libdir}/spa-%{spaversion}/audiomixer/
%{_libdir}/spa-%{spaversion}/avb/
%{_libdir}/spa-%{spaversion}/bluez5/ %{_libdir}/spa-%{spaversion}/bluez5/
%{_libdir}/spa-%{spaversion}/control/ %{_libdir}/spa-%{spaversion}/control/
%{_libdir}/spa-%{spaversion}/support/ %{_libdir}/spa-%{spaversion}/support/
@ -441,6 +581,7 @@ systemctl --no-reload preset --global pipewire.socket >/dev/null 2>&1 || :
%{_libdir}/pkgconfig/libspa-%{spaversion}.pc %{_libdir}/pkgconfig/libspa-%{spaversion}.pc
%files doc %files doc
%doc README.md NEWS
%{_datadir}/doc/pipewire/html %{_datadir}/doc/pipewire/html
%files utils %files utils
@ -454,6 +595,7 @@ systemctl --no-reload preset --global pipewire.socket >/dev/null 2>&1 || :
%{_bindir}/pw-dot %{_bindir}/pw-dot
%{_bindir}/pw-cat %{_bindir}/pw-cat
%{_bindir}/pw-dump %{_bindir}/pw-dump
%{_bindir}/pw-encplay
%{_bindir}/pw-link %{_bindir}/pw-link
%{_bindir}/pw-loopback %{_bindir}/pw-loopback
%{_bindir}/pw-play %{_bindir}/pw-play
@ -465,9 +607,11 @@ systemctl --no-reload preset --global pipewire.socket >/dev/null 2>&1 || :
%{_mandir}/man1/pw-cli.1* %{_mandir}/man1/pw-cli.1*
%{_mandir}/man1/pw-cat.1* %{_mandir}/man1/pw-cat.1*
%{_mandir}/man1/pw-dot.1* %{_mandir}/man1/pw-dot.1*
%{_mandir}/man1/pw-link.1*
%{_mandir}/man1/pw-metadata.1* %{_mandir}/man1/pw-metadata.1*
%{_mandir}/man1/pw-mididump.1* %{_mandir}/man1/pw-mididump.1*
%{_mandir}/man1/pw-profiler.1* %{_mandir}/man1/pw-profiler.1*
%{_mandir}/man1/pw-top.1*
%{_bindir}/spa-acp-tool %{_bindir}/spa-acp-tool
%{_bindir}/spa-inspect %{_bindir}/spa-inspect
@ -527,7 +671,18 @@ systemctl --no-reload preset --global pipewire.socket >/dev/null 2>&1 || :
%{_libdir}/pipewire-%{apiversion}/v4l2/libpw-v4l2.so %{_libdir}/pipewire-%{apiversion}/v4l2/libpw-v4l2.so
%endif %endif
%files module-x11
%{_libdir}/pipewire-%{apiversion}/libpipewire-module-x11-bell.so
%changelog %changelog
* Tue Aug 01 2023 Wim Taymans <wtaymans@redhat.com> - 0.3.67-2
- Add patch for removing inotify on /dev
- Resolves: rhbz#2221868
* Wed Mar 22 2023 Wim Taymans <wtaymans@redhat.com> - 0.3.67-1
- Update to 0.3.67
- Resolves: rhbz#2176829
* Fri Mar 11 2022 Wim Taymans <wtaymans@redhat.com> - 0.3.47-2 * Fri Mar 11 2022 Wim Taymans <wtaymans@redhat.com> - 0.3.47-2
- Add pulseaudio-utils as Requires for pipewire-pulseaudio - Add pulseaudio-utils as Requires for pipewire-pulseaudio
Resolves: rhbz#2059874 Resolves: rhbz#2059874