Skip to content

Commit

Permalink
alsa-utils=webos2 (refresh patches)
Browse files Browse the repository at this point in the history
:Release Notes:
New Yocto is more strict about applying patches which don't apply
cleanly.

:Detailed Notes:
WARNING: alsa-utils-1.1.5-r0 do_patch:
Some of the context lines in patches were ignored. This can lead to incorrectly applied patches.
The context lines in the patches can be updated with devtool:

    devtool modify <recipe>
    devtool finish --force-patch-refresh <recipe> <layer_path>

Then the updated patches and the source tree (in devtool's workspace)
should be reviewed to make sure the patches apply in the correct place
and don't introduce duplicate lines (which can, and does happen
when some of the context is ignored). Further information:
http://lists.openembedded.org/pipermail/openembedded-core/2018-March/148675.html
https://bugzilla.yoctoproject.org/show_bug.cgi?id=10450
Details:
Applying patch disable-libsamplerate.patch
patching file configure.ac
Hunk #1 succeeded at 38 with fuzz 2.
Hunk #2 succeeded at 54 with fuzz 2 (offset 9 lines).

Now at patch disable-libsamplerate.patch

:Testing Performed:
Only build tested.

:QA Notes:
No change to image.

:Issues Addressed:
[PLAT-60242] [OSE] Fix build issues
[PLAT-52479] Upgrade to Yocto 2.5 Sumo
[PLAT-52480] CCC: Upgrade to Yocto 2.5 Sumo
[PLAT-56432] CCC: Refresh patches which don't apply cleanly
  • Loading branch information
shr-project authored and Changhyeok Bae committed Jul 13, 2018
1 parent b036213 commit 911036d
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 12 deletions.
Original file line number Diff line number Diff line change
@@ -1,18 +1,20 @@
From 457c3160185d620ae95aa9b07ecf00cabee76e4e Mon Sep 17 00:00:00 2001
From 4a09d01895f10fd4503ad290208915465e518a3a Mon Sep 17 00:00:00 2001
From: Martin Jansa <[email protected]>
Date: Thu, 18 Feb 2016 12:43:22 +0100
Subject: [PATCH] configure.ac: add parameters to enable/disable libsamplerate

support

* we don't like the autodetection

Signed-off-by: Martin Jansa <[email protected]>

---
configure.ac | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index bdb133c..c7bef67 100644
index a263d3b..f61491f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -38,8 +38,6 @@ AC_CHECK_HEADERS([alsa/use-case.h], [have_ucm="yes"], [have_ucm="no"],
Expand All @@ -22,9 +24,9 @@ index bdb133c..c7bef67 100644
-AC_CHECK_HEADERS([samplerate.h], [have_samplerate="yes"], [have_samplerate="no"],
- [#include <samplerate.h>])

AM_CONDITIONAL(HAVE_PCM, test "$have_pcm" = "yes")
AM_CONDITIONAL(HAVE_MIXER, test "$have_mixer" = "yes")
@@ -47,7 +45,21 @@ AM_CONDITIONAL(HAVE_RAWMIDI, test "$have_rawmidi" = "yes")
AC_CHECK_LIB([asound], [snd_seq_client_info_get_card], [HAVE_SEQ_CLIENT_INFO_GET_CARD="yes"])
if test "$HAVE_SEQ_CLIENT_INFO_GET_CARD" = "yes" ; then
@@ -56,7 +54,21 @@ AM_CONDITIONAL(HAVE_RAWMIDI, test "$have_rawmidi" = "yes")
AM_CONDITIONAL(HAVE_SEQ, test "$have_seq" = "yes")
AM_CONDITIONAL(HAVE_UCM, test "$have_ucm" = "yes")
AM_CONDITIONAL(HAVE_TOPOLOGY, test "$have_topology" = "yes")
Expand All @@ -45,8 +47,5 @@ index bdb133c..c7bef67 100644
+fi
+AM_CONDITIONAL(HAVE_SAMPLERATE, test $have_samplerate = "yes")

dnl Disable bat
bat=
--
2.7.1

dnl Use tinyalsa
alsabat_backend_tiny=
4 changes: 2 additions & 2 deletions meta-webos/recipes-multimedia/alsa/alsa-utils_1.1.2.bbappend
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Copyright (c) 2014-2017 LG Electronics, Inc.
# Copyright (c) 2014-2018 LG Electronics, Inc.

EXTENDPRAUTO_append = "webos1"
EXTENDPRAUTO_append = "webos2"

FILESEXTRAPATHS_prepend := "${THISDIR}/${BP}:"

Expand Down

0 comments on commit 911036d

Please sign in to comment.