From c62161e4ab73eec10ad82fcd7a85e8cc75e559b7 Mon Sep 17 00:00:00 2001 From: Ankur Tyagi Date: Wed, 5 Nov 2025 12:14:08 +1300 Subject: libcdio: upgrade 2.1.0 -> 2.2.0 * The project switched to storing their releases on Github * Dropped patches which are now merged in the upstream * There is API, ABI change between 2.1.0 and 2.1.1 - API change: Rename some fields in ecma_167.h from integer (prefix i_) to unsigned (prefix u_) to actually match their type - ABI change: Add u_su_fields to the end of iso_rock_statbuf_t - ABI change: Add total_size in the middle of iso9660_stat_t Changelog: https://github.com/libcdio/libcdio/releases/tag/2.1.1 https://github.com/libcdio/libcdio/releases/tag/2.2.0 Signed-off-by: Ankur Tyagi Signed-off-by: Khem Raj --- ...error-format-security-errors-with-mvprint.patch | 40 -------------------- ...O_SOURCE_PATH-by-dropping-STRIP_FROM_PATH.patch | 43 ---------------------- .../recipes-multimedia/libcdio/libcdio_2.1.0.bb | 34 ----------------- .../recipes-multimedia/libcdio/libcdio_2.2.0.bb | 31 ++++++++++++++++ 4 files changed, 31 insertions(+), 117 deletions(-) delete mode 100644 meta-oe/recipes-multimedia/libcdio/libcdio/0001-Fix-a-few-Werror-format-security-errors-with-mvprint.patch delete mode 100644 meta-oe/recipes-multimedia/libcdio/libcdio/Drop-LIBCDIO_SOURCE_PATH-by-dropping-STRIP_FROM_PATH.patch delete mode 100644 meta-oe/recipes-multimedia/libcdio/libcdio_2.1.0.bb create mode 100644 meta-oe/recipes-multimedia/libcdio/libcdio_2.2.0.bb (limited to 'meta-oe') 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 deleted file mode 100644 index 09e7dc3dfb..0000000000 --- a/meta-oe/recipes-multimedia/libcdio/libcdio/0001-Fix-a-few-Werror-format-security-errors-with-mvprint.patch +++ /dev/null @@ -1,40 +0,0 @@ -From e5e54be286bf6d8336b747503c803750bc674c57 Mon Sep 17 00:00:00 2001 -From: Khem Raj -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 ---- - 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/Drop-LIBCDIO_SOURCE_PATH-by-dropping-STRIP_FROM_PATH.patch b/meta-oe/recipes-multimedia/libcdio/libcdio/Drop-LIBCDIO_SOURCE_PATH-by-dropping-STRIP_FROM_PATH.patch deleted file mode 100644 index 0b25dff75e..0000000000 --- a/meta-oe/recipes-multimedia/libcdio/libcdio/Drop-LIBCDIO_SOURCE_PATH-by-dropping-STRIP_FROM_PATH.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 08c1768aaeea86c522c0ef1705b9b6d434ebd3ae Mon Sep 17 00:00:00 2001 -From: Chris Lamb -Date: Fri, 28 Jul 2017 11:49:13 +0100 -Subject: [PATCH] Drop LIBCDIO_SOURCE_PATH by dropping STRIP_FROM_PATH Doxygen - setup; it's not used as FULL_PATH_NAMES = no - -Source: https://sources.debian.org/data/main/libc/libcdio/2.1.0-4/debian/patches/Drop-LIBCDIO_SOURCE_PATH-by-dropping-STRIP_FROM_PATH.patch -Upstream-Status: Pending -Signed-off-by: Khem Raj ---- - configure.ac | 5 ----- - doc/doxygen/Doxyfile.in | 2 +- - 2 files changed, 1 insertion(+), 6 deletions(-) - -Index: b/configure.ac -=================================================================== ---- a/configure.ac -+++ b/configure.ac -@@ -557,11 +557,6 @@ AC_SUBST(HAVE_SOLARIS_CDROM) - AC_SUBST(HAVE_WIN32_CDROM) - AC_SUBST(HAVE_OS2_CDROM) - --LIBCDIO_SOURCE_PATH="`pwd`" --AC_DEFINE_UNQUOTED(LIBCDIO_SOURCE_PATH, "$LIBCDIO_SOURCE_PATH", -- [Full path to libcdio top_sourcedir.]) --AC_SUBST(LIBCDIO_SOURCE_PATH) -- - AC_CHECK_FUNCS( [chdir drand48 fseeko fseeko64 ftruncate geteuid getgid \ - getuid getpwuid gettimeofday lseek64 lstat memcpy memset mkstemp rand \ - seteuid setegid snprintf setenv strndup unsetenv tzset sleep \ -Index: b/doc/doxygen/Doxyfile.in -=================================================================== ---- a/doc/doxygen/Doxyfile.in -+++ b/doc/doxygen/Doxyfile.in -@@ -138,7 +138,7 @@ FULL_PATH_NAMES = NO - # If left blank the directory from which doxygen is run is used as the - # path to strip. - --STRIP_FROM_PATH = @LIBCDIO_SOURCE_PATH@ -+STRIP_FROM_PATH = - - # The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of - # the path mentioned in the documentation of a class, which tells diff --git a/meta-oe/recipes-multimedia/libcdio/libcdio_2.1.0.bb b/meta-oe/recipes-multimedia/libcdio/libcdio_2.1.0.bb deleted file mode 100644 index d986f90d72..0000000000 --- a/meta-oe/recipes-multimedia/libcdio/libcdio_2.1.0.bb +++ /dev/null @@ -1,34 +0,0 @@ -SUMMARY = "The GNU Compact Disc Input and Control library (libcdio) contains a library for CD-ROM and CD image access." -HOMEPAGE = "http://www.gnu.org/software/libcdio/" -SECTION = "libs" -LICENSE = "GPL-3.0-or-later" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" - -SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.bz2 \ - file://0001-Fix-a-few-Werror-format-security-errors-with-mvprint.patch \ - file://Drop-LIBCDIO_SOURCE_PATH-by-dropping-STRIP_FROM_PATH.patch \ - " - -SRC_URI[sha256sum] = "8550e9589dbd594bfac93b81ecf129b1dc9d0d51e90f9696f1b2f9b2af32712b" - -inherit autotools pkgconfig - -PACKAGECONFIG ??= "cdda-player" -PACKAGECONFIG[cdda-player] = "--with-cdda-player,--without-cdda-player,ncurses" -PACKAGECONFIG[cddb] = "--enable-cddb,--disable-cddb,libcddb" -PACKAGECONFIG[vcd-info] = "--enable-vcd-info,--disable-vcd-info,vcdimager" - -# add -D_LARGEFILE64_SOURCE for 32bit targets -CFLAGS += "${@['-D_LARGEFILE64_SOURCE',''][d.getVar('SITEINFO_BITS') != '32']}" - -PACKAGES += "${PN}-utils" - -FILES:${PN} = "${libdir}/${BPN}${SOLIB}" -FILES:${PN}-utils = "${bindir}/*" - -python libcdio_split_packages() { - libdir = d.expand('${libdir}') - do_split_packages(d, libdir, r'^lib(.*)\.so\..*', 'lib%s', 'libcdio %s library', extra_depends='', allow_links=True) -} - -PACKAGESPLITFUNCS =+ "libcdio_split_packages" diff --git a/meta-oe/recipes-multimedia/libcdio/libcdio_2.2.0.bb b/meta-oe/recipes-multimedia/libcdio/libcdio_2.2.0.bb new file mode 100644 index 0000000000..c443d9b891 --- /dev/null +++ b/meta-oe/recipes-multimedia/libcdio/libcdio_2.2.0.bb @@ -0,0 +1,31 @@ +SUMMARY = "The GNU Compact Disc Input and Control library (libcdio) contains a library for CD-ROM and CD image access." +HOMEPAGE = "http://www.gnu.org/software/libcdio/" +SECTION = "libs" +LICENSE = "GPL-3.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/${BP}.tar.bz2" + +SRC_URI[sha256sum] = "6f8fbdf4d189cf63f2a7a1549c516cd720c7b222c7aaadbc924a26e745a48539" + +inherit autotools pkgconfig github-releases + +PACKAGECONFIG ??= "cdda-player" +PACKAGECONFIG[cdda-player] = "--with-cdda-player,--without-cdda-player,ncurses" +PACKAGECONFIG[cddb] = "--enable-cddb,--disable-cddb,libcddb" +PACKAGECONFIG[vcd-info] = "--enable-vcd-info,--disable-vcd-info,vcdimager" + +# add -D_LARGEFILE64_SOURCE for 32bit targets +CFLAGS += "${@['-D_LARGEFILE64_SOURCE',''][d.getVar('SITEINFO_BITS') != '32']}" + +PACKAGES += "${PN}-utils" + +FILES:${PN} = "${libdir}/${BPN}${SOLIB}" +FILES:${PN}-utils = "${bindir}/*" + +python libcdio_split_packages() { + libdir = d.expand('${libdir}') + do_split_packages(d, libdir, r'^lib(.*)\.so\..*', 'lib%s', 'libcdio %s library', extra_depends='', allow_links=True) +} + +PACKAGESPLITFUNCS =+ "libcdio_split_packages" -- cgit v1.2.3-54-g00ecf