oasis

commit: 5910c7030fbef420a1b8576ee50ad9ada1edb528
parent f5b4e4c18949b90d85fc4a040f2539438e53cca6
Author: Michael Forney <mforney@mforney.org>
Date:   Sun, 27 Jun 2021 02:58:55 -0700

alsa-lib: Switch to upstream patch for static build fix

Diffstat:
D
pkg/alsa-lib/patch/0006-Fix-build-with-enable-static.patch
30
------------------------------
A
pkg/alsa-lib/patch/0006-control-empty-fix-the-static-build.patch
28
++++++++++++++++++++++++++++

2 files changed, 28 insertions(+), 30 deletions(-)
diff --git a/pkg/alsa-lib/patch/0006-Fix-build-with-enable-static.patch b/pkg/alsa-lib/patch/0006-Fix-build-with-enable-static.patch
@@ -1,30 +0,0 @@
-From b8d490ad478f1ed862244a5a86d157263de94a23 Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Sun, 27 Jun 2021 01:24:41 -0700
-Subject: [PATCH] Fix build with --enable-static
-
-A typo in the variable name was causing a linking error:
-
-  libasound.a(control_symbols.o):(.data.rel+0x8): undefined reference to `_snd_module_control_empty'
-
-Signed-off-by: Michael Forney <mforney@mforney.org>
----
- src/control/control_empty.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/control/control_empty.c b/src/control/control_empty.c
-index 49d1026c..c9b048c1 100644
---- a/src/control/control_empty.c
-+++ b/src/control/control_empty.c
-@@ -30,7 +30,7 @@
- 
- #ifndef PIC
- /* entry for static linking */
--const char *_snd_module_ctl_empty = "";
-+const char *_snd_module_control_empty = "";
- #endif
- 
- /*! \page control_plugins
--- 
-2.31.1
-
diff --git a/pkg/alsa-lib/patch/0006-control-empty-fix-the-static-build.patch b/pkg/alsa-lib/patch/0006-control-empty-fix-the-static-build.patch
@@ -0,0 +1,28 @@
+From 42f37846a9f7a7ada7fc3d7887154e62c5f748d2 Mon Sep 17 00:00:00 2001
+From: Jaroslav Kysela <perex@perex.cz>
+Date: Tue, 15 Jun 2021 23:21:42 +0200
+Subject: [PATCH] control: empty - fix the static build
+
+Reported-by: Jan Palus <atler@pld-linux.org>
+Fixes: https://github.com/alsa-project/alsa-lib/issues/157
+Signed-off-by: Jaroslav Kysela <perex@perex.cz>
+---
+ src/control/control_empty.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/control/control_empty.c b/src/control/control_empty.c
+index 49d1026c..c9b048c1 100644
+--- a/src/control/control_empty.c
++++ b/src/control/control_empty.c
+@@ -30,7 +30,7 @@
+ 
+ #ifndef PIC
+ /* entry for static linking */
+-const char *_snd_module_ctl_empty = "";
++const char *_snd_module_control_empty = "";
+ #endif
+ 
+ /*! \page control_plugins
+-- 
+2.32.0
+