- fix building with ffmpeg 3

[packages/libx264.git] / libx264.spec

diff --git a/libx264.spec b/libx264.spec
index 44b73f092839ae9c142818a5efc97eafc7b1181d..61b0b93f0501b884cf3728334cd37a1b74ac6ddc 100644 (file)
--- a/libx264.spec
+++ b/libx264.spec
@@ -1,10 +1,15 @@
 #
 # Conditional build:
-%bcond_with    bootstrap
-#
-%define                snap    20111212
+%bcond_with    bootstrap       # no ffmpeg/gpac support in x264 utility
+%bcond_without asm             # disable asm
+
+%ifnarch %{ix86} %{x8664}
+%undefine      with_asm
+%endif
+
+%define                rel     7
+%define                snap    20140824
 %define                snaph   2245
-%define                rel             1
 Summary:       H264 encoder library
 Summary(pl.UTF-8):     Biblioteka kodująca H264
 Name:          libx264
@@ -14,15 +19,15 @@ License:    GPL v2+
 Group:         Libraries
 # still no releases, use snapshots
 Source0:       ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-%{snap}-%{snaph}.tar.bz2
-# Source0-md5: 586e5a6e49bef5b026702c327b1edda2
+# Source0-md5: d2a779a864254ca426dfb1f3115987a0
 Patch0:                %{name}-alpha.patch
 Patch1:                altivec-no-vand.patch
 Patch2:                %{name}-gpac.patch
+Patch3:                x32.patch
+Patch4:                ffmpeg3.patch
 URL:           http://www.videolan.org/developers/x264.html
 BuildRequires: pkgconfig
-%ifarch %{ix86} %{x8664}
-BuildRequires: yasm >= 0.6.0
-%endif
+%{?with_asm:BuildRequires:     yasm >= 1.2.0}
 %if %{without bootstrap}
 # which version exactly???
 # for full x264 CLI utility functionality it wants:
@@ -31,8 +36,7 @@ BuildRequires:        yasm >= 0.6.0
 BuildRequires: ffmpeg-devel >= 0.7.1
 BuildRequires: ffmpegsource-devel >= 2.16
 # gpac >= 2007-06-21
-BuildRequires: gpac-devel >= 0.4.5-2
-Requires:      gpac >= 0.4.5-2
+BuildRequires: gpac-devel >= 0.5.0-3
 %endif
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -74,6 +78,9 @@ Summary:      x264 CLI decoder
 Summary(pl.UTF-8):     Dekoder x264 działający z linii poleceń
 Group:         Applications/Multimedia
 Requires:      %{name} = %{version}-%{release}
+%if %{without bootstrap}
+Requires:      gpac >= 0.5.0-3
+%endif
 
 %description -n x264
 x264 CLI decoder.
@@ -88,16 +95,20 @@ Dekoder x264 działający z linii poleceń.
 %patch1 -p1
 %endif
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 %build
 CC="%{__cc}" \
 ./configure \
+       --host=%{_target_platform} \
        --prefix=%{_prefix} \
        --exec-prefix=%{_prefix} \
        --bindir=%{_bindir} \
        --includedir=%{_includedir} \
        --libdir=%{_libdir} \
        --extra-cflags="%{rpmcflags}" \
+       %{!?with_asm:--disable-asm} \
        --enable-pic \
        --enable-shared \
        --enable-static
@@ -119,7 +130,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS
-%attr(755,root,root) %{_libdir}/libx264.so.120
+%attr(755,root,root) %{_libdir}/libx264.so.142
 
 %files devel
 %defattr(644,root,root,755)