The patches need your Signed-off-by: alongside the Upstream-Status. Thanks, Ross
> On 21 Oct 2022, at 14:16, Claus Stovgaard via lists.openembedded.org > <claus.stovgaard=gmail....@lists.openembedded.org> wrote: > > Backport of patch already present upstream to fix issues with invalid > characters for GLIB when combining gstreamer1.0-libav with ffmpeg 5.x. > > Remove when gstreamer1.0-libav is upgraded to 1.21.1 or above > > Signed-off-by: Claus Stovgaard <claus.stovga...@gmail.com> > --- > ...r-APNG-encoder-property-registration.patch | 82 +++++++++++++++++++ > .../gstreamer/gstreamer1.0-libav_1.20.3.bb | 4 +- > 2 files changed, 85 insertions(+), 1 deletion(-) > create mode 100644 > meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/0001-libav-Fix-for-APNG-encoder-property-registration.patch > > diff --git > a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/0001-libav-Fix-for-APNG-encoder-property-registration.patch > > b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/0001-libav-Fix-for-APNG-encoder-property-registration.patch > new file mode 100644 > index 0000000000..bfb33a19d8 > --- /dev/null > +++ > b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/0001-libav-Fix-for-APNG-encoder-property-registration.patch > @@ -0,0 +1,82 @@ > +From 78a97c1ec35ada76d83fc67d0549ba56c74d8875 Mon Sep 17 00:00:00 2001 > +From: Seungha Yang <seun...@centricular.com> > +Date: Thu, 7 Jul 2022 22:16:30 +0900 > +Subject: [PATCH] libav: Fix for APNG encoder property registration > + > +The AVClass name of Animated PNG in FFmpeg 5.x is "(A)PNG" > +and it will be converted to "-a-png" through > +g_ascii_strdown() and g_strcanon(). But GLib disallow leading '-' > +character for a GType name. Strip leading '-' to workaround it. > + > +Upstream-Status: Backport > [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2724] > +--- > + ext/libav/gstavcfg.c | 29 +++++++++++++++++++++++------ > + 1 file changed, 23 insertions(+), 6 deletions(-) > + > +diff --git a/ext/libav/gstavcfg.c b/ext/libav/gstavcfg.c > +index c736920..a8635a7 100644 > +--- a/ext/libav/gstavcfg.c > ++++ b/ext/libav/gstavcfg.c > +@@ -91,10 +91,19 @@ register_enum (const AVClass ** obj, const AVOption * > top_opt) > + gchar *lower_obj_name = g_ascii_strdown ((*obj)->class_name, -1); > + gchar *enum_name = g_strdup_printf ("%s-%s", lower_obj_name, > top_opt->unit); > + gboolean none_default = TRUE; > ++ const gchar *enum_name_strip; > + > + g_strcanon (enum_name, G_CSET_a_2_z G_CSET_DIGITS, '-'); > + > +- if ((res = g_type_from_name (enum_name))) > ++ /* strip leading '-'s */ > ++ enum_name_strip = enum_name; > ++ while (enum_name_strip[0] == '-') > ++ enum_name_strip++; > ++ > ++ if (enum_name_strip[0] == '\0') > ++ goto done; > ++ > ++ if ((res = g_type_from_name (enum_name_strip))) > + goto done; > + > + while ((opt = av_opt_next (obj, opt))) { > +@@ -150,9 +159,8 @@ register_enum (const AVClass ** obj, const AVOption * > top_opt) > + } > + } > + > +- res = > +- g_enum_register_static (enum_name, &g_array_index (values, > GEnumValue, > +- 0)); > ++ res = g_enum_register_static (enum_name_strip, > ++ &g_array_index (values, GEnumValue, 0)); > + > + gst_type_mark_as_plugin_api (res, 0); > + } > +@@ -177,10 +185,19 @@ register_flags (const AVClass ** obj, const AVOption * > top_opt) > + GArray *values = g_array_new (TRUE, TRUE, sizeof (GEnumValue)); > + gchar *lower_obj_name = g_ascii_strdown ((*obj)->class_name, -1); > + gchar *flags_name = g_strdup_printf ("%s-%s", lower_obj_name, > top_opt->unit); > ++ const gchar *flags_name_strip; > + > + g_strcanon (flags_name, G_CSET_a_2_z G_CSET_DIGITS, '-'); > + > +- if ((res = g_type_from_name (flags_name))) > ++ /* strip leading '-'s */ > ++ flags_name_strip = flags_name; > ++ while (flags_name_strip[0] == '-') > ++ flags_name_strip++; > ++ > ++ if (flags_name_strip[0] == '\0') > ++ goto done; > ++ > ++ if ((res = g_type_from_name (flags_name_strip))) > + goto done; > + > + while ((opt = av_opt_next (obj, opt))) { > +@@ -211,7 +228,7 @@ register_flags (const AVClass ** obj, const AVOption * > top_opt) > + g_array_sort (values, (GCompareFunc) cmp_flags_value); > + > + res = > +- g_flags_register_static (flags_name, &g_array_index (values, > ++ g_flags_register_static (flags_name_strip, &g_array_index (values, > + GFlagsValue, 0)); > + > + gst_type_mark_as_plugin_api (res, 0); > diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.20.3.bb > b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.20.3.bb > index e8da49af99..7a2c0d1365 100644 > --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.20.3.bb > +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.20.3.bb > @@ -11,7 +11,9 @@ LIC_FILES_CHKSUM = > "file://COPYING;md5=69333daa044cb77e486cc36129f7a770 \ > > file://ext/libav/gstav.h;beginline=1;endline=18;md5=a752c35267d8276fd9ca3db6994fca9c > \ > " > > -SRC_URI = > "https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-${PV}.tar.xz"; > +SRC_URI = > "https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-${PV}.tar.xz \ > + > file://0001-libav-Fix-for-APNG-encoder-property-registration.patch \ > + " > SRC_URI[sha256sum] = > "3fedd10560fcdfaa1b6462cbf79a38c4e7b57d7f390359393fc0cef6dbf27dfe" > > S = "${WORKDIR}/gst-libav-${PV}" > -- > 2.25.1 > > > >
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#172025): https://lists.openembedded.org/g/openembedded-core/message/172025 Mute This Topic: https://lists.openembedded.org/mt/94475275/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
