diff --git a/abi_symbols b/abi_symbols --- a/abi_symbols +++ b/abi_symbols @@ -387,6 +387,8 @@ libjackserver.so.0:jackctl_wait_signals libjackserver.so.0:silent_jack_error_callback libjackserver.so.0:silent_jack_info_callback +libpipewire-0.3.so.0:PW_LOG_TOPIC_DEFAULT +libpipewire-0.3.so.0:_pw_log_topic_new libpipewire-0.3.so.0:pw_buffers_clear libpipewire-0.3.so.0:pw_buffers_negotiate libpipewire-0.3.so.0:pw_check_option @@ -633,6 +635,8 @@ libpipewire-0.3.so.0:pw_log_get libpipewire-0.3.so.0:pw_log_level libpipewire-0.3.so.0:pw_log_log +libpipewire-0.3.so.0:pw_log_logt +libpipewire-0.3.so.0:pw_log_logtv libpipewire-0.3.so.0:pw_log_logv libpipewire-0.3.so.0:pw_log_set libpipewire-0.3.so.0:pw_log_set_level @@ -842,6 +846,7 @@ libspa-videoconvert.so:spa_handle_factory_enum libspa-videotestsrc.so:spa_handle_factory_enum libspa-volume.so:spa_handle_factory_enum +pipewire:PW_LOG_TOPIC_DEFAULT pipewire:optarg pipewire:pw_log_level pipewire:stderr @@ -850,38 +855,48 @@ pipewire-media-session:pw_log_level pipewire-media-session:stderr pipewire-media-session:stdout +pipewire-pulse:PW_LOG_TOPIC_DEFAULT pipewire-pulse:optarg pipewire-pulse:pw_log_level pipewire-pulse:stderr pipewire-pulse:stdout +pw-cat:PW_LOG_TOPIC_DEFAULT pw-cat:optarg pw-cat:optind pw-cat:pw_log_level pw-cat:stderr pw-cat:stdout +pw-cli:PW_LOG_TOPIC_DEFAULT pw-cli:optarg pw-cli:optind pw-cli:pw_log_level +pw-cli:rl_attempted_completion_function +pw-cli:rl_attempted_completion_over pw-cli:stderr pw-cli:stdout +pw-dot:PW_LOG_TOPIC_DEFAULT pw-dot:optarg pw-dot:pw_log_level pw-dot:stderr pw-dot:stdout +pw-dump:PW_LOG_TOPIC_DEFAULT pw-dump:optarg pw-dump:optind pw-dump:pw_log_level pw-dump:stderr pw-dump:stdout +pw-link:PW_LOG_TOPIC_DEFAULT pw-link:optarg pw-link:optind pw-link:pw_log_level pw-link:stderr pw-link:stdout +pw-loopback:PW_LOG_TOPIC_DEFAULT pw-loopback:optarg pw-loopback:pw_log_level pw-loopback:stderr pw-loopback:stdout +pw-metadata:PW_LOG_TOPIC_DEFAULT pw-metadata:optarg pw-metadata:optind pw-metadata:pw_log_level @@ -891,20 +906,24 @@ pw-mididump:optind pw-mididump:stderr pw-mididump:stdout +pw-mon:PW_LOG_TOPIC_DEFAULT pw-mon:optarg pw-mon:pw_log_level pw-mon:stderr pw-mon:stdout +pw-profiler:PW_LOG_TOPIC_DEFAULT pw-profiler:optarg pw-profiler:pw_log_level pw-profiler:stderr pw-profiler:stdout +pw-reserve:PW_LOG_TOPIC_DEFAULT pw-reserve:optarg pw-reserve:pw_log_level pw-reserve:stderr pw-reserve:stdout pw-top:COLS pw-top:LINES +pw-top:PW_LOG_TOPIC_DEFAULT pw-top:optarg pw-top:pw_log_level pw-top:stderr diff --git a/abi_symbols32 b/abi_symbols32 --- a/abi_symbols32 +++ b/abi_symbols32 @@ -387,6 +387,8 @@ libjackserver.so.0:jackctl_wait_signals libjackserver.so.0:silent_jack_error_callback libjackserver.so.0:silent_jack_info_callback +libpipewire-0.3.so.0:PW_LOG_TOPIC_DEFAULT +libpipewire-0.3.so.0:_pw_log_topic_new libpipewire-0.3.so.0:pw_buffers_clear libpipewire-0.3.so.0:pw_buffers_negotiate libpipewire-0.3.so.0:pw_check_option @@ -633,6 +635,8 @@ libpipewire-0.3.so.0:pw_log_get libpipewire-0.3.so.0:pw_log_level libpipewire-0.3.so.0:pw_log_log +libpipewire-0.3.so.0:pw_log_logt +libpipewire-0.3.so.0:pw_log_logtv libpipewire-0.3.so.0:pw_log_logv libpipewire-0.3.so.0:pw_log_set libpipewire-0.3.so.0:pw_log_set_level diff --git a/abi_used_libs b/abi_used_libs --- a/abi_used_libs +++ b/abi_used_libs @@ -22,6 +22,7 @@ libncursesw.so.5 libpthread.so.0 libpulse.so.0 +libreadline.so.6 libsbc.so.1 libsndfile.so.1 libstdc++.so.6 diff --git a/abi_used_symbols b/abi_used_symbols --- a/abi_used_symbols +++ b/abi_used_symbols @@ -350,10 +350,10 @@ 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 +libc.so.6:fnmatch libc.so.6:fopen64 libc.so.6:fork libc.so.6:fputc @@ -861,6 +861,12 @@ libpulse.so.0:pa_threaded_mainloop_unlock libpulse.so.0:pa_threaded_mainloop_wait libpulse.so.0:pa_usec_to_bytes +libreadline.so.6:add_history +libreadline.so.6:rl_callback_handler_install +libreadline.so.6:rl_callback_handler_remove +libreadline.so.6:rl_callback_read_char +libreadline.so.6:rl_completion_matches +libreadline.so.6:rl_set_prompt libsbc.so.1:sbc_decode libsbc.so.1:sbc_encode libsbc.so.1:sbc_finish diff --git a/abi_used_symbols32 b/abi_used_symbols32 --- a/abi_used_symbols32 +++ b/abi_used_symbols32 @@ -319,6 +319,7 @@ libc.so.6:fgets libc.so.6:fileno libc.so.6:flock +libc.so.6:fnmatch libc.so.6:fopen64 libc.so.6:fork libc.so.6:fputc diff --git a/files/readline.patch b/files/readline.patch new file mode 100644 --- /dev/null +++ b/files/readline.patch @@ -0,0 +1,43 @@ +From 712aac1284d60032dc8a520a066e2d941a5b3dc1 Mon Sep 17 00:00:00 2001 +From: Joshua Strobl +Date: Thu, 30 Sep 2021 23:11:50 +0300 +Subject: [PATCH] Fix readline detection by allowing fallback to cc + find_library + +--- + meson.build | 12 +++++++++++- + 1 file changed, 11 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 42510c6fd..a0d733233 100644 +--- a/meson.build ++++ b/meson.build +@@ -326,6 +326,11 @@ dbus_dep = dependency('dbus-1') + sdl_dep = dependency('sdl2', required : get_option('sdl2')) + summary({'SDL 2': sdl_dep.found()}, bool_yn: true, section: 'Misc dependencies') + readline_dep = dependency('readline', required : false) ++ ++if not readline_dep.found() ++ readline_dep = cc.find_library('readline', required: false) ++endif ++ + summary({'readline (for pw-cli)': readline_dep.found()}, bool_yn: true, section: 'Misc dependencies') + ncurses_dep = dependency('ncursesw', required : false) + sndfile_dep = dependency('sndfile', version : '>= 1.0.20', required : get_option('sndfile')) +@@ -406,7 +411,12 @@ libinotify_dep = (build_machine.system() == 'freebsd' + : dependency('', required: false)) + + # On FreeBSD, libintl library is required for gettext +-libintl_dep = cc.find_library('intl', required: false) ++libintl_dep = dependency('intl', required: false) ++ ++if not libintl_dep.found() ++ libintl_dep = cc.find_library('intl', required: false) ++endif ++summary({'intl support': libintl_dep.found()}, bool_yn: true) + + need_alsa = get_option('pipewire-alsa').enabled() or get_option('session-managers').contains('media-session') + alsa_dep = dependency('alsa', version : '>=1.1.7', required: need_alsa) +-- +GitLab + diff --git a/package.yml b/package.yml --- a/package.yml +++ b/package.yml @@ -1,8 +1,8 @@ name : pipewire -version : 0.3.37 -release : 29 +version : 0.3.38 +release : 30 source : - - https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/0.3.37/pipewire-0.3.37.tar.gz : 28b7c7e015a5a56b67d96782bffc8e69502897c75fee647892b17f052b9c4158 + - https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/0.3.38/pipewire-0.3.38.tar.gz : 2a2424cea5bfdca88503fd8616fff891aa8355e850cab19e875050fe60c35ce7 homepage : https://pipewire.org/ license : - MIT @@ -37,6 +37,7 @@ - pkgconfig(libfreeaptx) - pkgconfig(libusb-1.0) - pkgconfig(sbc) + - readline-devel rundeps : - rtkit patterns : @@ -48,6 +49,7 @@ - /usr/share/pipewire/jack.conf - /usr/share/pipewire/media-session.d/with-jack setup : | + %patch -p1 < $pkgfiles/readline.patch COMMON_OPTIONS="-Dsystemd=enabled \ -Decho-cancel-webrtc=enabled \ -Dudevrulesdir=%libdir%/udev/rules.d \ diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml --- a/pspec_x86_64.xml +++ b/pspec_x86_64.xml @@ -56,7 +56,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.337.0 + /usr/lib64/libpipewire-0.3.so.0.338.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 @@ -249,23 +249,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.337.0 + /usr/lib32/libpipewire-0.3.so.0.338.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.337.0 + /usr/lib32/pipewire-0.3/jack/libjack.so.0.338.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.337.0 + /usr/lib32/pipewire-0.3/jack/libjacknet.so.0.338.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.337.0 + /usr/lib32/pipewire-0.3/jack/libjackserver.so.0.338.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 @@ -309,8 +309,8 @@ programming.devel - pipewire-devel - pipewire-32bit + pipewire-devel + pipewire-32bit /usr/lib32/libpipewire-0.3.so @@ -325,7 +325,7 @@ programming.devel - pipewire + pipewire /usr/include/pipewire-0.3/pipewire/array.h @@ -477,19 +477,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.337.0 + /usr/lib64/pipewire-0.3/jack/libjack.so.0.338.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.337.0 + /usr/lib64/pipewire-0.3/jack/libjacknet.so.0.338.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.337.0 + /usr/lib64/pipewire-0.3/jack/libjackserver.so.0.338.0 /usr/lib64/spa-0.2/jack/libspa-jack.so /usr/share/ld.so.conf.d/pipewire-jack.conf /usr/share/pipewire/jack.conf @@ -497,12 +497,12 @@ - - 2021-09-26 - 0.3.37 + + 2021-09-30 + 0.3.38 Packaging update Thomas Staudinger Staudi.Kaos@gmail.com \ No newline at end of file