mirror of
https://github.com/dslm4515/BMLFS.git
synced 2025-07-29 12:50:10 +00:00
Upgraded alsa-lib to 1.2.4
This commit is contained in:
Derrick
@ -1,8 +0,0 @@
|
||||
#! /bin/bash
|
||||
|
||||
# ALSA lib 1.1.9
|
||||
# source: ftp://ftp.alsa-project.org/pub/lib/alsa-lib-1.1.9.tar.bz2
|
||||
|
||||
./configure &&
|
||||
read -p "Compile? " && make -j2 &&
|
||||
read -p "Install? " && sudo -S porg -lD "make install"
|
||||
52
build-scripts/alsa-lib.build
Normal file
52
build-scripts/alsa-lib.build
Normal file
@ -0,0 +1,52 @@
|
||||
#! /bin/bash
|
||||
|
||||
# ALSA Library
|
||||
# Source: ftp://ftp.alsa-project.org/pub/lib/alsa-lib-1.2.4.tar.bz2
|
||||
#
|
||||
# $BUILD = Directory to temporarily install
|
||||
# $PKGS = Directory to store built packages
|
||||
#
|
||||
# DEPS
|
||||
# Required: NONE
|
||||
# Recommended: NONE
|
||||
# Optional: Doxygen, Python2
|
||||
|
||||
patch -Np1 -i ../patches/alsa-lib-alpine/fix-dlo.patch &&
|
||||
patch -Np1 -i ../patches/alsa-lib-alpine/remove-test.patch &&
|
||||
|
||||
./configure --prefix=/usr \
|
||||
--disable-python \
|
||||
--disable-static \
|
||||
--disable-resmgr \
|
||||
--enable-rawmidi \
|
||||
--enable-seq \
|
||||
--enable-aload $BUILDTRUPLE &&
|
||||
read -p "Compile?" && make -j2 &&
|
||||
|
||||
sudo -S make DESTDIR=$BUILD install &&
|
||||
|
||||
cd $BUILD && sudo -S mkdir -v ${BUILD}/install &&
|
||||
cat > /tmp/slack-desc << "EOF"
|
||||
# HOW TO EDIT THIS FILE:
|
||||
# The "handy ruler" below makes it easier to edit a package description. Line
|
||||
# up the first '|' above the ':' following the base package name, and the '|'
|
||||
# on the right side marks the last column you can put a character in. You must
|
||||
# make exactly 11 lines for the formatting to be correct. It's also
|
||||
# customary to leave one space after the ':' except on otherwise blank lines.
|
||||
|
||||
|-----handy-ruler------------------------------------------------------|
|
||||
alsa-lib: alsa-lib (Advanced Linux Sound Architecture library)
|
||||
alsa-lib:
|
||||
alsa-lib: The Advanced Linux Sound Architecture (ALSA) provides audio and MIDI
|
||||
alsa-lib: functionality to the Linux operating system. This is the ALSA library
|
||||
alsa-lib: (libasound) which is used by audio applications.
|
||||
alsa-lib:
|
||||
alsa-lib: For more information, see http://alsa-project.org
|
||||
alsa-lib:
|
||||
alsa-lib:
|
||||
alsa-lib:
|
||||
alsa-lib:
|
||||
EOF
|
||||
sudo -S mv -v /tmp/slack-desc install/ &&
|
||||
sudo -S makepkg -l y -c n $PKGS/alsa-lib-1.2.4-$(uname -m)-mlfs.txz &&
|
||||
sudo -S rm -rf ${BUILD}/*
|
||||
26
patches/alsa-lib-alpine/fix-dlo.patch
Normal file
26
patches/alsa-lib-alpine/fix-dlo.patch
Normal file
@ -0,0 +1,26 @@
|
||||
dlmisc.c:95:7: error: 'snd_plugin_dir_set' undeclared (first use in this function)
|
||||
95 | if (!snd_plugin_dir_set) {
|
||||
| ^~~~~~~~~~~~~~~~~~
|
||||
dlmisc.c:95:7: note: each undeclared identifier is reported only once for each function it appears in
|
||||
dlmisc.c:98:4: error: 'snd_plugin_dir' undeclared (first use in this function)
|
||||
98 | snd_plugin_dir = strdup(env);
|
||||
|
|
||||
|
||||
--- a/src/dlmisc.c
|
||||
+++ b/src/dlmisc.c
|
||||
@@ -91,6 +91,7 @@
|
||||
*/
|
||||
int snd_dlpath(char *path, size_t path_len, const char *name)
|
||||
{
|
||||
+#ifdef DL_ORIGIN_AVAILABLE
|
||||
snd_dlpath_lock();
|
||||
if (!snd_plugin_dir_set) {
|
||||
const char *env = getenv("ALSA_PLUGIN_DIR");
|
||||
@@ -104,6 +105,7 @@
|
||||
snprintf(path, path_len, "%s/%s",
|
||||
snd_plugin_dir ? snd_plugin_dir : ALSA_PLUGIN_DIR, name);
|
||||
snd_dlpath_unlock();
|
||||
+#endif
|
||||
return 0;
|
||||
}
|
||||
|
||||
85
patches/alsa-lib-alpine/remove-test.patch
Normal file
85
patches/alsa-lib-alpine/remove-test.patch
Normal file
@ -0,0 +1,85 @@
|
||||
diff --git a/test/Makefile.am b/test/Makefile.am
|
||||
index 99c2c4f..ac7bae1 100644
|
||||
--- a/test/Makefile.am
|
||||
+++ b/test/Makefile.am
|
||||
@@ -2,7 +2,7 @@ SUBDIRS=. lsb
|
||||
|
||||
check_PROGRAMS=control pcm pcm_min latency seq \
|
||||
playmidi1 timer rawmidi midiloop \
|
||||
- oldapi queue_timer namehint client_event_filter \
|
||||
+ queue_timer namehint client_event_filter \
|
||||
chmap audio_time user-ctl-element-set pcm-multi-thread
|
||||
|
||||
control_LDADD=../src/libasound.la
|
||||
@@ -16,7 +16,6 @@ playmidi1_LDADD=../src/libasound.la
|
||||
timer_LDADD=../src/libasound.la
|
||||
rawmidi_LDADD=../src/libasound.la
|
||||
midiloop_LDADD=../src/libasound.la
|
||||
-oldapi_LDADD=../src/libasound.la
|
||||
queue_timer_LDADD=../src/libasound.la
|
||||
namehint_LDADD=../src/libasound.la
|
||||
client_event_filter_LDADD=../src/libasound.la
|
||||
diff --git a/test/Makefile.in b/test/Makefile.in
|
||||
index d096226..699ae45 100644
|
||||
--- a/test/Makefile.in
|
||||
+++ b/test/Makefile.in
|
||||
@@ -90,7 +90,7 @@ host_triplet = @host@
|
||||
check_PROGRAMS = control$(EXEEXT) pcm$(EXEEXT) pcm_min$(EXEEXT) \
|
||||
latency$(EXEEXT) seq$(EXEEXT) playmidi1$(EXEEXT) \
|
||||
timer$(EXEEXT) rawmidi$(EXEEXT) midiloop$(EXEEXT) \
|
||||
- oldapi$(EXEEXT) queue_timer$(EXEEXT) namehint$(EXEEXT) \
|
||||
+ queue_timer$(EXEEXT) namehint$(EXEEXT) \
|
||||
client_event_filter$(EXEEXT) chmap$(EXEEXT) \
|
||||
audio_time$(EXEEXT) user-ctl-element-set$(EXEEXT) \
|
||||
pcm-multi-thread$(EXEEXT)
|
||||
@@ -136,9 +136,6 @@ midiloop_DEPENDENCIES = ../src/libasound.la
|
||||
namehint_SOURCES = namehint.c
|
||||
namehint_OBJECTS = namehint.$(OBJEXT)
|
||||
namehint_DEPENDENCIES = ../src/libasound.la
|
||||
-oldapi_SOURCES = oldapi.c
|
||||
-oldapi_OBJECTS = oldapi.$(OBJEXT)
|
||||
-oldapi_DEPENDENCIES = ../src/libasound.la
|
||||
pcm_SOURCES = pcm.c
|
||||
pcm_OBJECTS = pcm.$(OBJEXT)
|
||||
pcm_DEPENDENCIES = ../src/libasound.la
|
||||
@@ -222,11 +219,11 @@ am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
|
||||
am__v_CCLD_0 = @echo " CCLD " $@;
|
||||
am__v_CCLD_1 =
|
||||
SOURCES = audio_time.c chmap.c client_event_filter.c control.c \
|
||||
- latency.c midiloop.c namehint.c oldapi.c pcm.c \
|
||||
+ latency.c midiloop.c namehint.c pcm.c \
|
||||
pcm-multi-thread.c pcm_min.c playmidi1.c queue_timer.c \
|
||||
rawmidi.c seq.c timer.c user-ctl-element-set.c
|
||||
DIST_SOURCES = audio_time.c chmap.c client_event_filter.c control.c \
|
||||
- latency.c midiloop.c namehint.c oldapi.c pcm.c \
|
||||
+ latency.c midiloop.c namehint.c pcm.c \
|
||||
pcm-multi-thread.c pcm_min.c playmidi1.c queue_timer.c \
|
||||
rawmidi.c seq.c timer.c user-ctl-element-set.c
|
||||
RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
|
||||
@@ -439,7 +436,6 @@ playmidi1_LDADD = ../src/libasound.la
|
||||
timer_LDADD = ../src/libasound.la
|
||||
rawmidi_LDADD = ../src/libasound.la
|
||||
midiloop_LDADD = ../src/libasound.la
|
||||
-oldapi_LDADD = ../src/libasound.la
|
||||
queue_timer_LDADD = ../src/libasound.la
|
||||
namehint_LDADD = ../src/libasound.la
|
||||
client_event_filter_LDADD = ../src/libasound.la
|
||||
@@ -524,10 +520,6 @@ namehint$(EXEEXT): $(namehint_OBJECTS) $(namehint_DEPENDENCIES) $(EXTRA_namehint
|
||||
@rm -f namehint$(EXEEXT)
|
||||
$(AM_V_CCLD)$(LINK) $(namehint_OBJECTS) $(namehint_LDADD) $(LIBS)
|
||||
|
||||
-oldapi$(EXEEXT): $(oldapi_OBJECTS) $(oldapi_DEPENDENCIES) $(EXTRA_oldapi_DEPENDENCIES)
|
||||
- @rm -f oldapi$(EXEEXT)
|
||||
- $(AM_V_CCLD)$(LINK) $(oldapi_OBJECTS) $(oldapi_LDADD) $(LIBS)
|
||||
-
|
||||
pcm$(EXEEXT): $(pcm_OBJECTS) $(pcm_DEPENDENCIES) $(EXTRA_pcm_DEPENDENCIES)
|
||||
@rm -f pcm$(EXEEXT)
|
||||
$(AM_V_CCLD)$(pcm_LINK) $(pcm_OBJECTS) $(pcm_LDADD) $(LIBS)
|
||||
@@ -577,7 +569,6 @@ distclean-compile:
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/latency.Po@am__quote@ # am--include-marker
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/midiloop.Po@am__quote@ # am--include-marker
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/namehint.Po@am__quote@ # am--include-marker
|
||||
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/oldapi.Po@am__quote@ # am--include-marker
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pcm-multi-thread.Po@am__quote@ # am--include-marker
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pcm.Po@am__quote@ # am--include-marker
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pcm_min.Po@am__quote@ # am--include-marker
|
||||
Reference in New Issue
Block a user