1 |
commit: 75b700c7eb92e71fa4bebc7b797eaf33e98c1e09 |
2 |
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com> |
3 |
AuthorDate: Mon May 8 02:34:23 2017 +0000 |
4 |
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com> |
5 |
CommitDate: Mon May 8 02:34:23 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=75b700c7 |
7 |
|
8 |
media-libs/alsa-lib: fix int types in pcm.h |
9 |
|
10 |
media-libs/alsa-lib/Manifest | 3 ++- |
11 |
media-libs/alsa-lib/alsa-lib-1.1.3.ebuild | 6 +++-- |
12 |
.../alsa-lib/files/alsa-lib-1.1.3-stdint.patch | 29 ++++++++++++++++++++++ |
13 |
3 files changed, 35 insertions(+), 3 deletions(-) |
14 |
|
15 |
diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest |
16 |
index 54af2dd..7f2175b 100644 |
17 |
--- a/media-libs/alsa-lib/Manifest |
18 |
+++ b/media-libs/alsa-lib/Manifest |
19 |
@@ -1,4 +1,5 @@ |
20 |
AUX alsa-lib-1.1.3-missing-limits.patch 438 SHA256 0209a6a218550f4c5edafef92daec6f04e402d554d37c70e9a8b77997aaaef03 SHA512 cac154be8e27cac5c36e04f7b3df881234e6497bf49c777962a82176fcc745ec7c4f0cdd71a55c390bf415808ae76b3d5e7b383a9f59d00a0cfb5148b5653552 WHIRLPOOL d790cd8469769c53896b188950c8ec474a0ebae5765d1953a5d4c9344d061667dae48341af7368e6d198d1749e9f506440298f991c179a7b4838a1787d283f6d |
21 |
+AUX alsa-lib-1.1.3-stdint.patch 1287 SHA256 f353da22fdb6c742f7782cd8bf5401071a13775cd18e070418271d33cf5bbee1 SHA512 e04ef4d7063166411895200fb293a1b4f73b1c73ea9543caed0c8557970b865da0bffb5a5b02ec7c0703ef44e33483bb931538f23e283b580fbac5831a46a42f WHIRLPOOL aa34af230d37b9a51a9bbd86bd5c327575dcaa9713671fd43036a1e2b51bfab9020ad31229a2cb6e00270a4f6377056810686bc8b397fcc1df013fec27ba4703 |
22 |
DIST alsa-lib-1.1.3.tar.bz2 962001 SHA256 71282502184c592c1a008e256c22ed0ba5728ca65e05273ceb480c70f515969c SHA512 f5dbe2375a8c66af14378314a5238284d4ed63dfc86a750c0c6e8f6cdb6b1ea2d8ef26f870b5d152dc0b77d9b40821cab523f6734902b91583beb08e28c66850 WHIRLPOOL f33871789a7cc06a9db83fd659abdfeb7940d61a24ad7c71866f843d8c0c29eaf0e0770a2034dee2526c96835935b88c2fe882184c86528c98e7d4901f94b27d |
23 |
-EBUILD alsa-lib-1.1.3.ebuild 2309 SHA256 9b128b3ffd95a16796305ff68440ec80ee87c99dc15fc7d180edd098bd0f72ba SHA512 f890e5ae7dde1d915aaa5524eeb6034aee0270bf2df388b9792352541cdd7b0312cafb20b3fea4850e7773644dcb6a26915a0acfa52fe3b4488ee6b6a3c6b442 WHIRLPOOL 334a39d5f9b3dce527a35b8b06bf93c7565105653a3b02c3f6a632657a08a05fff9dcbfcdcee24c45b6b76c211da06645b8bd6a00faafe119910ad538aaf2cc2 |
24 |
+EBUILD alsa-lib-1.1.3.ebuild 2336 SHA256 cbd446f34fe96beb4668dee079e5d4bb6378c2537f98c955dbe4873c984da91b SHA512 ce3ae724b0cfec68b69601bad1390d60125bc31172b87b07c81f59581dc0e8565d83251c7d64b6db143e490d765e096828011308350646fb5371b708807450b0 WHIRLPOOL d4a90452c5bfd672a13d7beb7ee33749c114c0d2906d6c9508b8da212d571f7653bc6b577f604138c5e53ba290cb99ba43a187523f5ff8afa90e980ab8d08baf |
25 |
MISC metadata.xml 438 SHA256 f2bec88238bb4a607fc2bb215e5967996ddb2f4bbcfa4692934c387db292db92 SHA512 1e3a7f5a2f9ea84793ec938eb657fcbd6d5748f1cb055d085c638e30d1b5c1154a9dc0026d6e3592de074125c17926a4429757844f7d02b960f4a9a8d94a0433 WHIRLPOOL e1c1cdc7aa789e26c847575bf1d5b64c62ca652254cd54068cf1b2e5580d5512ec31157ccd9c524dcbf654f401779a93dde9f9ca7481b69083db41c70fe247e7 |
26 |
|
27 |
diff --git a/media-libs/alsa-lib/alsa-lib-1.1.3.ebuild b/media-libs/alsa-lib/alsa-lib-1.1.3.ebuild |
28 |
index 317b317..3febe2c 100644 |
29 |
--- a/media-libs/alsa-lib/alsa-lib-1.1.3.ebuild |
30 |
+++ b/media-libs/alsa-lib/alsa-lib-1.1.3.ebuild |
31 |
@@ -1,6 +1,5 @@ |
32 |
# Copyright 1999-2016 Gentoo Foundation |
33 |
# Distributed under the terms of the GNU General Public License v2 |
34 |
-# $Id$ |
35 |
|
36 |
EAPI=6 |
37 |
|
38 |
@@ -28,7 +27,10 @@ DEPEND="${RDEPEND} |
39 |
|
40 |
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
41 |
|
42 |
-PATCHES=( "${FILESDIR}"/${P}-missing-limits.patch ) |
43 |
+PATCHES=( |
44 |
+ "${FILESDIR}"/${P}-missing-limits.patch |
45 |
+ "${FILESDIR}"/${P}-stdint.patch |
46 |
+) |
47 |
|
48 |
pkg_setup() { |
49 |
use python && python-single-r1_pkg_setup |
50 |
|
51 |
diff --git a/media-libs/alsa-lib/files/alsa-lib-1.1.3-stdint.patch b/media-libs/alsa-lib/files/alsa-lib-1.1.3-stdint.patch |
52 |
new file mode 100644 |
53 |
index 0000000..38a1e87 |
54 |
--- /dev/null |
55 |
+++ b/media-libs/alsa-lib/files/alsa-lib-1.1.3-stdint.patch |
56 |
@@ -0,0 +1,29 @@ |
57 |
+Use stdlib.h defined types uint8_t, uint16_t, uint32_t and uint64_t |
58 |
+for compatibility with musl libc |
59 |
+ |
60 |
+--- include/pcm.h 2015-02-26 13:34:52.000000000 +0100 |
61 |
++++ include/pcm.h 2015-07-28 13:44:32.423885625 +0200 |
62 |
+@@ -29,6 +29,8 @@ |
63 |
+ #ifndef __ALSA_PCM_H |
64 |
+ #define __ALSA_PCM_H |
65 |
+ |
66 |
++#include <stdint.h> /* uint_ types */ |
67 |
++ |
68 |
+ #ifdef __cplusplus |
69 |
+ extern "C" { |
70 |
+ #endif |
71 |
+@@ -1063,10 +1065,10 @@ |
72 |
+ int snd_pcm_format_physical_width(snd_pcm_format_t format); /* in bits */ |
73 |
+ snd_pcm_format_t snd_pcm_build_linear_format(int width, int pwidth, int unsignd, int big_endian); |
74 |
+ ssize_t snd_pcm_format_size(snd_pcm_format_t format, size_t samples); |
75 |
+-u_int8_t snd_pcm_format_silence(snd_pcm_format_t format); |
76 |
+-u_int16_t snd_pcm_format_silence_16(snd_pcm_format_t format); |
77 |
+-u_int32_t snd_pcm_format_silence_32(snd_pcm_format_t format); |
78 |
+-u_int64_t snd_pcm_format_silence_64(snd_pcm_format_t format); |
79 |
++uint8_t snd_pcm_format_silence(snd_pcm_format_t format); |
80 |
++uint16_t snd_pcm_format_silence_16(snd_pcm_format_t format); |
81 |
++uint32_t snd_pcm_format_silence_32(snd_pcm_format_t format); |
82 |
++uint64_t snd_pcm_format_silence_64(snd_pcm_format_t format); |
83 |
+ int snd_pcm_format_set_silence(snd_pcm_format_t format, void *buf, unsigned int samples); |
84 |
+ |
85 |
+ snd_pcm_sframes_t snd_pcm_bytes_to_frames(snd_pcm_t *pcm, ssize_t bytes); |