From a5c85581ac1c1f22bd06609bbb02656d4d4fabde Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 30 Dec 2022 06:46:47 +0000 Subject: alsa-utils: move toradex specific bbappend The patch is applied only to apalis-imx6, move the recipe over to dynamic layers. Change-Id: Idfb72e99dab5f148fdc491bbcfa097c4213aaa04 Reviewed-by: Mikko Gronoff (cherry picked from commit 6b07a85543427e281f2db4fa267e0013b236b398) Reviewed-by: Qt Cherry-pick Bot --- .../0001-Increase-default-playback-volume.patch | 26 ++++++++++++++++++ .../alsa-utils/alsa-utils_%.bbappend | 32 ++++++++++++++++++++++ .../0001-Increase-default-playback-volume.patch | 26 ------------------ .../alsa-utils/alsa-utils_%.bbappend | 32 ---------------------- 4 files changed, 58 insertions(+), 58 deletions(-) create mode 100644 meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-multimedia/alsa-utils/alsa-utils/0001-Increase-default-playback-volume.patch create mode 100644 meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-multimedia/alsa-utils/alsa-utils_%.bbappend delete mode 100644 meta-boot2qt-distro/recipes-multimedia/alsa-utils/alsa-utils/0001-Increase-default-playback-volume.patch delete mode 100644 meta-boot2qt-distro/recipes-multimedia/alsa-utils/alsa-utils_%.bbappend diff --git a/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-multimedia/alsa-utils/alsa-utils/0001-Increase-default-playback-volume.patch b/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-multimedia/alsa-utils/alsa-utils/0001-Increase-default-playback-volume.patch new file mode 100644 index 00000000..2c0530e7 --- /dev/null +++ b/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-multimedia/alsa-utils/alsa-utils/0001-Increase-default-playback-volume.patch @@ -0,0 +1,26 @@ +From 804c0ca68e18a3e83ccbf49d0476fce3eb739477 Mon Sep 17 00:00:00 2001 +From: Kari Oikarinen +Date: Mon, 11 Dec 2017 13:55:27 +0200 +Subject: [PATCH] Increase default playback volume + +It is too quiet otherwise on Apalis iMX6. +--- + alsactl/init/default | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/alsactl/init/default b/alsactl/init/default +index 1c84f3e..af41576 100644 +--- a/alsactl/init/default ++++ b/alsactl/init/default +@@ -12,7 +12,7 @@ + + ENV{ppercent}:="75%" + ENV{cpercent}:="75%" +-ENV{pvolume}:="-20dB" ++ENV{pvolume}:="5dB" + ENV{cvolume}:="12dB" + ENV{has_pmaster_vol}:="false" + +-- +2.11.0 + diff --git a/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-multimedia/alsa-utils/alsa-utils_%.bbappend b/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-multimedia/alsa-utils/alsa-utils_%.bbappend new file mode 100644 index 00000000..90e8fd42 --- /dev/null +++ b/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-multimedia/alsa-utils/alsa-utils_%.bbappend @@ -0,0 +1,32 @@ +############################################################################ +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ +## +## This file is part of the Boot to Qt meta layer. +## +## $QT_BEGIN_LICENSE:GPL$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see https://www.qt.io/terms-conditions. For further +## information use the contact form at https://www.qt.io/contact-us. +## +## GNU General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 3 or (at your option) any later version +## approved by the KDE Free Qt Foundation. The licenses are as published by +## the Free Software Foundation and appearing in the file LICENSE.GPL3 +## included in the packaging of this file. Please review the following +## information to ensure the GNU General Public License requirements will +## be met: https://www.gnu.org/licenses/gpl-3.0.html. +## +## $QT_END_LICENSE$ +## +############################################################################ + +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" + +SRC_URI:append:apalis-imx6 = " file://0001-Increase-default-playback-volume.patch" diff --git a/meta-boot2qt-distro/recipes-multimedia/alsa-utils/alsa-utils/0001-Increase-default-playback-volume.patch b/meta-boot2qt-distro/recipes-multimedia/alsa-utils/alsa-utils/0001-Increase-default-playback-volume.patch deleted file mode 100644 index 2c0530e7..00000000 --- a/meta-boot2qt-distro/recipes-multimedia/alsa-utils/alsa-utils/0001-Increase-default-playback-volume.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 804c0ca68e18a3e83ccbf49d0476fce3eb739477 Mon Sep 17 00:00:00 2001 -From: Kari Oikarinen -Date: Mon, 11 Dec 2017 13:55:27 +0200 -Subject: [PATCH] Increase default playback volume - -It is too quiet otherwise on Apalis iMX6. ---- - alsactl/init/default | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/alsactl/init/default b/alsactl/init/default -index 1c84f3e..af41576 100644 ---- a/alsactl/init/default -+++ b/alsactl/init/default -@@ -12,7 +12,7 @@ - - ENV{ppercent}:="75%" - ENV{cpercent}:="75%" --ENV{pvolume}:="-20dB" -+ENV{pvolume}:="5dB" - ENV{cvolume}:="12dB" - ENV{has_pmaster_vol}:="false" - --- -2.11.0 - diff --git a/meta-boot2qt-distro/recipes-multimedia/alsa-utils/alsa-utils_%.bbappend b/meta-boot2qt-distro/recipes-multimedia/alsa-utils/alsa-utils_%.bbappend deleted file mode 100644 index 90e8fd42..00000000 --- a/meta-boot2qt-distro/recipes-multimedia/alsa-utils/alsa-utils_%.bbappend +++ /dev/null @@ -1,32 +0,0 @@ -############################################################################ -## -## Copyright (C) 2017 The Qt Company Ltd. -## Contact: https://www.qt.io/licensing/ -## -## This file is part of the Boot to Qt meta layer. -## -## $QT_BEGIN_LICENSE:GPL$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see https://www.qt.io/terms-conditions. For further -## information use the contact form at https://www.qt.io/contact-us. -## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 3 or (at your option) any later version -## approved by the KDE Free Qt Foundation. The licenses are as published by -## the Free Software Foundation and appearing in the file LICENSE.GPL3 -## included in the packaging of this file. Please review the following -## information to ensure the GNU General Public License requirements will -## be met: https://www.gnu.org/licenses/gpl-3.0.html. -## -## $QT_END_LICENSE$ -## -############################################################################ - -FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" - -SRC_URI:append:apalis-imx6 = " file://0001-Increase-default-playback-volume.patch" -- cgit v1.2.3