Accepting request 939025 from home:tiwai:branches:multimedia:libs

- Update to version 1.2.6.1:
  a minor fix release:
  * acp: fix linked configuration
  * ucm2: Add support for SC7180 Trogdor Lazor Chromebooks
  * USB-Audio: fix the wrong condition type for If.realtek-alc1220-vb 
- More a couple of upstream fixes for forgotten conversions:
  0001-sof-hda-dsp-fix-path-to-Hdmi.conf.patch
  0002-bytcht-es8316-fix-Include-paths-in-HiFi.conf.patch

OBS-URL: https://build.opensuse.org/request/show/939025
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa-ucm-conf?expand=0&rev=38

0001-sof-hda-dsp-fix-path-to-Hdmi.conf.patch

@@ -0,0 +1,25 @@
+From ea409c8caf7dae09ccf7e957b897cc246cb5852c Mon Sep 17 00:00:00 2001
+From: Miroslav Sustek <sustmidown@centrum.cz>
+Date: Thu, 9 Dec 2021 23:16:05 +0100
+Subject: [PATCH] sof-hda-dsp: fix path to Hdmi.conf
+
+Fixes: https://github.com/alsa-project/alsa-ucm-conf/pull/127
+Signed-off-by: Miroslav Sustek <sustmidown@centrum.cz>
+Signed-off-by: Jaroslav Kysela <perex@perex.cz>
+---
+ ucm2/Intel/sof-hda-dsp/HiFi.conf | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ucm2/Intel/sof-hda-dsp/HiFi.conf b/ucm2/Intel/sof-hda-dsp/HiFi.conf
+index fb9b1cad472c..713fdd94ef19 100644
+--- a/ucm2/Intel/sof-hda-dsp/HiFi.conf
++++ b/ucm2/Intel/sof-hda-dsp/HiFi.conf
+@@ -48,4 +48,4 @@ If.dmic {
+ 	}
+ }
+ 
+-Include.hdmi.File "/sof-hda-dsp/Hdmi.conf"
++Include.hdmi.File "/Intel/sof-hda-dsp/Hdmi.conf"
+-- 
+2.31.1
+

0002-bytcht-es8316-fix-Include-paths-in-HiFi.conf.patch

@@ -0,0 +1,26 @@
+From b0ffdb057133f6e3fe1484ff72b5115dc471f303 Mon Sep 17 00:00:00 2001
+From: Jaroslav Kysela <perex@perex.cz>
+Date: Fri, 10 Dec 2021 09:40:25 +0100
+Subject: [PATCH] bytcht-es8316: fix Include paths in HiFi.conf
+
+Signed-off-by: Jaroslav Kysela <perex@perex.cz>
+---
+ ucm2/Intel/bytcht-es8316/HiFi.conf | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/ucm2/Intel/bytcht-es8316/HiFi.conf b/ucm2/Intel/bytcht-es8316/HiFi.conf
+index d122c69dadc5..2cf179e9e866 100644
+--- a/ucm2/Intel/bytcht-es8316/HiFi.conf
++++ b/ucm2/Intel/bytcht-es8316/HiFi.conf
+@@ -20,6 +20,6 @@ If.0 {
+ 		Haystack "${CardComponents}"
+ 		Needle "cfg-spk:"
+ 	}
+-	True.Include.comp.File "/bytcht-es8316/HiFi-Components.conf"
+-	False.Include.long.File "/bytcht-es8316/HiFi-LongName.conf"
++	True.Include.comp.File "/Intel/bytcht-es8316/HiFi-Components.conf"
++	False.Include.long.File "/Intel/bytcht-es8316/HiFi-LongName.conf"
+ }
+-- 
+2.31.1
+

alsa-ucm-conf-1.2.6.1.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6eef3610f2a5cef3f91f6956b994bf3c8327073ef6718bb24faa2a0100da78ea
+size 27682

alsa-ucm-conf-1.2.6.1.tar.bz2.sig

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEE8E31BzesGohMSz1xg4BZbablnJEFAmGyNwMACgkQg4BZbabl
+nJGXmQ//S5NSpM92j6go1xw84TFtr7zgzfXhmnSsftfzv7EtJLyQOyt+Zr9uK/SP
+fnpx0EU29zw3Lc61a797dMEagLJq1GrmlZ1iuioC8BFh93HovxblfG4CaD7AVN9Q
+Pc+NOURCsg45Bd3J1IT7LqIAg5KyfikGXkd9rwM3Vs4W4kdaH1XOkThNAXb7ssgr
+gFnf6SpxcQ5HeRzbSfeNoFLTXRByuNGzt+ERpqFirprwQuZHeTfWxTfxrEQrScOY
+Ie9cV48pjuttNbgPKELBV1/v29gDStQLGTJCygE/MvQ7UxKDK/0FKZzSlEXqiLA0
+tP4Ekfls67TnpDbiTQbcGt8F8A4FZ7GazKKa3kMj3vAR+LuXtkWXOI5QzYDxKZSu
+l0WgFVepyPqSlPQppuKeVA6fV4SMWCqI4xgoWcjiKuXX6OhC8YMhiRUazJqV3ghu
+EjkMQP4GfPuuXQmMkmzw0XnSDnrsW/Y8EI0odVhYOhjJggTGtIDbRRLR0fHwrL2v
+vmzs+92lAM2Xm9dFtHU26oiOsL6qJBk1SFu8iwcIGbkvJZBCBoje2qvrqc2GbsgS
+Z4QnpmoJNmpqz5t3pMUSuik1Xq8DkFF+oXxgc7tAtetpcH8ZfPyPdemXVveb3e6k
+UUv13w2bfBD6tAMV6x5GrdK08lr/mRE5sPEyBtSSy+yoU16G+4o=
+=rmL3
+-----END PGP SIGNATURE-----

