r31 - videolan/vlc/debian/patches

[xtophe-guest at alioth.debian.org]

Author: xtophe-guest
Date: 2006-05-10 00:11:22 +0000 (Wed, 10 May 2006)
New Revision: 31

Removed:
   videolan/vlc/debian/patches/030_x264_altivec.diff
   videolan/vlc/debian/patches/030_x264_armv4l.diff
Modified:
   videolan/vlc/debian/patches/series
Log:
Both patches has been integrated upstream


Deleted: videolan/vlc/debian/patches/030_x264_altivec.diff
===================================================================
--- videolan/vlc/debian/patches/030_x264_altivec.diff	2006-05-09 23:16:38 UTC (rev 30)
+++ videolan/vlc/debian/patches/030_x264_altivec.diff	2006-05-10 00:11:22 UTC (rev 31)
@@ -1,116 +0,0 @@
-Index: vlc-0.8.5-test3.debian/extras/x264/common/ppc/pixel.c
-===================================================================
---- vlc-0.8.5-test3.debian.orig/extras/x264/common/ppc/pixel.c	2006-04-24 21:00:54.000000000 +0200
-+++ vlc-0.8.5-test3.debian/extras/x264/common/ppc/pixel.c	2006-04-24 21:01:24.000000000 +0200
-@@ -704,10 +704,10 @@
-         
-     }
-     
--    sum0v = vec_sums( sum0v, zero );
--    sum1v = vec_sums( sum1v, zero );
--    sum2v = vec_sums( sum2v, zero );
--    sum3v = vec_sums( sum3v, zero );
-+    sum0v = (vec_u32_t) vec_sums( sum0v, zero );
-+    sum1v = (vec_u32_t) vec_sums( sum1v, zero );
-+    sum2v = (vec_u32_t) vec_sums( sum2v, zero );
-+    sum3v = (vec_u32_t) vec_sums( sum3v, zero );
-     
-     sum0v = vec_splat( sum0v, 3 );
-     sum1v = vec_splat( sum1v, 3 );
-@@ -814,9 +814,9 @@
-         
-     }
-     
--    sum0v = vec_sums( sum0v, zero );
--    sum1v = vec_sums( sum1v, zero );
--    sum2v = vec_sums( sum2v, zero );
-+    sum0v = (vec_u32_t) vec_sums( sum0v, zero );
-+    sum1v = (vec_u32_t) vec_sums( sum1v, zero );
-+    sum2v = (vec_u32_t) vec_sums( sum2v, zero );
-     
-     sum0v = vec_splat( sum0v, 3 );
-     sum1v = vec_splat( sum1v, 3 );
-@@ -934,10 +934,10 @@
-         
-     }
-     
--    sum0v = vec_sums( sum0v, zero );
--    sum1v = vec_sums( sum1v, zero );
--    sum2v = vec_sums( sum2v, zero );
--    sum3v = vec_sums( sum3v, zero );
-+    sum0v = (vec_u32_t) vec_sums( sum0v, zero );
-+    sum1v = (vec_u32_t) vec_sums( sum1v, zero );
-+    sum2v = (vec_u32_t) vec_sums( sum2v, zero );
-+    sum3v = (vec_u32_t) vec_sums( sum3v, zero );
-     
-     sum0v = vec_splat( sum0v, 3 );
-     sum1v = vec_splat( sum1v, 3 );
-@@ -1044,9 +1044,9 @@
-         
-     }
-     
--    sum0v = vec_sums( sum0v, zero );
--    sum1v = vec_sums( sum1v, zero );
--    sum2v = vec_sums( sum2v, zero );
-+    sum0v = (vec_u32_t) vec_sums( sum0v, zero );
-+    sum1v = (vec_u32_t) vec_sums( sum1v, zero );
-+    sum2v = (vec_u32_t) vec_sums( sum2v, zero );
-     
-     sum0v = vec_splat( sum0v, 3 );
-     sum1v = vec_splat( sum1v, 3 );
-@@ -1165,10 +1165,10 @@
-         sum3v = (vec_s32_t) vec_sum4s( vec_sub( vec_max( fencv, pix3v ), vec_min( fencv, pix3v ) ), (vec_u32_t) sum3v ); 
-     }
-     
--    sum0v = vec_sum2s( sum0v, zero );
--    sum1v = vec_sum2s( sum1v, zero );
--    sum2v = vec_sum2s( sum2v, zero );
--    sum3v = vec_sum2s( sum3v, zero );
-+    sum0v = (vec_u32_t) vec_sum2s( sum0v, zero );
-+    sum1v = (vec_u32_t) vec_sum2s( sum1v, zero );
-+    sum2v = (vec_u32_t) vec_sum2s( sum2v, zero );
-+    sum3v = (vec_u32_t) vec_sum2s( sum3v, zero );
-     
-     sum0v = vec_splat( sum0v, 1 );
-     sum1v = vec_splat( sum1v, 1 );
-@@ -1275,9 +1275,9 @@
-     }
-     
-     
--    sum0v = vec_sum2s( sum0v, zero );
--    sum1v = vec_sum2s( sum1v, zero );
--    sum2v = vec_sum2s( sum2v, zero );
-+    sum0v = (vec_u32_t) vec_sum2s( sum0v, zero );
-+    sum1v = (vec_u32_t) vec_sum2s( sum1v, zero );
-+    sum2v = (vec_u32_t) vec_sum2s( sum2v, zero );
-     
-     sum0v = vec_splat( sum0v, 1 );
-     sum1v = vec_splat( sum1v, 1 );
-@@ -1396,10 +1396,10 @@
-     }
-     
-     
--    sum0v = vec_sum2s( sum0v, zero );
--    sum1v = vec_sum2s( sum1v, zero );
--    sum2v = vec_sum2s( sum2v, zero );
--    sum3v = vec_sum2s( sum3v, zero );
-+    sum0v = (vec_u32_t) vec_sum2s( sum0v, zero );
-+    sum1v = (vec_u32_t) vec_sum2s( sum1v, zero );
-+    sum2v = (vec_u32_t) vec_sum2s( sum2v, zero );
-+    sum3v = (vec_u32_t) vec_sum2s( sum3v, zero );
-     
-     sum0v = vec_splat( sum0v, 1 );
-     sum1v = vec_splat( sum1v, 1 );
-@@ -1507,9 +1507,9 @@
-     }
-     
-     
--    sum0v = vec_sum2s( sum0v, zero );
--    sum1v = vec_sum2s( sum1v, zero );
--    sum2v = vec_sum2s( sum2v, zero );
-+    sum0v = (vec_u32_t) vec_sum2s( sum0v, zero );
-+    sum1v = (vec_u32_t) vec_sum2s( sum1v, zero );
-+    sum2v = (vec_u32_t) vec_sum2s( sum2v, zero );
-     
-     sum0v = vec_splat( sum0v, 1 );
-     sum1v = vec_splat( sum1v, 1 );

