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)); ges/guile.scm?id=13425768f7c393cda49302ba2e8705f14ae56f0d&showmsg=1'>Expand)Author 2023-07-26gnu: Fix guile-for-guile-emacs builder....I think this broke in c4c08775a820868059b59c68d4dfd6be0c9d9010. * gnu/packages/guile.scm (guile-for-guile-emacs)[arguments]: Switch to gexp for phases. Christopher Baines 2023-07-20gnu: guile-2.0: Skip failing tests on the Hurd....* gnu/packages/guile.scm (guile-2.0)[arguments]: When building natively on the Hurd, add stage 'disable-threads.tests'... (guile-2.2): ...and when building natively on the Hurd, delete it again. Janneke Nieuwenhuizen 2023-07-20gnu: guile-git: Skip http proxy test on the Hurd....* gnu/packages/guile.scm (guile-git)[arguments]: When building natively on the Hurd, add phase 'skip-tests/hurd'. Janneke Nieuwenhuizen 2023-07-20gnu: guile: Skip hanging and failing pipe tests on the Hurd....* gnu/packages/guile.scm (guile-3.0)[arguments]: When building on the Hurd, add stage 'disable-popen.test-open-pipe' to avoid running the open-input-pipe test (hangs) and open-output-pipe test (fails. Janneke Nieuwenhuizen 2023-06-20gnu: guile-next: Update to 3.0.9-0.aa2cfe7....* gnu/packages/guile.scm (guile-next): Update to 3.0.9-0.aa2cfe7. Christopher Baines 2023-06-17gnu: Use target-hurd?, system-hurd? instead of hurd-target?, hurd-system?....* gnu/packages/hurd.scm (hurd-target?): Remove. (hurd-system?): Move to... * guix/utils.scm (system-hurd?): ...here. * gnu/packages/*: Update all users, removing (gnu packages hurd) include where now unused. Janneke Nieuwenhuizen 2023-04-22gnu: guile-next: Fix build failure....* gnu/packages/guile.scm (guile-next): Fix build failure. Signed-off-by: Andreas Enge <andreas@enge.fr> Josselin Poiret 2023-04-14Merge branch 'master' into core-updates....Conflicts: gnu/local.mk gnu/packages/build-tools.scm gnu/packages/certs.scm gnu/packages/check.scm gnu/packages/compression.scm gnu/packages/cups.scm gnu/packages/fontutils.scm gnu/packages/gnuzilla.scm gnu/packages/guile.scm gnu/packages/ibus.scm gnu/packages/image-processing.scm gnu/packages/linux.scm gnu/packages/music.scm gnu/packages/nss.scm gnu/packages/pdf.scm gnu/packages/python-xyz.scm gnu/packages/qt.scm gnu/packages/ruby.scm gnu/packages/shells.scm gnu/packages/tex.scm gnu/packages/video.scm gnu/packages/vulkan.scm gnu/packages/web.scm gnu/packages/webkit.scm gnu/packages/wm.scm Maxim Cournoyer