r197 - in unstable/x264/debian: . patches

[Samuel Hocevar]

Author: sho
Date: 2007-03-14 22:11:46 +0000 (Wed, 14 Mar 2007)
New Revision: 197

Modified:
   unstable/x264/debian/changelog
   unstable/x264/debian/patches/010_altivec_crash.diff
Log:
x264 (0.svn20070309-4) unstable; urgency=low

  * debian/patches/010_altivec_crash.diff:
    + Updated upstream patch to fix an FTBFS.

 -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Wed, 14 Mar 2007 23:10:23 +0100


Modified: unstable/x264/debian/changelog
===================================================================
--- unstable/x264/debian/changelog	2007-03-14 18:41:10 UTC (rev 196)
+++ unstable/x264/debian/changelog	2007-03-14 22:11:46 UTC (rev 197)
@@ -1,3 +1,10 @@
+x264 (0.svn20070309-4) unstable; urgency=low
+
+  * debian/patches/010_altivec_crash.diff:
+    + Updated upstream patch to fix an FTBFS.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Wed, 14 Mar 2007 23:10:23 +0100
+
 x264 (0.svn20070309-3) unstable; urgency=low
 
   * debian/control:

Modified: unstable/x264/debian/patches/010_altivec_crash.diff
===================================================================
--- unstable/x264/debian/patches/010_altivec_crash.diff	2007-03-14 18:41:10 UTC (rev 196)
+++ unstable/x264/debian/patches/010_altivec_crash.diff	2007-03-14 22:11:46 UTC (rev 197)
@@ -1,8 +1,8 @@
 Index: configure
 ===================================================================
---- configure	(revision 628)
-+++ configure	(working copy)
-@@ -161,9 +161,9 @@
+--- configure.orig	2007-01-09 21:25:32.000000000 +0100
++++ configure	2007-03-14 23:09:10.000000000 +0100
+@@ -161,9 +170,9 @@
      ARCH="PPC"
      if [ $SYS = MACOSX ]
      then
@@ -14,7 +14,7 @@
      fi
      ;;
    sparc)
-@@ -385,6 +385,7 @@
+@@ -385,6 +405,7 @@
  SYS=$SYS
  CC=$CC
  CFLAGS=$CFLAGS
@@ -24,8 +24,8 @@
  ASFLAGS=$ASFLAGS
 Index: common/cpu.c
 ===================================================================
---- common/cpu.c	(revision 628)
-+++ common/cpu.c	(working copy)
+--- common/cpu.c.orig	2006-12-16 01:32:38.000000000 +0100
++++ common/cpu.c	2007-03-14 23:08:27.000000000 +0100
 @@ -132,9 +132,43 @@
  }
  
@@ -73,8 +73,8 @@
  #endif
 Index: Makefile
 ===================================================================
---- Makefile	(revision 628)
-+++ Makefile	(working copy)
+--- Makefile.orig	2007-03-14 23:08:19.000000000 +0100
++++ Makefile	2007-03-14 23:09:14.000000000 +0100
 @@ -43,8 +43,10 @@
  
  # AltiVec optims
@@ -88,3 +88,65 @@
  endif
  
  # VIS optims
+@@ -95,7 +94,7 @@
+ .depend: config.mak
+ 	rm -f .depend
+ # Hacky - because gcc 2.9x doesn't have -MT
+-	$(foreach SRC, $(SRCS) $(SRCCLI), ( $(ECHON) "`dirname $(SRC)`/" && $(CC) $(CFLAGS) $(SRC) -MM -g0 ) 1>> .depend;)
++	$(foreach SRC, $(SRCS) $(SRCCLI), ( $(ECHON) "`dirname $(SRC)`/" && $(CC) $(CFLAGS) $(ALTIVECFLAGS) $(SRC) -MM -g0 ) 1>> .depend;)
+ 
+ config.mak: $(wildcard .svn/entries */.svn/entries */*/.svn/entries)
+ 	./configure $(CONFIGURE_ARGS)
+Index: common/ppc/quant.c
+===================================================================
+--- common/ppc/quant.c.orig	2007-03-14 23:08:43.000000000 +0100
++++ common/ppc/quant.c	2007-03-14 23:09:01.000000000 +0100
+@@ -18,6 +18,20 @@
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *****************************************************************************/
+ 
++#if defined SYS_LINUX
++#include <altivec.h>
++#endif
++
++typedef union {
++  unsigned int s[4];
++  vector unsigned int v;
++} vect_int_u;
++
++typedef union {
++  unsigned short s[8];
++  vector unsigned short v;
++} vect_ushort_u;
++
+ #include "common/common.h"
+ #include "ppccommon.h"
+ #include "quant.h"            
+Index: common/ppc/quant.h
+===================================================================
+--- common/ppc/quant.h.orig	2007-03-14 23:08:43.000000000 +0100
++++ common/ppc/quant.h	2007-03-14 23:09:01.000000000 +0100
+@@ -18,23 +18,9 @@
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *****************************************************************************/
+ 
+-#ifdef SYS_LINUX
+-#include <altivec.h>
+-#endif
+-
+ #ifndef _PPC_QUANT_H
+ #define _PPC_QUANT_H 1
+ 
+-typedef union {
+-  unsigned int s[4];
+-  vector unsigned int v;
+-} vect_int_u;
+-
+-typedef union {
+-  unsigned short s[8];
+-  vector unsigned short v;
+-} vect_ushort_u;
+-
+ void x264_quant_4x4_altivec( int16_t dct[4][4], int quant_mf[4][4], int const i_qbits, int const f );
+ void x264_quant_8x8_altivec( int16_t dct[8][8], int quant_mf[8][8], int const i_qbits, int const f );
+