PulseAudio Marge Bot pushed to branch master at PulseAudio / pulseaudio
Commits: fa3b66d2 by Igor V. Kovalenko at 2021-11-06T13:45:30+03:00 lirc: Fix module version Including lirc_client.h header overrides PACKAGE_VERSION with the one from lirc packege. Fix this by moving lirc_client.h include after module definition block. Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/660> - - - - - 1 changed file: - src/modules/module-lirc.c Changes: ===================================== src/modules/module-lirc.c ===================================== @@ -26,8 +26,6 @@ #include <string.h> #include <stdlib.h> -#include <lirc/lirc_client.h> - #include <pulse/xmalloc.h> #include <pulsecore/module.h> @@ -43,6 +41,11 @@ PA_MODULE_VERSION(PACKAGE_VERSION); PA_MODULE_LOAD_ONCE(true); PA_MODULE_USAGE("config=<config file> sink=<sink name> appname=<lirc application name> volume_limit=<volume limit> volume_step=<volume change step>"); +/* LIRC would provide it's own definition of PACKAGE_VERSION, include it after + * pulseaudio module definition block to prevent module loader version mismatch. + */ +#include <lirc/lirc_client.h> + static const char* const valid_modargs[] = { "config", "sink", View it on GitLab: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/commit/fa3b66d24919fe7e655ce489f504369ffecb2ae8 -- View it on GitLab: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/commit/fa3b66d24919fe7e655ce489f504369ffecb2ae8 You're receiving this email because of your account on gitlab.freedesktop.org.
