From f5012c02ce2fa832bf9a70a9b77502527c25b6c0 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Fri, 31 Jul 2020 23:52:26 +0200 Subject: [PATCH] - alsa-lib: bump version to 1.2.3.2 --- make/target-libs.mk | 7 +-- patches/alsa-lib-link_fix.patch | 22 ------- .../0000-alsa_pc_in.patch} | 0 ...01-Don-t-use-fork-on-noMMU-platforms.patch | 60 +++++++++++++++++++ 4 files changed, 62 insertions(+), 27 deletions(-) delete mode 100644 patches/alsa-lib-link_fix.patch rename patches/{alsa-lib.patch => alsa-lib/0000-alsa_pc_in.patch} (100%) create mode 100644 patches/alsa-lib/0001-Don-t-use-fork-on-noMMU-platforms.patch diff --git a/make/target-libs.mk b/make/target-libs.mk index 10b85351..c690e60d 100644 --- a/make/target-libs.mk +++ b/make/target-libs.mk @@ -1273,7 +1273,7 @@ glib2: $(GLIB2_DEPS) $(ARCHIVE)/$(GLIB2_SOURCE) | $(TARGET_DIR) # ----------------------------------------------------------------------------- -ALSA-LIB_VER = 1.2.3 +ALSA-LIB_VER = 1.2.3.2 ALSA-LIB_TMP = alsa-lib-$(ALSA-LIB_VER) ALSA-LIB_SOURCE = alsa-lib-$(ALSA-LIB_VER).tar.bz2 ALSA-LIB_SITE = https://www.alsa-project.org/files/pub/lib @@ -1281,14 +1281,11 @@ ALSA-LIB_SITE = https://www.alsa-project.org/files/pub/lib $(ARCHIVE)/$(ALSA-LIB_SOURCE): $(DOWNLOAD) $(ALSA-LIB_SITE)/$(ALSA-LIB_SOURCE) -ALSA-LIB_PATCH = alsa-lib.patch -ALSA-LIB_PATCH += alsa-lib-link_fix.patch - alsa-lib: $(ARCHIVE)/$(ALSA-LIB_SOURCE) $(REMOVE)/$(ALSA-LIB_TMP) $(UNTAR)/$(ALSA-LIB_SOURCE) $(CHDIR)/$(ALSA-LIB_TMP); \ - $(call apply_patches, $(ALSA-LIB_PATCH)); \ + $(APPLY_PATCHES); \ $(CONFIGURE) \ --prefix= \ --datarootdir=$(remove-datarootdir) \ diff --git a/patches/alsa-lib-link_fix.patch b/patches/alsa-lib-link_fix.patch deleted file mode 100644 index 9a3258c7..00000000 --- a/patches/alsa-lib-link_fix.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/src/Makefile.in -+++ b/src/Makefile.in -@@ -490,7 +490,7 @@ clean-libLTLIBRARIES: - } - - 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 -@@ -410,7 +410,7 @@ clean-pkglibLTLIBRARIES: - } - - 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/patches/alsa-lib.patch b/patches/alsa-lib/0000-alsa_pc_in.patch similarity index 100% rename from patches/alsa-lib.patch rename to patches/alsa-lib/0000-alsa_pc_in.patch diff --git a/patches/alsa-lib/0001-Don-t-use-fork-on-noMMU-platforms.patch b/patches/alsa-lib/0001-Don-t-use-fork-on-noMMU-platforms.patch new file mode 100644 index 00000000..5bf9dd20 --- /dev/null +++ b/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 +