commit 9a67f548a22bd197f3a1de59fa73dc9ff6f2d25b Author: Xavier Bachelot <xavier(a)bachelot.org&gt; Date: Fri Nov 26 14:33:55 2021 +0100 Fix build with ffmpeg 4.5 lightspark-0.8.5-ffmpeg45.patch | 232 ++++++++++++++++++++++++++++++++++++++++ lightspark.spec | 10 +- 2 files changed, 241 insertions(+), 1 deletion(-) --- diff --git a/lightspark-0.8.5-ffmpeg45.patch b/lightspark-0.8.5-ffmpeg45.patch new file mode 100644 index 0000000..2c3a317 --- /dev/null +++ b/lightspark-0.8.5-ffmpeg45.patch @@ -0,0 +1,232 @@ +From 50297fc5f79cd88aebf7ef86aa9466d7933dce65 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ludger=20Kr=C3=A4mer?= <dbluelle(a)onlinehome.de&gt; +Date: Thu, 25 Nov 2021 16:46:42 +0100 +Subject: [PATCH] fix compilation against ffmpeg 4.5 fixes #843 + +--- + src/backends/decoder.cpp | 52 ++++++++++++++++++++-------------------- + src/backends/decoder.h | 2 +- + 2 files changed, 27 insertions(+), 27 deletions(-) + +diff --git a/src/backends/decoder.cpp b/src/backends/decoder.cpp +index d3fca9f5d..25d944a9a 100644 +--- a/src/backends/decoder.cpp ++++ b/src/backends/decoder.cpp +@@ -158,25 +158,23 @@ void FFMpegVideoDecoder::switchCodec(LS_VIDEO_CODEC codecId, uint8_t *initdata, + av_free(codecContext); + } + #ifdef HAVE_AVCODEC_ALLOC_CONTEXT3 +- codecContext=avcodec_alloc_context3(NULL); ++ codecContext=avcodec_alloc_context3(nullptr); + #else + codecContext=avcodec_alloc_context(); + #endif //HAVE_AVCODEC_ALLOC_CONTEXT3 +- AVCodec* codec=NULL; ++ const AVCodec* codec=nullptr; + videoCodec=codecId; + if(codecId==H264) + { + //TODO: serialize access to avcodec_open +- const enum CodecID FFMPEGcodecId=CODEC_ID_H264; +- codec=avcodec_find_decoder(FFMPEGcodecId); ++ codec=avcodec_find_decoder(CODEC_ID_H264); + assert(codec); + //Ignore the frameRateHint as the rate is gathered from the video data + } + else if(codecId==H263) + { + //TODO: serialize access to avcodec_open +- const enum CodecID FFMPEGcodecId=CODEC_ID_FLV1; +- codec=avcodec_find_decoder(FFMPEGcodecId); ++ codec=avcodec_find_decoder(CODEC_ID_FLV1); + assert(codec); + + //Exploit the frame rate information +@@ -186,8 +184,7 @@ void FFMpegVideoDecoder::switchCodec(LS_VIDEO_CODEC codecId, uint8_t *initdata, + else if(codecId==VP6) + { + //TODO: serialize access to avcodec_open +- const enum CodecID FFMPEGcodecId=CODEC_ID_VP6F; +- codec=avcodec_find_decoder(FFMPEGcodecId); ++ codec=avcodec_find_decoder(CODEC_ID_VP6F); + assert(codec); + + //Exploit the frame rate information +@@ -197,8 +194,7 @@ void FFMpegVideoDecoder::switchCodec(LS_VIDEO_CODEC codecId, uint8_t *initdata, + else if(codecId==VP6A) + { + //TODO: serialize access to avcodec_open +- const enum CodecID FFMPEGcodecId=CODEC_ID_VP6A; +- codec=avcodec_find_decoder(FFMPEGcodecId); ++ codec=avcodec_find_decoder(CODEC_ID_VP6A); + assert(codec); + + //Exploit the frame rate information +@@ -211,7 +207,7 @@ void FFMpegVideoDecoder::switchCodec(LS_VIDEO_CODEC codecId, uint8_t *initdata, + codecContext->extradata_size=datalen; + } + #ifdef HAVE_AVCODEC_OPEN2 +- if(avcodec_open2(codecContext, codec, NULL)<0) ++ if(avcodec_open2(codecContext, codec, nullptr)<0) + #else + if(avcodec_open(codecContext, codec)<0) + #endif //HAVE_AVCODEC_ALLOC_CONTEXT3 +@@ -249,9 +245,9 @@ FFMpegVideoDecoder::FFMpegVideoDecoder(AVCodecParameters* codecPar, double frame + return; + } + avcodec_parameters_to_context(codecContext,codecPar); +- AVCodec* codec=avcodec_find_decoder(codecPar->codec_id); ++ const AVCodec* codec=avcodec_find_decoder(codecPar->codec_id); + #ifdef HAVE_AVCODEC_OPEN2 +- if(avcodec_open2(codecContext, codec, NULL)<0) ++ if(avcodec_open2(codecContext, codec, nullptr)<0) + #else + if(avcodec_open(codecContext, codec)<0) + #endif //HAVE_AVCODEC_ALLOC_CONTEXT3 +@@ -284,7 +280,7 @@ FFMpegVideoDecoder::FFMpegVideoDecoder(AVCodecContext* _c, double frameRateHint) + default: + return; + } +- AVCodec* codec=avcodec_find_decoder(codecContext->codec_id); ++ const AVCodec* codec=avcodec_find_decoder(codecContext->codec_id); + #ifdef HAVE_AVCODEC_OPEN2 + if(avcodec_open2(codecContext, codec, NULL)<0) + #else +@@ -740,11 +736,11 @@ void FFMpegAudioDecoder::switchCodec(LS_AUDIO_CODEC audioCodec, uint8_t* initdat + if (resamplecontext) + avresample_free(&resamplecontext); + #endif +- AVCodec* codec=avcodec_find_decoder(LSToFFMpegCodec(audioCodec)); ++ const AVCodec* codec=avcodec_find_decoder(LSToFFMpegCodec(audioCodec)); + assert(codec); + + #ifdef HAVE_AVCODEC_ALLOC_CONTEXT3 +- codecContext=avcodec_alloc_context3(NULL); ++ codecContext=avcodec_alloc_context3(nullptr); + #else + codecContext=avcodec_alloc_context(); + #endif //HAVE_AVCODEC_ALLOC_CONTEXT3 +@@ -756,7 +752,7 @@ void FFMpegAudioDecoder::switchCodec(LS_AUDIO_CODEC audioCodec, uint8_t* initdat + } + + #ifdef HAVE_AVCODEC_OPEN2 +- if(avcodec_open2(codecContext, codec, NULL)<0) ++ if(avcodec_open2(codecContext, codec, nullptr)<0) + #else + if(avcodec_open(codecContext, codec)<0) + #endif //HAVE_AVCODEC_ALLOC_CONTEXT3 +@@ -770,13 +766,13 @@ void FFMpegAudioDecoder::switchCodec(LS_AUDIO_CODEC audioCodec, uint8_t* initdat + + FFMpegAudioDecoder::FFMpegAudioDecoder(EngineData* eng,LS_AUDIO_CODEC lscodec, int sampleRate, int channels, bool):engine(eng),ownedContext(true) + #if defined HAVE_LIBAVRESAMPLE || defined HAVE_LIBSWRESAMPLE +- ,resamplecontext(NULL) ++ ,resamplecontext(nullptr) + #endif + { + status=INIT; + + CodecID codecId = LSToFFMpegCodec(lscodec); +- AVCodec* codec=avcodec_find_decoder(codecId); ++ const AVCodec* codec=avcodec_find_decoder(codecId); + assert(codec); + codecContext=avcodec_alloc_context3(codec); + codecContext->codec_id = codecId; +@@ -815,7 +811,7 @@ FFMpegAudioDecoder::FFMpegAudioDecoder(EngineData* eng,AVCodecParameters* codecP + #endif + { + status=INIT; +- AVCodec* codec=avcodec_find_decoder(codecPar->codec_id); ++ const AVCodec* codec=avcodec_find_decoder(codecPar->codec_id); + assert(codec); + #ifdef HAVE_AVCODEC_ALLOC_CONTEXT3 + codecContext=avcodec_alloc_context3(NULL); +@@ -844,7 +840,7 @@ FFMpegAudioDecoder::FFMpegAudioDecoder(EngineData* eng,AVCodecContext* _c):engin + #endif + { + status=INIT; +- AVCodec* codec=avcodec_find_decoder(codecContext->codec_id); ++ const AVCodec* codec=avcodec_find_decoder(codecContext->codec_id); + assert(codec); + + #ifdef HAVE_AVCODEC_OPEN2 +@@ -1277,7 +1273,11 @@ FFMpegStreamDecoder::FFMpegStreamDecoder(NetStream *ns, EngineData *eng, std::is + avioContext->is_streamed=1; + #endif + +- AVInputFormat* fmt = NULL; ++#ifdef FF_API_AVIOFORMAT ++ AVInputFormat* fmt = nullptr; ++#else ++ const AVInputFormat* fmt = nullptr; ++#endif + if (format) + { + switch (format->codec) +@@ -1302,7 +1302,7 @@ FFMpegStreamDecoder::FFMpegStreamDecoder(NetStream *ns, EngineData *eng, std::is + break; + } + } +- if (fmt == NULL) ++ if (fmt == nullptr) + { + //Probe the stream format. + //NOTE: in FFMpeg 0.7 there is av_probe_input_buffer +@@ -1323,15 +1323,15 @@ FFMpegStreamDecoder::FFMpegStreamDecoder(NetStream *ns, EngineData *eng, std::is + fmt=av_probe_input_format(&probeData,1); + delete[] probeData.buf; + } +- if(fmt==NULL) ++ if(fmt==nullptr) + return; + + #ifdef HAVE_AVIO_ALLOC_CONTEXT + formatCtx=avformat_alloc_context(); + formatCtx->pb = avioContext; +- int ret=avformat_open_input(&formatCtx, "lightspark_stream", fmt, NULL); ++ int ret=avformat_open_input(&formatCtx, "lightspark_stream", fmt, nullptr); + #else +- int ret=av_open_input_stream(&formatCtx, avioContext, "lightspark_stream", fmt, NULL); ++ int ret=av_open_input_stream(&formatCtx, avioContext, "lightspark_stream", fmt, nullptr); + #endif + if(ret<0) + return; +diff --git a/src/backends/decoder.h b/src/backends/decoder.h +index 7b3f1640e..ae959b073 100644 +--- a/src/backends/decoder.h ++++ b/src/backends/decoder.h +@@ -364,7 +364,7 @@ class FFMpegAudioDecoder: public AudioDecoder + std::vector<uint8_t> overflowBuffer; + bool fillDataAndCheckValidity(); + CodecID LSToFFMpegCodec(LS_AUDIO_CODEC lscodec); +-#ifdef HAVE_AVCODEC_DECODE_AUDIO4 ++#if defined HAVE_AVCODEC_DECODE_AUDIO4 || (defined HAVE_AVCODEC_SEND_PACKET && defined HAVE_AVCODEC_RECEIVE_FRAME) + AVFrame* frameIn; + int resampleFrameToS16(FrameSamples& curTail); + #endif +From e525ae0c317e79b2eabe9d4e657833e3dc290eb7 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ludger=20Kr=C3=A4mer?= <dbluelle(a)onlinehome.de&gt; +Date: Thu, 25 Nov 2021 17:19:55 +0100 +Subject: [PATCH] fix compilation for older ffmpeg version + +--- + src/backends/decoder.cpp | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/backends/decoder.cpp b/src/backends/decoder.cpp +index 25d944a9a..5257eec9d 100644 +--- a/src/backends/decoder.cpp ++++ b/src/backends/decoder.cpp +@@ -1273,10 +1273,10 @@ FFMpegStreamDecoder::FFMpegStreamDecoder(NetStream *ns, EngineData *eng, std::is + avioContext->is_streamed=1; + #endif + +-#ifdef FF_API_AVIOFORMAT +- AVInputFormat* fmt = nullptr; +-#else ++#if LIBAVFORMAT_VERSION_MAJOR > 58 + const AVInputFormat* fmt = nullptr; ++#else ++ AVInputFormat* fmt = nullptr; + #endif + if (format) + { diff --git a/lightspark.spec b/lightspark.spec index 9b69586..91c4e21 100644 --- a/lightspark.spec +++ b/lightspark.spec @@ -7,7 +7,7 @@ Name: lightspark Version: 0.8.5 -Release: 3%{?git_snapshot:.%{date}git%{commit_short}}%{?dist} +Release: 4%{?git_snapshot:.%{date}git%{commit_short}}%{?dist} Summary: An alternative Flash Player implementation License: LGPLv3+ URL: http://lightspark.github.io/ @@ -20,6 +20,10 @@ Source0: https://github.com/lightspark/lightspark/archive/%{version}/%{na # Fix build on EL7 (gcc4.8) # https://github.com/lightspark/lightspark/commit/4d81b0977433f52d944d89a3c... Patch0: lightspark-0.8.5-gcc48.patch +# Fix build against ffmpeg 4.5 +# https://github.com/lightspark/lightspark/commit/50297fc5f79cd88aebf7ef86a... +# https://github.com/lightspark/lightspark/commit/e525ae0c317e79b2eabe9d4e6... +Patch1: lightspark-0.8.5-ffmpeg45.patch BuildRequires: cmake3 BuildRequires: desktop-file-utils @@ -77,6 +81,7 @@ This is the Chromium compatible plugin for %{name}. %else %setup -q -n %{name}-%{version} %patch0 -p1 -b .gcc48 +%patch1 -p1 -b .ffmpeg45 %endif @@ -130,6 +135,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop %changelog +* Fri Nov 26 2021 Xavier Bachelot <xavier(a)bachelot.org&gt; - 0.8.5-4 +- Fix build with ffmpeg 4.5 + * Fri Nov 26 2021 Xavier Bachelot <xavier(a)bachelot.org&gt; - 0.8.5-3 - Fix build for EL7 (gcc 4.8)