[PATCH 0/3] ALSA upgrades

[PATCH 0/3] ALSA upgrades

[Cristian Iorga]

The following changes since commit fe2e53ba30ba679c038bd5b48b9a91a41af4c49e:

  bitbake: toaster: create Build methods for calculating progress and ETA (2014-08-29 13:56:50 +0100)

are available in the git repository at:

  git://git.yoctoproject.org/poky-contrib ciorga/PU2
  http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=ciorga/PU2

Cristian Iorga (3):
  alsa-lib: upgrade to 1.0.28
  alsa-tools: upgrade to 1.0.28
  alsa-utils: upgrade to 1.0.28

 .../Check-if-wordexp-function-is-supported.patch   | 31 +++++-----
 ...-iatomic.h-functions-definitions-for-mips.patch | 68 ----------------------
 .../{alsa-lib_1.0.27.2.bb => alsa-lib_1.0.28.bb}   |  7 +--
 .../alsa/alsa-tools/mips_has_no_io_h.patch         | 16 -----
 .../{alsa-tools_1.0.27.bb => alsa-tools_1.0.28.bb} |  7 +--
 ...f_1.0.27.2.bb => alsa-utils-alsaconf_1.0.28.bb} |  0
 ...-t-let-systemd-unit-restore-the-volume-wh.patch | 42 ++++++++-----
 ...alsa-utils_1.0.27.2.bb => alsa-utils_1.0.28.bb} |  6 +-
 8 files changed, 52 insertions(+), 125 deletions(-)
 delete mode 100644 meta/recipes-multimedia/alsa/alsa-lib/Update-iatomic.h-functions-definitions-for-mips.patch
 rename meta/recipes-multimedia/alsa/{alsa-lib_1.0.27.2.bb => alsa-lib_1.0.28.bb} (86%)
 delete mode 100644 meta/recipes-multimedia/alsa/alsa-tools/mips_has_no_io_h.patch
 rename meta/recipes-multimedia/alsa/{alsa-tools_1.0.27.bb => alsa-tools_1.0.28.bb} (82%)
 rename meta/recipes-multimedia/alsa/{alsa-utils-alsaconf_1.0.27.2.bb => alsa-utils-alsaconf_1.0.28.bb} (100%)
 rename meta/recipes-multimedia/alsa/{alsa-utils_1.0.27.2.bb => alsa-utils_1.0.28.bb} (94%)

-- 
1.9.1

[PATCH 1/3] alsa-lib: upgrade to 1.0.28

[Cristian Iorga]

Changelog:
http://www.alsa-project.org/main/index.php/Changes_v1.0.27.2_v1.0.28

Update-iatomic.h-functions-definitions-for-mips.patch removed,
integrated upstream.
Check-if-wordexp-function-is-supported.patch updated.

Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
---
 .../Check-if-wordexp-function-is-supported.patch   | 31 +++++-----
 ...-iatomic.h-functions-definitions-for-mips.patch | 68 ----------------------
 .../{alsa-lib_1.0.27.2.bb => alsa-lib_1.0.28.bb}   |  7 +--
 3 files changed, 19 insertions(+), 87 deletions(-)
 delete mode 100644 meta/recipes-multimedia/alsa/alsa-lib/Update-iatomic.h-functions-definitions-for-mips.patch
 rename meta/recipes-multimedia/alsa/{alsa-lib_1.0.27.2.bb => alsa-lib_1.0.28.bb} (86%)

diff --git a/meta/recipes-multimedia/alsa/alsa-lib/Check-if-wordexp-function-is-supported.patch b/meta/recipes-multimedia/alsa/alsa-lib/Check-if-wordexp-function-is-supported.patch
index 41b3c23..75a6eb8 100644
--- a/meta/recipes-multimedia/alsa/alsa-lib/Check-if-wordexp-function-is-supported.patch
+++ b/meta/recipes-multimedia/alsa/alsa-lib/Check-if-wordexp-function-is-supported.patch
@@ -1,6 +1,6 @@
-From 2555c5d62229cf269974f6ec6e4689ab97bbda42 Mon Sep 17 00:00:00 2001
+From e33357b59a10d44e9bec5d24100ce23ca300cc79 Mon Sep 17 00:00:00 2001
 From: "Hong H. Pham" <hong.pham@windriver.com>
