From patchwork Fri Apr 13 07:28:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?J=C3=B6rg_Krause?= X-Patchwork-Id: 897868 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=embedded.rocks Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40MqC15Kdnz9s16 for ; Fri, 13 Apr 2018 17:28:45 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 2A8E489F43; Fri, 13 Apr 2018 07:28:42 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id SgvLBIwVgzaW; Fri, 13 Apr 2018 07:28:38 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 6028A89E33; Fri, 13 Apr 2018 07:28:38 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id C60B41BFD7B for ; Fri, 13 Apr 2018 07:28:35 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id C37928828B for ; Fri, 13 Apr 2018 07:28:35 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id P9YNDjx8D_3a for ; Fri, 13 Apr 2018 07:28:33 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mout01.posteo.de (mout01.posteo.de [185.67.36.141]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 1EA1288281 for ; Fri, 13 Apr 2018 07:28:32 +0000 (UTC) Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 2472220BB5 for ; Fri, 13 Apr 2018 09:28:30 +0200 (CEST) Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 40MqBj08Gpz9rxN for ; Fri, 13 Apr 2018 09:28:28 +0200 (CEST) Received: from mail.embedded.rocks ([127.0.0.1]) by localhost (mail.embedded.rocks [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id 1E9dqoe3QS-2; Fri, 13 Apr 2018 09:28:27 +0200 (CEST) Received: from nzxt.fritz.box (port-92-195-1-194.dynamic.qsc.de [92.195.1.194]) (Authenticated sender: joerg.krause@embedded.rocks) by mail.embedded.rocks (Postfix) with ESMTPSA; Fri, 13 Apr 2018 09:28:27 +0200 (CEST) From: =?utf-8?q?J=C3=B6rg_Krause?= To: buildroot@buildroot.org Date: Fri, 13 Apr 2018 09:28:24 +0200 Message-Id: <20180413072825.14512-1-joerg.krause@embedded.rocks> X-Mailer: git-send-email 2.17.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/2] alsa-lib: bump to version 1.1.6 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Regenerate patches using git as patch 0002 didn't applied and the others were fuzzy. Signed-off-by: Jörg Krause --- package/alsa-lib/0001-no-mmu.patch | 40 +++++++++----- package/alsa-lib/0002-dlmisc.patch | 54 +++++++++---------- ...-conditional-enabling-of-libdl-in-m4.patch | 17 +++++- package/alsa-lib/alsa-lib.hash | 2 +- package/alsa-lib/alsa-lib.mk | 2 +- 5 files changed, 73 insertions(+), 42 deletions(-) diff --git a/package/alsa-lib/0001-no-mmu.patch b/package/alsa-lib/0001-no-mmu.patch index 2ae0f67158..0114e29d64 100644 --- a/package/alsa-lib/0001-no-mmu.patch +++ b/package/alsa-lib/0001-no-mmu.patch @@ -1,14 +1,27 @@ +From fac9e178f0d221c33efa579f54f6456156570088 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=B6rg=20Krause?= +Date: Fri, 13 Apr 2018 09:02:37 +0200 +Subject: [PATCH 1/3] no mmu +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + Don't use fork() on noMMU platforms -[Gustavo: update patch for 1.0.28] +[Jörg: update patch for 1.1.6] +Signed-off-by: Jörg Krause Signed-off-by: Thomas Petazzoni +--- + configure.ac | 2 ++ + src/pcm/pcm_direct.c | 10 +++++++++- + 2 files changed, 11 insertions(+), 1 deletion(-) -Index: alsa-lib-1.0.26/configure.ac -=================================================================== ---- alsa-lib-1.0.26.orig/configure.ac 2012-09-06 10:55:14.000000000 +0200 -+++ alsa-lib-1.0.26/configure.ac 2013-03-09 16:22:08.000000000 +0100 -@@ -66,6 +66,8 @@ - AM_CONDITIONAL(ALSA_HSEARCH_R, [test "x$HAVE_HSEARCH_R" != xyes]) +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]) @@ -16,11 +29,11 @@ Index: alsa-lib-1.0.26/configure.ac SAVE_LIBRARY_VERSION AC_SUBST(LIBTOOL_VERSION_INFO) -Index: alsa-lib-1.0.26/src/pcm/pcm_direct.c -=================================================================== ---- alsa-lib-1.0.26.orig/src/pcm/pcm_direct.c 2012-09-06 10:55:14.000000000 +0200 -+++ alsa-lib-1.0.26/src/pcm/pcm_direct.c 2013-03-09 16:22:51.000000000 +0100 -@@ -424,13 +424,21 @@ +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; } @@ -43,3 +56,6 @@ Index: alsa-lib-1.0.26/src/pcm/pcm_direct.c if (ret == 0) server_job(dmix); _exit(EXIT_SUCCESS); +-- +2.17.0 + diff --git a/package/alsa-lib/0002-dlmisc.patch b/package/alsa-lib/0002-dlmisc.patch index 24b7230cae..bf8c970283 100644 --- a/package/alsa-lib/0002-dlmisc.patch +++ b/package/alsa-lib/0002-dlmisc.patch @@ -1,3 +1,11 @@ +From 0400d018fc7c71ac628bcce608656febe16e0f77 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=B6rg=20Krause?= +Date: Fri, 13 Apr 2018 09:11:23 +0200 +Subject: [PATCH 2/3] dlmisc +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + alsa-lib: provide dummy definitions of RTLD_* if necessary The FLAT GNU toolchain (e.g. blackfin) doesn't include the dlfcn.h header @@ -6,47 +14,36 @@ definitions for parameters RTLD_GLOBAL / RTLD_NOW which are normally provided by dlfcn.h. Signed-off-by: Sonic Zhang +[Jörg: update for 1.1.6] +Signed-off-by: Jörg Krause [Thomas: don't add separate dlmisc.h, move dummy defs to global.h] Signed-off-by: Thomas De Schampheleire +--- + modules/mixer/simple/sbasedl.c | 4 +++- + src/mixer/simple_abst.c | 3 +++ + 2 files changed, 6 insertions(+), 1 deletion(-) -diff --git a/include/global.h b/include/global.h ---- a/include/global.h -+++ b/include/global.h -@@ -97,6 +97,16 @@ extern struct snd_dlsym_link *snd_dlsym_ - /** \brief Returns the version of a dynamic symbol as a string. */ - #define SND_DLSYM_VERSION(version) __STRING(version) - -+/* RTLD_NOW and RTLD_GLOBAL (used for 'mode' in snd_dlopen) are not defined -+ * on all arches (e.g. blackfin), so provide a dummy definition here. */ -+#ifndef RTLD_NOW -+#define RTLD_NOW 0 -+#endif -+ -+#ifndef RTLD_GLOBAL -+#define RTLD_GLOBAL 0 -+#endif -+ - void *snd_dlopen(const char *file, int mode); - void *snd_dlsym(void *handle, const char *name, const char *version); - int snd_dlclose(void *handle); diff --git a/modules/mixer/simple/sbasedl.c b/modules/mixer/simple/sbasedl.c +index d8cbf0f1..daa0ab30 100644 --- a/modules/mixer/simple/sbasedl.c +++ b/modules/mixer/simple/sbasedl.c -@@ -27,7 +27,9 @@ +@@ -27,8 +27,10 @@ #include #include #include -+#include "config.h" +-#include + #include "config.h" +#ifdef HAVE_DLFCN - #include ++#include +#endif --#include "config.h" #include "asoundlib.h" #include "mixer_abst.h" + #include "sbase.h" diff --git a/src/mixer/simple_abst.c b/src/mixer/simple_abst.c +index 9c61cb58..0ca58fe0 100644 --- a/src/mixer/simple_abst.c +++ b/src/mixer/simple_abst.c -@@ -34,7 +34,9 @@ +@@ -34,7 +34,10 @@ #include #include #include @@ -54,6 +51,9 @@ diff --git a/src/mixer/simple_abst.c b/src/mixer/simple_abst.c +#ifdef HAVE_DLFCN #include +#endif --#include "config.h" - #include "asoundlib.h" + #include "mixer_local.h" #include "mixer_simple.h" + +-- +2.17.0 + diff --git a/package/alsa-lib/0003-conditional-enabling-of-libdl-in-m4.patch b/package/alsa-lib/0003-conditional-enabling-of-libdl-in-m4.patch index c533419baa..42ecaee61d 100644 --- a/package/alsa-lib/0003-conditional-enabling-of-libdl-in-m4.patch +++ b/package/alsa-lib/0003-conditional-enabling-of-libdl-in-m4.patch @@ -1,3 +1,11 @@ +From b7aec21cdec1fc2c18c91ae47d54b3acf56ea378 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=B6rg=20Krause?= +Date: Fri, 13 Apr 2018 09:13:46 +0200 +Subject: [PATCH 3/3] conditional enabling of libdl in m4 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + alsa-lib: conditionally enable libdl in AM_PATH_ALSA m4 macro The AM_PATH_ALSA macro in utils/alsa.m4 unconditionally uses -ldl. This @@ -8,11 +16,15 @@ Blackfin FLAT binaries. This patch updates the macro to check if dlopen is available, and use that result to conditionally add -ldl to the list of libraries. +[Jörg: update for 1.1.6] +Signed-off-by: Jörg Krause Signed-off-by: Thomas De Schampheleire - --- + utils/alsa.m4 | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/utils/alsa.m4 b/utils/alsa.m4 +index e12310df..a5c5a292 100644 --- a/utils/alsa.m4 +++ b/utils/alsa.m4 @@ -44,6 +44,8 @@ if test "$alsa_inc_prefix" != "" ; then @@ -33,3 +45,6 @@ diff --git a/utils/alsa.m4 b/utils/alsa.m4 LIBS="$ALSA_LIBS $LIBS" AC_MSG_RESULT($ALSA_LIBS) +-- +2.17.0 + diff --git a/package/alsa-lib/alsa-lib.hash b/package/alsa-lib/alsa-lib.hash index 885309386e..d2434380bd 100644 --- a/package/alsa-lib/alsa-lib.hash +++ b/package/alsa-lib/alsa-lib.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 f4f68ad3c6da36b0b5241ac3c798a7a71e0e97d51f972e9f723b3f20a9650ae6 alsa-lib-1.1.5.tar.bz2 +sha256 5f2cd274b272cae0d0d111e8a9e363f08783329157e8dd68b3de0c096de6d724 alsa-lib-1.1.6.tar.bz2 sha256 a190dc9c8043755d90f8b0a75fa66b9e42d4af4c980bf5ddc633f0124db3cee7 COPYING sha256 bfe16cf823bcff261fc6a062c07ee96660e3c39678f42f39a788a68dbc234ced aserver/COPYING diff --git a/package/alsa-lib/alsa-lib.mk b/package/alsa-lib/alsa-lib.mk index 3235502089..39be1bf005 100644 --- a/package/alsa-lib/alsa-lib.mk +++ b/package/alsa-lib/alsa-lib.mk @@ -4,7 +4,7 @@ # ################################################################################ -ALSA_LIB_VERSION = 1.1.5 +ALSA_LIB_VERSION = 1.1.6 ALSA_LIB_SOURCE = alsa-lib-$(ALSA_LIB_VERSION).tar.bz2 ALSA_LIB_SITE = ftp://ftp.alsa-project.org/pub/lib ALSA_LIB_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (aserver) From patchwork Fri Apr 13 07:28:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?J=C3=B6rg_Krause?= X-Patchwork-Id: 897867 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=embedded.rocks Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40MqBy3fzKz9s16 for ; Fri, 13 Apr 2018 17:28:41 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id B025289BF8; Fri, 13 Apr 2018 07:28:36 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id b-jhJAnqC5nB; Fri, 13 Apr 2018 07:28:34 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id A728089C29; Fri, 13 Apr 2018 07:28:34 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id C6EB81BFD7B for ; Fri, 13 Apr 2018 07:28:33 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id C3D8388A32 for ; Fri, 13 Apr 2018 07:28:33 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Ar8ODqIkVkje for ; Fri, 13 Apr 2018 07:28:32 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mout01.posteo.de (mout01.posteo.de [185.67.36.141]) by whitealder.osuosl.org (Postfix) with ESMTPS id A251388A2E for ; Fri, 13 Apr 2018 07:28:32 +0000 (UTC) Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 245FC2044C for ; Fri, 13 Apr 2018 09:28:30 +0200 (CEST) Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 40MqBj1r2nz9rxs for ; Fri, 13 Apr 2018 09:28:29 +0200 (CEST) Received: from mail.embedded.rocks ([127.0.0.1]) by localhost (mail.embedded.rocks [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id dU4yuf3Lrn-O; Fri, 13 Apr 2018 09:28:28 +0200 (CEST) Received: from nzxt.fritz.box (port-92-195-1-194.dynamic.qsc.de [92.195.1.194]) (Authenticated sender: joerg.krause@embedded.rocks) by mail.embedded.rocks (Postfix) with ESMTPSA; Fri, 13 Apr 2018 09:28:28 +0200 (CEST) From: =?utf-8?q?J=C3=B6rg_Krause?= To: buildroot@buildroot.org Date: Fri, 13 Apr 2018 09:28:25 +0200 Message-Id: <20180413072825.14512-2-joerg.krause@embedded.rocks> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180413072825.14512-1-joerg.krause@embedded.rocks> References: <20180413072825.14512-1-joerg.krause@embedded.rocks> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 2/2] alsa-utils: bump version to 1.1.6 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Jörg Krause --- package/alsa-utils/alsa-utils.hash | 2 +- package/alsa-utils/alsa-utils.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/alsa-utils/alsa-utils.hash b/package/alsa-utils/alsa-utils.hash index 41cf946bd4..ff8fd08013 100644 --- a/package/alsa-utils/alsa-utils.hash +++ b/package/alsa-utils/alsa-utils.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 320bd285e91db6e7fd7db3c9ec6f55b02f35449ff273c7844780ac6a5a3de2e8 alsa-utils-1.1.5.tar.bz2 +sha256 155caecc40b2220f686f34ba3655a53e3bdbc0586adb1056733949feaaf7d36e alsa-utils-1.1.6.tar.bz2 sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING diff --git a/package/alsa-utils/alsa-utils.mk b/package/alsa-utils/alsa-utils.mk index 2d3407d422..9b2e64b1d3 100644 --- a/package/alsa-utils/alsa-utils.mk +++ b/package/alsa-utils/alsa-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -ALSA_UTILS_VERSION = 1.1.5 +ALSA_UTILS_VERSION = 1.1.6 ALSA_UTILS_SOURCE = alsa-utils-$(ALSA_UTILS_VERSION).tar.bz2 ALSA_UTILS_SITE = ftp://ftp.alsa-project.org/pub/utils ALSA_UTILS_LICENSE = GPL-2.0