From 3d520839afffc7096d599f07210a63bd4b21c427 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Mon, 14 Feb 2022 17:38:28 -0500 Subject: Add backports of mpd and related recipes Backport the recipe for the latest (0.23.5) version of mpd (Music Player Daemon) from meta-openembedded's master branch. This provides a version with native PipeWire support, and should help make the upcoming upgrade to Yocto Project 3.5 (aka Kirkstone) easier. Additionally, the recipes for the related libmpdclient library and mpc utility are also backported to ensure compatibility. The provided bbappend for the mpd recipe tweaks the backport to build with the older version of meson in dunfell, and applies configuration to approximate the lightmediascanner set up with regards to media location and using /var/volatile for metadata storage for robustness. Bug-AGL: SPEC-4255 Signed-off-by: Scott Murray Change-Id: Ida58289a16079f48c3467d55aef4a608671ffc37 --- ...Tweaks-to-allow-building-with-older-meson.patch | 55 ++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 recipes-multimedia/musicpd/files/0001-Tweaks-to-allow-building-with-older-meson.patch (limited to 'recipes-multimedia/musicpd/files/0001-Tweaks-to-allow-building-with-older-meson.patch') diff --git a/recipes-multimedia/musicpd/files/0001-Tweaks-to-allow-building-with-older-meson.patch b/recipes-multimedia/musicpd/files/0001-Tweaks-to-allow-building-with-older-meson.patch new file mode 100644 index 00000000..9dcb3700 --- /dev/null +++ b/recipes-multimedia/musicpd/files/0001-Tweaks-to-allow-building-with-older-meson.patch @@ -0,0 +1,55 @@ +From a01163d061fae0114a508be83c0ac83461fba43d Mon Sep 17 00:00:00 2001 +From: Scott Murray +Date: Wed, 2 Feb 2022 14:39:50 -0500 +Subject: [PATCH] Tweaks to allow building with older meson + +The requirements for newer meson in meson.build stem from changes +for building dependencies as sub-projects. If we avoid triggering +those, then older meson works fine. To enable such, manually edit +out additions from commits f23ecf00da, aef0535c55, 520028dcfc, and +6b1d0cb01d (not necessarily an exhaustive list), and set the +minimum meson version to 0.51, as that's where the build flags +for native vs target became available, and those are being used. + +Upstream-Status: Inappropriate [disable feature] + +Signed-off-by: Scott Murray +--- + meson.build | 15 +-------------- + 1 file changed, 1 insertion(+), 14 deletions(-) + +diff --git a/meson.build b/meson.build +index 481270567..6264485c8 100644 +--- a/meson.build ++++ b/meson.build +@@ -2,7 +2,7 @@ project( + 'mpd', + ['c', 'cpp'], + version: '0.23.5', +- meson_version: '>= 0.56.0', ++ meson_version: '>= 0.51.0', + default_options: [ + 'c_std=c11', + 'build.c_std=c11', +@@ -10,21 +10,8 @@ project( + 'build.cpp_std=c++17', + 'warning_level=3', + +- # If we build those libraries as Meson subproject, they shall be +- # linked statically into the MPD executable. +- 'expat:default_library=static', +- 'fmt:default_library=static', +- 'gtest:default_library=static', +- 'sqlite3:default_library=static', +- 'vorbis:default_library=static', +- + # Not interested in compiler warnings from subprojects. + 'expat:werror=false', +- 'expat:warning_level=0', +- 'fmt:warning_level=0', +- 'gtest:warning_level=0', +- 'sqlite3:warning_level=0', +- 'vorbis:warning_level=0', + ], + license: 'GPLv2+', + ) -- cgit 1.2.3-korg