Fixes 'multiple definition errors' when building with GCC 10+ From: https://bugs.gentoo.org/710796 Originally from: https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/a62e41e and https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/7a976c7 --- a/spa/plugins/bluez5/a2dp-codecs.h +++ b/spa/plugins/bluez5/a2dp-codecs.h @@ -284,15 +284,15 @@ } } -const a2dp_sbc_t bluez_a2dp_sbc; +extern const a2dp_sbc_t bluez_a2dp_sbc; #if ENABLE_MP3 -const a2dp_mpeg_t bluez_a2dp_mpeg; +extern const a2dp_mpeg_t bluez_a2dp_mpeg; #endif #if ENABLE_AAC -const a2dp_aac_t bluez_a2dp_aac; +extern const a2dp_aac_t bluez_a2dp_aac; #endif #if ENABLE_APTX -const a2dp_aptx_t bluez_a2dp_aptx; +extern const a2dp_aptx_t bluez_a2dp_aptx; #endif #endif --- a/spa/plugins/bluez5/bluez5-monitor.c +++ b/spa/plugins/bluez5/bluez5-monitor.c @@ -75,7 +75,7 @@ struct spa_list transport_list; }; -struct spa_handle_factory spa_a2dp_sink_factory; +extern struct spa_handle_factory spa_a2dp_sink_factory; static void fill_item(struct spa_bt_monitor *this, struct spa_bt_transport *transport, struct spa_pod **result, struct spa_pod_builder *builder) --- a/spa/plugins/bluez5/meson.build +++ b/spa/plugins/bluez5/meson.build @@ -1,7 +1,8 @@ bluez5_sources = ['plugin.c', 'a2dp-sink.c', - 'bluez5-monitor.c'] + 'a2dp-codecs.c', + 'bluez5-monitor.c'] bluez5lib = shared_library('spa-bluez5', bluez5_sources, b89addc9ab25b5e488c443575'>commitdiff
path: root/gnu/tests/data/jami-dummy-account.dat
AgeCommit message (Expand)Author
2021-08-02Reinstate "services: Add a service for Jami."...This reverts commit 4673f817938d9d2b1b40a072ab2e0c44a32ccc97, which reverted commit 69dcc24c9f0cdfea674eb690e7755d26a25ced2b with the fix detailed below. Thanks to Christopher Baines for reporting the failure and proposing a fix. * guix/self.scm (compiled-guix) [*system-test-modules*]: Add the test data files via the 'extra-files' argument. * gnu/local.mk (dist_patch_DATA): Move the tests/data/jami-dummy-account.dat file to... * gnu/local.mk (MODULES_NOT_COMPILED): ... here. Maxim Cournoyer
2021-08-02Revert "services: Add a service for Jami."...This reverts commit 69dcc24c9f0cdfea674eb690e7755d26a25ced2b. It broke 'guix pull'. Maxim Cournoyer
2021-08-02services: Add a service for Jami....* gnu/services/telephony.scm (string-or-computed-file?) (string-list?, account-fingerprint-list?): New procedures. (maybe-string-list, maybe-account-fingerprint-list) (maybe-boolean, maybe-string, jami-account-list): New configuration field types. (serialize-string-list, serialize-boolean, serialize-string) (jami-account, jami-account->alist, jami-configuration) (jami-account-list?, jami-account-list-maybe): New procedures. (%jami-accounts): New variable. (jami-configuration->command-line-arguments): New procedure. (jami-dbus-session-activation, jami-shepherd-services): New procedures. (jami-service-type): New variable. * gnu/build/jami-service.scm: New file. * gnu/tests/data/jami-dummy-account.dat: Likewise. * gnu/tests/telephony.scm: Likewise. * gnu/local.mk (GNU_SYSTEM_MODULES): Register them. * Makefile.am (SCM_TESTS): Register the test file. (dist_patch_DATA): Register the new data file. * doc/guix.texi (Telephony Services): Document it. Maxim Cournoyer