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)); f6a55a9a65234&showmsg=1'>smalltalk.scm
AgeCommit message (Collapse)Author
2021-06-04gnu: smalltalk: Find glibc even when cross-compiling.Maxime Devos
glibc is named "cross-libc" instead of "libc" when cross-compiling. Smalltalk still fails to cross-compile though. * gnu/packages/smalltalk.scm (smalltalk)[arguments]{phases}<#:fix-libc>: Also search for "cross-libc" instead of only "libc" in 'inputs'. Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
2021-06-04gnu: smalltalk: Move 'zip' from 'inputs' to 'native-inputs'.Maxime Devos
The 'zip' package is not in the references of 'smalltalk'. As such, it probably should be a native input, not a regular input. This can be confirmed by trying to cross-compile the 'smalltalk' package, without this commit. The configure script will ask to install InfoZIP. * gnu/packages/smalltalk.scm (smalltalk)[inputs]{zip}: Move to ... (smalltalk)[native-inputs]{zip} ... here. Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
2021-06-04gnu: smalltalk: Use 'inputs' in phases instead of '%build-inputs'.Maxime Devos
In build phases, the former is preferred. * gnu/packages/smalltalk.scm (smalltalk)[arguments]<#:phases>{fix-libc}: Use 'inputs' argument instead of '%build-inputs'. Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
2021-01-05gnu: smalltalk: Update to version 3.2.91.Miguel Ángel Arruga Vivas
* gnu/packages/smalltalk.scm (smalltalk): Update to 3.2.91. Co-Authored-By: Holger Peters <holger.peters@posteo.de>
2021-01-05gnu: smalltalk: Fix integer multiplication overflow.Miguel Ángel Arruga Vivas
* gnu/local.mk (dist_patch_DATA): Add Smalltalk patch. * gnu/packages/patches/smalltalk-multiplication-overflow.patch: Patch from upstream commit 72ada189aba0283c551ead16635c1983968080b8. * gnu/packages/smalltalk.scm (smalltalk): Use patch and link with gmp and lightning libraries instead of the included source.