forked from pool/alsa-utils
Takashi Iwai
7200ea9d85
- Backport upstream patches: A few portability fixes, alsaucm fixes and extensions, alsatplg minor fixes, alsa-info.sh extensions: 0001-treewide-sys-poll-to-poll.patch 0002-treewide-Fix-wrong-formats-on-32-bit.patch 0003-treewide-Fix-printf-formats.patch 0004-aplay-Adjust-buffer-sizes-to-fix-snprintf-warnings.patch 0005-aplay-Limit-VUMeter-progress-bar-to-100-for-negative.patch 0006-alsactl-sysfs-add-sys-kernel-uevent_seqnum-check-to-.patch 0007-alsaucm-use-the-first-sound-card-use-case-name-hw-CA.patch 0008-alsaucm-add-text-dump-command.patch 0009-alsaucm-add-json-dump-command.patch 0010-alsaucm-dump-fix-the-prefixed.patch 0011-alsactl-fix-sched-idle-set-it-really-to-SCHED_IDLE.patch 0012-configure-Fix-linking-of-alsatplg-with-the-older-lib.patch 0013-alsatplg-add-n-normalize-option.patch 0014-alsatplg-add-s-sort-and-fix-memory-leaks.patch 0015-alsatplg-fix-another-small-leak-in-normalize_config.patch 0016-alsa-info.sh-Consolidate-PCI-device-output.patch 0017-alsa-info.sh-Read-from-proc-modules-and-sort-the-res.patch 0018-alsa-info.sh-Simplify-iteration-over-cards-when-call.patch 0019-alsa-info.sh-Use-existing-function-to-print-ALSA-con.patch 0020-alsa-info.sh-Exit-script-after-writing-information-t.patch 0021-alsa-info.sh-Replace-gauge-with-infobox-for-upload-d.patch 0022-alsa-info.sh-Remove-progress-spinner-during-upload-w.patch 0023-alsa-info.sh-Condense-nested-commands-for-file-uploa.patch 0024-alsa-info.sh-Condense-nested-commands-for-formatting.patch 0025-alsa-info.sh-Perform-test-for-wget-earlier.patch 0026-alsa-info.sh-Warn-after-actual-upload-failure-do-not.patch OBS-URL: https://build.opensuse.org/request/show/766332 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa-utils?expand=0&rev=165
88 lines
2.3 KiB
Diff
88 lines
2.3 KiB
Diff
From 5e6df5ae4ba587ba324dd97b7bd8af9f8159f59a Mon Sep 17 00:00:00 2001
|
|
From: Rosen Penev <rosenp@gmail.com>
|
|
Date: Tue, 19 Nov 2019 20:28:53 -0800
|
|
Subject: [PATCH 01/26] treewide: sys/poll to poll
|
|
|
|
Fixes warning on musl:
|
|
|
|
warning redirecting incorrect #include <sys/poll.h> to <poll.h>
|
|
|
|
Signed-off-by: Rosen Penev <rosenp@gmail.com>
|
|
Signed-off-by: Takashi Iwai <tiwai@suse.de>
|
|
---
|
|
amidi/amidi.c | 2 +-
|
|
amixer/amixer.c | 2 +-
|
|
aplay/aplay.c | 2 +-
|
|
seq/aplaymidi/arecordmidi.c | 2 +-
|
|
seq/aseqdump/aseqdump.c | 2 +-
|
|
5 files changed, 5 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/amidi/amidi.c b/amidi/amidi.c
|
|
index b6e05e159031..c6268e4c2ccd 100644
|
|
--- a/amidi/amidi.c
|
|
+++ b/amidi/amidi.c
|
|
@@ -31,7 +31,7 @@
|
|
#include <signal.h>
|
|
#include <sys/timerfd.h>
|
|
#include <sys/types.h>
|
|
-#include <sys/poll.h>
|
|
+#include <poll.h>
|
|
#include <sys/stat.h>
|
|
#include <unistd.h>
|
|
#include <fcntl.h>
|
|
diff --git a/amixer/amixer.c b/amixer/amixer.c
|
|
index ad9c482e87e4..f7f31f0167fb 100644
|
|
--- a/amixer/amixer.c
|
|
+++ b/amixer/amixer.c
|
|
@@ -28,7 +28,7 @@
|
|
#include <errno.h>
|
|
#include <assert.h>
|
|
#include <alsa/asoundlib.h>
|
|
-#include <sys/poll.h>
|
|
+#include <poll.h>
|
|
#include <stdint.h>
|
|
#include "amixer.h"
|
|
#include "../alsamixer/volume_mapping.h"
|
|
diff --git a/aplay/aplay.c b/aplay/aplay.c
|
|
index 274bbce33dd2..52410684b47e 100644
|
|
--- a/aplay/aplay.c
|
|
+++ b/aplay/aplay.c
|
|
@@ -44,7 +44,7 @@
|
|
#include <assert.h>
|
|
#include <termios.h>
|
|
#include <signal.h>
|
|
-#include <sys/poll.h>
|
|
+#include <poll.h>
|
|
#include <sys/uio.h>
|
|
#include <sys/time.h>
|
|
#include <sys/stat.h>
|
|
diff --git a/seq/aplaymidi/arecordmidi.c b/seq/aplaymidi/arecordmidi.c
|
|
index f3db65ee8b91..604cd0d29722 100644
|
|
--- a/seq/aplaymidi/arecordmidi.c
|
|
+++ b/seq/aplaymidi/arecordmidi.c
|
|
@@ -27,7 +27,7 @@
|
|
#include <string.h>
|
|
#include <signal.h>
|
|
#include <getopt.h>
|
|
-#include <sys/poll.h>
|
|
+#include <poll.h>
|
|
#include <alsa/asoundlib.h>
|
|
#include "aconfig.h"
|
|
#include "version.h"
|
|
diff --git a/seq/aseqdump/aseqdump.c b/seq/aseqdump/aseqdump.c
|
|
index 790454020259..578e06fbcb22 100644
|
|
--- a/seq/aseqdump/aseqdump.c
|
|
+++ b/seq/aseqdump/aseqdump.c
|
|
@@ -25,7 +25,7 @@
|
|
#include <string.h>
|
|
#include <signal.h>
|
|
#include <getopt.h>
|
|
-#include <sys/poll.h>
|
|
+#include <poll.h>
|
|
#include <alsa/asoundlib.h>
|
|
#include "aconfig.h"
|
|
#include "version.h"
|
|
--
|
|
2.16.4
|
|
|