commit e1f5c3fd37f65e059b55e0b4c910b6148e9eaf9f Author: sagitter <sagitter(a)fedoraproject.org&gt; Date: Sat Jun 10 20:03:09 2017 +0200 Patched for building against ffmpeg-3.1 (f25) ...atch-to-allow-building-against-ffmpeg-3.1.patch | 28 ++++++++++++++++++++++ xpra-codecs-freeworld.spec | 12 +++++++++- 2 files changed, 39 insertions(+), 1 deletion(-) --- diff --git a/xpra-codecs-freeworld-0002-Add-patch-to-allow-building-against-ffmpeg-3.1.patch b/xpra-codecs-freeworld-0002-Add-patch-to-allow-building-against-ffmpeg-3.1.patch new file mode 100644 index 0000000..9f94a38 --- /dev/null +++ b/xpra-codecs-freeworld-0002-Add-patch-to-allow-building-against-ffmpeg-3.1.patch @@ -0,0 +1,28 @@ +--- xpra/codecs/enc_ffmpeg/encoder.orig.pyx 2017-03-17 08:24:28.000000000 +0100 ++++ xpra/codecs/enc_ffmpeg/encoder.pyx 2017-05-10 12:23:37.728332187 +0200 +@@ -125,10 +125,10 @@ + int FF_PROFILE_H264_HIGH + int FF_PROFILE_H264_HIGH_10 + int FF_PROFILE_H264_HIGH_10_INTRA +- int FF_PROFILE_H264_MULTIVIEW_HIGH ++# int FF_PROFILE_H264_MULTIVIEW_HIGH + int FF_PROFILE_H264_HIGH_422 + int FF_PROFILE_H264_HIGH_422_INTRA +- int FF_PROFILE_H264_STEREO_HIGH ++# int FF_PROFILE_H264_STEREO_HIGH + int FF_PROFILE_H264_HIGH_444 + int FF_PROFILE_H264_HIGH_444_PREDICTIVE + int FF_PROFILE_H264_HIGH_444_INTRA +@@ -446,10 +446,10 @@ + FF_PROFILE_H264_HIGH : "high", + FF_PROFILE_H264_HIGH_10 : "high10", + FF_PROFILE_H264_HIGH_10_INTRA : "high10 intra", +- FF_PROFILE_H264_MULTIVIEW_HIGH : "multiview high", ++# FF_PROFILE_H264_MULTIVIEW_HIGH : "multiview high", + FF_PROFILE_H264_HIGH_422 : "high422", + FF_PROFILE_H264_HIGH_422_INTRA : "high422 intra", +- FF_PROFILE_H264_STEREO_HIGH : "stereo high", ++# FF_PROFILE_H264_STEREO_HIGH : "stereo high", + FF_PROFILE_H264_HIGH_444 : "high444", + FF_PROFILE_H264_HIGH_444_PREDICTIVE : "high444 predictive", + FF_PROFILE_H264_HIGH_444_INTRA : "high444 intra", diff --git a/xpra-codecs-freeworld.spec b/xpra-codecs-freeworld.spec index 387ce94..18be44c 100644 --- a/xpra-codecs-freeworld.spec +++ b/xpra-codecs-freeworld.spec @@ -19,13 +19,16 @@ Name: xpra-codecs-freeworld Version: 2.0.2 -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 +##Patch for building xpra with ffmpeg-3.1 +Patch0: %{name}-0002-Add-patch-to-allow-building-against-ffmpeg-3.1.patch + BuildRequires: python2-devel pygobject2-devel pygtk2-devel BuildRequires: libXtst-devel BuildRequires: libxkbfile-devel, libvpx-devel @@ -50,6 +53,10 @@ x264 and ffmpeg. %prep %setup -q -n xpra-%{version} +%if 0%{?fedora} < 26 +%patch0 -p0 +%endif + %build CFLAGS="%{optflags}" %{__python2} setup.py build --executable="%{__python2} -s" \ %{?_with_enc_x264} \ @@ -96,6 +103,9 @@ find %{buildroot}%{python2_sitearch}/xpra -name '*.so' \ %license COPYING %changelog +* Wed May 10 2017 Antonio Trande <sagitter(a)fedoraproject.org.com&gt; - 2.0.2-2 +- Patched for building against ffmpeg-3.1 (f25) + * Tue May 09 2017 Antonio Trande <sagitter(a)fedoraproject.org.com&gt; - 2.0.2-1 - Update to 2.0.2 - webp option deprecated