diff options
| m--------- | conf.d/app-templates | 0 | ||||
| -rw-r--r-- | conf.d/cmake/00-debian-osconfig.cmake | 2 | ||||
| -rw-r--r-- | conf.d/cmake/00-default-osconfig.cmake | 1 | ||||
| -rw-r--r-- | conf.d/cmake/00-opensuse-osconfig.cmake | 2 | ||||
| -rw-r--r-- | conf.d/cmake/config.cmake | 1 | ||||
| -rw-r--r-- | plugins/alsa/alsa-bluez.c | 4 |
6 files changed, 8 insertions, 2 deletions
diff --git a/conf.d/app-templates b/conf.d/app-templates -Subproject 9c1a0fb10dda08bebffb490152b5cdde6420e18 +Subproject 3dc85ecc9693a3a4af6d1143507f56b6800d523 diff --git a/conf.d/cmake/00-debian-osconfig.cmake b/conf.d/cmake/00-debian-osconfig.cmake new file mode 100644 index 0000000..7bc3b57 --- /dev/null +++ b/conf.d/cmake/00-debian-osconfig.cmake @@ -0,0 +1,2 @@ +list(APPEND PKG_REQUIRED_LIST lua>=5.3 alsa>=1.1.4) +set(CMAKE_INSTALL_PREFIX $ENV{HOME}/opt)
\ No newline at end of file diff --git a/conf.d/cmake/00-default-osconfig.cmake b/conf.d/cmake/00-default-osconfig.cmake new file mode 100644 index 0000000..c089c52 --- /dev/null +++ b/conf.d/cmake/00-default-osconfig.cmake @@ -0,0 +1 @@ +list(APPEND PKG_REQUIRED_LIST alsa>=1.1.6) diff --git a/conf.d/cmake/00-opensuse-osconfig.cmake b/conf.d/cmake/00-opensuse-osconfig.cmake index 3f2e833..4e433f6 100644 --- a/conf.d/cmake/00-opensuse-osconfig.cmake +++ b/conf.d/cmake/00-opensuse-osconfig.cmake @@ -1,4 +1,4 @@ message(STATUS "*** Notice: OpenSuSe LUA-5.3+DynApi") -list(APPEND PKG_REQUIRED_LIST lua>=5.3) +list(APPEND PKG_REQUIRED_LIST lua>=5.3 alsa>=1.1.4) set(CMAKE_INSTALL_PREFIX $ENV{HOME}/opt) set(USE_EFENCE 0) diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake index 2b8bd06..f2dd44f 100644 --- a/conf.d/cmake/config.cmake +++ b/conf.d/cmake/config.cmake @@ -74,7 +74,6 @@ set (PKG_REQUIRED_LIST afb-daemon>=4.0 libmicrohttpd>=0.9.55 uuid - alsa>=1.1.6 lua ) diff --git a/plugins/alsa/alsa-bluez.c b/plugins/alsa/alsa-bluez.c index bd6bc99..53612df 100644 --- a/plugins/alsa/alsa-bluez.c +++ b/plugins/alsa/alsa-bluez.c @@ -37,8 +37,12 @@ void alsa_bluez_init() { if (initialized) goto failed; +#if SND_LIB_VERSION >= (1<<16|1<<8|6) char errbuf[256]; void * dl = snd_dlopen(ALSA_BLUEZ_PROXY_LIB, RTLD_NOW, errbuf, 256); +#else + void * dl = snd_dlopen(ALSA_BLUEZ_PROXY_LIB, RTLD_NOW); +#endif if (!dl) { printf("Failed to open bluealsa proxy plugin\n"); goto failed; |