commit 0616368
hovercats
·
2024-10-08 13:57:26 +0000 UTC
parent a962d79
alsa-lib: 1.2.12
8 files changed,
+20,
-12
+3,
-0
1@@ -40,9 +40,11 @@
2 #include <stdarg.h>
3 #include <endian.h>
4
5+#ifndef DOC_HIDDEN
6 #ifndef __GNUC__
7 #define __inline__ inline
8 #endif
9+#endif /* DOC_HIDDEN */
10
11 #include <alsa/asoundef.h>
12 #include <alsa/version.h>
13@@ -53,6 +55,7 @@
14 #include <alsa/conf.h>
15 #include <alsa/pcm.h>
16 #include <alsa/rawmidi.h>
17+#include <alsa/ump.h>
18 #include <alsa/timer.h>
19 #include <alsa/control.h>
20 #include <alsa/mixer.h>
+2,
-2
1@@ -4,11 +4,11 @@
2
3 #define SND_LIB_MAJOR 1 /**< major number of library version */
4 #define SND_LIB_MINOR 2 /**< minor number of library version */
5-#define SND_LIB_SUBMINOR 5 /**< subminor number of library version */
6+#define SND_LIB_SUBMINOR 12 /**< subminor number of library version */
7 #define SND_LIB_EXTRAVER 1000000 /**< extra version number, used mainly for betas */
8 /** library version */
9 #define SND_LIB_VER(maj, min, sub) (((maj)<<16)|((min)<<8)|(sub))
10 #define SND_LIB_VERSION SND_LIB_VER(SND_LIB_MAJOR, SND_LIB_MINOR, SND_LIB_SUBMINOR)
11 /** library version (string) */
12-#define SND_LIB_VERSION_STR "1.2.5.1"
13+#define SND_LIB_VERSION_STR "1.2.12"
14
+6,
-8
1@@ -9,6 +9,7 @@
2 #define BUILD_PCM "1"
3 #define BUILD_PCM_PLUGIN_ADPCM "1"
4 #define BUILD_PCM_PLUGIN_ALAW "1"
5+#define BUILD_PCM_PLUGIN_IEC958 "1"
6 #define BUILD_PCM_PLUGIN_LFLOAT "1"
7 #define BUILD_PCM_PLUGIN_MMAP_EMUL "1"
8 #define BUILD_PCM_PLUGIN_MULAW "1"
9@@ -31,7 +32,7 @@
10 #define HAVE_LIBRT 1
11 #define HAVE_MALLOC_H 1
12 #define HAVE_MEMORY_H 1
13-#define HAVE_MMX 1
14+#define HAVE_MMX "1"
15 #define HAVE_PTHREAD_MUTEX_RECURSIVE /**/
16 /* #undef HAVE_SOFT_FLOAT */
17 #define HAVE_STDINT_H 1
18@@ -45,20 +46,17 @@
19 #define HAVE_UNISTD_H 1
20 #define HAVE_USELOCALE 1
21 /* #undef HAVE_WORDEXP */
22-#ifdef HAVE__THREAD_LOCAL
23-# define HAVE___THREAD 1
24-# define __thread _Thread_local
25-#endif
26+#define HAVE___THREAD 1
27 /* #undef LOCKLESS_DMIX_DEFAULT */
28 #define LT_OBJDIR ".libs/"
29 /* #undef NDEBUG */
30 #define PACKAGE "alsa-lib"
31 #define PACKAGE_BUGREPORT ""
32 #define PACKAGE_NAME "alsa-lib"
33-#define PACKAGE_STRING "alsa-lib 1.2.11"
34+#define PACKAGE_STRING "alsa-lib 1.2.12"
35 #define PACKAGE_TARNAME "alsa-lib"
36 #define PACKAGE_URL ""
37-#define PACKAGE_VERSION "1.2.11"
38+#define PACKAGE_VERSION "1.2.12"
39 #define SND_MAX_CARDS 32
40 #define STDC_HEADERS 1
41 #define SUPPORT_ALOAD "1"
42@@ -81,7 +79,7 @@
43 #ifndef __EXTENSIONS__
44 # define __EXTENSIONS__ 1
45 #endif
46-#define VERSION "1.2.11"
47+#define VERSION "1.2.12"
48 #define VERSIONED_SYMBOLS /**/
49 #ifndef _DARWIN_USE_64_BIT_INODE
50 # define _DARWIN_USE_64_BIT_INODE 1
+1,
-0
1@@ -1,2 +1,3 @@
2+&_snd_module_control_remap,
3 &_snd_module_control_shm,
4 &_snd_module_control_ext,
+4,
-0
1@@ -34,6 +34,7 @@ pkg.hdrs = {
2 'seq_midi_event.h',
3 'seqmid.h',
4 'timer.h',
5+ 'ump.h',
6 }),
7 copy('$outdir/include/alsa', '$dir/alsa', {'asoundlib.h', 'version.h'}),
8 }
9@@ -54,6 +55,7 @@ lib('libasound.a', [[src/(
10 control.c control_hw.c control_empty.c
11 setup.c ctlparse.c
12 control_symbols.c
13+ control_remap.c
14 control_shm.c
15 control_ext.c
16 )
17@@ -86,6 +88,8 @@ lib('libasound.a', [[src/(
18 pcm_asym.c
19 pcm_iec958.c
20 pcm_softvol.c
21+ pcm_extplug.c
22+ pcm_ioplug.c
23 pcm_mmap_emul.c
24 )
25 rawmidi/(
+2,
-0
1@@ -20,4 +20,6 @@
2 &_snd_module_pcm_asym,
3 &_snd_module_pcm_iec958,
4 &_snd_module_pcm_softvol,
5+&_snd_module_pcm_extplug,
6+&_snd_module_pcm_ioplug,
7 &_snd_module_pcm_mmap_emul,
+1,
-1
1@@ -1 +1 @@
2-Subproject commit 7e3a3c2b0a092d0f568ba3c98365030dd91cc877
3+Subproject commit 34422861f5549aee3e9df9fd8240d10b530d9abd
+1,
-1
1@@ -1 +1 @@
2-1.2.11 r1
3+1.2.12 r0