On Fri, Mar 18, 2022 at 06:26:18AM +0100, Theo Buehler wrote:
> In gstreamer 1.20, GstAppSinkCallbacks grew a new member. An initializer
> needs to be adapted to keep ports-gcc happy.
>
> For details see the change to gstappsink.h in
>
> https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/1046/diffs
OK
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/x11/qt5/qtwebkit/Makefile,v
> retrieving revision 1.36
> diff -u -p -r1.36 Makefile
> --- Makefile 11 Mar 2022 20:17:10 -0000 1.36
> +++ Makefile 17 Mar 2022 19:34:21 -0000
> @@ -13,7 +13,7 @@ PKGNAME = qtwebkit-${VERSION}
> PKGSPEC = qtwebkit->=${VERSION}v0
>
> EPOCH = 0
> -REVISION = 6
> +REVISION = 7
>
> SHARED_LIBS += Qt5WebKit 3.1 # 5.9
> SHARED_LIBS += Qt5WebKitWidgets 3.1 # 5.9
> Index:
> patches/patch-Source_WebCore_platform_audio_gstreamer_AudioFileReaderGStreamer_cpp
> ===================================================================
> RCS file:
> patches/patch-Source_WebCore_platform_audio_gstreamer_AudioFileReaderGStreamer_cpp
> diff -N
> patches/patch-Source_WebCore_platform_audio_gstreamer_AudioFileReaderGStreamer_cpp
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++
> patches/patch-Source_WebCore_platform_audio_gstreamer_AudioFileReaderGStreamer_cpp
> 17 Mar 2022 19:34:14 -0000
> @@ -0,0 +1,16 @@
> +gstreamer 1.20 grew a new_event callback in GstAppSinkCallbacks which
> +broke the build with ports-gcc.
> +
> +error: braces around scalar initializer for type 'gboolean (*)(GstAppSink*,
> gpointer)' {aka 'int (*)(_GstAppSink*, void*)'}
> +
> +Index: Source/WebCore/platform/audio/gstreamer/AudioFileReaderGStreamer.cpp
> +--- Source/WebCore/platform/audio/gstreamer/AudioFileReaderGStreamer.cpp.orig
> ++++ Source/WebCore/platform/audio/gstreamer/AudioFileReaderGStreamer.cpp
> +@@ -230,6 +230,7 @@ void AudioFileReader::handleNewDeinterleavePad(GstPad*
> + [](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);
>
--
Antoine
