[PATCH 0/4] Update alsa recipes

[PATCH 0/4] Update alsa recipes

[Tanu Kaskinen]

Here are updates for the alsa 1.1.1 release. alsa-tools 1.1.1 was not
released, because there have been no changes since 1.1.0.

As a bonus, the first patch fixes the BUGTRACKER links that have been
broken for quite some time.

The following changes since commit 554719e3f65e468f89a96d4869766d3ff7a8012e:

  lib/oe/package_manager: adapt for Python 3 (2016-06-05 23:39:43 +0100)

are available in the git repository at:

  git://git.openembedded.org/openembedded-core-contrib tanuk/updates
  http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=tanuk/updates

Tanu Kaskinen (4):
  alsa: update BUGTRACKER links
  alsa-lib: 1.1.0 -> 1.1.1
  alsa-utils: 1.1.0 -> 1.1.1
  alsa-plugins: 1.1.0 -> 1.1.1

 ...fix-appl-pointer-not-correct-when-mmap_co.patch |  2 +-
 ...1-topology-Add-missing-include-sys-stat.h.patch | 35 ----------------------
 .../avoid-including-sys-poll.h-directly.patch      |  2 +-
 .../alsa/{alsa-lib_1.1.0.bb => alsa-lib_1.1.1.bb}  |  7 ++---
 ...ph-include-config.h-from-rate_speexrate.c.patch | 35 ----------------------
 ...alsa-plugins_1.1.0.bb => alsa-plugins_1.1.1.bb} | 10 +++----
 meta/recipes-multimedia/alsa/alsa-tools_1.1.0.bb   |  2 +-
 ...cripts_1.1.0.bb => alsa-utils-scripts_1.1.1.bb} |  0
 .../{alsa-utils_1.1.0.bb => alsa-utils_1.1.1.bb}   | 14 ++++++---
 9 files changed, 20 insertions(+), 87 deletions(-)
 delete mode 100644 meta/recipes-multimedia/alsa/alsa-lib/0001-topology-Add-missing-include-sys-stat.h.patch
 rename meta/recipes-multimedia/alsa/{alsa-lib_1.1.0.bb => alsa-lib_1.1.1.bb} (85%)
 delete mode 100644 meta/recipes-multimedia/alsa/alsa-plugins/0001-pph-include-config.h-from-rate_speexrate.c.patch
 rename meta/recipes-multimedia/alsa/{alsa-plugins_1.1.0.bb => alsa-plugins_1.1.1.bb} (93%)
 rename meta/recipes-multimedia/alsa/{alsa-utils-scripts_1.1.0.bb => alsa-utils-scripts_1.1.1.bb} (100%)
 rename meta/recipes-multimedia/alsa/{alsa-utils_1.1.0.bb => alsa-utils_1.1.1.bb} (89%)

-- 
2.8.1

[PATCH 1/4] alsa: update BUGTRACKER links

[Tanu Kaskinen]

The old bug tracker is defunct.

Signed-off-by: Tanu Kaskinen <tanuk@iki.fi>
---
 meta/recipes-multimedia/alsa/alsa-lib_1.1.0.bb     | 2 +-
 meta/recipes-multimedia/alsa/alsa-plugins_1.1.0.bb | 1 +
 meta/recipes-multimedia/alsa/alsa-tools_1.1.0.bb   | 2 +-
 meta/recipes-multimedia/alsa/alsa-utils_1.1.0.bb   | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-multimedia/alsa/alsa-lib_1.1.0.bb b/meta/recipes-multimedia/alsa/alsa-lib_1.1.0.bb
index 296a7bb..cff3d01 100644
--- a/meta/recipes-multimedia/alsa/alsa-lib_1.1.0.bb
+++ b/meta/recipes-multimedia/alsa/alsa-lib_1.1.0.bb
@@ -1,6 +1,6 @@
 SUMMARY = "ALSA sound library"
 HOMEPAGE = "http://www.alsa-project.org"
