summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Bultel <thierry.bultel@iot.bzh>2018-09-20 13:55:25 +0200
committerThierry Bultel <thierry.bultel@iot.bzh>2018-09-20 14:00:12 +0200
commita07c4ca8162affc61a5b0e5db8485f0753cd465b (patch)
treec2915279454ffe38c3eea47885f3642b4d0b3de7
parenta84a9312af0397e71a584f59e77e8a32d92c2fef (diff)
removed the dependency to alsalib-1.1.6 for host
This fixes the compilation for hosts (Ubuntu, fedora, opensuse), that do not have alsalib-1.1.6 Notice that this fix needed another one in app-template, since the OS detection was broken. These are the changes brought by the bump of app-templates: (3dc85ec - Thierry Bultel) common.cmake: fixed erroneous search path for os-release (7fa5e5a - Romain Forlot) Fix: missing gcov symbol in compiled binaries (76e12e7 - CorentinLGS) app-templates doc: Changed doc to fit new format. (02f45f1 - Romain Forlot) Update Docs (52ae181 - Romain Forlot) Fix: typo (f0b24b0 - Romain Forlot) Rollback about TEST build type (e841a77 - Romain Forlot) Adding a TEST build type (994ebc1 - Romain Forlot) Change default compilation options. (85d5ffd - Romain Forlot) Test widget only if there are test materials (d14bdce - Romain Forlot) Handles more test LABELS. (70cf8fd - Romain Forlot) Missing flag for COVERAGE build type (3c99b8a - Romain Forlot) Create a test widget Change-Id: I788d8d0bf110dd9cdc11aac256bd535db0d90e4d Signed-off-by: Thierry Bultel <thierry.bultel@iot.bzh>
m---------conf.d/app-templates0
-rw-r--r--conf.d/cmake/00-debian-osconfig.cmake2
-rw-r--r--conf.d/cmake/00-default-osconfig.cmake1
-rw-r--r--conf.d/cmake/00-opensuse-osconfig.cmake2
-rw-r--r--conf.d/cmake/config.cmake1
-rw-r--r--plugins/alsa/alsa-bluez.c4
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;