diff --git a/abi_libs b/abi_libs --- a/abi_libs +++ b/abi_libs @@ -19,6 +19,7 @@ libpipewire-module-protocol-pulse.so libpipewire-module-protocol-simple.so libpipewire-module-pulse-tunnel.so +libpipewire-module-rt.so libpipewire-module-rtkit.so libpipewire-module-session-manager.so libpipewire-module-spa-device-factory.so @@ -41,7 +42,6 @@ libspa-videoconvert.so libspa-videotestsrc.so libspa-volume.so -libspa-vulkan.so pipewire pipewire-media-session pipewire-pulse diff --git a/abi_libs32 b/abi_libs32 --- a/abi_libs32 +++ b/abi_libs32 @@ -19,13 +19,13 @@ libpipewire-module-protocol-pulse.so libpipewire-module-protocol-simple.so libpipewire-module-pulse-tunnel.so +libpipewire-module-rt.so libpipewire-module-rtkit.so libpipewire-module-session-manager.so libpipewire-module-spa-device-factory.so libpipewire-module-spa-device.so libpipewire-module-spa-node-factory.so libpipewire-module-spa-node.so -libpipewire-module-zeroconf-discover.so libspa-alsa.so libspa-audioconvert.so libspa-audiomixer.so diff --git a/abi_symbols b/abi_symbols --- a/abi_symbols +++ b/abi_symbols @@ -389,6 +389,7 @@ libjackserver.so.0:silent_jack_info_callback libpipewire-0.3.so.0:pw_buffers_clear libpipewire-0.3.so.0:pw_buffers_negotiate +libpipewire-0.3.so.0:pw_check_option libpipewire-0.3.so.0:pw_client_info_free libpipewire-0.3.so.0:pw_client_info_update libpipewire-0.3.so.0:pw_conf_load_conf @@ -404,6 +405,7 @@ libpipewire-0.3.so.0:pw_context_create_device libpipewire-0.3.so.0:pw_context_create_factory libpipewire-0.3.so.0:pw_context_create_link +libpipewire-0.3.so.0:pw_context_create_metadata libpipewire-0.3.so.0:pw_context_create_node libpipewire-0.3.so.0:pw_context_create_port libpipewire-0.3.so.0:pw_context_destroy @@ -563,6 +565,15 @@ libpipewire-0.3.so.0:pw_impl_link_get_output libpipewire-0.3.so.0:pw_impl_link_get_user_data libpipewire-0.3.so.0:pw_impl_link_register +libpipewire-0.3.so.0:pw_impl_metadata_add_listener +libpipewire-0.3.so.0:pw_impl_metadata_destroy +libpipewire-0.3.so.0:pw_impl_metadata_get_global +libpipewire-0.3.so.0:pw_impl_metadata_get_implementation +libpipewire-0.3.so.0:pw_impl_metadata_get_user_data +libpipewire-0.3.so.0:pw_impl_metadata_register +libpipewire-0.3.so.0:pw_impl_metadata_set_implementation +libpipewire-0.3.so.0:pw_impl_metadata_set_property +libpipewire-0.3.so.0:pw_impl_metadata_set_propertyf libpipewire-0.3.so.0:pw_impl_module_add_listener libpipewire-0.3.so.0:pw_impl_module_destroy libpipewire-0.3.so.0:pw_impl_module_get_context @@ -781,6 +792,7 @@ libpipewire-module-protocol-pulse.so:pipewire__module_init libpipewire-module-protocol-simple.so:pipewire__module_init libpipewire-module-pulse-tunnel.so:pipewire__module_init +libpipewire-module-rt.so:pipewire__module_init libpipewire-module-rtkit.so:pipewire__module_init libpipewire-module-session-manager.so:pipewire__module_init libpipewire-module-spa-device-factory.so:pipewire__module_init @@ -806,7 +818,6 @@ libspa-videoconvert.so:spa_handle_factory_enum libspa-videotestsrc.so:spa_handle_factory_enum libspa-volume.so:spa_handle_factory_enum -libspa-vulkan.so:spa_handle_factory_enum pipewire:optarg pipewire:pw_log_level pipewire:stderr diff --git a/abi_symbols32 b/abi_symbols32 --- a/abi_symbols32 +++ b/abi_symbols32 @@ -389,6 +389,7 @@ libjackserver.so.0:silent_jack_info_callback libpipewire-0.3.so.0:pw_buffers_clear libpipewire-0.3.so.0:pw_buffers_negotiate +libpipewire-0.3.so.0:pw_check_option libpipewire-0.3.so.0:pw_client_info_free libpipewire-0.3.so.0:pw_client_info_update libpipewire-0.3.so.0:pw_conf_load_conf @@ -404,6 +405,7 @@ libpipewire-0.3.so.0:pw_context_create_device libpipewire-0.3.so.0:pw_context_create_factory libpipewire-0.3.so.0:pw_context_create_link +libpipewire-0.3.so.0:pw_context_create_metadata libpipewire-0.3.so.0:pw_context_create_node libpipewire-0.3.so.0:pw_context_create_port libpipewire-0.3.so.0:pw_context_destroy @@ -563,6 +565,15 @@ libpipewire-0.3.so.0:pw_impl_link_get_output libpipewire-0.3.so.0:pw_impl_link_get_user_data libpipewire-0.3.so.0:pw_impl_link_register +libpipewire-0.3.so.0:pw_impl_metadata_add_listener +libpipewire-0.3.so.0:pw_impl_metadata_destroy +libpipewire-0.3.so.0:pw_impl_metadata_get_global +libpipewire-0.3.so.0:pw_impl_metadata_get_implementation +libpipewire-0.3.so.0:pw_impl_metadata_get_user_data +libpipewire-0.3.so.0:pw_impl_metadata_register +libpipewire-0.3.so.0:pw_impl_metadata_set_implementation +libpipewire-0.3.so.0:pw_impl_metadata_set_property +libpipewire-0.3.so.0:pw_impl_metadata_set_propertyf libpipewire-0.3.so.0:pw_impl_module_add_listener libpipewire-0.3.so.0:pw_impl_module_destroy libpipewire-0.3.so.0:pw_impl_module_get_context @@ -781,13 +792,13 @@ libpipewire-module-protocol-pulse.so:pipewire__module_init libpipewire-module-protocol-simple.so:pipewire__module_init libpipewire-module-pulse-tunnel.so:pipewire__module_init +libpipewire-module-rt.so:pipewire__module_init libpipewire-module-rtkit.so:pipewire__module_init libpipewire-module-session-manager.so:pipewire__module_init libpipewire-module-spa-device-factory.so:pipewire__module_init libpipewire-module-spa-device.so:pipewire__module_init libpipewire-module-spa-node-factory.so:pipewire__module_init libpipewire-module-spa-node.so:pipewire__module_init -libpipewire-module-zeroconf-discover.so:pipewire__module_init libspa-alsa.so:spa_handle_factory_enum libspa-audioconvert.so:spa_handle_factory_enum libspa-audiomixer.so:spa_handle_factory_enum diff --git a/abi_used_libs b/abi_used_libs --- a/abi_used_libs +++ b/abi_used_libs @@ -7,6 +7,7 @@ libdbus-1.so.3 libdl.so.2 libfdk-aac.so.2 +libgcc_s.so.1 libglib-2.0.so.0 libgobject-2.0.so.0 libgstallocators-1.0.so.0 @@ -23,6 +24,8 @@ libpulse.so.0 libsbc.so.1 libsndfile.so.1 +libstdc++.so.6 libsystemd.so.0 libudev.so.1 -libvulkan.so.1 +libusb-1.0.so.0 +libwebrtc_audio_processing.so.1 diff --git a/abi_used_libs32 b/abi_used_libs32 --- a/abi_used_libs32 +++ b/abi_used_libs32 @@ -1,9 +1,8 @@ libasound.so.2 -libavahi-client.so.3 -libavahi-common.so.3 libc.so.6 libdbus-1.so.3 libdl.so.2 +libgcc_s.so.1 libglib-2.0.so.0 libgobject-2.0.so.0 libgstallocators-1.0.so.0 @@ -14,5 +13,7 @@ libm.so.6 libpthread.so.0 libpulse.so.0 +libstdc++.so.6 libsystemd.so.0 libudev.so.1 +libwebrtc_audio_processing.so.1 diff --git a/abi_used_symbols b/abi_used_symbols --- a/abi_used_symbols +++ b/abi_used_symbols @@ -276,19 +276,32 @@ libasound.so.2:snd_use_case_set libavahi-client.so.3:avahi_client_errno libavahi-client.so.3:avahi_client_free +libavahi-client.so.3:avahi_client_get_state libavahi-client.so.3:avahi_client_new +libavahi-client.so.3:avahi_entry_group_add_service_strlst +libavahi-client.so.3:avahi_entry_group_add_service_subtype +libavahi-client.so.3:avahi_entry_group_commit +libavahi-client.so.3:avahi_entry_group_free +libavahi-client.so.3:avahi_entry_group_get_client +libavahi-client.so.3:avahi_entry_group_new +libavahi-client.so.3:avahi_entry_group_reset libavahi-client.so.3:avahi_service_browser_free libavahi-client.so.3:avahi_service_browser_new libavahi-client.so.3:avahi_service_resolver_free libavahi-client.so.3:avahi_service_resolver_new libavahi-common.so.3:avahi_address_snprint +libavahi-common.so.3:avahi_alternative_service_name libavahi-common.so.3:avahi_free libavahi-common.so.3:avahi_strerror +libavahi-common.so.3:avahi_string_list_add_pair +libavahi-common.so.3:avahi_string_list_add_printf +libavahi-common.so.3:avahi_string_list_free libavahi-common.so.3:avahi_string_list_get_pair libavcodec.so.58:av_codec_is_encoder libavcodec.so.58:av_codec_iterate libbluetooth.so.3:ba2str libbluetooth.so.3:hci_close_dev +libbluetooth.so.3:hci_devinfo libbluetooth.so.3:hci_get_route libbluetooth.so.3:hci_open_dev libbluetooth.so.3:hci_read_local_ext_features @@ -299,6 +312,7 @@ libc.so.6:__ctype_tolower_loc libc.so.6:__errno_location libc.so.6:__fprintf_chk +libc.so.6:__isoc99_fscanf libc.so.6:__isoc99_sscanf libc.so.6:__libc_start_main libc.so.6:__memcpy_chk @@ -309,6 +323,7 @@ libc.so.6:__snprintf_chk libc.so.6:__sprintf_chk libc.so.6:__stack_chk_fail +libc.so.6:__strcpy_chk libc.so.6:__strncpy_chk libc.so.6:__vasprintf_chk libc.so.6:__vfprintf_chk @@ -390,6 +405,11 @@ libc.so.6:perror libc.so.6:poll libc.so.6:prctl +libc.so.6:pthread_attr_destroy +libc.so.6:pthread_attr_init +libc.so.6:pthread_attr_setdetachstate +libc.so.6:pthread_attr_setinheritsched +libc.so.6:pthread_attr_setscope libc.so.6:pthread_cond_destroy libc.so.6:pthread_cond_init libc.so.6:pthread_condattr_init @@ -409,10 +429,15 @@ libc.so.6:regfree libc.so.6:renameat libc.so.6:scandir64 +libc.so.6:sched_get_priority_max +libc.so.6:sched_get_priority_min libc.so.6:sched_getaffinity +libc.so.6:sched_setscheduler libc.so.6:send libc.so.6:setenv +libc.so.6:setlinebuf libc.so.6:setlocale +libc.so.6:setpriority libc.so.6:setrlimit64 libc.so.6:setsockopt libc.so.6:shutdown @@ -456,6 +481,7 @@ libc.so.6:timerfd_create libc.so.6:timerfd_gettime libc.so.6:timerfd_settime +libc.so.6:uname libc.so.6:unlink libc.so.6:waitpid libc.so.6:write @@ -542,6 +568,7 @@ libfdk-aac.so.2:aacEncInfo libfdk-aac.so.2:aacEncOpen libfdk-aac.so.2:aacEncoder_SetParam +libgcc_s.so.1:_Unwind_Resume libglib-2.0.so.0:g_assertion_message_expr libglib-2.0.so.0:g_cond_init libglib-2.0.so.0:g_cond_signal @@ -777,6 +804,7 @@ libpthread.so.0:connect libpthread.so.0:lseek64 libpthread.so.0:open64 +libpthread.so.0:pthread_attr_setstacksize libpthread.so.0:pthread_cancel libpthread.so.0:pthread_cond_broadcast libpthread.so.0:pthread_cond_signal @@ -788,6 +816,7 @@ libpthread.so.0:pthread_mutex_destroy libpthread.so.0:pthread_mutex_init libpthread.so.0:pthread_mutex_lock +libpthread.so.0:pthread_mutex_trylock libpthread.so.0:pthread_mutex_unlock libpthread.so.0:pthread_mutexattr_init libpthread.so.0:pthread_mutexattr_settype @@ -814,6 +843,7 @@ libpulse.so.0:pa_stream_cork libpulse.so.0:pa_stream_drop libpulse.so.0:pa_stream_flush +libpulse.so.0:pa_stream_get_latency libpulse.so.0:pa_stream_get_state libpulse.so.0:pa_stream_new libpulse.so.0:pa_stream_peek @@ -833,6 +863,7 @@ libpulse.so.0:pa_threaded_mainloop_stop libpulse.so.0:pa_threaded_mainloop_unlock libpulse.so.0:pa_threaded_mainloop_wait +libpulse.so.0:pa_usec_to_bytes libsbc.so.1:sbc_decode libsbc.so.1:sbc_encode libsbc.so.1:sbc_finish @@ -856,6 +887,9 @@ libsndfile.so.1:sf_writef_float libsndfile.so.1:sf_writef_int libsndfile.so.1:sf_writef_short +libstdc++.so.6:_ZSt18_Rb_tree_incrementPSt18_Rb_tree_node_base +libstdc++.so.6:_ZdlPvm +libstdc++.so.6:__gxx_personality_v0 libsystemd.so.0:sd_is_socket_unix libsystemd.so.0:sd_journal_send_with_location libsystemd.so.0:sd_listen_fds @@ -887,44 +921,12 @@ libudev.so.1:udev_monitor_unref libudev.so.1:udev_new libudev.so.1:udev_unref -libvulkan.so.1:vkAllocateCommandBuffers -libvulkan.so.1:vkAllocateDescriptorSets -libvulkan.so.1:vkAllocateMemory -libvulkan.so.1:vkBeginCommandBuffer -libvulkan.so.1:vkBindBufferMemory -libvulkan.so.1:vkCmdBindDescriptorSets -libvulkan.so.1:vkCmdBindPipeline -libvulkan.so.1:vkCmdDispatch -libvulkan.so.1:vkCmdPushConstants -libvulkan.so.1:vkCreateBuffer -libvulkan.so.1:vkCreateCommandPool -libvulkan.so.1:vkCreateComputePipelines -libvulkan.so.1:vkCreateDescriptorPool -libvulkan.so.1:vkCreateDescriptorSetLayout -libvulkan.so.1:vkCreateDevice -libvulkan.so.1:vkCreateFence -libvulkan.so.1:vkCreateInstance -libvulkan.so.1:vkCreatePipelineLayout -libvulkan.so.1:vkCreateShaderModule -libvulkan.so.1:vkDestroyBuffer -libvulkan.so.1:vkDestroyCommandPool -libvulkan.so.1:vkDestroyDescriptorPool -libvulkan.so.1:vkDestroyDescriptorSetLayout -libvulkan.so.1:vkDestroyDevice -libvulkan.so.1:vkDestroyInstance -libvulkan.so.1:vkDestroyPipeline -libvulkan.so.1:vkDestroyPipelineLayout -libvulkan.so.1:vkDestroyShaderModule -libvulkan.so.1:vkDeviceWaitIdle -libvulkan.so.1:vkEndCommandBuffer -libvulkan.so.1:vkEnumeratePhysicalDevices -libvulkan.so.1:vkFreeMemory -libvulkan.so.1:vkGetBufferMemoryRequirements -libvulkan.so.1:vkGetDeviceQueue -libvulkan.so.1:vkGetFenceStatus -libvulkan.so.1:vkGetInstanceProcAddr -libvulkan.so.1:vkGetPhysicalDeviceMemoryProperties -libvulkan.so.1:vkGetPhysicalDeviceQueueFamilyProperties -libvulkan.so.1:vkQueueSubmit -libvulkan.so.1:vkResetFences -libvulkan.so.1:vkUpdateDescriptorSets +libusb-1.0.so.0:libusb_exit +libusb-1.0.so.0:libusb_free_config_descriptor +libusb-1.0.so.0:libusb_free_device_list +libusb-1.0.so.0:libusb_get_config_descriptor +libusb-1.0.so.0:libusb_get_device_descriptor +libusb-1.0.so.0:libusb_get_device_list +libusb-1.0.so.0:libusb_init +libusb-1.0.so.0:libusb_strerror +libwebrtc_audio_processing.so.1:_ZN6webrtc15AudioProcessing6CreateERKNS_6ConfigE diff --git a/abi_used_symbols32 b/abi_used_symbols32 --- a/abi_used_symbols32 +++ b/abi_used_symbols32 @@ -274,17 +274,6 @@ libasound.so.2:snd_use_case_mgr_open libasound.so.2:snd_use_case_parse_ctl_elem_id libasound.so.2:snd_use_case_set -libavahi-client.so.3:avahi_client_errno -libavahi-client.so.3:avahi_client_free -libavahi-client.so.3:avahi_client_new -libavahi-client.so.3:avahi_service_browser_free -libavahi-client.so.3:avahi_service_browser_new -libavahi-client.so.3:avahi_service_resolver_free -libavahi-client.so.3:avahi_service_resolver_new -libavahi-common.so.3:avahi_address_snprint -libavahi-common.so.3:avahi_free -libavahi-common.so.3:avahi_strerror -libavahi-common.so.3:avahi_string_list_get_pair libc.so.6:__asprintf_chk libc.so.6:__assert_fail libc.so.6:__ctype_b_loc @@ -298,6 +287,7 @@ libc.so.6:__snprintf_chk libc.so.6:__sprintf_chk libc.so.6:__stack_chk_fail +libc.so.6:__strcpy_chk libc.so.6:__strncpy_chk libc.so.6:__vasprintf_chk libc.so.6:__vsnprintf_chk @@ -326,7 +316,6 @@ libc.so.6:fcntl64 libc.so.6:fdopen libc.so.6:feof -libc.so.6:fflush libc.so.6:fgets libc.so.6:fileno libc.so.6:flock @@ -372,6 +361,11 @@ libc.so.6:opendir libc.so.6:perror libc.so.6:prctl +libc.so.6:pthread_attr_destroy +libc.so.6:pthread_attr_init +libc.so.6:pthread_attr_setdetachstate +libc.so.6:pthread_attr_setinheritsched +libc.so.6:pthread_attr_setscope libc.so.6:pthread_cond_destroy libc.so.6:pthread_cond_init libc.so.6:pthread_condattr_init @@ -389,8 +383,13 @@ libc.so.6:regfree libc.so.6:renameat libc.so.6:scandir64 +libc.so.6:sched_get_priority_max +libc.so.6:sched_get_priority_min libc.so.6:sched_getaffinity +libc.so.6:sched_setscheduler +libc.so.6:setlinebuf libc.so.6:setlocale +libc.so.6:setpriority libc.so.6:setrlimit64 libc.so.6:setsockopt libc.so.6:sigaddset @@ -437,6 +436,7 @@ libdbus-1.so.3:dbus_connection_add_filter libdbus-1.so.3:dbus_connection_close libdbus-1.so.3:dbus_connection_dispatch +libdbus-1.so.3:dbus_connection_ref libdbus-1.so.3:dbus_connection_remove_filter libdbus-1.so.3:dbus_connection_send_with_reply libdbus-1.so.3:dbus_connection_send_with_reply_and_block @@ -482,6 +482,7 @@ libdl.so.2:dlerror libdl.so.2:dlopen libdl.so.2:dlsym +libgcc_s.so.1:_Unwind_Resume libglib-2.0.so.0:g_assertion_message_expr libglib-2.0.so.0:g_cond_init libglib-2.0.so.0:g_cond_signal @@ -690,6 +691,7 @@ libpthread.so.0:close libpthread.so.0:connect libpthread.so.0:open64 +libpthread.so.0:pthread_attr_setstacksize libpthread.so.0:pthread_cancel libpthread.so.0:pthread_cond_broadcast libpthread.so.0:pthread_cond_signal @@ -701,6 +703,7 @@ libpthread.so.0:pthread_mutex_destroy libpthread.so.0:pthread_mutex_init libpthread.so.0:pthread_mutex_lock +libpthread.so.0:pthread_mutex_trylock libpthread.so.0:pthread_mutex_unlock libpthread.so.0:pthread_mutexattr_init libpthread.so.0:pthread_mutexattr_settype @@ -727,6 +730,7 @@ libpulse.so.0:pa_stream_cork libpulse.so.0:pa_stream_drop libpulse.so.0:pa_stream_flush +libpulse.so.0:pa_stream_get_latency libpulse.so.0:pa_stream_get_state libpulse.so.0:pa_stream_new libpulse.so.0:pa_stream_peek @@ -746,6 +750,10 @@ libpulse.so.0:pa_threaded_mainloop_stop libpulse.so.0:pa_threaded_mainloop_unlock libpulse.so.0:pa_threaded_mainloop_wait +libpulse.so.0:pa_usec_to_bytes +libstdc++.so.6:_ZSt18_Rb_tree_incrementPSt18_Rb_tree_node_base +libstdc++.so.6:_ZdlPvj +libstdc++.so.6:__gxx_personality_v0 libsystemd.so.0:sd_is_socket_unix libsystemd.so.0:sd_journal_send_with_location libsystemd.so.0:sd_listen_fds @@ -771,3 +779,4 @@ libudev.so.1:udev_monitor_unref libudev.so.1:udev_new libudev.so.1:udev_unref +libwebrtc_audio_processing.so.1:_ZN6webrtc15AudioProcessing6CreateERKNS_6ConfigE diff --git a/files/0001-Disable-rtkit-support.patch b/files/0001-Disable-rtkit-support.patch deleted file mode 100644 --- a/files/0001-Disable-rtkit-support.patch +++ /dev/null @@ -1,305 +0,0 @@ -From 8f71a56267e69417014b0c22f44ad931bc553fe3 Mon Sep 17 00:00:00 2001 -From: Reilly Brogan -Date: Fri, 21 May 2021 15:23:34 -0500 -Subject: [PATCH] Disable rtkit support - -This can be removed if/when rtkit is packaged for Solus ---- - src/daemon/client-rt.conf.in | 79 ------------------- - src/daemon/filter-chain/demonic.conf | 10 --- - .../filter-chain/sink-dolby-surround.conf | 9 --- - src/daemon/filter-chain/sink-eq6.conf | 9 --- - .../filter-chain/sink-matrix-spatialiser.conf | 9 --- - src/daemon/filter-chain/source-rnnoise.conf | 9 --- - src/daemon/jack.conf.in | 10 --- - src/daemon/media-session.d/media-session.conf | 10 --- - src/daemon/meson.build | 1 - - src/daemon/pipewire-pulse.conf.in | 9 --- - src/daemon/pipewire.conf.in | 10 --- - 11 files changed, 165 deletions(-) - delete mode 100644 src/daemon/client-rt.conf.in - -diff --git a/src/daemon/client-rt.conf.in b/src/daemon/client-rt.conf.in -deleted file mode 100644 -index 7bb1470f5..000000000 ---- a/src/daemon/client-rt.conf.in -+++ /dev/null -@@ -1,79 +0,0 @@ --# Real-time Client config file for PipeWire version @VERSION@ # -- --context.properties = { -- ## Configure properties in the system. -- #mem.warn-mlock = false -- #mem.allow-mlock = true -- #mem.mlock-all = false -- log.level = 0 --} -- --context.spa-libs = { -- # = -- # -- # Used to find spa factory names. It maps an spa factory name -- # regular expression to a library name that should contain -- # that factory. -- # -- audio.convert.* = audioconvert/libspa-audioconvert -- support.* = support/libspa-support --} -- --context.modules = [ -- #{ name = -- # [ args = { = ... } ] -- # [ flags = [ [ ifexists ] [ nofail ] ] -- #} -- # -- # Loads a module with the given parameters. -- # If ifexists is given, the module is ignored when it is not found. -- # If nofail is given, module initialization failures are ignored. -- # -- # Uses RTKit to boost the data thread priority. -- { name = libpipewire-module-rtkit -- args = { -- #nice.level = -11 -- #rt.prio = 88 -- #rt.time.soft = 200000 -- #rt.time.hard = 200000 -- } -- flags = [ ifexists nofail ] -- } -- -- # The native communication protocol. -- { name = libpipewire-module-protocol-native } -- -- # Allows creating nodes that run in the context of the -- # client. Is used by all clients that want to provide -- # data to PipeWire. -- { name = libpipewire-module-client-node } -- -- # Allows creating devices that run in the context of the -- # client. Is used by the session manager. -- { name = libpipewire-module-client-device } -- -- # Makes a factory for wrapping nodes in an adapter with a -- # converter and resampler. -- { name = libpipewire-module-adapter } -- -- # Allows applications to create metadata objects. It creates -- # a factory for Metadata objects. -- { name = libpipewire-module-metadata } -- -- # Provides factories to make session manager objects. -- { name = libpipewire-module-session-manager } --] -- --filter.properties = { -- #node.latency = 1024/48000 --} -- --stream.properties = { -- #node.latency = 1024/48000 -- #node.autoconnect = true -- #resample.quality = 4 -- #channelmix.normalize = false -- #channelmix.mix-lfe = true -- #channelmix.upmix = false -- #channelmix.lfe-cutoff = 0 --} -diff --git a/src/daemon/filter-chain/demonic.conf b/src/daemon/filter-chain/demonic.conf -index ffe3ea83a..94f9cf91b 100644 ---- a/src/daemon/filter-chain/demonic.conf -+++ b/src/daemon/filter-chain/demonic.conf -@@ -19,16 +19,6 @@ context.spa-libs = { - } - - context.modules = [ -- # Uses RTKit to boost the data thread priority. -- { name = libpipewire-module-rtkit -- args = { -- #nice.level = -11 -- #rt.prio = 88 -- #rt.time.soft = 200000 -- #rt.time.hard = 200000 -- } -- flags = [ ifexists nofail ] -- } - - # The native communication protocol. - { name = libpipewire-module-protocol-native } -diff --git a/src/daemon/filter-chain/sink-dolby-surround.conf b/src/daemon/filter-chain/sink-dolby-surround.conf -index 943959266..e0fb22eb2 100644 ---- a/src/daemon/filter-chain/sink-dolby-surround.conf -+++ b/src/daemon/filter-chain/sink-dolby-surround.conf -@@ -12,15 +12,6 @@ context.spa-libs = { - } - - context.modules = [ -- { name = libpipewire-module-rtkit -- args = { -- #nice.level = -11 -- #rt.prio = 88 -- #rt.time.soft = 200000 -- #rt.time.hard = 200000 -- } -- flags = [ ifexists nofail ] -- } - { name = libpipewire-module-protocol-native } - { name = libpipewire-module-client-node } - { name = libpipewire-module-adapter } -diff --git a/src/daemon/filter-chain/sink-eq6.conf b/src/daemon/filter-chain/sink-eq6.conf -index 212c375bc..21b9d16f1 100644 ---- a/src/daemon/filter-chain/sink-eq6.conf -+++ b/src/daemon/filter-chain/sink-eq6.conf -@@ -12,15 +12,6 @@ context.spa-libs = { - } - - context.modules = [ -- { name = libpipewire-module-rtkit -- args = { -- #nice.level = -11 -- #rt.prio = 88 -- #rt.time.soft = 200000 -- #rt.time.hard = 200000 -- } -- flags = [ ifexists nofail ] -- } - { name = libpipewire-module-protocol-native } - { name = libpipewire-module-client-node } - { name = libpipewire-module-adapter } -diff --git a/src/daemon/filter-chain/sink-matrix-spatialiser.conf b/src/daemon/filter-chain/sink-matrix-spatialiser.conf -index 53e3b571f..daf707d53 100644 ---- a/src/daemon/filter-chain/sink-matrix-spatialiser.conf -+++ b/src/daemon/filter-chain/sink-matrix-spatialiser.conf -@@ -13,15 +13,6 @@ context.spa-libs = { - } - - context.modules = [ -- { name = libpipewire-module-rtkit -- args = { -- #nice.level = -11 -- #rt.prio = 88 -- #rt.time.soft = 200000 -- #rt.time.hard = 200000 -- } -- flags = [ ifexists nofail ] -- } - { name = libpipewire-module-protocol-native } - { name = libpipewire-module-client-node } - { name = libpipewire-module-adapter } -diff --git a/src/daemon/filter-chain/source-rnnoise.conf b/src/daemon/filter-chain/source-rnnoise.conf -index 63f6d65fa..45b8e1098 100644 ---- a/src/daemon/filter-chain/source-rnnoise.conf -+++ b/src/daemon/filter-chain/source-rnnoise.conf -@@ -12,15 +12,6 @@ context.spa-libs = { - } - - context.modules = [ -- { name = libpipewire-module-rtkit -- args = { -- #nice.level = -11 -- #rt.prio = 88 -- #rt.time.soft = 200000 -- #rt.time.hard = 200000 -- } -- flags = [ ifexists nofail ] -- } - { name = libpipewire-module-protocol-native } - { name = libpipewire-module-client-node } - { name = libpipewire-module-adapter } -diff --git a/src/daemon/jack.conf.in b/src/daemon/jack.conf.in -index d7e689940..9f4f5c902 100644 ---- a/src/daemon/jack.conf.in -+++ b/src/daemon/jack.conf.in -@@ -29,16 +29,6 @@ context.modules = [ - # If nofail is given, module initialization failures are ignored. - # - # -- # Uses RTKit to boost the data thread priority. -- { name = libpipewire-module-rtkit -- args = { -- #nice.level = -11 -- #rt.prio = 88 -- #rt.time.soft = 200000 -- #rt.time.hard = 200000 -- } -- flags = [ ifexists nofail ] -- } - - # The native communication protocol. - { name = libpipewire-module-protocol-native } -diff --git a/src/daemon/media-session.d/media-session.conf b/src/daemon/media-session.d/media-session.conf -index 914d9154f..7b934985a 100644 ---- a/src/daemon/media-session.d/media-session.conf -+++ b/src/daemon/media-session.d/media-session.conf -@@ -27,16 +27,6 @@ context.modules = [ - # If ifexists is given, the module is ignored when it is not found. - # If nofail is given, module initialization failures are ignored. - # -- # Uses RTKit to boost the data thread priority. -- { name = libpipewire-module-rtkit -- args = { -- #nice.level = -11 -- #rt.prio = 88 -- #rt.time.soft = 200000 -- #rt.time.hard = 200000 -- } -- flags = [ ifexists nofail ] -- } - - # The native communication protocol. - { name = libpipewire-module-protocol-native } -diff --git a/src/daemon/meson.build b/src/daemon/meson.build -index 0429698a8..1b66980c3 100644 ---- a/src/daemon/meson.build -+++ b/src/daemon/meson.build -@@ -28,7 +28,6 @@ conf_config_uninstalled.set('comment', '') - conf_files = [ - [ 'pipewire.conf.in', 'pipewire.conf' ], - [ 'client.conf.in', 'client.conf' ], -- [ 'client-rt.conf.in', 'client-rt.conf' ], - [ 'jack.conf.in', 'jack.conf' ], - [ 'pipewire-pulse.conf.in', 'pipewire-pulse.conf' ] - ] -diff --git a/src/daemon/pipewire-pulse.conf.in b/src/daemon/pipewire-pulse.conf.in -index c481684ef..849909e90 100644 ---- a/src/daemon/pipewire-pulse.conf.in -+++ b/src/daemon/pipewire-pulse.conf.in -@@ -14,15 +14,6 @@ context.spa-libs = { - } - - context.modules = [ -- { name = libpipewire-module-rtkit -- args = { -- #nice.level = -11 -- #rt.prio = 88 -- #rt.time.soft = 200000 -- #rt.time.hard = 200000 -- } -- flags = [ ifexists nofail ] -- } - { name = libpipewire-module-protocol-native } - { name = libpipewire-module-client-node } - { name = libpipewire-module-adapter } -diff --git a/src/daemon/pipewire.conf.in b/src/daemon/pipewire.conf.in -index bbafa134b..a23803813 100644 ---- a/src/daemon/pipewire.conf.in -+++ b/src/daemon/pipewire.conf.in -@@ -62,16 +62,6 @@ context.modules = [ - # If nofail is given, module initialization failures are ignored. - # - -- # Uses RTKit to boost the data thread priority. -- { name = libpipewire-module-rtkit -- args = { -- #nice.level = -11 -- #rt.prio = 88 -- #rt.time.soft = 200000 -- #rt.time.hard = 200000 -- } -- flags = [ ifexists nofail ] -- } - - # The native communication protocol. - { name = libpipewire-module-protocol-native } --- -2.30.2 - diff --git a/files/0002-Let-pipewire-pulse-services-conflict-with-their-puls.patch b/files/0002-Let-pipewire-pulse-services-conflict-with-their-puls.patch deleted file mode 100644 --- a/files/0002-Let-pipewire-pulse-services-conflict-with-their-puls.patch +++ /dev/null @@ -1,41 +0,0 @@ -From d2e1b968afe83be089d2009725e545491310f258 Mon Sep 17 00:00:00 2001 -From: Sjoerd Simons -Date: Sat, 22 May 2021 14:17:19 +0200 -Subject: [PATCH] Let pipewire-pulse services conflict with their pulseaudio - counterparts - -You can only run either pulseaudio *or* the pipewire-pulse daemon at one -time. So make the pipewire-pulse units conflict with their pulseaudio -counterparts to avoid both running at the same time ---- - src/daemon/systemd/user/pipewire-pulse.service.in | 1 + - src/daemon/systemd/user/pipewire-pulse.socket | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/src/daemon/systemd/user/pipewire-pulse.service.in b/src/daemon/systemd/user/pipewire-pulse.service.in -index 061e2acb..56b8a64f 100644 ---- a/src/daemon/systemd/user/pipewire-pulse.service.in -+++ b/src/daemon/systemd/user/pipewire-pulse.service.in -@@ -17,6 +17,7 @@ Requires=pipewire-pulse.socket - ConditionUser=!root - Wants=pipewire.service - After=pipewire.service -+Conflicts=pulseaudio.service - - [Service] - LockPersonality=yes -diff --git a/src/daemon/systemd/user/pipewire-pulse.socket b/src/daemon/systemd/user/pipewire-pulse.socket -index 39d2c897..1ae5edaf 100644 ---- a/src/daemon/systemd/user/pipewire-pulse.socket -+++ b/src/daemon/systemd/user/pipewire-pulse.socket -@@ -1,6 +1,7 @@ - [Unit] - Description=PipeWire PulseAudio - ConditionUser=!root -+Conflicts=pulseaudio.socket - - [Socket] - Priority=6 --- -2.30.2 - diff --git a/package.yml b/package.yml --- a/package.yml +++ b/package.yml @@ -1,8 +1,8 @@ name : pipewire -version : 0.3.28 -release : 21 +version : 0.3.31 +release : 22 source : - - https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/0.3.28/pipewire-0.3.28.tar.gz : 1d9271e121a5049aef379e9bb7c50524faa6f971e668806637d7b9df1b7cab88 + - https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/0.3.31/pipewire-0.3.31.tar.gz : 2fec0eb47dbfcad51fb8bb3d59c26fe57e09204d63c9d2776070dbdc08aaaaae homepage : https://pipewire.org/ license : - MIT @@ -17,7 +17,6 @@ emul32 : yes builddeps : - pkgconfig32(alsa) - - pkgconfig32(avahi-client) - pkgconfig32(dbus-1) - pkgconfig32(gstreamer-1.0) - pkgconfig32(gstreamer-plugins-base-1.0) @@ -27,15 +26,19 @@ - pkgconfig32(ncursesw) - pkgconfig32(sdl2) - pkgconfig32(sndfile) + - pkgconfig32(webrtc-audio-processing) - pkgconfig32(x11) + - pkgconfig(avahi-client) - pkgconfig(bluez) - pkgconfig(fdk-aac) - pkgconfig(jack) - pkgconfig(ldacBT-abr) - pkgconfig(libavcodec) - pkgconfig(libopenaptx) + - pkgconfig(libusb-1.0) - pkgconfig(sbc) - - vulkan-headers +rundeps : + - rtkit patterns : - jack : - /usr/bin/pw-jack @@ -45,21 +48,19 @@ - /usr/share/pipewire/jack.conf - /usr/share/pipewire/media-session.d/with-jack setup : | - patch -Np1 < "${pkgfiles}"/0001-Disable-rtkit-support.patch - patch -Np1 < "${pkgfiles}"/0002-Let-pipewire-pulse-services-conflict-with-their-puls.patch - COMMON_OPTIONS="-Dsystemd=enabled \ + -Decho-cancel-webrtc=enabled \ -Dudevrulesdir=%libdir%/udev/rules.d \ -Dlibjack-path=%libdir%/pipewire-0.3/jack" if [[ -n "${EMUL32BUILD}" ]]; then CONFIGURE_OPTIONS="$COMMON_OPTIONS -Dffmpeg=disabled \ + -Davahi=disabled \ -Dbluez5=disabled \ -Dbluez5-codec-aptx=disabled \ -Dbluez5-codec-ldac=disabled \ -Dbluez5-codec-aac=disabled \ - -Djack=disabled \ - -Dvulkan=disabled" + -Djack=disabled else CONFIGURE_OPTIONS="$COMMON_OPTIONS -Dffmpeg=enabled" fi diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml --- a/pspec_x86_64.xml +++ b/pspec_x86_64.xml @@ -3,8 +3,8 @@ pipewire https://pipewire.org/ - Joshua Strobl - joshua@getsol.us + Reilly Brogan + solus@reillybrogan.com MIT LGPL-2.1-or-later @@ -55,7 +55,7 @@ /usr/lib64/alsa-lib/libasound_module_pcm_pipewire.so /usr/lib64/gstreamer-1.0/libgstpipewire.so /usr/lib64/libpipewire-0.3.so.0 - /usr/lib64/libpipewire-0.3.so.0.328.0 + /usr/lib64/libpipewire-0.3.so.0.331.0 /usr/lib64/pipewire-0.3/libpipewire-module-access.so /usr/lib64/pipewire-0.3/libpipewire-module-adapter.so /usr/lib64/pipewire-0.3/libpipewire-module-client-device.so @@ -71,6 +71,7 @@ /usr/lib64/pipewire-0.3/libpipewire-module-protocol-pulse.so /usr/lib64/pipewire-0.3/libpipewire-module-protocol-simple.so /usr/lib64/pipewire-0.3/libpipewire-module-pulse-tunnel.so + /usr/lib64/pipewire-0.3/libpipewire-module-rt.so /usr/lib64/pipewire-0.3/libpipewire-module-rtkit.so /usr/lib64/pipewire-0.3/libpipewire-module-session-manager.so /usr/lib64/pipewire-0.3/libpipewire-module-spa-device-factory.so @@ -92,7 +93,6 @@ /usr/lib64/spa-0.2/videoconvert/libspa-videoconvert.so /usr/lib64/spa-0.2/videotestsrc/libspa-videotestsrc.so /usr/lib64/spa-0.2/volume/libspa-volume.so - /usr/lib64/spa-0.2/vulkan/libspa-vulkan.so /usr/lib64/udev/rules.d/90-pipewire-alsa.rules /usr/share/alsa-card-profile/mixer/paths/analog-input-aux.conf /usr/share/alsa-card-profile/mixer/paths/analog-input-dock-mic.conf @@ -152,6 +152,7 @@ /usr/share/alsa-card-profile/mixer/profile-sets/maudio-fasttrack-pro.conf /usr/share/alsa-card-profile/mixer/profile-sets/native-instruments-audio4dj.conf /usr/share/alsa-card-profile/mixer/profile-sets/native-instruments-audio8dj.conf + /usr/share/alsa-card-profile/mixer/profile-sets/native-instruments-komplete-audio6.conf /usr/share/alsa-card-profile/mixer/profile-sets/native-instruments-korecontroller.conf /usr/share/alsa-card-profile/mixer/profile-sets/native-instruments-traktor-audio10.conf /usr/share/alsa-card-profile/mixer/profile-sets/native-instruments-traktor-audio2.conf @@ -214,6 +215,7 @@ /usr/share/locale/uk/LC_MESSAGES/pipewire.mo /usr/share/locale/zh_CN/LC_MESSAGES/pipewire.mo /usr/share/locale/zh_TW/LC_MESSAGES/pipewire.mo + /usr/share/pipewire/client-rt.conf /usr/share/pipewire/client.conf /usr/share/pipewire/filter-chain/demonic.conf /usr/share/pipewire/filter-chain/sink-dolby-surround.conf @@ -221,6 +223,7 @@ /usr/share/pipewire/filter-chain/sink-matrix-spatialiser.conf /usr/share/pipewire/filter-chain/source-rnnoise.conf /usr/share/pipewire/media-session.d/alsa-monitor.conf + /usr/share/pipewire/media-session.d/bluez-hardware.conf /usr/share/pipewire/media-session.d/bluez-monitor.conf /usr/share/pipewire/media-session.d/media-session.conf /usr/share/pipewire/media-session.d/v4l2-monitor.conf @@ -237,23 +240,23 @@ emul32 - pipewire + pipewire /usr/lib32/alsa-lib/libasound_module_ctl_pipewire.so /usr/lib32/alsa-lib/libasound_module_pcm_pipewire.so /usr/lib32/gstreamer-1.0/libgstpipewire.so /usr/lib32/libpipewire-0.3.so.0 - /usr/lib32/libpipewire-0.3.so.0.328.0 + /usr/lib32/libpipewire-0.3.so.0.331.0 /usr/lib32/pipewire-0.3/jack/libjack.so /usr/lib32/pipewire-0.3/jack/libjack.so.0 - /usr/lib32/pipewire-0.3/jack/libjack.so.0.328.0 + /usr/lib32/pipewire-0.3/jack/libjack.so.0.331.0 /usr/lib32/pipewire-0.3/jack/libjacknet.so /usr/lib32/pipewire-0.3/jack/libjacknet.so.0 - /usr/lib32/pipewire-0.3/jack/libjacknet.so.0.328.0 + /usr/lib32/pipewire-0.3/jack/libjacknet.so.0.331.0 /usr/lib32/pipewire-0.3/jack/libjackserver.so /usr/lib32/pipewire-0.3/jack/libjackserver.so.0 - /usr/lib32/pipewire-0.3/jack/libjackserver.so.0.328.0 + /usr/lib32/pipewire-0.3/jack/libjackserver.so.0.331.0 /usr/lib32/pipewire-0.3/libpipewire-module-access.so /usr/lib32/pipewire-0.3/libpipewire-module-adapter.so /usr/lib32/pipewire-0.3/libpipewire-module-client-device.so @@ -269,13 +272,13 @@ /usr/lib32/pipewire-0.3/libpipewire-module-protocol-pulse.so /usr/lib32/pipewire-0.3/libpipewire-module-protocol-simple.so /usr/lib32/pipewire-0.3/libpipewire-module-pulse-tunnel.so + /usr/lib32/pipewire-0.3/libpipewire-module-rt.so /usr/lib32/pipewire-0.3/libpipewire-module-rtkit.so /usr/lib32/pipewire-0.3/libpipewire-module-session-manager.so /usr/lib32/pipewire-0.3/libpipewire-module-spa-device-factory.so /usr/lib32/pipewire-0.3/libpipewire-module-spa-device.so /usr/lib32/pipewire-0.3/libpipewire-module-spa-node-factory.so /usr/lib32/pipewire-0.3/libpipewire-module-spa-node.so - /usr/lib32/pipewire-0.3/libpipewire-module-zeroconf-discover.so /usr/lib32/spa-0.2/alsa/libspa-alsa.so /usr/lib32/spa-0.2/audioconvert/libspa-audioconvert.so /usr/lib32/spa-0.2/audiomixer/libspa-audiomixer.so @@ -297,8 +300,8 @@ programming.devel - pipewire-devel - pipewire-32bit + pipewire-devel + pipewire-32bit /usr/lib32/libpipewire-0.3.so @@ -313,7 +316,7 @@ programming.devel - pipewire + pipewire /usr/include/pipewire-0.3/pipewire/array.h @@ -344,6 +347,7 @@ /usr/include/pipewire-0.3/pipewire/impl-device.h /usr/include/pipewire-0.3/pipewire/impl-factory.h /usr/include/pipewire-0.3/pipewire/impl-link.h + /usr/include/pipewire-0.3/pipewire/impl-metadata.h /usr/include/pipewire-0.3/pipewire/impl-module.h /usr/include/pipewire-0.3/pipewire/impl-node.h /usr/include/pipewire-0.3/pipewire/impl-port.h @@ -404,6 +408,7 @@ /usr/include/spa-0.2/spa/param/bluetooth/type-info.h /usr/include/spa-0.2/spa/param/format-utils.h /usr/include/spa-0.2/spa/param/format.h + /usr/include/spa-0.2/spa/param/latency-utils.h /usr/include/spa-0.2/spa/param/param.h /usr/include/spa-0.2/spa/param/profiler.h /usr/include/spa-0.2/spa/param/props.h @@ -433,6 +438,7 @@ /usr/include/spa-0.2/spa/support/loop.h /usr/include/spa-0.2/spa/support/plugin.h /usr/include/spa-0.2/spa/support/system.h + /usr/include/spa-0.2/spa/utils/ansi.h /usr/include/spa-0.2/spa/utils/defs.h /usr/include/spa-0.2/spa/utils/dict.h /usr/include/spa-0.2/spa/utils/hook.h @@ -457,19 +463,19 @@ multimedia.audio - pipewire + pipewire /usr/bin/pw-jack /usr/lib64/pipewire-0.3/jack/libjack.so /usr/lib64/pipewire-0.3/jack/libjack.so.0 - /usr/lib64/pipewire-0.3/jack/libjack.so.0.328.0 + /usr/lib64/pipewire-0.3/jack/libjack.so.0.331.0 /usr/lib64/pipewire-0.3/jack/libjacknet.so /usr/lib64/pipewire-0.3/jack/libjacknet.so.0 - /usr/lib64/pipewire-0.3/jack/libjacknet.so.0.328.0 + /usr/lib64/pipewire-0.3/jack/libjacknet.so.0.331.0 /usr/lib64/pipewire-0.3/jack/libjackserver.so /usr/lib64/pipewire-0.3/jack/libjackserver.so.0 - /usr/lib64/pipewire-0.3/jack/libjackserver.so.0.328.0 + /usr/lib64/pipewire-0.3/jack/libjackserver.so.0.331.0 /usr/lib64/spa-0.2/jack/libspa-jack.so /usr/share/ld.so.conf.d/pipewire-jack.conf /usr/share/pipewire/jack.conf @@ -477,12 +483,12 @@ - - 2021-06-15 - 0.3.28 + + 2021-06-29 + 0.3.31 Packaging update - Joshua Strobl - joshua@getsol.us + Reilly Brogan + solus@reillybrogan.com \ No newline at end of file