-BUGTRACKER = "https://bugtrack.alsa-project.org/alsa-bug/login_page.php"
+BUGTRACKER = "http://alsa-project.org/main/index.php/Bug_Tracking"
 SECTION = "libs/multimedia"
 LICENSE = "LGPLv2.1 & GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34 \
diff --git a/meta/recipes-multimedia/alsa/alsa-plugins_1.1.0.bb b/meta/recipes-multimedia/alsa/alsa-plugins_1.1.0.bb
index fec6575..e541017 100644
--- a/meta/recipes-multimedia/alsa/alsa-plugins_1.1.0.bb
+++ b/meta/recipes-multimedia/alsa/alsa-plugins_1.1.0.bb
@@ -1,5 +1,6 @@
 SUMMARY = "ALSA Plugins"
 HOMEPAGE = "http://alsa-project.org"
+BUGTRACKER = "http://alsa-project.org/main/index.php/Bug_Tracking"
 SECTION = "multimedia"
 
 # The primary license of alsa-plugins is LGPLv2.1.
diff --git a/meta/recipes-multimedia/alsa/alsa-tools_1.1.0.bb b/meta/recipes-multimedia/alsa/alsa-tools_1.1.0.bb
index 916bf08..8d4a146 100644
--- a/meta/recipes-multimedia/alsa/alsa-tools_1.1.0.bb
+++ b/meta/recipes-multimedia/alsa/alsa-tools_1.1.0.bb
@@ -1,6 +1,6 @@
 SUMMARY = "Advanced tools for certain ALSA sound card drivers"
 HOMEPAGE = "http://www.alsa-project.org"
-BUGTRACKER = "https://bugtrack.alsa-project.org/alsa-bug/login_page.php"
+BUGTRACKER = "http://alsa-project.org/main/index.php/Bug_Tracking"
 SECTION = "console/utils"
 LICENSE = "GPLv2 & LGPLv2+"
 DEPENDS = "alsa-lib ncurses glib-2.0"
diff --git a/meta/recipes-multimedia/alsa/alsa-utils_1.1.0.bb b/meta/recipes-multimedia/alsa/alsa-utils_1.1.0.bb
index af40488..62b1686 100644
--- a/meta/recipes-multimedia/alsa/alsa-utils_1.1.0.bb
+++ b/meta/recipes-multimedia/alsa/alsa-utils_1.1.0.bb
@@ -1,6 +1,6 @@
 SUMMARY = "ALSA sound utilities"
 HOMEPAGE = "http://www.alsa-project.org"
-BUGTRACKER = "https://bugtrack.alsa-project.org/alsa-bug/login_page.php"
+BUGTRACKER = "http://alsa-project.org/main/index.php/Bug_Tracking"
 SECTION = "console/utils"
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
-- 
2.8.1

[PATCH 2/4] alsa-lib: 1.1.0 -> 1.1.1

[Tanu Kaskinen]

Release notes:
http://alsa-project.org/main/index.php/Changes_v1.1.0_v1.1.1

Dropped upstreamed patch
0001-topology-Add-missing-include-sys-stat.h.patch.

Updated "Upstream-Status" of accepted patch
0001-pcm_plugin-fix-appl-pointer-not-correct-when-mmap_co.patch.

Rebased avoid-including-sys-poll.h-directly.patch.

Signed-off-by: Tanu Kaskinen <tanuk@iki.fi>
---
 ...fix-appl-pointer-not-correct-when-mmap_co.patch |  2 +-
 ...1-topology-Add-missing-include-sys-stat.h.patch | 35 ----------------------
 .../avoid-including-sys-poll.h-directly.patch      |  2 +-
 .../alsa/{alsa-lib_1.1.0.bb => alsa-lib_1.1.1.bb}  |  5 ++--
 4 files changed, 4 insertions(+), 40 deletions(-)
 delete mode 100644 meta/recipes-multimedia/alsa/alsa-lib/0001-topology-Add-missing-include-sys-stat.h.patch
 rename meta/recipes-multimedia/alsa/{alsa-lib_1.1.0.bb => alsa-lib_1.1.1.bb} (89%)

diff --git a/meta/recipes-multimedia/alsa/alsa-lib/0001-pcm_plugin-fix-appl-pointer-not-correct-when-mmap_co.patch b/meta/recipes-multimedia/alsa/alsa-lib/0001-pcm_plugin-fix-appl-pointer-not-correct-when-mmap_co.patch
index 9fd69f3..bb2f82b 100755
--- a/meta/recipes-multimedia/alsa/alsa-lib/0001-pcm_plugin-fix-appl-pointer-not-correct-when-mmap_co.patch
+++ b/meta/recipes-multimedia/alsa/alsa-lib/0001-pcm_plugin-fix-appl-pointer-not-correct-when-mmap_co.patch
@@ -9,7 +9,7 @@ which cause the avail_update()'s result wrong.
 This patch move the snd_pcm_mmap_appl_forward() to the place when
 snd_pcm_mmap_commit() is successfully returned.
 