Deleted: videolan/vlc/debian/patches/030_x264_armv4l.diff
===================================================================
--- videolan/vlc/debian/patches/030_x264_armv4l.diff	2006-05-09 23:16:38 UTC (rev 30)
+++ videolan/vlc/debian/patches/030_x264_armv4l.diff	2006-05-10 00:11:22 UTC (rev 31)
@@ -1,13 +0,0 @@
-Index: vlc-0.8.5-test3.debian/extras/x264/configure
-===================================================================
---- vlc-0.8.5-test3.debian.orig/extras/x264/configure	2006-04-24 21:02:01.000000000 +0200
-+++ vlc-0.8.5-test3.debian/extras/x264/configure	2006-04-24 21:02:24.000000000 +0200
-@@ -166,7 +166,7 @@
-   m68k)
-     ARCH="M68K"
-     ;;
--  arm|armv5tel)
-+  arm|armv5tel|armv4l)
-     ARCH="ARM"
-     ;;
-   s390|s390x)

Modified: videolan/vlc/debian/patches/series
===================================================================
--- videolan/vlc/debian/patches/series	2006-05-09 23:16:38 UTC (rev 30)
+++ videolan/vlc/debian/patches/series	2006-05-10 00:11:22 UTC (rev 31)
@@ -1,5 +1,3 @@
 010_no-wx-updates.diff 
 010_osdmenu-paths.diff 
 020_freetype_font.diff
-030_x264_altivec.diff
-030_x264_armv4l.diff