main/alsa-lib: fix musl build

fix various idiotic constructs. patches are mostly from sabotage,
but some I wrote myself too.

1 files changed, 145 insertions, 0 deletions

diff --git a/main/alsa-lib/alsa-lib_mixed_types.patch b/main/alsa-lib/alsa-lib_mixed_types.patch
new file mode 100644
index 000000000..986975391
--- /dev/null
+++ b/main/alsa-lib/alsa-lib_mixed_types.patch
@@ -0,0 +1,145 @@
+--- alsa-lib-1.0.25.orig/src/pcm/pcm_misc.c	2013-07-22 23:16:24.942000003 +0000
++++ alsa-lib-1.0.25/src/pcm/pcm_misc.c	2013-07-22 23:18:34.345000003 +0000
+@@ -363,7 +363,7 @@
+  * \param format Sample format
+  * \return silence 64 bit word
+  */
+-u_int64_t snd_pcm_format_silence_64(snd_pcm_format_t format)
++uint64_t snd_pcm_format_silence_64(snd_pcm_format_t format)
+ {
+ 	switch (format) {
+ 	case SNDRV_PCM_FORMAT_S8:
+@@ -437,7 +437,7 @@
+ 	{
+ 		union {
+ 			float f[2];
+-			u_int64_t i;
++			uint64_t i;
+ 		} u;
+ 		u.f[0] = u.f[1] = 0.0;
+ #ifdef SNDRV_LITTLE_ENDIAN
+@@ -450,7 +450,7 @@
+ 	{
+ 		union {
+ 			double f;
+-			u_int64_t i;
++			uint64_t i;
+ 		} u;
+ 		u.f = 0.0;
+ #ifdef SNDRV_LITTLE_ENDIAN
+@@ -463,7 +463,7 @@
+ 	{
+ 		union {
+ 			float f[2];
+-			u_int64_t i;
++			uint64_t i;
+ 		} u;
+ 		u.f[0] = u.f[1] = 0.0;
+ #ifdef SNDRV_LITTLE_ENDIAN
+@@ -476,7 +476,7 @@
+ 	{
+ 		union {
+ 			double f;
+-			u_int64_t i;
++			uint64_t i;
+ 		} u;
+ 		u.f = 0.0;
+ #ifdef SNDRV_LITTLE_ENDIAN
+@@ -509,10 +509,10 @@
+  * \param format Sample format
+  * \return silence 32 bit word
+  */
+-u_int32_t snd_pcm_format_silence_32(snd_pcm_format_t format)
++uint32_t snd_pcm_format_silence_32(snd_pcm_format_t format)
+ {
+ 	assert(snd_pcm_format_physical_width(format) <= 32);
+-	return (u_int32_t)snd_pcm_format_silence_64(format);
++	return (uint32_t)snd_pcm_format_silence_64(format);
+ }
+ 
+ /**
+@@ -520,10 +520,10 @@
+  * \param format Sample format
+  * \return silence 16 bit word
+  */
+-u_int16_t snd_pcm_format_silence_16(snd_pcm_format_t format)
++uint16_t snd_pcm_format_silence_16(snd_pcm_format_t format)
+ {
+ 	assert(snd_pcm_format_physical_width(format) <= 16);
+-	return (u_int16_t)snd_pcm_format_silence_64(format);
++	return (uint16_t)snd_pcm_format_silence_64(format);
+ }
+ 
+ /**
+@@ -531,10 +531,10 @@
+  * \param format Sample format
+  * \return silence 8 bit word
+  */
+-u_int8_t snd_pcm_format_silence(snd_pcm_format_t format)
++uint8_t snd_pcm_format_silence(snd_pcm_format_t format)
+ {
+ 	assert(snd_pcm_format_physical_width(format) <= 8);
+-	return (u_int8_t)snd_pcm_format_silence_64(format);
++	return (uint8_t)snd_pcm_format_silence_64(format);
+ }
+ 
+ /**
+@@ -550,7 +550,7 @@
+ 		return 0;
+ 	switch (snd_pcm_format_physical_width(format)) {
+ 	case 4: {
+-		u_int8_t silence = snd_pcm_format_silence_64(format);
++		uint8_t silence = snd_pcm_format_silence_64(format);
+ 		unsigned int samples1;
+ 		if (samples % 2 != 0)
+ 			return -EINVAL;
+@@ -559,13 +559,13 @@
+ 		break;
+ 	}
+ 	case 8: {
+-		u_int8_t silence = snd_pcm_format_silence_64(format);
++		uint8_t silence = snd_pcm_format_silence_64(format);
+ 		memset(data, silence, samples);
+ 		break;
+ 	}
+ 	case 16: {
+-		u_int16_t silence = snd_pcm_format_silence_64(format);
+-		u_int16_t *pdata = (u_int16_t *)data;
++		uint16_t silence = snd_pcm_format_silence_64(format);
++		uint16_t *pdata = (uint16_t *)data;
+ 		if (! silence)
+ 			memset(data, 0, samples * 2);
+ 		else {
+@@ -575,8 +575,8 @@
+ 		break;
+ 	}
+ 	case 24: {
+-		u_int32_t silence = snd_pcm_format_silence_64(format);
+-		u_int8_t *pdata = (u_int8_t *)data;
++		uint32_t silence = snd_pcm_format_silence_64(format);
++		uint8_t *pdata = (uint8_t *)data;
+ 		if (! silence)
+ 			memset(data, 0, samples * 3);
+ 		else {
+@@ -595,8 +595,8 @@
+ 		break;
+ 	}
+ 	case 32: {
+-		u_int32_t silence = snd_pcm_format_silence_64(format);
+-		u_int32_t *pdata = (u_int32_t *)data;
++		uint32_t silence = snd_pcm_format_silence_64(format);
++		uint32_t *pdata = (uint32_t *)data;
+ 		if (! silence)
+ 			memset(data, 0, samples * 4);
+ 		else {
+@@ -606,8 +606,8 @@
+ 		break;
+ 	}
+ 	case 64: {
+-		u_int64_t silence = snd_pcm_format_silence_64(format);
+-		u_int64_t *pdata = (u_int64_t *)data;
++		uint64_t silence = snd_pcm_format_silence_64(format);
++		uint64_t *pdata = (uint64_t *)data;
+ 		if (! silence)
+ 			memset(data, 0, samples * 8);
+ 		else {