summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia/alsa
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2018-04-24 12:33:45 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-05-15 10:56:49 +0100
commit4fa8f93e6a90f62499715d55262f931f417c7cde (patch)
tree852c013b2ccc1fb52005e5e89ae9c09b04d0ab33 /meta/recipes-multimedia/alsa
parentd3081fc0a237c10478ff95709fab03590811dd81 (diff)
downloadpoky-4fa8f93e6a90f62499715d55262f931f417c7cde.tar.gz
alsa-tools: Update to 1.1.6
License-Update: FSF address updated in hdsploader/COPYING and ld10k1/COPYING.LIB Fix built with clang along the way Package python dependent tools into a separate package (From OE-Core rev: 2a39c8529332c4ea0f8edcac7cfdfb410ca3fb5b) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia/alsa')
-rw-r--r--meta/recipes-multimedia/alsa/alsa-tools/0002-Fix-clang-Wreserved-user-defined-literal-warnings.patch28
-rw-r--r--meta/recipes-multimedia/alsa/alsa-tools/autotools.patch42
-rw-r--r--meta/recipes-multimedia/alsa/alsa-tools_1.1.6.bb (renamed from meta/recipes-multimedia/alsa/alsa-tools_1.1.5.bb)25
3 files changed, 75 insertions, 20 deletions
diff --git a/meta/recipes-multimedia/alsa/alsa-tools/0002-Fix-clang-Wreserved-user-defined-literal-warnings.patch b/meta/recipes-multimedia/alsa/alsa-tools/0002-Fix-clang-Wreserved-user-defined-literal-warnings.patch
new file mode 100644
index 0000000000..2290915eab
--- /dev/null
+++ b/meta/recipes-multimedia/alsa/alsa-tools/0002-Fix-clang-Wreserved-user-defined-literal-warnings.patch
@@ -0,0 +1,28 @@
1From 2e48e4045e1e951433da0ca4b1e49798eedde14f Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 24 Apr 2018 12:21:18 -0700
4Subject: [PATCH] Fix clang -Wreserved-user-defined-literal warnings
5
6| us428control.cc:66:18: error: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wreserved-user-defined-literal]
7| printf("usage: "PROGNAME" [-v verbosity_level 0..2] [-c card] [-D device] [-u usb-device] [-m mode]\n");
8| ^
9
10Upstream-Status: Submitted [https://patchwork.kernel.org/patch/10360805/]
11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12---
13 us428control/us428control.cc | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
16diff --git a/us428control/us428control.cc b/us428control/us428control.cc
17index e839bf4..8cb3c42 100644
18--- a/us428control/us428control.cc
19+++ b/us428control/us428control.cc
20@@ -63,7 +63,7 @@ static void usage(void)
21 {
22 printf("Tascam US-428 Control\n");
23 printf("version %s\n", VERSION);
24- printf("usage: "PROGNAME" [-v verbosity_level 0..2] [-c card] [-D device] [-u usb-device] [-m mode]\n");
25+ printf("usage: " PROGNAME " [-v verbosity_level 0..2] [-c card] [-D device] [-u usb-device] [-m mode]\n");
26 printf("mode is one of (us224, us428, mixxx)\n");
27 }
28 /*
diff --git a/meta/recipes-multimedia/alsa/alsa-tools/autotools.patch b/meta/recipes-multimedia/alsa/alsa-tools/autotools.patch
index 2e74963c89..c85834a593 100644
--- a/meta/recipes-multimedia/alsa/alsa-tools/autotools.patch
+++ b/meta/recipes-multimedia/alsa/alsa-tools/autotools.patch
@@ -1,3 +1,8 @@
1From b9a65bf3ba5628cfe8cfd2d10ce2dcf11a606775 Mon Sep 17 00:00:00 2001
2From: Dongxiao Xu <dongxiao.xu@intel.com>
3Date: Thu, 14 Jul 2011 15:40:36 +0800
4Subject: [PATCH] alsa-tools: Fix recipe build error.
5
1Add parameters to autoreconf to support cross compile. 6Add parameters to autoreconf to support cross compile.
2Remove some sub-components which needs further recipe support. 7Remove some sub-components which needs further recipe support.
3 8
@@ -5,22 +10,17 @@ Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
5 10
6Upstream-Status: Inappropriate [configuration] 11Upstream-Status: Inappropriate [configuration]
7 12
8diff -ruN alsa-tools-1.0.24.1-orig//ld10k1/gitcompile alsa-tools-1.0.24.1/ld10k1/gitcompile 13---
9--- alsa-tools-1.0.24.1-orig//ld10k1/gitcompile 2011-07-06 11:27:40.227665002 +0800 14 Makefile | 4 ++--
10+++ alsa-tools-1.0.24.1/ld10k1/gitcompile 2011-07-14 13:26:18.017665004 +0800 15 ld10k1/gitcompile | 2 +-
11@@ -1,6 +1,6 @@ 16 2 files changed, 3 insertions(+), 3 deletions(-)
12 #!/bin/bash 17
13 18diff --git a/Makefile b/Makefile
14-autoreconf -fi || exit 1 19index c32bf25..1119372 100644
15+autoreconf $ACLOCAL_FLAGS -fi || exit 1 20--- a/Makefile
16 export CFLAGS='-O2 -Wall -pipe -g' 21+++ b/Makefile
17 echo "CFLAGS=$CFLAGS"
18 echo "./configure $@"
19diff -ruN alsa-tools-1.0.24.1-orig//Makefile alsa-tools-1.0.24.1/Makefile
20--- alsa-tools-1.0.24.1-orig//Makefile 2011-07-06 11:27:40.207665000 +0800
21+++ alsa-tools-1.0.24.1/Makefile 2011-07-14 15:08:08.877665009 +0800
22@@ -1,8 +1,8 @@ 22@@ -1,8 +1,8 @@
23 VERSION = 1.1.5 23 VERSION = 1.1.6
24 TOP = . 24 TOP = .
25-SUBDIRS = as10k1 envy24control hdsploader hdspconf hdspmixer \ 25-SUBDIRS = as10k1 envy24control hdsploader hdspconf hdspmixer \
26+SUBDIRS = as10k1 envy24control \ 26+SUBDIRS = as10k1 envy24control \
@@ -30,3 +30,15 @@ diff -ruN alsa-tools-1.0.24.1-orig//Makefile alsa-tools-1.0.24.1/Makefile
30 hwmixvolume hdajackretask hda-verb hdajacksensetest 30 hwmixvolume hdajackretask hda-verb hdajacksensetest
31 31
32 all: 32 all:
33diff --git a/ld10k1/gitcompile b/ld10k1/gitcompile
34index 99429ac..20005d9 100755
35--- a/ld10k1/gitcompile
36+++ b/ld10k1/gitcompile
37@@ -1,6 +1,6 @@
38 #!/bin/bash
39
40-autoreconf -fi || exit 1
41+autoreconf $ACLOCAL_FLAGS -fi || exit 1
42 export CFLAGS='-O2 -Wall -pipe -g'
43 echo "CFLAGS=$CFLAGS"
44 echo "./configure $@"
diff --git a/meta/recipes-multimedia/alsa/alsa-tools_1.1.5.bb b/meta/recipes-multimedia/alsa/alsa-tools_1.1.6.bb
index 1be43aa6e7..e065eec6b8 100644
--- a/meta/recipes-multimedia/alsa/alsa-tools_1.1.5.bb
+++ b/meta/recipes-multimedia/alsa/alsa-tools_1.1.6.bb
@@ -5,17 +5,19 @@ SECTION = "console/utils"
5LICENSE = "GPLv2 & LGPLv2+" 5LICENSE = "GPLv2 & LGPLv2+"
6DEPENDS = "alsa-lib ncurses glib-2.0" 6DEPENDS = "alsa-lib ncurses glib-2.0"
7 7
8LIC_FILES_CHKSUM = "file://hdsploader/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ 8LIC_FILES_CHKSUM = "file://hdsploader/COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
9 file://ld10k1/COPYING.LIB;md5=7fbc338309ac38fefcd64b04bb903e34" 9 file://ld10k1/COPYING.LIB;md5=a916467b91076e631dd8edb7424769c7 \
10 "
10 11
11SRC_URI = "ftp://ftp.alsa-project.org/pub/tools/${BP}.tar.bz2 \ 12SRC_URI = "ftp://ftp.alsa-project.org/pub/tools/${BP}.tar.bz2 \
12 file://autotools.patch \ 13 file://autotools.patch \
13 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'file://makefile_no_gtk.patch', d)} \ 14 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'file://makefile_no_gtk.patch', d)} \
14 file://gitcompile_hdajacksensetest \ 15 file://gitcompile_hdajacksensetest \
16 file://0002-Fix-clang-Wreserved-user-defined-literal-warnings.patch \
15 " 17 "
16 18
17SRC_URI[md5sum] = "3afb92eb1b4f2edc8691498e57c3ec78" 19SRC_URI[md5sum] = "5ca8c9437ae779997cd62fb2815fef19"
18SRC_URI[sha256sum] = "bc3c6567de835223ee7d69487b8c22fb395a2e8c613341b0c96e6a5f6a2bd534" 20SRC_URI[sha256sum] = "d69c4dc2fb641a974d9903e9eb78c94cb0c7ac6c45bae664f0c9d6c0a1593227"
19 21
20inherit autotools-brokensep pkgconfig 22inherit autotools-brokensep pkgconfig
21 23
@@ -37,4 +39,17 @@ do_compile_prepend () {
37 cp ${WORKDIR}/gitcompile_hdajacksensetest ${S}/hdajacksensetest/gitcompile 39 cp ${WORKDIR}/gitcompile_hdajacksensetest ${S}/hdajacksensetest/gitcompile
38} 40}
39 41
40FILES_${PN} += "${datadir}/ld10k1" 42do_install_append() {
43 sed -i -e "s|/usr/bin/python2|/usr/bin/env python2|g" ${D}${bindir}/hwmixvolume
44}
45
46PACKAGES =+ "${PN}-hwmixvolume"
47
48FILES_${PN}-hwmixvolume = "${bindir}/hwmixvolume"
49
50FILES_${PN} += "${datadir}/ld10k1 \
51 ${datadir}/icons/hicolor \
52 "
53
54RDEPENDS_${PN}-hwmixvolume += "python"
55