From: Baruch Siach Date: Fri, 22 Dec 2017 10:27:37 +0000 (+0200) Subject: alsa-lib: bump to version 1.1.5 X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a4d76e206d1c32e671cde324f1b8bb0da247af4e;p=buildroot.git alsa-lib: bump to version 1.1.5 Drop upstream patches; renumber the rest. Add license files hashes. Cc: Bernd Kuhls Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- diff --git a/package/alsa-lib/0001-musl-pcm-h.patch b/package/alsa-lib/0001-musl-pcm-h.patch deleted file mode 100644 index ce1528c572..0000000000 --- a/package/alsa-lib/0001-musl-pcm-h.patch +++ /dev/null @@ -1,33 +0,0 @@ -Fix musl-related build errors in packages depending on alsa, in our case -this fixes openal. - -Downloaded from -http://git.alpinelinux.org/cgit/aports/tree/main/alsa-lib/alsa-lib_pcm_h.patch - -Signed-off-by: Bernd Kuhls - ---- alsa-lib-1.0.25/include/pcm.h -+++ alsa-lib-1.0.25.patched/include/pcm.h -@@ -33,6 +33,7 @@ - extern "C" { - #endif - -+#include - /** - * \defgroup PCM PCM Interface - * See the \ref pcm page for more details. -@@ -941,10 +942,10 @@ - int snd_pcm_format_physical_width(snd_pcm_format_t format); /* in bits */ - snd_pcm_format_t snd_pcm_build_linear_format(int width, int pwidth, int unsignd, int big_endian); - ssize_t snd_pcm_format_size(snd_pcm_format_t format, size_t samples); --u_int8_t snd_pcm_format_silence(snd_pcm_format_t format); --u_int16_t snd_pcm_format_silence_16(snd_pcm_format_t format); --u_int32_t snd_pcm_format_silence_32(snd_pcm_format_t format); --u_int64_t snd_pcm_format_silence_64(snd_pcm_format_t format); -+uint8_t snd_pcm_format_silence(snd_pcm_format_t format); -+uint16_t snd_pcm_format_silence_16(snd_pcm_format_t format); -+uint32_t snd_pcm_format_silence_32(snd_pcm_format_t format); -+uint64_t snd_pcm_format_silence_64(snd_pcm_format_t format); - int snd_pcm_format_set_silence(snd_pcm_format_t format, void *buf, unsigned int samples); - - snd_pcm_sframes_t snd_pcm_bytes_to_frames(snd_pcm_t *pcm, ssize_t bytes); diff --git a/package/alsa-lib/0001-no-mmu.patch b/package/alsa-lib/0001-no-mmu.patch new file mode 100644 index 0000000000..2ae0f67158 --- /dev/null +++ b/package/alsa-lib/0001-no-mmu.patch @@ -0,0 +1,45 @@ +Don't use fork() on noMMU platforms + +[Gustavo: update patch for 1.0.28] +Signed-off-by: Thomas Petazzoni + +Index: alsa-lib-1.0.26/configure.ac +=================================================================== +--- alsa-lib-1.0.26.orig/configure.ac 2012-09-06 10:55:14.000000000 +0200 ++++ alsa-lib-1.0.26/configure.ac 2013-03-09 16:22:08.000000000 +0100 +@@ -66,6 +66,8 @@ + AM_CONDITIONAL(ALSA_HSEARCH_R, [test "x$HAVE_HSEARCH_R" != xyes]) + AC_CHECK_FUNCS([uselocale]) + ++AC_CHECK_FUNC([fork]) ++ + SAVE_LIBRARY_VERSION + AC_SUBST(LIBTOOL_VERSION_INFO) + +Index: alsa-lib-1.0.26/src/pcm/pcm_direct.c +=================================================================== +--- alsa-lib-1.0.26.orig/src/pcm/pcm_direct.c 2012-09-06 10:55:14.000000000 +0200 ++++ alsa-lib-1.0.26/src/pcm/pcm_direct.c 2013-03-09 16:22:51.000000000 +0100 +@@ -424,13 +424,21 @@ + close(dmix->server_fd); + return ret; + } +- ++ ++#ifdef HAVE_FORK + ret = fork(); ++#else ++ ret = vfork(); ++#endif + if (ret < 0) { + close(dmix->server_fd); + return ret; + } else if (ret == 0) { ++#ifdef HAVE_FORK + ret = fork(); ++#else ++ ret = vfork(); ++#endif + if (ret == 0) + server_job(dmix); + _exit(EXIT_SUCCESS); diff --git a/package/alsa-lib/0002-dlmisc.patch b/package/alsa-lib/0002-dlmisc.patch new file mode 100644 index 0000000000..24b7230cae --- /dev/null +++ b/package/alsa-lib/0002-dlmisc.patch @@ -0,0 +1,59 @@ +alsa-lib: provide dummy definitions of RTLD_* if necessary + +The FLAT GNU toolchain (e.g. blackfin) doesn't include the dlfcn.h header +file, so we need to guard that include. Additionally, provide dummy +definitions for parameters RTLD_GLOBAL / RTLD_NOW which are normally +provided by dlfcn.h. + +Signed-off-by: Sonic Zhang +[Thomas: don't add separate dlmisc.h, move dummy defs to global.h] +Signed-off-by: Thomas De Schampheleire + +diff --git a/include/global.h b/include/global.h +--- a/include/global.h ++++ b/include/global.h +@@ -97,6 +97,16 @@ extern struct snd_dlsym_link *snd_dlsym_ + /** \brief Returns the version of a dynamic symbol as a string. */ + #define SND_DLSYM_VERSION(version) __STRING(version) + ++/* RTLD_NOW and RTLD_GLOBAL (used for 'mode' in snd_dlopen) are not defined ++ * on all arches (e.g. blackfin), so provide a dummy definition here. */ ++#ifndef RTLD_NOW ++#define RTLD_NOW 0 ++#endif ++ ++#ifndef RTLD_GLOBAL ++#define RTLD_GLOBAL 0 ++#endif ++ + void *snd_dlopen(const char *file, int mode); + void *snd_dlsym(void *handle, const char *name, const char *version); + int snd_dlclose(void *handle); +diff --git a/modules/mixer/simple/sbasedl.c b/modules/mixer/simple/sbasedl.c +--- a/modules/mixer/simple/sbasedl.c ++++ b/modules/mixer/simple/sbasedl.c +@@ -27,7 +27,9 @@ + #include + #include + #include ++#include "config.h" ++#ifdef HAVE_DLFCN + #include ++#endif +-#include "config.h" + #include "asoundlib.h" + #include "mixer_abst.h" +diff --git a/src/mixer/simple_abst.c b/src/mixer/simple_abst.c +--- a/src/mixer/simple_abst.c ++++ b/src/mixer/simple_abst.c +@@ -34,7 +34,9 @@ + #include + #include + #include ++#include "config.h" ++#ifdef HAVE_DLFCN + #include ++#endif +-#include "config.h" + #include "asoundlib.h" + #include "mixer_simple.h" diff --git a/package/alsa-lib/0002-no-mmu.patch b/package/alsa-lib/0002-no-mmu.patch deleted file mode 100644 index 2ae0f67158..0000000000 --- a/package/alsa-lib/0002-no-mmu.patch +++ /dev/null @@ -1,45 +0,0 @@ -Don't use fork() on noMMU platforms - -[Gustavo: update patch for 1.0.28] -Signed-off-by: Thomas Petazzoni - -Index: alsa-lib-1.0.26/configure.ac -=================================================================== ---- alsa-lib-1.0.26.orig/configure.ac 2012-09-06 10:55:14.000000000 +0200 -+++ alsa-lib-1.0.26/configure.ac 2013-03-09 16:22:08.000000000 +0100 -@@ -66,6 +66,8 @@ - AM_CONDITIONAL(ALSA_HSEARCH_R, [test "x$HAVE_HSEARCH_R" != xyes]) - AC_CHECK_FUNCS([uselocale]) - -+AC_CHECK_FUNC([fork]) -+ - SAVE_LIBRARY_VERSION - AC_SUBST(LIBTOOL_VERSION_INFO) - -Index: alsa-lib-1.0.26/src/pcm/pcm_direct.c -=================================================================== ---- alsa-lib-1.0.26.orig/src/pcm/pcm_direct.c 2012-09-06 10:55:14.000000000 +0200 -+++ alsa-lib-1.0.26/src/pcm/pcm_direct.c 2013-03-09 16:22:51.000000000 +0100 -@@ -424,13 +424,21 @@ - close(dmix->server_fd); - return ret; - } -- -+ -+#ifdef HAVE_FORK - ret = fork(); -+#else -+ ret = vfork(); -+#endif - if (ret < 0) { - close(dmix->server_fd); - return ret; - } else if (ret == 0) { -+#ifdef HAVE_FORK - ret = fork(); -+#else -+ ret = vfork(); -+#endif - if (ret == 0) - server_job(dmix); - _exit(EXIT_SUCCESS); diff --git a/package/alsa-lib/0003-conditional-enabling-of-libdl-in-m4.patch b/package/alsa-lib/0003-conditional-enabling-of-libdl-in-m4.patch new file mode 100644 index 0000000000..c533419baa --- /dev/null +++ b/package/alsa-lib/0003-conditional-enabling-of-libdl-in-m4.patch @@ -0,0 +1,35 @@ +alsa-lib: conditionally enable libdl in AM_PATH_ALSA m4 macro + +The AM_PATH_ALSA macro in utils/alsa.m4 unconditionally uses -ldl. This +breaks compilation of alsa-utils (and probably other packages using this +macro) for targets that do not support dynamic loading, such as for +Blackfin FLAT binaries. + +This patch updates the macro to check if dlopen is available, and use that +result to conditionally add -ldl to the list of libraries. + +Signed-off-by: Thomas De Schampheleire + +--- + +diff --git a/utils/alsa.m4 b/utils/alsa.m4 +--- a/utils/alsa.m4 ++++ b/utils/alsa.m4 +@@ -44,6 +44,8 @@ if test "$alsa_inc_prefix" != "" ; then + fi + AC_MSG_RESULT($ALSA_CFLAGS) + ++AC_CHECK_LIB(c, dlopen, LIBDL="", [AC_CHECK_LIB(dl, dlopen, LIBDL="-ldl")]) ++ + dnl add any special lib dirs + AC_MSG_CHECKING(for ALSA LDFLAGS) + if test "$alsa_prefix" != "" ; then +@@ -52,7 +54,7 @@ if test "$alsa_prefix" != "" ; then + fi + + dnl add the alsa library +-ALSA_LIBS="$ALSA_LIBS -lasound -lm -ldl -lpthread" ++ALSA_LIBS="$ALSA_LIBS -lasound -lm $LIBDL -lpthread" + LIBS="$ALSA_LIBS $LIBS" + AC_MSG_RESULT($ALSA_LIBS) + diff --git a/package/alsa-lib/0003-dlmisc.patch b/package/alsa-lib/0003-dlmisc.patch deleted file mode 100644 index 24b7230cae..0000000000 --- a/package/alsa-lib/0003-dlmisc.patch +++ /dev/null @@ -1,59 +0,0 @@ -alsa-lib: provide dummy definitions of RTLD_* if necessary - -The FLAT GNU toolchain (e.g. blackfin) doesn't include the dlfcn.h header -file, so we need to guard that include. Additionally, provide dummy -definitions for parameters RTLD_GLOBAL / RTLD_NOW which are normally -provided by dlfcn.h. - -Signed-off-by: Sonic Zhang -[Thomas: don't add separate dlmisc.h, move dummy defs to global.h] -Signed-off-by: Thomas De Schampheleire - -diff --git a/include/global.h b/include/global.h ---- a/include/global.h -+++ b/include/global.h -@@ -97,6 +97,16 @@ extern struct snd_dlsym_link *snd_dlsym_ - /** \brief Returns the version of a dynamic symbol as a string. */ - #define SND_DLSYM_VERSION(version) __STRING(version) - -+/* RTLD_NOW and RTLD_GLOBAL (used for 'mode' in snd_dlopen) are not defined -+ * on all arches (e.g. blackfin), so provide a dummy definition here. */ -+#ifndef RTLD_NOW -+#define RTLD_NOW 0 -+#endif -+ -+#ifndef RTLD_GLOBAL -+#define RTLD_GLOBAL 0 -+#endif -+ - void *snd_dlopen(const char *file, int mode); - void *snd_dlsym(void *handle, const char *name, const char *version); - int snd_dlclose(void *handle); -diff --git a/modules/mixer/simple/sbasedl.c b/modules/mixer/simple/sbasedl.c ---- a/modules/mixer/simple/sbasedl.c -+++ b/modules/mixer/simple/sbasedl.c -@@ -27,7 +27,9 @@ - #include - #include - #include -+#include "config.h" -+#ifdef HAVE_DLFCN - #include -+#endif --#include "config.h" - #include "asoundlib.h" - #include "mixer_abst.h" -diff --git a/src/mixer/simple_abst.c b/src/mixer/simple_abst.c ---- a/src/mixer/simple_abst.c -+++ b/src/mixer/simple_abst.c -@@ -34,7 +34,9 @@ - #include - #include - #include -+#include "config.h" -+#ifdef HAVE_DLFCN - #include -+#endif --#include "config.h" - #include "asoundlib.h" - #include "mixer_simple.h" diff --git a/package/alsa-lib/0004-conditional-enabling-of-libdl-in-m4.patch b/package/alsa-lib/0004-conditional-enabling-of-libdl-in-m4.patch deleted file mode 100644 index c533419baa..0000000000 --- a/package/alsa-lib/0004-conditional-enabling-of-libdl-in-m4.patch +++ /dev/null @@ -1,35 +0,0 @@ -alsa-lib: conditionally enable libdl in AM_PATH_ALSA m4 macro - -The AM_PATH_ALSA macro in utils/alsa.m4 unconditionally uses -ldl. This -breaks compilation of alsa-utils (and probably other packages using this -macro) for targets that do not support dynamic loading, such as for -Blackfin FLAT binaries. - -This patch updates the macro to check if dlopen is available, and use that -result to conditionally add -ldl to the list of libraries. - -Signed-off-by: Thomas De Schampheleire - ---- - -diff --git a/utils/alsa.m4 b/utils/alsa.m4 ---- a/utils/alsa.m4 -+++ b/utils/alsa.m4 -@@ -44,6 +44,8 @@ if test "$alsa_inc_prefix" != "" ; then - fi - AC_MSG_RESULT($ALSA_CFLAGS) - -+AC_CHECK_LIB(c, dlopen, LIBDL="", [AC_CHECK_LIB(dl, dlopen, LIBDL="-ldl")]) -+ - dnl add any special lib dirs - AC_MSG_CHECKING(for ALSA LDFLAGS) - if test "$alsa_prefix" != "" ; then -@@ -52,7 +54,7 @@ if test "$alsa_prefix" != "" ; then - fi - - dnl add the alsa library --ALSA_LIBS="$ALSA_LIBS -lasound -lm -ldl -lpthread" -+ALSA_LIBS="$ALSA_LIBS -lasound -lm $LIBDL -lpthread" - LIBS="$ALSA_LIBS $LIBS" - AC_MSG_RESULT($ALSA_LIBS) - diff --git a/package/alsa-lib/0005-src-rawmidi-rawmidi_symbols.c-use-rawmidi_virt-only-.patch b/package/alsa-lib/0005-src-rawmidi-rawmidi_symbols.c-use-rawmidi_virt-only-.patch deleted file mode 100644 index 72646dda8d..0000000000 --- a/package/alsa-lib/0005-src-rawmidi-rawmidi_symbols.c-use-rawmidi_virt-only-.patch +++ /dev/null @@ -1,52 +0,0 @@ -From da16e18f03fc63e1206b93d6a719b177d4f4bb99 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Fri, 11 Aug 2017 22:33:01 +0200 -Subject: [PATCH] src/rawmidi/rawmidi_symbols.c: use rawmidi_virt only when - available - -src/rawmidi/Makefile.am only brings rawmidi_virt.c into the build when -BUILD_SEQ is defined (i.e when --enable-seq is passed). However, -rawmidi_symbols.c unconditionally refers to _snd_module_rawmidi_virt, -defined in rawmidi_virt.c. - -This causes a link failure when BUILD_SEQ is disabled. For example -when linking ffmpeg against alsa-lib: - -/home/thomas/projets/buildroot/output/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libasound.a(pcm_dmix.o): In function `snd_pcm_dmix_sync_ptr': -pcm_dmix.c:(.text+0x83c): warning: -/home/thomas/projets/buildroot/output/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libasound.a(rawmidi_symbols.o):(.data+0x4): undefined reference to `_snd_module_rawmidi_virt' -collect2: error: ld returned 1 exit status - -To fix this, we make sure that rawmidi_symbols.c only uses -_snd_module_rawmidi_virt when available. - -Signed-off-by: Thomas Petazzoni - -Patch sent upstream: https://www.spinics.net/lists/alsa-devel/msg65902.html ---- - src/rawmidi/rawmidi_symbols.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/rawmidi/rawmidi_symbols.c b/src/rawmidi/rawmidi_symbols.c -index cdc06d7..6473433 100644 ---- a/src/rawmidi/rawmidi_symbols.c -+++ b/src/rawmidi/rawmidi_symbols.c -@@ -21,11 +21,15 @@ - #ifndef PIC - - extern const char *_snd_module_rawmidi_hw; -+#ifdef BUILD_SEQ - extern const char *_snd_module_rawmidi_virt; -+#endif - - static const char **snd_rawmidi_open_objects[] = { - &_snd_module_rawmidi_hw, -+#ifdef BUILD_SEQ - &_snd_module_rawmidi_virt -+#endif - }; - - void *snd_rawmidi_open_symbols(void) --- -2.9.4 - diff --git a/package/alsa-lib/alsa-lib.hash b/package/alsa-lib/alsa-lib.hash index cf2a705b39..885309386e 100644 --- a/package/alsa-lib/alsa-lib.hash +++ b/package/alsa-lib/alsa-lib.hash @@ -1,2 +1,4 @@ # Locally calculated -sha256 91bb870c14d1c7c269213285eeed874fa3d28112077db061a3af8010d0885b76 alsa-lib-1.1.4.1.tar.bz2 +sha256 f4f68ad3c6da36b0b5241ac3c798a7a71e0e97d51f972e9f723b3f20a9650ae6 alsa-lib-1.1.5.tar.bz2 +sha256 a190dc9c8043755d90f8b0a75fa66b9e42d4af4c980bf5ddc633f0124db3cee7 COPYING +sha256 bfe16cf823bcff261fc6a062c07ee96660e3c39678f42f39a788a68dbc234ced aserver/COPYING diff --git a/package/alsa-lib/alsa-lib.mk b/package/alsa-lib/alsa-lib.mk index 12fa408cff..3235502089 100644 --- a/package/alsa-lib/alsa-lib.mk +++ b/package/alsa-lib/alsa-lib.mk @@ -4,7 +4,7 @@ # ################################################################################ -ALSA_LIB_VERSION = 1.1.4.1 +ALSA_LIB_VERSION = 1.1.5 ALSA_LIB_SOURCE = alsa-lib-$(ALSA_LIB_VERSION).tar.bz2 ALSA_LIB_SITE = ftp://ftp.alsa-project.org/pub/lib ALSA_LIB_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (aserver)