rpms/ffmpeg-compat/devel 0001-Fix-build-when-seletected-fpu-is-not-neon-on-arm.patch, NONE, 1.1 ffmpeg-compat.spec, 1.10, 1.11

Author: kwizart Update of /cvs/free/rpms/ffmpeg-compat/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv10936/devel Modified Files: ffmpeg-compat.spec Added Files: 0001-Fix-build-when-seletected-fpu-is-not-neon-on-arm.patch Log Message: Fix FTBFS on arm non-neon target 0001-Fix-build-when-seletected-fpu-is-not-neon-on-arm.patch: h264dsp_init_arm.c | 4 +++- h264pred_init_arm.c | 5 +++-- 2 files changed, 6 insertions(+), 3 deletions(-) --- NEW FILE 0001-Fix-build-when-seletected-fpu-is-not-neon-on-arm.patch --- From: Nicolas Chauvet <kwizart(a)gmail.com&gt; Date: Sat, 29 Jun 2013 14:12:59 +0200 Subject: [PATCH] Fix build when seletected fpu is not neon on arm --- libavcodec/arm/h264dsp_init_arm.c | 4 +++- libavcodec/arm/h264pred_init_arm.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/libavcodec/arm/h264dsp_init_arm.c b/libavcodec/arm/h264dsp_init_arm.c index c06c3d0..7014d1a 100644 --- a/libavcodec/arm/h264dsp_init_arm.c +++ b/libavcodec/arm/h264dsp_init_arm.c @@ -122,5 +122,7 @@ static void ff_h264dsp_init_neon(H264DSPContext *c) void ff_h264dsp_init_arm(H264DSPContext *c) { - if (HAVE_NEON) ff_h264dsp_init_neon(c); +#if HAVE_NEON + ff_h264dsp_init_neon(c); +#endif } diff --git a/libavcodec/arm/h264pred_init_arm.c b/libavcodec/arm/h264pred_init_arm.c index a7d9960..8574ff0 100644 --- a/libavcodec/arm/h264pred_init_arm.c +++ b/libavcodec/arm/h264pred_init_arm.c @@ -72,5 +72,7 @@ static void ff_h264_pred_init_neon(H264PredContext *h, int codec_id) void ff_h264_pred_init_arm(H264PredContext *h, int codec_id) { - if (HAVE_NEON) ff_h264_pred_init_neon(h, codec_id); +#if HAVE_NEON + ff_h264_pred_init_neon(h, codec_id); +#endif } -- 1.7.1 Index: ffmpeg-compat.spec =================================================================== RCS file: /cvs/free/rpms/ffmpeg-compat/devel/ffmpeg-compat.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- ffmpeg-compat.spec 27 Jun 2013 20:24:03 -0000 1.10 +++ ffmpeg-compat.spec 29 Jun 2013 13:34:29 -0000 1.11 @@ -10,7 +10,7 @@ Summary: Digital VCR and streaming server Name: ffmpeg-compat Version: 0.6.6 -Release: 8%{?dist} +Release: 9%{?dist} %if 0%{?_with_amr:1} License: GPLv3+ %else @@ -21,6 +21,7 @@ Source0: http://ffmpeg.org/releases/ffmpeg-%{version}.tar.bz2 Source1: ffmpeg-snapshot.sh Patch0: ffmpeg-0.6.6-compile-fix.patch +Patch1: 0001-Fix-build-when-seletected-fpu-is-not-neon-on-arm.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: bzip2-devel @@ -116,6 +117,7 @@ %prep %setup -q -n ffmpeg-%{version} %patch0 -p1 +%patch1 -p1 %build mkdir generic @@ -229,6 +231,9 @@ %changelog +* Sat Jun 29 2013 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 0.6.6-9 +- Fix build on non-neon arm + * Thu Jun 27 2013 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 0.6.6-8 - Drop support for VAAPI on fedora