r43 - in videolan/vlc/debian: . patches
xtophe-guest at alioth.debian.org
xtophe-guest at alioth.debian.org
Wed Mar 14 14:19:19 CET 2007
Author: xtophe-guest
Date: 2006-05-15 18:43:37 +0000 (Mon, 15 May 2006)
New Revision: 43
Added:
videolan/vlc/debian/patches/030_x264_ppc_asm.diff
Removed:
videolan/vlc/debian/vlc-plugin-alsa.dirs
videolan/vlc/debian/wxvlc.dirs
videolan/vlc/debian/wxvlc.menu
Modified:
videolan/vlc/debian/changelog
videolan/vlc/debian/control
videolan/vlc/debian/patches/series
videolan/vlc/debian/rules
Log:
Port [42]
Modified: videolan/vlc/debian/changelog
===================================================================
--- videolan/vlc/debian/changelog 2006-05-14 16:49:25 UTC (rev 42)
+++ videolan/vlc/debian/changelog 2006-05-15 18:43:37 UTC (rev 43)
@@ -1,3 +1,17 @@
+<<<<<<< .mine
+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:
@@ -6,10 +20,19 @@
-- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Tue, 25 Apr 2006 09:05:45 +0200
+=======
+vlc (0.8.5-test3.debian-3) unstable; urgency=low
+
+ * debian/control:
+ + Build-depend on libdvdread-dev (>= 0.9.5) because libdvdread3-dev just
+ disappeared (Closes: #364681).
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Tue, 25 Apr 2006 09:05:45 +0200
+
+>>>>>>> .r42
vlc (0.8.5-test3.debian-2) unstable; urgency=low
* debian/control:
- + Added missing libavc1394-dev build-dependency.
* debian/patches/030_x264_altivec.diff:
+ Fixed illegal implicit casts of vector types.
Modified: videolan/vlc/debian/control
===================================================================
--- videolan/vlc/debian/control 2006-05-14 16:49:25 UTC (rev 42)
+++ videolan/vlc/debian/control 2006-05-15 18:43:37 UTC (rev 43)
@@ -3,16 +3,16 @@
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, libshout3-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, libxosd-dev, zlib1g-dev, libavc1394-dev
-Standards-Version: 3.6.2
+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
Copied: videolan/vlc/debian/patches/030_x264_ppc_asm.diff (from rev 42, unstable/vlc/debian/patches/030_x264_ppc_asm.diff)
Modified: videolan/vlc/debian/patches/series
===================================================================
--- videolan/vlc/debian/patches/series 2006-05-14 16:49:25 UTC (rev 42)
+++ videolan/vlc/debian/patches/series 2006-05-15 18:43:37 UTC (rev 43)
@@ -1,3 +1,4 @@
010_no-wx-updates.diff
010_osdmenu-paths.diff
020_freetype_font.diff
+030_x264_ppc_asm.diff
Modified: videolan/vlc/debian/rules
===================================================================
--- videolan/vlc/debian/rules 2006-05-14 16:49:25 UTC (rev 42)
+++ videolan/vlc/debian/rules 2006-05-15 18:43:37 UTC (rev 43)
@@ -73,9 +73,9 @@
--enable-mpc \
--enable-vcd \
--enable-vcdx \
+ --enable-xosd \
$(NULL)
-
# 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
@@ -206,11 +206,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 \
@@ -251,15 +246,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
- mv debian/vlc/$(APPDIR)/vlc.desktop debian/wxvlc/$(APPDIR)
- rm -rf debian/vlc/$(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: videolan/vlc/debian/vlc-plugin-alsa.dirs
===================================================================
--- videolan/vlc/debian/vlc-plugin-alsa.dirs 2006-05-14 16:49:25 UTC (rev 42)
+++ videolan/vlc/debian/vlc-plugin-alsa.dirs 2006-05-15 18:43:37 UTC (rev 43)
@@ -1,2 +0,0 @@
-usr/lib/vlc/audio_output
-usr/share/doc
Deleted: videolan/vlc/debian/wxvlc.dirs
===================================================================
--- videolan/vlc/debian/wxvlc.dirs 2006-05-14 16:49:25 UTC (rev 42)
+++ videolan/vlc/debian/wxvlc.dirs 2006-05-15 18:43:37 UTC (rev 43)
@@ -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: videolan/vlc/debian/wxvlc.menu
===================================================================
--- videolan/vlc/debian/wxvlc.menu 2006-05-14 16:49:25 UTC (rev 42)
+++ videolan/vlc/debian/wxvlc.menu 2006-05-15 18:43:37 UTC (rev 43)
@@ -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