-Upstream-Status: Submitted [https://patchwork.kernel.org/patch/8760881/]
+Upstream-Status: Accepted [expected in 1.1.2]
 
 Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com>
 Signed-off-by: Takashi Iwai <tiwai@suse.de>
diff --git a/meta/recipes-multimedia/alsa/alsa-lib/0001-topology-Add-missing-include-sys-stat.h.patch b/meta/recipes-multimedia/alsa/alsa-lib/0001-topology-Add-missing-include-sys-stat.h.patch
deleted file mode 100644
index 0ead0cd..0000000
--- a/meta/recipes-multimedia/alsa/alsa-lib/0001-topology-Add-missing-include-sys-stat.h.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 3f1dba9a821b53b42001605f9a126a958804884f Mon Sep 17 00:00:00 2001
-From: Takashi Iwai <tiwai@suse.de>
-Date: Mon, 9 Nov 2015 13:37:26 +0100
-Subject: [PATCH] topology: Add missing include sys/stat.h
-
-Necessary for proper definitions of S_IRUSR & co. Otherwise it
-results in compile errors with old glibc and uclibc:
-  parser.c: In function 'snd_tplg_build_file':
-  parser.c:262: error: 'S_IRUSR' undeclared (first use in this function)
-  parser.c:262: error: (Each undeclared identifier is reported only once
-  parser.c:262: error: for each function it appears in.)
-
-Upstream-Status: Backport
-
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
-Signed-off-by: Maxin B. John <maxin.john@intel.com>
----
- src/topology/parser.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/topology/parser.c b/src/topology/parser.c
-index 80a0ae0..18bb9c7 100644
---- a/src/topology/parser.c
-+++ b/src/topology/parser.c
-@@ -16,6 +16,7 @@
-            Liam Girdwood <liam.r.girdwood@linux.intel.com>
- */
- 
-+#include <sys/stat.h>
- #include "list.h"
- #include "tplg_local.h"
- 
--- 
-2.4.0
-
diff --git a/meta/recipes-multimedia/alsa/alsa-lib/avoid-including-sys-poll.h-directly.patch b/meta/recipes-multimedia/alsa/alsa-lib/avoid-including-sys-poll.h-directly.patch
index 161619b..b8b1cb6 100644
--- a/meta/recipes-multimedia/alsa/alsa-lib/avoid-including-sys-poll.h-directly.patch
+++ b/meta/recipes-multimedia/alsa/alsa-lib/avoid-including-sys-poll.h-directly.patch
@@ -73,7 +73,7 @@ index b429f5d..e05898f 100644
 +#include <poll.h>
  #include <sys/types.h>
  #include <errno.h>
- #include <linux/types.h>
+ #if defined(__linux__)
 diff --git a/src/control/control.c b/src/control/control.c
 index 4a28cf6..071c5db 100644
 --- a/src/control/control.c
diff --git a/meta/recipes-multimedia/alsa/alsa-lib_1.1.0.bb b/meta/recipes-multimedia/alsa/alsa-lib_1.1.1.bb
similarity index 89%
rename from meta/recipes-multimedia/alsa/alsa-lib_1.1.0.bb
rename to meta/recipes-multimedia/alsa/alsa-lib_1.1.1.bb
index cff3d01..4fb7cca 100644
--- a/meta/recipes-multimedia/alsa/alsa-lib_1.1.0.bb
+++ b/meta/recipes-multimedia/alsa/alsa-lib_1.1.1.bb
@@ -17,11 +17,10 @@ ARM_INSTRUCTION_SET = "arm"
 SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/${BP}.tar.bz2 \
            file://Check-if-wordexp-function-is-supported.patch \
            file://avoid-including-sys-poll.h-directly.patch \
-           file://0001-topology-Add-missing-include-sys-stat.h.patch \
            file://0001-pcm_plugin-fix-appl-pointer-not-correct-when-mmap_co.patch \
 "
-SRC_URI[md5sum] = "69515ca73c3c4a212ef45160dea846c1"
-SRC_URI[sha256sum] = "dfde65d11e82b68f82e562ab6228c1fb7c78854345d3c57e2c68a9dd3dae1f15"
+SRC_URI[md5sum] = "881060d2c568f7f49db82c58df2f9ddc"
+SRC_URI[sha256sum] = "8ac76c3144ed2ed49da7622ab65ac5415205913ccbedde877972383cbc234269"
 
 inherit autotools pkgconfig
 
-- 
2.8.1

[PATCH 3/4] alsa-utils: 1.1.0 -> 1.1.1

[Tanu Kaskinen]

Changelog:
http://alsa-project.org/main/index.php/Changes_v1.1.0_v1.1.1

alsabat has now a "standalone" mode, in which analysis with libfftw is
not needed. Therefore, it's now possible to enable alsabat without
fftw. However, there's no way to explicitly tell the configure script
to enable alsabat, but disable fftw. Without support for explicit
request to disable fftw, fftw would become a floating dependency,
which is why the recipe still only supports the "disable alsabat" and
"enable alsabat with fftw" options.

Dropped 0001-alsabat-rename-to-avoid-naming-conflict.patch (it's
included in the new release).

Signed-off-by: Tanu Kaskinen <tanuk@iki.fi>
---
 ...sa-utils-scripts_1.1.0.bb => alsa-utils-scripts_1.1.1.bb} |  0
 .../alsa/{alsa-utils_1.1.0.bb => alsa-utils_1.1.1.bb}        | 12 +++++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)
 rename meta/recipes-multimedia/alsa/{alsa-utils-scripts_1.1.0.bb => alsa-utils-scripts_1.1.1.bb} (100%)
 rename meta/recipes-multimedia/alsa/{alsa-utils_1.1.0.bb => alsa-utils_1.1.1.bb} (90%)

