diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2021-10-30 01:34:37 -0700 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2021-11-01 05:45:17 -0700 |
| commit | a1ac306208bb9f56fc6e311bd9ff87c46dc2182f (patch) | |
| tree | 5961b7d2ce0558d24a326695936316102cf27d4f | |
| parent | 1f6ef41c0658a2900b6d537b5e728bd9f8029461 (diff) | |
| download | meta-openembedded-contrib-a1ac306208bb9f56fc6e311bd9ff87c46dc2182f.tar.gz | |
libcdio: Fix build with ncurses 6.3+
Signed-off-by: Khem Raj <raj.khem@gmail.com>
| -rw-r--r-- | meta-oe/recipes-multimedia/libcdio/libcdio/0001-Fix-a-few-Werror-format-security-errors-with-mvprint.patch | 40 | ||||
| -rw-r--r-- | meta-oe/recipes-multimedia/libcdio/libcdio_2.1.0.bb | 4 |
2 files changed, 43 insertions, 1 deletions
diff --git a/meta-oe/recipes-multimedia/libcdio/libcdio/0001-Fix-a-few-Werror-format-security-errors-with-mvprint.patch b/meta-oe/recipes-multimedia/libcdio/libcdio/0001-Fix-a-few-Werror-format-security-errors-with-mvprint.patch new file mode 100644 index 0000000000..09e7dc3dfb --- /dev/null +++ b/meta-oe/recipes-multimedia/libcdio/libcdio/0001-Fix-a-few-Werror-format-security-errors-with-mvprint.patch @@ -0,0 +1,40 @@ +From e5e54be286bf6d8336b747503c803750bc674c57 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 30 Oct 2021 01:28:18 -0700 +Subject: [PATCH] Fix a few -Werror=format-security errors with mvprintw() + +In all these places a non-constant is used as a format string which +compiler complains about. Fix by using "%s" as format. + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/cdda-player.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/cdda-player.c b/src/cdda-player.c +index 69eddee..8834d60 100644 +--- a/src/cdda-player.c ++++ b/src/cdda-player.c +@@ -298,7 +298,7 @@ action(const char *psz_action) + psz_action); + else + snprintf(psz_action_line, sizeof(psz_action_line), "%s", "" ); +- mvprintw(LINE_ACTION, 0, psz_action_line); ++ mvprintw(LINE_ACTION, 0, "%s", psz_action_line); + clrtoeol(); + refresh(); + } +@@ -1029,10 +1029,10 @@ display_tracks(void) + } + if (sub.track == i) { + attron(A_STANDOUT); +- mvprintw(i_line++, 0, line); ++ mvprintw(i_line++, 0, "%s", line); + attroff(A_STANDOUT); + } else +- mvprintw(i_line++, 0, line); ++ mvprintw(i_line++, 0, "%s", line); + clrtoeol(); + } + } diff --git a/meta-oe/recipes-multimedia/libcdio/libcdio_2.1.0.bb b/meta-oe/recipes-multimedia/libcdio/libcdio_2.1.0.bb index 2340132984..2becafb2a4 100644 --- a/meta-oe/recipes-multimedia/libcdio/libcdio_2.1.0.bb +++ b/meta-oe/recipes-multimedia/libcdio/libcdio_2.1.0.bb @@ -4,7 +4,9 @@ SECTION = "libs" LICENSE = "GPLv3+" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.bz2" +SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.bz2 \ + file://0001-Fix-a-few-Werror-format-security-errors-with-mvprint.patch \ + " SRC_URI[md5sum] = "aa7629e8f73662a762f64c444b901055" SRC_URI[sha256sum] = "8550e9589dbd594bfac93b81ecf129b1dc9d0d51e90f9696f1b2f9b2af32712b" |