Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (97fc565578faccaba59d504a89109e9d92374e6e)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (97fc565578faccaba59d504a89109e9d92374e6e)
  • Date: Wed, 6 Jan 2021 03:36:32 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

audio-drivers/alsa-lib/HISTORY
| 6 +
audio-drivers/alsa-lib/PRE_BUILD
| 3

audio-drivers/alsa-lib/patches/0001-dlmisc-the-snd_plugin_dir_set-snd_plugin_dir-must-be.patch
| 32 ++++++++++
audio-drivers/alsa-lib/patches/0002-stdint_compat.patch
| 14 ++++
4 files changed, 53 insertions(+), 2 deletions(-)

New commits:
commit 97fc565578faccaba59d504a89109e9d92374e6e
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

alsa-lib: Remove editing of config.sub, no longer needed

commit be517b9c807237c5d2430d8b58186262ee5dbf94
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

alsa-lib: Add portability fixes

diff --git a/audio-drivers/alsa-lib/HISTORY b/audio-drivers/alsa-lib/HISTORY
index 53e6865..b145b9b 100644
--- a/audio-drivers/alsa-lib/HISTORY
+++ b/audio-drivers/alsa-lib/HISTORY
@@ -1,3 +1,9 @@
+2021-01-06 Ismael Luceno <ismael AT iodev.co.uk>
+ * PRE_BUILD,
+
patches/0001-dlmisc-the-snd_plugin_dir_set-snd_plugin_dir-must-be.patch,
+ patches/0002-stdint_compat.patch: added portability fixes
+ * PRE_BUILD: removed editing of config.sub, no longer needed
+
2020-10-23 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.2.4

diff --git a/audio-drivers/alsa-lib/PRE_BUILD
b/audio-drivers/alsa-lib/PRE_BUILD
index 258e1e5..5a82752 100755
--- a/audio-drivers/alsa-lib/PRE_BUILD
+++ b/audio-drivers/alsa-lib/PRE_BUILD
@@ -1,5 +1,6 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&
+apply_patch_dir patches &&

if spell_ok python; then
sed -i "s:python/:python$(installed_version python | cut -c-3)/:" \
@@ -14,6 +15,4 @@ if [[ "${ALSA_LIB_BRANCH}" == "scm" ]]; then
automake --foreign --copy --add-missing &&
touch depcomp &&
autoconf
-else
- sedit 's!maybe_os in$!& linux-musl*|\\!' config.sub
fi
diff --git
a/audio-drivers/alsa-lib/patches/0001-dlmisc-the-snd_plugin_dir_set-snd_plugin_dir-must-be.patch

b/audio-drivers/alsa-lib/patches/0001-dlmisc-the-snd_plugin_dir_set-snd_plugin_dir-must-be.patch
new file mode 100644
index 0000000..a89f858
--- /dev/null
+++
b/audio-drivers/alsa-lib/patches/0001-dlmisc-the-snd_plugin_dir_set-snd_plugin_dir-must-be.patch
@@ -0,0 +1,32 @@
+From ad8c8e5503980295dd8e5e54a6285d2d7e32eb1e Mon Sep 17 00:00:00 2001
+From: Jaroslav Kysela <perex AT perex.cz>
+Date: Thu, 22 Oct 2020 20:57:32 +0200
+Subject: [PATCH] dlmisc: the snd_plugin_dir_set / snd_plugin_dir must be
+ declared even for \!DL_ORIGIN_AVAILABLE
+
+Fixes: 8580c081c2 ("dlsym: add support for ALSA_PLUGIN_DIR environment
variable")
+BugLink: https://github.com/alsa-project/alsa-lib/issues/91
+Signed-off-by: Jaroslav Kysela <perex AT perex.cz>
+---
+ src/dlmisc.c | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/src/dlmisc.c b/src/dlmisc.c
+index c9517c55..f20eb593 100644
+--- a/src/dlmisc.c
++++ b/src/dlmisc.c
+@@ -42,11 +42,9 @@
+ #ifndef PIC
+ struct snd_dlsym_link *snd_dlsym_start = NULL;
+ #endif
+-#ifdef DL_ORIGIN_AVAILABLE
+ static int snd_plugin_dir_set = 0;
+ static char *snd_plugin_dir = NULL;
+ #endif
+-#endif
+
+ #if defined(DL_ORIGIN_AVAILABLE) && defined(HAVE_LIBPTHREAD)
+ static pthread_mutex_t snd_dlpath_mutex = PTHREAD_MUTEX_INITIALIZER;
+--
+2.29.0
+
diff --git a/audio-drivers/alsa-lib/patches/0002-stdint_compat.patch
b/audio-drivers/alsa-lib/patches/0002-stdint_compat.patch
new file mode 100644
index 0000000..0ff7b41
--- /dev/null
+++ b/audio-drivers/alsa-lib/patches/0002-stdint_compat.patch
@@ -0,0 +1,14 @@
+Use stdlib.h defined types uint8_t, uint16_t, uint32_t and uint64_t
+for compatibility with musl libc
+
+--- a/include/pcm.h 2015-02-26 13:34:52.000000000 +0100
++++ a/include/pcm.h 2015-07-28 13:44:32.423885625 +0200
+@@ -29,6 +29,8 @@
+ #ifndef __ALSA_PCM_H
+ #define __ALSA_PCM_H
+
++#include <stdint.h> /* uint_ types */
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif



  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (97fc565578faccaba59d504a89109e9d92374e6e), Ismael Luceno, 01/05/2021

Archive powered by MHonArc 2.6.24.

Top of Page