rpms/x264/devel x264-ppc.patch,1.1,1.2

[Dominik Mierzejewski]

Author: rathann

Update of /cvs/free/rpms/x264/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv27094

Modified Files:
	x264-ppc.patch 
Log Message:
fix ppc build, try 2

x264-ppc.patch:

Index: x264-ppc.patch
===================================================================
RCS file: /cvs/free/rpms/x264/devel/x264-ppc.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- x264-ppc.patch	26 Mar 2009 21:19:02 -0000	1.1
+++ x264-ppc.patch	26 Mar 2009 22:15:48 -0000	1.2
@@ -1,6 +1,6 @@
 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
++++ x264-20090319/common/ppc/pixel.c	2009-03-26 23:14:50.000000000 +0100
 @@ -1865,7 +1865,7 @@ static int pixel_sa8d_16x16_altivec( uin
  
  #define VEC_LOAD_HIGH( p, num )                                    \
@@ -10,3 +10,21 @@
      vec_s16_t pix16_d##num;
  
  static uint64_t pixel_hadamard_ac_altivec( uint8_t *pix, int stride, const vec_u8_t perm )
+@@ -1905,7 +1905,7 @@ static uint64_t pixel_hadamard_ac_altive
+     vec_u16_t addabs67 = vec_add( VEC_ABSOLUTE(pix16_d6), VEC_ABSOLUTE(pix16_d7) );
+ 
+     vec_u16_t sum4_v = vec_add(vec_add(addabs01, addabs23), vec_add(addabs45, addabs67));
+-    vec_ste(vec_sums(vec_sum4s(sum4_v, zero_s32v), zero_s32v), 12, sum4_tab);
++    vec_ste(vec_sums(vec_sum4s((vec_s16_t)sum4_v, zero_s32v), zero_s32v), 12, sum4_tab);
+ 
+     vec_s16_t tmpi0 = vec_add(pix16_d0, pix16_d4);
+     vec_s16_t tmpi4 = vec_sub(pix16_d0, pix16_d4);
+@@ -1933,7 +1933,7 @@ static uint64_t pixel_hadamard_ac_altive
+                                   VEC_ABSOLUTE( vec_sub(pix16_d3, pix16_d7) ) );
+ 
+     vec_u16_t sum8_v = vec_add( vec_add(addsum04, addsum15), vec_add(addsum26, addsum37) );
+-    vec_ste(vec_sums( vec_sum4s(sum8_v, zero_s32v), zero_s32v), 12, sum8_tab);
++    vec_ste(vec_sums( vec_sum4s((vec_s16_t)sum8_v, zero_s32v), zero_s32v), 12, sum8_tab);
+ 
+     int sum8 = sum8_tab[3];
+