Takashi Iwai
31229b2211
- Backport upstream fixes: PCM sw_params behavior fix, UCM additions and corrections, dshare position overflow fix, build fixes for Android: 0001-pcm-Preserve-period_event-in-snd_pcm_hw_sw_params-ca.patch 0004-ucm-Add-ucm-files-for-DB820c-board.patch 0005-ucm-bytcr-PlatformEnableSeq.conf-update-some-comment.patch 0006-pcm-dshare-Fix-overflow-when-slave_hw_ptr-rolls-over.patch 0007-test-latency-use-frame-bytes-correctly-in-writebuf.patch 0008-conf-pcm-dmix-add-CHANNELS-argument.patch 0009-Android-avoid-using-versionsort.patch 0010-pcm-add-the-missing-strings.h-include.patch 0011-alisp-add-the-missing-include.patch 0012-add-snd_strlcpy-and-use-it-everywhere.patch 0013-pcm-rate-plugin-fix-signess-in-snd_pcm_rate_avail_up.patch - Drop -Iinclude/alsa from alsa.pc (bsc#1130333) 0014-Drop-I-includedir-alsa-from-alsa.pc.patch OBS-URL: https://build.opensuse.org/request/show/689240 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa?expand=0&rev=245
44 lines
1.5 KiB
Diff
44 lines
1.5 KiB
Diff
From 59715fb0783335b59309969c949da53cd3460900 Mon Sep 17 00:00:00 2001
|
|
From: Chih-Wei Huang <cwhuang@android-x86.org>
|
|
Date: Fri, 15 Mar 2019 17:17:02 +0800
|
|
Subject: [PATCH 09/14] Android: avoid using versionsort
|
|
|
|
Android doesn't have versionsort yet.
|
|
|
|
Signed-off-by: Chih-Wei Huang <cwhuang@linux.org.tw>
|
|
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
|
---
|
|
src/conf.c | 2 +-
|
|
src/ucm/parser.c | 2 +-
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/conf.c b/src/conf.c
|
|
index b8db490ca06a..cda5518e673b 100644
|
|
--- a/src/conf.c
|
|
+++ b/src/conf.c
|
|
@@ -3750,7 +3750,7 @@ int snd_config_hook_load(snd_config_t *root, snd_config_t *config, snd_config_t
|
|
int n;
|
|
|
|
#ifndef DOC_HIDDEN
|
|
-#if defined(_GNU_SOURCE) && !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__sun)
|
|
+#if defined(_GNU_SOURCE) && !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__sun) && !defined(ANDROID)
|
|
#define SORTFUNC versionsort
|
|
#else
|
|
#define SORTFUNC alphasort
|
|
diff --git a/src/ucm/parser.c b/src/ucm/parser.c
|
|
index 5e1a8862fac1..ad6bcec78622 100644
|
|
--- a/src/ucm/parser.c
|
|
+++ b/src/ucm/parser.c
|
|
@@ -1532,7 +1532,7 @@ int uc_mgr_scan_master_configs(const char **_list[])
|
|
snd_config_topdir());
|
|
filename[MAX_FILE-1] = '\0';
|
|
|
|
-#if defined(_GNU_SOURCE) && !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__sun)
|
|
+#if defined(_GNU_SOURCE) && !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__sun) && !defined(ANDROID)
|
|
#define SORTFUNC versionsort
|
|
#else
|
|
#define SORTFUNC alphasort
|
|
--
|
|
2.16.4
|
|
|