diff --git a/meta/recipes-multimedia/alsa/alsa-utils-scripts_1.1.0.bb b/meta/recipes-multimedia/alsa/alsa-utils-scripts_1.1.1.bb
similarity index 100%
rename from meta/recipes-multimedia/alsa/alsa-utils-scripts_1.1.0.bb
rename to meta/recipes-multimedia/alsa/alsa-utils-scripts_1.1.1.bb
diff --git a/meta/recipes-multimedia/alsa/alsa-utils_1.1.0.bb b/meta/recipes-multimedia/alsa/alsa-utils_1.1.1.bb
similarity index 90%
rename from meta/recipes-multimedia/alsa/alsa-utils_1.1.0.bb
rename to meta/recipes-multimedia/alsa/alsa-utils_1.1.1.bb
index 62b1686..08c4646 100644
--- a/meta/recipes-multimedia/alsa/alsa-utils_1.1.0.bb
+++ b/meta/recipes-multimedia/alsa/alsa-utils_1.1.1.bb
@@ -8,17 +8,23 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
 DEPENDS = "alsa-lib ncurses libsamplerate0"
 
 PACKAGECONFIG ??= "udev"
+
+# alsabat can be built also without fftw support (with reduced functionality).
+# It would be better to always enable alsabat, but provide an option for
+# enabling/disabling fftw. The configure script doesn't support that, however
+# (at least in any obvious way), so for now we only support alsabat with fftw
+# or no alsabat at all.
 PACKAGECONFIG[bat] = "--enable-bat,--disable-bat,fftw"
+
 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 \
            file://0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch \
-           file://0001-alsabat-rename-to-avoid-naming-conflict.patch \
           "
 
-SRC_URI[md5sum] = "b9d6102fbbd0b68040bb77023ed30c0c"
-SRC_URI[sha256sum] = "3b1c3135b76e14532d3dd23fb15759ddd7daf9ffbc183f7a9a0a3a86374748f1"
+SRC_URI[md5sum] = "f8d00ad5fba757b4c3735d066cc288e2"
+SRC_URI[sha256sum] = "89757c9abaf420831b088fce354d492acc170bd02bb50eb7392c175f594b8041"
 
 # lazy hack. needs proper fixing in gettext.m4, see
 # http://bugs.openembedded.org/show_bug.cgi?id=2348
-- 
2.8.1

[PATCH 4/4] alsa-plugins: 1.1.0 -> 1.1.1

[Tanu Kaskinen]

Changelog: http://alsa-project.org/main/index.php/Changes_v1.1.0_v1.1.1

