Takashi Iwai
5dabf3bcba
- Backport upstream fixes / enhancements about alsa modules: mainly for UCM support (boo#1160914): 0001-alsa-mixer-path-test-Hide-unused-functions-when-buil.patch 0002-alsa-mixer-recognize-the-Speaker-Jack-control.patch 0003-alsa-mixer-add-support-for-SteelSeries-Arctis-Pro-20.patch 0004-alsa-mixer-Add-support-for-SteelSeries-Arctis-5-2019.patch 0005-alsa-mixer-add-support-for-LucidSound-LS31-and-creat.patch 0006-alsa-ucm-use-ucm2-name-for-the-direct-card-index-ope.patch 0007-alsa-ucm-add-mixer-IDs-to-ucm_items.patch 0008-alsa-mixer-handle-the-index-for-ALSA-mixer-element-i.patch 0009-alsa-mixer-improve-alsa_id_decode-function.patch 0010-alsa-ucm-Support-Playback-CaptureVolume.patch 0011-alsa-ucm-Fix-volume-control-based-on-review.patch 0012-alsa-ucm-use-the-correct-mixer-identifiers-as-first.patch 0013-alsa-ucm-add-support-for-master-volume.patch 0014-alsa-ucm-split-correctly-JackHWMute-device-names.patch 0015-alsa-ucm-fix-parsing-for-JackControl.patch 0016-alsa-ucm-add-comments-to-ucm_get_mixer_id.patch 0017-alsa-ucm-validate-access-to-PA_DEVICE_PORT_DATA.patch 0018-alsa-Skip-resume-PCM-if-hardware-doesn-t-support-it.patch 0019-alsa-ucm-parse-correctly-the-device-values.patch 0020-alsa-ucm-do-not-try-to-use-UCM-device-name-as-jack-n.patch 0021-alsa-util-do-not-try-to-guess-the-mixer-name-from-th.patch 0022-alsa-ucm-add-control-and-mixer-device-items.patch 0023-alsa-ucm-get-the-mixer-names-from-ucm-don-t-guess.patch 0024-alsa-ucm-use-the-proper-mixer-name-for-ucm-pcm-sink-.patch 0025-alsa-mixer-handle-interface-type-CARD-PCM-for-mixer-.patch 0026-alsa-mixer-Add-the-ability-to-pass-the-intended-role.patch 0027-alsa-mixer-Set-the-intended-role-of-Steelseries-Arct.patch 0028-alsa-rewrite-mixer-open-close-cache-mixer-accesses-i.patch OBS-URL: https://build.opensuse.org/request/show/774841 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/pulseaudio?expand=0&rev=217
49 lines
1.6 KiB
Diff
49 lines
1.6 KiB
Diff
From 3dff31e19ca627fc4e0a8f13aeb44923118ecfa1 Mon Sep 17 00:00:00 2001
|
||
From: Tanu Kaskinen <tanuk@iki.fi>
|
||
Date: Fri, 20 Sep 2019 17:09:40 +0300
|
||
Subject: [PATCH] alsa-mixer-path-test: Hide unused functions when building
|
||
with Meson
|
||
MIME-Version: 1.0
|
||
Content-Type: text/plain; charset=UTF-8
|
||
Content-Transfer-Encoding: 8bit
|
||
|
||
Silences these warnings:
|
||
|
||
[509/574] Compiling C object 'src/tests/a4ccf2d@@alsa-mixer-path-test@exe/alsa-mixer-path-test.c.o'.
|
||
../src/tests/alsa-mixer-path-test.c:24:20: warning: ‘load_makefile’ defined but not used [-Wunused-function]
|
||
static pa_strlist *load_makefile() {
|
||
^~~~~~~~~~~~~
|
||
../src/tests/alsa-mixer-path-test.c:17:20: warning: ‘get_default_paths_dir’ defined but not used [-Wunused-function]
|
||
static const char *get_default_paths_dir(void) {
|
||
^~~~~~~~~~~~~~~~~~~~~
|
||
---
|
||
src/tests/alsa-mixer-path-test.c | 5 +++++
|
||
1 file changed, 5 insertions(+)
|
||
|
||
diff --git a/src/tests/alsa-mixer-path-test.c b/src/tests/alsa-mixer-path-test.c
|
||
index ee40587b7b13..75cf086138cc 100644
|
||
--- a/src/tests/alsa-mixer-path-test.c
|
||
+++ b/src/tests/alsa-mixer-path-test.c
|
||
@@ -13,6 +13,10 @@
|
||
#include <pulsecore/strlist.h>
|
||
#include <modules/alsa/alsa-mixer.h>
|
||
|
||
+/* This test inspects the Makefile, so this is not applicable when using
|
||
+ * Meson. */
|
||
+#ifndef MESON_BUILD
|
||
+
|
||
/* This function was copied from alsa-mixer.c */
|
||
static const char *get_default_paths_dir(void) {
|
||
if (pa_run_from_build_tree())
|
||
@@ -52,6 +56,7 @@ static pa_strlist *load_makefile() {
|
||
fclose(f);
|
||
return result;
|
||
}
|
||
+#endif /* end of #ifndef MESON_BUILD */
|
||
|
||
START_TEST (mixer_path_test) {
|
||
#ifdef MESON_BUILD
|
||
--
|
||
2.16.4
|
||
|