import alsa-lib-1.1.9-4.el8

.alsa-lib.metadata

@@ -1 +1 @@
-b96002ef24b4155e5d86c081869d8d7b4b496fde SOURCES/alsa-lib-1.1.6.tar.bz2
+2404e1c377428908c5188076d5652a2a1ecd028e SOURCES/alsa-lib-1.1.9.tar.bz2

.gitignore

@@ -1 +1 @@
-SOURCES/alsa-lib-1.1.6.tar.bz2
+SOURCES/alsa-lib-1.1.9.tar.bz2

SOURCES/alsa-lib-1.1.9-config.patch

@@ -1,8 +1,8 @@
 diff --git a/src/conf/alsa.conf b/src/conf/alsa.conf
-index 1889f01..60c12ac 100644
+index 09980586..c4525f0b 100644
 --- a/src/conf/alsa.conf
 +++ b/src/conf/alsa.conf
-@@ -66,8 +66,7 @@ defaults.pcm.nonblock 1
+@@ -67,8 +67,7 @@ defaults.pcm.nonblock 1
  defaults.pcm.compat 0
  defaults.pcm.minperiodtime 5000		# in us
  defaults.pcm.ipc_key 5678293
@@ -10,13 +10,13 @@ index 1889f01..60c12ac 100644
 -defaults.pcm.ipc_perm 0660
 +defaults.pcm.ipc_perm 0600
  defaults.pcm.dmix.max_periods 0
+ defaults.pcm.dmix.channels 2
  defaults.pcm.dmix.rate 48000
- defaults.pcm.dmix.format "unchanged"
 diff --git a/src/conf/pcm/dmix.conf b/src/conf/pcm/dmix.conf
-index e62cb29..a005488 100644
+index 7fa5c8b2..97936a82 100644
 --- a/src/conf/pcm/dmix.conf
 +++ b/src/conf/pcm/dmix.conf
-@@ -41,10 +41,6 @@ pcm.!dmix {
+@@ -48,10 +48,6 @@ pcm.!dmix {
  		@func refer
  		name defaults.pcm.ipc_key
  	}
@@ -28,7 +28,7 @@ index e62cb29..a005488 100644
  		@func refer
  		name defaults.pcm.ipc_perm
 diff --git a/src/conf/pcm/dsnoop.conf b/src/conf/pcm/dsnoop.conf
-index 49cfca9..842e1fb 100644
+index abbd44f7..528fb6ad 100644
 --- a/src/conf/pcm/dsnoop.conf
 +++ b/src/conf/pcm/dsnoop.conf
 @@ -41,10 +41,6 @@ pcm.!dsnoop {

SPECS/alsa-lib.spec

@@ -4,8 +4,8 @@
 
 Summary:  The Advanced Linux Sound Architecture (ALSA) library
 Name:     alsa-lib
-Version:  1.1.6
+Version:  1.1.9
-Release:  3%{?prever_dot}%{?dist}
+Release:  4%{?prever_dot}%{?dist}
 License:  LGPLv2+
 Group:    System Environment/Libraries
 URL:      http://www.alsa-project.org/
@@ -14,8 +14,8 @@ Source:   ftp://ftp.alsa-project.org/pub/lib/%{name}-%{version}%{?prever}%{?post
 Source10: asound.conf
 Source11: modprobe-dist-alsa.conf
 Source12: modprobe-dist-oss.conf
-Patch0:   alsa-lib-1.1.6-post.patch
+Patch0:   alsa-git.patch
-Patch1:   alsa-lib-1.0.24-config.patch
+Patch1:   alsa-lib-1.1.9-config.patch
 Patch2:   alsa-lib-1.0.14-glibc-open.patch
 
 BuildRequires:  doxygen
@@ -44,17 +44,28 @@ This package includes the ALSA development libraries for developing
 against the ALSA libraries and interfaces.
 
 %package  -n alsa-ucm
-Summary:  ALSA Universal Configuration Manager
+Summary:   ALSA Use Case Manager configuration
-Group:    System Environment/Libraries
+Group:     System Environment/Libraries
-Requires: %{name} = %{version}-%{release}
+BuildArch: noarch
+Requires:  %{name} = %{version}-%{release}
 
 %description -n alsa-ucm
 The Advanced Linux Sound Architecture (ALSA) Universal Configuration 
 Manager allows configuration of Audio input/output names and routing
 
+%package  -n alsa-topology
+Summary:   ALSA Topology configuration
+Group:     System Environment/Libraries
+BuildArch: noarch
+Requires:  %{name} = %{version}-%{release}
+
+%description -n alsa-topology
+The Advanced Linux Sound Architecture (ALSA) topology configuration
+contains alsa-lib configuration of SoC topology
+
 %prep
 %setup -q -n %{name}-%{version}%{?prever}%{?postver}
-%patch0 -p1 -b .post
+%patch0 -p1 -b .alsa-git
 %patch1 -p1 -b .config
 %patch2 -p1 -b .glibc-open
 
@@ -70,6 +81,8 @@ make %{?_smp_mflags} V=1
 make doc
 
 %install
+%global sysmodprobedir %{_prefix}/lib/modprobe.d
+
 make DESTDIR=%{buildroot} install
 
 # We need the library to be available even before /usr might be mounted
@@ -82,17 +95,23 @@ mkdir -p -m 755 %{buildroot}/etc
 install -p -m 644 %{SOURCE10} %{buildroot}/etc
 
 # Install the modprobe files for ALSA
-mkdir -p -m 755 %{buildroot}/lib/modprobe.d/
+mkdir -p -m 755 %{buildroot}%{sysmodprobedir}
-install -p -m 644 %{SOURCE11} %{buildroot}/lib/modprobe.d/dist-alsa.conf
+install -p -m 644 %{SOURCE11} %{buildroot}%{sysmodprobedir}/dist-alsa.conf
 # bug#926973, place this file to the doc directory
 install -p -m 644 %{SOURCE12} .
 
 # Create UCM directory
 mkdir -p %{buildroot}/%{_datadir}/alsa/ucm
 
-#Remove libtool archives.
+# Create topology directory
+mkdir -p %{buildroot}/%{_datadir}/alsa/topology
+
+# Remove libtool archives.
 find %{buildroot} -name '*.la' -delete
 
+# Remove /usr/include/asoundlib.h
+rm %{buildroot}/%{_includedir}/asoundlib.h
+
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
@@ -107,7 +126,8 @@ find %{buildroot} -name '*.la' -delete
 #{_libdir}/alsa-lib/
 %{_datadir}/alsa/
 %exclude %{_datadir}/alsa/ucm
-/lib/modprobe.d/dist-*
+%exclude %{_datadir}/alsa/topology
+%{sysmodprobedir}/dist-*
 
 %files devel
 %doc TODO doc/doxygen/
@@ -120,7 +140,14 @@ find %{buildroot} -name '*.la' -delete
 %files -n alsa-ucm
 %{_datadir}/alsa/ucm
 
+%files -n alsa-topology
+%{_datadir}/alsa/topology
+
 %changelog
+* Mon May 27 2019 Jaroslav Kysela <perex@perex.cz> - 1.1.9-4
+- Moved topology files to alsa-topology
+- Updated to 1.1.9
+
 * Fri Jan 25 2019 Jaroslav Kysela <jkysela@redhat.com> - 1.1.6-3
 - Sync with the RHEL 7
 - Add Dell WD15/WD19 Dock to USB-Audio.conf and create UCM configs