Use separated ucm dir configuration for new partitioned hal

[Version] 1.0.29-3
[Issue Type] HAL

Change-Id: Iac11ef8e63514809a6fab86646a01a873e9d7c30

diff --git a/configure.ac b/configure.ac
index f0995e3..5796fe5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -99,6 +99,15 @@ ALSA_CONFIG_DIR="$confdir"
 AC_DEFINE_UNQUOTED(ALSA_CONFIG_DIR, "$confdir", [directory containing ALSA configuration database])
 AC_SUBST(ALSA_CONFIG_DIR)
 
+dnl ALSA ucm directory for TIZEN
+AC_ARG_WITH(ucmdir,
+    AS_HELP_STRING([--with-ucmdir=dir],
+    [path where ALSA ucm files are stored]),
+    ucmdir="$withval", ucmdir="$confdir")
+ALSA_USE_CASE_DIR="$ucmdir"
+AC_DEFINE_UNQUOTED(ALSA_USE_CASE_DIR, "$ucmdir", [directory containing ALSA ucm configuration database])
+AC_SUBST(ALSA_USE_CASE_DIR)
+
 dnl ALSA plugin directory
 test "x$exec_prefix" = xNONE && exec_prefix=$prefix
 

diff --git a/packaging/alsa-lib.spec b/packaging/alsa-lib.spec
index 552723d..b21bc70 100644 (file)
--- a/packaging/alsa-lib.spec
+++ b/packaging/alsa-lib.spec
@@ -1,6 +1,6 @@
 Name:           alsa-lib
 Version:        1.0.29
-Release:        2
+Release:        3
 License:        LGPL-2.1+
 Summary:        The Advanced Linux Sound Architecture (ALSA) library
 Url:            http://www.alsa-project.org/
@@ -38,13 +38,13 @@ cp %{SOURCE1001} .
 
 
 %build
-%configure --disable-static \
+%reconfigure --disable-static \
     --with-alsa-devdir=/dev/snd \
     --disable-alisp \
     --disable-python \
     --with-gnu-ld \
     --with-pcm-plugins=rate,route,linear,plug,dmix,dsnoop,asym,mmap,ioplug,null,empty \
-    --with-configdir=%{confdir}
+    --with-ucmdir=%{confdir}/ucm
 
 make %{?_smp_mflags}
 
@@ -64,7 +64,7 @@ rm -f %{buildroot}/%{_bindir}/aserver
 %license COPYING
 %{_libdir}/lib*.so.*
 %{_libdir}/alsa-lib/smixer/*.so
-%{confdir}/*
+%{_datadir}/alsa/*
 
 %files -n libasound-devel
 %manifest %{name}.manifest

diff --git a/src/ucm/ucm_local.h b/src/ucm/ucm_local.h
index c1655c7..0ef7f3d 100644 (file)
--- a/src/ucm/ucm_local.h
+++ b/src/ucm/ucm_local.h
@@ -41,7 +41,10 @@
 #include "use-case.h"
 
 #define MAX_FILE               256
+
+#ifndef ALSA_USE_CASE_DIR /* TIZEN : This will be defined using --with-ucmdir on configure */
 #define ALSA_USE_CASE_DIR      ALSA_CONFIG_DIR "/ucm"
+#endif
 
 #define SEQUENCE_ELEMENT_TYPE_CDEV     1
 #define SEQUENCE_ELEMENT_TYPE_CSET     2