| 1 |
commit: aa2763887266bfe7e5dfe447f8833050d2745a27 |
| 2 |
Author: Chí-Thanh Christopher Nguyễn <chithanh <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jul 20 08:45:37 2017 +0000 |
| 4 |
Commit: Chí-Thanh Christopher Nguyễn <chithanh <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jul 20 08:45:37 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa276388 |
| 7 |
|
| 8 |
www-plugins/lightspark: add upstream patch to fix ffmpeg-free build |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/show_bug.cgi?id=607492 |
| 11 |
|
| 12 |
Package-Manager: Portage-2.3.6, Repoman-2.3.1 |
| 13 |
|
| 14 |
.../files/lightspark-0.8.0-ffmpeg-free.patch | 31 ++++++++++++++++++++++ |
| 15 |
www-plugins/lightspark/lightspark-0.8.0.ebuild | 2 ++ |
| 16 |
2 files changed, 33 insertions(+) |
| 17 |
|
| 18 |
diff --git a/www-plugins/lightspark/files/lightspark-0.8.0-ffmpeg-free.patch b/www-plugins/lightspark/files/lightspark-0.8.0-ffmpeg-free.patch |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..76566e6be79 |
| 21 |
--- /dev/null |
| 22 |
+++ b/www-plugins/lightspark/files/lightspark-0.8.0-ffmpeg-free.patch |
| 23 |
@@ -0,0 +1,31 @@ |
| 24 |
+From 22a85a13a5c3ded942ef59522ad399eb5d9a58d9 Mon Sep 17 00:00:00 2001 |
| 25 |
+From: Mikhail Vorobyov <vorobyov.mikhail@×××××.com> |
| 26 |
+Date: Tue, 18 Jul 2017 23:46:37 +0300 |
| 27 |
+Subject: [PATCH] Add NullVideoDecoder::switchCodec |
| 28 |
+ |
| 29 |
+Add VideoDecoder::switchCodec implementation to NullVideoDecoder to fix |
| 30 |
+ffmpeg-free build. |
| 31 |
+--- |
| 32 |
+ src/backends/decoder.h | 2 ++ |
| 33 |
+ 1 file changed, 2 insertions(+) |
| 34 |
+ |
| 35 |
+diff --git a/src/backends/decoder.h b/src/backends/decoder.h |
| 36 |
+index 069543d0..f53288bd 100644 |
| 37 |
+--- a/src/backends/decoder.h |
| 38 |
++++ b/src/backends/decoder.h |
| 39 |
+@@ -140,6 +140,7 @@ class NullVideoDecoder: public VideoDecoder |
| 40 |
+ public: |
| 41 |
+ NullVideoDecoder() {status=VALID;} |
| 42 |
+ ~NullVideoDecoder() { while(fenceCount); } |
| 43 |
++ void switchCodec(LS_VIDEO_CODEC codecId, uint8_t* initdata, uint32_t datalen, double frameRateHint){}; |
| 44 |
+ bool decodeData(uint8_t* data, uint32_t datalen, uint32_t time){return false;} |
| 45 |
+ bool discardFrame(){return false;} |
| 46 |
+ void skipUntil(uint32_t time){} |
| 47 |
+@@ -305,6 +306,7 @@ class NullAudioDecoder: public AudioDecoder |
| 48 |
+ sampleRate=44100; |
| 49 |
+ channelCount=2; |
| 50 |
+ } |
| 51 |
++ void switchCodec(LS_AUDIO_CODEC codecId, uint8_t* initdata, uint32_t datalen){}; |
| 52 |
+ uint32_t decodeData(uint8_t* data, int32_t datalen, uint32_t time){return 0;} |
| 53 |
+ }; |
| 54 |
+ |
| 55 |
|
| 56 |
diff --git a/www-plugins/lightspark/lightspark-0.8.0.ebuild b/www-plugins/lightspark/lightspark-0.8.0.ebuild |
| 57 |
index d67d565b6b3..1a71cb2ec2d 100644 |
| 58 |
--- a/www-plugins/lightspark/lightspark-0.8.0.ebuild |
| 59 |
+++ b/www-plugins/lightspark/lightspark-0.8.0.ebuild |
| 60 |
@@ -51,6 +51,8 @@ DEPEND="${RDEPEND} |
| 61 |
|
| 62 |
S=${WORKDIR}/${P/_rc*/} |
| 63 |
|
| 64 |
+PATCHES=( "${FILESDIR}"/${P}-ffmpeg-free.patch ) |
| 65 |
+ |
| 66 |
pkg_pretend() { |
| 67 |
if [[ ${MERGE_TYPE} != binary ]]; then |
| 68 |
if tc-is-gcc && [[ $(gcc-major-version) == 4 && $(gcc-minor-version) -lt 6 || $(gcc-major-version) -lt 4 ]] ; then |
Archives