r26 - in unstable/vlc/debian: . patches
Sam Hocevar
sho at alioth.debian.org
Wed Mar 14 14:19:08 CET 2007
Author: sho
Date: 2006-04-24 20:04:50 +0000 (Mon, 24 Apr 2006)
New Revision: 26
Added:
unstable/vlc/debian/patches/020_freetype_font.diff
unstable/vlc/debian/patches/030_x264_altivec.diff
unstable/vlc/debian/patches/030_x264_armv4l.diff
Removed:
unstable/vlc/debian/patches/020_freetype_font
Modified:
unstable/vlc/debian/changelog
unstable/vlc/debian/control
unstable/vlc/debian/patches/series
Log:
vlc (0.8.5-test3.debian-1) unstable; urgency=low
* debian/control:
+ Added missing libavc1394-dev build-dependency.
* debian/patches/030_x264_altivec.diff:
+ Fixed illegal implicit casts of vector types.
* debian/patches/030_x264_armvl.diff:
+ Added support for the armv4l CPU.
Modified: unstable/vlc/debian/changelog
===================================================================
--- unstable/vlc/debian/changelog 2006-04-24 17:07:50 UTC (rev 25)
+++ unstable/vlc/debian/changelog 2006-04-24 20:04:50 UTC (rev 26)
@@ -1,5 +1,18 @@
vlc (0.8.5-test3.debian-1) unstable; urgency=low
+ * debian/control:
+ + Added missing libavc1394-dev build-dependency.
+
+ * debian/patches/030_x264_altivec.diff:
+ + Fixed illegal implicit casts of vector types.
+
+ * debian/patches/030_x264_armvl.diff:
+ + Added support for the armv4l CPU.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Mon, 24 Apr 2006 20:45:16 +0200
+
+vlc (0.8.5-test3.debian-1) unstable; urgency=low
+
* New upstream release.
* Upstream fixed many bugs:
Modified: unstable/vlc/debian/control
===================================================================
--- unstable/vlc/debian/control 2006-04-24 17:07:50 UTC (rev 25)
+++ unstable/vlc/debian/control 2006-04-24 20:04:50 UTC (rev 26)
@@ -2,7 +2,7 @@
Section: graphics
Priority: optional
Maintainer: Sam Hocevar (Debian packages) <sam+deb at zoy.org>
-Build-Depends: debhelper (>= 4.0), dh-buildinfo, quilt, nasm, yasm [amd64], gettext, linux-kernel-headers (>= 2.5.999-test7-bk-7), xulrunner, libxul-dev, xlibmesa-gl-dev, liba52-0.7.4-dev, libaa1-dev, libarts1-dev (>= 1.4.2-1), libasound2-dev (>= 0.9.0beta10a), libaudiofile-dev, libavahi-client-dev, libavcodec-dev (>= 0.cvs20060329-4), libavformat-dev (>= 0.cvs20060329-4), libcaca-dev (>= 0.9), libcdio-dev, libdvbpsi4-dev, libdvdnav-dev, libdvdread3-dev, libdts-dev, libesd0-dev, libflac-dev (>= 1.1.2-3), libfreetype6-dev, libfribidi-dev, libggi2-dev, libglib2.0-0, libglide2-dev [i386], libgnutls-dev (>= 1.2.8), libhal-dev (>= 0.5.5.1-3), libid3tag0-dev, libidl0, libimlib2-dev, liblircclient-dev, liblivemedia-dev (>= 2006.03.17), libmad0-dev, libmatroska-dev (>= 0.8.0), libmodplug-dev, libmpcdec-dev, libmpeg2-4-dev, libncurses5-dev, libogg-dev, libpostproc-dev (>= 0.cvs20060329-4), libpng12-dev, libsdl1.2-dev (>= 1.2.7+1.2.8cvs20041007-5.3), libsmbclient-dev, libsvga1-dev [i386], libsysfs-dev, libtar-dev, libtheora-dev, libvcdinfo-dev, libvorbis-dev, libwxgtk2.6-dev, libx11-dev, libxext-dev, libxml2-dev, libxt-dev, libxv-dev, zlib1g-dev
+Build-Depends: debhelper (>= 4.0), dh-buildinfo, quilt, nasm, yasm [amd64], gettext, linux-kernel-headers (>= 2.5.999-test7-bk-7), xulrunner, libxul-dev, xlibmesa-gl-dev, liba52-0.7.4-dev, libaa1-dev, libarts1-dev (>= 1.4.2-1), libasound2-dev (>= 0.9.0beta10a), libaudiofile-dev, libavahi-client-dev, libavcodec-dev (>= 0.cvs20060329-4), libavformat-dev (>= 0.cvs20060329-4), libcaca-dev (>= 0.9), libcdio-dev, libdvbpsi4-dev, libdvdnav-dev, libdvdread3-dev, libdts-dev, libesd0-dev, libflac-dev (>= 1.1.2-3), libfreetype6-dev, libfribidi-dev, libggi2-dev, libglib2.0-0, libglide2-dev [i386], libgnutls-dev (>= 1.2.8), libhal-dev (>= 0.5.5.1-3), libid3tag0-dev, libidl0, libimlib2-dev, liblircclient-dev, liblivemedia-dev (>= 2006.03.17), libmad0-dev, libmatroska-dev (>= 0.8.0), libmodplug-dev, libmpcdec-dev, libmpeg2-4-dev, libncurses5-dev, libogg-dev, libpostproc-dev (>= 0.cvs20060329-4), libpng12-dev, libsdl1.2-dev (>= 1.2.7+1.2.8cvs20041007-5.3), libsmbclient-dev, libsvga1-dev [i386], libsysfs-dev, libtar-dev, libtheora-dev, libvcdinfo-dev, libvorbis-dev, libwxgtk2.6-dev, libx11-dev, libxext-dev, libxml2-dev, libxt-dev, libxv-dev, zlib1g-dev, libavc1394-dev
Standards-Version: 3.6.2
Package: vlc
Deleted: unstable/vlc/debian/patches/020_freetype_font
===================================================================
--- unstable/vlc/debian/patches/020_freetype_font 2006-04-24 17:07:50 UTC (rev 25)
+++ unstable/vlc/debian/patches/020_freetype_font 2006-04-24 20:04:50 UTC (rev 26)
@@ -1,13 +0,0 @@
-Index: vlc-0.8.5-test3.debian/modules/misc/freetype.c
-===================================================================
---- vlc-0.8.5-test3.debian.orig/modules/misc/freetype.c 2006-04-24 18:20:14.000000000 +0200
-+++ vlc-0.8.5-test3.debian/modules/misc/freetype.c 2006-04-24 18:20:21.000000000 +0200
-@@ -55,7 +55,7 @@
- #elif defined( WIN32 )
- #define DEFAULT_FONT "" /* Default font found at run-time */
- #else
--#define DEFAULT_FONT "/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf"
-+#define DEFAULT_FONT ""
- #endif
-
- #if defined(HAVE_FRIBIDI)
Copied: unstable/vlc/debian/patches/020_freetype_font.diff (from rev 25, unstable/vlc/debian/patches/020_freetype_font)
Added: unstable/vlc/debian/patches/030_x264_altivec.diff
===================================================================
--- unstable/vlc/debian/patches/030_x264_altivec.diff 2006-04-24 17:07:50 UTC (rev 25)
+++ unstable/vlc/debian/patches/030_x264_altivec.diff 2006-04-24 20:04:50 UTC (rev 26)
@@ -0,0 +1,116 @@
+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 );
Added: unstable/vlc/debian/patches/030_x264_armv4l.diff
===================================================================
--- unstable/vlc/debian/patches/030_x264_armv4l.diff 2006-04-24 17:07:50 UTC (rev 25)
+++ unstable/vlc/debian/patches/030_x264_armv4l.diff 2006-04-24 20:04:50 UTC (rev 26)
@@ -0,0 +1,13 @@
+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: unstable/vlc/debian/patches/series
===================================================================
--- unstable/vlc/debian/patches/series 2006-04-24 17:07:50 UTC (rev 25)
+++ unstable/vlc/debian/patches/series 2006-04-24 20:04:50 UTC (rev 26)
@@ -1,4 +1,6 @@
010_no-wx-updates.diff
010_osdmenu-paths.diff
020_xulrunner.diff
-020_freetype_font
+020_freetype_font.diff
+030_x264_altivec.diff
+030_x264_armv4l.diff
More information about the Pkg-multimedia-commits
mailing list