-Date: Tue, 26 Feb 2013 19:40:04 -0500
+Date: Fri, 29 Aug 2014 17:13:55 +0300
 Subject: [PATCH] Check if wordexp function is supported
 
 eglibc could be configured to build without wordexp, so it is not enough
@@ -8,24 +8,25 @@ to check if wordexp.h exists (the header file could be installed, but it's
 possible that the wordexp() function is not supported).  An additional
 check if wordexp() is supported by the system C library is needed.
 
-Upstream-Status: Pending
+Upstream-Status: Inappropriate [configuration]
 
 Signed-off-by: Hong H. Pham <hong.pham@windriver.com>
+Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
 ---
- configure.in   |    5 ++++-
- src/userfile.c |    2 +-
+ configure.ac   | 5 ++++-
+ src/userfile.c | 2 +-
  2 files changed, 5 insertions(+), 2 deletions(-)
 
-diff --git a/configure.in b/configure.in
-index 4bcb0d6..ba1c2dd 100644
---- a/configure.in
-+++ b/configure.in
-@@ -333,7 +333,10 @@ arm*)
- esac
+diff --git a/configure.ac b/configure.ac
+index b8353a0..773b72f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -311,7 +311,10 @@ fi
+ AC_SUBST(ALSA_DEPLIBS)
  