alsa-ucm-conf-1.2.6.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:61884662f6bbdcda723cc2db5a0b3905b21ff36fcd065c40f15e5bafb984e499
-size 27309

alsa-ucm-conf-1.2.6.tar.bz2.sig

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCAAdFiEE8E31BzesGohMSz1xg4BZbablnJEFAmGt/bsACgkQg4BZbabl
-nJFflg//bFr9CV4bowwAJQ8ThY2m4BbuLDjMmI2eEWkh2Uj1JqKgLDGm1B+WVeWs
-SfIdhH1f9ALogEpcLmm3R0YsZKahDrvFvtv2+rrtYAZfBgaXqAdLgHoJSdtIM9C/
-CDSjW4Vk1pXQMJgAeKLM8mn53EB8wNuTYoK+TWCjQKbzYiTIHQG/iFBcXL7M/N23
-o64D8JeaHMrVLczHdgK2lUo9cflP9LQR+QocIL90MQFPAyeO/6rY4v+jOmkaQd1T
-DJVObNG/8Qun4LuL5mOGaL4ILimRZqTiAWPYUJS3XzhqrBj6rOBj1vNse9I+Vpoy
-iLw8MyFCrryhHkgsIQn3vfVsVFePBxhA/ZpUW2qhg8GP4gvsegQ+M1mP2YcU3G06
-a7Hw0h404yCxAftNcfGC3+2g0l8viL3jKz1FUf/Ak6BUbLAh+dy2DYXWP/3ZWP7y
-unBCGMGWr0b8LlUFR7SRhldp2DcXcr38/MAg8pO9/Ncdn4guqMjjbQ04ESi8WR62
-iD9M3zOru3Z4V/Nlhd3XmpgLYKUwRfeqY2zvuQa1vbfXMdq3ar9svxLaKyQVxtGh
-ar4xfADvBXqFVehPngr2AAobhn4I44RGc8dre+XCtzhRrAqGgbWvr/y5AD/H290p
-3OGbwR5dR28u4YynMABfmg+5WReFC0edYdUNX3uUGfIlIR+y++M=
-=SUFI
------END PGP SIGNATURE-----

alsa-ucm-conf.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Fri Dec 10 08:59:24 CET 2021 - tiwai@suse.de
+
+- Update to version 1.2.6.1:
+  a minor fix release:
+  * acp: fix linked configuration
+  * ucm2: Add support for SC7180 Trogdor Lazor Chromebooks
+  * USB-Audio: fix the wrong condition type for If.realtek-alc1220-vb 
+- More a couple of upstream fixes for forgotten conversions:
+  0001-sof-hda-dsp-fix-path-to-Hdmi.conf.patch
+  0002-bytcht-es8316-fix-Include-paths-in-HiFi.conf.patch
+
 -------------------------------------------------------------------
 Mon Dec  6 15:13:22 CET 2021 - tiwai@suse.de
 

alsa-ucm-conf.spec

@@ -17,13 +17,15 @@
 
 
 Name:           alsa-ucm-conf
-Version:        1.2.6
+Version:        1.2.6.1
 Release:        0
 Summary:        ALSA UCM Profiles
 License:        BSD-3-Clause
 URL:            https://www.alsa-project.org
 Source:         %{url}/files/pub/lib/alsa-ucm-conf-%{version}.tar.bz2
 Source1:        %{url}/files/pub/lib/alsa-ucm-conf-%{version}.tar.bz2.sig
+Patch1:         0001-sof-hda-dsp-fix-path-to-Hdmi.conf.patch
+Patch2:         0002-bytcht-es8316-fix-Include-paths-in-HiFi.conf.patch
 BuildRequires:  fdupes
 BuildArch:      noarch
 Requires:       libasound2 >= %{version}
@@ -32,7 +34,7 @@ Requires:       libasound2 >= %{version}
 This package contains the profiles files for ALSA UCM (Use Case Manager).
 
 %prep
-%setup -q -n %{name}-%{version}
+%autosetup -p1
 find . -name ".gitignore" -delete
 
 %build