| Message ID | 1643166825-9023-1-git-send-email-wangmy@fujitsu.com |
|---|---|
| State | New |
| Headers | show |
| Series | [meta-multimedia] gerbera: fix bug caused by update of fmt | expand |
I have already staged similar patch in master-next On Tue, Jan 25, 2022 at 7:14 PM wangmy <wangmy@fujitsu.com> wrote: > > Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> > --- > ...0001-fix-bug-caused-by-update-of-fmt.patch | 36 +++++++++++++++++++ > .../gerbera/gerbera_1.9.2.bb | 1 + > 2 files changed, 37 insertions(+) > create mode 100644 meta-multimedia/recipes-multimedia/gerbera/gerbera/0001-fix-bug-caused-by-update-of-fmt.patch > > diff --git a/meta-multimedia/recipes-multimedia/gerbera/gerbera/0001-fix-bug-caused-by-update-of-fmt.patch b/meta-multimedia/recipes-multimedia/gerbera/gerbera/0001-fix-bug-caused-by-update-of-fmt.patch > new file mode 100644 > index 000000000..eb3a80233 > --- /dev/null > +++ b/meta-multimedia/recipes-multimedia/gerbera/gerbera/0001-fix-bug-caused-by-update-of-fmt.patch > @@ -0,0 +1,36 @@ > +From 2d00f2c8ba8176d9fc6a266e9f4d5ebf75422414 Mon Sep 17 00:00:00 2001 > +From: Wang Mingyu <wangmy@fujitsu.com> > +Date: Wed, 26 Jan 2022 10:17:31 +0900 > +Subject: [PATCH] fix bug caused by update of fmt when do_compile > + > +After fmt was updated to 8.1.1, the following problems were caused: > + > +gerbera/1.9.2-r0/recipe-sysroot/usr/include/fmt/core.h:1728:7: error: static > +assertion failed: Cannot format an argument. To make type T formattable > +provide a formatter<T> specialization: https://fmt.dev/latest/api.html#udt > +| 1728 | formattable, > +| | ^~~~~~~~~~~ > + > +Upstream-Status: Pending > + > +Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> > +--- > + src/content/autoscan.cc | 2 +- > + 1 file changed, 1 insertion(+), 1 deletion(-) > + > +diff --git a/src/content/autoscan.cc b/src/content/autoscan.cc > +index ae0c0f9..6865a6c 100644 > +--- a/src/content/autoscan.cc > ++++ b/src/content/autoscan.cc > +@@ -127,7 +127,7 @@ std::string_view AutoscanDirectory::mapScanmode(ScanMode scanmode) > + case ScanMode::INotify: > + return "inotify"; > + } > +- throw_std_runtime_error("Illegal scanmode ({}) given to mapScanmode()", scanmode); > ++ throw_std_runtime_error("Illegal scanmode ({}) given to mapScanmode()", (int)scanmode); > + } > + > + ScanMode AutoscanDirectory::remapScanmode(const std::string& scanmode) > +-- > +2.25.1 > + > diff --git a/meta-multimedia/recipes-multimedia/gerbera/gerbera_1.9.2.bb b/meta-multimedia/recipes-multimedia/gerbera/gerbera_1.9.2.bb > index 94657ba53..d05c36093 100644 > --- a/meta-multimedia/recipes-multimedia/gerbera/gerbera_1.9.2.bb > +++ b/meta-multimedia/recipes-multimedia/gerbera/gerbera_1.9.2.bb > @@ -4,6 +4,7 @@ LICENSE = "GPLv2" > LIC_FILES_CHKSUM = "file://LICENSE.md;md5=25cdec9afe3f1f26212ead6bd2f7fac8" > > SRC_URI = "git://github.com/v00d00/gerbera.git;protocol=https;branch=master \ > + file://0001-fix-bug-caused-by-update-of-fmt.patch \ > " > > SRCREV = "3b93d362ec33f738868a4e896a2c9ee8e9d7a92a" > -- > 2.25.1 > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#95091): https://lists.openembedded.org/g/openembedded-devel/message/95091 > Mute This Topic: https://lists.openembedded.org/mt/88689352/1997914 > Group Owner: openembedded-devel+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- >
diff --git a/meta-multimedia/recipes-multimedia/gerbera/gerbera/0001-fix-bug-caused-by-update-of-fmt.patch b/meta-multimedia/recipes-multimedia/gerbera/gerbera/0001-fix-bug-caused-by-update-of-fmt.patch new file mode 100644 index 000000000..eb3a80233 --- /dev/null +++ b/meta-multimedia/recipes-multimedia/gerbera/gerbera/0001-fix-bug-caused-by-update-of-fmt.patch @@ -0,0 +1,36 @@ +From 2d00f2c8ba8176d9fc6a266e9f4d5ebf75422414 Mon Sep 17 00:00:00 2001 +From: Wang Mingyu <wangmy@fujitsu.com> +Date: Wed, 26 Jan 2022 10:17:31 +0900 +Subject: [PATCH] fix bug caused by update of fmt when do_compile + +After fmt was updated to 8.1.1, the following problems were caused: + +gerbera/1.9.2-r0/recipe-sysroot/usr/include/fmt/core.h:1728:7: error: static +assertion failed: Cannot format an argument. To make type T formattable +provide a formatter<T> specialization: https://fmt.dev/latest/api.html#udt +| 1728 | formattable, +| | ^~~~~~~~~~~ + +Upstream-Status: Pending + +Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> +--- + src/content/autoscan.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/content/autoscan.cc b/src/content/autoscan.cc +index ae0c0f9..6865a6c 100644 +--- a/src/content/autoscan.cc ++++ b/src/content/autoscan.cc +@@ -127,7 +127,7 @@ std::string_view AutoscanDirectory::mapScanmode(ScanMode scanmode) + case ScanMode::INotify: + return "inotify"; + } +- throw_std_runtime_error("Illegal scanmode ({}) given to mapScanmode()", scanmode); ++ throw_std_runtime_error("Illegal scanmode ({}) given to mapScanmode()", (int)scanmode); + } + + ScanMode AutoscanDirectory::remapScanmode(const std::string& scanmode) +-- +2.25.1 + diff --git a/meta-multimedia/recipes-multimedia/gerbera/gerbera_1.9.2.bb b/meta-multimedia/recipes-multimedia/gerbera/gerbera_1.9.2.bb index 94657ba53..d05c36093 100644 --- a/meta-multimedia/recipes-multimedia/gerbera/gerbera_1.9.2.bb +++ b/meta-multimedia/recipes-multimedia/gerbera/gerbera_1.9.2.bb @@ -4,6 +4,7 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://LICENSE.md;md5=25cdec9afe3f1f26212ead6bd2f7fac8" SRC_URI = "git://github.com/v00d00/gerbera.git;protocol=https;branch=master \ + file://0001-fix-bug-caused-by-update-of-fmt.patch \ " SRCREV = "3b93d362ec33f738868a4e896a2c9ee8e9d7a92a"
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> --- ...0001-fix-bug-caused-by-update-of-fmt.patch | 36 +++++++++++++++++++ .../gerbera/gerbera_1.9.2.bb | 1 + 2 files changed, 37 insertions(+) create mode 100644 meta-multimedia/recipes-multimedia/gerbera/gerbera/0001-fix-bug-caused-by-update-of-fmt.patch