From e9bf3526a3a5e02396f24203bf8535a21b6f9784 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 31 Jan 2023 09:01:31 +0000 Subject: gentoo auto-resync : 31:01:2023 - 09:01:31 --- .../alephone/files/alephone-20230119-c99.patch | 99 ++++++++++++++++++++++ 1 file changed, 99 insertions(+) create mode 100644 games-fps/alephone/files/alephone-20230119-c99.patch (limited to 'games-fps/alephone/files') diff --git a/games-fps/alephone/files/alephone-20230119-c99.patch b/games-fps/alephone/files/alephone-20230119-c99.patch new file mode 100644 index 000000000000..7340e1fb2be0 --- /dev/null +++ b/games-fps/alephone/files/alephone-20230119-c99.patch @@ -0,0 +1,99 @@ +https://github.com/Aleph-One-Marathon/alephone/pull/405 +From: Matt Jolly +Date: Sat, 28 Jan 2023 18:03:51 +1100 +Subject: [PATCH] use designated initialisers for SDL_ffmpegCodec* + +These were failing to compile under clang16 as the old `audioBitrate` +was being jammed into `crf`, causing an incompatible integer conversion. +--- a/Source_Files/FFmpeg/SDL_ffmpeg.c ++++ b/Source_Files/FFmpeg/SDL_ffmpeg.c +@@ -155,41 +155,55 @@ int SDL_ffmpegDecodeVideoFrame( SDL_ffmpegFile*, AVPacket*, SDL_ffmpegVideoFrame + + const SDL_ffmpegCodec SDL_ffmpegCodecAUTO = + { +- -1, +- 720, 576, +- 1, 25, +- 6000000, +- -1, -1, +- -1, +- 2, 48000, +- 192000, +- -1, -1 ++ .videoCodecID=-1, ++ .width=720, ++ .height=576, ++ .framerateNum=1, ++ .framerateDen=25, ++ .videoBitrate=6000000, ++ .videoMinRate=-1, ++ .videoMaxRate=-1, ++ .audioCodecID=-1, ++ .channels=2, ++ .sampleRate=48000, ++ .cpuCount=-1, ++ .audioQuality=-1 + }; + ++ ++ + const SDL_ffmpegCodec SDL_ffmpegCodecPALDVD = + { +- AV_CODEC_ID_MPEG2VIDEO, +- 720, 576, +- 1, 25, +- 6000000, +- -1, -1, +- AV_CODEC_ID_MP2, +- 2, 48000, +- 192000, +- -1, -1 ++ .videoCodecID=AV_CODEC_ID_MPEG2VIDEO, ++ .width=720, ++ .height=576, ++ .framerateNum=1, ++ .framerateDen=25, ++ .videoBitrate=6000000, ++ .videoMinRate=-1, ++ .videoMaxRate=-1, ++ .audioCodecID=AV_CODEC_ID_MP2, ++ .channels=2, ++ .sampleRate=48000, ++ .cpuCount=-1, ++ .audioQuality=-1 + }; + + const SDL_ffmpegCodec SDL_ffmpegCodecPALDV = + { +- AV_CODEC_ID_DVVIDEO, +- 720, 576, +- 1, 25, +- 6553600, +- -1, -1, +- AV_CODEC_ID_DVAUDIO, +- 2, 48000, +- 256000, +- -1, -1 ++ .videoCodecID=AV_CODEC_ID_DVVIDEO, ++ .width=720, ++ .height=576, ++ .framerateNum=1, ++ .framerateDen=25, ++ .videoBitrate=6553600, ++ .videoMinRate=-1, ++ .videoMaxRate=-1, ++ .audioCodecID=AV_CODEC_ID_DVAUDIO, ++ .channels=2, ++ .sampleRate=48000, ++ .cpuCount=-1, ++ .audioQuality=-1 + }; + + SDL_ffmpegFile* SDL_ffmpegCreateFile() +@@ -2269,4 +2283,4 @@ int SDL_ffmpegDecodeVideoFrame( SDL_ffmpegFile* file, AVPacket *pack, SDL_ffmpeg + /** + \endcond + */ +-#endif +\ No newline at end of file ++#endif -- cgit v1.2.3