commit 007d554a7af0bbfa5d38470a16c75d4210175053 Author: sagitter <sagitter(a)fedoraproject.org&gt; Date: Fri Feb 9 22:51:36 2018 +0100 Update to 2.2.4 .gitignore | 1 + sources | 2 +- xpra-codecs-freeworld-ffmpeg35.patch | 16 ---------------- xpra-codecs-freeworld.spec | 6 +++++- 4 files changed, 7 insertions(+), 18 deletions(-) --- diff --git a/.gitignore b/.gitignore index 79150a2..9ad4797 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ xpra-0.16.3.tar.xz /xpra-2.2.1.tar.xz /xpra-2.2.2.tar.xz /xpra-2.2.3.tar.xz +/xpra-2.2.4.tar.xz diff --git a/sources b/sources index 89e8804..d2d947e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c983399558c92627ba1c3b5e120341ee xpra-2.2.3.tar.xz +66c4d05216f12068d0cec042e36f1523 xpra-2.2.4.tar.xz diff --git a/xpra-codecs-freeworld-ffmpeg35.patch b/xpra-codecs-freeworld-ffmpeg35.patch index 4772089..04abf51 100644 --- a/xpra-codecs-freeworld-ffmpeg35.patch +++ b/xpra-codecs-freeworld-ffmpeg35.patch @@ -1,19 +1,3 @@ ---- src/xpra/codecs/dec_avcodec2/decoder.pyx (revision 18085) -+++ src/xpra/codecs/dec_avcodec2/decoder.pyx (revision 18086) -@@ -53,5 +53,5 @@ - - cdef extern from "libavcodec/avcodec.h": -- int CODEC_FLAG2_FAST -+ int AV_CODEC_FLAG2_FAST - - ctypedef struct AVFrame: -@@ -359,5 +359,5 @@ - self.codec_ctx.thread_type = 2 #FF_THREAD_SLICE: allow more than one thread per frame - self.codec_ctx.thread_count = 0 #auto -- self.codec_ctx.flags2 |= CODEC_FLAG2_FAST #may cause "no deblock across slices" - which should be fine -+ self.codec_ctx.flags2 |= AV_CODEC_FLAG2_FAST #may cause "no deblock across slices" - which should be fine - r = avcodec_open2(self.codec_ctx, self.codec, NULL) - if r<0: --- src/xpra/codecs/enc_ffmpeg/encoder.pyx (revision 18087) +++ src/xpra/codecs/enc_ffmpeg/encoder.pyx (revision 18088) @@ -135,42 +135,34 @@ diff --git a/xpra-codecs-freeworld.spec b/xpra-codecs-freeworld.spec index 21d710a..498f5e1 100644 --- a/xpra-codecs-freeworld.spec +++ b/xpra-codecs-freeworld.spec @@ -18,7 +18,7 @@ %endif Name: xpra-codecs-freeworld -Version: 2.2.3 +Version: 2.2.4 Release: 1%{?dist} Summary: Additional codecs for xpra using x264 and ffmpeg @@ -110,6 +110,10 @@ find %{buildroot}%{python2_sitearch}/xpra -name '*.so' \ %license COPYING %changelog +* Fri Feb 09 2018 Antonio Trande <sagitter(a)fedoraproject.org&gt; - 2.2.4-1 +- Update to 2.2.4 +- Modify patch for ffmpeg-3.5 + * Sun Jan 21 2018 Antonio Trande <sagitter(a)fedoraproject.org&gt; - 2.2.3-1 - Update to 2.2.3 - Patched for ffmpeg-3.5