From 98b0271168d1d584939a67c1945567742f9eae57 Mon Sep 17 00:00:00 2001 From: Markham Date: Thu, 8 Oct 2020 17:45:34 +0200 Subject: [PATCH] bump version alsa-lib-1.2.3.2 --- archive-patches/alsa-lib-link_fix.patch | 22 ------- .../0000-alsa_pc_in.patch} | 0 ...01-Don-t-use-fork-on-noMMU-platforms.patch | 60 +++++++++++++++++++ make/multimedia.mk | 7 ++- make/versions.mk | 2 +- 5 files changed, 66 insertions(+), 25 deletions(-) delete mode 100644 archive-patches/alsa-lib-link_fix.patch rename archive-patches/{alsa-lib.patch => alsa-lib/0000-alsa_pc_in.patch} (100%) create mode 100644 archive-patches/alsa-lib/0001-Don-t-use-fork-on-noMMU-platforms.patch diff --git a/archive-patches/alsa-lib-link_fix.patch b/archive-patches/alsa-lib-link_fix.patch deleted file mode 100644 index 2869dbf..0000000 --- a/archive-patches/alsa-lib-link_fix.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/src/Makefile.in -+++ b/src/Makefile.in -@@ -421,7 +421,7 @@ clean-libLTLIBRARIES: - rm -f $${locs}; \ - } - libasound.la: $(libasound_la_OBJECTS) $(libasound_la_DEPENDENCIES) $(EXTRA_libasound_la_DEPENDENCIES) -- $(AM_V_CCLD)$(libasound_la_LINK) -rpath $(libdir) $(libasound_la_OBJECTS) $(libasound_la_LIBADD) $(LIBS) -+ $(AM_V_CCLD)$(libasound_la_LINK) -rpath $(DESTDIR)$(libdir) $(libasound_la_OBJECTS) $(libasound_la_LIBADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) ---- a/src/pcm/scopes/Makefile.in -+++ b/src/pcm/scopes/Makefile.in -@@ -348,7 +348,7 @@ clean-pkglibLTLIBRARIES: - rm -f $${locs}; \ - } - scope-level.la: $(scope_level_la_OBJECTS) $(scope_level_la_DEPENDENCIES) $(EXTRA_scope_level_la_DEPENDENCIES) -- $(AM_V_CCLD)$(scope_level_la_LINK) -rpath $(pkglibdir) $(scope_level_la_OBJECTS) $(scope_level_la_LIBADD) $(LIBS) -+ $(AM_V_CCLD)$(scope_level_la_LINK) -rpath $(DESTDIR)$(pkglibdir) $(scope_level_la_OBJECTS) $(scope_level_la_LIBADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) diff --git a/archive-patches/alsa-lib.patch b/archive-patches/alsa-lib/0000-alsa_pc_in.patch similarity index 100% rename from archive-patches/alsa-lib.patch rename to archive-patches/alsa-lib/0000-alsa_pc_in.patch diff --git a/archive-patches/alsa-lib/0001-Don-t-use-fork-on-noMMU-platforms.patch b/archive-patches/alsa-lib/0001-Don-t-use-fork-on-noMMU-platforms.patch new file mode 100644 index 0000000..5bf9dd2 --- /dev/null +++ b/archive-patches/alsa-lib/0001-Don-t-use-fork-on-noMMU-platforms.patch @@ -0,0 +1,60 @@ +From 41c029755502acf01ed634db437ac06d09be6c41 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Fri, 13 Apr 2018 09:02:37 +0200 +Subject: [PATCH] Don't use fork() on noMMU platforms +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Thomas Petazzoni +[Jörg: update patch for 1.1.6] +Signed-off-by: Jörg Krause +Upstream: http://mailman.alsa-project.org/pipermail/alsa-devel/2018-November/141376.html +--- + configure.ac | 2 ++ + src/pcm/pcm_direct.c | 10 +++++++++- + 2 files changed, 11 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index cce195ae..0c852434 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -51,6 +51,8 @@ dnl Checks for library functions. + AC_PROG_GCC_TRADITIONAL + AC_CHECK_FUNCS([uselocale]) + ++AC_CHECK_FUNC([fork]) ++ + SAVE_LIBRARY_VERSION + AC_SUBST(LIBTOOL_VERSION_INFO) + +diff --git a/src/pcm/pcm_direct.c b/src/pcm/pcm_direct.c +index 2b07eff9..4dc3ea26 100644 +--- a/src/pcm/pcm_direct.c ++++ b/src/pcm/pcm_direct.c +@@ -431,13 +431,21 @@ int snd_pcm_direct_server_create(snd_pcm_direct_t *dmix) + 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); +-- +2.14.3 + diff --git a/make/multimedia.mk b/make/multimedia.mk index dfb8a46..9fb27a0 100755 --- a/make/multimedia.mk +++ b/make/multimedia.mk @@ -144,12 +144,15 @@ $(D)/libsdl-mixer: $(D)/libsdl $(ARCHIVE)/SDL_mixer-1.2.11.tar.gz | $(TARGETPREF $(REMOVE)/SDL_mixer-1.2.11 $(TOUCH) +ALSA-LIB_PATCH = 0000-alsa_pc_in.patch +ALSA-LIB_PATCH += 0001-Don-t-use-fork-on-noMMU-platforms.patch + $(D)/alsa-lib: $(ARCHIVE)/alsa-lib-$(ALSA_LIB_VER).tar.bz2 | $(TARGETPREFIX) $(START_BUILD) $(UNTAR)/alsa-lib-$(ALSA_LIB_VER).tar.bz2 set -e; cd $(BUILD_TMP)/alsa-lib-$(ALSA_LIB_VER); \ - $(PATCH)/alsa-lib.patch; \ - $(PATCH)/alsa-lib-link_fix.patch; \ + $(call apply_patches, $(addprefix alsa-lib/, $(ALSA-LIB_PATCH))); \ + autoreconf -fi; \ $(CONFIGURE) \ --prefix= \ --datarootdir=/.remove \ diff --git a/make/versions.mk b/make/versions.mk index 409d85a..028cc18 100644 --- a/make/versions.mk +++ b/make/versions.mk @@ -1,7 +1,7 @@ # versions # The Advanced Linux Sound Architecture (ALSA) provides audio and MIDI functionality to the Linux operating system. -ALSA_LIB_VER = 1.2.3 +ALSA_LIB_VER = 1.2.3.2 AUTOFS4_VER = 4.1.4 -- 2.39.5