From 26cbb6fd9019f28141f8fef42521c82246fa3d03 Mon Sep 17 00:00:00 2001 From: Marcel Ziswiler Date: Sun, 31 Mar 2019 01:45:57 +0100 Subject: alsa: apalis-tk1-mainline: fix asound.conf patching Fix commit 0f59e154bfeb ("alsa: apalis-tk1-mainline: add initial asound.state and asound.conf"). Signed-off-by: Marcel Ziswiler --- .../0001-alsa-conf-select-default-soundcard.patch | 30 ---------------------- .../0001-alsa-conf-select-default-soundcard.patch | 30 ++++++++++++++++++++++ recipes-multimedia/alsa/alsa-lib_%.bbappend | 6 +++-- 3 files changed, 34 insertions(+), 32 deletions(-) delete mode 100644 recipes-multimedia/alsa/alsa-lib/0001-alsa-conf-select-default-soundcard.patch create mode 100644 recipes-multimedia/alsa/alsa-lib/apalis-tk1-mainline/0001-alsa-conf-select-default-soundcard.patch diff --git a/recipes-multimedia/alsa/alsa-lib/0001-alsa-conf-select-default-soundcard.patch b/recipes-multimedia/alsa/alsa-lib/0001-alsa-conf-select-default-soundcard.patch deleted file mode 100644 index ce18242..0000000 --- a/recipes-multimedia/alsa/alsa-lib/0001-alsa-conf-select-default-soundcard.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 6d812a2c9b586be635fa430ebaa1c0e60dfa1b2d Mon Sep 17 00:00:00 2001 -From: Philippe Schenker -Date: Fri, 29 Mar 2019 15:24:23 +0100 -Subject: [PATCH] alsa-conf: select default soundcard - -Select sound card 1 as the default one. - -Signed-off-by: Philippe Schenker ---- - src/conf/alsa.conf | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/conf/alsa.conf b/src/conf/alsa.conf -index 09980586..8e7c84d6 100644 ---- a/src/conf/alsa.conf -+++ b/src/conf/alsa.conf -@@ -59,8 +59,8 @@ defaults.namehint.basic on - # show extended name hints - defaults.namehint.extended off - # --defaults.ctl.card 0 --defaults.pcm.card 0 -+defaults.ctl.card 1 -+defaults.pcm.card 1 - defaults.pcm.device 0 - defaults.pcm.subdevice -1 - defaults.pcm.nonblock 1 --- -2.21.0 - diff --git a/recipes-multimedia/alsa/alsa-lib/apalis-tk1-mainline/0001-alsa-conf-select-default-soundcard.patch b/recipes-multimedia/alsa/alsa-lib/apalis-tk1-mainline/0001-alsa-conf-select-default-soundcard.patch new file mode 100644 index 0000000..ce18242 --- /dev/null +++ b/recipes-multimedia/alsa/alsa-lib/apalis-tk1-mainline/0001-alsa-conf-select-default-soundcard.patch @@ -0,0 +1,30 @@ +From 6d812a2c9b586be635fa430ebaa1c0e60dfa1b2d Mon Sep 17 00:00:00 2001 +From: Philippe Schenker +Date: Fri, 29 Mar 2019 15:24:23 +0100 +Subject: [PATCH] alsa-conf: select default soundcard + +Select sound card 1 as the default one. + +Signed-off-by: Philippe Schenker +--- + src/conf/alsa.conf | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/conf/alsa.conf b/src/conf/alsa.conf +index 09980586..8e7c84d6 100644 +--- a/src/conf/alsa.conf ++++ b/src/conf/alsa.conf +@@ -59,8 +59,8 @@ defaults.namehint.basic on + # show extended name hints + defaults.namehint.extended off + # +-defaults.ctl.card 0 +-defaults.pcm.card 0 ++defaults.ctl.card 1 ++defaults.pcm.card 1 + defaults.pcm.device 0 + defaults.pcm.subdevice -1 + defaults.pcm.nonblock 1 +-- +2.21.0 + diff --git a/recipes-multimedia/alsa/alsa-lib_%.bbappend b/recipes-multimedia/alsa/alsa-lib_%.bbappend index 9d174f1..4908618 100644 --- a/recipes-multimedia/alsa/alsa-lib_%.bbappend +++ b/recipes-multimedia/alsa/alsa-lib_%.bbappend @@ -1,3 +1,5 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS_prepend_tegra124m := "${THISDIR}/${PN}:" -SRC_URI_append = "file://0001-alsa-conf-select-default-soundcard.patch" +PACKAGE_ARCH_tegra124m = "${MACHINE_ARCH}" + +SRC_URI_append_tegra124m = " file://0001-alsa-conf-select-default-soundcard.patch" -- cgit v1.2.3