7 files changed, 22 insertions, 97 deletions

diff --git a/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.99.1.bb b/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.99.1.bb
index f4d206c154..28c1063ceb 100644
--- a/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.99.1.bb
+++ b/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.99.1.bb
@@ -207,6 +207,11 @@ do_install() {
 
         sed -i "s|@MINIFI_LOG@|${MINIFI_LOG}|g" ${D}${sysconfdir}/default/volatiles/99_minifi
     fi
+    
+    for ss in $(find ${D}${libexecdir}/minifi-python-examples -type f); do
+        sed -i 's,/usr/bin/env python$,/usr/bin/env python3,' "$ss"
+    done
+
 }
 
 pkg_postinst:${PN}() {
diff --git a/meta-oe/recipes-gnome/gtk+/gtkmm4_4.14.0.bb b/meta-oe/recipes-gnome/gtk+/gtkmm4_4.20.0.bb
index d3a01e444c..439ab800f8 100644
--- a/meta-oe/recipes-gnome/gtk+/gtkmm4_4.14.0.bb
+++ b/meta-oe/recipes-gnome/gtk+/gtkmm4_4.20.0.bb
@@ -3,8 +3,10 @@ HOMEPAGE = "http://www.gtkmm.org/"
 SECTION = "libs"
 
 LICENSE = "LGPL-2.1-only & GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \
-                    file://COPYING.tools;md5=751419260aa954499f7abaabaa882bbe"
+LIC_FILES_CHKSUM = " \
+        file://COPYING;md5=4bf661c1e3793e55c8d1051bc5e0ae21 \
+        file://COPYING.tools;md5=570a9b3749dd0463a1778803b12a6dce \
+"
 
 DEPENDS = "glib-2.0-native atkmm pangomm-2.48 glibmm gtk4 cairomm-1.16 gdk-pixbuf-native"
 
@@ -14,7 +16,7 @@ inherit gnomebase features_check
 
 REQUIRED_DISTRO_FEATURES = "opengl x11"
 
-SRC_URI[archive.sha256sum] = "9350a0444b744ca3dc69586ebd1b6707520922b6d9f4f232103ce603a271ecda"
+SRC_URI[archive.sha256sum] = "daad9bf9b70f90975f91781fc7a656c923a91374261f576c883cd3aebd59c833"
 
 EXTRA_OEMESON = "-Dbuild-demos=false"
 
diff --git a/meta-oe/recipes-multimedia/libcdio/libcdio-paranoia_10.2+2.0.1.bb b/meta-oe/recipes-multimedia/libcdio/libcdio-paranoia_10.2+2.0.2.bb
index 42507051f6..b880f3f090 100644
--- a/meta-oe/recipes-multimedia/libcdio/libcdio-paranoia_10.2+2.0.1.bb
+++ b/meta-oe/recipes-multimedia/libcdio/libcdio-paranoia_10.2+2.0.2.bb
@@ -1,18 +1,19 @@
 SUMMARY = "library to read digital audio CDs with error correction"
 HOMEPAGE = "http://www.gnu.org/software/libcdio/"
-BUGTRUCKER = "https://github.com/rocky/libcdio-paranoia/issues/"
+BUGTRUCKER = "https://github.com/libcdio/libcdio-paranoia/issues"
 SECTION = "libs"
 LICENSE = "GPL-3.0-or-later"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 DEPENDS = "libcdio"
 
-SRC_URI = "${GNU_MIRROR}/libcdio/${BP}.tar.bz2"
-SRC_URI[sha256sum] = "33b1cf305ccfbfd03b43936975615000ce538b119989c4bec469577570b60e8a"
+SRC_URI = "${GITHUB_BASE_URI}/download/release-${PV}/${BP}.tar.bz2"
+SRC_URI[sha256sum] = "186892539dedd661276014d71318c8c8f97ecb1250a86625256abd4defbf0d0c"
+
+GITHUB_BASE_URI = "https://github.com/libcdio/${BPN}/releases/"
 
-UPSTREAM_CHECK_URI = "https://github.com/rocky/libcdio-paranoia/releases"
 UPSTREAM_CHECK_REGEX = "release-(?P<pver>\d+(\.\d+)+\+\d+(\.\d+)+)"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig github-releases
 
 PACKAGES += "${PN}-utils"
 
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 <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/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 <chris@chris-lamb.co.uk>
-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 <raj.khem@gmail.com>
----
- 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.2.0.bb
index d986f90d72..c443d9b891 100644
--- a/meta-oe/recipes-multimedia/libcdio/libcdio_2.1.0.bb
+++ b/meta-oe/recipes-multimedia/libcdio/libcdio_2.2.0.bb
@@ -4,14 +4,11 @@ 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 = "${GITHUB_BASE_URI}/download/${PV}/${BP}.tar.bz2"
 
-SRC_URI[sha256sum] = "8550e9589dbd594bfac93b81ecf129b1dc9d0d51e90f9696f1b2f9b2af32712b"
+SRC_URI[sha256sum] = "6f8fbdf4d189cf63f2a7a1549c516cd720c7b222c7aaadbc924a26e745a48539"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig github-releases
 
 PACKAGECONFIG ??= "cdda-player"
 PACKAGECONFIG[cdda-player] = "--with-cdda-player,--without-cdda-player,ncurses"
diff --git a/meta-python/recipes-devtools/python/python3-systemd_235.bb b/meta-python/recipes-devtools/python/python3-systemd_235.bb
index 6b44751df7..269e175cc5 100644
--- a/meta-python/recipes-devtools/python/python3-systemd_235.bb
+++ b/meta-python/recipes-devtools/python/python3-systemd_235.bb
@@ -15,3 +15,6 @@ inherit pypi features_check pkgconfig setuptools3
 REQUIRED_DISTRO_FEATURES = "systemd"
 
 RDEPENDS:${PN} += "systemd python3-syslog python3-logging python3-syslog"
+
+# v235's setup.py is not written in a way to avoid race condition
+PARALLEL_MAKE = "-j 1"