From: Jaechul Lee <jcsing.lee@samsung.com>
Date: Fri, 2 Aug 2024 02:11:56 +0000 (+0900)
Subject: Merge branch 'upstream' into tizen_base
X-Git-Tag: accepted/tizen/base/20240828.010434~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=15c72e69dc21c29c6bfcffca5c173a89c558eafe;p=platform%2Fupstream%2Falsa-lib.git

Merge branch 'upstream' into tizen_base

Change-Id: I50fd7c0c03eb457809dec49280253fbbcd4c5bac
---

15c72e69dc21c29c6bfcffca5c173a89c558eafe
diff --cc packaging/alsa-lib.spec
index bf48088,0000000..ab6a48f
mode 100644,000000..100644
--- a/packaging/alsa-lib.spec
+++ b/packaging/alsa-lib.spec
@@@ -1,76 -1,0 +1,76 @@@
 +Name:           alsa-lib
- Version:        1.0.29
- Release:        6
++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.*
- %{_libdir}/alsa-lib/smixer/*.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 fd889bf,e65bf2c..4d9e2f5
--- a/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 0ef7f3d,464d115..3d18421
--- a/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;