mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-11 13:30:02 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

lirc: Fix module version

Browse source 
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>
This commit is contained in:
Igor V. Kovalenko 2021-11-06 12:44:25 +03:00
parent add6e71e4c
commit fa3b66d249
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/modules/module-lirc.c
View file

@ -26,8 +26,6 @@
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include <lirc/lirc_client.h>
#include <pulse/xmalloc.h> #include <pulse/xmalloc.h>
#include <pulsecore/module.h> #include <pulsecore/module.h>
@ -43,6 +41,11 @@ PA_MODULE_VERSION(PACKAGE_VERSION);
PA_MODULE_LOAD_ONCE(true); 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>"); 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[] = { static const char* const valid_modargs[] = {
"config", "config",
"sink", "sink",