r42 - in unstable/vlc/debian: . patches
Sam Hocevar
sho at alioth.debian.org
Wed Mar 14 14:19:19 CET 2007
Author: sho
Date: 2006-05-14 16:49:25 +0000 (Sun, 14 May 2006)
New Revision: 42
Added:
unstable/vlc/debian/patches/030_x264_ppc_asm.diff
Removed:
unstable/vlc/debian/vlc-plugin-alsa.dirs
unstable/vlc/debian/wxvlc.dirs
unstable/vlc/debian/wxvlc.menu
Modified:
unstable/vlc/debian/changelog
unstable/vlc/debian/control
unstable/vlc/debian/patches/series
unstable/vlc/debian/rules
Log:
vlc (0.8.5-test3.debian-4) UNRELEASED; urgency=low
* debian/control:
+ Merged wxvlc and vlc-plugin-alsa into vlc to get rid of circular
dependencies (Closes: #365816).
+ Set policy to 3.7.2.
+ libxosd-dev is installable again; build-depend on it (Closes: #364937).
* debian/patches/030_x264_ppc_asm.diff:
+ Fix PPC assembly compilation issues in x264 (Closes: #366965).
Modified: unstable/vlc/debian/changelog
===================================================================
--- unstable/vlc/debian/changelog 2006-05-14 00:54:01 UTC (rev 41)
+++ unstable/vlc/debian/changelog 2006-05-14 16:49:25 UTC (rev 42)
@@ -1,3 +1,16 @@
+vlc (0.8.5-test3.debian-4) UNRELEASED; urgency=low
+
+ * debian/control:
+ + Merged wxvlc and vlc-plugin-alsa into vlc to get rid of circular
+ dependencies (Closes: #365816).
+ + Set policy to 3.7.2.
+ + libxosd-dev is installable again; build-depend on it (Closes: #364937).
+
+ * debian/patches/030_x264_ppc_asm.diff:
+ + Fix PPC assembly compilation issues in x264 (Closes: #366965).
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Sun, 14 May 2006 00:54:51 -0500
+
vlc (0.8.5-test3.debian-3) unstable; urgency=low
* debian/control:
Modified: unstable/vlc/debian/control
===================================================================
--- unstable/vlc/debian/control 2006-05-14 00:54:01 UTC (rev 41)
+++ unstable/vlc/debian/control 2006-05-14 16:49:25 UTC (rev 42)
@@ -2,17 +2,17 @@
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, libdvdread-dev (>= 0.9.5), 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
+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, libdvdread-dev (>= 0.9.5), 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, libxosd-dev
+Standards-Version: 3.7.2
Package: vlc
Section: graphics
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, wxvlc, vlc-plugin-alsa
+Depends: ${shlibs:Depends}, ${misc:Depends}
Recommends: ttf-freefont, videolan-doc
Suggests: mozilla-plugin-vlc
-Replaces: vlc-plugin-dvb (<< 0.5.2-2), vlc-plugin-xosd (<< 0.5.2-2), vlc-plugin-dv (<< 0.5.2-2), vlc-plugin-mad (<< 0.5.2-2), vlc-mad (<< 0.5.0), vlc-plugin-a52 (<< 0.5.2-2), vlc-plugin-ogg (<< 0.5.2-2), vlc-plugin-lirc (<< 0.5.2-2), vlc-lirc (<< 0.5.0), vlc-plugin-aa (<< 0.5.2-2), vlc-aa (<< 0.5.0)
-Conflicts: vlc-plugin-dvb (<< 0.5.2-2), vlc-plugin-xosd (<< 0.5.2-2), vlc-plugin-dv (<< 0.5.2-2), vlc-plugin-mad (<< 0.5.2-2), vlc-mad (<< 0.5.0), vlc-plugin-a52 (<< 0.5.2-2), vlc-plugin-ogg (<< 0.5.2-2), vlc-plugin-lirc (<< 0.5.2-2), vlc-lirc (<< 0.5.0), vlc-plugin-aa (<< 0.5.2-2), vlc-aa (<< 0.5.0)
+Replaces: vlc-plugin-dvb (<< 0.5.2-2), vlc-plugin-xosd (<< 0.5.2-2), vlc-plugin-dv (<< 0.5.2-2), vlc-plugin-mad (<< 0.5.2-2), vlc-mad (<< 0.5.0), vlc-plugin-a52 (<< 0.5.2-2), vlc-plugin-ogg (<< 0.5.2-2), vlc-plugin-lirc (<< 0.5.2-2), vlc-lirc (<< 0.5.0), vlc-plugin-aa (<< 0.5.2-2), vlc-aa (<< 0.5.0), wxvlc (<< 0.8.5-test3.debian-4), vlc-plugin-alsa (<< 0.8.5-test3.debian-4)
+Conflicts: vlc-plugin-dvb (<< 0.5.2-2), vlc-plugin-xosd (<< 0.5.2-2), vlc-plugin-dv (<< 0.5.2-2), vlc-plugin-mad (<< 0.5.2-2), vlc-mad (<< 0.5.0), vlc-plugin-a52 (<< 0.5.2-2), vlc-plugin-ogg (<< 0.5.2-2), vlc-plugin-lirc (<< 0.5.2-2), vlc-lirc (<< 0.5.0), vlc-plugin-aa (<< 0.5.2-2), vlc-aa (<< 0.5.0), wxvlc (<< 0.8.5-test3.debian-4), vlc-plugin-alsa (<< 0.8.5-test3.debian-4)
Provides: mp3-decoder
Description: multimedia player for all audio and video formats
VLC is the VideoLAN project's media player. It plays MPEG, MPEG2, MPEG4,
@@ -26,7 +26,7 @@
VLC has support for on-the-fly transcoding of audio and video formats, either
for broadcasting purposes or for movie format transformations. Support for
most output methods is provided by this package, but features can be added
- by installing additional audio plugins (vlc-plugin-esd, vlc-plugin-alsa,
+ by installing additional audio plugins (vlc-plugin-esd, vlc-plugin-sdl,
vlc-plugin-arts) or video plugins (vlc-plugin-sdl, vlc-plugin-ggi,
vlc-plugin-glide, vlc-plugin-svgalib). There is also a web browser plugin
in the mozilla-plugin-vlc package.
@@ -58,14 +58,10 @@
streams from various network sources.
Package: vlc-plugin-alsa
-Architecture: any
-Depends: vlc (= ${Source-Version}), ${shlibs:Depends}, ${misc:Depends}
-Conflicts: vlc-alsa (<< 0.5.0)
-Replaces: vlc-alsa (<< 0.5.0)
-Description: ALSA audio output plugin for VLC
- This plugin adds support for the Advanced Linux Sound Architecture to
- the VLC media player. To activate it, use the `--aout alsa' flag or
- select the `alsa' audio output plugin from the preferences menu.
+Architecture: all
+Depends: vlc
+Description: dummy transitional package
+ This dummy package is now part of VLC.
.
VLC is the VideoLAN project's media player. It plays MPEG, MPEG2, MPEG4,
DivX, MOV, WMV, QuickTime, mp3, Ogg/Vorbis files, DVDs, VCDs, and multimedia
@@ -156,11 +152,10 @@
streams from various network sources.
Package: wxvlc
-Architecture: any
-Depends: vlc (= ${Source-Version}), ${shlibs:Depends}, ${misc:Depends}
-Description: wxWidgets frontend for VLC
- This plugin adds a wxWidgets interface to the VLC media player. To activate
- the wxWidgets GUI, use the `--intf wx' flag or run the `wxvlc' program.
+Architecture: all
+Depends: vlc
+Description: dummy transitional package
+ This dummy package is now part of VLC.
.
VLC is the VideoLAN project's media player. It plays MPEG, MPEG2, MPEG4,
DivX, MOV, WMV, QuickTime, mp3, Ogg/Vorbis files, DVDs, VCDs, and multimedia
Added: unstable/vlc/debian/patches/030_x264_ppc_asm.diff
===================================================================
--- unstable/vlc/debian/patches/030_x264_ppc_asm.diff 2006-05-14 00:54:01 UTC (rev 41)
+++ unstable/vlc/debian/patches/030_x264_ppc_asm.diff 2006-05-14 16:49:25 UTC (rev 42)
@@ -0,0 +1,337 @@
+Index: debian/official/pkg-multimedia/unstable/build-area/vlc-0.8.5-test3.debian/extras/x264/common/ppc/pixel.c
+===================================================================
+--- debian.orig/official/pkg-multimedia/unstable/build-area/vlc-0.8.5-test3.debian/extras/x264/common/ppc/pixel.c 2006-05-14 09:08:09.000000000 +0200
++++ debian/official/pkg-multimedia/unstable/build-area/vlc-0.8.5-test3.debian/extras/x264/common/ppc/pixel.c 2006-05-14 09:09:35.000000000 +0200
+@@ -610,19 +610,18 @@
+ DECLARE_ALIGNED( int, sum3, 16 );
+ int y;
+
++ LOAD_ZERO;
+ vec_u8_t temp_lv, temp_hv;
+ vec_u8_t fencv, pix0v, pix1v, pix2v, pix3v;
+ //vec_u8_t perm0v, perm1v, perm2v, perm3v;
+ vec_u8_t perm0vA, perm1vA, perm2vA, perm3vA, perm0vB, perm1vB, perm2vB, perm3vB;
+
+- vec_u32_t sum0v, sum1v, sum2v, sum3v;
+- vec_s32_t zero;
++ vec_s32_t sum0v, sum1v, sum2v, sum3v;
+
+- zero = vec_splat_s32(0);
+- sum0v = vec_splat_u32(0);
+- sum1v = vec_splat_u32(0);
+- sum2v = vec_splat_u32(0);
+- sum3v = vec_splat_u32(0);
++ sum0v = vec_splat_s32(0);
++ sum1v = vec_splat_s32(0);
++ sum2v = vec_splat_s32(0);
++ sum3v = vec_splat_s32(0);
+
+ perm0vA = vec_lvsl(0, pix0);
+ perm1vA = vec_lvsl(0, pix1);
+@@ -704,10 +703,10 @@
+
+ }
+
+- 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_sums( sum0v, zero_s32v );
++ sum1v = vec_sums( sum1v, zero_s32v );
++ sum2v = vec_sums( sum2v, zero_s32v );
++ sum3v = vec_sums( sum3v, zero_s32v );
+
+ sum0v = vec_splat( sum0v, 3 );
+ sum1v = vec_splat( sum1v, 3 );
+@@ -736,17 +735,16 @@
+ DECLARE_ALIGNED( int, sum2, 16 );
+ int y;
+
++ LOAD_ZERO;
+ vec_u8_t temp_lv, temp_hv; // temporary load vectors
+ vec_u8_t fencv, pix0v, pix1v, pix2v;
+ vec_u8_t perm0vA, perm1vA, perm2vA, perm0vB, perm1vB, perm2vB;
+
+- vec_u32_t sum0v, sum1v, sum2v;
+- vec_s32_t zero;
++ vec_s32_t sum0v, sum1v, sum2v;
+
+- zero = vec_splat_s32(0);
+- sum0v = vec_splat_u32(0);
+- sum1v = vec_splat_u32(0);
+- sum2v = vec_splat_u32(0);
++ sum0v = vec_splat_s32(0);
++ sum1v = vec_splat_s32(0);
++ sum2v = vec_splat_s32(0);
+
+ perm0vA = vec_lvsl(0, pix0);
+ perm1vA = vec_lvsl(0, pix1);
+@@ -814,9 +812,9 @@
+
+ }
+
+- 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_sums( sum0v, zero_s32v );
++ sum1v = vec_sums( sum1v, zero_s32v );
++ sum2v = vec_sums( sum2v, zero_s32v );
+
+ sum0v = vec_splat( sum0v, 3 );
+ sum1v = vec_splat( sum1v, 3 );
+@@ -840,18 +838,17 @@
+ DECLARE_ALIGNED( int, sum3, 16 );
+ int y;
+
++ LOAD_ZERO;
+ vec_u8_t temp_lv, temp_hv;
+ vec_u8_t fencv, pix0v, pix1v, pix2v, pix3v;
+ vec_u8_t perm0vA, perm1vA, perm2vA, perm3vA, perm0vB, perm1vB, perm2vB, perm3vB;
+
+- vec_u32_t sum0v, sum1v, sum2v, sum3v;
+- vec_s32_t zero;
++ vec_s32_t sum0v, sum1v, sum2v, sum3v;
+
+- zero = vec_splat_s32(0);
+- sum0v = vec_splat_u32(0);
+- sum1v = vec_splat_u32(0);
+- sum2v = vec_splat_u32(0);
+- sum3v = vec_splat_u32(0);
++ sum0v = vec_splat_s32(0);
++ sum1v = vec_splat_s32(0);
++ sum2v = vec_splat_s32(0);
++ sum3v = vec_splat_s32(0);
+
+ perm0vA = vec_lvsl(0, pix0);
+ perm1vA = vec_lvsl(0, pix1);
+@@ -934,10 +931,10 @@
+
+ }
+
+- 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_sums( sum0v, zero_s32v );
++ sum1v = vec_sums( sum1v, zero_s32v );
++ sum2v = vec_sums( sum2v, zero_s32v );
++ sum3v = vec_sums( sum3v, zero_s32v );
+
+ sum0v = vec_splat( sum0v, 3 );
+ sum1v = vec_splat( sum1v, 3 );
+@@ -966,17 +963,16 @@
+ DECLARE_ALIGNED( int, sum2, 16 );
+ int y;
+
++ LOAD_ZERO;
+ vec_u8_t temp_lv, temp_hv;
+ vec_u8_t fencv, pix0v, pix1v, pix2v;
+ vec_u8_t perm0vA, perm1vA, perm2vA, perm0vB, perm1vB, perm2vB;
+
+- vec_u32_t sum0v, sum1v, sum2v;
+- vec_s32_t zero;
++ vec_s32_t sum0v, sum1v, sum2v;
+
+- zero = vec_splat_s32(0);
+- sum0v = vec_splat_u32(0);
+- sum1v = vec_splat_u32(0);
+- sum2v = vec_splat_u32(0);
++ sum0v = vec_splat_s32(0);
++ sum1v = vec_splat_s32(0);
++ sum2v = vec_splat_s32(0);
+
+
+ perm0vA = vec_lvsl(0, pix0);
+@@ -1044,9 +1040,9 @@
+
+ }
+
+- 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_sums( sum0v, zero_s32v );
++ sum1v = vec_sums( sum1v, zero_s32v );
++ sum2v = vec_sums( sum2v, zero_s32v );
+
+ sum0v = vec_splat( sum0v, 3 );
+ sum1v = vec_splat( sum1v, 3 );
+@@ -1071,18 +1067,17 @@
+ DECLARE_ALIGNED( int, sum3, 16 );
+ int y;
+
++ LOAD_ZERO;
+ vec_u8_t temp_lv, temp_hv;
+ vec_u8_t fencv, pix0v, pix1v, pix2v, pix3v;
+ vec_u8_t perm0vA, perm1vA, perm2vA, perm3vA, perm0vB, perm1vB, perm2vB, perm3vB, permEncv;
+
+- vec_u32_t sum0v, sum1v, sum2v, sum3v;
+- vec_s32_t zero;
++ vec_s32_t sum0v, sum1v, sum2v, sum3v;
+
+- zero = vec_splat_s32(0);
+- sum0v = vec_splat_u32(0);
+- sum1v = vec_splat_u32(0);
+- sum2v = vec_splat_u32(0);
+- sum3v = vec_splat_u32(0);
++ sum0v = vec_splat_s32(0);
++ sum1v = vec_splat_s32(0);
++ sum2v = vec_splat_s32(0);
++ sum3v = vec_splat_s32(0);
+
+ permEncv = vec_lvsl(0, fenc);
+ perm0vA = vec_lvsl(0, pix0);
+@@ -1165,10 +1160,10 @@
+ sum3v = (vec_s32_t) vec_sum4s( vec_sub( vec_max( fencv, pix3v ), vec_min( fencv, pix3v ) ), (vec_u32_t) sum3v );
+ }
+
+- 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_sum2s( sum0v, zero_s32v );
++ sum1v = vec_sum2s( sum1v, zero_s32v );
++ sum2v = vec_sum2s( sum2v, zero_s32v );
++ sum3v = vec_sum2s( sum3v, zero_s32v );
+
+ sum0v = vec_splat( sum0v, 1 );
+ sum1v = vec_splat( sum1v, 1 );
+@@ -1194,17 +1189,16 @@
+ DECLARE_ALIGNED( int, sum2, 16 );
+ int y;
+
++ LOAD_ZERO;
+ vec_u8_t temp_lv, temp_hv;
+ vec_u8_t fencv, pix0v, pix1v, pix2v;
+ vec_u8_t perm0vA, perm1vA, perm2vA, perm0vB, perm1vB, perm2vB,permEncv;
+
+- vec_u32_t sum0v, sum1v, sum2v;
+- vec_s32_t zero;
++ vec_s32_t sum0v, sum1v, sum2v;
+
+- zero = vec_splat_s32(0);
+- sum0v = vec_splat_u32(0);
+- sum1v = vec_splat_u32(0);
+- sum2v = vec_splat_u32(0);
++ sum0v = vec_splat_s32(0);
++ sum1v = vec_splat_s32(0);
++ sum2v = vec_splat_s32(0);
+
+ permEncv = vec_lvsl(0, fenc);
+ perm0vA = vec_lvsl(0, pix0);
+@@ -1275,9 +1269,9 @@
+ }
+
+
+- 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_sum2s( sum0v, zero_s32v );
++ sum1v = vec_sum2s( sum1v, zero_s32v );
++ sum2v = vec_sum2s( sum2v, zero_s32v );
+
+ sum0v = vec_splat( sum0v, 1 );
+ sum1v = vec_splat( sum1v, 1 );
+@@ -1301,18 +1295,17 @@
+ DECLARE_ALIGNED( int, sum3, 16 );
+ int y;
+
++ LOAD_ZERO;
+ vec_u8_t temp_lv, temp_hv;
+ vec_u8_t fencv, pix0v, pix1v, pix2v, pix3v;
+ vec_u8_t perm0vA, perm1vA, perm2vA, perm3vA, perm0vB, perm1vB, perm2vB, perm3vB, permEncv;
+
+- vec_u32_t sum0v, sum1v, sum2v, sum3v;
+- vec_s32_t zero;
++ vec_s32_t sum0v, sum1v, sum2v, sum3v;
+
+- zero = vec_splat_s32(0);
+- sum0v = vec_splat_u32(0);
+- sum1v = vec_splat_u32(0);
+- sum2v = vec_splat_u32(0);
+- sum3v = vec_splat_u32(0);
++ sum0v = vec_splat_s32(0);
++ sum1v = vec_splat_s32(0);
++ sum2v = vec_splat_s32(0);
++ sum3v = vec_splat_s32(0);
+
+ permEncv = vec_lvsl(0, fenc);
+ perm0vA = vec_lvsl(0, pix0);
+@@ -1396,10 +1389,10 @@
+ }
+
+
+- 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_sum2s( sum0v, zero_s32v );
++ sum1v = vec_sum2s( sum1v, zero_s32v );
++ sum2v = vec_sum2s( sum2v, zero_s32v );
++ sum3v = vec_sum2s( sum3v, zero_s32v );
+
+ sum0v = vec_splat( sum0v, 1 );
+ sum1v = vec_splat( sum1v, 1 );
+@@ -1426,17 +1419,16 @@
+ DECLARE_ALIGNED( int, sum2, 16 );
+ int y;
+
++ LOAD_ZERO;
+ vec_u8_t temp_lv, temp_hv;
+ vec_u8_t fencv, pix0v, pix1v, pix2v;
+ vec_u8_t perm0vA, perm1vA, perm2vA, perm0vB, perm1vB, perm2vB, permEncv;
+
+- vec_u32_t sum0v, sum1v, sum2v;
+- vec_s32_t zero;
++ vec_s32_t sum0v, sum1v, sum2v;
+
+- zero = vec_splat_s32(0);
+- sum0v = vec_splat_u32(0);
+- sum1v = vec_splat_u32(0);
+- sum2v = vec_splat_u32(0);
++ sum0v = vec_splat_s32(0);
++ sum1v = vec_splat_s32(0);
++ sum2v = vec_splat_s32(0);
+
+ permEncv = vec_lvsl(0, fenc);
+ perm0vA = vec_lvsl(0, pix0);
+@@ -1507,9 +1499,9 @@
+ }
+
+
+- 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_sum2s( sum0v, zero_s32v );
++ sum1v = vec_sum2s( sum1v, zero_s32v );
++ sum2v = vec_sum2s( sum2v, zero_s32v );
+
+ sum0v = vec_splat( sum0v, 1 );
+ sum1v = vec_splat( sum1v, 1 );
+@@ -1534,14 +1526,13 @@
+ DECLARE_ALIGNED( int, sum, 16 );
+
+ int y;
++ LOAD_ZERO;
+ vec_u8_t pix1vA, pix2vA, pix1vB, pix2vB;
+ vec_u32_t sumv;
+- vec_s32_t zero;
+ vec_u8_t maxA, minA, diffA, maxB, minB, diffB;
+ vec_u8_t temp_lv, temp_hv;
+ vec_u8_t permA, permB;
+
+- zero = vec_splat_s32(0);
+ sumv = vec_splat_u32(0);
+
+ permA = vec_lvsl(0, pix2);
+@@ -1607,9 +1598,9 @@
+ diffB = vec_sub(maxB, minB);
+ sumv = vec_msum(diffB, diffB, sumv);
+
+- sumv = vec_sums(sumv, zero);
++ sumv = (vec_u32_t) vec_sums((vec_s32_t) sumv, zero_s32v);
+ sumv = vec_splat(sumv, 3);
+- vec_ste( sumv, 0, &sum);
++ vec_ste((vec_s32_t) sumv, 0, &sum);
+ return sum;
+ }
+
Modified: unstable/vlc/debian/patches/series
===================================================================
--- unstable/vlc/debian/patches/series 2006-05-14 00:54:01 UTC (rev 41)
+++ unstable/vlc/debian/patches/series 2006-05-14 16:49:25 UTC (rev 42)
@@ -4,3 +4,4 @@
020_freetype_font.diff
030_x264_altivec.diff
030_x264_armv4l.diff
+030_x264_ppc_asm.diff
Modified: unstable/vlc/debian/rules
===================================================================
--- unstable/vlc/debian/rules 2006-05-14 00:54:01 UTC (rev 41)
+++ unstable/vlc/debian/rules 2006-05-14 16:49:25 UTC (rev 42)
@@ -71,10 +71,9 @@
--enable-mpc \
--enable-vcd \
--enable-vcdx \
+ --enable-xosd \
$(NULL)
-# --enable-xosd \
-
# These ones are currently shipped with VLC
vlc_confflags += --enable-faad --with-faad-tree=extras/faad2
vlc_confflags += --enable-x264 --with-x264-tree=extras/x264
@@ -205,11 +204,6 @@
mv debian/vlc/usr/lib/vlc/audio_output/libesd_plugin.so \
debian/vlc-plugin-esd/usr/lib/vlc/audio_output/
- # Package: vlc-plugin-alsa
- ln -s vlc debian/vlc-plugin-alsa/usr/share/doc/vlc-plugin-alsa
- mv debian/vlc/usr/lib/vlc/audio_output/libalsa_plugin.so \
- debian/vlc-plugin-alsa/usr/lib/vlc/audio_output/
-
# Package: vlc-plugin-sdl
ln -s vlc debian/vlc-plugin-sdl/usr/share/doc/vlc-plugin-sdl
mv debian/vlc/usr/lib/vlc/audio_output/libaout_sdl_plugin.so \
@@ -250,14 +244,8 @@
debian/vlc-plugin-svgalib/usr/lib/vlc/video_output
endif
- # Package: wxvlc
- mv debian/vlc/usr/bin/wxvlc debian/wxvlc/usr/bin/
- ln -s vlc debian/wxvlc/usr/share/doc/wxvlc
- cp debian/vlc/$(VIDDIR)/vlc.xpm debian/wxvlc/$(VIDDIR)/wxvlc.xpm
- cp debian/vlc.desktop debian/wxvlc/$(APPDIR)
- mv debian/vlc/usr/lib/vlc/gui/libwxwidgets_plugin.so \
- debian/wxvlc/usr/lib/vlc/gui/
- ln -s vlc.1.gz debian/wxvlc/usr/share/man/man1/wxvlc.1.gz
+ cp debian/vlc/$(VIDDIR)/vlc.xpm debian/vlc/$(VIDDIR)/wxvlc.xpm
+ ln -s vlc.1.gz debian/vlc/usr/share/man/man1/wxvlc.1.gz
# Clean up
rm -f debian/vlc/$(VIDDIR)/*.png
Deleted: unstable/vlc/debian/vlc-plugin-alsa.dirs
===================================================================
--- unstable/vlc/debian/vlc-plugin-alsa.dirs 2006-05-14 00:54:01 UTC (rev 41)
+++ unstable/vlc/debian/vlc-plugin-alsa.dirs 2006-05-14 16:49:25 UTC (rev 42)
@@ -1,2 +0,0 @@
-usr/lib/vlc/audio_output
-usr/share/doc
Deleted: unstable/vlc/debian/wxvlc.dirs
===================================================================
--- unstable/vlc/debian/wxvlc.dirs 2006-05-14 00:54:01 UTC (rev 41)
+++ unstable/vlc/debian/wxvlc.dirs 2006-05-14 16:49:25 UTC (rev 42)
@@ -1,7 +0,0 @@
-usr/bin
-usr/lib/vlc/gui
-usr/share/doc
-usr/share/man/man1
-usr/share/pixmaps
-usr/share/vlc
-usr/share/applications
Deleted: unstable/vlc/debian/wxvlc.menu
===================================================================
--- unstable/vlc/debian/wxvlc.menu 2006-05-14 00:54:01 UTC (rev 41)
+++ unstable/vlc/debian/wxvlc.menu 2006-05-14 16:49:25 UTC (rev 42)
@@ -1,3 +0,0 @@
-?package(wxvlc):command="/usr/bin/wxvlc" hotkey="V" needs="X11" \
- section="Apps/Viewers" title="VLC media player" \
- icon="/usr/share/vlc/wxvlc.xpm" hints="Video"
More information about the Pkg-multimedia-commits
mailing list