diff --git a/package/mpd/0001-src-event-meson.build-add-atomic-dependency-for-spar.patch b/package/mpd/0001-src-event-meson.build-add-atomic-dependency-for-spar.patch index 28a82da30a..9ebf7d09d9 100644 --- a/package/mpd/0001-src-event-meson.build-add-atomic-dependency-for-spar.patch +++ b/package/mpd/0001-src-event-meson.build-add-atomic-dependency-for-spar.patch @@ -13,6 +13,10 @@ Upstream: not sent (the same kind of patch for ncmpc was refused: https://github.com/MusicPlayerDaemon/ncmpc/pull/45) Signed-off-by: Fabrice Fontaine [Andreas: adapt upstream formatting] +Signed-off-by: Andreas Ziegler +--- +Rebase for mpd-0.24 + Signed-off-by: Andreas Ziegler --- src/event/meson.build | 4 ++++ @@ -22,7 +26,7 @@ diff --git a/src/event/meson.build b/src/event/meson.build index bc13bbcd2..88370c03a 100644 --- a/src/event/meson.build +++ b/src/event/meson.build -@@ -47,9 +47,13 @@ event = declare_dependency( +@@ -46,9 +46,13 @@ ], ) diff --git a/package/mpd/Config.in b/package/mpd/Config.in index 03ceaa1e00..6bf745b30b 100644 --- a/package/mpd/Config.in +++ b/package/mpd/Config.in @@ -1,13 +1,13 @@ menuconfig BR2_PACKAGE_MPD bool "mpd" depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_USE_WCHAR # boost + depends on BR2_USE_WCHAR # libfmt depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # fork depends on BR2_TOOLCHAIN_HAS_ATOMIC - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # C++17 - depends on BR2_HOST_GCC_AT_LEAST_8 # C++17 - select BR2_PACKAGE_BOOST + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_12 # C++20 recommended + depends on BR2_HOST_GCC_AT_LEAST_10 # C++20 constinit P4311R2 + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_6 # openat2.h select BR2_PACKAGE_FMT select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE help @@ -433,10 +433,11 @@ config BR2_PACKAGE_MPD_ID3TAG endif -comment "mpd needs a toolchain w/ C++, threads, wchar, gcc >= 8, host gcc >= 8" +comment "mpd needs a toolchain w/ C++, threads, wchar, host-gcc 10, gcc 12, headers 5.6" depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_ATOMIC depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_8 || \ - !BR2_HOST_GCC_AT_LEAST_8 + !BR2_TOOLCHAIN_GCC_AT_LEAST_12 || \ + !BR2_THOST_GCC_AT_LEAST_10 || \ + !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_6 diff --git a/package/mpd/mpd.hash b/package/mpd/mpd.hash index ce6d63addf..a8d2b31b3e 100644 --- a/package/mpd/mpd.hash +++ b/package/mpd/mpd.hash @@ -1,3 +1,3 @@ # Locally calculated after checking pgp signature -sha256 a86f4fe811695743b08db82a9f1a840b8918bb4f46b06f48aa1d8d1b5386dff2 mpd-0.23.17.tar.xz +sha256 1c828a290816d540fb2dec90f78044b55ff5ef8b49dd47a639ac34e3e5226bc5 mpd-0.24.tar.xz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk index b0935d5184..0f5c07ae71 100644 --- a/package/mpd/mpd.mk +++ b/package/mpd/mpd.mk @@ -4,11 +4,11 @@ # ################################################################################ -MPD_VERSION_MAJOR = 0.23 -MPD_VERSION = $(MPD_VERSION_MAJOR).17 +MPD_VERSION_MAJOR = 0.24 +MPD_VERSION = $(MPD_VERSION_MAJOR) MPD_SOURCE = mpd-$(MPD_VERSION).tar.xz MPD_SITE = https://www.musicpd.org/download/mpd/$(MPD_VERSION_MAJOR) -MPD_DEPENDENCIES = host-pkgconf boost fmt +MPD_DEPENDENCIES = host-pkgconf fmt MPD_LICENSE = GPL-2.0+ MPD_LICENSE_FILES = COPYING # these refer to the FreeBSD PPP daemon