98d999615a
- Backports from upstream: minor PCM fixes, topology API updates, and a few build cleanup: 0002-pcm-simple-Fix-asserts.patch 0003-topology-open-topology-files-with-O_TRUNC.patch 0004-topology-Remove-unused-function-write_data_block.patch 0005-topology-Remove-unused-variables.patch 0006-topology-Fix-comparison-of-unsigned-expression-0.patch 0007-topology-Not-compare-a-for-loop-iterator-with-ABI-__.patch 0008-topology-Quit-and-show-error-message-on-big-endian-m.patch 0009-config-files-do-not-include-ucm-topology-configurati.patch 0010-control-add-missing-asserts-to-ctl_elem_set-function.patch 0011-pcm_hw-fix-possible-memory-leak-coverity.patch 0012-coverity-fixes.patch 0013-topology-fix-debug-output-to-print-correct-max-value.patch OBS-URL: https://build.opensuse.org/request/show/357797 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa?expand=0&rev=192
31 lines
713 B
Diff
31 lines
713 B
Diff
From c7e87084412b26ea36cc62ac557bcde18f56bf22 Mon Sep 17 00:00:00 2001
|
|
From: Jaroslav Kysela <perex@perex.cz>
|
|
Date: Tue, 12 Jan 2016 14:56:18 +0100
|
|
Subject: [PATCH] config files - do not include ucm/topology configuration when
|
|
not requested
|
|
|
|
---
|
|
src/conf/Makefile.am | 9 ++++++++-
|
|
1 file changed, 8 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/src/conf/Makefile.am b/src/conf/Makefile.am
|
|
index a04f73fddc65..5a3f857eff42 100644
|
|
--- a/src/conf/Makefile.am
|
|
+++ b/src/conf/Makefile.am
|
|
@@ -1,4 +1,11 @@
|
|
-SUBDIRS=cards pcm alsa.conf.d ucm topology
|
|
+SUBDIRS=cards pcm alsa.conf.d
|
|
+
|
|
+if BUILD_UCM
|
|
+SUBDIRS += ucm
|
|
+endif
|
|
+if BUILD_TOPOLOGY
|
|
+SUBDIRS += topology
|
|
+endif
|
|
|
|
cfg_files = alsa.conf
|
|
if BUILD_ALISP
|
|
--
|
|
2.7.0
|
|
|