From e657d4a3216b1944b8b11d8dd9355bb710d6262c Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Sat, 7 Nov 2009 15:34:58 +0000 Subject: [PATCH] * Sat Nov 7 2009 Hans de Goede - 0.5-5.20091026svn - Add -fPIC -dPIC when compiling on ppc (rf804) --- ffmpeg-ppc-pic.patch | 18 ++++++++++++++++++ ffmpeg.spec | 8 +++++++- 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 ffmpeg-ppc-pic.patch diff --git a/ffmpeg-ppc-pic.patch b/ffmpeg-ppc-pic.patch new file mode 100644 index 0000000..2ccbce1 --- /dev/null +++ b/ffmpeg-ppc-pic.patch @@ -0,0 +1,18 @@ +diff -up ffmpeg-20091026/configure~ ffmpeg-20091026/configure +--- ffmpeg-20091026/configure~ 2009-10-24 19:24:25.000000000 +0200 ++++ ffmpeg-20091026/configure 2009-11-07 16:35:15.000000000 +0100 +@@ -1805,12 +1805,14 @@ case "$arch" in + "Power Macintosh"|ppc|powerpc) + arch="ppc" + enable fast_unaligned ++ spic=$shared + ;; + ppc64) + arch="ppc" + subarch="ppc64" + enable fast_64bit + enable fast_unaligned ++ spic=$shared + ;; + s390|s390x) + arch="s390" diff --git a/ffmpeg.spec b/ffmpeg.spec index 1f90476..1e59841 100644 --- a/ffmpeg.spec +++ b/ffmpeg.spec @@ -6,7 +6,7 @@ Summary: Digital VCR and streaming server Name: ffmpeg Version: 0.5 -Release: 4.%{svn}svn%{?dist} +Release: 5.%{svn}svn%{?dist} %if 0%{?_with_opencore_amr:1} License: GPLv3+ %else @@ -18,6 +18,8 @@ Source0: http://rpms.kwizart.net/fedora/SOURCES/%{name}-%{svn}.tar.bz2 Source1: ffmpeg-snapshot.sh # get rid of textrels on x86_64 in yasm code Patch0: %{name}-textrel.patch +# compile with -fPIC on ppc/ppc64 (rf804) +Patch1: %{name}-ppc-pic.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: bzip2-devel @@ -120,6 +122,7 @@ This package contains development files for %{name} %prep %setup -q -n %{name}-%{svn} %patch0 -p1 -b .textrel +%patch1 -p1 -b .ppc-pic %build mkdir generic @@ -224,6 +227,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Nov 7 2009 Hans de Goede - 0.5-5.20091026svn +- Add -fPIC -dPIC when compiling on ppc (rf804) + * Thu Oct 22 2009 Dominik Mierzejewski - 0.5-4.20091026svn - 20091026 snapshot, requires recent x264 - dropped support for old amr libs (not supported upstream since July)