summaryrefslogtreecommitdiffstats
path: root/package/tinyalsa/0001-tinypcminfo-make-function-pcm_get_format_name-static.patch
diff options
context:
space:
mode:
authorMaxime Hadjinlian <maxime.hadjinlian@gmail.com>2016-11-02 18:46:24 +0100
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2016-11-02 23:23:11 +0100
commitab70598952323a01dcec8d1a337f6c748399d00b (patch)
tree75f0a820aa6f3cc3d0eae705c94be610b52f8f11 /package/tinyalsa/0001-tinypcminfo-make-function-pcm_get_format_name-static.patch
parent625af098cd358e5dc3528b5bf39def755c6b65a6 (diff)
downloadbuildroot-ab70598952323a01dcec8d1a337f6c748399d00b.tar.gz
buildroot-ab70598952323a01dcec8d1a337f6c748399d00b.zip
tinyalsa: bump version to 1.0.2
tinyalsa has started doing release, so we will use it. With this release, both our patches were applied mainline: - 0001-tinypcminfo-make-function-pcm_get_format_name-static.patch [1] - 0002-asound.h-include-time.h-to-get-struct-timespec-proto.patch [2] The Makefile has changed a lot, so we take advantage of that to simplify our package. 1. https://github.com/tinyalsa/tinyalsa/commit/7d204edfe87f4e22105bcaeb750d69ac769afdd6 2. https://github.com/tinyalsa/tinyalsa/commit/c8333f8c7a4e4b9549abeef7530b2cd20a18e537 Signed-off-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com> [Thomas: add patch to remove doxygen usage.] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/tinyalsa/0001-tinypcminfo-make-function-pcm_get_format_name-static.patch')
-rw-r--r--package/tinyalsa/0001-tinypcminfo-make-function-pcm_get_format_name-static.patch45
1 files changed, 0 insertions, 45 deletions
diff --git a/package/tinyalsa/0001-tinypcminfo-make-function-pcm_get_format_name-static.patch b/package/tinyalsa/0001-tinypcminfo-make-function-pcm_get_format_name-static.patch
deleted file mode 100644
index 4c8d48fd9e..0000000000
--- a/package/tinyalsa/0001-tinypcminfo-make-function-pcm_get_format_name-static.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 10d82df8d920ceec4be9028a4939f96d6f407e81 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Wed, 26 Aug 2015 09:20:13 +0200
-Subject: [PATCH] tinypcminfo: make function pcm_get_format_name() static
-
-When building tinyalsa with gcc 5.x, the following warnings appear:
-
-tinypcminfo.c:97:52: warning: 'format_lookup' is static but used in inline function 'pcm_get_format_name' which is not static
- return bit_index < ARRAY_SIZE(format_lookup) ? format_lookup[bit_index] : NULL;
- ^
-tinypcminfo.c:97:35: warning: 'format_lookup' is static but used in inline function 'pcm_get_format_name' which is not static
- return bit_index < ARRAY_SIZE(format_lookup) ? format_lookup[bit_index] : NULL;
-
-And the build fails with:
-
-tinypcminfo.o: In function `main':
-tinypcminfo.c:(.text+0x2f0): undefined reference to `pcm_get_format_name'
-collect2: error: ld returned 1 exit status
-
-To fix this, this patch marks the pcm_get_format_name() as static,
-since it's anyway only used in tinypcminfo.c.
-
-Submitted upstream: https://github.com/tinyalsa/tinyalsa/pull/61
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- tinypcminfo.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tinypcminfo.c b/tinypcminfo.c
-index b2d11bc..99eec34 100644
---- a/tinypcminfo.c
-+++ b/tinypcminfo.c
-@@ -92,7 +92,7 @@ static const char *format_lookup[] = {
- /* Returns a human readable name for the format associated with bit_index,
- * NULL if bit_index is not known.
- */
--inline const char *pcm_get_format_name(unsigned bit_index)
-+static inline const char *pcm_get_format_name(unsigned bit_index)
- {
- return bit_index < ARRAY_SIZE(format_lookup) ? format_lookup[bit_index] : NULL;
- }
---
-2.5.0
-
OpenPOWER on IntegriCloud