Merge branch 'upstream' into tizen_base

Change-Id: I50fd7c0c03eb457809dec49280253fbbcd4c5bac

diff --cc configure.ac
Simple merge

diff --cc packaging/alsa-lib.spec
index bf480888a9c8ca3d46a3c630a0655471c4ec936f,0000000000000000000000000000000000000000..ab6a48f752d1f15784af413b86bbf920fb9e2b81
mode 100644,000000..100644
--- 1/packaging/alsa-lib.spec
--- /dev/null
+++ b/packaging/alsa-lib.spec
@@@ -1,76 -1,0 +1,76 @@@
- Version:        1.0.29
- Release:        6
 +Name:           alsa-lib
- %{_libdir}/alsa-lib/smixer/*.so
++Version:        1.2.12
++Release:        0
 +License:        LGPL-2.1+
 +Summary:        The Advanced Linux Sound Architecture (ALSA) library
 +Url:            http://www.alsa-project.org/
 +Group:          System/Audio
 +Source0:        ftp://ftp.alsa-project.org/pub/lib/%{name}-%{version}.tar.bz2
 +Source1001:   alsa-lib.manifest
 +%define confdir /hal/share/alsa
 +
 +%description
 +The Advanced Linux Sound Architecture (ALSA) provides audio and MIDI
 +functionality to the Linux operating system.
 +
 +This package includes the ALSA runtime libraries to simplify application
 +programming and provide higher level functionality as well as support for
 +the older OSS API, providing binary compatibility for most OSS programs.
 +
 +%package -n libasound
 +Summary:        ALSA Library package for multimedia framework middleware package
 +Group:          System/Audio
 +
 +%description -n libasound
 +ALSA Library package for multimedia framework middleware package
 +
 +%package -n libasound-devel
 +Summary:        ALSA Library package for multimedia framework middleware package
 +Group:          Development/Libraries
 +Requires:       libasound
 +
 +%description -n libasound-devel
 +ALSA Library package for multimedia framework middleware package
 +
 +%prep
 +%setup -q
 +cp %{SOURCE1001} .
 +
 +
 +%build
 +%reconfigure --disable-static \
 +    --with-alsa-devdir=/dev/snd \
 +    --disable-alisp \
 +    --disable-python \
++    --disable-topology \
 +    --with-gnu-ld \
 +    --with-pcm-plugins=rate,route,linear,plug,dmix,dsnoop,asym,mmap,ioplug,null,empty,softvol,iec958,hooks \
 +    --with-ucmdir=%{confdir}/ucm
 +
 +make %{?_smp_mflags}
 +
 +%install
 +%make_install
 +
 +rm -f %{buildroot}/%{_bindir}/aserver
 +
 +%post -n libasound -p /sbin/ldconfig
 +
 +%postun -n libasound -p /sbin/ldconfig
 +
 +
 +%files -n libasound
 +%manifest %{name}.manifest
 +%defattr(-,root,root,-)
 +%license COPYING
 +%{_libdir}/lib*.so.*
 +%{_datadir}/alsa/*
 +
 +%files -n libasound-devel
 +%manifest %{name}.manifest
 +%defattr(-,root,root,-)
 +%{_includedir}/*
 +%{_libdir}/lib*.so
 +%{_libdir}/pkgconfig/*
 +%{_datadir}/aclocal
 +

diff --cc src/conf/alsa.conf
index fd889bfe1ca5c3868ed03d64fdc1fdbb0655daa7,e65bf2ca39a5e09ef2b8280509797905c51b0cec..4d9e2f520cea66b6e679262057a8369158bfd838
--- 1/src/conf/alsa.conf
--- 2/src/conf/alsa.conf
+++ b/src/conf/alsa.conf
@@@ -11,13 -16,16 +16,19 @@@
                        {
                                @func concat
                                strings [
-                                       { @func datadir }
-                                       "/alsa.conf.d/"
+                                       {
+                                               @func getenv
+                                               vars [
+                                                       XDG_CONFIG_HOME
+                                               ]
+                                               default "~/.config"
+                                       }
+                                       "/alsa/asoundrc"
                                ]
                        }
 +                      "/etc/asound.conf"
 +                      "/hal/etc/asound.conf"
 +                      "~/.asoundrc"
                ]
                errors false
        }

diff --cc src/ucm/ucm_local.h
index 0ef7f3dc3b3dfd6c6c78214289911e5fa2d6d0f9,464d11543a77de68800c28db04c7a30b9ee89c49..3d184217159f8225cef4789160d391949391fe43
--- 1/src/ucm/ucm_local.h
--- 2/src/ucm/ucm_local.h
+++ b/src/ucm/ucm_local.h
@@@ -36,21 -36,30 +36,33 @@@
  #define UC_MGR_DEBUG
  #endif
  
- #include <pthread.h>
  #include "local.h"
+ #include <pthread.h>
  #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
- #define SEQUENCE_ELEMENT_TYPE_SLEEP   3
- #define SEQUENCE_ELEMENT_TYPE_EXEC    4
- #define SEQUENCE_ELEMENT_TYPE_CSET_BIN_FILE   5
+ #define SYNTAX_VERSION_MAX    7
+ 
+ #define MAX_CARD_SHORT_NAME   32
+ #define MAX_CARD_LONG_NAME    80
+ 
+ #define SEQUENCE_ELEMENT_TYPE_CDEV            1
+ #define SEQUENCE_ELEMENT_TYPE_CSET            2
+ #define SEQUENCE_ELEMENT_TYPE_SLEEP           3
+ #define SEQUENCE_ELEMENT_TYPE_EXEC            4
+ #define SEQUENCE_ELEMENT_TYPE_SHELL           5
+ #define SEQUENCE_ELEMENT_TYPE_CSET_BIN_FILE   6
+ #define SEQUENCE_ELEMENT_TYPE_CSET_TLV                7
+ #define SEQUENCE_ELEMENT_TYPE_CSET_NEW                8
+ #define SEQUENCE_ELEMENT_TYPE_CTL_REMOVE      9
+ #define SEQUENCE_ELEMENT_TYPE_CMPT_SEQ                10
+ #define SEQUENCE_ELEMENT_TYPE_SYSSET          11
+ #define SEQUENCE_ELEMENT_TYPE_CFGSAVE         12
+ #define SEQUENCE_ELEMENT_TYPE_DEV_ENABLE_SEQ  13
+ #define SEQUENCE_ELEMENT_TYPE_DEV_DISABLE_SEQ 14
+ #define SEQUENCE_ELEMENT_TYPE_DEV_DISABLE_ALL 15
  
  struct ucm_value {
          struct list_head list;