PulseAudio Marge Bot pushed to branch master at PulseAudio / pulseaudio
Commits: 4f0f215a by Igor V. Kovalenko at 2021-01-18T17:57:41+00:00 buildsys: autotools: move map-file to src/pulse Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/461> - - - - - 353c0137 by Igor V. Kovalenko at 2021-01-18T17:57:41+00:00 buildsys: meson: implement update-map-file target Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/461> - - - - - f7c84b32 by Igor V. Kovalenko at 2021-01-18T17:57:41+00:00 map-file: regenerate Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/461> - - - - - 5 changed files: - configure.ac - + scripts/generate-map-file.sh - src/Makefile.am - src/map-file → src/pulse/map-file - src/pulse/meson.build Changes: ===================================== configure.ac ===================================== @@ -195,8 +195,8 @@ AS_CASE([" $CFLAGS "], [*" -O0 "*], [], [ # Check whether the linker supports the -version-script option. # The Make variable $(srcdir) needs to be in the LDFLAGS in that form, # so that it is expanded the right way in every subdir. -AX_CHECK_LINK_FLAG(["-Wl,-version-script=${srcdir}/src/map-file"], - [VERSIONING_LDFLAGS='-Wl,-version-script=$(abs_top_srcdir)/src/map-file']) +AX_CHECK_LINK_FLAG(["-Wl,-version-script=${srcdir}/src/pulse/map-file"], + [VERSIONING_LDFLAGS='-Wl,-version-script=$(abs_top_srcdir)/src/pulse/map-file']) AC_SUBST([VERSIONING_LDFLAGS]) # Use immediate (now) bindings; avoids the funky re-call in itself. ===================================== scripts/generate-map-file.sh ===================================== @@ -0,0 +1,23 @@ +#!/bin/bash + +# Generator for linker version script. +# We use the same linker version script for all public .so files +# +# generate-map-file.sh where-is/map-file public_interface_1.h public_interface_2.h ... public_interface_N.h +# + +CTAGS_IDENTIFIER_LIST="PA_GCC_MALLOC,PA_GCC_ALLOC_SIZE2,PA_GCC_ALLOC_SIZE,PA_GCC_PURE,PA_GCC_CONST,PA_GCC_DEPRECATED,PA_GCC_PRINTF_ATTR" + +print_map_file() { + echo "PULSE_0 {" + echo "global:" + ctags -I ${CTAGS_IDENTIFIER_LIST} -f - --c-kinds=p "$@" | awk '/^pa_/ { print $1 ";" }' | sort + echo "local:" + echo "*;" + echo "};" +} + +TARGET_FILE=$1 +shift + +cd "${MESON_SOURCE_ROOT}/${MESON_SUBDIR}" && print_map_file "$@" > ${TARGET_FILE} ===================================== src/Makefile.am ===================================== @@ -107,7 +107,7 @@ EXTRA_DIST = \ utils/qpaeq \ utils/pa-info \ daemon/pulseaudio.desktop.in \ - map-file \ + pulse/map-file \ daemon/pulseaudio-system.conf \ modules/echo-cancel/adrian-license.txt \ modules/gsettings/org.freedesktop.pulseaudio.gschema.xml \ @@ -2277,7 +2277,7 @@ update-map-file: ctags -I PA_GCC_MALLOC,PA_GCC_ALLOC_SIZE2,PA_GCC_ALLOC_SIZE,PA_GCC_PURE,PA_GCC_CONST,PA_GCC_DEPRECATED,PA_GCC_PRINTF_ATTR -f - --c-kinds=p $(pulseinclude_HEADERS) | awk '/^pa_/ { print $$1 ";" }' | sort ; \ echo "local:" ; \ echo "*;" ; \ - echo "};" ) > $(srcdir)/map-file + echo "};" ) > $(srcdir)/pulse/map-file update-all: update-ffmpeg update-map-file ===================================== src/map-file → src/pulse/map-file ===================================== @@ -61,7 +61,6 @@ pa_context_get_source_info_by_name; pa_context_get_source_info_list; pa_context_get_source_output_info; pa_context_get_source_output_info_list; -pa_context_set_port_latency_offset; pa_context_get_state; pa_context_get_tile_size; pa_context_is_local; @@ -94,6 +93,7 @@ pa_context_set_default_sink; pa_context_set_default_source; pa_context_set_event_callback; pa_context_set_name; +pa_context_set_port_latency_offset; pa_context_set_sink_input_mute; pa_context_set_sink_input_volume; pa_context_set_sink_mute_by_index; @@ -102,10 +102,10 @@ pa_context_set_sink_port_by_index; pa_context_set_sink_port_by_name; pa_context_set_sink_volume_by_index; pa_context_set_sink_volume_by_name; -pa_context_set_source_output_mute; -pa_context_set_source_output_volume; pa_context_set_source_mute_by_index; pa_context_set_source_mute_by_name; +pa_context_set_source_output_mute; +pa_context_set_source_output_volume; pa_context_set_source_port_by_index; pa_context_set_source_port_by_name; pa_context_set_source_volume_by_index; @@ -176,19 +176,19 @@ pa_ext_stream_restore_test; pa_ext_stream_restore_write; pa_format_info_copy; pa_format_info_free; -pa_format_info_from_string; +pa_format_info_free_string_array; pa_format_info_from_sample_spec; +pa_format_info_from_string; pa_format_info_get_channel_map; pa_format_info_get_channels; -pa_format_info_get_prop_type; pa_format_info_get_prop_int; -pa_format_info_get_prop_int_range; pa_format_info_get_prop_int_array; +pa_format_info_get_prop_int_range; pa_format_info_get_prop_string; pa_format_info_get_prop_string_array; +pa_format_info_get_prop_type; pa_format_info_get_rate; pa_format_info_get_sample_format; -pa_format_info_free_string_array; pa_format_info_is_compatible; pa_format_info_is_pcm; pa_format_info_new; @@ -210,8 +210,8 @@ pa_get_fqdn; pa_get_home_dir; pa_get_host_name; pa_get_library_version; -pa_gettimeofday; pa_get_user_name; +pa_gettimeofday; pa_glib_mainloop_free; pa_glib_mainloop_get_api; pa_glib_mainloop_new; @@ -251,7 +251,6 @@ pa_message_params_write_raw; pa_message_params_write_string; pa_message_params_write_uint64; pa_msleep; -pa_thread_make_realtime; pa_operation_cancel; pa_operation_get_state; pa_operation_ref; @@ -375,6 +374,7 @@ pa_sw_volume_multiply; pa_sw_volume_snprint_dB; pa_sw_volume_to_dB; pa_sw_volume_to_linear; +pa_thread_make_realtime; pa_threaded_mainloop_accept; pa_threaded_mainloop_free; pa_threaded_mainloop_get_api; @@ -403,8 +403,8 @@ pa_utf8_valid; pa_volume_snprint; pa_volume_snprint_verbose; pa_xfree; -pa_xmalloc; pa_xmalloc0; +pa_xmalloc; pa_xmemdup; pa_xrealloc; pa_xstrdup; ===================================== src/pulse/meson.build ===================================== @@ -72,7 +72,11 @@ if glib_dep.found() libpulse_headers += 'glib-mainloop.h' endif -versioning_link_args = '-Wl,-version-script=' + join_paths(meson.source_root(), 'src', 'map-file') +run_target('update-map-file', + command : [ join_paths(meson.source_root(), 'scripts/generate-map-file.sh'), 'map-file', + [ libpulse_headers, 'simple.h', join_paths(meson.build_root(), 'src', 'pulse', 'version.h') ] ]) + +versioning_link_args = '-Wl,-version-script=' + join_paths(meson.source_root(), 'src', 'pulse', 'map-file') libpulse = shared_library('pulse', libpulse_sources, View it on GitLab: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/compare/6d41b93cdb011a08d01770624a8fe5bb9720b586...f7c84b3217a5f21824d12705e71373c363c9df0f -- View it on GitLab: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/compare/6d41b93cdb011a08d01770624a8fe5bb9720b586...f7c84b3217a5f21824d12705e71373c363c9df0f You're receiving this email because of your account on gitlab.freedesktop.org.
_______________________________________________ pulseaudio-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/pulseaudio-commits
