The bundled ffmpeg in Chromium is newer than the one in Guix. Patch so we can build with the new and old ffmpeg versions. Taken from Gentoo: https://gitweb.gentoo.org/repo/gentoo.git/tree/www-client/chromium/files/chromium-93-fix-build-with-system-ffmpeg.patch diff --git a/media/filters/audio_decoder_unittest.cc b/media/filters/audio_decoder_unittest.cc --- a/media/filters/audio_decoder_unittest.cc +++ b/media/filters/audio_decoder_unittest.cc @@ -109,7 +109,11 @@ void SetDiscardPadding(AVPacket* packet, } // If the timestamp is positive, try to use FFmpeg's discard data. +#if LIBAVUTIL_VERSION_MAJOR < 57 + int skip_samples_size = 0; +#else size_t skip_samples_size = 0; +#endif const uint32_t* skip_samples_ptr = reinterpret_cast(av_packet_get_side_data( packet, AV_PKT_DATA_SKIP_SAMPLES, &skip_samples_size)); diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc --- a/media/filters/ffmpeg_demuxer.cc +++ b/media/filters/ffmpeg_demuxer.cc @@ -427,11 +427,19 @@ void FFmpegDemuxerStream::EnqueuePacket( scoped_refptr buffer; if (type() == DemuxerStream::TEXT) { +#if LIBAVUTIL_VERSION_MAJOR < 57 + int id_size = 0; +#else size_t id_size = 0; +#endif uint8_t* id_data = av_packet_get_side_data( packet.get(), AV_PKT_DATA_WEBVTT_IDENTIFIER, &id_size); +#if LIBAVUTIL_VERSION_MAJOR < 57 + int settings_size = 0; +#else size_t settings_size = 0; +#endif uint8_t* settings_data = av_packet_get_side_data( packet.get(), AV_PKT_DATA_WEBVTT_SETTINGS, &settings_size); @@ -443,7 +451,11 @@ void FFmpegDemuxerStream::EnqueuePacket( buffer = DecoderBuffer::CopyFrom(packet->data, packet->size, side_data.data(), side_data.size()); } else { +#if LIBAVUTIL_VERSION_MAJOR < 57 + int side_data_size = 0; +#else size_t side_data_size = 0; +#endif uint8_t* side_data = av_packet_get_side_data( packet.get(), AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL, &side_data_size); @@ -504,7 +516,11 @@ void FFmpegDemuxerStream::EnqueuePacket( packet->size - data_offset); } +#if LIBAVUTIL_VERSION_MAJOR < 57 + int skip_samples_size = 0; +#else size_t skip_samples_size = 0; +#endif const uint32_t* skip_samples_ptr = reinterpret_cast(av_packet_get_side_data( packet.get(), AV_PKT_DATA_SKIP_SAMPLES, &skip_samples_size)); essage (Expand)Author 2023-12-20gnu: Syncthing: Update to 1.27.1....* gnu/packages/syncthing.scm (syncthing): Update to 1.27.1. Signed-off-by: Leo Famulari <leo@famulari.name> Change-Id: Ib95828dee7b2b8b5f852a47026f3bbff69361329 Benjamin Slade 2023-11-03gnu: syncthing: Update to 1.25.0....* gnu/packages/syncthing.scm (syncthing): Update to 1.25.0. Change-Id: I39ebd12e96fb09386cf51bd42cd5241f3820c16c Signed-off-by: Christopher Baines <mail@cbaines.net> Timotej Lazar 2023-09-25gnu: syncthing: Update to 1.24.0....* gnu/packages/syncthing.scm (syncthing): Update to 1.24.0. Signed-off-by: Christopher Baines <mail@cbaines.net> Timotej Lazar 2023-09-17gnu: Remove extraneous imports....Found by running 'guild compile -W3 gnu/packages/$module.scm', using guild from the upcoming Guile. * gnu/packages/admin.scm: Remove extraneous imports. * gnu/packages/avr.scm: Likewise. * gnu/packages/base.scm: Likewise. * gnu/packages/bootloaders.scm: Likewise. * gnu/packages/firmware.scm: Likewise. * gnu/packages/linphone.scm: Likewise. * gnu/packages/telephony.scm: Likewise. * gnu/packages/cran.scm: Likewise. * gnu/packages/kde.scm: Likewise. * gnu/packages/libcanberra.scm: Likewise. * gnu/packages/libreoffice.scm: Likewise. * gnu/packages/mes.scm: Likewise. * gnu/packages/mingw.scm: Likewise. * gnu/packages/serialization.scm: Likewise. * gnu/packages/sync.scm: Likewise. * gnu/packages/syncthing.scm: Likewise. * gnu/packages/terminals.scm: Likewise. * gnu/packages/version-control.scm: Likewise. * gnu/packages/video.scm: Likewise. * gnu/packages/wm.scm: Likewise. * gnu/packages/emulators.scm: Likewise. Reviewed-by: Ludovic Courtès <ludo@gnu.org> Maxim Cournoyer 2023-09-14gnu: syncthing: Update to 1.23.7....The uraggregate binary was merged into ursrv, so don’t attempt to install it. * gnu/packages/syncthing.scm (syncthing): Update to 1.23.7. [arguments]: Build with go-1.20. Signed-off-by: Ludovic Courtès <ludo@gnu.org> Timotej Lazar 2023-08-21gnu: syncthing: Use new package style....* gnu/packages/syncthing.scm (syncthing)[arguments]: Use gexps. Drop trailing Signed-off-by: Ludovic Courtès <ludo@gnu.org> Timotej Lazar 2023-08-21gnu: syncthing: Update to 1.23.6....* gnu/packages/syncthing.scm (syncthing): Update to 1.23.6. Signed-off-by: Ludovic Courtès <ludo@gnu.org> Timotej Lazar