From e6bc86c41dedaf74bfbeebda6bc9156e75db84f5 Mon Sep 17 00:00:00 2001 From: Renbo Date: Wed, 22 May 2024 14:13:52 +0800 Subject: [PATCH 1/5] update to pipewire-1.0.1-1 Signed-off-by: Renbo --- ...iresrc-Let-GstBaseSrc-handle-pseudo-.patch | 132 ++++ 0001-v4l2-don-t-set-inotify-on-dev.patch | 619 ---------------- 1000-fix-readline-dependence-find.patch | 11 - dist | 2 +- download | 2 +- pipewire.spec | 671 +++++++++++------- pipewire.sysusers | 2 + 7 files changed, 542 insertions(+), 897 deletions(-) create mode 100644 0001-Revert-gst-pipewiresrc-Let-GstBaseSrc-handle-pseudo-.patch delete mode 100644 0001-v4l2-don-t-set-inotify-on-dev.patch delete mode 100644 1000-fix-readline-dependence-find.patch create mode 100644 pipewire.sysusers diff --git a/0001-Revert-gst-pipewiresrc-Let-GstBaseSrc-handle-pseudo-.patch b/0001-Revert-gst-pipewiresrc-Let-GstBaseSrc-handle-pseudo-.patch new file mode 100644 index 0000000..2c692e0 --- /dev/null +++ b/0001-Revert-gst-pipewiresrc-Let-GstBaseSrc-handle-pseudo-.patch @@ -0,0 +1,132 @@ +From 18bd53043435f3d32d6eee871dcd23017239ef70 Mon Sep 17 00:00:00 2001 +From: Wim Taymans +Date: Fri, 19 Jan 2024 12:53:39 +0100 +Subject: [PATCH] Revert "gst/pipewiresrc: Let GstBaseSrc handle pseudo-live + calculations" + +This reverts commit 004206db370f4244411ffc16135d51d021809df8. +--- + src/gst/gstpipewiresrc.c | 66 +++++++++++++++------------------------- + 1 file changed, 24 insertions(+), 42 deletions(-) + +diff --git a/src/gst/gstpipewiresrc.c b/src/gst/gstpipewiresrc.c +index d95e99620..753bf760a 100644 +--- a/src/gst/gstpipewiresrc.c ++++ b/src/gst/gstpipewiresrc.c +@@ -91,8 +91,6 @@ static gboolean gst_pipewire_src_start (GstBaseSrc * basesrc); + static gboolean gst_pipewire_src_stop (GstBaseSrc * basesrc); + static gboolean gst_pipewire_src_event (GstBaseSrc * src, GstEvent * event); + static gboolean gst_pipewire_src_query (GstBaseSrc * src, GstQuery * query); +-static void gst_pipewire_src_get_times (GstBaseSrc * basesrc, GstBuffer * buffer, +- GstClockTime * start, GstClockTime * end); + + static void + gst_pipewire_src_set_property (GObject * object, guint prop_id, +@@ -415,7 +413,6 @@ gst_pipewire_src_class_init (GstPipeWireSrcClass * klass) + gstbasesrc_class->stop = gst_pipewire_src_stop; + gstbasesrc_class->event = gst_pipewire_src_event; + gstbasesrc_class->query = gst_pipewire_src_query; +- gstbasesrc_class->get_times = gst_pipewire_src_get_times; + gstpushsrc_class->create = gst_pipewire_src_create; + + GST_DEBUG_CATEGORY_INIT (pipewire_src_debug, "pipewiresrc", 0, +@@ -581,7 +578,7 @@ static GstBuffer *dequeue_buffer(GstPipeWireSrc *pwsrc) + GST_LOG_OBJECT (pwsrc, "pts %" G_GUINT64_FORMAT ", dts_offset %" G_GUINT64_FORMAT, h->pts, h->dts_offset); + + if (GST_CLOCK_TIME_IS_VALID (h->pts)) { +- GST_BUFFER_PTS (buf) = h->pts; ++ GST_BUFFER_PTS (buf) = h->pts + GST_PIPEWIRE_CLOCK (pwsrc->clock)->time_offset; + if (GST_BUFFER_PTS (buf) + h->dts_offset > 0) + GST_BUFFER_DTS (buf) = GST_BUFFER_PTS (buf) + h->dts_offset; + } +@@ -1136,39 +1133,11 @@ gst_pipewire_src_query (GstBaseSrc * src, GstQuery * query) + return res; + } + +-static void +-gst_pipewire_src_get_times (GstBaseSrc * basesrc, GstBuffer * buffer, +- GstClockTime * start, GstClockTime * end) +-{ +- GstPipeWireSrc *pwsrc = GST_PIPEWIRE_SRC (basesrc); +- +- /* for live sources, sync on the timestamp of the buffer */ +- if (gst_base_src_is_live (basesrc)) { +- GstClockTime timestamp = GST_BUFFER_PTS (buffer); +- +- if (GST_CLOCK_TIME_IS_VALID (timestamp)) { +- /* get duration to calculate end time */ +- GstClockTime duration = GST_BUFFER_DURATION (buffer); +- +- if (GST_CLOCK_TIME_IS_VALID (duration)) { +- *end = timestamp + duration; +- } +- *start = timestamp; +- } +- } else { +- *start = GST_CLOCK_TIME_NONE; +- *end = GST_CLOCK_TIME_NONE; +- } +- +- GST_LOG_OBJECT (pwsrc, "start %" GST_TIME_FORMAT " (%" G_GUINT64_FORMAT +- "), end %" GST_TIME_FORMAT " (%" G_GUINT64_FORMAT ")", +- GST_TIME_ARGS (*start), *start, GST_TIME_ARGS (*end), *end); +-} +- + static GstFlowReturn + gst_pipewire_src_create (GstPushSrc * psrc, GstBuffer ** buffer) + { + GstPipeWireSrc *pwsrc; ++ GstClockTime pts, dts, base_time; + const char *error = NULL; + GstBuffer *buf; + gboolean update_time = FALSE, timeout = FALSE; +@@ -1247,24 +1216,37 @@ gst_pipewire_src_create (GstPushSrc * psrc, GstBuffer ** buffer) + + *buffer = buf; + +- if (update_time) { +- GstClock *clock; +- GstClockTime pts, dts; ++ if (pwsrc->is_live) ++ base_time = GST_ELEMENT_CAST (psrc)->base_time; ++ else ++ base_time = 0; + +- clock = gst_element_get_clock (GST_ELEMENT_CAST (pwsrc)); ++ if (update_time) { ++ GstClock *clock = gst_element_get_clock (GST_ELEMENT_CAST (pwsrc)); + if (clock != NULL) { + pts = dts = gst_clock_get_time (clock); + gst_object_unref (clock); + } else { + pts = dts = GST_CLOCK_TIME_NONE; + } ++ } else { ++ pts = GST_BUFFER_PTS (*buffer); ++ dts = GST_BUFFER_DTS (*buffer); ++ } + +- GST_BUFFER_PTS (*buffer) = pts; +- GST_BUFFER_DTS (*buffer) = dts; ++ if (GST_CLOCK_TIME_IS_VALID (pts)) ++ pts = (pts >= base_time ? pts - base_time : 0); ++ if (GST_CLOCK_TIME_IS_VALID (dts)) ++ dts = (dts >= base_time ? dts - base_time : 0); + +- GST_LOG_OBJECT (pwsrc, "Sending keepalive buffer pts/dts: %" GST_TIME_FORMAT +- " (%" G_GUINT64_FORMAT ")", GST_TIME_ARGS (pts), pts); +- } ++ GST_LOG_OBJECT (pwsrc, ++ "pts %" G_GUINT64_FORMAT ", dts %" G_GUINT64_FORMAT ++ ", base-time %" GST_TIME_FORMAT " -> %" GST_TIME_FORMAT ", %" GST_TIME_FORMAT, ++ GST_BUFFER_PTS (*buffer), GST_BUFFER_DTS (*buffer), GST_TIME_ARGS (base_time), ++ GST_TIME_ARGS (pts), GST_TIME_ARGS (dts)); ++ ++ GST_BUFFER_PTS (*buffer) = pts; ++ GST_BUFFER_DTS (*buffer) = dts; + + return GST_FLOW_OK; + +-- +2.43.0 + diff --git a/0001-v4l2-don-t-set-inotify-on-dev.patch b/0001-v4l2-don-t-set-inotify-on-dev.patch deleted file mode 100644 index f72abf9..0000000 --- a/0001-v4l2-don-t-set-inotify-on-dev.patch +++ /dev/null @@ -1,619 +0,0 @@ -From d64136204aa986774910a89fec7b2a3ff9ca4e6d Mon Sep 17 00:00:00 2001 -From: Wim Taymans -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 - diff --git a/1000-fix-readline-dependence-find.patch b/1000-fix-readline-dependence-find.patch deleted file mode 100644 index 08c9d3c..0000000 --- a/1000-fix-readline-dependence-find.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- pipewire-0.3.67/meson.build.orig 2024-01-12 14:42:44.047801137 +0800 -+++ pipewire-0.3.67/meson.build 2024-01-12 14:43:06.409967768 +0800 -@@ -262,7 +262,7 @@ - sdl_dep = dependency('sdl2', required : get_option('sdl2')) - summary({'SDL2 (video examples)': sdl_dep.found()}, bool_yn: true, section: 'Misc dependencies') - drm_dep = dependency('libdrm', required : false) --readline_dep = dependency('readline', required : get_option('readline')) -+readline_dep = dependency('readline', required : false) - - if not readline_dep.found() - readline_dep = cc.find_library('readline', required : get_option('readline')) diff --git a/dist b/dist index 573541a..89c1faf 100644 --- a/dist +++ b/dist @@ -1 +1 @@ -0 +an9 diff --git a/download b/download index e69aebf..6defe7a 100644 --- a/download +++ b/download @@ -1 +1 @@ -c3f399f63b6a520fce5f25ab7b9c9e1f pipewire-0.3.67.tar.gz +2d67349ca5755903c009ade732debc99 pipewire-1.0.1.tar.gz diff --git a/pipewire.spec b/pipewire.spec index 1edbb8c..beff04a 100644 --- a/pipewire.spec +++ b/pipewire.spec @@ -1,7 +1,6 @@ -%define anolis_release .0.1 -%global majorversion 0 -%global minorversion 3 -%global microversion 67 +%global majorversion 1 +%global minorversion 0 +%global microversion 1 %global apiversion 0.3 %global spaversion 0.2 @@ -10,7 +9,7 @@ %global ms_version 0.4.2 # For rpmdev-bumpspec and releng automation -%global baserelease 2 +%global baserelease 1 #global snapdate 20210107 #global gitcommit b17db2cebc1a5ab2c01851d29c05f79cd2f262bb @@ -26,12 +25,6 @@ %bcond_without alsa %bcond_without vulkan -%if (0%{?fedora} && 0%{?fedora} < 35) -%bcond_without media_session -%else -%bcond_with media_session -%endif - # Features disabled for RHEL 8 %if 0%{?rhel} && 0%{?rhel} < 9 %bcond_with pulse @@ -44,12 +37,27 @@ # Features disabled for RHEL %if 0%{?rhel} %bcond_with jackserver_plugin +%bcond_with libmysofa +%bcond_with lc3 +%bcond_with lv2 +%bcond_with roc %else %bcond_without jackserver_plugin +%bcond_without libmysofa +%bcond_without lc3 +%bcond_without lv2 +#bcond_without roc +%bcond_with roc +%endif + +%if 0%{?rhel} || ("%{_arch}" == "s390x") +%bcond_with ffado +%else +%bcond_without ffado %endif -# Disabled for RHEL < 10 and Fedora < 36 -%if (0%{?rhel} && 0%{?rhel} < 10) || (0%{?fedora} && 0%{?fedora} < 36) +# Disabled for RHEL < 11 and Fedora < 36 +%if (0%{?rhel} && 0%{?rhel} < 11) || (0%{?fedora} && 0%{?fedora} < 36) || ("%{_arch}" == "s390x") || ("%{_arch}" == "ppc64le") %bcond_with libcamera_plugin %else %bcond_without libcamera_plugin @@ -57,176 +65,142 @@ %bcond_without v4l2 -Name: pipewire -Summary: Media Sharing Server -Version: %{majorversion}.%{minorversion}.%{microversion} -Release: %{baserelease}%{?snapdate:.%{snapdate}git%{shortcommit}}%{anolis_release}%{?dist} -License: MIT -URL: https://pipewire.org/ +Name: pipewire +Summary: Media Sharing Server +Version: %{majorversion}.%{minorversion}.%{microversion} +Release: %{baserelease}%{?snapdate:.%{snapdate}git%{shortcommit}}%{?dist} +License: MIT +URL: https://pipewire.org/ %if 0%{?snapdate} -Source0: https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/%{gitcommit}/pipewire-%{shortcommit}.tar.gz +Source0: https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/%{gitcommit}/pipewire-%{shortcommit}.tar.gz %else -Source0: https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/%{version}/pipewire-%{version}.tar.gz -%endif - -%if %{with media-session} -Source1: https://gitlab.freedesktop.org/pipewire/media-session/-/archive/%{ms_version}/media-session-%{ms_version}.tar.gz +Source0: https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/%{version}/pipewire-%{version}.tar.gz %endif +Source1: pipewire.sysusers ## upstream patches -Patch0001: 0001-v4l2-don-t-set-inotify-on-dev.patch +Patch0001: 0001-Revert-gst-pipewiresrc-Let-GstBaseSrc-handle-pseudo-.patch ## upstreamable patches -## fedora patches -%if %{with media-session} -Patch1001: 0001-Build-media-session-from-local-tarbal.patch -%endif - -Patch1002: 1000-fix-readline-dependence-find.patch - ## rhel patches -BuildRequires: gettext -BuildRequires: meson >= 0.59.0 -BuildRequires: gcc -BuildRequires: gcc-c++ -BuildRequires: pkgconfig -BuildRequires: pkgconfig(libudev) -BuildRequires: pkgconfig(dbus-1) -BuildRequires: pkgconfig(glib-2.0) >= 2.32 -BuildRequires: pkgconfig(gio-unix-2.0) >= 2.32 -BuildRequires: pkgconfig(gstreamer-1.0) >= 1.10.0 -BuildRequires: pkgconfig(gstreamer-base-1.0) >= 1.10.0 -BuildRequires: pkgconfig(gstreamer-plugins-base-1.0) >= 1.10.0 -BuildRequires: pkgconfig(gstreamer-net-1.0) >= 1.10.0 -BuildRequires: pkgconfig(gstreamer-allocators-1.0) >= 1.10.0 +BuildRequires: gettext +BuildRequires: meson >= 0.59.0 +BuildRequires: gcc +BuildRequires: g++ +BuildRequires: pkgconfig +BuildRequires: pkgconfig(libudev) +BuildRequires: pkgconfig(dbus-1) +BuildRequires: pkgconfig(glib-2.0) >= 2.32 +BuildRequires: pkgconfig(gio-unix-2.0) >= 2.32 +BuildRequires: pkgconfig(gstreamer-1.0) >= 1.10.0 +BuildRequires: pkgconfig(gstreamer-base-1.0) >= 1.10.0 +BuildRequires: pkgconfig(gstreamer-plugins-base-1.0) >= 1.10.0 +BuildRequires: pkgconfig(gstreamer-net-1.0) >= 1.10.0 +BuildRequires: pkgconfig(gstreamer-allocators-1.0) >= 1.10.0 # libldac is not built on x390x, see rhbz#1677491 %ifnarch s390x -BuildRequires: pkgconfig(ldacBT-enc) -BuildRequires: pkgconfig(ldacBT-abr) +BuildRequires: pkgconfig(ldacBT-enc) +BuildRequires: pkgconfig(ldacBT-abr) %endif -BuildRequires: pkgconfig(fdk-aac) -%if %{with vulkan} -BuildRequires: pkgconfig(vulkan) +BuildRequires: pkgconfig(fdk-aac) +BuildRequires: pkgconfig(bluez) +BuildRequires: systemd +BuildRequires: systemd-devel +BuildRequires: alsa-lib-devel +BuildRequires: libv4l-devel +BuildRequires: doxygen +BuildRequires: python-docutils +BuildRequires: graphviz +BuildRequires: sbc-devel +%if %{with lc3} +BuildRequires: liblc3-devel %endif -BuildRequires: pkgconfig(bluez) -BuildRequires: systemd -BuildRequires: systemd-devel -BuildRequires: alsa-lib-devel -BuildRequires: libv4l-devel -BuildRequires: doxygen -BuildRequires: python3-docutils -BuildRequires: graphviz -BuildRequires: sbc-devel -BuildRequires: libsndfile-devel -BuildRequires: ncurses-devel -BuildRequires: pulseaudio-libs-devel -BuildRequires: avahi-devel -BuildRequires: pkgconfig(webrtc-audio-processing) >= 0.2 -BuildRequires: libusb1-devel -#BuildRequires: libunwind-devel -BuildRequires: readline-devel -#BuildRequires: lilv-devel -BuildRequires: openssl-devel -BuildRequires: libcanberra-devel -#BuildRequires: roc-toolkit-devel -#BuildRequires: openfec-devel -BuildRequires: libuv-devel -BuildRequires: speexdsp-devel -#BuildRequires: sox-devel -#BuildRequires: libmysofa-devel -BuildRequires: opus-devel - +BuildRequires: libsndfile-devel +BuildRequires: ncurses-devel +BuildRequires: pulseaudio-libs-devel +BuildRequires: avahi-devel +BuildRequires: pkgconfig(webrtc-audio-processing) >= 0.2 +BuildRequires: libusb1-devel +BuildRequires: readline-devel +BuildRequires: openssl-devel +BuildRequires: libcanberra-devel +BuildRequires: libuv-devel +BuildRequires: speexdsp-devel +BuildRequires: systemd-rpm-macros +%{?sysusers_requires_compat} Requires(pre): shadow-utils -Requires: %{name}-libs%{?_isa} = %{version}-%{release} -Requires: systemd -Requires: rtkit +Requires: %{name}-libs%{?_isa} = %{version}-%{release} +Requires: systemd +Requires: rtkit # A virtual Provides so we can swap session managers -# Requires: pipewire-session-manager +Requires: pipewire-session-manager # Prefer WirePlumber for session manager -Suggests: wireplumber +Suggests: wireplumber %description PipeWire is a multimedia server for Linux and other Unix like operating systems. %package libs -Summary: Libraries for PipeWire clients -License: MIT -Recommends: %{name}%{?_isa} = %{version}-%{release} -Obsoletes: %{name}-libpulse < %{version}-%{release} +Summary: Libraries for PipeWire clients +License: MIT +Recommends: %{name}%{?_isa} = %{version}-%{release} +Obsoletes: %{name}-libpulse < %{version}-%{release} %description libs This package contains the runtime libraries for any application that wishes to interface with a PipeWire media server. %package gstreamer -Summary: GStreamer elements for PipeWire -License: MIT -Recommends: %{name}%{?_isa} = %{version}-%{release} -Requires: %{name}-libs%{?_isa} = %{version}-%{release} +Summary: GStreamer elements for PipeWire +License: MIT +Recommends: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}-libs%{?_isa} = %{version}-%{release} %description gstreamer This package contains GStreamer elements to interface with a PipeWire media server. %package devel -Summary: Headers and libraries for PipeWire client development -License: MIT -Requires: %{name}-libs%{?_isa} = %{version}-%{release} +Summary: Headers and libraries for PipeWire client development +License: MIT +Requires: %{name}-libs%{?_isa} = %{version}-%{release} %description devel Headers and libraries for developing applications that can communicate with a PipeWire media server. %package doc -Summary: PipeWire media server documentation -License: MIT +Summary: PipeWire media server documentation +License: MIT %description doc This package contains documentation for the PipeWire media server. %package utils -Summary: PipeWire media server utilities -License: MIT -Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: %{name}-libs%{?_isa} = %{version}-%{release} +Summary: PipeWire media server utilities +License: MIT +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}-libs%{?_isa} = %{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 -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} %package alsa -Summary: PipeWire media server ALSA support -License: MIT -Recommends: %{name}%{?_isa} = %{version}-%{release} -Requires: %{name}-libs%{?_isa} = %{version}-%{release} +Summary: PipeWire media server ALSA support +License: MIT +Recommends: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}-libs%{?_isa} = %{version}-%{release} %if ! (0%{?fedora} && 0%{?fedora} < 34) # Ensure this is provided by default to route all audio -Supplements: %{name} = %{version}-%{release} +Supplements: %{name} = %{version}-%{release} # Replace PulseAudio and JACK ALSA plugins with PipeWire ## N.B.: If alsa-plugins gets updated in F33, this will need to be bumped -Obsoletes: alsa-plugins-jack < 1.2.2-5 -Obsoletes: alsa-plugins-pulseaudio < 1.2.2-5 +Obsoletes: alsa-plugins-jack < 1.2.2-5 +Obsoletes: alsa-plugins-pulseaudio < 1.2.2-5 %endif %description alsa @@ -234,36 +208,49 @@ This package contains an ALSA plugin for the PipeWire media server. %endif %if %{with jack} -%package jack-audio-connection-kit -Summary: PipeWire JACK implementation -License: MIT -Recommends: %{name}%{?_isa} = %{version}-%{release} -Conflicts: jack-audio-connection-kit -Conflicts: jack-audio-connection-kit-dbus +%package jack-audio-connection-kit-libs +Summary: PipeWire JACK implementation libraries +License: MIT +Recommends: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}-libs%{?_isa} = %{version}-%{release} # Fixed jack subpackages -Conflicts: %{name}-libjack < 0.3.13-6 -Conflicts: %{name}-jack-audio-connection-kit < 0.3.13-6 +Conflicts: %{name}-libjack < 0.3.13-6 +Conflicts: %{name}-jack-audio-connection-kit < 0.3.72-1 +# Replaces libjack subpackage +Obsoletes: %{name}-libjack < 0.3.19-2 +Provides: %{name}-libjack = %{version}-%{release} +Provides: %{name}-libjack%{?_isa} = %{version}-%{release} + +%description jack-audio-connection-kit-libs +This package provides a JACK implementation libraries based on PipeWire + +%package jack-audio-connection-kit +Summary: PipeWire JACK implementation +License: MIT +Recommends: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}-jack-audio-connection-kit-libs%{?_isa} = %{version}-%{release} +Conflicts: jack-audio-connection-kit +Conflicts: jack-audio-connection-kit-dbus # Replaces libjack subpackage -Obsoletes: %{name}-libjack < 0.3.19-2 -Provides: %{name}-libjack = %{version}-%{release} -Provides: %{name}-libjack%{?_isa} = %{version}-%{release} %if ! (0%{?fedora} && 0%{?fedora} < 34) # Ensure this is provided by default to route all audio -Supplements: %{name} = %{version}-%{release} +Supplements: %{name} = %{version}-%{release} # Replace JACK with PipeWire-JACK ## N.B.: If jack gets updated in F33, this will need to be bumped -Obsoletes: jack-audio-connection-kit < 1.9.16-2 +Obsoletes: jack-audio-connection-kit < 1.9.16-2 +# Fix upgrade path to f38, see #2203789 +Obsoletes: jack-audio-connection-kit-example-clients < 1.9.22 %endif %description jack-audio-connection-kit This package provides a JACK implementation based on PipeWire %package jack-audio-connection-kit-devel -Summary: Development files for %{name}-jack-audio-connection-kit -License: MIT -Requires: %{name}-jack-audio-connection-kit%{?_isa} = %{version}-%{release} -Conflicts: jack-audio-connection-kit-devel -Enhances: %{name}-jack-audio-connection-kit +Summary: Development files for %{name}-jack-audio-connection-kit +License: MIT +Requires: %{name}-jack-audio-connection-kit-libs%{?_isa} = %{version}-%{release} +Conflicts: jack-audio-connection-kit-devel +Enhances: %{name}-jack-audio-connection-kit-libs %description jack-audio-connection-kit-devel This package provides development files for building JACK applications @@ -272,12 +259,13 @@ using PipeWire's JACK library. %if %{with jackserver_plugin} %package plugin-jack -Summary: PipeWire media server JACK support -License: MIT -BuildRequires: jack-audio-connection-kit-devel -Recommends: %{name}%{?_isa} = %{version}-%{release} -Requires: %{name}-libs%{?_isa} = %{version}-%{release} -Requires: jack-audio-connection-kit +Summary: PipeWire media server JACK support +License: MIT +BuildRequires: jack-audio-connection-kit-devel +Recommends: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}-jack-audio-connection-kit-libs = %{version}-%{release} +Requires: %{name}-libs%{?_isa} = %{version}-%{release} +Requires: jack-audio-connection-kit %description plugin-jack This package contains the PipeWire spa plugin to connect to a JACK server. @@ -285,53 +273,63 @@ This package contains the PipeWire spa plugin to connect to a JACK server. %if %{with libcamera_plugin} %package plugin-libcamera -Summary: PipeWire media server libcamera support -License: MIT -BuildRequires: libcamera-devel -BuildRequires: libdrm-devel -Recommends: %{name}%{?_isa} = %{version}-%{release} -Requires: %{name}-libs%{?_isa} = %{version}-%{release} -Requires: libcamera -Requires: libdrm +Summary: PipeWire media server libcamera support +License: MIT +BuildRequires: libcamera-devel +BuildRequires: libdrm-devel +Recommends: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}-libs%{?_isa} = %{version}-%{release} +Requires: libcamera +Requires: libdrm %description plugin-libcamera This package contains the PipeWire spa plugin to access cameras through libcamera. %endif +%if %{with vulkan} +%package plugin-vulkan +Summary: PipeWire media server vulkan support +License: MIT +BuildRequires: pkgconfig(vulkan) +Recommends: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}-libs%{?_isa} = %{version}-%{release} + +%description plugin-vulkan +This package contains the PipeWire spa plugin for vulkan. +%endif + %if %{with pulse} %package pulseaudio -Summary: PipeWire PulseAudio implementation -License: MIT -Recommends: %{name}%{?_isa} = %{version}-%{release} -Requires: %{name}-libs%{?_isa} = %{version}-%{release} -Requires: pulseaudio-utils -BuildRequires: pulseaudio-libs -Conflicts: pulseaudio +Summary: PipeWire PulseAudio implementation +License: MIT +Recommends: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}-libs%{?_isa} = %{version}-%{release} +Conflicts: pulseaudio # Fixed pulseaudio subpackages -Conflicts: %{name}-libpulse < 0.3.13-6 -Conflicts: %{name}-pulseaudio < 0.3.13-6 +Conflicts: %{name}-libpulse < 0.3.13-6 +Conflicts: %{name}-pulseaudio < 0.3.13-6 %if ! (0%{?fedora} && 0%{?fedora} < 34) # Ensure this is provided by default to route all audio -Supplements: %{name} = %{version}-%{release} +Supplements: %{name} = %{version}-%{release} # Replace PulseAudio with PipeWire-PulseAudio ## N.B.: If pulseaudio gets updated in F33, this will need to be bumped -Obsoletes: pulseaudio < 14.2-3 -Obsoletes: pulseaudio-esound-compat < 14.2-3 -Obsoletes: pulseaudio-module-bluetooth < 14.2-3 -Obsoletes: pulseaudio-module-gconf < 14.2-3 -Obsoletes: pulseaudio-module-gsettings < 14.2-3 -Obsoletes: pulseaudio-module-jack < 14.2-3 -Obsoletes: pulseaudio-module-lirc < 14.2-3 -Obsoletes: pulseaudio-module-x11 < 14.2-3 -Obsoletes: pulseaudio-module-zeroconf < 14.2-3 -Obsoletes: pulseaudio-qpaeq < 14.2-3 +Obsoletes: pulseaudio < 14.2-3 +Obsoletes: pulseaudio-esound-compat < 14.2-3 +Obsoletes: pulseaudio-module-bluetooth < 14.2-3 +Obsoletes: pulseaudio-module-gconf < 14.2-3 +Obsoletes: pulseaudio-module-gsettings < 14.2-3 +Obsoletes: pulseaudio-module-jack < 14.2-3 +Obsoletes: pulseaudio-module-lirc < 14.2-3 +Obsoletes: pulseaudio-module-x11 < 14.2-3 +Obsoletes: pulseaudio-module-zeroconf < 14.2-3 +Obsoletes: pulseaudio-qpaeq < 14.2-3 %endif # Virtual Provides to support swapping between PipeWire-PA and PA -Provides: pulseaudio-daemon -Conflicts: pulseaudio-daemon -Provides: pulseaudio-module-bluetooth -Provides: pulseaudio-module-jack +Provides: pulseaudio-daemon +Conflicts: pulseaudio-daemon +Provides: pulseaudio-module-bluetooth +Provides: pulseaudio-module-jack %description pulseaudio This package provides a PulseAudio implementation based on PipeWire @@ -339,10 +337,10 @@ This package provides a PulseAudio implementation based on PipeWire %if %{with v4l2} %package v4l2 -Summary: PipeWire media server v4l2 LD_PRELOAD support -License: MIT -Recommends: %{name}%{?_isa} = %{version}-%{release} -Requires: %{name}-libs%{?_isa} = %{version}-%{release} +Summary: PipeWire media server v4l2 LD_PRELOAD support +License: MIT +Recommends: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}-libs%{?_isa} = %{version}-%{release} %description v4l2 This package contains an LD_PRELOAD library that redirects v4l2 applications to @@ -350,57 +348,107 @@ PipeWire. %endif %package module-x11 -Summary: PipeWire media server x11 support -License: MIT -Recommends: %{name}%{?_isa} = %{version}-%{release} -Requires: %{name}-libs%{?_isa} = %{version}-%{release} +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 -%autosetup -p1 %{?snapdate:-n %{name}-%{gitcommit}} +%if %{with ffado} +%package module-ffado +Summary: PipeWire media server ffado support +License: MIT +BuildRequires: libffado-devel +Recommends: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}-libs%{?_isa} = %{version}-%{release} + +%description module-ffado +This package contains the FFADO support for PipeWire. +%endif + +%if %{with roc} +%package module-roc +Summary: PipeWire media server ROC support +License: MIT +BuildRequires: roc-toolkit-devel +BuildRequires: libunwind-devel +BuildRequires: openfec-devel +BuildRequires: sox-devel +Recommends: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}-libs%{?_isa} = %{version}-%{release} + +%description module-roc +This package contains the ROC support for PipeWire. +%endif +%if %{with libmysofa} +%package module-filter-chain-sofa +Summary: PipeWire media server sofa filter-chain support +License: MIT +BuildRequires: libmysofa-devel +Recommends: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}-libs%{?_isa} = %{version}-%{release} -%if %{with media-session} -mkdir subprojects/packagefiles -cp %{SOURCE1} subprojects/packagefiles/ +%description module-filter-chain-sofa +This package contains the mysofa support for PipeWire filter-chain. %endif +%if %{with lv2} +%package module-filter-chain-lv2 +Summary: PipeWire media server lv2 filter-chain support +License: MIT +BuildRequires: lilv-devel +Recommends: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}-libs%{?_isa} = %{version}-%{release} + +%description module-filter-chain-lv2 +This package contains the mysofa support for PipeWire filter-chain. +%endif + + +%prep +%autosetup -p1 %{?snapdate:-n %{name}-%{gitcommit}} + %build %meson \ -D docs=enabled -D man=enabled -D gstreamer=enabled -D systemd=enabled \ - -D gstreamer-device-provider=disabled -D sdl2=disabled \ + -D sdl2=disabled \ -D audiotestsrc=disabled -D videotestsrc=disabled \ -D volume=disabled -D bluez5-codec-aptx=disabled \ - -D bluez5-codec-lc3plus=disabled -D roc=disabled -D x11-xfixes=disabled \ - -D lv2=disabled -D libmysofa=disabled \ + -D bluez5-codec-lc3plus=disabled -D x11-xfixes=disabled \ %ifarch s390x -D bluez5-codec-ldac=disabled \ %endif - %{!?with_media_session:-D session-managers=[]} \ + -D session-managers=[] \ %{!?with_jack:-D pipewire-jack=disabled} \ %{!?with_jackserver_plugin:-D jack=disabled} \ %{!?with_libcamera_plugin:-D libcamera=disabled} \ %{?with_jack:-D jack-devel=true} \ %{!?with_alsa:-D pipewire-alsa=disabled} \ %{?with_vulkan:-D vulkan=enabled} \ + %{!?with_libmysofa:-D libmysofa=disabled} \ + %{!?with_lv2:-D lv2=disabled} \ + %{!?with_roc:-D roc=disabled} \ + %{!?with_ffado:-D libffado=disabled} \ + %{!?with_lc3:-D bluez5-codec-lc3=disabled} \ %{nil} %meson_build %install +install -p -D -m 0644 %{SOURCE1} %{buildroot}%{_sysusersdir}/pipewire.conf %meson_install +# Own this directory so add-ons can use it +install -d -m 0755 %{buildroot}%{_datadir}/pipewire/pipewire.conf.d/ + %if %{with jack} mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d/ echo %{_libdir}/pipewire-%{apiversion}/jack/ > %{buildroot}%{_sysconfdir}/ld.so.conf.d/pipewire-jack-%{_arch}.conf %else rm %{buildroot}%{_datadir}/pipewire/jack.conf -%if %{with media_session} -rm %{buildroot}%{_datadir}/pipewire/media-session.d/with-jack -%endif - %endif %if %{with alsa} @@ -410,10 +458,6 @@ cp %{buildroot}%{_datadir}/alsa/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 -%if %{with media_session} -touch %{buildroot}%{_datadir}/pipewire/media-session.d/with-alsa -%endif - %endif %if ! %{with pulse} @@ -422,16 +466,14 @@ rm %{buildroot}%{_bindir}/pipewire-pulse rm %{buildroot}%{_userunitdir}/pipewire-pulse.* rm %{buildroot}%{_datadir}/pipewire/pipewire-pulse.conf -%if %{with media_session} -rm %{buildroot}%{_datadir}/pipewire/media-session.d/with-pulseaudio %endif +%if %{with pulse} +# Own this directory so add-ons can use it +install -d -m 0755 %{buildroot}%{_datadir}/pipewire/pipewire-pulse.conf.d/ %endif %find_lang %{name} -%if %{with media_session} -%find_lang media-session -%endif # upstream should use udev.pc mkdir -p %{buildroot}%{_prefix}/lib/udev/rules.d @@ -446,10 +488,7 @@ echo "test failed" fi %pre -getent group pipewire >/dev/null || groupadd -r pipewire -getent passwd pipewire >/dev/null || \ - useradd -r -g pipewire -d %{_localstatedir}/run/pipewire -s /sbin/nologin -c "PipeWire System Daemon" pipewire -exit 0 +%sysusers_create_compat %{SOURCE1} %post %systemd_user_post pipewire.service @@ -467,11 +506,6 @@ systemctl --no-reload preset --global pipewire.socket >/dev/null 2>&1 || : %systemd_user_post pipewire-pulse.socket %endif -%if %{with media_session} -%post media-session -%systemd_user_post pipewire-media-session.service -%endif - %files %license LICENSE COPYING %doc README.md NEWS @@ -480,39 +514,22 @@ systemctl --no-reload preset --global pipewire.socket >/dev/null 2>&1 || : %{_bindir}/pipewire %{_bindir}/pipewire-avb %{_bindir}/pipewire-aes67 +%{_bindir}/pipewire-vulkan %{_mandir}/man1/pipewire.1* -%{_mandir}/man1/pipewire-pulse.1.gz %dir %{_datadir}/pipewire/ +%dir %{_datadir}/pipewire/pipewire.conf.d/ %{_datadir}/pipewire/pipewire.conf +%{_datadir}/pipewire/pipewire.conf.avail/10-rates.conf +%{_datadir}/pipewire/pipewire.conf.avail/20-upmix.conf %{_datadir}/pipewire/minimal.conf %{_datadir}/pipewire/filter-chain.conf %{_datadir}/pipewire/filter-chain/*.conf %{_datadir}/pipewire/pipewire-avb.conf %{_datadir}/pipewire/pipewire-aes67.conf +%{_datadir}/pipewire/pipewire-vulkan.conf %{_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 +%{_sysusersdir}/pipewire.conf %files libs -f %{name}.lang %license LICENSE COPYING @@ -530,18 +547,19 @@ systemctl --no-reload preset --global pipewire.socket >/dev/null 2>&1 || : %{_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-netjack2-driver.so +%{_libdir}/pipewire-%{apiversion}/libpipewire-module-netjack2-manager.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-sap.so +%{_libdir}/pipewire-%{apiversion}/libpipewire-module-rtp-session.so %{_libdir}/pipewire-%{apiversion}/libpipewire-module-rtp-sink.so %{_libdir}/pipewire-%{apiversion}/libpipewire-module-rtp-source.so %{_libdir}/pipewire-%{apiversion}/libpipewire-module-rt.so @@ -550,6 +568,8 @@ systemctl --no-reload preset --global pipewire.socket >/dev/null 2>&1 || : %{_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-vban-send.so +%{_libdir}/pipewire-%{apiversion}/libpipewire-module-vban-recv.so %{_libdir}/pipewire-%{apiversion}/libpipewire-module-zeroconf-discover.so %dir %{_datadir}/alsa-card-profile/ %dir %{_datadir}/alsa-card-profile/mixer/ @@ -569,11 +589,52 @@ systemctl --no-reload preset --global pipewire.socket >/dev/null 2>&1 || : %{_libdir}/spa-%{spaversion}/support/ %{_libdir}/spa-%{spaversion}/v4l2/ %{_libdir}/spa-%{spaversion}/videoconvert/ -%if %{with vulkan} -%{_libdir}/spa-%{spaversion}/vulkan/ -%endif %{_datadir}/pipewire/client.conf +%{_datadir}/pipewire/client.conf.avail/20-upmix.conf %{_datadir}/pipewire/client-rt.conf +%{_datadir}/pipewire/client-rt.conf.avail/20-upmix.conf +%{_mandir}/man7/libpipewire-module-access.7.gz +%{_mandir}/man7/libpipewire-module-adapter.7.gz +%{_mandir}/man7/libpipewire-module-avb.7.gz +%{_mandir}/man7/libpipewire-module-client-device.7.gz +%{_mandir}/man7/libpipewire-module-client-node.7.gz +%{_mandir}/man7/libpipewire-module-combine-stream.7.gz +%{_mandir}/man7/libpipewire-module-echo-cancel.7.gz +%{_mandir}/man7/libpipewire-module-example-filter.7.gz +%{_mandir}/man7/libpipewire-module-example-sink.7.gz +%{_mandir}/man7/libpipewire-module-example-source.7.gz +%{_mandir}/man7/libpipewire-module-fallback-sink.7.gz +%{_mandir}/man7/libpipewire-module-ffado-driver.7.gz +%{_mandir}/man7/libpipewire-module-filter-chain.7.gz +%{_mandir}/man7/libpipewire-module-jack-tunnel.7.gz +%{_mandir}/man7/libpipewire-module-jackdbus-detect.7.gz +%{_mandir}/man7/libpipewire-module-link-factory.7.gz +%{_mandir}/man7/libpipewire-module-loopback.7.gz +%{_mandir}/man7/libpipewire-module-metadata.7.gz +%{_mandir}/man7/libpipewire-module-netjack2-driver.7.gz +%{_mandir}/man7/libpipewire-module-netjack2-manager.7.gz +%{_mandir}/man7/libpipewire-module-pipe-tunnel.7.gz +%{_mandir}/man7/libpipewire-module-portal.7.gz +%{_mandir}/man7/libpipewire-module-profiler.7.gz +%{_mandir}/man7/libpipewire-module-protocol-native.7.gz +%{_mandir}/man7/libpipewire-module-protocol-pulse.7.gz +%{_mandir}/man7/libpipewire-module-protocol-simple.7.gz +%{_mandir}/man7/libpipewire-module-pulse-tunnel.7.gz +%{_mandir}/man7/libpipewire-module-raop-discover.7.gz +%{_mandir}/man7/libpipewire-module-raop-sink.7.gz +%{_mandir}/man7/libpipewire-module-roc-sink.7.gz +%{_mandir}/man7/libpipewire-module-roc-source.7.gz +%{_mandir}/man7/libpipewire-module-rt.7.gz +%{_mandir}/man7/libpipewire-module-rtp-sap.7.gz +%{_mandir}/man7/libpipewire-module-rtp-session.7.gz +%{_mandir}/man7/libpipewire-module-rtp-sink.7.gz +%{_mandir}/man7/libpipewire-module-rtp-source.7.gz +%{_mandir}/man7/libpipewire-module-session-manager.7.gz +%{_mandir}/man7/libpipewire-module-vban-recv.7.gz +%{_mandir}/man7/libpipewire-module-vban-send.7.gz +%{_mandir}/man7/libpipewire-module-x11-bell.7.gz +%{_mandir}/man7/libpipewire-module-zeroconf-discover.7.gz +%{_mandir}/man7/libpipewire-modules.7.gz %files gstreamer %{_libdir}/gstreamer-1.0/libgstpipewire.* @@ -590,31 +651,35 @@ systemctl --no-reload preset --global pipewire.socket >/dev/null 2>&1 || : %{_datadir}/doc/pipewire/html %files utils -%{_bindir}/pw-mon -%{_bindir}/pw-metadata -%{_bindir}/pw-dsdplay -%{_bindir}/pw-mididump -%{_bindir}/pw-midiplay -%{_bindir}/pw-midirecord +%{_bindir}/pw-cat %{_bindir}/pw-cli +%{_bindir}/pw-config %{_bindir}/pw-dot -%{_bindir}/pw-cat +%{_bindir}/pw-dsdplay %{_bindir}/pw-dump %{_bindir}/pw-encplay %{_bindir}/pw-link %{_bindir}/pw-loopback +%{_bindir}/pw-metadata +%{_bindir}/pw-mididump +%{_bindir}/pw-midiplay +%{_bindir}/pw-midirecord +%{_bindir}/pw-mon %{_bindir}/pw-play %{_bindir}/pw-profiler %{_bindir}/pw-record %{_bindir}/pw-reserve %{_bindir}/pw-top -%{_mandir}/man1/pw-mon.1* -%{_mandir}/man1/pw-cli.1* %{_mandir}/man1/pw-cat.1* +%{_mandir}/man1/pw-cli.1* +%{_mandir}/man1/pw-config.1* %{_mandir}/man1/pw-dot.1* +%{_mandir}/man1/pw-dump.1* %{_mandir}/man1/pw-link.1* +%{_mandir}/man1/pw-loopback.1* %{_mandir}/man1/pw-metadata.1* %{_mandir}/man1/pw-mididump.1* +%{_mandir}/man1/pw-mon.1* %{_mandir}/man1/pw-profiler.1* %{_mandir}/man1/pw-top.1* @@ -635,13 +700,15 @@ systemctl --no-reload preset --global pipewire.socket >/dev/null 2>&1 || : %endif %if %{with jack} -%files jack-audio-connection-kit +%files jack-audio-connection-kit-libs %{_bindir}/pw-jack %{_mandir}/man1/pw-jack.1* %{_libdir}/pipewire-%{apiversion}/jack/libjack.so.* %{_libdir}/pipewire-%{apiversion}/jack/libjacknet.so.* %{_libdir}/pipewire-%{apiversion}/jack/libjackserver.so.* %{_datadir}/pipewire/jack.conf + +%files jack-audio-connection-kit %{_sysconfdir}/ld.so.conf.d/pipewire-jack-%{_arch}.conf %files jack-audio-connection-kit-devel @@ -654,6 +721,8 @@ systemctl --no-reload preset --global pipewire.socket >/dev/null 2>&1 || : %if %{with jackserver_plugin} %files plugin-jack +%{_libdir}/pipewire-%{apiversion}/libpipewire-module-jack-tunnel.so +%{_libdir}/pipewire-%{apiversion}/libpipewire-module-jackdbus-detect.so %{_libdir}/spa-%{spaversion}/jack/ %endif @@ -662,12 +731,53 @@ systemctl --no-reload preset --global pipewire.socket >/dev/null 2>&1 || : %{_libdir}/spa-%{spaversion}/libcamera/ %endif +%if %{with vulkan} +%files plugin-vulkan +%{_libdir}/spa-%{spaversion}/vulkan/ +%endif + %if %{with pulse} %files pulseaudio %{_bindir}/pipewire-pulse -%{_mandir}/man1/pipewire-pulse.1.* %{_userunitdir}/pipewire-pulse.* %{_datadir}/pipewire/pipewire-pulse.conf +%dir %{_datadir}/pipewire/pipewire-pulse.conf.d/ +%{_datadir}/pipewire/pipewire-pulse.conf.avail/20-upmix.conf +%{_libdir}/pipewire-%{apiversion}/libpipewire-module-protocol-pulse.so +%{_mandir}/man1/pipewire-pulse.1* +%{_mandir}/man5/pipewire-pulse.conf.5.gz +%{_mandir}/man7/pipewire-pulse-module-alsa-sink.7.gz +%{_mandir}/man7/pipewire-pulse-module-alsa-source.7.gz +%{_mandir}/man7/pipewire-pulse-module-always-sink.7.gz +%{_mandir}/man7/pipewire-pulse-module-combine-sink.7.gz +%{_mandir}/man7/pipewire-pulse-module-echo-cancel.7.gz +%{_mandir}/man7/pipewire-pulse-module-gsettings.7.gz +%{_mandir}/man7/pipewire-pulse-module-jackdbus-detect.7.gz +%{_mandir}/man7/pipewire-pulse-module-ladspa-sink.7.gz +%{_mandir}/man7/pipewire-pulse-module-ladspa-source.7.gz +%{_mandir}/man7/pipewire-pulse-module-loopback.7.gz +%{_mandir}/man7/pipewire-pulse-module-native-protocol-tcp.7.gz +%{_mandir}/man7/pipewire-pulse-module-null-sink.7.gz +%{_mandir}/man7/pipewire-pulse-module-pipe-sink.7.gz +%{_mandir}/man7/pipewire-pulse-module-pipe-source.7.gz +%{_mandir}/man7/pipewire-pulse-module-raop-discover.7.gz +%{_mandir}/man7/pipewire-pulse-module-remap-sink.7.gz +%{_mandir}/man7/pipewire-pulse-module-remap-source.7.gz +%{_mandir}/man7/pipewire-pulse-module-roc-sink-input.7.gz +%{_mandir}/man7/pipewire-pulse-module-roc-sink.7.gz +%{_mandir}/man7/pipewire-pulse-module-roc-source.7.gz +%{_mandir}/man7/pipewire-pulse-module-rtp-recv.7.gz +%{_mandir}/man7/pipewire-pulse-module-rtp-send.7.gz +%{_mandir}/man7/pipewire-pulse-module-simple-protocol-tcp.7.gz +%{_mandir}/man7/pipewire-pulse-module-switch-on-connect.7.gz +%{_mandir}/man7/pipewire-pulse-module-tunnel-sink.7.gz +%{_mandir}/man7/pipewire-pulse-module-tunnel-source.7.gz +%{_mandir}/man7/pipewire-pulse-module-virtual-sink.7.gz +%{_mandir}/man7/pipewire-pulse-module-virtual-source.7.gz +%{_mandir}/man7/pipewire-pulse-module-x11-bell.7.gz +%{_mandir}/man7/pipewire-pulse-module-zeroconf-discover.7.gz +%{_mandir}/man7/pipewire-pulse-module-zeroconf-publish.7.gz +%{_mandir}/man7/pipewire-pulse-modules.7.gz %endif %if %{with v4l2} @@ -679,10 +789,41 @@ systemctl --no-reload preset --global pipewire.socket >/dev/null 2>&1 || : %files module-x11 %{_libdir}/pipewire-%{apiversion}/libpipewire-module-x11-bell.so +%if %{with ffado} +%files module-ffado +%{_libdir}/pipewire-%{apiversion}/libpipewire-module-ffado-driver.so +%endif + +%if %{with roc} +%files module-roc +%{_libdir}/pipewire-%{apiversion}/libpipewire-module-roc-sink.so +%{_libdir}/pipewire-%{apiversion}/libpipewire-module-roc-source.so +%endif + +%if %{with libmysofa} +%files module-filter-chain-sofa +%{_libdir}/pipewire-%{apiversion}/libpipewire-module-filter-chain-sofa.so +%endif + +%if %{with lv2} +%files module-filter-chain-lv2 +%{_libdir}/pipewire-%{apiversion}/libpipewire-module-filter-chain-lv2.so +%endif + %changelog -* Wed Dec 13 2023 Chang Gao - 0.3.67-2.0.1 -- Remove pipwire-session-manager requires -- fix readline dependence find (rb01097748@alibaba-inc.com) +* Tue Jan 19 2024 Wim Taymans - 1.0.1-1 +- Update to version 1.0.1 +- Add patch to revert timestamps +- Resolves: RHEL-17641, RHEL-21900 + +* Tue Jan 09 2024 Wim Taymans - 1.0.0-2 +- Fix install conflict with older versions. +- Resolves: RHEL-17641 + +* Mon Jan 08 2024 Wim Taymans - 1.0.0-1 +- Update to version 1.0.0 +- Add patch to avoid crash in deviceprovider. +- Resolves: RHEL-17641 * Tue Aug 01 2023 Wim Taymans - 0.3.67-2 - Add patch for removing inotify on /dev diff --git a/pipewire.sysusers b/pipewire.sysusers new file mode 100644 index 0000000..1e08df1 --- /dev/null +++ b/pipewire.sysusers @@ -0,0 +1,2 @@ +#Type Name ID GECOS Home directory Shell +u pipewire - "PipeWire System Daemon" /run/pipewire - -- Gitee From f50d4092654dfc40eb5ce4c1a341f0b4ef2ae930 Mon Sep 17 00:00:00 2001 From: "taifu.gc" Date: Tue, 29 Nov 2022 11:46:50 +0800 Subject: [PATCH 2/5] Reconfig python-docutils buildrequirement to python3-docutils Add unpackage file to filelist --- pipewire.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pipewire.spec b/pipewire.spec index beff04a..2182976 100644 --- a/pipewire.spec +++ b/pipewire.spec @@ -88,7 +88,7 @@ Patch0001: 0001-Revert-gst-pipewiresrc-Let-GstBaseSrc-handle-pseudo-.patch BuildRequires: gettext BuildRequires: meson >= 0.59.0 BuildRequires: gcc -BuildRequires: g++ +BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: pkgconfig(libudev) BuildRequires: pkgconfig(dbus-1) @@ -111,7 +111,7 @@ BuildRequires: systemd-devel BuildRequires: alsa-lib-devel BuildRequires: libv4l-devel BuildRequires: doxygen -BuildRequires: python-docutils +BuildRequires: python3-docutils BuildRequires: graphviz BuildRequires: sbc-devel %if %{with lc3} @@ -516,6 +516,7 @@ systemctl --no-reload preset --global pipewire.socket >/dev/null 2>&1 || : %{_bindir}/pipewire-aes67 %{_bindir}/pipewire-vulkan %{_mandir}/man1/pipewire.1* +%{_mandir}/man1/pipewire-pulse.1.gz %dir %{_datadir}/pipewire/ %dir %{_datadir}/pipewire/pipewire.conf.d/ %{_datadir}/pipewire/pipewire.conf @@ -744,7 +745,7 @@ systemctl --no-reload preset --global pipewire.socket >/dev/null 2>&1 || : %dir %{_datadir}/pipewire/pipewire-pulse.conf.d/ %{_datadir}/pipewire/pipewire-pulse.conf.avail/20-upmix.conf %{_libdir}/pipewire-%{apiversion}/libpipewire-module-protocol-pulse.so -%{_mandir}/man1/pipewire-pulse.1* +%{_mandir}/man1/pipewire-pulse.1.* %{_mandir}/man5/pipewire-pulse.conf.5.gz %{_mandir}/man7/pipewire-pulse-module-alsa-sink.7.gz %{_mandir}/man7/pipewire-pulse-module-alsa-source.7.gz -- Gitee From 963a54d14d1625df1c139a8bbda3c1bf2593db70 Mon Sep 17 00:00:00 2001 From: "taifu.gc" Date: Mon, 5 Dec 2022 02:50:45 +0800 Subject: [PATCH 3/5] Remove pipwire-session-manager requires --- pipewire.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pipewire.spec b/pipewire.spec index 2182976..5f1f64e 100644 --- a/pipewire.spec +++ b/pipewire.spec @@ -1,3 +1,4 @@ +%define anolis_release .0.1 %global majorversion 1 %global minorversion 0 %global microversion 1 @@ -68,7 +69,7 @@ Name: pipewire Summary: Media Sharing Server Version: %{majorversion}.%{minorversion}.%{microversion} -Release: %{baserelease}%{?snapdate:.%{snapdate}git%{shortcommit}}%{?dist} +Release: %{baserelease}%{?snapdate:.%{snapdate}git%{shortcommit}%{anolis_release}}%{?dist} License: MIT URL: https://pipewire.org/ %if 0%{?snapdate} @@ -136,7 +137,7 @@ Requires: %{name}-libs%{?_isa} = %{version}-%{release} Requires: systemd Requires: rtkit # A virtual Provides so we can swap session managers -Requires: pipewire-session-manager +# Requires: pipewire-session-manager # Prefer WirePlumber for session manager Suggests: wireplumber @@ -812,6 +813,9 @@ systemctl --no-reload preset --global pipewire.socket >/dev/null 2>&1 || : %endif %changelog +* Wed May 22 2024 Chang Gao - 1.0.1-1.0.1 +- Remove pipwire-session-manager requires + * Tue Jan 19 2024 Wim Taymans - 1.0.1-1 - Update to version 1.0.1 - Add patch to revert timestamps -- Gitee From cb0f7e3e838bbb7632713d75dcdbd29e65ee6b26 Mon Sep 17 00:00:00 2001 From: Bo Ren Date: Fri, 12 Jan 2024 14:56:31 +0800 Subject: [PATCH 4/5] fix readline dependence find Signed-off-by: Bo Ren --- 1000-fix-readline-dependence-find.patch | 11 +++++++++++ pipewire.spec | 4 ++++ 2 files changed, 15 insertions(+) create mode 100644 1000-fix-readline-dependence-find.patch diff --git a/1000-fix-readline-dependence-find.patch b/1000-fix-readline-dependence-find.patch new file mode 100644 index 0000000..08c9d3c --- /dev/null +++ b/1000-fix-readline-dependence-find.patch @@ -0,0 +1,11 @@ +--- pipewire-0.3.67/meson.build.orig 2024-01-12 14:42:44.047801137 +0800 ++++ pipewire-0.3.67/meson.build 2024-01-12 14:43:06.409967768 +0800 +@@ -262,7 +262,7 @@ + sdl_dep = dependency('sdl2', required : get_option('sdl2')) + summary({'SDL2 (video examples)': sdl_dep.found()}, bool_yn: true, section: 'Misc dependencies') + drm_dep = dependency('libdrm', required : false) +-readline_dep = dependency('readline', required : get_option('readline')) ++readline_dep = dependency('readline', required : false) + + if not readline_dep.found() + readline_dep = cc.find_library('readline', required : get_option('readline')) diff --git a/pipewire.spec b/pipewire.spec index 5f1f64e..09ea8f2 100644 --- a/pipewire.spec +++ b/pipewire.spec @@ -86,6 +86,8 @@ Patch0001: 0001-Revert-gst-pipewiresrc-Let-GstBaseSrc-handle-pseudo-.patch ## rhel patches +Patch1002: 1000-fix-readline-dependence-find.patch + BuildRequires: gettext BuildRequires: meson >= 0.59.0 BuildRequires: gcc @@ -131,6 +133,7 @@ BuildRequires: libuv-devel BuildRequires: speexdsp-devel BuildRequires: systemd-rpm-macros %{?sysusers_requires_compat} +BuildRequires: opus-devel Requires(pre): shadow-utils Requires: %{name}-libs%{?_isa} = %{version}-%{release} @@ -815,6 +818,7 @@ systemctl --no-reload preset --global pipewire.socket >/dev/null 2>&1 || : %changelog * Wed May 22 2024 Chang Gao - 1.0.1-1.0.1 - Remove pipwire-session-manager requires +- fix readline dependence find (rb01097748@alibaba-inc.com) * Tue Jan 19 2024 Wim Taymans - 1.0.1-1 - Update to version 1.0.1 -- Gitee From 093817d60fc155dda7e4606331868f07cfc698dd Mon Sep 17 00:00:00 2001 From: Bo Ren Date: Tue, 6 Aug 2024 17:54:00 +0800 Subject: [PATCH 5/5] Remove pulse/jack files and change way to create user Signed-off-by: Bo Ren --- pipewire.spec | 46 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 45 insertions(+), 1 deletion(-) diff --git a/pipewire.spec b/pipewire.spec index 09ea8f2..07e1935 100644 --- a/pipewire.spec +++ b/pipewire.spec @@ -469,9 +469,48 @@ cp %{buildroot}%{_datadir}/alsa/alsa.conf.d/99-pipewire-default.conf \ rm %{buildroot}%{_bindir}/pipewire-pulse rm %{buildroot}%{_userunitdir}/pipewire-pulse.* rm %{buildroot}%{_datadir}/pipewire/pipewire-pulse.conf +rm %{buildroot}%{_datadir}/pipewire/pipewire-pulse.conf.avail/20-upmix.conf +rm %{buildroot}%{_libdir}/pipewire-%{apiversion}/libpipewire-module-protocol-pulse.so +rm %{buildroot}%{_mandir}/man5/pipewire-pulse.conf.5 +rm %{buildroot}%{_mandir}/man7/pipewire-pulse-module-alsa-sink.7 +rm %{buildroot}%{_mandir}/man7/pipewire-pulse-module-alsa-source.7 +rm %{buildroot}%{_mandir}/man7/pipewire-pulse-module-always-sink.7 +rm %{buildroot}%{_mandir}/man7/pipewire-pulse-module-combine-sink.7 +rm %{buildroot}%{_mandir}/man7/pipewire-pulse-module-echo-cancel.7 +rm %{buildroot}%{_mandir}/man7/pipewire-pulse-module-gsettings.7 +rm %{buildroot}%{_mandir}/man7/pipewire-pulse-module-jackdbus-detect.7 +rm %{buildroot}%{_mandir}/man7/pipewire-pulse-module-ladspa-sink.7 +rm %{buildroot}%{_mandir}/man7/pipewire-pulse-module-ladspa-source.7 +rm %{buildroot}%{_mandir}/man7/pipewire-pulse-module-loopback.7 +rm %{buildroot}%{_mandir}/man7/pipewire-pulse-module-native-protocol-tcp.7 +rm %{buildroot}%{_mandir}/man7/pipewire-pulse-module-null-sink.7 +rm %{buildroot}%{_mandir}/man7/pipewire-pulse-module-pipe-sink.7 +rm %{buildroot}%{_mandir}/man7/pipewire-pulse-module-pipe-source.7 +rm %{buildroot}%{_mandir}/man7/pipewire-pulse-module-raop-discover.7 +rm %{buildroot}%{_mandir}/man7/pipewire-pulse-module-remap-sink.7 +rm %{buildroot}%{_mandir}/man7/pipewire-pulse-module-remap-source.7 +rm %{buildroot}%{_mandir}/man7/pipewire-pulse-module-roc-sink-input.7 +rm %{buildroot}%{_mandir}/man7/pipewire-pulse-module-roc-sink.7 +rm %{buildroot}%{_mandir}/man7/pipewire-pulse-module-roc-source.7 +rm %{buildroot}%{_mandir}/man7/pipewire-pulse-module-rtp-recv.7 +rm %{buildroot}%{_mandir}/man7/pipewire-pulse-module-rtp-send.7 +rm %{buildroot}%{_mandir}/man7/pipewire-pulse-module-simple-protocol-tcp.7 +rm %{buildroot}%{_mandir}/man7/pipewire-pulse-module-switch-on-connect.7 +rm %{buildroot}%{_mandir}/man7/pipewire-pulse-module-tunnel-sink.7 +rm %{buildroot}%{_mandir}/man7/pipewire-pulse-module-tunnel-source.7 +rm %{buildroot}%{_mandir}/man7/pipewire-pulse-module-virtual-sink.7 +rm %{buildroot}%{_mandir}/man7/pipewire-pulse-module-virtual-source.7 +rm %{buildroot}%{_mandir}/man7/pipewire-pulse-module-x11-bell.7 +rm %{buildroot}%{_mandir}/man7/pipewire-pulse-module-zeroconf-discover.7 +rm %{buildroot}%{_mandir}/man7/pipewire-pulse-module-zeroconf-publish.7 +rm %{buildroot}%{_mandir}/man7/pipewire-pulse-modules.7 %endif +%if ! %{with jack} +rm %{buildroot}%{_mandir}/man1/pw-jack.1 +%endif + %if %{with pulse} # Own this directory so add-ons can use it install -d -m 0755 %{buildroot}%{_datadir}/pipewire/pipewire-pulse.conf.d/ @@ -492,7 +531,10 @@ echo "test failed" fi %pre -%sysusers_create_compat %{SOURCE1} +getent group pipewire >/dev/null || groupadd -r pipewire +getent passwd pipewire >/dev/null || \ + useradd -r -g pipewire -d %{_localstatedir}/run/pipewire -s /sbin/nologin -c "PipeWire System Daemon" pipewire +exit 0 %post %systemd_user_post pipewire.service @@ -819,6 +861,8 @@ systemctl --no-reload preset --global pipewire.socket >/dev/null 2>&1 || : * Wed May 22 2024 Chang Gao - 1.0.1-1.0.1 - Remove pipwire-session-manager requires - fix readline dependence find (rb01097748@alibaba-inc.com) +- Remove pulse/jack files +- change way to create user * Tue Jan 19 2024 Wim Taymans - 1.0.1-1 - Update to version 1.0.1 -- Gitee