Takashi Iwai
c728daee43
- 0041-configure-Quite-AM_CONDITIONAL-arguments.patch: Fix for the recent automake conditionals - 0042-mixer-Don-t-build-simple_abst-when-no-libdl-is-avail.patch: Minor fix for the build without libdl - Fix endian check breakage due to the recent UAPI header move: 0043-Fix-endian-check-in-local.h.patch OBS-URL: https://build.opensuse.org/request/show/145255 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa?expand=0&rev=121
54 lines
1.6 KiB
Diff
54 lines
1.6 KiB
Diff
From 1b428e7719fdec1b5e3206b8e55a86c4891d1849 Mon Sep 17 00:00:00 2001
|
|
From: Takashi Iwai <tiwai@suse.de>
|
|
Date: Fri, 7 Dec 2012 09:28:06 +0100
|
|
Subject: [PATCH 42/43] mixer: Don't build simple_abst when no libdl is
|
|
available
|
|
|
|
Check BUILD_MODULES conditional not to compile simple_abst.c.
|
|
Also return -ENXIO to caller statically in that case.
|
|
|
|
Signed-off-by: Takashi Iwai <tiwai@suse.de>
|
|
---
|
|
src/mixer/Makefile.am | 6 +++++-
|
|
src/mixer/mixer_simple.h | 10 ++++++++++
|
|
2 files changed, 15 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/src/mixer/Makefile.am b/src/mixer/Makefile.am
|
|
index bb466ed..c0749a4 100644
|
|
--- a/src/mixer/Makefile.am
|
|
+++ b/src/mixer/Makefile.am
|
|
@@ -1,6 +1,10 @@
|
|
EXTRA_LTLIBRARIES=libmixer.la
|
|
|
|
-libmixer_la_SOURCES = bag.c mixer.c simple.c simple_none.c simple_abst.c
|
|
+libmixer_la_SOURCES = bag.c mixer.c simple.c simple_none.c
|
|
+
|
|
+if BUILD_MODULES
|
|
+libmixer_la_SOURCES += simple_abst.c
|
|
+endif
|
|
|
|
noinst_HEADERS = mixer_local.h mixer_simple.h
|
|
|
|
diff --git a/src/mixer/mixer_simple.h b/src/mixer/mixer_simple.h
|
|
index e88b007..116eebd 100644
|
|
--- a/src/mixer/mixer_simple.h
|
|
+++ b/src/mixer/mixer_simple.h
|
|
@@ -28,4 +28,14 @@
|
|
snd1_mixer_simple_basic_register
|
|
|
|
int snd_mixer_simple_none_register(snd_mixer_t *mixer, struct snd_mixer_selem_regopt *options, snd_mixer_class_t **classp);
|
|
+
|
|
+#ifdef HAVE_LIBDL
|
|
int snd_mixer_simple_basic_register(snd_mixer_t *mixer, struct snd_mixer_selem_regopt *options, snd_mixer_class_t **classp);
|
|
+#else
|
|
+static inline int snd_mixer_simple_basic_register(snd_mixer_t *mixer,
|
|
+ struct snd_mixer_selem_regopt *options,
|
|
+ snd_mixer_class_t **classp)
|
|
+{
|
|
+ return -ENXIO;
|
|
+}
|
|
+#endif
|
|
--
|
|
1.8.0.1
|
|
|