diff mbox series

[1/1] package/qt5/qt5webkit: fix compilation with linaro 7.3 / 7.5 toolchains

Message ID 20220310124106.2916278-1-nicolas.carrier@orolia.com
State Accepted
Headers show
Series [1/1] package/qt5/qt5webkit: fix compilation with linaro 7.3 / 7.5 toolchains | expand

Commit Message

Nicolas Carrier March 10, 2022, 12:41 p.m. UTC
An unitialized field in a structure, causes the following error:
    platform/audio/gstreamer/AudioFileReaderGStreamer.cpp:234:5: error: braces around scalar initializer for type ‘gboolean (*)(GstAppSink*, gpointer) {aka int (*)(_GstAppSink*, void*)}’

This commit applies a patch to qt5webkit to fix the compilation issue.

Signed-off-by: Nicolas Carrier <nicolas.carrier@orolia.com>
---
 ...x-AudioFileReaderGStreamer-compilation.patch | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 package/qt5/qt5webkit/0005-fix-AudioFileReaderGStreamer-compilation.patch

Comments

Nicolas Carrier March 10, 2022, 12:42 p.m. UTC | #1
I forgot to add, that I had this bug when testing the latest LTS version 2022.02, so if accepted, it
could be applied to it too, it would be great :)

On Thu, 2022-03-10 at 13:41 +0100, Nicolas Carrier wrote:
> An unitialized field in a structure, causes the following error:
>     platform/audio/gstreamer/AudioFileReaderGStreamer.cpp:234:5: error: braces around scalar
> initializer for type ‘gboolean (*)(GstAppSink*, gpointer) {aka int (*)(_GstAppSink*, void*)}’
> 
> This commit applies a patch to qt5webkit to fix the compilation issue.
> 
> Signed-off-by: Nicolas Carrier <nicolas.carrier@orolia.com>
> ---
>  ...x-AudioFileReaderGStreamer-compilation.patch | 17 +++++++++++++++++
>  1 file changed, 17 insertions(+)
>  create mode 100644 package/qt5/qt5webkit/0005-fix-AudioFileReaderGStreamer-compilation.patch
> 
> diff --git a/package/qt5/qt5webkit/0005-fix-AudioFileReaderGStreamer-compilation.patch
> b/package/qt5/qt5webkit/0005-fix-AudioFileReaderGStreamer-compilation.patch
> new file mode 100644
> index 0000000000..dc2dcdafb7
> --- /dev/null
> +++ b/package/qt5/qt5webkit/0005-fix-AudioFileReaderGStreamer-compilation.patch
> @@ -0,0 +1,17 @@
> +AudioFileReaderGStreamer.cpp: fix error: braces around scalar initializer
> +
> +Compilation error, with linaro toolchains Linaro ARM 2018.05 and Linaro ARM
> +2019.12.
> +
> +Signed-off-by: Nicolas Carrier <nicolas.carrier@orolia.com>
> +
> +--- a/Source/WebCore/platform/audio/gstreamer/AudioFileReaderGStreamer.cpp     2022-03-09
> 16:44:12.597494891 +0100
> ++++ b/Source/WebCore/platform/audio/gstreamer/AudioFileReaderGStreamer.cpp     2020-03-04
> 18:16:37.000000000 +0100
> +@@ -230,6 +230,7 @@ void AudioFileReader::handleNewDeinterle
> +         [](GstAppSink* sink, gpointer userData) -> GstFlowReturn {
> +             return static_cast<AudioFileReader*>(userData)->handleSample(sink);
> +         },
> ++        nullptr, // new_event
> +         { nullptr }
> +     };
> +     gst_app_sink_set_callbacks(GST_APP_SINK(sink), &callbacks, this, 0);
Thomas Petazzoni July 24, 2022, 10:33 a.m. UTC | #2
On Thu, 10 Mar 2022 13:41:06 +0100
Nicolas Carrier <nicolas.carrier@orolia.com> wrote:

> An unitialized field in a structure, causes the following error:
>     platform/audio/gstreamer/AudioFileReaderGStreamer.cpp:234:5: error: braces around scalar initializer for type ‘gboolean (*)(GstAppSink*, gpointer) {aka int (*)(_GstAppSink*, void*)}’
> 
> This commit applies a patch to qt5webkit to fix the compilation issue.
> 
> Signed-off-by: Nicolas Carrier <nicolas.carrier@orolia.com>
> ---
>  ...x-AudioFileReaderGStreamer-compilation.patch | 17 +++++++++++++++++
>  1 file changed, 17 insertions(+)
>  create mode 100644 package/qt5/qt5webkit/0005-fix-AudioFileReaderGStreamer-compilation.patch

Thanks for your patch. I looked into this, and the problem is not
related to Linaro toolchains, but a compatibility issue with GStreamer
newer than 1.19.x, which changed this GstAppSinkCallbacks structure. I
identified the upstream fix for this problem, backported it, and added
an explanation.

See the resulting commit at:

  https://git.buildroot.org/buildroot/commit/?id=bb50b821702841fdc75bf8151555cd401f764f07

Thanks a lot!

Thomas
diff mbox series

Patch

diff --git a/package/qt5/qt5webkit/0005-fix-AudioFileReaderGStreamer-compilation.patch b/package/qt5/qt5webkit/0005-fix-AudioFileReaderGStreamer-compilation.patch
new file mode 100644
index 0000000000..dc2dcdafb7
--- /dev/null
+++ b/package/qt5/qt5webkit/0005-fix-AudioFileReaderGStreamer-compilation.patch
@@ -0,0 +1,17 @@ 
+AudioFileReaderGStreamer.cpp: fix error: braces around scalar initializer
+
+Compilation error, with linaro toolchains Linaro ARM 2018.05 and Linaro ARM
+2019.12.
+
+Signed-off-by: Nicolas Carrier <nicolas.carrier@orolia.com>
+
+--- a/Source/WebCore/platform/audio/gstreamer/AudioFileReaderGStreamer.cpp	2022-03-09 16:44:12.597494891 +0100
++++ b/Source/WebCore/platform/audio/gstreamer/AudioFileReaderGStreamer.cpp	2020-03-04 18:16:37.000000000 +0100
+@@ -230,6 +230,7 @@ void AudioFileReader::handleNewDeinterle
+         [](GstAppSink* sink, gpointer userData) -> GstFlowReturn {
+             return static_cast<AudioFileReader*>(userData)->handleSample(sink);
+         },
++        nullptr, // new_event
+         { nullptr }
+     };
+     gst_app_sink_set_callbacks(GST_APP_SINK(sink), &callbacks, this, 0);