- dnl Check for wordexp.h
--AC_CHECK_HEADERS([wordexp.h])
-+AC_CHECK_HEADERS([wordexp.h],
+ dnl Check for headers
+-AC_CHECK_HEADERS([wordexp.h endian.h sys/endian.h])
++AC_CHECK_HEADERS([wordexp.h endian.h sys/endian.h],
 +  dnl Make sure wordexp is supported by the C library
 +  AC_CHECK_FUNCS([wordexp])
 +)
@@ -46,5 +47,5 @@ index 3a73836..b8ce809 100644
  #include <assert.h>
  int snd_user_file(const char *file, char **result)
 -- 
-1.7.10.4
+1.9.1
 
diff --git a/meta/recipes-multimedia/alsa/alsa-lib/Update-iatomic.h-functions-definitions-for-mips.patch b/meta/recipes-multimedia/alsa/alsa-lib/Update-iatomic.h-functions-definitions-for-mips.patch
deleted file mode 100644
index f1a7947..0000000
--- a/meta/recipes-multimedia/alsa/alsa-lib/Update-iatomic.h-functions-definitions-for-mips.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-Upstream-Status: Backport
-
-Signed-off-by: Kai Kang <kai.kang@windriver.com>
-
-From f21f48a70f8437a671b58fcab75e54222a9eea16 Mon Sep 17 00:00:00 2001
-From: Kai Kang <jiashuo.kang at gmail.com>
-Date: Thu, 15 Aug 2013 17:17:19 +0800
-Subject: [PATCH] Update iatomic.h functions definitions for mips
-
-Functions atomic_add(s) and atomic_sub(s) are defined with 'extern
-__inline__' that may cause compile fails when cross compile for mips.
-The error message looks like:
-
-| pcm/.libs/libpcm.a(pcm_meter.o): In function `snd_pcm_meter_update_scope':
-| .../alsa-lib-1.0.27.2/src/pcm/pcm_meter.c:139: undefined reference to `atomic_sub'
-
-Replace the 'extern __inline__' with 'static __inline__' to fix this
-issue.
-
-Signed-off-by: Kai Kang <jiashuo.kang at gmail.com>
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
----
- include/iatomic.h | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/include/iatomic.h b/include/iatomic.h
-index 5711fe8..2393297 100644
---- a/include/iatomic.h
-+++ b/include/iatomic.h
-@@ -720,7 +720,7 @@ typedef struct { volatile int counter; } atomic_t;
-  * Atomically adds @i to @v.  Note that the guaranteed useful range
-  * of an atomic_t is only 24 bits.
-  */
--extern __inline__ void atomic_add(int i, atomic_t * v)
-+static __inline__ void atomic_add(int i, atomic_t * v)
- {
- 	unsigned long temp;
- 
-@@ -744,7 +744,7 @@ extern __inline__ void atomic_add(int i, atomic_t * v)
-  * Atomically subtracts @i from @v.  Note that the guaranteed
-  * useful range of an atomic_t is only 24 bits.
-  */
--extern __inline__ void atomic_sub(int i, atomic_t * v)
-+static __inline__ void atomic_sub(int i, atomic_t * v)
- {
- 	unsigned long temp;
- 
-@@ -763,7 +763,7 @@ extern __inline__ void atomic_sub(int i, atomic_t * v)
- /*
-  * Same as above, but return the result value
-  */
--extern __inline__ int atomic_add_return(int i, atomic_t * v)
-+static __inline__ int atomic_add_return(int i, atomic_t * v)
- {
- 	unsigned long temp, result;
- 
-@@ -784,7 +784,7 @@ extern __inline__ int atomic_add_return(int i, atomic_t * v)
- 	return result;
- }
- 
--extern __inline__ int atomic_sub_return(int i, atomic_t * v)
-+static __inline__ int atomic_sub_return(int i, atomic_t * v)
- {
- 	unsigned long temp, result;
- 
--- 
-1.8.1.2
-
diff --git a/meta/recipes-multimedia/alsa/alsa-lib_1.0.27.2.bb b/meta/recipes-multimedia/alsa/alsa-lib_1.0.28.bb
similarity index 86%
rename from meta/recipes-multimedia/alsa/alsa-lib_1.0.27.2.bb
rename to meta/recipes-multimedia/alsa/alsa-lib_1.0.28.bb
index fc0847d..d509da2 100644
--- a/meta/recipes-multimedia/alsa/alsa-lib_1.0.27.2.bb
+++ b/meta/recipes-multimedia/alsa/alsa-lib_1.0.28.bb
@@ -14,16 +14,15 @@ BBCLASSEXTEND = "native nativesdk"
 #FIXME: remove the following
 ARM_INSTRUCTION_SET = "arm"
 
-SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/alsa-lib-${PV}.tar.bz2 \
+SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/${BP}.tar.bz2 \
            file://Check-if-wordexp-function-is-supported.patch \
            file://fix-tstamp-declaration.patch \
-           file://Update-iatomic.h-functions-definitions-for-mips.patch \
            file://0001-pcm-route-Use-get32-for-multi-source-route-calculati.patch \
            file://0001-pcm-rate-fix-hw_ptr-exceed-the-boundary.patch \
            file://0001-pcm-pcm_local.h-include-time.h-to-enable-CLOCK_MONOT.patch \
 "
-SRC_URI[md5sum] = "69129a7c37697f81ac092335e9fa452b"
-SRC_URI[sha256sum] = "690ed393e7efd4fc7e3a2d2cda5449298ca0c895197e5914e350882012430d19"
+SRC_URI[md5sum] = "c9e21b88a2b3e6e12ea7ba0f3b271fc3"
+SRC_URI[sha256sum] = "3c074b85dde1b30e78ef4995579765833e5b693fbbd8f834c335e080cb734a6d"
 
 inherit autotools pkgconfig
 
-- 
1.9.1

[PATCH 2/3] alsa-tools: upgrade to 1.0.28

[Cristian Iorga]

mips_has_no_io_h.patch removed, no longer necessary.
Changelog:
http://www.alsa-project.org/main/index.php/Changes_v1.0.27.2_v1.0.28

Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
---
 .../alsa/alsa-tools/mips_has_no_io_h.patch               | 16 ----------------
 .../alsa/{alsa-tools_1.0.27.bb => alsa-tools_1.0.28.bb}  |  7 +++----
 2 files changed, 3 insertions(+), 20 deletions(-)
 delete mode 100644 meta/recipes-multimedia/alsa/alsa-tools/mips_has_no_io_h.patch
 rename meta/recipes-multimedia/alsa/{alsa-tools_1.0.27.bb => alsa-tools_1.0.28.bb} (82%)

diff --git a/meta/recipes-multimedia/alsa/alsa-tools/mips_has_no_io_h.patch b/meta/recipes-multimedia/alsa/alsa-tools/mips_has_no_io_h.patch
deleted file mode 100644
index 09b10f1..0000000
--- a/meta/recipes-multimedia/alsa/alsa-tools/mips_has_no_io_h.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Upstream-Status: Pending
-Signed-off-by: Saul Wold <sgw@linux.intel.com>
-
-Index: alsa-tools-1.0.26.1/hda-verb/hda-verb.c
-===================================================================
---- alsa-tools-1.0.26.1.orig/hda-verb/hda-verb.c
-+++ alsa-tools-1.0.26.1/hda-verb/hda-verb.c
-@@ -13,7 +13,7 @@
- #include <ctype.h>
- #include <unistd.h>
- #include <sys/ioctl.h>
--#ifndef __PPC__
-+#if !(__PPC__ || __mips__)
- #include <sys/io.h>
- #endif
- #include <sys/types.h>
diff --git a/meta/recipes-multimedia/alsa/alsa-tools_1.0.27.bb b/meta/recipes-multimedia/alsa/alsa-tools_1.0.28.bb
similarity index 82%
rename from meta/recipes-multimedia/alsa/alsa-tools_1.0.27.bb
rename to meta/recipes-multimedia/alsa/alsa-tools_1.0.28.bb
index bca7170..4b9509e 100644
--- a/meta/recipes-multimedia/alsa/alsa-tools_1.0.27.bb
+++ b/meta/recipes-multimedia/alsa/alsa-tools_1.0.28.bb
@@ -8,14 +8,13 @@ DEPENDS = "alsa-lib ncurses"
 LIC_FILES_CHKSUM = "file://hdsploader/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
                     file://ld10k1/COPYING.LIB;md5=7fbc338309ac38fefcd64b04bb903e34"
 
-SRC_URI = "ftp://ftp.alsa-project.org/pub/tools/alsa-tools-${PV}.tar.bz2 \
-           file://mips_has_no_io_h.patch \
+SRC_URI = "ftp://ftp.alsa-project.org/pub/tools/${BP}.tar.bz2 \
            file://autotools.patch \
            ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', \
                                 'file://makefile_no_gtk.patch', d)}"
 
-SRC_URI[md5sum] = "1ea381d00a6069a98613aa7effa4cb51"
-SRC_URI[sha256sum] = "6562611b5a6560712f109e09740a9d4fa47296b07ed9590cb44139c5f154ada2"
+SRC_URI[md5sum] = "e6c929175d8ee729c06d49b51439bad6"
+SRC_URI[sha256sum] = "76e59711c6d0f39cbddce83ce1ed8da00bad112fee021f94fa990d8685cc3761"
 
 inherit autotools-brokensep pkgconfig
 
-- 
1.9.1

[PATCH 3/3] alsa-utils: upgrade to 1.0.28

[Cristian Iorga]

Changelog:
http://www.alsa-project.org/main/index.php/Changes_v1.0.27.2_v1.0.28

0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch updated.

Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
---
 ...f_1.0.27.2.bb => alsa-utils-alsaconf_1.0.28.bb} |  0
 ...-t-let-systemd-unit-restore-the-volume-wh.patch | 42 ++++++++++++++--------
 ...alsa-utils_1.0.27.2.bb => alsa-utils_1.0.28.bb} |  6 ++--
 3 files changed, 30 insertions(+), 18 deletions(-)
 rename meta/recipes-multimedia/alsa/{alsa-utils-alsaconf_1.0.27.2.bb => alsa-utils-alsaconf_1.0.28.bb} (100%)
 rename meta/recipes-multimedia/alsa/{alsa-utils_1.0.27.2.bb => alsa-utils_1.0.28.bb} (94%)

diff --git a/meta/recipes-multimedia/alsa/alsa-utils-alsaconf_1.0.27.2.bb b/meta/recipes-multimedia/alsa/alsa-utils-alsaconf_1.0.28.bb
similarity index 100%
rename from meta/recipes-multimedia/alsa/alsa-utils-alsaconf_1.0.27.2.bb
rename to meta/recipes-multimedia/alsa/alsa-utils-alsaconf_1.0.28.bb
diff --git a/meta/recipes-multimedia/alsa/alsa-utils/0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch b/meta/recipes-multimedia/alsa/alsa-utils/0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch
index 477cd11..e99dd51 100644
--- a/meta/recipes-multimedia/alsa/alsa-utils/0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch
+++ b/meta/recipes-multimedia/alsa/alsa-utils/0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch
@@ -1,35 +1,44 @@
-From 37c99a3cbff36915b56a5703eeaed3c70796f80f Mon Sep 17 00:00:00 2001
+From 43a56fa36a12f09ccd78b3cf5e6ae197fcab501f Mon Sep 17 00:00:00 2001
 From: Koen Kooi <koen@dominion.thruhere.net>
-Date: Sun, 9 Oct 2011 20:06:35 +0200
-Subject: [PATCH] alsactl: don't let systemd unit restore the volume when asound.state is missing
+Date: Fri, 29 Aug 2014 18:58:56 +0300
+Subject: [PATCH] alsactl: don't let systemd unit restore the volume when
+ asound.state is missing
 
 This avoids an error on bootup
 
-Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
-
 Filed as https://bugtrack.alsa-project.org/alsa-bug/view.php?id=5459
 
 Upstream-Status: Pending
 
-Index: alsa-utils-1.0.27.2/alsactl/Makefile.am
-===================================================================
---- alsa-utils-1.0.27.2.orig/alsactl/Makefile.am
-+++ alsa-utils-1.0.27.2/alsactl/Makefile.am
-@@ -36,8 +36,8 @@ install-data-hook:
+Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
+Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
+---
+ alsactl/Makefile.am             | 7 ++++---
+ alsactl/alsa-restore.service.in | 1 +
+ 2 files changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/alsactl/Makefile.am b/alsactl/Makefile.am
+index 47f06e9..b728c06 100644
+--- a/alsactl/Makefile.am
++++ b/alsactl/Makefile.am
+@@ -43,9 +43,10 @@ install-data-hook:
  endif
  
  edit = \
 -	$(SED) -r -e 's,@sbindir\@,$(sbindir),g' \
+-		  -e 's,@mydatadir\@,$(mydatadir),g' \
 -		  -e 's,@daemonswitch\@,$(ALSACTL_DAEMONSWITCH),g' \
-+	$(SED) -e 's,@localstatedir\@,$(localstatedir),g' -e 's,@sbindir\@,$(sbindir),g' \
++	$(SED) -e 's,@localstatedir\@,$(localstatedir),g' \
++	       -e 's,@sbindir\@,$(sbindir),g' \
++	       -e 's,@mydatadir\@,$(mydatadir),g' \
 +	       -e 's,@daemonswitch\@,$(ALSACTL_DAEMONSWITCH),g' \
  							< $< > $@ || rm $@
  
  alsa-state.service: alsa-state.service.in
-Index: alsa-utils-1.0.27.2/alsactl/alsa-restore.service.in
-===================================================================
---- alsa-utils-1.0.27.2.orig/alsactl/alsa-restore.service.in
-+++ alsa-utils-1.0.27.2/alsactl/alsa-restore.service.in
+diff --git a/alsactl/alsa-restore.service.in b/alsactl/alsa-restore.service.in
+index 245a439..b017854 100644
+--- a/alsactl/alsa-restore.service.in
++++ b/alsactl/alsa-restore.service.in
 @@ -10,6 +10,7 @@ DefaultDependencies=no
  After=alsa-state.service
  Before=shutdown.target
@@ -38,3 +47,6 @@ Index: alsa-utils-1.0.27.2/alsactl/alsa-restore.service.in
  
  [Service]
  Type=oneshot
+-- 
+1.9.1
+
diff --git a/meta/recipes-multimedia/alsa/alsa-utils_1.0.27.2.bb b/meta/recipes-multimedia/alsa/alsa-utils_1.0.28.bb
similarity index 94%
rename from meta/recipes-multimedia/alsa/alsa-utils_1.0.27.2.bb
rename to meta/recipes-multimedia/alsa/alsa-utils_1.0.28.bb
index 047fcfe..d6b24f1 100644
--- a/meta/recipes-multimedia/alsa/alsa-utils_1.0.27.2.bb
+++ b/meta/recipes-multimedia/alsa/alsa-utils_1.0.28.bb
@@ -11,12 +11,12 @@ PACKAGECONFIG ??= "udev"
 PACKAGECONFIG[udev] = "--with-udev-rules-dir=`pkg-config --variable=udevdir udev`/rules.d,,udev"
 PACKAGECONFIG[xmlto] = "--enable-xmlto, --disable-xmlto, xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native"
 
-SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2 \
+SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/${BP}.tar.bz2 \
            file://0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch \
           "
 
-SRC_URI[md5sum] = "b65e9a04181bd7c9db7667a4566f8dc3"
-SRC_URI[sha256sum] = "02bfac39092f3b68d743c23ad3d688d6c5aa8df69f2ccd692c5b8282edb352ea"
+SRC_URI[md5sum] = "361552d5b1cacd0a1e7ba09e69990211"
+SRC_URI[sha256sum] = "f3ff4c89b0125a7797b1b13cd094cc92276e655458274967386e812d03642acc"
 
 # lazy hack. needs proper fixing in gettext.m4, see
 # http://bugs.openembedded.org/show_bug.cgi?id=2348
-- 
1.9.1

Re: [PATCH 1/3] alsa-lib: upgrade to 1.0.28

[Richard Purdie]

On Fri, 2014-08-29 at 20:06 +0300, Cristian Iorga wrote:
> diff --git a/meta/recipes-multimedia/alsa/alsa-lib_1.0.27.2.bb b/meta/recipes-multimedia/alsa/alsa-lib_1.0.28.bb
> similarity index 86%
> rename from meta/recipes-multimedia/alsa/alsa-lib_1.0.27.2.bb
> rename to meta/recipes-multimedia/alsa/alsa-lib_1.0.28.bb
> index fc0847d..d509da2 100644
> --- a/meta/recipes-multimedia/alsa/alsa-lib_1.0.27.2.bb
> +++ b/meta/recipes-multimedia/alsa/alsa-lib_1.0.28.bb
> @@ -14,16 +14,15 @@ BBCLASSEXTEND = "native nativesdk"
>  #FIXME: remove the following
>  ARM_INSTRUCTION_SET = "arm"
>  
> -SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/alsa-lib-${PV}.tar.bz2 \
> +SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/${BP}.tar.bz2 \
>             file://Check-if-wordexp-function-is-supported.patch \

This breaks the fetch of alsa-utils-alsaconf. I've reverted this part of
the change.

Cheers,

Richard