[xroar/f34] new version
by Andrea Musuruane
Summary of changes:
7091557... new version (*)
(*) This commit already existed in another branch; no separate mail sent
2 years, 5 months
[xroar/f35] new version
by Andrea Musuruane
Summary of changes:
7091557... new version (*)
(*) This commit already existed in another branch; no separate mail sent
2 years, 5 months
[xroar] new version
by Andrea Musuruane
commit 7091557a2050290c3bccd09770eb4f290a43ec7c
Author: Andrea Musuruane <musuruan(a)gmail.com>
Date: Fri Nov 26 17:14:45 2021 +0100
new version
.gitignore | 1 +
sources | 2 +-
xroar.spec | 5 ++++-
3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index dc2a0b8..166c107 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@ dragon.rom
/xroar-0.37.tar.gz
/xroar-0.37.1.tar.gz
/xroar-1.0.tar.gz
+/xroar-1.0.2.tar.gz
diff --git a/sources b/sources
index 55fdaa5..e503df3 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
SHA512 (dragon.rom) = bbe3dc286a828acd745155ad8b2f8f1dc7d674c10deae619758662a4f45feefd1d1aea6b8b09f4c4db8b40cbaf475ab540d88d8286e1e4f8478692ad08979285
-SHA512 (xroar-1.0.tar.gz) = 92ca435f57f24ca1aeb7803d15bd8d827611921e2aebd2f0d4baed00f99ddb6ef9b44b7e9803ff362180452f00d077897a119b3c7afa866f82a411ba103b703c
+SHA512 (xroar-1.0.2.tar.gz) = b1789ccaca62cf5a3f093b85de03d8c335cedc55c6f09e097d1341f18cbf37f1241ef6bd3dffae7bc66d7def2ab737a5e9d2986d56228413cef838e3dd5a3d69
diff --git a/xroar.spec b/xroar.spec
index 7180be6..a7353f0 100644
--- a/xroar.spec
+++ b/xroar.spec
@@ -1,5 +1,5 @@
Name: xroar
-Version: 1.0
+Version: 1.0.2
Release: 1%{?dist}
Summary: A Dragon 32, Dragon 64 and Tandy CoCo emulator
License: GPLv3+
@@ -98,6 +98,9 @@ rm -f %{buildroot}%{_infodir}/dir
%changelog
+* Fri Nov 26 2021 Andrea Musuruane <musuruan(a)gmail.com> - 1.0.2-1
+- new version
+
* Sat Nov 20 2021 Andrea Musuruane <musuruan(a)gmail.com> - 1.0-1
- new version
2 years, 5 months
[lightspark/el7: 46/46] Merge remote-tracking branch 'origin/master' into el7
by Xavier Bachelot
commit 7520f2ea4d5d976164cbdbbf8b5d31778ccea52f
Merge: 0d55e97 9a67f54
Author: Xavier Bachelot <xavier(a)bachelot.org>
Date: Fri Nov 26 16:07:31 2021 +0100
Merge remote-tracking branch 'origin/master' into el7
.gitignore | 10 +-
lightspark-0.7.2-fix_ffmpeg_include_dir.patch | 11 -
lightspark-0.7.2-llvm-libs-hack.patch | 19 --
lightspark-0.8.5-ffmpeg45.patch | 232 +++++++++++++++++++
lightspark-0.8.5-gcc48.patch | 108 +++++++++
lightspark.spec | 307 +++++++++++++++++---------
sources | 2 +-
7 files changed, 557 insertions(+), 132 deletions(-)
---
2 years, 5 months
[lightspark/el7] (46 commits) ...Merge remote-tracking branch 'origin/master' into el7
by Xavier Bachelot
Summary of changes:
6288f10... rebuild for LLVM 3.4 (*)
0879ff8... Rebuild for ffmpeg 2.2 (*)
020234d... remove old files (*)
f9d2349... * Sun Aug 03 2014 Sérgio Basto <sergio(a)serjux.com> - 0.7.2 (*)
df1fcb7... * Sun Aug 03 2014 Sérgio Basto <sergio(a)serjux.com> - 0.7.2 (*)
98a6f11... Rebuilt for ffmpeg-2.3 (*)
8fc9124... * Fri Sep 26 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 0.7 (*)
a9b6880... Rebuilt for FFmpeg 2.4.3 (*)
f9330f8... Update to latest git (*)
25a5138... Rebuilt for ffmpeg-3.1.1 (*)
a47bd40... - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass (*)
2e12c24... 2017-01-07 snapshot (*)
51e61da... Disable ppc64le and ppc64 (*)
b7e29fd... 2017-04-22 snapshot - LLVM 4.0 support (*)
c9efe71... Rebuild for ffmpeg update (*)
9608761... lightspark 0.8.0 (*)
c1b257a... - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass (*)
57c85ed... Rebuild for ffmpeg update (*)
a6d75c2... Rebuilt for ffmpeg-3.5 git (*)
519df3d... Fix llvm-5 build issue (*)
08b7fb6... Rebuild for boost-1.66 (*)
c96f787... - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass (*)
6a1fe91... - Rebuilt for new ffmpeg snapshot (*)
a57230a... 0.8.1 (*)
4045384... Remove llvm5.patch (*)
1cabc71... Enable ppc64le build again (*)
f297f00... Fix build on ppc64 (*)
52a3da8... Disable LLVM (*)
02916d7... - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass (*)
5c4cc6d... Rebuild for new ffmpeg version (*)
810b058... Add patch to build with libswresample (*)
f6c109c... 0.8.2 (*)
e28a75a... - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass (*)
a8d817d... - Rebuild for ffmpeg-4.3 git (*)
9bec648... Rebuilt for Boost 1.73 (*)
eab42e5... 0.8.3 (*)
98d2387... Use new cmake macros (*)
ffc8af8... - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass (*)
0307b18... Rebuilt for new ffmpeg snapshot (*)
241c6fb... - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass (*)
77ef283... - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass (*)
5b09673... Update to 0.8.5 (*)
e4df745... Rebuilt for new ffmpeg snapshot (*)
15c93c6... Fix build for EL7 (gcc 4.8) (*)
9a67f54... Fix build with ffmpeg 4.5 (*)
7520f2e... Merge remote-tracking branch 'origin/master' into el7
(*) This commit already existed in another branch; no separate mail sent
2 years, 5 months
[lightspark/f35] (4 commits) ...Fix build with ffmpeg 4.5
by Xavier Bachelot
Summary of changes:
5b09673... Update to 0.8.5 (*)
e4df745... Rebuilt for new ffmpeg snapshot (*)
15c93c6... Fix build for EL7 (gcc 4.8) (*)
9a67f54... Fix build with ffmpeg 4.5 (*)
(*) This commit already existed in another branch; no separate mail sent
2 years, 5 months
[lightspark] Fix build with ffmpeg 4.5
by Xavier Bachelot
commit 9a67f548a22bd197f3a1de59fa73dc9ff6f2d25b
Author: Xavier Bachelot <xavier(a)bachelot.org>
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>
+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>
+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> - 0.8.5-4
+- Fix build with ffmpeg 4.5
+
* Fri Nov 26 2021 Xavier Bachelot <xavier(a)bachelot.org> - 0.8.5-3
- Fix build for EL7 (gcc 4.8)
2 years, 5 months
