From b6bd2fafb5efe4902b3fa580a564ab0079b032e4 Mon Sep 17 00:00:00 2001
From: Dominik Mierzejewski <dominik@greysector.net>
Date: Thu, 26 Mar 2009 21:19:02 +0000
Subject: [PATCH] - 20090319 snapshot - fix build on ppc

---
 .gitignore     |  2 +-
 sources        |  2 +-
 x264-ppc.patch | 12 ++++++++++++
 x264.spec      | 11 +++++++----
 4 files changed, 21 insertions(+), 6 deletions(-)
 create mode 100644 x264-ppc.patch

diff --git a/.gitignore b/.gitignore
index 2a9c2b5..87f3e12 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-x264-20090310.tar.bz2
+x264-20090319.tar.bz2
diff --git a/sources b/sources
index 1d997ea..94a43c1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9bfa0ecd434dc1daebdd4c1bacbda188  x264-20090310.tar.bz2
+548146e4fe42572a8dfde55c65ce5206  x264-20090319.tar.bz2
diff --git a/x264-ppc.patch b/x264-ppc.patch
new file mode 100644
index 0000000..fa09551
--- /dev/null
+++ b/x264-ppc.patch
@@ -0,0 +1,12 @@
+diff -up x264-20090319/common/ppc/pixel.c.ppc x264-20090319/common/ppc/pixel.c
+--- x264-20090319/common/ppc/pixel.c.ppc	2009-03-26 21:12:11.000000000 +0100
++++ x264-20090319/common/ppc/pixel.c	2009-03-26 21:44:58.000000000 +0100
+@@ -1865,7 +1865,7 @@ static int pixel_sa8d_16x16_altivec( uin
+ 
+ #define VEC_LOAD_HIGH( p, num )                                    \
+     vec_u8_t pix8_##num = vec_ld( stride*num, p );                 \
+-    vec_s16_t pix16_s##num = vec_perm(pix8_##num, zero_u8v, perm); \
++    vec_s16_t pix16_s##num = (vec_s16_t)vec_perm(pix8_##num, zero_u8v, perm); \
+     vec_s16_t pix16_d##num;
+ 
+ static uint64_t pixel_hadamard_ac_altivec( uint8_t *pix, int stride, const vec_u8_t perm )
diff --git a/x264.spec b/x264.spec
index b1e6152..592cf01 100644
--- a/x264.spec
+++ b/x264.spec
@@ -1,5 +1,5 @@
-%define snapshot 20090310
-%define git 5b65cc
+%define snapshot 20090319
+%define git c109c8
 
 Summary: H264/AVC video streams encoder
 Name: x264
@@ -11,6 +11,7 @@ URL: http://developers.videolan.org/x264.html
 Source0: http://rpm.greysector.net/livna/%{name}-%{snapshot}.tar.bz2
 Source1: x264-snapshot.sh
 Patch0: %{name}-rpm.patch
+Patch1: %{name}-ppc.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
 %{!?_without_gpac:BuildRequires: gpac-devel-static}
 %{?_with_visualize:BuildRequires: libX11-devel}
@@ -65,6 +66,7 @@ This package contains the development files.
 %prep
 %setup -q -n %{name}-%{snapshot}
 %patch0 -p1 -b .r
+%patch1 -p1 -b .ppc
 # AUTHORS file is in iso-8859-1
 iconv -f iso-8859-1 -t utf-8 -o AUTHORS.utf8 AUTHORS
 mv -f AUTHORS.utf8 AUTHORS
@@ -132,9 +134,10 @@ popd
 %endif
 
 %changelog
-* Tue Mar 10 2009 Dominik Mierzejewski <rpm@greysector.net> 0.0.0-0.24.20090310git5b65cc
-- 20090310 snapshot
+* Tue Mar 26 2009 Dominik Mierzejewski <rpm@greysector.net> 0.0.0-0.24.20090319gitc109c8
+- 20090319 snapshot
 - build with static gpac
+- fix build on ppc
 
 * Tue Feb 10 2009 Dominik Mierzejewski <rpm@greysector.net> 0.0.0-0.23.20090119git451ba8d
 - 20090119 snapshot