commit 144efe91c811f0137ed121f83de311bec29d9439 Author: Jonathan Underwood <jonathan.underwood(a)gmail.com&gt; Date: Sun Jul 31 18:56:07 2016 +0100 Add xpra-0.17.x-12944.patch to fix build failure with latest ffmpeg - Fix bogus changelog date in spec file xpra-0.17.x-12944.patch | 10 ++++++++++ xpra-codecs-freeworld.spec | 15 +++++++++++++-- 2 files changed, 23 insertions(+), 2 deletions(-) --- diff --git a/xpra-0.17.x-12944.patch b/xpra-0.17.x-12944.patch new file mode 100644 index 0000000..2ff12bb --- /dev/null +++ b/xpra-0.17.x-12944.patch @@ -0,0 +1,10 @@ +Index: /tags/v0.17.x/src/setup.py +=================================================================== +--- /tags/v0.17.x/src/setup.py (revision 12943) ++++ /tags/v0.17.x/src/setup.py (revision 12944) +@@ -2312,4 +2312,5 @@ + if dec_avcodec2_ENABLED: + avcodec2_pkgconfig = pkgconfig("avcodec", "avutil") ++ add_to_keywords(avcodec2_pkgconfig, 'extra_compile_args', "-Wno-error=deprecated-declarations") + cython_add(Extension("xpra.codecs.dec_avcodec2.decoder", + ["xpra/codecs/dec_avcodec2/decoder.pyx"]+membuffers_c, diff --git a/xpra-codecs-freeworld.spec b/xpra-codecs-freeworld.spec index 5e7cf28..b83d8f8 100644 --- a/xpra-codecs-freeworld.spec +++ b/xpra-codecs-freeworld.spec @@ -1,12 +1,18 @@ Name: xpra-codecs-freeworld Version: 0.17.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Additional codecs for xpra using x264 and ffmpeg License: GPLv2+ URL: http://www.xpra.org/ Source0: http://xpra.org/src/xpra-%{version}.tar.xz +# Fix build failure due to deprecated avcodec_decode_video2 in recent ffmpeg +# See: https://www.xpra.org/trac/changeset/12944/xpra +# And: https://xpra.org/trac/changeset/12943/xpra +# 12943 doesn't apply cleanly, so for now we'll just use 12944 +# Can be dropped in 0.17.5 +Patch0: xpra-0.17.x-12944.patch BuildRequires: python2-devel pygobject2-devel pygtk2-devel BuildRequires: libXtst-devel @@ -26,6 +32,7 @@ x264 and ffmpeg. %prep %setup -q -n xpra-%{version} +%patch0 -p4 %build CFLAGS="%{optflags}" %{__python} setup.py build \ @@ -58,6 +65,10 @@ find %{buildroot}%{python_sitearch}/xpra -name '*.so' \ %license COPYING %changelog +* Sun Jul 31 2016 Jonathan Underwood <jonathan.underwood(a)gmail.com&gt; - 0.17.4-2 +- Add xpra-0.17.x-12944.patch to fix build failure with latest ffmpeg +- Fix bogus changelog date in spec file + * Sun Jul 31 2016 Jonathan Underwood <jonathan.underwood(a)gmail.com&gt; - 0.17.4-1 - Update to 0.17.4 @@ -79,7 +90,7 @@ find %{buildroot}%{python_sitearch}/xpra -name '*.so' \ * Wed Dec 2 2015 Jonathan Underwood <jonathan.underwood(a)gmail.com&gt; - 0.15.9-1 - Update to 0.15.9 -* Tue Nov 23 2015 Jonathan Underwood <jonathan.underwood(a)gmail.com&gt; - 0.15.8-1 +* Tue Nov 24 2015 Jonathan Underwood <jonathan.underwood(a)gmail.com&gt; - 0.15.8-1 - Update to 0.15.8 * Thu Sep 17 2015 Jonathan Underwood <jonathan.underwood(a)gmail.com&gt; - 0.15.6-1