gerbera: Upgrade to 2.4.1
PATCH 1/6 gerbera: Upgrade to 2.4.1
https://github.com/gerbera/gerbera/releases/tag/v2.4.1
https://github.com/gerbera/gerbera/releases/tag/v2.4.0
https://github.com/gerbera/gerbera/releases/tag/v2.3.0
---
.../gerbera/{gerbera_2.2.0.bb => gerbera_2.4.1.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-multimedia/recipes-multimedia/gerbera/{gerbera_2.2.0.bb => gerbera_2.4.1.bb} (96%)meta-multimedia/recipes-multimedia/gerbera/gerbera_2.4.1.bb renamed from meta-multimedia/recipes-multimedia/gerbera/gerbera_2.2.0.bb +1 -1
@@ -4,7 +4,7 @@ LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://LICENSE.md;md5=25cdec9afe3f1f26212ead6bd2f7fac8" SRC_URI = "git://github.com/gerbera/gerbera.git;protocol=https;branch=master" -SRCREV = "821d364d611dc30b3ef8a5e9beb0bf3e71b25199" +SRCREV = "870dd32d42f626dc2246d34b2224ffb6fd73e205" S = "${WORKDIR}/git"
PATCH 2/6 mpd: Upgrade mpd to 0.23.16
- Release Notes
* database
- fix integer overflows with 64-bit inode numbers
* filter
- ffmpeg: fix for filters producing no output
* support libfmt 11
* support ICU 76
- Drop ICU-76 support patch its already in this release
---
...n.build-support-building-with-ICU-76.patch | 52 -------------------
.../{mpd_0.23.15.bb => mpd_0.23.16.bb} | 3 +-
2 files changed, 1 insertion(+), 54 deletions(-)
delete mode 100644 meta-multimedia/recipes-multimedia/musicpd/mpd/0001-meson.build-support-building-with-ICU-76.patch
rename meta-multimedia/recipes-multimedia/musicpd/{mpd_0.23.15.bb => mpd_0.23.16.bb} (97%)meta-multimedia/recipes-multimedia/musicpd/mpd/0001-meson.build-support-building-with-ICU-76.patch deleted +0 -52
@@ -1,52 +0,0 @@ -From 1a063fee7ec1077e248ff97ebf1f92c5c5941a67 Mon Sep 17 00:00:00 2001 -From: Michael Cho <[email protected]> -Date: Sat, 26 Oct 2024 10:29:53 -0400 -Subject: [PATCH] meson.build: support building with ICU 76 - -ICU 76 decided to reduce overlinking[^1] thus `icu-i18n` will no longer -add `icu-uc` when linking to shared libraries. This results in failure: -``` -src/lib/icu/libicu.a.p/Converter.cxx.o: undefined reference to symbol 'ucnv_fromUnicode_76' -``` - -[^1]: https://github.com/unicode-org/icu/commit/199bc827021ffdb43b6579d68e5eecf54c7f6f56 - -Upstream-Status: Backport [https://github.com/MusicPlayerDaemon/MPD/commit/1a063fee7ec1077e248ff97ebf1f92c5c5941a67] -Signed-off-by: Khem Raj <[email protected]> ---- - src/lib/icu/meson.build | 11 +++++++---- - 1 file changed, 7 insertions(+), 4 deletions(-) - -diff --git a/src/lib/icu/meson.build b/src/lib/icu/meson.build -index 3ecc0a517..e6cf8cdce 100644 ---- a/src/lib/icu/meson.build -+++ b/src/lib/icu/meson.build -@@ -1,5 +1,7 @@ --icu_dep = dependency('icu-i18n', version: '>= 50', required: get_option('icu')) --conf.set('HAVE_ICU', icu_dep.found()) -+icu_i18n_dep = dependency('icu-i18n', version: '>= 50', required: get_option('icu')) -+icu_uc_dep = dependency('icu-uc', version: '>= 50', required: get_option('icu')) -+have_icu = icu_i18n_dep.found() and icu_uc_dep.found() -+conf.set('HAVE_ICU', have_icu) - - icu_sources = [ - 'Canonicalize.cxx', -@@ -13,7 +15,7 @@ if is_windows - endif - - iconv_dep = [] --if icu_dep.found() -+if have_icu - icu_sources += [ - 'Init.cxx', - 'Util.cxx', -@@ -31,7 +33,8 @@ icu = static_library( - icu_sources, - include_directories: inc, - dependencies: [ -- icu_dep, -+ icu_i18n_dep, -+ icu_uc_dep, - iconv_dep, - fmt_dep, - ],
meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.16.bb renamed from meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.15.bb +1 -2
@@ -21,9 +21,8 @@ DEPENDS += " \ PV .= "+git" SRC_URI = "git://github.com/MusicPlayerDaemon/MPD;branch=master;protocol=https \ file://mpd.conf.in \ - file://0001-meson.build-support-building-with-ICU-76.patch \ " -SRCREV = "965c466e9bda262790e76edd5272e9e74b407ff3" +SRCREV = "b5bd294e5c88c062b1a9c0c4c60397fbf7f3f1c5" S = "${WORKDIR}/git" EXTRA_OEMESON += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '-Dsystemd=enabled -Dsystemd_system_unit_dir=${systemd_system_unitdir} -Dsystemd_user_unit_dir=${systemd_system_unitdir}', '-Dsystemd=disabled', d)} \
PATCH 3/6 mpd: Use meson wrap for fmt
In reply to Khem Rajmpd still depends on fmt 11.0.x and oe-core has moved to 11.1.x until mpd is ported to use it, lets fall back to what mpd works with instead of using system provided fmt
--- meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.16.bb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.16.bb +5 -1
@@ -15,14 +15,18 @@ DEPENDS += " \ icu \ dbus \ expat \ - fmt \ " PV .= "+git" SRC_URI = "git://github.com/MusicPlayerDaemon/MPD;branch=master;protocol=https \ + https://github.com/mesonbuild/wrapdb/releases/download/fmt_11.0.2-1/fmt-11.0.2.tar.gz;name=fmt;subdir=git/subprojects \ + https://wrapdb.mesonbuild.com/v2/fmt_11.0.2-1/get_patch;downloadfilename=fmt_11.0.2-1_patch.zip;name=fmt-meson;subdir=git/subprojects \ file://mpd.conf.in \ " SRCREV = "b5bd294e5c88c062b1a9c0c4c60397fbf7f3f1c5" +SRC_URI[fmt.sha256sum] = "6cb1e6d37bdcb756dbbe59be438790db409cdb4868c66e888d5df9f13f7c027f" +SRC_URI[fmt-meson.sha256sum] = "90c9e3b8e8f29713d40ca949f6f93ad115d78d7fb921064112bc6179e6427c5e" + S = "${WORKDIR}/git" EXTRA_OEMESON += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '-Dsystemd=enabled -Dsystemd_system_unit_dir=${systemd_system_unitdir} -Dsystemd_user_unit_dir=${systemd_system_unitdir}', '-Dsystemd=disabled', d)} \
PATCH 4/6 mpd: Drop adding +git to PR
In reply to Khem RajWe are using latest release SHA1
--- meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.16.bb | 1 - 1 file changed, 1 deletion(-)
meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.16.bb +0 -1
@@ -17,7 +17,6 @@ DEPENDS += " \ expat \ " -PV .= "+git" SRC_URI = "git://github.com/MusicPlayerDaemon/MPD;branch=master;protocol=https \ https://github.com/mesonbuild/wrapdb/releases/download/fmt_11.0.2-1/fmt-11.0.2.tar.gz;name=fmt;subdir=git/subprojects \ https://wrapdb.mesonbuild.com/v2/fmt_11.0.2-1/get_patch;downloadfilename=fmt_11.0.2-1_patch.zip;name=fmt-meson;subdir=git/subprojects \
Re: [oe] [meta-multimedia][PATCH 4/6] mpd: Drop adding +git to PR
Small typo in subject, PR->PV
Quoted 29 lines · Khem Raj via lists.openembedded.org
We are using latest release SHA1
Signed-off-by Khem Raj <[email protected]>--- meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.16.bb | 1 - 1 file changed, 1 deletion(-)meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.16.bb +0
-2@@ -17,7 +17,6 @@ DEPENDS += " \ expat \ " -PV .= "+git" SRC_URI = "git://github.com/MusicPlayerDaemon/MPD;branch=master;protocol=https \ https://github.com/mesonbuild/wrapdb/releases/download/fmt_11.0.2-1/fmt-11.0.2.tar.gz;name=fmt;subdir=git/subprojects \ https://wrapdb.mesonbuild.com/v2/fmt_11.0.2-1/get_patch;downloadfilename=fmt_11.0.2-1_patch.zip;name=fmt-meson;subdir=git/subprojects \ -=-=-=-=-=-=-=-=-=-=-=-Links: You receive all messages sent to this group.
View/Reply Online (#114760): https://lists.openembedded.org/g/openembedded-devel/message/114760
Mute This Topic: https://lists.openembedded.org/mt/110526837/3617156
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [oe] [meta-multimedia][PATCH 4/6] mpd: Drop adding +git to PR
Quoted 3 lines · Martin Jansa
Small typo in subject,
PR->PV
yes thanks fixed in master-next
Quoted 31 lines
Quoted 29 lines · Khem Raj via lists.openembedded.org
We are using latest release SHA1
Signed-off-by Khem Raj <[email protected]>--- meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.16.bb | 1 - 1 file changed, 1 deletion(-)meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.16.bb +0
-2@@ -17,7 +17,6 @@ DEPENDS += " \ expat \ " -PV .= "+git" SRC_URI = "git://github.com/MusicPlayerDaemon/MPD;branch=master;protocol=https \ https://github.com/mesonbuild/wrapdb/releases/download/fmt_11.0.2-1/fmt-11.0.2.tar.gz;name=fmt;subdir=git/subprojects \ https://wrapdb.mesonbuild.com/v2/fmt_11.0.2-1/get_patch;downloadfilename=fmt_11.0.2-1_patch.zip;name=fmt-meson;subdir=git/subprojects \ -=-=-=-=-=-=-=-=-=-=-=-Links: You receive all messages sent to this group.
View/Reply Online (#114760): https://lists.openembedded.org/g/openembedded-devel/message/114760
Mute This Topic: https://lists.openembedded.org/mt/110526837/3617156
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
PATCH 5/6 spdlog: Switch to latest on 1.x branch
In reply to Khem RajThis gets up fmt 11.1 support
--- meta-oe/recipes-support/spdlog/spdlog_1.15.0.bb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
meta-oe/recipes-support/spdlog/spdlog_1.15.0.bb +5 -2
@@ -3,14 +3,17 @@ HOMEPAGE = "https://github.com/gabime/spdlog/wiki" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=9573510928429ad0cbe5ba4de77546e9" -SRCREV = "8e5613379f5140fefb0b60412fbf1f5406e7c7f8" +PV .= "+git" +SRCREV = "7f8060d5b280eac9786f92ac74d263cc8359c5ed" SRC_URI = "git://github.com/gabime/spdlog.git;protocol=https;branch=v1.x" +DEPENDS += "fmt" + S = "${WORKDIR}/git" inherit cmake # no need to build example & tests & benchmarks on pure yocto -EXTRA_OECMAKE += "-DSPDLOG_INSTALL=on -DSPDLOG_BUILD_SHARED=on -DSPDLOG_BUILD_EXAMPLE=off -DSPDLOG_FMT_EXTERNAL=off" +EXTRA_OECMAKE += "-DSPDLOG_INSTALL=on -DSPDLOG_BUILD_SHARED=on -DSPDLOG_BUILD_EXAMPLE=off -DSPDLOG_FMT_EXTERNAL=on" BBCLASSEXTEND = "native"
PATCH 6/6 python3-pyrad: Fix build with poetry 2.x
In reply to Khem RajBackport a patch that reformats pyproject file to the taste of poetry 2
--- .../python/python3-pyrad/208.patch | 51 +++++++++++++++++++ .../python/python3-pyrad_2.4.bb | 4 +- 2 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 meta-python/recipes-devtools/python/python3-pyrad/208.patch
meta-python/recipes-devtools/python/python3-pyrad/208.patch new file +51 -0
@@ -0,0 +1,51 @@ +From d17438da2008f48aa13cc95a626c990bf645799a Mon Sep 17 00:00:00 2001 +From: Luca Barbieri <[email protected]> +Date: Wed, 8 Jan 2025 10:35:22 +0100 +Subject: [PATCH 1/2] Fix pyproject.toml format + +Fix pyproject format to correctly build with poetry-core 2.0.0 +Upstream-Status: Submitted [https://github.com/pyradius/pyrad/pull/208] +Signed-off-by: Khem Raj <[email protected]> +--- + pyproject.toml | 28 ++++++++++++++-------------- + 1 file changed, 14 insertions(+), 14 deletions(-) + +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -2,16 +2,16 @@ + requires = ["poetry-core>=1.0.0"] + build-backend = "poetry.core.masonry.api" + +-[tool.poetry] ++[project] + name = "pyrad" + version= "2.4" + readme = "README.rst" + license = "BSD-3-Clause" + description="RADIUS tools" + authors = [ +- "Istvan Ruzman <[email protected]>", +- "Christian Giese <[email protected]>", +-] ++ { name = "Istvan Ruzman", email = "[email protected]" }, ++ { name = "Christian Giese", email = "[email protected]" }, ++ ] + keywords = ["AAA", "accounting", "authentication", "authorization", "RADIUS"] + classifiers = [ + "Development Status :: 6 - Mature", +@@ -28,7 +28,7 @@ include = [ + "example/*" + ] + +-[tool.poetry.urls] ++[project.urls] + repository = "https://github.com/pyradius/pyrad" + + [tool.poetry.dependencies] +@@ -36,5 +36,5 @@ python = "^2.7 || ^3.6" + six = "^1.15.0" + netaddr = "^0.8" + +-[tool.poetry.dev-dependencies] ++[tool.poetry.group.dev.dependencies] + nose = "^0.10.0b1"
meta-python/recipes-devtools/python/python3-pyrad_2.4.bb +3 -1
@@ -6,7 +6,9 @@ LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=e910b35b0ef4e1f665 PYPI_PACKAGE = "pyrad" SRC_URI[sha256sum] = "057de4b7e89d8da57ba782c1bde45c63ebee720ae2c0b0a69beaff15c47e30d9" -SRC_URI += "file://use-poetry-core.patch" +SRC_URI += "file://use-poetry-core.patch \ + file://208.patch \ + " inherit pypi python_poetry_core