Removed upstreamed patch
0001-pph-include-config.h-from-rate_speexrate.c.patch.

Signed-off-by: Tanu Kaskinen <tanuk@iki.fi>
---
 ...ph-include-config.h-from-rate_speexrate.c.patch | 35 ----------------------
 ...alsa-plugins_1.1.0.bb => alsa-plugins_1.1.1.bb} |  9 ++----
 2 files changed, 3 insertions(+), 41 deletions(-)
 delete mode 100644 meta/recipes-multimedia/alsa/alsa-plugins/0001-pph-include-config.h-from-rate_speexrate.c.patch
 rename meta/recipes-multimedia/alsa/{alsa-plugins_1.1.0.bb => alsa-plugins_1.1.1.bb} (93%)

diff --git a/meta/recipes-multimedia/alsa/alsa-plugins/0001-pph-include-config.h-from-rate_speexrate.c.patch b/meta/recipes-multimedia/alsa/alsa-plugins/0001-pph-include-config.h-from-rate_speexrate.c.patch
deleted file mode 100644
index 8e5b6a2..0000000
--- a/meta/recipes-multimedia/alsa/alsa-plugins/0001-pph-include-config.h-from-rate_speexrate.c.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 4350314c941489833a8baa930e16512e55f72a13 Mon Sep 17 00:00:00 2001
-From: Tanu Kaskinen <tanuk@iki.fi>
-Date: Wed, 27 Jan 2016 13:22:38 +0200
-Subject: [PATCH] pph: include config.h from rate_speexrate.c
-
-Fixes compilation against libspeexdsp 1.2rc3.
-
-rate_speexrate.c includes speex_resampler.h, which depends on config.h
-by referencing the HAVE_SPEEX_SPEEXDSP_TYPES_H macro. AFAIK it's not
-a good idea to include config.h from headers (I don't know/remember
-why, though), which is why I include config.h from rate_speexrate.c
-instead of speex_resampler.h.
-
-Upstream-Status: Accepted [expected in 1.1.1]
-
-Signed-off-by: Tanu Kaskinen <tanuk@iki.fi>
----
- pph/rate_speexrate.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/pph/rate_speexrate.c b/pph/rate_speexrate.c
-index 0a1325c..8fc4cef 100644
---- a/pph/rate_speexrate.c
-+++ b/pph/rate_speexrate.c
-@@ -28,6 +28,7 @@
-    POSSIBILITY OF SUCH DAMAGE.
- */
- 
-+#include "config.h"
- #include <stdio.h>
- #include <alsa/asoundlib.h>
- #include <alsa/pcm_rate.h>
--- 
-2.7.0.rc3
-
diff --git a/meta/recipes-multimedia/alsa/alsa-plugins_1.1.0.bb b/meta/recipes-multimedia/alsa/alsa-plugins_1.1.1.bb
similarity index 93%
rename from meta/recipes-multimedia/alsa/alsa-plugins_1.1.0.bb
rename to meta/recipes-multimedia/alsa/alsa-plugins_1.1.1.bb
index e541017..c95ea54 100644
--- a/meta/recipes-multimedia/alsa/alsa-plugins_1.1.0.bb
+++ b/meta/recipes-multimedia/alsa/alsa-plugins_1.1.1.bb
@@ -20,12 +20,9 @@ LIC_FILES_CHKSUM = "\
         file://rate/rate_samplerate.c;endline=35;md5=fd77bce85f4a338c0e8ab18430b69fae \
 "
 
-SRC_URI = "\
-        ftp://ftp.alsa-project.org/pub/plugins/${BP}.tar.bz2 \
-        file://0001-pph-include-config.h-from-rate_speexrate.c.patch \
-"
-SRC_URI[md5sum] = "b123e42ed881b9adbc99e4040f257c39"
-SRC_URI[sha256sum] = "3b83c329953bef99f5fe25ae04ec4a455fe6514939f3b45a5321966652b2c9ee"
+SRC_URI = "ftp://ftp.alsa-project.org/pub/plugins/${BP}.tar.bz2"
+SRC_URI[md5sum] = "69f9f3e2de3c97fc71d496e91e271fe5"
+SRC_URI[sha256sum] = "8ea4d1e082c36528a896a2581e5eb62d4dc2683238e353050d0d624e65f901f1"
 
 DEPENDS += "alsa-lib"
 
-- 
2.8.1