Author: kwizart Update of /cvs/free/rpms/x264/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv22136/devel Modified Files: x264.spec Log Message: Fix ARM and add bootsrap Index: x264.spec =================================================================== RCS file: /cvs/free/rpms/x264/devel/x264.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- x264.spec 8 Apr 2012 14:04:14 -0000 1.34 +++ x264.spec 1 May 2012 07:47:27 -0000 1.35 @@ -1,12 +1,14 @@ %global snapshot 20120303 %global branch stable -#global _without_gpac 0 -%global _with_libavformat 1 +%{?_with_bootrap: +%global _without_gpac 1 +%global _without_libavformat 1 +} Summary: H264/AVC video streams encoder Name: x264 Version: 0.120 -Release: 3.%{snapshot}%{?dist} +Release: 4.%{snapshot}%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://developers.videolan.org/x264.html @@ -15,7 +17,7 @@ # don't remove config.h and don't re-run version.sh Patch0: x264-nover.patch %{!?_without_gpac:BuildRequires: gpac-devel-static zlib-devel} -%{?_with_libavformat:BuildRequires: ffmpeg-devel} +%{!?_without_libavformat:BuildRequires: ffmpeg-devel} %{?_with_ffmpegsource:BuildRequires: ffmpegsource-devel} %{?_with_visualize:BuildRequires: libX11-devel} %ifarch x86_64 i686 @@ -57,7 +59,7 @@ --includedir=%{_includedir} \\\ --extra-cflags="$RPM_OPT_FLAGS" \\\ %{?_with_visualize:--enable-visualize} \\\ - %{!?_with_libavformat:--disable-lavf} \\\ + %{?_without_libavformat:--disable-lavf} \\\ %{!?_with_ffmpegsource:--disable-ffms} \\\ --enable-debug \\\ --enable-shared \\\ @@ -77,7 +79,7 @@ %{x_configure}\ --host=%{_target_platform} \ --libdir=%{_libdir} \ -%ifarch i686 armv5tel +%ifarch i686 armv5tel armv6l --disable-asm \ %endif @@ -134,8 +136,9 @@ %endif %changelog -* Sun Apr 08 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 0.120-3.20120303 -- Disable ASM on armv5tel +* Tue May 01 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 0.120-4.20120303 +- Disable ASM on armv5tel armv6l +- Add --with bootstrap conditional * Tue Mar 6 2012 Sérgio Basto <sergio(a)serjux.com&gt; - 0.120-2.20120303 - Enable libavformat , after compile ffmeg with 0.120-1