--- vlc-0.8.6.h.orig/.pc/.version +++ vlc-0.8.6.h/.pc/.version @@ -0,0 +1 @@ +2 --- vlc-0.8.6.h.orig/debian/vlc-plugin-jack.links +++ vlc-0.8.6.h/debian/vlc-plugin-jack.links @@ -0,0 +1,2 @@ +usr/share/doc/vlc-nox usr/share/doc/vlc-plugin-jack +usr/share/bug/vlc-nox usr/share/bug/vlc-plugin-jack --- vlc-0.8.6.h.orig/debian/vlc-nox.install.kfreebsd-i386 +++ vlc-0.8.6.h/debian/vlc-nox.install.kfreebsd-i386 @@ -0,0 +1,66 @@ +usr/bin/vlc +usr/share/doc +usr/share/locale +usr/share/vlc/http +usr/share/vlc/osdmenu +usr/lib/vlc/access/libvcd_plugin.so +usr/lib/vlc/access/libvcdx_plugin.so +usr/lib/vlc/access/libaccess_*.so +usr/lib/vlc/access/libdvdnav_plugin.so +usr/lib/vlc/access/libdvdread_plugin.so +usr/lib/vlc/access/libcdda_plugin.so +usr/lib/vlc/access_filter +usr/lib/vlc/access_output +usr/lib/vlc/audio_filter +usr/lib/vlc/audio_mixer +usr/lib/vlc/audio_output/libaout_file_plugin.so +usr/lib/vlc/audio_output/liboss_plugin.so +usr/lib/vlc/codec/libcmml_plugin.so +usr/lib/vlc/codec/libffmpeg_plugin.so +usr/lib/vlc/codec/libspudec_plugin.so +usr/lib/vlc/codec/liba52_plugin.so +usr/lib/vlc/codec/libcinepak_plugin.so +usr/lib/vlc/codec/libdts_plugin.so +usr/lib/vlc/codec/libflacdec_plugin.so +usr/lib/vlc/codec/liblpcm_plugin.so +usr/lib/vlc/codec/libaraw_plugin.so +usr/lib/vlc/codec/libvorbis_plugin.so +usr/lib/vlc/codec/libspeex_plugin.so +usr/lib/vlc/codec/libadpcm_plugin.so +usr/lib/vlc/codec/libmpeg_audio_plugin.so +usr/lib/vlc/codec/liblibmpeg2_plugin.so +usr/lib/vlc/codec/librawvideo_plugin.so +usr/lib/vlc/codec/libsubsdec_plugin.so +usr/lib/vlc/codec/libdvbsub_plugin.so +usr/lib/vlc/codec/libtwolame_plugin.so +usr/lib/vlc/codec/libpng_plugin.so +usr/lib/vlc/codec/libsvcdsub_plugin.so +usr/lib/vlc/codec/libtelx_plugin.so +usr/lib/vlc/codec/libcvdsub_plugin.so +usr/lib/vlc/codec/libfake_plugin.so +usr/lib/vlc/codec/libfaad_plugin.so +usr/lib/vlc/codec/libtelx_plugin.so +usr/lib/vlc/control +usr/lib/vlc/demux +usr/lib/vlc/gui/libncurses_plugin.so +usr/lib/vlc/misc/libscreensaver_plugin.so +usr/lib/vlc/misc/libdummy_plugin.so +usr/lib/vlc/misc/libmemcpy_plugin.so +usr/lib/vlc/misc/libipv4_plugin.so +usr/lib/vlc/misc/libipv6_plugin.so +usr/lib/vlc/misc/libexport_plugin.so +usr/lib/vlc/misc/libxtag_plugin.so +usr/lib/vlc/misc/libxml_plugin.so +usr/lib/vlc/misc/libfreetype_plugin.so +usr/lib/vlc/misc/liblogger_plugin.so +usr/lib/vlc/misc/libvod_rtsp_plugin.so +usr/lib/vlc/misc/libgnutls_plugin.so +usr/lib/vlc/misc/libgrowl_plugin.so +usr/lib/vlc/mux +usr/lib/vlc/packetizer +usr/lib/vlc/services_discovery +usr/lib/vlc/stream_out +usr/lib/vlc/video_chroma +usr/lib/vlc/video_filter +usr/lib/vlc/video_output/libimage_plugin.so +usr/lib/vlc/visualization/libvisual_plugin.so --- vlc-0.8.6.h.orig/debian/vlc-plugin-sdl.install +++ vlc-0.8.6.h/debian/vlc-plugin-sdl.install @@ -0,0 +1,2 @@ +usr/lib/vlc/audio_output/libaout_sdl_plugin.so +usr/lib/vlc/video_output/libvout_sdl_plugin.so --- vlc-0.8.6.h.orig/debian/vlc-plugin-ggi.install +++ vlc-0.8.6.h/debian/vlc-plugin-ggi.install @@ -0,0 +1 @@ +usr/lib/vlc/video_output/libggi_plugin.so --- vlc-0.8.6.h.orig/debian/vlc.install +++ vlc-0.8.6.h/debian/vlc.install @@ -0,0 +1,20 @@ +usr/bin/svlc +usr/bin/wxvlc +usr/lib/vlc/access/libscreen_plugin.so +usr/lib/vlc/codec/libsdl_image_plugin.so +usr/lib/vlc/gui/libskins2_plugin.so +usr/lib/vlc/gui/libwxwidgets_plugin.so +usr/lib/vlc/misc/libnotify_plugin.so +usr/lib/vlc/video_output/libx11_plugin.so +usr/lib/vlc/video_output/libxvideo_plugin.so +usr/lib/vlc/video_output/libglx_plugin.so +usr/lib/vlc/video_output/libaa_plugin.so +usr/lib/vlc/video_output/libcaca_plugin.so +usr/lib/vlc/video_output/libopengl_plugin.so +usr/lib/vlc/visualization/libxosd_plugin.so +usr/share/vlc/skins2 +usr/share/vlc/*.png +usr/share/vlc/*.xpm +usr/share/vlc/*.ico +usr/share/applications +usr/share/pixmaps --- vlc-0.8.6.h.orig/debian/libvlc0-dev.links +++ vlc-0.8.6.h/debian/libvlc0-dev.links @@ -0,0 +1,2 @@ +/usr/share/doc/libvlc0 /usr/share/doc/libvlc0-dev +/usr/share/bug/vlc-nox /usr/share/bug/libvlc0-dev --- vlc-0.8.6.h.orig/debian/watch +++ vlc-0.8.6.h/debian/watch @@ -0,0 +1,4 @@ +version=3 + +opts="dversionmangle=s/(\d\.\d\.\d).([a-z])/$1$2/" \ + http://download.videolan.org/pub/videolan/vlc/([\d\.]+[a-z])\/vlc-([\d\.]+[a-z])\.tar\.gz --- vlc-0.8.6.h.orig/debian/copyright +++ vlc-0.8.6.h/debian/copyright @@ -0,0 +1,539 @@ +This package was debianized by Sam Hocevar on +Mon, 13 Mar 2000 02:21:45 +0100. + +It was taken from http://download.videolan.org/pub/vlc/, and the source +tarball also contains the x264 tree. + +1. Copyright holders list +========================= + +With the exception of other files mentioned in this document, all code and +artwork belongs to members of the VideoLAN team . See +each file for precise details about its respective authors. + Copyright (c) 1996-2006 Laurent Aimar + Marc Ariberti + Stephan Assmus + Olivier Aubert + Sigmund Augdal Helberg + Pierre Baillet + Gildas Bazin + Rocky Bernstein + Johan Bilien + Stéphane Borel + Arnaud de Bossoreille de Ribou + Filippo Carone + Tony Castley + Antoine Cellerier + Renaud Dartus + Cyril Deguet + Rémi Denis-Courmont + Colin Delacroix + Boris Dorès + Jean-Marc Dressler + Henri Fallon + Andrew Flintham + Damien Fouilleul + Alexis Guillard + Gerald Hansink + Shane Harper + Derk-Jan Hartman + Gaël Hendryckx + Sam Hocevar + Eugenio Jarosiewicz + Jon Lech Johansen + Michel Kaempf + Felix Kühne + Simon Latapie + Pascal Levesque + Christophe Massiot + Loïc Minier + Florian G. Pflug + Heiko Panther + Eric Petit + Benjamin Pracht + Emmanuel Puig + Frédéric RUGET + Jean-Paul Saman + Arnaud Schauly + Vincent Seguin + Richard Shepherd + Clément Stenac + Peter Surda + Olivier Teulière + Licensed under the GNU General Public License, version 2 or later. + +extras/x264/extras/getopt.c: + Copyright (c) 2000 The NetBSD Foundation, Inc. + This code is derived from software contributed to The NetBSD Foundation + by Dieter Baron and Thomas Klausner. + Licensed under the NetBSD license (see below). + +Other files in extras/x264: + Copyright (c) 2003-2006 Laurent Aimar + Alex Izvorski (aizvorski(at)gmail.com) + Alex Wright (alexw0885(at)hotmail.com) + Andrew Dunstan + bobololo + Christian Heine (sennindemokrit(at)gmx.net) + Eric Petit + Francesco Corriga + Justin Clay (justin_clay(at)hotmail.com) + Loren Merritt (lorenm(at)u.washington.edu) + Måns Rullgård (mru(at)mru.ath.cx) + Michael Niedermayer (michaelni(at)gmx.at) + Mike Matsnev (mike(at)po.cs.msu.su) + Min Chen + Phil Jensen (philj(at)csufresno.edu) + Radek Czyz (radoslaw(at)syskin.cjb.net) + Riccardo Stievano (walkunafraid(at)tin.it) + Tuukka Toivonen (tuukkat(at)ee.oulu.fi) + Vincent Torri (Vincent.Torri(at)iecn.u-nancy.fr) + Licensed under the GNU General Public License, version 2 or later. + +mozilla/support/npunix.c: +mozilla/support/npwin.cpp: + Copyright (c) 1998 Netscape Communications Corporation + dp Suresh + Stephen Mak + Advertised as being under the Mozilla Public License, but effectively + under the MPL/GPL/LGPL triple license since the Mozilla relicensing, + hence used under the GNU General Public License, version 2 or later. + +src/extras/getopt.c: +src/extras/getopt.h: +src/extras/getopt1.c: + Copyright (c) 1987, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97 + Free Software Foundation, Inc. + Licensed under the GNU General Public License, version 2 or later. + +src/misc/unicode.c: + Copyright (c) 2005-2006 Rémi Denis-Courmont + 1998-2002 Larry Wall + Licensed under the GNU General Public License, version 2 or later. + +src/misc/charset.c: + Copyright (c) 2003-2006 Derk-Jan Hartman + Christophe Massiot + Rémi Denis-Courmont + 2001-2003 The Mape Project + Karel Zak + Licensed under the GNU General Public License, version 2 or later. + +Files in loader/: + Copyright (C) the Wine project + 1993 Robert J. Amstadt + 1993, 1994 Martin Ayotte + 1994 Eric Youndale & Erik Bos + 1995 Thomas Sandford + 1995, 1996 Martin von Löwis + 1996-1998 Marcus Meissner + 1998 Patrick Stridvall + 1999 Éric Pouech + 1995-1999 Alexandre Julliard + 2000 Eugene Kuznetsov (divx@euro.ru) + 2005 Rémi Denis-Courmont + Originally distributed under LPGL 2.1 (or later) by the Wine project. + Licensed under the GNU General Public License, version 2 or later. + +Files in intl/: + Copyright (C) 1984, 1989, 1990, 1995-2002 Free Software Foundation, Inc. + Licensed under the GNU General Public License, version 2 or later. + +include/mmx.h: + Copyright (C) 1997-1999 H. Dietz and R. Fisher + Licensed under the GNU General Public License, version 2 or later. + +Files in modules/gui/skins2/unzip: + Copyright (C) 1998-2005 Gilles Vollant + Copyright (c) 1990-2000 Info-ZIP. All rights reserved. + Licensed under the Info-ZIP license (see below). + +modules/access/dvb/en50221.c: + Copyright (c) 2004-2005 Christophe Massiot + 2000 Klaus Schmidinger + Licensed under the GNU General Public License, version 2 or later. + +modules/stream_out/transrate/putvlc.h: + Copyright (C) 1996, MPEG Software Simulation Group. All Rights Reserved. + This file has a purely functional purpose and does henceforth not qualify + for copyright. + +Other files in modules/stream_out/transrate/: + Copyright (C) 2003 Antoine Missout + Laurent Aimar + Christophe Massiot + 2000-2003 Michel Lespinasse + 1999-2000 Aaron Holtzman + Licensed under the GNU General Public License, version 2 or later. + +Files in modules/codec/cmml/: +modules/misc/xml/xtag.c: + Copyright (C) 2003-2004 Commonwealth Scientific and Industrial Research + Organisation (CSIRO) Australia + 2003-2004 Conrad Parker + 2003-2004 Andre Pang + 2004 Gildas Bazin + Licensed under the GNU General Public License, version 2 or later. + +modules/codec/dvbsub.c: + Copyright (c) 2003 Damien LUCAS + 2003 ANEVIA + 2003-2005 Gildas Bazin + 2003-2005 Laurent Aimar + 2003-2005 Jean-Paul Saman + Licensed under the GNU General Public License, version 2 or later. + +Files in modules/video_filter/swscale/: + Copyright (C) 1999 Aaron Holtzman + 1999 Franck Sicard + 2000 Håkan Hjort + 2000 Silicon Integrated System Corp. + 2001 Nick Kurshev + 2001-2003 Michael Niedermayer + 2003-2004 Gildas Bazin + 2004 Marc Hoffman + 2004 Romain Dolbeau + Licensed under the GNU General Public License, version 2 or later. + +modules/misc/playlist/xspf.[ch]: +modules/demux/playlist/xspf.[ch]: + Copyright (c) 2006 Daniel Stränger + 2006 Yoann Peronneau + Licensed under the GNU General Public License, version 2 or later. + +modules/demux/ty.c: + Copyright (C) 2005 Neal Symms + 2005 Christopher Wingert for tivo-mplayer + Licensed under the GNU General Public License, version 2 or later. + +Files in modules/access/rtsp/: + Copyright (c) 2005 Gildas Bazin + 2002-2004 the xine project + Licensed under the GNU General Public License, version 2 or later. + +modules/access/v4l.c: + Copyright (c) 2002-2004 Laurent Aimar + 2002-2004 Paul Forgey + 2002-2004 Gildas Bazin + 2002-2004 Benjamin Pracht + Licensed under the GNU General Public License, version 2 or later. + +modules/access/videodev_mjpeg.h: + Copyright (c) 2006 lavrec + 2006 Rainer Johanni + Licensed under the GNU General Public License, version 2 or later. + +Files in src/osd/: +modules/mux/rtp/rtcp.[ch]: +modules/mux/rtp/rtp.h: + Copyright (c) 2005 M2X + 2005 Jean-Paul Saman + 2005 Sigmund Augdal Helberg + Licensed under the GNU General Public License, version 2 or later. + +modules/access/dv.c: + Copyright (c) 2005 M2X + 2005 Jean-Paul Saman + Copyright Arne Schirmacher + Dan Dennedy and others + Licensed under the GNU General Public License, version 2 or later. + +share/skins2/fonts/FreeSans.ttf: +share/skins2/fonts/FreeSansBold.ttf: + Copyright (C) 2002 Free Software Foundation. + Primoz Peterlin + Licensed under the GNU General Public License, version 2 or later. + +Other files in share/skins2/: + Copyright (c) 2006 aLtgLasS + 1994-1996 Jos Buivenga + Licensed under the Creative Commons Attribution 2.5 Scotland license + +2. License list +=============== + +The blurb for the GNU General Publice License, version 2 or later: + + | This program is free software; you can redistribute it and/or modify + | it under the terms of the GNU General Public License as published by + | the Free Software Foundation; either version 2, or (at your option) + | any later version. + | + | This program is distributed in the hope that it will be useful, + | but WITHOUT ANY WARRANTY; without even the implied warranty of + | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + | General Public License for more details. + | + | You should have received a copy of the GNU General Public License + | along with this program; if not, write to the Free Software + | Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian GNU/Linux systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + +The NetBSD license: + + | Redistribution and use in source and binary forms, with or without + | modification, are permitted provided that the following conditions + | are met: + | 1. Redistributions of source code must retain the above copyright + | notice, this list of conditions and the following disclaimer. + | 2. Redistributions in binary form must reproduce the above copyright + | notice, this list of conditions and the following disclaimer in the + | documentation and/or other materials provided with the distribution. + | 3. All advertising materials mentioning features or use of this software + | must display the following acknowledgement: + | This product includes software developed by the NetBSD + | Foundation, Inc. and its contributors. + | 4. Neither the name of The NetBSD Foundation nor the names of its + | contributors may be used to endorse or promote products derived + | from this software without specific prior written permission. + | + | THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS + | ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + | TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + | PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS + | BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + | INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + | CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + | ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + | POSSIBILITY OF SUCH DAMAGE. + +The Info-ZIP license: + + | For the purposes of this copyright and license, "Info-ZIP" is defined as + | the following set of individuals: + | + | Mark Adler, John Bush, Karl Davis, Harald Denker, Jean-Michel Dubois, + | Jean-loup Gailly, Hunter Goatley, Ed Gordon, Ian Gorman, Chris Herborth, + | Dirk Haase, Greg Hartwig, Robert Heath, Jonathan Hudson, Paul Kienitz, + | David Kirschbaum, Johnny Lee, Onno van der Linden, Igor Mandrichenko, + | Steve P. Miller, Sergio Monesi, Keith Owens, George Petrov, Greg Roelofs, + | Kai Uwe Rommel, Steve Salisbury, Dave Smith, Steven M. Schweda, + | Christian Spieler, Cosmin Truta, Antoine Verheijen, Paul von Behren, + | Rich Wales, Mike White + | + | This software is provided "as is," without warranty of any kind, express + | or implied. In no event shall Info-ZIP or its contributors be held liable + | for any direct, indirect, incidental, special or consequential damages + | arising out of the use of or inability to use this software. + | + | Permission is granted to anyone to use this software for any purpose, + | including commercial applications, and to alter it and redistribute it + | freely, subject to the following restrictions: + | + | 1. Redistributions of source code must retain the above copyright notice, + | definition, disclaimer, and this list of conditions. + | + | 2. Redistributions in binary form (compiled executables) must reproduce + | the above copyright notice, definition, disclaimer, and this list of + | conditions in documentation and/or other materials provided with the + | distribution. The sole exception to this condition is redistribution + | of a standard UnZipSFX binary (including SFXWiz) as part of a + | self-extracting archive; that is permitted without inclusion of this + | license, as long as the normal SFX banner has not been removed from + | the binary or disabled. + | + | 3. Altered versions--including, but not limited to, ports to new operating + | systems, existing ports with new graphical interfaces, and dynamic, + | shared, or static library versions--must be plainly marked as such + | and must not be misrepresented as being the original source. Such + | altered versions also must not be misrepresented as being Info-ZIP + | releases--including, but not limited to, labeling of the altered + | versions with the names "Info-ZIP" (or any variation thereof, including, + | but not limited to, different capitalizations), "Pocket UnZip," "WiZ" + | or "MacZip" without the explicit permission of Info-ZIP. Such altered + | versions are further prohibited from misrepresentative use of the + | Zip-Bugs or Info-ZIP e-mail addresses or of the Info-ZIP URL(s). + | + | 4. Info-ZIP retains the right to use the names "Info-ZIP," "Zip," "UnZip," + | "UnZipSFX," "WiZ," "Pocket UnZip," "Pocket Zip," and "MacZip" for its + | own source and binary releases. + +The Creative Commons Attribution 2.5 Scotland license: + + | This Creative Commons Scotland public licence enables You to Use the + | Work worldwide provided that You keep to the terms of this Licence. + | + | 'The Licensor' (the Person offering the Work under the terms and + | conditions of this Licence) + | + | and + | + | 'You' (the Person acquiring rights under this Licence) + | + | agree as follows: + | + | 1. Definitions of Capitalised Words + | 1. "Collective Work" means a work made up of the Work in its entirety + | in unmodified form, along with other work, assembled into a + | collective whole. + | 2. "Derivative Work" means a work that Uses the Work (or any + | substantial part of the Work) in any material form whatsoever + | (such as a translation, dramatisation, or abridgment), other than + | (i) as a whole and in unmodified form or (ii) by modifying it as + | may be technically necessary to Use it in a different mode or + | format; but a Collective Work is not a Derivative Work for the + | purpose of this Licence. + | 3. "Derogatory Treatment" means derogatory treatment as defined by + | section 80 of the Copyright Design and Patents Act 1988, except as + | allowed by that Act: and it has that meaning wherever that + | treatment may take place and whoever may carry it out. + | 4. "Licence Elements" means the following licence attributes + | indicated in the title of this Licence: Attribution. + | 5. "Original Author" means the Person who created the Work. + | 6. "Person" means a natural person or a body of persons corporate or + | incorporate. + | 7. "Use", as a verb, means doing any act which is restricted by + | copyright, whether in the original medium or any other; and + | includes modifying the Work as may be technically necessary to Use + | it in a different mode or format. + | 8. "Work" means the work protected by copyright which is offered + | under the terms of this Licence, and includes the Work as + | incorporated in any Collective Work. + | 9. Words in the singular include the plural and vice versa. + | + | 2. The Rights Granted + | + | 2.1 The Licensor grants to You a worldwide, royalty-free, + | non-exclusive, licence to Use the Work for the duration of its + | copyright. + | + | So you may, for example: + | 1. copy the Work, or create Derivative Works or incorporate it into a + | Collective Work; + | 2. copy Derivative Works, or the Work as incorporated in any + | Collective Work; and + | 3. publish, perform or communicate the Work and/or Derivative Works + | and/or the Work as incorporated in any Collective Work to anyone; + | + | in any medium whether now known or created in the future. + | + | 2.2 However, this Licence does not allow you to: + | 1. impose any terms or any technological measures on the Work, or a + | Derivative Work, that alter or restrict the terms of this Licence + | or any rights granted under it or have the effect or intent of + | restricting the ability of any person to exercise those rights; + | 2. sublicense the Work; or + | 3. subject the Work to Derogatory Treatment. + | + | 2.3 You must, if you publish or distribute the Work or any Derivative + | Work to anyone else in any way, give reasonable credit to the Original + | Author as follows: + | 1. by giving the name of the Original Author if that has been + | supplied; or a pseudonym if that has been supplied instead; and/or + | the name of any other person if that has been supplied for + | attribution in place of the Original Author; + | 2. by giving the title of the Work if that has been supplied; + | 3. by giving the Uniform Resource Identifier of the Work if that has + | been supplied, but you need not do so if this does not refer to + | its copyright terms or to its licensing information; + | 4. in the case of a Derivative Work, by identifying how the Work has + | been used (for example, "French translation of the Work by X", or + | "Screenplay based on original work by X"); and + | 5. in the case of a Derivative Work or a Collective Work, placing + | that credit in the same place, and at least as prominently, as any + | comparable authorship credit. + | + | But, if what you are publishing or distributing is a Derivative + | Work or a Collective Work, you must remove any of these credits + | if you are asked to do so by the Licensor and if it is + | practicable to do so. + | + | These are important conditions of this licence and if you fail to do + | so you will be in material breach of its terms. + | + | 2.4 The Original Author asserts the right to be identified as the + | original author of the Work; but only as and when required by clause + | 2.3 above. + | + | 2.5 You must also, if you publish or distribute the Work or any + | Derivative Work to anyone else in any way: + | 1. include a copy of this Licence (or its Uniform Resource + | Identifier) with it; and + | 2. keep intact any copyright notices for the Work and notices that + | refer to this Licence. + | + | These are important conditions of this licence and if you fail to do + | so you will be in material breach of its terms. + | + | 2.6 Each time You publish the Work or any Derivative Work to anyone + | else in any way, the Licensor offers to the recipient a licence to the + | Work on the same terms and conditions as this Licence. + | + | 2.7 And: + | 1. the right to release the Work under different terms, or to stop + | distributing the Work, is reserved; and + | 2. all other rights not expressly granted by the Licensor are + | reserved. + | + | 2.8 This Licence does not affect any rights that You or anyone else + | may independently have under any applicable law (including fair + | dealing, fair use, or any other legally recognised limitation or + | exception to copyright infringement) to make any Use of this Work. + | + | 3. Warranties and Disclaimer + | + | 3.1 The Work is licensed by the Licensor "as is" and without any + | warranty of any kind, either express or implied, whether of title, of + | accuracy, of fitness for purpose, or otherwise. + | + | 4. Limit of Liability + | + | 4.1 Subject to any liability which may not be excluded or limited by + | law, the Licensor shall not be liable for, and expressly excludes, all + | liability for loss or damage however and whenever caused to anyone by + | any Use under this Licence, whether by You or by anyone else, and + | whether caused by any fault on the part of the Licensor or not. If + | liability may not be excluded by law, it is limited to actual and + | direct financial loss to the extent it is caused by proved negligence + | on the part of the Licensor. + | + | 5. Termination + | + | 5.1 Any breach by You of the terms of this licence (for example, by + | distributing the work licensed without attributing authorship as + | appropriate) entitles the Licensor to terminate this Licence with + | immediate effect and without notice to you. Persons who have received + | the Work, Derivative Works, or Collective Works from You under this + | Licence, however, will not have their licences terminated provided + | their use is in full compliance with this Licence or a licence granted + | under clause 2.6 of this Licence. + | + | 5.2 If You are not in breach of the terms of this licence, the + | Licensor may not terminate your rights under it. + | + | 5.3 Unless terminated under clause 5.1, this Licence is granted to you + | for the duration of copyright in the Work. + | + | 6. General + | + | 6.1 If any provision of this Licence is held to be invalid or + | unenforceable, that shall not affect the validity or enforceability of + | the remainder of the terms of this Licence. + | + | 6.2 This Licence is the entire agreement between the parties with + | respect to the Work licensed here. It replaces any earlier + | understandings, agreements or representations with respect to the Work + | not specified here. + | + | 6.3 If You are in breach of the terms of this Licence (for example, by + | distributing the work licensed without attributing authorship as + | appropriate) you will not be entitled to rely on the terms of this + | Licence or to complain of any breach by the Licensor. + | + | 6.4 Neither You, nor anyone else, may enforce any provision of this + | Licence by specific implement or interdict. + | + | 6.5 This Licence is governed by the law of Scotland and the parties + | accept the exclusive jurisdiction of the Courts of Scotland to decide + | any action or claim directed against the Licensor. + | + | 6.6 If there is any dispute as to the meaning or effect of any + | provision of this Licence, it must so far as possible be read and + | given effect in a way that is compatible with the provisions of the + | Creative Commons generic licence, version 2.5, which has the same + | Licence Elements. + --- vlc-0.8.6.h.orig/debian/vlc.docs +++ vlc-0.8.6.h/debian/vlc.docs @@ -0,0 +1,6 @@ +debian/README.Debian +AUTHORS +MAINTAINERS +NEWS +README +THANKS --- vlc-0.8.6.h.orig/debian/libvlc0-dev.install +++ vlc-0.8.6.h/debian/libvlc0-dev.install @@ -0,0 +1,4 @@ +usr/bin/vlc-config +usr/lib/*.so +usr/lib/*.a +usr/include/vlc/*.h --- vlc-0.8.6.h.orig/debian/changelog +++ vlc-0.8.6.h/debian/changelog @@ -0,0 +1,1890 @@ +vlc (0.8.6.h-4+lenny3) oldstable-security; urgency=high + + * CVE-2010-0522 CVE-2010-1441 CVE-2010-1442 + * CVE-2010-1443 CVE-2010-3275 CVE-2010-3276 + * CVE-2011-0531 + + -- Moritz Tue, 05 Apr 2011 20:47:05 +0000 + +vlc (0.8.6.h-4+lenny2.3) stable-security; urgency=high + + * Non-maintainer upload by the Security Team. + * Fix integer underflow in RTSP streaming (410-rtsp-integer- + underflow.diff) + + -- Devin Carraway Sun, 18 Apr 2010 09:25:53 +0000 + +vlc (0.8.6.h-4+lenny2) testing-security; urgency=high + + * Non-maintainer upload by the Security Team. + * Fix buffer overflow in CUE demuxer + (No CVE id yet; Closes: #504639). + + -- Nico Golde Thu, 06 Nov 2008 00:32:12 +0100 + +vlc (0.8.6.h-4+lenny1) testing-security; urgency=high + + * Non-maintainer upload by the Security Team. + * Fix integer overflows that could possibly lead to arbitrary + code execution (CVE-2008-4686.diff; Closes: #503118). + + -- Nico Golde Mon, 03 Nov 2008 14:41:58 +0100 + +vlc (0.8.6.h-4) unstable; urgency=high + + * Security: Fix integer overflow in mms module + (Closes: #496265)(407-mms-overflow.diff taken from upstream) + + -- Christophe Mutricy Mon, 25 Aug 2008 01:07:27 +0100 + +vlc (0.8.6.h-3) unstable; urgency=low + + * Minor cleanups. + * Use DEB_HOST_ARCH instead of DEB_BUILD_ARCH in rules. + * Use objdump -x instead of ldd to check for links on libX11 as ldd might + resolve libvlc to the system's version if the system has libvlc installed; + closes: #495730. + + -- Loic Minier Fri, 22 Aug 2008 19:46:35 +0200 + +vlc (0.8.6.h-2) unstable; urgency=high + + * Fix integer overflow in TTA (CVE-2008-3732) (405-CVE-2008-3732.diff) + * Fix crashes in Live555 (406-live555-crash.diff) + * Switch to libdc1394-22-dev (Closes: #484695) + + -- Christophe Mutricy Thu, 21 Aug 2008 20:19:39 +0100 + +vlc (0.8.6.h-1) unstable; urgency=high + + [ Christophe Mutricy ] + * Acknowledge NMU by Nico Golde. Thanks. + * Acknowledge NMU by Mike Hommey. Thanks. + * New security upstrem release + - Fix buffer overflow (CVE-2008-1881) + - Fix out of bound array access (CVE-2008-1769) + - Fix various integer overflow in MP4 demuxer, Cinepak, RTSP + (CVE-2008-1489, CVE-2008-1768) + - Remove 105_min_mkv.patch, 400-CVE-2008-1489.diff and + 401-CVE-2008-0073.diff, 402-CVE-2008-1881, 403-CVE-2008-1768.diff + and 404-CVE-2008-1881 integrated upstream + * Remove old transitional packages: vlc-plugin-alsa and wxvlc + (Closes: #477543, #477545) + * Add some magic for reportbug to ask people to remove their plugin cache + and get the info for vlc-nox and libvlc0 also. + + [ Reinhard Tartler ] + * added a watch file + * new upstream release, refreshing patches + + [ Christophe Mutricy ] + * Fix buffer overflow in Wav demux.(CVE-2008-2430)(Closes: #489004) + (Patch taken from upstream: 401-CVE-2008-2430.diff) + + -- Christophe Mutricy Sat, 05 Jul 2008 23:45:15 +0100 + +vlc (0.8.6.e-2.3) unstable; urgency=low + + * Non-maintainer upload. + * debian/control: Build depend on iceape-dev >= 1.1.9-4 instead of + libxul-dev (Closes: #480812). + * debian/patches/010_iceape.diff: configure.ac changes to allow to build + against iceape. + * debian/patches/050_bootstrap.diff: Corresponding configure changes. + * debian/patches/series: Added 010_iceape.diff. + + -- Mike Hommey Fri, 23 May 2008 21:11:07 +0200 + +vlc (0.8.6.e-2.1) unstable; urgency=high + + * Non-maintainer upload by the Security Team. + * This update addresses the following security issues: + - CVE-2008-1769: out-of-bounds array access and memory corruption + via a crafted cinepak file (Closes: #478140). + - CVE-2008-1768: multiple integer overflow triggering buffer overflows + in the mp4 and real demuxer and the cinepak codec (Closes: #478140). + - CVE-2008-1881: stack-based buffer overflow in subtitle parsing leading + to arbitrary code execution via crafted subtitle file (Closes: #477805). + + -- Nico Golde Sun, 27 Apr 2008 16:17:49 +0200 + +vlc (0.8.6.e-2) unstable; urgency=high + + [ Christophe Mutricy ] + * Acknowledge NMU by Nico Golde. Thanks + * New patch taken from upstream to fix an arbitrary code execution. + CVE-2008-0073 (Closes: #473057) + * New patch to fix FTBS in MKV module + + [ Loic Minier ] + * Mention CVE id in 0.8.6.e-1.1. + + -- Christophe Mutricy Sat, 29 Mar 2008 15:04:28 +0000 + +vlc (0.8.6.e-1.1) unstable; urgency=high + + * Non-maintainer upload by the Security Team. + * Fix Integer overflow in MP4_ReadBox_rdrf function + that triggers a heap-based buffer overflow via a + large atom length value (Closes: #472635); CVE-2008-1489. + + -- Nico Golde Wed, 26 Mar 2008 13:21:44 +0100 + +vlc (0.8.6.e-1) unstable; urgency=high + + [ Christophe Mutricy ] + * New security upstream release + - CORE-2008-0130, VideoLAN-SA-0802, CVE-2008-0986: Arbitrary memory + overwrite in the MP4 demuxer (Closes: #467652) + - Others security fixes already included in the Debian package + - Xshm detection fix (Closes: #404361) + - Alsa 5.1 fixes + - DTS to S/PDIF fixes + * patches/ + - delete the uneeded sec-* patches + - delete 100_no_wx_update.diff as the update "feature" has been removed + upstream + + [ Loic Minier ] + * Urgency high for security bugfix. + + -- Christophe Mutricy Mon, 25 Feb 2008 23:35:24 +0000 + +vlc (0.8.6.c-6) unstable; urgency=high + + [ Nico Golde ] + * This update addresses the following security issues (Closes: #461544). + - CVE-2008-0295: Heap-based buffer overflow in real_sdpplin.c + which could lead to user-assisted arbitrary code execution + via crafted SDP data. + - CVE-2008-0296: Heap-based buffer overflow in libaccess_realrtsp plugin + which might lead to arbitrary code execution via a crafted RTSP server. + + [ Loic Minier ] + * Merge above changes by Nico Golde. + + -- Loic Minier Mon, 21 Jan 2008 16:16:51 +0100 + +vlc (0.8.6.c-5) unstable; urgency=low + + [ Christophe Mutricy ] + * New vlc-plugin-jack pkg with jack audio_output module + (closes: #402252, #444992) + * Make all the symlink for /usr/share/${pkg} point to /usr/share/doc/vlc-nox + as the plugins depends on vlc-nox and not vlc + * debian/control: dpkg-shlibdeps gives the correct depends for + vlc-plugin-glide. So drop the hardcoded depends on libglide2 + * debian/rules: dpkg-shlibdeps now behaves better with libraries without + versionned symbol file. + + [ Sam Hocevar ] + * debian/control: + + Dropped the libcdio-dev versioned build-dep to ease backports. + + [ Loic Minier ] + * Ack NMU by Nico Golde; thanks! + * Wrap more deps. + * Also build vlc-plugin-svgalib package on amd64 as well; build-dep on + libsvga1-dev on amd64 too; --enable-svgalib on amd64. + * Drop debian/*.dirs. + * Only pass --host to configure if DEB_BUILD_GNU_TYPE and DEB_HOST_GNU_TYPE + differ. + * Pass --quiltrc /dev/null to quilt and use $(QUILT) to invoke quilt. + * Bump up Debhelper compatibility level to 6; drop dpkg-dev build-dep. + * Add /svn to Vcs-Svn. + * Don't run ./vlc as a test if nocheck is given. + * Cleanup rules. + * Drop vlc-plugin-alsa and wxvlc /u/s/d symlinks as these are dummy packages + anyway. + * Update menu file. + + -- Loic Minier Fri, 11 Jan 2008 17:32:36 +0100 + +vlc (0.8.6.c-4.1) unstable; urgency=high + + * Non-maintainer upload by security team. + * This update addresses the following security issues + (CVE ids pending; Closes: #458318): + - Fix format string issue in internal webserver that could lead to + to arbitrary code execution (sec-httpd_formatstring.diff). + - Disable m3u EXTVLCOPT parsing if no command line option is specified + (--m3u-extvlcopt) to prevent browser plugins to control stream output + and thus overwriting arbitrary files of the user running vlc + (sec-vlcopt_support.diff). + - Fix stack-based buffer overflow in subtitle parsing + (sec-subtitle_buffer_overflow.diff). + - Fix NULL pointer dereference in the rtsp/rtp module by checking return + of the httpd_MsgGet function (sec-rtsp_remote_dos.diff). + + -- Nico Golde Fri, 11 Jan 2008 15:05:10 +0100 + +vlc (0.8.6.c-4) unstable; urgency=high + + [ Loic Minier ] + * Wrap build-deps and deps. + * Only suggest videolan-doc; closes: #451914. + + [ Christophe Mutricy ] + * Use Vcs- instead of Xs-Vcs- + * Add Homepage field to control + * Use --ignore-missing-info with dpkg-shlibdeps as glide doesn't provide a + versionned .shlibs + + [ Sam Hocevar ] + * debian/control: + + Build-depend on a newer libcdio-dev to transition to the newer binary + packages (Closes: #456390, #456403, #453823). + + Depend on ttf-dejavu-core instead of ttf-dejavu (Closes: #445580). + + Set policy to 3.7.3. + * debian/rules: + + Don’t ignore make distclean errors. + + Call dh_desktop to register desktop files. + + -- Sam Hocevar (Debian packages) Sat, 15 Dec 2007 12:33:48 +0000 + +vlc (0.8.6.c-3) unstable; urgency=high + + * debian/control: + + Removed now useless linux-libc-dev build-dependency (Closes: #430710), + thanks to Steve Langasek. + + -- Sam Hocevar (Debian packages) Thu, 05 Jul 2007 10:13:42 +0200 + +vlc (0.8.6.c-2) unstable; urgency=high + + [ Loic Minier ] + * Merge the never uploaded 0.8.6.a.debian-7 changelog entry into 0.8.6.c-1. + + [ Christophe Mutricy ] + * Build-depends on linux-libc-dev rather than linux-kernel-headers + (Closes: #430710 ) + + [ Sam Hocevar ] + * debian/control: + + Build-depend on newer libavcodec libraries. + + Build-depend on newer libflac-dev. + + -- Sam Hocevar (Debian packages) Wed, 04 Jul 2007 22:31:32 +0200 + +vlc (0.8.6.c-1) unstable; urgency=high + + [ Loic Minier ] + * New patch, 107_gcc-4.3, fixes missing include causing a build failure with + GCC 4.3; thanks Martin Michlmayr; closes: #417750. + + [ Christophe Mutricy ] + * No longer build the x264 module as libx264 has been removed from Sid + (Closes: #424649, #427283). + * New patch, 108_flac-1.1.3 taken from upstream to fix building with + libflac8 (Closes: #426673). + * Rebuild against new libavcodec and libavformat (Closes: #427573). + + [ Fathi Boudra, Christophe Mutricy ] + * New upstream release (Closes: #424915): + + multiple format string vulnerabilities (VideoLAN-SA-0207). + (Closes: #429726) + + media player unspecified Denial Of Service vulnerability (CVE-2007-0256). + (Closes: #407290) + + missing includes to fix FTBFS with GCC 4.3.0. (Closes: #417750) + + fullscreen opens a normal window instead of going fullscreen on amd64. + (Closes: #405035) + + fix building with libflac8. (Closes: #426673) + + The following patches are no longer necessary: + 105_audio_format_crash.diff + 106_xshm_check.diff + 107_gcc-4.3.diff + 108_flac-1.1.3.diff + + [ Sam Hocevar ] + * Install libtelx_plugin.so in vlc-nox package. + + -- Sam Hocevar (Debian packages) Tue, 26 Jun 2007 01:41:02 +0200 + +vlc (0.8.6.a.debian-6) unstable; urgency=low + + * Rebuilt package against packages that are in unstable (Closes: #415446). + + * debian/control: + + Use ${binary:Version} instead of ${Source-Version}. + + Build-depend on dpkg-dev (>= 1.13.19). + + -- Sam Hocevar (Debian packages) Tue, 20 Mar 2007 14:50:43 +0100 + +vlc (0.8.6.a.debian-5) unstable; urgency=low + + * Refreshed and renamed all patches. + + * debian/control: + + Set pkg-multimedia-maintainers as main maintainer. + + Fixed Vcs fields. + * debian/compat: + + Set compat to 5. + * debian/rules: + + Big cleanup. + + Distribute libvlc.a again. + + Switch to AM_MAINTAINER_MODE instead of touching all files. + + * debian/patches/106_xshm_check.diff: + + New patch. Don't crash if XShmAttach fails, instead fall back to + normal X images (Closes: #404361). + + * debian/patches/300_manpage_syntax.diff: + + New patch. Fix dvd:// syntax in manpage (Closes: #412372) and add + mention of the videolan-doc package. + + -- Sam Hocevar (Debian packages) Sat, 17 Mar 2007 19:46:52 +0100 + +vlc (0.8.6.a.debian-4) unstable; urgency=low + + * *sigh*, libfaad-dev build-depend was in fact missing. + + -- Sam Hocevar (Debian packages) Tue, 13 Mar 2007 10:39:04 +0100 + +vlc (0.8.6.a.debian-3) unstable; urgency=low + + * debian/control: + + Add XS-Vcs-Browser field. + + Build-depend on libx264-dev. + + Build-depend on libfaad-dev. + * debian/rules: + + Now that they're in unstable, no longer build our custom x264 and faad2. + + * debian/patches/030_audio_format_crash.diff: + + Patch from upstream to fix multiple crashes with audio conversions. + + -- Sam Hocevar (Debian packages) Mon, 12 Mar 2007 16:41:06 +0100 + +vlc (0.8.6.a.debian-2) unstable; urgency=high + + * debian/patches/021_x264_powerpc.diff: + + Patch from upstream to fix FTBFS on PowerPC (Closes: #411438). + * debian/rules: + + Fix a kFreeBSD FTBFS, courtesy of Petr Salinger (Closes: #399713). + + -- Sam Hocevar (Debian packages) Wed, 21 Feb 2007 12:12:02 +0100 + +vlc (0.8.6.a.debian-1) unstable; urgency=high + + * New upstream bugfix release. + * Most of our patches are now in sync with upstream. Removed: + + 000_bootstrap.diff + + 000_ltmain.diff + + patch-badly-initialised-data-0.8.6debian-0.8.6a.diff + + patch-configure.ac-syntax-0.8.6debian-0.8.6a.diff + + patch-documentation-0.8.6debian-0.8.6a.diff + + patch-i422-yuy2-crash-0.8.6debian-0.8.6a.diff + + patch-integer-signedness-0.8.6debian-0.8.6a.diff + + patch-logo-filter-crash-0.8.6debian-0.8.6a.diff + + patch-memory-leaks-0.8.6debian-0.8.6a.diff + + patch-missing-locks-0.8.6debian-0.8.6a.diff + + patch-mjpeg-separator-0.8.6debian-0.8.6a.diff + + patch-mozilla-plugin-0.8.6debian-0.8.6a.diff + + patch-network-protocols-fixes-0.8.6debian-0.8.6a.diff + + patch-playlist-crash-0.8.6debian-0.8.6a.diff + + patch-po-0.8.6debian-0.8.6a.diff + + patch-private-libcaca-0.8.6debian-0.8.6a.diff + + patch-remove-debug-messages-0.8.6debian-0.8.6a.diff + + patch-sanitise-javascript-0.8.6debian-0.8.6a.diff + + patch-sanity-checks-0.8.6debian-0.8.6a.diff + + patch-sdl-image-priority-0.8.6debian-0.8.6a.diff + + patch-utf8-0.8.6debian-0.8.6a.diff + + patch-version-information-0.8.6debian-0.8.6a.diff + + MOAB-02-01-2007-CVE-2007-0017.patch + + -- Sam Hocevar (Debian packages) Thu, 11 Jan 2007 18:17:41 +0100 + +vlc (0.8.6-svn20061012.debian-2) unstable; urgency=high + + * Maintainer upload. + * Acknowledge previous NMUs by Andreas Barth. Thanks. + (Closes: #405425, #400720, #403022). + + * debian/control: + + Put back mozilla-plugin-vlc package. + + * debian/rules: + + Build with mediacontrol bindings, needed for the Mozilla plugin. + + * 020_kfreebsd.diff: + + New patch courtesy of Petr Salinger. Fix a GNU/kFreeBSD FTBFS + (Closes: #399713). + + * patch-configure.ac-syntax-0.8.6debian-0.8.6a.diff: + + Fix "CFAGS" to "CFLAGS" in configure.ac. + + * patch-documentation-0.8.6debian-0.8.6a.diff: + + Documentation, translation and error messages updates. + + * patch-network-protocols-fixes-0.8.6debian-0.8.6a.diff: + + Various fixes for the IPv4, IPv6, SAP and HTTP protocols. + + * patch-po-0.8.6debian-0.8.6a.diff: + + Translation updates. + + * patch-version-information-0.8.6debian-0.8.6a.diff: + + Set version information to 0.8.6a, even if it's not really our real + version, to make it clear that the security issues were fixed. + + * patch-mozilla-plugin-0.8.6debian-0.8.6a.diff: + + Proper fix for the Mozilla plugin (Closes: #400720, #403022). + + * 000_bootstrap.diff: + + Rebootstrap tarball because of changes to configure.ac. + + * patch-badly-initialised-data-0.8.6debian-0.8.6a.diff: + + Fix various badly initialised variables in the code. + + * patch-i422-yuy2-crash-0.8.6debian-0.8.6a.diff: + + Fix a crash in the I422-YUY2 chroma conversion. + + * patch-integer-signedness-0.8.6debian-0.8.6a.diff: + + Fix integer signedness issues in the variable code. + + * patch-logo-filter-crash-0.8.6debian-0.8.6a.diff: + + Fix a crash in the logo filter. + + * patch-memory-leaks-0.8.6debian-0.8.6a.diff: + + Fix various memory leaks. + + * patch-missing-locks-0.8.6debian-0.8.6a.diff: + + Add missing mutex locks. + + * patch-mjpeg-separator-0.8.6debian-0.8.6a.diff: + + Fix MJPEG format support. + + * patch-playlist-crash-0.8.6debian-0.8.6a.diff: + + Fix a crash in the playlist code. + + * patch-private-libcaca-0.8.6debian-0.8.6a.diff: + + Do not use private libcaca symbols. + + * patch-remove-debug-messages-0.8.6debian-0.8.6a.diff: + + Disable debug messages and spurious messages to stderr. + + * patch-sanitise-javascript-0.8.6debian-0.8.6a.diff: + + Fix the javascript string sanitising. + + * patch-sanity-checks-0.8.6debian-0.8.6a.diff: + + Various sanity checks for untrusted data. + + * patch-sdl-image-priority-0.8.6debian-0.8.6a.diff: + + Downgraded the sdl-image plugin priority. + + * patch-utf8-0.8.6debian-0.8.6a.diff: + + Fix Unicode support in GUIs and file access. + + -- Sam Hocevar (Debian packages) Mon, 8 Jan 2007 09:43:07 +0100 + +vlc (0.8.6-svn20061012.debian-1.2) unstable; urgency=high + + * Non-maintainer upload. + * Fix format string vulnerability with patch + MOAB-02-01-2007-CVE-2007-0017.patch, CVE-2007-0017. Closes: #405425 + + -- Andreas Barth Sat, 6 Jan 2007 23:07:51 +0000 + +vlc (0.8.6-svn20061012.debian-1.1) unstable; urgency=high + + * Non-maintainer upload. + * remove broken package mozilla-plugin-vlc. Closes: #400720, #403022 + + -- Andreas Barth Sat, 23 Dec 2006 19:17:40 +0000 + +vlc (0.8.6-svn20061101.debian-1) UNRELEASED; urgency=high + + * New upstream SVN snapshot. + + -- Sam Hocevar (Debian packages) Wed, 1 Nov 2006 10:50:17 +0100 + +vlc (0.8.6-svn20061012.debian-1) unstable; urgency=low + + * New upstream SVN snapshot. + * Upstream fixed the BadWindow request issue (Closes: #392207). + + -- Sam Hocevar (Debian packages) Thu, 12 Oct 2006 20:43:45 +0200 + +vlc (0.8.6-svn20061008.debian-1) unstable; urgency=high + + * New upstream SVN snapshot. Fixes a heap smashing bug. + * debian/control: + + Build-depend on libgtk2.0-dev to work around #388521 (Closes: #391739). + + Replace XS-X-Vcs-Svn with -XS-Vcs-Svn. + + * debian/patches/020_notify.diff: + + Fix notify support. Thanks to Christophe Mutricy. + + -- Sam Hocevar (Debian packages) Sun, 8 Oct 2006 18:54:30 +0200 + +vlc (0.8.6-svn20061001.debian-4) unstable; urgency=low + + * Build-depend on libnotify and explicitly activate the libnotify plugin + (Closes: #391308). + * Re-enable DV support. libraw1394 is not waiting for us anyway. + + -- Sam Hocevar (Debian packages) Fri, 6 Oct 2006 10:24:26 +0200 + +vlc (0.8.6-svn20061001.debian-2) unstable; urgency=high + + * Temporarily disable DV support because the libraw1394 transition does + not look like it will happen soon. + + -- Sam Hocevar (Debian packages) Wed, 4 Oct 2006 14:00:16 +0200 + +vlc (0.8.6-svn20061001.debian-1) unstable; urgency=low + + * New upstream SVN snapshot. + + -- Sam Hocevar (Debian packages) Sun, 1 Oct 2006 17:57:57 +0200 + +vlc (0.8.6-svn20060925.debian-1) unstable; urgency=low + + [ Sam Hocevar ] + * New upstrean SVN snapshot. + * This release fixes issues with the French Freebox device (Closes: #388332). + + * debian/control: + + Added Clément Stenac to the uploaders. + + * 020_certificates_paths.diff: + + New patch from upstream that looks for SSL certificates in + /etc/ssl/certs/ca-certificates.crt (Closes: #365239). + + [ Clément Stenac ] + * Add VCS information to control + + -- Sam Hocevar (Debian packages) Mon, 25 Sep 2006 14:00:46 +0200 + +vlc (0.8.6-svn20060918.debian-1) unstable; urgency=low + + * New upstream SVN snapshot, with a slightly saner version number. + * debian/rules: + + Call dh_install with -si so that it does not try to install files that + are not for us (Closes: #387873). + + -- Sam Hocevar (Debian packages) Mon, 18 Sep 2006 12:38:26 +0200 + +vlc (0.8.6-svn20060911.0.8.5-1-svn.debian-5) unstable; urgency=low + + * debian/control: + + Added proper conflicts/replaces to the libvlc0 package because it + overwrites files from old vlc packages (Closes: #387844). + + -- Sam Hocevar (Debian packages) Sun, 17 Sep 2006 01:38:24 +0200 + +vlc (0.8.6-svn20060911.0.8.5-1-svn.debian-4) unstable; urgency=low + + * debian/control: + + Add libsdl-image1.2-dev to the build-dependencies. + + Shorten short descriptions and add “without X support” to the vlc-nox + short description. + + -- Sam Hocevar (Debian packages) Sat, 16 Sep 2006 20:08:53 +0200 + +vlc (0.8.6-svn20060911.0.8.5-1-svn.debian-3) unstable; urgency=low + + * debian/control: + + Distribute libvlc0 in a separate package. + + Created vlc-nox package that contains VLC and all its non-X related + plugins. + * debian/rules: + + Use dh_install. + + Bail out with an error if a plugin from vlc-nox got linked to libX11. + + -- Sam Hocevar (Debian packages) Thu, 14 Sep 2006 18:39:59 +0200 + +vlc (0.8.6-svn20060911.0.8.5-1-svn.debian-2) unstable; urgency=low + + * debian/patches/000_dup_builtins.diff: + + Fix a powerpc FTBFS due to duplicate libraries in link lines. + + -- Sam Hocevar (Debian packages) Mon, 11 Sep 2006 18:32:04 +0200 + +vlc (0.8.6-svn20060911.0.8.5-1-svn.debian-1) unstable; urgency=low + + * New upstream SVN snapshot, fixes an amd64 FTBFS. + + -- Sam Hocevar (Debian packages) Mon, 11 Sep 2006 13:56:19 +0200 + +vlc (0.8.6-svn20060910.0.8.5-1-svn.debian-1) unstable; urgency=low + + * New upstream SVN snapshot, from the forthcoming 0.8.5-1 branch. + * This branch's playlist window does not crash like the 0.8.6 does + (Closes: #375213, #385036, #384869). + + * Upstream fixed implicit pointer functions (Closes: #385192). + * Upstream's x264 build system now uses config.guess instead of uname to + detect system and CPU types (Closes: #385535). + * Upstream removed debug messages from the ts plugin (Closes: #385008, + Closes: #385323). + * Aspect ration in mkv files was fixed (Closes: #385876). + + * debian/control: + + Build-depend on libcaca-dev (>= 0.99.beta4-1) so that we no longer pull + useless build dependencies (Closes: #385536). + + Have VLC depend on ttf-dejavu again. It's used for subtitles and the + default skin. + * debian/copyright: + + Full copyright holders and license audit (Closes: #324978). + * debian/rules: + + No longer install old copyright files (Closes: #385200). + + Re-activated the speex module (Closes: #386204). + + Don't install TTF fonts, use the ones from ttf-dejavu instead. + + * debian/patches/020_freetype_font.diff: + + Renamed this patch into 020_dejavu_font.diff and made it use dejavu + fonts. + + -- Sam Hocevar (Debian packages) Sun, 10 Sep 2006 19:02:17 +0200 + +vlc (0.8.6-svn20060823.debian-3) unstable; urgency=low + + * debian/control: + + Added missing build-dep on libdc1394-13-dev (Closes: #384568, #384582). + + Build-depend on a newer libcaca for better colour ASCII rendering. + + -- Sam Hocevar (Debian packages) Fri, 25 Aug 2006 11:19:00 +0200 + +vlc (0.8.6-svn20060823.debian-2) unstable; urgency=low + + * debian/control: + + Added missing build-dep on libraw1394-dev. + * debian/rules: + + Replaced --enable-livedotcom with --enable-live555. + + -- Sam Hocevar (Debian packages) Fri, 25 Aug 2006 09:37:47 +0200 + +vlc (0.8.6-svn20060823.debian-1) unstable; urgency=low + + * New upstream SVN snapshot. + * debian/rules: + + Distribute a shared version of libvlc. + + Activated the twolame encoder. + * debian/control: + + Build-depend on a newer libavcodec so as to get WMV3 decoding support. + + Cleaned up package dependencies a bit. + + * debian/patches/000_ltmain.diff: + + Work around libtool not wanting to install our plugins. + + -- Sam Hocevar (Debian packages) Thu, 24 Aug 2006 18:06:12 +0200 + +vlc (0.8.5.debian-2) unstable; urgency=low + + * debian/rules: + + Fix generation of Arch: all transition packages. + + -- Sam Hocevar (Debian packages) Wed, 7 Jun 2006 14:46:22 +0200 + +vlc (0.8.5.debian-1) unstable; urgency=low + + * New upstream release (Closes: #364934). + * This release no longer disables audio input if the v4l video device does + not advertise an audio device (Closes: #316377). + * This release fixes PPC asm compilation issues in x264 (Closes: #366965). + + * 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_altivec.diff: + * debian/patches/030_x264_armvl.diff: + + Patches applied upstream. Removed. + + -- Sam Hocevar (Debian packages) Tue, 23 May 2006 16:15:56 +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) Tue, 25 Apr 2006 09:05:45 +0200 + +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. + + * debian/patches/030_x264_armvl.diff: + + Added support for the armv4l CPU. + + -- Sam Hocevar (Debian packages) 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: + + Fixed the CPU features used by the deinterlace plugin and no + longer crashes on non-SSE machines (Closes: #363153). + + Properly build on amd64 wrt PIC (Closes: #339372, #330146, #330154). + + Fixed the double pane in settings dialog issue (Closes: #343031). + + Help flags now adapt to the locale and help formatting was fixed + (Closes: #347278). + + HTTP streaming no longer fails (Closes: #352599). + + Memory leak fixed (Closes: #359655). + + x264 build system supports ppc64 and mips64 (Closes: #361452, #358233). + + OGG muxing was fixed (Closes: #364321). + + * debian/control: + + Removed legacy dummy packages. + + Switched from dpatch to quilt. + + Removed now useless build-dependency on gcc-snapshot (Closes: #361729). + + Ditto for xlibs-static-pic (Closes: #364265). + + Build-depend on newer ffmpeg libraries so that we dynamically link + against them. + + Build-depend on newer Matroska libraries to fix .mkv support + (Closes: #348404). + + Build-depend on libxul-dev and xulrunner instead of mozilla-dev. + + Build-depend on newer live555 libraries. + + Depend on vlc-plugin-alsa. + + Removed the ttf-freefont dependency (Closes: #353459, #362071). + + * debian/vlc.mime: + + Fixed broken templates (Closes: #354101). + + * debian/patches/010_no-wx-updates.diff: + + Created from old dpatch. Disables broken "check for updates" button. + + * debian/patches/010_osdmenu-paths.diff + + Created from old dpatch. Fixes file paths for OSD plugin. + + * debian/patches/020_xulrunner.diff: + + Build using XULrunner (Closes: #364381). + + * debian/patches/020_freetype_font: + + Do not hardcode the default font, let VLC find one itself. + + -- Sam Hocevar (Debian packages) Mon, 24 Apr 2006 18:10:10 +0200 + +vlc (0.8.4.debian-2) unstable; urgency=low + + * debian/rules: + + Enable zeroconf/bonjour support (Closes: #348085). + + Enable musepack decoding support. + + Enable VCD navigation support. + * debian/control: + + Build-depend on more recent versions of libavcodec to fix CVE-2005-4048. + + Build-depend on libhal-dev (>= 0.5.5.1-3) for the dbus transition. + + Build-depend on libavahi-client-dev. + + Build-depend on libmpcdec-dev. + + Build-depend on libsysfs-dev so that the MP4 module can get an iPod’s + version number. + + Build-depend on libvcdinfo-dev. + * debian/vlc.mime: + + Put flags after the command, as per mailcap(5) (Closes: #340434). + + * src/libvlc.c configure.ac modules/services_discovery/hal.c: + + Backported HAL 0.5 patch from upstream, thanks to Clément Stenac and + Loïc Minier. As a result, we now build and install again on unstable + (Closes: #332927, #347598, #347847). + * extras/x264/configure: + + Support the armv5tel platform. + + -- Sam Hocevar (Debian packages) Sun, 22 Jan 2006 12:08:42 +0100 + +vlc (0.8.4.debian-1) unstable; urgency=low + + * New upstream release. + + -- Sam Hocevar (Debian packages) Sat, 26 Nov 2005 19:55:09 +0100 + +vlc (0.8.4-test2-2) unstable; urgency=low + + * extras/x264/configure: + + Teach the configure script about the Alpha platform. + + -- Sam Hocevar (Debian packages) Fri, 11 Nov 2005 18:49:31 +0100 + +vlc (0.8.4-test2-1) unstable; urgency=low + + * New upstream release. + * debian/control: + + Build-depend on a newer version of gnutls (Closes: #335774). + + Replaced occurrences of "wxwindows" with "wxwidgets" (Closes: #330141). + * debian/rules: + + Use dh_buildinfo because of all the static libraries we use. + * Upstream fixed the wx code so that it builds with newer versions of the + library (Closes: #332282, #332773). + + -- Sam Hocevar (Debian packages) Fri, 11 Nov 2005 10:41:35 +0100 + +vlc (0.8.4-svn20050920-3) unstable; urgency=low + + * configure.ac: + + Fixed a bug in the gnomevfs plugin configuration. + * debian/rules: + + Explicitly disable the GnomeVFS plugin (Closes: #329317). + * debian/control: + + Buuild-depend on yasm on amd64. + + -- Sam Hocevar (Debian packages) Wed, 21 Sep 2005 11:36:24 +0200 + +vlc (0.8.4-svn20050920-2) unstable; urgency=low + + * configure: + + Fixed the powerpc build with gcc-4.x. + * extras/x264/configure: + + Added missing Debian architectures to the configure script. + + -- Sam Hocevar (Debian packages) Tue, 20 Sep 2005 17:46:35 +0200 + +vlc (0.8.4-svn20050920-1) unstable; urgency=low + + * New SVN snapshot. + * configure.ac: + + Upstream fixed the AltiVec build on PPC. + * debian/control: + + Build-depend on a newer version of libavcodec. mp2v and mp1v encoders + work again (Closes: #324840). + + Build-depend on gcc-snapshot on i386 and amd64, because currently only + that version of gcc properly builds some of the MMX modules. + + -- Sam Hocevar (Debian packages) Tue, 20 Sep 2005 13:43:41 +0200 + +vlc (0.8.4-svn20050823-2) unstable; urgency=low + + * debian/control: + + Build-depend on libflac-dev (>= 1.1.2-3) because of the soname + change (Closes: #325948). + * debian/copyright: + + Fixed the FSF address. + + -- Sam Hocevar (Debian packages) Thu, 1 Sep 2005 12:36:10 +0200 + +vlc (0.8.4-svn20050823-1) unstable; urgency=low + + * New SVN snapshot. + * debian/control: + + Build-depend on libsmbclient-dev. + + Build-depend on libwxgtk2.6-dev (Closes: #285373), which means the + interface now works with non-UTF8 locales (Closes: #308770, #322665). + + Build-depend on a newer version of libavcodec. + * debian/rules: + + Activated SMB client support. + + Install desktop files in usr/share/applications instead of + usr/share/gnome/apps/Multimedia. + * debian/patches/00list: + + 20_no-wx-updates.dpatch: disabled the update check. + + 20_interfaces.dpatch: disabled deprecated patch. + * configure.ac: + + Fixes powerpc build. + * include/network.h src/misc/net.c: + + Fixes HTTP input (Closes: #322757). + + Fixes URL encoding in the RTSP module (Closes: #323813). + * modules/gui/skins2 modules/gui/wxwidgets: + + Fixes a compilation issue on 64-bit architectures (Closes: #324031). + * modules/visualization/xosd.c: + + Fixes libxosd initialisation (Closes: #324039). + + -- Sam Hocevar (Debian packages) Mon, 22 Aug 2005 14:43:48 +0200 + +vlc (0.8.4-svn20050810-2) unstable; urgency=low + + * debian/control: + + Build-depend on libarts1-dev (>= 1.4.2-1). + + Build-depend on a newer version of libavcodec. + + -- Sam Hocevar (Debian packages) Tue, 16 Aug 2005 17:36:21 +0200 + +vlc (0.8.4-svn20050810-1) unstable; urgency=low + + * New SVN snapshot. + * Rebuilt against libaa1 and new wxWin and SDL packages to complete the + aalib transition (Closes: #320874) and make the packages installable again + (Closes: #319292, #319598, #321461, #322166, #317380). + * debian/rules: + + Use DEB_BUILD_ARCH_CPU instead of DEB_BUILD_GNU_CPU. + * debian/vlc.desktop: + + Added desktop file, thanks to Mantas Kriauciunas (Closes: #290612). + * debian/control: + + Removed unused dummy packages (Closes: #321988, #322003, #322013). + + Build-depend on libmatroska-dev (>= 0.7.7). + + Build-depend on libwxgtk2.4-dev (>= 2.4.4). + + Build-depend on libdvbpsi4-dev instead of libdvbpsi3-dev. + * Build-depend on libsdl1.2-dev (>= 1.2.7+1.2.8cvs20041007-5.3). + + Build-depend on a newer version of libmatroska-dev and mozilla-dev + because of the C++ transition. + + Build-depend on libsvga1-dev instead of svgalib1-dev. + * This snapshot no longer uses tune=opteron on amd64 (Closes: #316161). + * The SVN version adds support for Freebox users (Closes: #317035). + * Various gcc-4.x FTBFS were fixed upstream (Closes: #317055). + * mozilla/support/npunix.c: fixed undeclared NPP_GetJavaClass + (Closes: #317067). + + -- Sam Hocevar (Debian packages) Wed, 10 Aug 2005 16:18:37 +0200 + +vlc (0.8.2-1) unstable; urgency=low + + * New upstream release. + * This version fixes the random playlist parsing (Closes: #308375), encodes + non-ASCII characters in RTSP requests (Closes: #279735) and fixes an issue + with large files (Closes: #306110). + * debian/control: + + Set policy to 3.6.2.1. + + Build-depend on libpng12-dev, xlibmesa-gl-dev. + + Build-depend on a more recent ffmpeg library set, to fix nasty visual + artifacts with post-processing (Closes: #300220). + + mozilla-plugin-vlc recommends mozilla-firefox in addition to + mozilla-browser (Closes: #308723). + + Now that sarge is out, removed legacy packages that disappeared in woody. + * debian/rules: + + Activated PNG output support. + + Activated GLX output support. + * The NEWS file documents the changed behaviour for SAP (Closes: #303262). + * Minor typo fixed in the manpage (Closes: #300339). + * po/de.po: merged corrections from Jens Seidel (Closes: #313890). + + -- Sam Hocevar (Debian packages) Sun, 26 Jun 2005 16:28:19 +0200 + +vlc (0.8.1.svn20050314-1) unstable; urgency=low + + * More recent SVN snapshot. + * This snapshot fixes issues in modules/gui/wxwindows/streamout.cpp that + caused FTBFS on 64-bit architectures (Closes: #289923). + * debian/control: + + Build-depend on new libmatroska and libavcodec versions. + + Unfortunate return to wxwidgets 2.4 until 2.5 enters testing. + + Upgraded libflac-dev build dependency to (>= 1.1.1-5) to resolve + dependency issues (Closes: #298067). + * debian/vlc.mime: merged Guido Guenther’s contribution (Closes: #297261). + + -- Sam Hocevar (Debian packages) Mon, 14 Mar 2005 10:53:59 +0100 + +vlc (0.8.1-3) unstable; urgency=low + + * debian/control: + + Build-depend on fixed ffmpeg packages (Closes: #289444). + + Build-depend on a newer libflac-dev so that resulting packages use + libflac6 (Closes: #289490). + * modules/gui/wxwindows/open.cpp: + + Compilation fix for 64 bits systems. + + -- Sam Hocevar (Debian packages) Mon, 10 Jan 2005 11:10:02 +0100 + +vlc (0.8.1-2) unstable; urgency=low + + * debian/control: + + Use ffmpeg from Debian instead of the contrib one. + + Use wxgtk2.5 instead of 2.4. + + Activated the ncurses UI (Closes: #286962). + * debian/gnome-vlc.desktop debian/gvlc.desktop: + + Fixed the icon location. + + -- Sam Hocevar (Debian packages) Thu, 6 Jan 2005 18:00:00 +0100 + +vlc (0.8.1-1) unstable; urgency=low + + * New upstream release. + * debian/gnome-vlc.desktop: + + Fixed program path (Closes: #280290). + * debian/control: + + Require an up-to-date liblivemedia. + + Build-depend on libgnutls11-dev. + + -- Sam Hocevar (Debian packages) Sun, 14 Nov 2004 22:21:23 +0100 + +vlc (0.8.0.final-1) unstable; urgency=low + + * Final 0.8.0 upstream release. + * src/misc/modules.c: + + Fixed a startup issue with the svlc shortcut (Closes: #274376). + * debian/control: + + Suggest the Mozilla and ALSA plugins. Only mentioned the others in + the package description because they are not of notable usefulness + (Closes: #275160). + * modules/access/http.c: + + Fix HTTP proxy handling (Closes: #278381). + + -- Sam Hocevar (Debian packages) Wed, 3 Nov 2004 14:52:05 +0100 + +vlc (0.8.0-test1-1) unstable; urgency=high + + * New upstream tarball. + * debian/rules: + + Fixed previously broken DVD support. + + Removed currently broken Speex support. + * debian/control: + + Build-depend on libdvdnav. + + -- Sam Hocevar (Debian packages) Sat, 4 Sep 2004 02:32:49 +0200 + +vlc (0.7.2.svn20040827-1) unstable; urgency=high + + * New SVN snapshot. + * debian/rules: + + Activated x264 support. + + Re-enabled libmodplug support. + + Build PIC plugins even on x86. + + Disabled SLP because its code is broken. + + Disabled the GNOME, Qt, GTK+ and KDE interfaces in favour of the + WxWidgets one. + + Activated HAL support. + * debian/control: + + Force the vlc-plugin-arts dependencies. + + Build-depend on jam and nasm because of x264. + + -- Sam Hocevar (Debian packages) Fri, 27 Aug 2004 21:31:13 +0200 + +vlc (0.7.2.final-11) unstable; urgency=medium + + * configure.ac: + + Fixed an LDFLAGS/CFLAGS confusion. + + Don't use -finline-limit since it now tries to inline functions that + have not been explicitely inlined (Closes: #265673). + * debian/patches/20_configure.dpatch: + + Don't manage this patch with dpatch since it causes ownership issues. + + -- Sam Hocevar (Debian packages) Sun, 15 Aug 2004 01:35:35 +0200 + +vlc (0.7.2.final-10) unstable; urgency=medium + + * The "I hope I got it right this time" upload. + * configure.ac: + + Use -maltivec -mabi=altivec for the memcpyaltivec and deinterlace + plugins on PowerPC. + + -- Sam Hocevar (Debian packages) Tue, 10 Aug 2004 18:01:47 +0200 + +vlc (0.7.2.final-9) unstable; urgency=low + + * debian/control: + + Added a missing dpatch build dependency (Closes: #263363). + + Removed the modplug plugin until libmodplug-dev enters Debian. + + -- Sam Hocevar (Debian packages) Tue, 10 Aug 2004 11:01:15 +0200 + +vlc (0.7.2.final-8) unstable; urgency=low + + * debian/control: + + Added a missing dpatch build dependency. + * configure.ac: + + Fixed the powerpc build by conditionally re-enabling -maltivec + -mabi=altivec. + + -- Sam Hocevar (Debian packages) Fri, 30 Jul 2004 00:05:58 +0200 + +vlc (0.7.2.final-7) unstable; urgency=low + + * debian/rules: + + Switch build system to dpatch. + + -- Sam Hocevar (Debian packages) Thu, 29 Jul 2004 17:03:51 +0200 + +vlc (0.7.2.final-6) unstable; urgency=low + + * configure.ac: don't use -maltivec -mabi=altivec, because we don't want + to trigger AltiVec optimisations in our generic code (Closes: #256578, + Closes: #260819). + + -- Sam Hocevar (Debian packages) Fri, 23 Jul 2004 17:21:21 +0200 + +vlc (0.7.2.final-5) unstable; urgency=low + + * debian/control: + + Build-depend on libdvbpsi3-dev, so that we can get rid of the previous + versions of this library. + + Recommend the videolan-doc package. + + Build-conflict on libavcodec-dev, just in case it enters Sid at an + unappropriate moment. + * debian/README.Debian: + + Removed mention of the libmpeg2 tree, which we no longer provide. + + -- Sam Hocevar (Debian packages) Tue, 20 Jul 2004 11:25:17 +0200 + +vlc (0.7.2.final-4) unstable; urgency=low + + * debian/rules: + + Activated Theora support (Closes: #259061). + + Re-enabled the KDE plugin (Closes: #258295). + * debian/control: + + Set policy to 3.6.1.1. + + -- Sam Hocevar (Debian packages) Tue, 13 Jul 2004 00:21:20 +0200 + +vlc (0.7.2.final-3) unstable; urgency=low + + * extras/ffmpeg/configure: fixed HPPA architecture detection. + + -- Sam Hocevar (Debian packages) Fri, 25 Jun 2004 11:55:33 +0200 + +vlc (0.7.2.final-2) unstable; urgency=low + + * extras/ffmpeg/libavcodec/svq1.c: fixed vector/vect namespace issues on + powerpc. + + -- Sam Hocevar (Debian packages) Tue, 22 Jun 2004 15:21:09 +0200 + +vlc (0.7.2.final-1) unstable; urgency=low + + * New upstream release. + * Temporarily disabled the KDE GUI plugin. + + -- Sam Hocevar (Debian packages) Sat, 29 May 2004 00:06:48 -0300 + +vlc (0.7.2-test2-1) unstable; urgency=low + + * New upstream snapshot. + + -- Sam Hocevar (Debian packages) Thu, 6 May 2004 11:11:25 +0200 + +vlc (0.7.2-test1-4) unstable; urgency=low + + * extras/ffmpeg/libacvodec/Makefile: + + Fixed a PARISC/HPPA mix-up. + * src/interface/interface.c: + + Removed the "switch interface" menu due to wxwin's utter bugosity. + + -- Sam Hocevar (Debian packages) Fri, 30 Apr 2004 13:15:59 +0200 + +vlc (0.7.2-test1-3) unstable; urgency=low + + * configure.ac: + + Link DTS plugins with libdts_pic.a, not libdts.a. + * debian/control: + + Build-depend on libid3tag0-dev for ID3 tag support. + + Made vlc depend on wxvlc for the moment. + * extras/ffmpeg/libacvodec/Makefile: + + Build motion_est.c with -O1. + + -- Sam Hocevar (Debian packages) Fri, 30 Apr 2004 10:49:59 +0200 + +vlc (0.7.2-test1-2) unstable; urgency=low + + * debian/control: + + Build-depend on libxml2-dev. + * extras/ffmpeg/libavcodec/ppc/dsputil_altivec.c: + + Syntax fixes for powerpc. + + -- Sam Hocevar (Debian packages) Wed, 28 Apr 2004 12:49:18 +0200 + +vlc (0.7.2-test1-1) unstable; urgency=low + + * New SVN snapshot. + * The skinned interface is now the default one (Closes: #245210). + * debian/control: + + Removed the libdv2-dev build-dependency. + + Set the liblivemedia-dev build-dependency to (>= 2004.04.23-1). + + Set the libmatroska-dev build-dependency to (>= 0.7.0). + + Build-depend on libfribidi-dev. + + Build-depend on libcdio-dev. + + Build-depend on libmodplug-dev. + * debian/rules: + + Activated fribidi support. + + Activated CDDA support via libcdio. + + Activated MOD support. + * configure.ac: + + Re-enabled i420_yuy2_altivec. + * src/interface/interface.c: + + Disable unavailable interfaces from the switch menu (Closes: #245209). + + -- Sam Hocevar (Debian packages) Mon, 26 Apr 2004 16:30:25 +0200 + +vlc (0.7.1-7) unstable; urgency=high + + * debian/control: + + Override kdelibs4's shlibs value to get VLC into testing. + + No longer build-depend on dvb-dev. + + -- Sam Hocevar (Debian packages) Tue, 20 Apr 2004 18:00:40 +0200 + +vlc (0.7.1-6) unstable; urgency=low + + * debian/control: + + Removed the build dependency on gcc-3.2 because gcc-3.3 no longer ICEs + on ppc/mpegvideo_altivec.o (Closes: #236442). + + Build depend on fixed libsdl1.2-dev (>= 1.2.7-5). + + -- Sam Hocevar (Debian packages) Tue, 6 Apr 2004 10:27:35 +0200 + +vlc (0.7.1-5) unstable; urgency=low + + * debian/control: + + Added a build-dependency on libaudiofile-dev to fix the m68k build. + * debian/rules: + + Added symlinks for mozilla-firefox (Closes: #239352). + + -- Sam Hocevar (Debian packages) Tue, 30 Mar 2004 23:10:20 +0200 + +vlc (0.7.1-4) unstable; urgency=medium + + * extras/ffmpeg/libavcodec/ppc/mpegvideo_ppc.c: + + Replaced fprintf() with av_log() to fix the powerpc build. + + -- Sam Hocevar (Debian packages) Sun, 21 Mar 2004 13:59:07 +0100 + +vlc (0.7.1-3) unstable; urgency=medium + + * debian/rules: + + Activated DTS decoding support. + * debian/control: + + Build-depend on libx11-dev, libxext-dev, libxt-dev instead of xlibs-dev. + + Build-depend on libxv-dev, xlibs-static-pic instead of xlibs-pic. + + -- Sam Hocevar (Debian packages) Sat, 20 Mar 2004 18:13:43 +0100 + +vlc (0.7.1-2) unstable; urgency=medium + + * debian/control: + + Build-depend on zlib1g-dev because ffmpeg uses it by default. + * configure.ac: + + Add -lz to the link flags for plugins that use ffmpeg. + + Disabled i420_yuy2_altivec for now, because it only has a C version of + the AltiVec routines. + + -- Sam Hocevar (Debian packages) Thu, 4 Mar 2004 17:34:58 +0100 + +vlc (0.7.1-1) unstable; urgency=medium + + * New upstream release. + * debian/copyright: + + Added faad2 and ffmpeg authors to the copyright (Closes: #212766). + * mozilla/vlcplugin.h: + + Added the 'video/x-ms-asf' MIME type to the plugin (Closes: #232690). + + -- Sam Hocevar (Debian packages) Wed, 3 Mar 2004 10:47:21 +0100 + +vlc (0.7.0-3) unstable; urgency=medium + + * ppc/mpegvideo_altivec.c: + + Build this file with GCC 3.2 to work around an ICE. + + -- Sam Hocevar (Debian packages) Wed, 21 Jan 2004 15:36:30 +0100 + +vlc (0.7.0-2) unstable; urgency=low + + * debian/rules: + + Look for faad in extras/faad2, not extras/faad. + * modules/demux/mkv.cpp: + + Updated mkv module for the latest Matroska version (Closes: #227923). + * modules/video_output/caca.c: + + Updated caca module for the latest libcaca version. + + -- Sam Hocevar (Debian packages) Tue, 20 Jan 2004 18:30:58 +0100 + +vlc (0.7.0-1) unstable; urgency=low + + * New upstream release. + * debian/control: + + Build-depend on fixed dvb-dev packages. + + Build-depend on fixed linux-kernel-headers packages. + * debian/rules: + + Look for faad in extras/faad2, not extras/faad. + + Enable postprocessing in the ffmpeg configuration. + + Activated libcaca video output. + * doc/vlc.1: + + Fixed a minor typo (Closes: #223605). + + -- Sam Hocevar (Debian packages) Sun, 4 Jan 2004 03:29:22 +0100 + +vlc (0.6.2+cvs20031030-2) unstable; urgency=low + + * debian/control: + + Build-depend on a newer wxwindows version to avoid incompatibilities. + + Build-depend on linux-kernel-headers and build-conflict on dvb-dev + because these packages cannot be installed together. + * debian/rules: + + Temporarily disabled the framebuffer video output plugin because of + current code errors in linux-kernel-headers. + + -- Sam Hocevar (Debian packages) Sat, 1 Nov 2003 11:01:40 +0100 + +vlc (0.6.2+cvs20031030-1) unstable; urgency=low + + * New CVS snapshot. + * debian/rules: + + Disabled the deprecated satellite plugin; the dvb plugin is now + the recommended one (Closes: #216367). + + Don't install fortunes in /usr/share/games, they are too private for + common mortals (Closes: #212856). They are still available in the + /usr/share/doc/vlc directory though. + + Activated the speex codec. + + Activated the PVR input module. + * debian/control: + + Depend on ttf-freefont for subtitles. + + Upgraded debhelper build-dependency to (>= 4.0). + + -- Sam Hocevar (Debian packages) Fri, 31 Oct 2003 11:08:57 +0100 + +vlc (0.6.2-3) unstable; urgency=low + + * debian/control: + + Set libxosd-dev build-dependency to (>= 2.2.4-1.3) because previous + versions were broken on s390 (Closes: #208383). + + Rewrote long descriptions (Closes: #209602, #209615, #209628, #209636, + Closes: #209774, #209914, #210028, #210095). + + -- Sam Hocevar (Debian packages) Mon, 15 Sep 2003 21:28:43 +0200 + +vlc (0.6.2-2) unstable; urgency=low + + * debian/control: + + Set libmatroska-dev build-dependency to (>= 0.5.0-3) because previous + versions were broken on platforms where PIC/non-PIC cannot be mixed in + objects (Closes: #208383). + + Set policy to 3.6.1.0. + + -- Sam Hocevar (Debian packages) Fri, 5 Sep 2003 02:32:54 +0200 + +vlc (0.6.2-1) unstable; urgency=low + + * New upstream release. + * debian/control: + + Added a build-dependency on freetype6-dev. + + Added a build-dependency on libdvbpsi2-dev. + + We now recommend gnome-vlc | wxvlc. + + We now suggest fortune-mod. + * This release now uses libfreetype to render subtitles, and we recommend + ttf-freefont | ttf-thryomanes, so that the old .rle font is no longer + needed (Closes: #203013). + * extras/faad: + + aclocal-1.6 && autoconf && automake-1.6 -a -c -f && libtoolize -c -f + * extras/faad/common/mp4v2: + + aclocal-1.4 && autoconf && autoheader && automake-1.4 --foreign -a -c \ + && libtoolize -c -f + * extras/mpeg2dec: + + aclocal-1.7 && autoconf && automake-1.7 -a -c && libtoolize -c -f + + -- Sam Hocevar (Debian packages) Tue, 2 Sep 2003 10:45:24 +0200 + +vlc (0.6.0+cvs-20030716-2) unstable; urgency=low + + * debian/control: + + Updated debhelper build-dependency to (>= 3.4.4) because we now + use debian/compat. + + Use ${misc:Depends} everywhere. + + -- Sam Hocevar (Debian packages) Wed, 16 Jul 2003 16:55:31 +0200 + +vlc (0.6.0+cvs-20030716-1) unstable; urgency=low + + * New CVS snapshot. + * debian/control: + + Set policy to 3.6.0. No changes required. + + Extended the package description. + * modules/video_output/x11/xcommon.c: + + Fix for crashes in the Mozilla plugin (Closes: #200920). + * mozilla/*: + + Compilation fixes for Mozilla 1.4 headers (Closes: #201093). + + -- Sam Hocevar (Debian packages) Wed, 16 Jul 2003 16:55:31 +0200 + +vlc (0.6.0+cvs-20030705-1) unstable; urgency=low + + * New CVS snapshot. + + Includes previous Debian fixes. + + Errors in plugins now properly trigger build abort so that no build + failures are missed. Thanks to LaMont Jones for pointing out the problem. + * debian/rules: + + Enabled Matroska support. + + Only build builtins in the first compile pass so that we don't mix PIC + and non-PIC code (Closes: #199968). Phew, I hope I got it right this + time. + * extras/ffmpeg: + + Re-applied the Alpha build fix from 0.6.0+cvs-20030627-2 that had + disappeared in 0.6.0+cvs-20030703-1. + + -- Sam Hocevar (Debian packages) Sat, 5 Jul 2003 01:09:11 +0200 + +vlc (0.6.0+cvs-20030703-1) unstable; urgency=low + + * New CVS snapshot. + + Includes previous Debian fixes. + + Build should be a bit faster now. + * extras/faad: + + aclocal-1.6 && autoconf && automake-1.6 -a -c -f && libtoolize -c -f + * extras/faad/common/id3lib: + + mkdir doc examples + + aclocal-1.4 && autoconf && automake-1.4 -a -c && libtoolize -c -f + * extras/mpeg2dec: + + aclocal-1.7 && autoconf && automake-1.7 -a -c && libtoolize -c -f + + Fixes build on parisc (Closes: #199693). + + -- Sam Hocevar (Debian packages) Thu, 3 Jul 2003 11:25:57 +0200 + +vlc (0.6.0+cvs-20030627-2) unstable; urgency=low + + * extras/ffmpeg: + + Fixed compilation for Alpha. + * debian/rules: + + Enabled the video4linux input plugin (Closes: #199427). + + -- Sam Hocevar (Debian packages) Sun, 29 Jun 2003 21:12:10 +0200 + +vlc (0.6.0+cvs-20030627-1) unstable; urgency=low + + * New upstream release. + * debian/rules: + + Replaced $(DEB_BUILD_ARCH) with `dpkg-architecture -qDEB_BUILD_GNU_CPU` + so that the rules can be called directly. + + Use the -s flag instead of -a so that debhelper properly handles the + i386-only plugin packages. + + Split the build rule into configure and build. + * debian/control: + + Removed leading "a"s from package descriptions. + + Set policy to 3.5.10. + + -- Sam Hocevar (Debian packages) Sat, 21 Jun 2003 17:55:07 +0200 + +vlc (0.5.3-3) unstable; urgency=low + + * Built-in modules were linked twice in the mozilla plugin; removed the + non-PIC ones (Closes: #194384). + + -- Samuel Hocevar Fri, 23 May 2003 11:15:19 +0200 + +vlc (0.5.3-2) unstable; urgency=low + + * Changed the libvlc0-dev section to libdevel. + * We now build the static objects twice: once the normal way before we + link them with VLC, and once with -fPIC so that they can be linked to + the Mozilla plugin. + * Updated extras/faad/config.{sub,guess}. + + -- Samuel Hocevar Fri, 14 Apr 2003 15:14:07 +0200 + +vlc (0.5.3-1) unstable; urgency=low + + * New upstream release. + * Fixed a clock skew issue in debian/rules. + + -- Samuel Hocevar Tue, 8 Apr 2003 15:20:20 +0100 + +vlc (0.5.2-4) unstable; urgency=low + + * Changed the section of gnome-vlc and kvlc according to new Debian + archive sections. + * Updated woody-buildpackage so that packages say "stable". + + -- Samuel Hocevar Tue, 1 Apr 2003 18:08:01 +0200 + +vlc (0.5.2-3) unstable; urgency=low + + * Added explicit dependencies on vlc to legacy packages to make linda and + lintian happier. + * Added correct versioned build-dependency on debhelper. + * Updated the autotools helper files in extras/faad. + + -- Samuel Hocevar Wed, 26 Mar 2003 02:50:34 +0100 + +vlc (0.5.2-2) unstable; urgency=low + + * Bumped up standards version to 0.5.9.0. + * Added build-dependencies on libidl0 and libglib2.0-0 to work around + mozilla-dev's currently broken dependencies. + * We now link against libdvdread3 instead of libdvdread2. + + -- Samuel Hocevar Tue, 25 Mar 2003 23:21:51 +0100 + +vlc (0.5.2-1) unstable; urgency=low + + * New upstream release. + * Removed vlc-plugin-dvb, vlc-plugin-xosd, vlc-plugin-aa, vlc-plugin-lirc and + vlc-plugin-dv packages because the dependencies are quite small, and merged + them into the main vlc package. + * Removed the vlc-mad, vlc-arts, vlc-lirc and vlc-aa legacy packages because + they were not in woody. + + -- Samuel Hocevar Tue, 11 Mar 2003 20:32:36 +0100 + +vlc (0.5.1-1) unstable; urgency=low + + * New upstream release. + * The vlc-glide package is now Architecture: i386 only. + * The vlc-plugin-mad package Provides: mp3-decoder. + * The deprecated vlc-* packages have a proper link to /usr/share/doc/vlc/. + + -- Samuel Hocevar Sat, 15 Feb 2003 03:43:33 +0100 + +vlc (0.5.0-1) unstable; urgency=low + + * New upstream release (Closes: #157166). + * Audio MPEG and A52 decoders now use external libraries (libmad, liba52). + * Build-Depends are now valid (Closes: #147103). + * More robust AVI parser (Closes: #158037). + * An issue with X taking more and more CPU was fixed (Closes: #153286). + * Package now includes a NEWS file. + * New package containing a Mozilla plugin. + * New codec packages: Ogg/Vorbis, DV. + * New GUI package: wxvlc (wxWindows). + * New debian/woody-buildpackage file that can be used to build Woody + packages. + * Made the GNOME desktop entries more user-friendly (Closes: #149749). + + -- Samuel Hocevar Thu, 4 Jul 2002 17:44:25 +0200 + +vlc (0.4.1-1) unstable; urgency=low + + * New upstream release. + + -- Samuel Hocevar Mon, 3 Jun 2002 23:43:35 +0200 + +vlc (0.4.0-1) unstable; urgency=low + + * New upstream release. + + -- Samuel Hocevar Thu, 23 May 2002 01:27:05 +0200 + +vlc (0.3.1-1) unstable; urgency=low + + * New upstream release. + * Fixes a crash in the Gtk+ interface. + + -- Samuel Hocevar Thu, 18 Apr 2002 06:43:42 +0200 + +vlc (0.3.0-1) unstable; urgency=low + + * New upstream release. + * Reworked Gtk interface (Closes: #138732), with a working preferences + dialog (Closes: #134142, #134147). + * The ALSA plugin now supports S/PDIF (Closes: #118301). + + -- Samuel Hocevar Sat, 6 Apr 2002 04:27:50 +0200 + +vlc (0.2.92-8) unstable; urgency=high + + * Only link with libXv.a if libXv_pic.a wasn't found, which fixes + package builds on sid. + * Added -ffunction-sections to the compilation of mpeg_vdec.a when + the architecture is hppa. + + -- Samuel Hocevar Sun, 6 Jan 2002 06:56:08 +0100 + +vlc (0.2.92-7) unstable; urgency=high + + * Fixed configure.in so that it doesn't fail on hppa. + * Fixed a symbol resolution issue that made vlc crash when libdvdcss + was installed. + + -- Samuel Hocevar Sat, 5 Jan 2002 03:46:23 +0100 + +vlc (0.2.92-6) unstable; urgency=high + + * Attempt to fix IA64 and hppa builds. + + -- Samuel Hocevar Fri, 4 Jan 2002 14:11:02 +0100 + +vlc (0.2.92-5) unstable; urgency=high + + * Many fixes imported from the 0.2.92 upstream release (VCD input, + buffer management, decoder error management). + * Removed a stupid dependency on libc6 which prevented the package + from being built on alpha. + + -- Samuel Hocevar Wed, 2 Jan 2002 04:16:44 +0100 + +vlc (0.2.92-4) unstable; urgency=high + + * Put debian/control and debian/rules in sync again (Closes: #126697). + * Replaced the 48x48 XPM icons with 32x32 icons to comply with policy + (Closes: #126939). + * Don't spawn the Gtk+ or the Gnome interface if no $DISPLAY variable is + present, which fixes the framebuffer output (Closes: #101753). + + -- Samuel Hocevar Sun, 30 Dec 2001 02:59:01 +0100 + +vlc (0.2.92-3) unstable; urgency=high + + * Removed references to vlc-mad (Closes: #126194). + + -- Samuel Hocevar Sat, 22 Dec 2001 21:04:27 +0100 + +vlc (0.2.92-2) unstable; urgency=high + + * Bumped urgency to high to get this stable version into testing; all + reported critical bugs were fixed. + * Bumped Standards-Version to 3.5.6. + * Fixed a PowerPC compilation issue. + * Fixed a crash in the VCD input. + + -- Samuel Hocevar Thu, 20 Dec 2001 23:24:21 +0100 + +vlc (0.2.92-1) unstable; urgency=low + + * Using the stable 0.2.92 CVS branch, has lots of stability fixes. + * Disabled broken ALSA audio output (Closes: #110869, #119846). + * Changed configure.in so that vlc is linked against libXv.a, + not xvideo.so and sdl.so (Closes: #111790). + * Added versioned build-dep to libasound2-dev (Closes: #121057). + + -- Samuel Hocevar Wed, 19 Dec 2001 17:06:44 +0100 + +vlc (0.2.91-2) unstable; urgency=low + + * Added "Video" menu hints (Closes: #121036). + + -- Samuel Hocevar Sun, 25 Nov 2001 02:25:34 +0100 + +vlc (0.2.91-1) unstable; urgency=low + + * New upstream release. + * This release fixes IFO parsing issues (Closes: #119369). + * vlc will dlopen() an installed libdvdcss if available, to play + encrypted DVDs (Closes: #89856). + * vlc is now in sync with the official libdvdcss (Closes: #118194). + + -- Samuel Hocevar Mon, 12 Nov 2001 17:14:29 +0100 + +vlc (0.2.90-3) unstable; urgency=low + + * Added stricter Build-Depends on libsdl1.2-dev (Closes: #117180). + + -- Samuel Hocevar Fri, 26 Oct 2001 16:06:01 +0200 + +vlc (0.2.90-2) unstable; urgency=low + + * Various upstream bugfixes. + * Compiled against libsdl1.2-debian (Closes: #116709). + + -- Samuel Hocevar Tue, 23 Oct 2001 02:09:39 +0200 + +vlc (0.2.90-1) unstable; urgency=low + + * Fixed syntax error in build dependencies (Closes: #109722). + * XVideo module now compiled as built-in, to avoid PIC and non-PIC + code collision (Closes: #111790). + + -- Samuel Hocevar Wed, 10 Oct 2001 15:00:29 +0200 + +vlc (0.2.83-2) unstable; urgency=low + + * Fixed build dependencies for architectures not supporting libasound2 + (Closes: #109722). + + -- Samuel Hocevar Fri, 24 Aug 2001 12:47:45 +0200 + +vlc (0.2.83-1) unstable; urgency=low + + * New upstream release. + * Activated subtitles in overlay mode (Closes: #97471). + + -- Samuel Hocevar Wed, 22 Aug 2001 15:18:01 +0200 + +vlc (0.2.82-1) unstable; urgency=low + + * New upstream release. + * Fixed broken manpage symlinks (Closes: #99561). + + -- Samuel Hocevar Tue, 7 Aug 2001 12:39:16 +0200 + +vlc (0.2.81-1) unstable; urgency=low + + * New upstream release. + + -- Samuel Hocevar Sat, 28 Jul 2001 04:13:57 +0200 + +vlc (0.2.80-1) unstable; urgency=low + + * New upstream release. + + -- Samuel Hocevar Tue, 5 Jun 2001 04:41:06 +0200 + +vlc (0.2.73-2) unstable; urgency=low + + * We now build without MMX in the main application (Closes: #96036). + + -- Samuel Hocevar Fri, 4 May 2001 07:13:04 +0200 + +vlc (0.2.73-1) unstable; urgency=low + + * New upstream release. + + -- Samuel Hocevar Sat, 28 Apr 2001 07:02:35 +0200 + +vlc (0.2.72-1) unstable; urgency=low + + * New upstream release. + + -- Samuel Hocevar Mon, 16 Apr 2001 14:33:53 +0200 + +vlc (0.2.71-1) unstable; urgency=low + + * New upstream release. + + -- Samuel Hocevar Fri, 13 Apr 2001 08:13:26 +0200 + +vlc (0.2.70-1) unstable; urgency=low + + * New upstream release. + * Non-i386 package builds really fixed (Closes: #89285). + + -- Samuel Hocevar Sat, 7 Apr 2001 05:52:00 +0200 + +vlc (0.2.63-3) unstable; urgency=low + + * Added versioned conflicts/replaces to vlc-gtk (Closes: #88796). + + -- Samuel Hocevar Wed, 7 Mar 2001 20:47:48 +0100 + +vlc (0.2.63-2) unstable; urgency=low + + * Glide shouldn't cause any non-x86 problems anymore (Closes: #88583). + + -- Samuel Hocevar Mon, 5 Mar 2001 12:50:28 +0100 + +vlc (0.2.63-1) unstable; urgency=low + + * New upstream release. + + -- Samuel Hocevar Mon, 5 Mar 2001 00:41:16 +0100 + +vlc (0.2.62-2) unstable; urgency=low + + * Removed a few lintian warnings. + + -- Samuel Hocevar Sat, 3 Mar 2001 10:29:31 +0100 + +vlc (0.2.62-1) unstable; urgency=low + + * New release. Glide and GGI packages build again. + * Updated vlc.1 manpage (Closes: #87478). + * Fixed debian/control (Closes: #83707). + * The framebuffer plugin doesn't hijack ^C anymore (Closes: #87500). + + -- Samuel Hocevar Fri, 2 Mar 2001 17:32:24 +0100 + +vlc (0.2.61-1) unstable; urgency=low + + * New release. The package build works again. + + -- Samuel Hocevar Fri, 16 Feb 2001 08:09:59 +0100 + +vlc (0.2.60-1) unstable; urgency=low + + * New release. The package build is most presumably FUBAR. + + -- Samuel Hocevar Wed, 14 Feb 2001 08:33:46 +0100 + +vlc (0.2.50nocss-1) unstable; urgency=low + + * Only build vlc-glide under x86 (Closes: #84046). + * Switched PentiumPro optimization off (Closes: #83707). + + -- Samuel Hocevar Mon, 5 Feb 2001 20:49:15 +0100 + +vlc (0.2.50-1) unstable; urgency=low + + * Unstable release. + + -- Samuel Hocevar Wed, 31 Jan 2001 04:30:37 +0100 + +vlc (0.1.99i) unstable; urgency=low + + * Fixed the framerate display + + -- Samuel Hocevar Tue, 24 Oct 2000 11:08:01 +0200 + +vlc (0.1.99i) unstable; urgency=low + + * fixed the support for field pictures, which involved a few dozens + bugs in the video parser and video decoder. + * renamed an inconsistent variable in src/input/input_file.c. + * added support for I+ synchro (all Is and the first P). + * fixed a motion compensation bug which generated some distortion + on B images. + * fixed a motion compensation bug for skipped macroblocks. + * fixed a synchro bug for field images. + * fixed the --server option which didn't work if a ~/.vlcrc existed. + + -- Samuel Hocevar Mon, 28 Aug 2000 02:34:18 +0200 + +vlc (0.1.99h) unstable; urgency=low + + * added support for the SDL vout : the --display fullscreen allows + fullscreen when possible. Disabled by default. + * updated debian directory to build vlc-sdl. + * removed CCFLAGS flags which were improperly used. + * added hints for powerpc build. + * fixed the input_file exit bug. + * removed the frame statistics output. + * removed a verbose message in intf_sdl.c. + * added a few sanity checks in the audio mpeg and ac3 decoders. + * temporarily got rid of vlc.channels. + + -- Samuel Hocevar Tue, 22 Aug 2000 01:31:58 +0200 + +vlc (0.1.99g) unstable; urgency=low + + * removed all "*vlc" aliases except "gvlc" and "fbvlc". The other sucked. + * new --synchro flag which lets you force which images are decoded. + * fixed 32bpp MMX YUV, made the comments clearer, removed an emms. + * now scaling is on by default, so that people won't tell that the vlc + cannot do scaling :-) + * fixed 8bpp YUV. + * fixed the fscked up Bresenham algorithm in all YUV functions. + * fixed a dumb bug in the Makefile that prevented inclusion of the + -march=pentium directive. thanks Meuuh, blame sam. + * separate Debian packages + + -- Samuel Hocevar Wed, 16 Aug 2000 01:07:14 +0200 + +vlc (0.1.99f) unstable; urgency=low + + * plugin detection now works + * "gvlc", "fbvlc", "ggivlc" aliases now work + * fixed functions that weren't properly inlined + * removed bloat from the MMX YUV plugin + * vlc.init becomes ~/.vlcrc + * removed float operations in the video decoder, and all emms asm functions + * borrowed linuxvideo's MMX motion compensation + * fixed an undefined symbol in the MMX YUV plugin + + -- Samuel Hocevar Tue, 8 Aug 2000 11:24:01 +0200 + +vlc (0.1.99e) unstable; urgency=low + + * new bitstream syntax and slight performance increase + + -- Samuel Hocevar Thu, 20 Jul 2000 15:14:06 +0200 + +vlc (0.1.99d) unstable; urgency=low + + * .deb is now more lintian-friendly + * removed a few useless warning messages + * new plugin API + * plugin auto-detection + * removed the default --enable-ppro option because it didn't work on K6-2 + * the framebuffer client now leaves the console in a working state + * the dithered 8 bpp YUV transformation works again (blame bbp !) + * the YUV transformations are now plugins as well + * alternative symlinks like gvlc, fbvlc are now created at compile time + * borrowed libmpeg2's GPLed MMX YUV transformations (16 and 32 bits) + * fixed an endianness problem which occurred on iMacs + + -- Samuel Hocevar Wed, 12 Jul 2000 01:24:40 +0200 + +vlc (0.1.99c) unstable; urgency=low + + * Caught Delete Window event in Gnome and X11 modes + * Fixed manpage + * GGI output now works + * Fixed a segfault on exit for the Gnome plugin + * Sound support almost works under BeOS + + -- Samuel Hocevar Tue, 20 Jun 2000 03:01:12 +0200 + +vlc (0.1.99b) unstable; urgency=low + + * Added a ChangeLog file + * Updated the VLAN code + * Fixed a bug preventing to quit + + -- Samuel Hocevar Sat, 17 Jun 2000 03:46:16 +0200 + +vlc (0.1.99a) unstable; urgency=low + + * Fixed some compile flag errors + + -- Samuel Hocevar Thu, 15 Jun 2000 20:48:54 +0200 + +vlc (0.1.99-1) unstable; urgency=low + + * Initial Release. + + -- Samuel Hocevar Mon, 13 Mar 2000 02:21:45 +0100 + --- vlc-0.8.6.h.orig/debian/compat +++ vlc-0.8.6.h/debian/compat @@ -0,0 +1 @@ +6 --- vlc-0.8.6.h.orig/debian/vlc-plugin-arts.install +++ vlc-0.8.6.h/debian/vlc-plugin-arts.install @@ -0,0 +1 @@ +usr/lib/vlc/audio_output/libarts_plugin.so --- vlc-0.8.6.h.orig/debian/vlc-plugin-esd.links +++ vlc-0.8.6.h/debian/vlc-plugin-esd.links @@ -0,0 +1,2 @@ +usr/share/doc/vlc-nox usr/share/doc/vlc-plugin-esd +usr/share/bug/vlc-nox usr/share/bug/vlc-plugin-esd --- vlc-0.8.6.h.orig/debian/README.Debian +++ vlc-0.8.6.h/debian/README.Debian @@ -0,0 +1,17 @@ +$Id$ + +Notes for anyone wanting to build Debian packages of VLC. + + - Default configuration is supposed to be latest unstable. + + - Usually VLC will come with a copy of x264 in the extras/ directory, + because it is not yet available in Debian. + + - If there is no CVS directory in the root, debian/rules will assume a + full build is requested and will clean x264/. + + - VLC does not link with libdvdcss by default, thus it will not depend + on the libdvdcss packages. However it will use libdvdread that can + optionally open libdvdcss if found. To build packages that link directly + against libdvdcss, remove the --without-dvdcss flag in debian/rules. + --- vlc-0.8.6.h.orig/debian/vlc-plugin-ggi.links +++ vlc-0.8.6.h/debian/vlc-plugin-ggi.links @@ -0,0 +1,2 @@ +usr/share/doc/vlc-nox usr/share/doc/vlc-plugin-ggi +usr/share/bug/vlc-nox usr/share/bug/vlc-plugin-ggi --- vlc-0.8.6.h.orig/debian/vlc.mime +++ vlc-0.8.6.h/debian/vlc.mime @@ -0,0 +1,43 @@ +video/mpeg; vlc %s; description="MPEG Video"; test=test -n "$DISPLAY"; priority=7 +video/mpeg; vlc -I rc -V caca %s; needsterminal; description="MPEG Video"; priority=4 +video/x-mpeg; vlc %s; description="MPEG Video"; test=test -n "$DISPLAY"; priority=7 +video/x-mpeg; vlc -I rc -V caca %s; needsterminal; description="MPEG Video"; priority=4 +video/mpeg-system; vlc %s; description="MPEG Video"; test=test -n "$DISPLAY"; priority=7 +video/mpeg-system; vlc -I rc -V caca %s; needsterminal; description="MPEG Video"; priority=4 +video/x-mpeg-system; vlc %s; description="MPEG Video"; test=test -n "$DISPLAY"; priority=7 +video/x-mpeg-system; vlc -I rc -V caca %s; needsterminal; description="MPEG Video"; priority=4 + +audio/x-wav; vlc %s; description="WAV Audio"; nametemplate=%s.wav; test=test -n "$DISPLAY"; priority=7 +audio/x-wav; vlc -I rc -V caca %s; nametemplate=%s.wav; needsterminal; description="WAV Audio"; priority=4 + +video/mpeg4; vlc %s; description="MPEG-4 Video"; test=test -n "$DISPLAY"; priority=7 +video/mpeg4; vlc -I rc -V caca %s; needsterminal; description="MPEG-4 Video"; priority=4 +audio/mpeg; vlc %s; description="MPEG Audio"; nametemplate=%s.mpg; test=test -n "$DISPLAY"; priority=7 +audio/mpeg; vlc -I rc -V caca %s; nametemplate=%s.mpg; needsterminal; description="MPEG Audio"; priority=4 +audio/mpegurl; vlc %s; description="MPEG Audio URL"; nametemplate=%s.m3u; test=test -n "$DISPLAY"; priority=7 +audio/mpegurl; vlc -I rc -V caca %s; nametemplate=%s.m3u; needsterminal; description="MPEG Audio URL"; priority=4 +audio/x-mp3; vlc %s; nametemplate=%s.mp3; description="MPEG Audio"; test=test -n "$DISPLAY"; priority=7 +audio/x-mp3; vlc -I rc -V caca %s; nametemplate=%s.mp3; needsterminal; description="MPEG Audio"; priority=4 +audio/mpeg4; vlc %s; description="MPEG-4 Audio"; test=test -n "$DISPLAY"; priority=7 +audio/mpeg4; vlc -I rc -V caca %s; needsterminal; description="MPEG-4 Audio"; priority=4 +application/mpeg4-iod; vlc %s; description="MPEG-4 Video"; test=test -n "$DISPLAY"; priority=7 +application/mpeg4-iod; vlc -I rc -V caca %s; needsterminal; description="MPEG-4 Video"; priority=4 +application/mpeg4-muxcodetable; vlc %s; description="MPEG-4 Video"; test=test -n "$DISPLAY"; priority=7 +application/mpeg4-muxcodetable; vlc -I rc -V caca %s; needsterminal; description="MPEG-4 Video"; priority=4 + +video/x-msvideo; vlc %s; description="MS Video (AVI)"; test=test -n "$DISPLAY"; priority=4 +video/x-msvideo; vlc -I rc -V caca %s; needsterminal; description="MS Video (AVI)"; priority=3 + +video/quicktime; vlc %s; description="Apple Quicktime Video"; test=test -n "$DISPLAY"; priority=4 +video/quicktime; vlc -I rc -V caca %s; needsterminal; description="Apple Quicktime Video"; priority=3 + +application/ogg; vlc %s; nametemplate=%s.ogg; description="Ogg stream"; test=test -n "$DISPLAY"; priority=4 +application/ogg; vlc -I rc -V caca %s; nametemplate=%s.ogg; needsterminal; description="Ogg stream"; priority=3 +application/x-ogg; vlc %s; nametemplate=%s.ogg; description="Ogg stream"; test=test -n "$DISPLAY"; priority=4 +application/x-ogg; vlc -I rc -V caca %s; nametemplate=%s.ogg; needsterminal; description="Ogg stream"; priority=3 + +application/x-ms-asf-plugin; vlc %s; description="Windows Media Video"; test=test -n "$DISPLAY"; priority=4 +application/x-ms-asf-plugin; vlc -I rc -V caca %s; needsterminal; description="Windows Media Video"; priority=3 +application/x-mplayer2; vlc %s; description="Windows Media"; test=test -n "$DISPLAY"; priority=4 +application/x-mplayer2; vlc -I rc -V caca %s; needsterminal; description="Windows Media"; priority=3 + --- vlc-0.8.6.h.orig/debian/vlc-plugin-esd.install +++ vlc-0.8.6.h/debian/vlc-plugin-esd.install @@ -0,0 +1 @@ +usr/lib/vlc/audio_output/libesd_plugin.so --- vlc-0.8.6.h.orig/debian/vlc-plugin-jack.install +++ vlc-0.8.6.h/debian/vlc-plugin-jack.install @@ -0,0 +1 @@ +usr/lib/vlc/audio_output/libjack_plugin.so --- vlc-0.8.6.h.orig/debian/vlc-plugin-sdl.links +++ vlc-0.8.6.h/debian/vlc-plugin-sdl.links @@ -0,0 +1,2 @@ +usr/share/doc/vlc-nox usr/share/doc/vlc-plugin-sdl +usr/share/bug/vlc-nox usr/share/bug/vlc-plugin-sdl --- vlc-0.8.6.h.orig/debian/mozilla-plugin-vlc.install +++ vlc-0.8.6.h/debian/mozilla-plugin-vlc.install @@ -0,0 +1 @@ +usr/lib/mozilla --- vlc-0.8.6.h.orig/debian/vlc-plugin-glide.install +++ vlc-0.8.6.h/debian/vlc-plugin-glide.install @@ -0,0 +1 @@ +usr/lib/vlc/video_output/libglide_plugin.so --- vlc-0.8.6.h.orig/debian/vlc.links +++ vlc-0.8.6.h/debian/vlc.links @@ -0,0 +1,5 @@ +/usr/share/doc/vlc-nox /usr/share/doc/vlc +/usr/share/vlc/vlc.xpm /usr/share/vlc/wxvlc.xpm +/usr/share/man/man1/vlc.1.gz /usr/share/man/man1/svlc.1.gz +/usr/share/man/man1/vlc.1.gz /usr/share/man/man1/wxvlc.1.gz +/usr/share/bug/vlc-nox /usr/share/bug/vlc --- vlc-0.8.6.h.orig/debian/vlc.desktop +++ vlc-0.8.6.h/debian/vlc.desktop @@ -0,0 +1,13 @@ +[Desktop Entry] +Encoding=UTF-8 +Version=0.9.2 +Name=VLC media player +Name[fr]=lecteur multimédia VLC +Comment=Universal movies and music player +Comment[fr]=Lecteur universel pour films et musique +Exec=wxvlc +Icon=vlc +Terminal=false +Type=Application +Categories=Application;AudioVideo;Player; +MimeType=video/dv;video/mpeg;video/x-mpeg;video/msvideo;video/quicktime;video/x-anim;video/x-avi;video/x-ms-asf;video/x-ms-wmv;video/x-msvideo;video/x-nsv;video/x-flc;video/x-fli;application/ogg;application/x-ogg;application/x-matroska;audio/x-mp3;audio/x-mpeg;audio/mpeg;audio/x-wav;audio/x-mpegurl;audio/x-scpls;audio/x-m4a;audio/x-ms-asf;audio/x-ms-asx;audio/x-ms-wax;application/vnd.rn-realmedia;audio/x-real-audio;audio/x-pn-realaudio;application/x-flac;audio/x-flac;application/x-shockwave-flash;misc/ultravox;application/x-matroska;audio/vnd.rn-realaudio;audio/x-pn-aiff;audio/x-pn-au;audio/x-pn-wav;audio/x-pn-windows-acm;image/vnd.rn-realpix;video/vnd.rn-realvideo;audio/x-pn-realaudio-plugin; --- vlc-0.8.6.h.orig/debian/vlc.menu +++ vlc-0.8.6.h/debian/vlc.menu @@ -0,0 +1,3 @@ +?package(vlc):command="/usr/bin/wxvlc" hotkey="V" needs="X11" \ + section="Applications/Viewers" title="VLC media player" \ + icon="/usr/share/vlc/vlc.xpm" hints="Video" --- vlc-0.8.6.h.orig/debian/rules +++ vlc-0.8.6.h/debian/rules @@ -0,0 +1,217 @@ +#!/usr/bin/make -f + +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) +DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) + +ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE)) +confflags := --build=$(DEB_BUILD_GNU_TYPE) +else +confflags := --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) +endif + +# how to call quilt +QUILT := QUILT_PATCHES=debian/patches quilt --quiltrc /dev/null + +# configure flags +confflags += --enable-release --prefix=/usr +confflags += \ + --enable-libtool \ + --disable-gnome \ + --disable-gtk \ + --disable-familiar \ + --disable-fb \ + --enable-ggi \ + --enable-sdl \ + --enable-esd \ + --disable-qt \ + --enable-mad \ + --enable-arts \ + --enable-jack \ + --enable-lirc \ + --enable-a52 \ + --enable-aa \ + --enable-dvbpsi \ + --enable-mozilla \ + --disable-kde \ + --enable-mp4 \ + --enable-dvb \ + --disable-satellite \ + --enable-ogg \ + --enable-vorbis \ + --enable-wxwidgets \ + --with-wx-config=wx-config \ + --disable-slp \ + --enable-flac \ + --disable-skins \ + --disable-basic-skins \ + --enable-skins2 \ + --enable-freetype \ + --enable-mkv \ + --enable-speex \ + --enable-caca \ + --enable-live555 \ + --enable-libmpeg2 \ + --enable-dts \ + --enable-fribidi \ + --enable-cdio \ + --enable-mod \ + --enable-theora \ + --enable-modplug \ + --enable-dvdnav \ + --enable-gnutls \ + --enable-ffmpeg \ + --enable-ncurses \ + --enable-smb \ + --disable-gnomevfs \ + --enable-bonjour \ + --enable-mpc \ + --enable-vcd \ + --enable-vcdx \ + --enable-xosd \ + --enable-twolame \ + --enable-notify \ + --enable-faad \ + --enable-mediacontrol-bindings \ + --disable-x264 \ + $(NULL) + +# Linux specific flags +ifeq ($(DEB_HOST_ARCH_OS),linux) +confflags += --enable-alsa --enable-dv --enable-v4l --enable-pvr +endif + +# Glide is only for x86 on Linux +ifeq ($(DEB_HOST_ARCH),i386) +confflags += --enable-glide +endif + +# svgalib is only for x86 and x86-64 on Linux +ifneq ($(filter $(DEB_HOST_ARCH), amd64 i386),) +confflags += --enable-svgalib +endif + +# Remove --without-dvdcss in non-totalitarian countries +confflags += --enable-dvd --without-dvdcss + +# A few shortcuts +VIDDIR := usr/share/vlc +PIXDIR := usr/share/pixmaps + +build: build-stamp +build-stamp: + dh_testdir + $(QUILT) push -a || test $$? = 2 + ./configure --enable-static --mandir=$${prefix}/share/man $(confflags) + $(MAKE) src/libvlc.la + cp src/.libs/libvlc.a src/libvlc.a + ./configure --mandir=$${prefix}/share/man $(confflags) + $(MAKE) +ifeq ($(filter nocheck,$(DEB_BUILD_OPTIONS)),) +ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) + # Check which plugins were built and whether they load properly. + ./vlc --reset-plugins-cache -l -I rc vlc:quit +endif +endif + touch $@ + +clean: + dh_testdir + dh_testroot + sed -e '/lib\(alsa\|dvb\|v4l\|pvr\)_/d' debian/vlc-nox.install \ + >debian/vlc-nox.install.kfreebsd-i386 + cp debian/vlc-nox.install.kfreebsd-i386 \ + debian/vlc-nox.install.kfreebsd-amd64 + rm -f build-stamp + # Clean VLC + [ ! -f Makefile ] || $(MAKE) distclean + rm -f src/libvlc.a + # Clean zsh completion stuff + rm -f extras/zsh + # Removed ugly cruft + rm -f src/misc/modules_builtin.h + rm -f mozilla/vlcintf.xpt mozilla/vlcintf.h + # Remove spurious autotools stuff + rm -f config.log confdefs.h + # Unpatch package + $(QUILT) pop -a -R || test $$? = 2 + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp/ + cp src/libvlc.a debian/tmp/usr/lib + # Clean up libtool crap + find debian/tmp -name '*.la' -exec rm '{}' ';' + # Remove useless stuff + rm -Rf debian/tmp/$(VIDDIR)/skins + rm -f debian/tmp/usr/share/vlc/skins2/fonts/FreeSans.ttf + rm -f debian/tmp/usr/share/vlc/skins2/fonts/FreeSansBold.ttf + ln -s /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf debian/tmp/usr/share/vlc/skins2/fonts/FreeSans.ttf + ln -s /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf debian/tmp/usr/share/vlc/skins2/fonts/FreeSansBold.ttf + # Move stuff around + mkdir -p debian/tmp/$(PIXDIR) + -mv debian/tmp/$(VIDDIR)/vlc48x48.png debian/tmp/$(PIXDIR)/vlc.png + -mv debian/tmp/$(VIDDIR)/vlc32x32.xpm debian/tmp/$(VIDDIR)/vlc.xpm + # Install stuff + dh_install -si --fail-missing --sourcedir=debian/tmp + # install BTS stuff + mkdir -p debian/vlc-nox/usr/share/bug/vlc-nox + cp debian/bug/* debian/vlc-nox/usr/share/bug/vlc-nox + # Clean up + rm -f debian/vlc/$(VIDDIR)/*.png +ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) + # Check that we did not install a plugin linked with libX11 in vlc-nox + BORKED=no; \ + for file in $$(find debian/vlc-nox/usr/lib/vlc -name '*.so'); do \ + if objdump -x $$file | egrep -q '^ +NEEDED +libX11\.so'; then \ + BORKED=yes; \ + echo $$file depends on libX11; \ + fi; \ + done; \ + if test "$$BORKED" = yes; then exit 1; fi +endif + +# Build architecture-independent files here. +binary-indep: build install + dh_testdir + dh_testroot + dh_link -i + dh_compress -i + dh_fixperms -i + dh_installdeb -i + dh_gencontrol -i + dh_md5sums -i + dh_builddeb -i + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_link -s + dh_installdocs -p vlc-nox + dh_installdocs -p libvlc0 + dh_buildinfo -p vlc-nox + dh_installmenu -s + dh_installmime -s + dh_installman doc/vlc.1 -p vlc-nox + dh_installman doc/vlc-config.1 -p libvlc0-dev + dh_installchangelogs ChangeLog -p vlc-nox + dh_installchangelogs ChangeLog -p libvlc0 + dh_desktop + dh_strip -s + dh_compress -s + dh_fixperms -s + dh_makeshlibs -plibvlc0 -V # -V is nasty, but I mean it + dh_installdeb -s + dh_shlibdeps -s -ldebian/libvlc0/usr/lib + dh_gencontrol -s + dh_md5sums -s + dh_builddeb -s + +binary: binary-indep binary-arch +.PHONY: build clean install binary-indep binary-arch binary --- vlc-0.8.6.h.orig/debian/vlc-plugin-svgalib.links +++ vlc-0.8.6.h/debian/vlc-plugin-svgalib.links @@ -0,0 +1,2 @@ +usr/share/doc/vlc-nox usr/share/doc/vlc-plugin-svgalib +usr/share/bug/vlc-nox usr/share/bug/vlc-plugin-svgalib --- vlc-0.8.6.h.orig/debian/vlc-nox.install.kfreebsd-amd64 +++ vlc-0.8.6.h/debian/vlc-nox.install.kfreebsd-amd64 @@ -0,0 +1,66 @@ +usr/bin/vlc +usr/share/doc +usr/share/locale +usr/share/vlc/http +usr/share/vlc/osdmenu +usr/lib/vlc/access/libvcd_plugin.so +usr/lib/vlc/access/libvcdx_plugin.so +usr/lib/vlc/access/libaccess_*.so +usr/lib/vlc/access/libdvdnav_plugin.so +usr/lib/vlc/access/libdvdread_plugin.so +usr/lib/vlc/access/libcdda_plugin.so +usr/lib/vlc/access_filter +usr/lib/vlc/access_output +usr/lib/vlc/audio_filter +usr/lib/vlc/audio_mixer +usr/lib/vlc/audio_output/libaout_file_plugin.so +usr/lib/vlc/audio_output/liboss_plugin.so +usr/lib/vlc/codec/libcmml_plugin.so +usr/lib/vlc/codec/libffmpeg_plugin.so +usr/lib/vlc/codec/libspudec_plugin.so +usr/lib/vlc/codec/liba52_plugin.so +usr/lib/vlc/codec/libcinepak_plugin.so +usr/lib/vlc/codec/libdts_plugin.so +usr/lib/vlc/codec/libflacdec_plugin.so +usr/lib/vlc/codec/liblpcm_plugin.so +usr/lib/vlc/codec/libaraw_plugin.so +usr/lib/vlc/codec/libvorbis_plugin.so +usr/lib/vlc/codec/libspeex_plugin.so +usr/lib/vlc/codec/libadpcm_plugin.so +usr/lib/vlc/codec/libmpeg_audio_plugin.so +usr/lib/vlc/codec/liblibmpeg2_plugin.so +usr/lib/vlc/codec/librawvideo_plugin.so +usr/lib/vlc/codec/libsubsdec_plugin.so +usr/lib/vlc/codec/libdvbsub_plugin.so +usr/lib/vlc/codec/libtwolame_plugin.so +usr/lib/vlc/codec/libpng_plugin.so +usr/lib/vlc/codec/libsvcdsub_plugin.so +usr/lib/vlc/codec/libtelx_plugin.so +usr/lib/vlc/codec/libcvdsub_plugin.so +usr/lib/vlc/codec/libfake_plugin.so +usr/lib/vlc/codec/libfaad_plugin.so +usr/lib/vlc/codec/libtelx_plugin.so +usr/lib/vlc/control +usr/lib/vlc/demux +usr/lib/vlc/gui/libncurses_plugin.so +usr/lib/vlc/misc/libscreensaver_plugin.so +usr/lib/vlc/misc/libdummy_plugin.so +usr/lib/vlc/misc/libmemcpy_plugin.so +usr/lib/vlc/misc/libipv4_plugin.so +usr/lib/vlc/misc/libipv6_plugin.so +usr/lib/vlc/misc/libexport_plugin.so +usr/lib/vlc/misc/libxtag_plugin.so +usr/lib/vlc/misc/libxml_plugin.so +usr/lib/vlc/misc/libfreetype_plugin.so +usr/lib/vlc/misc/liblogger_plugin.so +usr/lib/vlc/misc/libvod_rtsp_plugin.so +usr/lib/vlc/misc/libgnutls_plugin.so +usr/lib/vlc/misc/libgrowl_plugin.so +usr/lib/vlc/mux +usr/lib/vlc/packetizer +usr/lib/vlc/services_discovery +usr/lib/vlc/stream_out +usr/lib/vlc/video_chroma +usr/lib/vlc/video_filter +usr/lib/vlc/video_output/libimage_plugin.so +usr/lib/vlc/visualization/libvisual_plugin.so --- vlc-0.8.6.h.orig/debian/vlc-plugin-svgalib.install +++ vlc-0.8.6.h/debian/vlc-plugin-svgalib.install @@ -0,0 +1 @@ +usr/lib/vlc/video_output/libsvgalib_plugin.so --- vlc-0.8.6.h.orig/debian/control +++ vlc-0.8.6.h/debian/control @@ -0,0 +1,347 @@ +Source: vlc +Section: graphics +Priority: optional +Maintainer: Debian multimedia packages maintainers +Uploaders: Sam Hocevar (Debian packages) , + Clément Stenac , + Loic Minier , + Christophe Mutricy +Build-Depends: debhelper (>= 6), + dh-buildinfo, + quilt, + nasm, + yasm [amd64 kfreebsd-amd64], + gettext, + iceape-dev (>= 1.1.9-4), + libgl1-mesa-dev, + liba52-0.7.4-dev, + libaa1-dev, + libarts1-dev (>= 1.4.2), + libasound2-dev (>= 0.9.0beta10a) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], + libaudiofile-dev, + libavahi-client-dev, + libavcodec-dev (>= 0.cvs20070307-3), + libavformat-dev (>= 0.cvs20070307-3), + libcaca-dev (>= 0.99.beta4), + libcdio-dev, + libdvbpsi4-dev, + libdvdnav-dev, + libdvdread-dev (>= 0.9.5), + libdts-dev, + libesd0-dev, + libflac-dev (>= 1.1.4-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) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], + 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.cvs20070307-3), + libpng12-dev, + libsdl1.2-dev (>= 1.2.7+1.2.8cvs20041007-5.3), + libsmbclient-dev, + libsvga1-dev [amd64 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 [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], + libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], + libdc1394-22-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], + libxosd-dev, + libtwolame-dev (>= 0.3.8), + libspeex-dev, + libsdl-image1.2-dev, + libnotify-dev, + libgtk2.0-dev, + python-dev, + libfaad-dev, + libjack-dev +Standards-Version: 3.7.3 +Homepage: http://www.videolan.org/vlc +Vcs-Svn: svn://svn.debian.org/svn/pkg-multimedia/unstable/vlc +Vcs-Browser: http://svn.debian.org/wsvn/pkg-multimedia/unstable/vlc/ + +Package: vlc +Section: graphics +Architecture: any +Depends: vlc-nox (= ${binary:Version}), + ${shlibs:Depends}, + ${misc:Depends}, + ttf-dejavu-core +Suggests: mozilla-plugin-vlc, + videolan-doc +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 and streamer + 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 + streams from various network sources. + . + VLC can also be used as a streaming server that duplicates the stream it + reads and multicasts them through the network to other clients, or serves + them through HTTP. + . + 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-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. + +Package: vlc-nox +Section: net +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends} +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), + vlc (<< 0.8.6-svn20060911.0.8.5-1-svn.debian-3) +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), + vlc (<< 0.8.6-svn20060911.0.8.5-1-svn.debian-3) +Provides: mp3-decoder +Description: multimedia player and streamer (without X support) + 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 + streams from various network sources. + . + VLC can also be used as a streaming server that duplicates the stream it + reads and multicasts them through the network to other clients, or serves + them through HTTP. + . + 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-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. + . + This package contains a version of VLC that does not require X and that is + thus suitable for headless servers. + +Package: libvlc0 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends} +Replaces: vlc (<< 0.8.6-svn20060911.0.8.5-1-svn.debian-3) +Conflicts: vlc (<< 0.8.6-svn20060911.0.8.5-1-svn.debian-3) +Description: multimedia player and streamer library + This package contains the shared library required by applications using VLC + features. + . + 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 + streams from various network sources. + +Package: libvlc0-dev +Section: libdevel +Architecture: any +Depends: libvlc0 (= ${binary:Version}), + ${shlibs:Depends}, + ${misc:Depends} +Description: development files for VLC + This package contains headers and a static library required to build plugins + for VLC, or standalone applications that use VLC features. + . + 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 + streams from various network sources. + +Package: vlc-plugin-esd +Architecture: any +Depends: vlc-nox, + ${shlibs:Depends}, + ${misc:Depends} +Conflicts: vlc-esd (<< 0.5.0) +Replaces: vlc-esd (<< 0.5.0) +Description: Esound audio output plugin for VLC + This plugin adds support for the Enlightened Sound Daemon to the VLC + media player. To activate it, use the `--aout esd' flag or select the + `esd' audio output plugin from the preferences menu. + . + 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 + streams from various network sources. + +Package: vlc-plugin-sdl +Architecture: any +Depends: vlc-nox, + ${shlibs:Depends}, + ${misc:Depends} +Conflicts: vlc-sdl (<< 0.5.0) +Replaces: vlc-sdl (<< 0.5.0) +Description: SDL video and audio output plugin for VLC + This plugin adds support for the Simple DirectMedia Layer library to + the VLC media player. To activate it, use the `--vout sdl' or + `--aout sdl' flags or select the `sdl' video or audio output plugin + from the preferences menu. + . + 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 + streams from various network sources. + +Package: vlc-plugin-ggi +Architecture: any +Depends: vlc-nox, + ${shlibs:Depends}, + ${misc:Depends} +Conflicts: vlc-ggi (<< 0.5.0) +Replaces: vlc-ggi (<< 0.5.0) +Description: GGI video output plugin for VLC + This is a GGI plugin for the VLC media player. To activate it, use + the `--vout ggi' flag or select the `ggi' video output plugin from the + preferences menu. + . + 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 + streams from various network sources. + +Package: vlc-plugin-glide +Architecture: i386 +Depends: vlc-nox, + ${shlibs:Depends} +Conflicts: vlc-glide (<< 0.5.0) +Replaces: vlc-glide (<< 0.5.0) +Description: Glide video output plugin for VLC + This is a Glide (3dfx) plugin for the VLC media player. To activate + it, use the `--vout glide' flag or select the `glide' video output + plugin from the preferences menu. + . + 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 + streams from various network sources. + +Package: vlc-plugin-arts +Architecture: any +Depends: vlc-nox, + ${shlibs:Depends}, + ${misc:Depends} +Conflicts: vlc-arts (<< 0.5.0) +Replaces: vlc-arts (<< 0.5.0) +Description: aRts audio output plugin for VLC + This plugin adds support for the aRts Sound System to the VLC media + player. To activate it, use the `--aout arts' flag or select the `arts' + audio output plugin from the preferences menu. + . + 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 + streams from various network sources. + +Package: mozilla-plugin-vlc +Architecture: any +Depends: vlc-nox (= ${binary:Version}), + vlc, + ${shlibs:Depends}, + ${misc:Depends} +Description: multimedia plugin for web browsers based on VLC + This plugin adds support for MPEG, MPEG2, DVD, DivX, Ogg/Vorbis and many + more formats to your Gecko-based web browser (Firefox, Galeon, etc.). The + decoding process is done by VLC and the output window is embedded in a + webpage or directly in the browser window. There is also support for + fullscreen display and javascript control. + . + 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 + streams from various network sources. + +Package: vlc-plugin-svgalib +Architecture: amd64 i386 +Depends: vlc-nox (= ${binary:Version}), + ${shlibs:Depends}, + ${misc:Depends} +Description: SVGAlib video output plugin for VLC + This plugin adds support for SVGAlib to the VLC media player. To + activate it, use the `--vout svgalib' flag or select the `svgalib' video + output plugin from the preferences menu. Note that you will need root + permissions to use SVGAlib. + . + 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 + streams from various network sources. + +Package: vlc-plugin-jack +Architecture: any +Depends: vlc-nox (= ${binary:Version}), + ${shlibs:Depends}, + ${misc:Depends} +Description: Jack audio plugins for VLC + These plugins add support for JACK to the VLC media player. To + activate the audio output module, use the `--aout jack' flag or + select the `jack' audio output plugin from the preferences menu. + . + 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 + streams from various network sources. + --- vlc-0.8.6.h.orig/debian/vlc-plugin-arts.links +++ vlc-0.8.6.h/debian/vlc-plugin-arts.links @@ -0,0 +1,2 @@ +/usr/share/doc/vlc-nox /usr/share/doc/vlc-plugin-arts +/usr/share/bug/vlc-nox /usr/share/bug/vlc-plugin-arts --- vlc-0.8.6.h.orig/debian/vlc-plugin-glide.links +++ vlc-0.8.6.h/debian/vlc-plugin-glide.links @@ -0,0 +1,2 @@ +usr/share/doc/vlc-nox usr/share/doc/vlc-plugin-glide +usr/share/bug/vlc-nox usr/share/bug/vlc-plugin-glide --- vlc-0.8.6.h.orig/debian/vlc-nox.install +++ vlc-0.8.6.h/debian/vlc-nox.install @@ -0,0 +1,70 @@ +usr/bin/vlc +usr/share/doc +usr/share/locale +usr/share/vlc/http +usr/share/vlc/osdmenu +usr/lib/vlc/access/libdvb_plugin.so +usr/lib/vlc/access/libpvr_plugin.so +usr/lib/vlc/access/libv4l_plugin.so +usr/lib/vlc/access/libvcd_plugin.so +usr/lib/vlc/access/libvcdx_plugin.so +usr/lib/vlc/access/libaccess_*.so +usr/lib/vlc/access/libdvdnav_plugin.so +usr/lib/vlc/access/libdvdread_plugin.so +usr/lib/vlc/access/libcdda_plugin.so +usr/lib/vlc/access_filter +usr/lib/vlc/access_output +usr/lib/vlc/audio_filter +usr/lib/vlc/audio_mixer +usr/lib/vlc/audio_output/libalsa_plugin.so +usr/lib/vlc/audio_output/libaout_file_plugin.so +usr/lib/vlc/audio_output/liboss_plugin.so +usr/lib/vlc/codec/libcmml_plugin.so +usr/lib/vlc/codec/libffmpeg_plugin.so +usr/lib/vlc/codec/libspudec_plugin.so +usr/lib/vlc/codec/liba52_plugin.so +usr/lib/vlc/codec/libcinepak_plugin.so +usr/lib/vlc/codec/libdts_plugin.so +usr/lib/vlc/codec/libflacdec_plugin.so +usr/lib/vlc/codec/liblpcm_plugin.so +usr/lib/vlc/codec/libaraw_plugin.so +usr/lib/vlc/codec/libvorbis_plugin.so +usr/lib/vlc/codec/libspeex_plugin.so +usr/lib/vlc/codec/libadpcm_plugin.so +usr/lib/vlc/codec/libmpeg_audio_plugin.so +usr/lib/vlc/codec/liblibmpeg2_plugin.so +usr/lib/vlc/codec/librawvideo_plugin.so +usr/lib/vlc/codec/libsubsdec_plugin.so +usr/lib/vlc/codec/libdvbsub_plugin.so +usr/lib/vlc/codec/libtwolame_plugin.so +usr/lib/vlc/codec/libpng_plugin.so +usr/lib/vlc/codec/libsvcdsub_plugin.so +usr/lib/vlc/codec/libtelx_plugin.so +usr/lib/vlc/codec/libcvdsub_plugin.so +usr/lib/vlc/codec/libfake_plugin.so +usr/lib/vlc/codec/libfaad_plugin.so +usr/lib/vlc/codec/libtelx_plugin.so +usr/lib/vlc/control +usr/lib/vlc/demux +usr/lib/vlc/gui/libncurses_plugin.so +usr/lib/vlc/misc/libscreensaver_plugin.so +usr/lib/vlc/misc/libdummy_plugin.so +usr/lib/vlc/misc/libmemcpy_plugin.so +usr/lib/vlc/misc/libipv4_plugin.so +usr/lib/vlc/misc/libipv6_plugin.so +usr/lib/vlc/misc/libexport_plugin.so +usr/lib/vlc/misc/libxtag_plugin.so +usr/lib/vlc/misc/libxml_plugin.so +usr/lib/vlc/misc/libfreetype_plugin.so +usr/lib/vlc/misc/liblogger_plugin.so +usr/lib/vlc/misc/libvod_rtsp_plugin.so +usr/lib/vlc/misc/libgnutls_plugin.so +usr/lib/vlc/misc/libgrowl_plugin.so +usr/lib/vlc/mux +usr/lib/vlc/packetizer +usr/lib/vlc/services_discovery +usr/lib/vlc/stream_out +usr/lib/vlc/video_chroma +usr/lib/vlc/video_filter +usr/lib/vlc/video_output/libimage_plugin.so +usr/lib/vlc/visualization/libvisual_plugin.so --- vlc-0.8.6.h.orig/debian/mozilla-plugin-vlc.links +++ vlc-0.8.6.h/debian/mozilla-plugin-vlc.links @@ -0,0 +1,3 @@ +/usr/share/doc/vlc /usr/share/doc/mozilla-plugin-vlc +/usr/lib/mozilla/plugins/libvlcplugin.so /usr/lib/mozilla-firefox/plugins/libvlcplugin.so +/usr/share/bug/vlc-nox /usr/share/bug/mozilla-plugin-vlc --- vlc-0.8.6.h.orig/debian/libvlc0.install +++ vlc-0.8.6.h/debian/libvlc0.install @@ -0,0 +1 @@ +usr/lib/libvlc.so.* --- vlc-0.8.6.h.orig/debian/patches/series +++ vlc-0.8.6.h/debian/patches/series @@ -0,0 +1,23 @@ +001_am_maintainer_mode.diff +010_iceape.diff +050_bootstrap.diff +101_certificates_paths.diff +102_dejavu_font.diff +103_kfreebsd.diff +104_notify.diff +200_osdmenu_paths.diff +300_manpage_syntax.diff +401-CVE-2008-2430.diff +405-CVE-2008-3732.diff +406-live555-crash.diff +407-mms-overflow.diff +408-CVE-2008-4686.diff +409-cue-overflow.diff +410-rtsp-integer-underflow.diff +CVE-2010-0522.patch +CVE-2010-1441.patch +CVE-2010-1442-1.patch +CVE-2010-1442-2.patch +CVE-2010-1442-3.patch +CVE-2010-3275-CVE-2010-3276.patch +CVE-2011-0531.patch --- vlc-0.8.6.h.orig/debian/patches/408-CVE-2008-4686.diff +++ vlc-0.8.6.h/debian/patches/408-CVE-2008-4686.diff @@ -0,0 +1,46 @@ +diff -Nurad vlc-0.8.6.h.orig/modules/demux/ty.c vlc-0.8.6.h/modules/demux/ty.c +--- vlc-0.8.6.h.orig/modules/demux/ty.c 2008-11-01 14:10:36.000000000 +0100 ++++ vlc-0.8.6.h/modules/demux/ty.c 2008-11-01 14:19:52.000000000 +0100 +@@ -129,8 +129,8 @@ + mtime_t lastVideoPTS; + + ty_rec_hdr_t *rec_hdrs; /* record headers array */ +- int i_cur_rec; /* current record in this chunk */ +- int i_num_recs; /* number of recs in this chunk */ ++ unsigned i_cur_rec; /* current record in this chunk */ ++ unsigned i_num_recs; /* number of recs in this chunk */ + int i_seq_rec; /* record number where seq start is */ + vlc_bool_t eof; + vlc_bool_t b_first_chunk; +@@ -763,7 +763,7 @@ + { + demux_sys_t *p_sys = p_demux->p_sys; + int64_t seek_pos = p_sys->i_stream_size * seek_pct; +- int i; ++ unsigned i; + long l_skip_amt; + + /* if we're not seekable, there's nothing to do */ +@@ -856,7 +856,8 @@ + /* =========================================================================== */ + static int get_chunk_header(demux_t *p_demux) + { +- int i_readSize, i_num_recs, i; ++ uint32_t i, i_readSize; ++ unsigned i_num_recs; + uint8_t packet_header[4]; + uint8_t record_header[16]; + ty_rec_hdr_t *p_rec_hdr; +@@ -914,7 +915,11 @@ + /* parse headers into array */ + if (p_sys->rec_hdrs) + free(p_sys->rec_hdrs); +- p_sys->rec_hdrs = malloc(i_num_recs * sizeof(ty_rec_hdr_t)); ++ p_sys->rec_hdrs = calloc(i_num_recs, sizeof(ty_rec_hdr_t)); ++ if(!p_sys->rec_hdrs){ ++ i_num_recs = 0; ++ return; ++ } + for (i = 0; i < i_num_recs; i++) + { + i_readSize = stream_Read( p_demux->s, record_header, 16 ); --- vlc-0.8.6.h.orig/debian/patches/406-live555-crash.diff +++ vlc-0.8.6.h/debian/patches/406-live555-crash.diff @@ -0,0 +1,28 @@ +diff --git a/modules/demux/live555.cpp b/modules/demux/live555.cpp +index 3c75243..90040d3 100644 +--- a/modules/demux/live555.cpp ++++ b/modules/demux/live555.cpp +@@ -829,7 +829,8 @@ describe: + else + { + const char *psz_tmp = strstr( psz_error, "RTSP" ); +- sscanf( psz_tmp, "RTSP/%*s%3u", &i_code ); ++ if( psz_tmp ) ++ sscanf( psz_tmp, "RTSP/%*u.%*u %3u", &i_code ); + } + msg_Dbg( p_demux, "DESCRIBE failed with %d: [%s]", i_code, psz_error ); + +@@ -869,13 +870,6 @@ describe: + p_sys->rtsp = NULL; + goto createnew; + } +- else +- { +- msg_Dbg( p_demux, "connection timeout, retrying" ); +- if( p_sys->rtsp ) RTSPClient::close( p_sys->rtsp ); +- p_sys->rtsp = NULL; +- goto createnew; +- } + i_ret = VLC_EGENERIC; + } + --- vlc-0.8.6.h.orig/debian/patches/CVE-2010-1442-1.patch +++ vlc-0.8.6.h/debian/patches/CVE-2010-1442-1.patch @@ -0,0 +1,23 @@ +diff -aur vlc-0.8.6.h.orig/modules/demux/mkv.cpp vlc-0.8.6.h/modules/demux/mkv.cpp +--- vlc-0.8.6.h.orig/modules/demux/mkv.cpp 2008-05-25 18:28:57.000000000 +0000 ++++ vlc-0.8.6.h/modules/demux/mkv.cpp 2011-04-05 20:41:43.000000000 +0000 +@@ -108,6 +108,8 @@ + + #define MKVD_TIMECODESCALE 1000000 + ++#define __STDC_LIMIT_MACROS 1 ++ + //////////////////////////////////////////////////////////////////////////////////////////////////////////////// + #undef ATTRIBUTE_PACKED + #undef PRAGMA_PACK_BEGIN +@@ -1857,7 +1861,7 @@ + } + } + +-static block_t *MemToBlock( demux_t *p_demux, uint8_t *p_mem, int i_mem, size_t offset) ++static block_t *MemToBlock( demux_t *p_demux, uint8_t *p_mem, size_t i_mem, size_t offset) + { + block_t *p_block; + if( !(p_block = block_New( p_demux, i_mem + offset ) ) ) return NULL; +Only in vlc-0.8.6.h/modules/demux: mkv.cpp.orig +Only in vlc-0.8.6.h/modules/demux: mkv.cpp~ --- vlc-0.8.6.h.orig/debian/patches/103_kfreebsd.diff +++ vlc-0.8.6.h/debian/patches/103_kfreebsd.diff @@ -0,0 +1,20 @@ +Index: vlc-0.8.6.debian/modules/misc/network/ipv6.c +=================================================================== +--- vlc-0.8.6.debian.orig/modules/misc/network/ipv6.c 2006-12-11 12:32:22.000000000 +0100 ++++ vlc-0.8.6.debian/modules/misc/network/ipv6.c 2006-12-11 12:32:38.000000000 +0100 +@@ -57,6 +57,7 @@ + #if defined (WIN32) && !defined (MCAST_JOIN_SOURCE_GROUP) + /* Interim Vista definitions */ + # define MCAST_JOIN_SOURCE_GROUP 45 /* from */ ++#if defined __GLIBC__ && !defined __FreeBSD_kernel__ + struct group_source_req + { + uint32_t gsr_interface; /* interface index */ +@@ -64,6 +65,7 @@ + struct sockaddr_storage gsr_source; /* source address */ + }; + #endif ++#endif + + /***************************************************************************** + * Local prototypes --- vlc-0.8.6.h.orig/debian/patches/410-rtsp-integer-underflow.diff +++ vlc-0.8.6.h/debian/patches/410-rtsp-integer-underflow.diff @@ -0,0 +1,12 @@ +Index: vlc-0.8.6.h/modules/access/rtsp/real.c +=================================================================== +--- vlc-0.8.6.h.orig/modules/access/rtsp/real.c 2008-05-25 18:28:57.000000000 +0000 ++++ vlc-0.8.6.h/modules/access/rtsp/real.c 2010-04-18 09:24:19.000000000 +0000 +@@ -597,6 +597,7 @@ + unsigned char **buffer) { + + int n; ++ if (pf->length<12) return 0; + rmff_dump_pheader(ph, *buffer); + n=rtsp_read_data(rtsp_session, *buffer + 12, ph->length - 12); + return (n <= 0) ? 0 : n+12; --- vlc-0.8.6.h.orig/debian/patches/CVE-2010-3275-CVE-2010-3276.patch +++ vlc-0.8.6.h/debian/patches/CVE-2010-3275-CVE-2010-3276.patch @@ -0,0 +1,13 @@ +diff -aur vlc-0.8.6.h.orig//src/video_output/video_output.c vlc-0.8.6.h/src/video_output/video_output.c +--- vlc-0.8.6.h.orig//src/video_output/video_output.c 2008-05-25 20:28:58.000000000 +0200 ++++ vlc-0.8.6.h/src/video_output/video_output.c 2011-03-30 15:13:28.000000000 +0200 +@@ -251,6 +251,9 @@ + /* Initialize the rendering heap */ + I_RENDERPICTURES = 0; + ++ if( i_width <= 0 || i_height <= 0 || i_width > 8192 || i_height > 8192 ) ++ return NULL; ++ + vlc_ureduce( &p_fmt->i_sar_num, &p_fmt->i_sar_den, + p_fmt->i_sar_num, p_fmt->i_sar_den, 50000 ); + p_vout->fmt_render = *p_fmt; /* FIXME palette */ --- vlc-0.8.6.h.orig/debian/patches/CVE-2010-1441.patch +++ vlc-0.8.6.h/debian/patches/CVE-2010-1441.patch @@ -0,0 +1,173 @@ +From 8ab9066cf44f06afd8dca32e9aa9460393b0ad8e Mon Sep 17 00:00:00 2001 +From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= +Date: Thu, 15 Apr 2010 21:51:20 +0300 +Subject: [PATCH] Fixed potential segfault with corrupted streams (audio codecs). + +(cherry picked from commit b51e492c3da42a569b9b6715c97fe858a0c96a15) + +Conflicts: + + modules/codec/mpeg_audio.c +--- + modules/codec/a52.c | 9 +++++---- + modules/codec/dts.c | 9 +++++---- + modules/codec/mpeg_audio.c | 24 ++++++++++++++++-------- + 3 files changed, 26 insertions(+), 16 deletions(-) + +diff --git a/modules/codec/a52.c b/modules/codec/a52.c +index f55cae1..fe808fc 100644 +--- a/modules/codec/a52.c ++++ vlc-0.8.6.h/modules/codec/a52.c +@@ -99,7 +99,7 @@ enum { + ****************************************************************************/ + static void *DecodeBlock ( decoder_t *, block_t ** ); + +-static uint8_t *GetOutBuffer ( decoder_t *, void ** ); ++static uint8_t *GetOutBuffer ( decoder_t *, block_t ** ); + static aout_buffer_t *GetAoutBuffer( decoder_t * ); + static block_t *GetSoutBuffer( decoder_t * ); + +@@ -182,7 +182,7 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) + decoder_sys_t *p_sys = p_dec->p_sys; + uint8_t p_header[VLC_A52_HEADER_SIZE]; + uint8_t *p_buf; +- void *p_out_buffer; ++ block_t *p_out_buffer; + + if( !pp_block || !*pp_block ) return NULL; + +@@ -346,7 +347,7 @@ static void CloseCommon( vlc_object_t *p_this ) + /***************************************************************************** + * GetOutBuffer: + *****************************************************************************/ +-static uint8_t *GetOutBuffer( decoder_t *p_dec, void **pp_out_buffer ) ++static uint8_t *GetOutBuffer( decoder_t *p_dec, block_t **pp_out_buffer ) + { + decoder_sys_t *p_sys = p_dec->p_sys; + uint8_t *p_buf; +diff --git a/modules/codec/dts.c b/modules/codec/dts.c +index 090eae1..f8f64eb 100644 +--- a/modules/codec/dts.c ++++ vlc-0.8.6.h/modules/codec/dts.c +@@ -108,7 +108,7 @@ static inline int SyncCode( const uint8_t * ); + static int SyncInfo( const uint8_t *, bool *, unsigned int *, unsigned int *, + unsigned int *, unsigned int *, unsigned int * ); + +-static uint8_t *GetOutBuffer ( decoder_t *, void ** ); ++static uint8_t *GetOutBuffer ( decoder_t *, block_t ** ); + static aout_buffer_t *GetAoutBuffer( decoder_t * ); + static block_t *GetSoutBuffer( decoder_t * ); + +@@ -185,7 +185,7 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) + decoder_sys_t *p_sys = p_dec->p_sys; + uint8_t p_header[DTS_HEADER_SIZE]; + uint8_t *p_buf; +- void *p_out_buffer; ++ block_t *p_out_buffer; + + if( !pp_block || !*pp_block ) + return NULL; +@@ -325,7 +325,8 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) + + /* Copy the whole frame into the buffer. When we reach this point + * we already know we have enough data available. */ +- block_GetBytes( &p_sys->bytestream, p_buf, p_sys->i_frame_size ); ++ block_GetBytes( &p_sys->bytestream, ++ p_buf, __MIN( p_sys->i_frame_size, p_out_buffer->i_buffer ) ); + + /* Make sure we don't reuse the same pts twice */ + if( p_sys->i_pts == p_sys->bytestream.p_block->i_pts ) +@@ -359,7 +360,7 @@ static void CloseCommon( vlc_object_t *p_this ) + /***************************************************************************** + * GetOutBuffer: + *****************************************************************************/ +-static uint8_t *GetOutBuffer( decoder_t *p_dec, void **pp_out_buffer ) ++static uint8_t *GetOutBuffer( decoder_t *p_dec, block_t **pp_out_buffer ) + { + decoder_sys_t *p_sys = p_dec->p_sys; + uint8_t *p_buf; +diff --git a/modules/codec/mpeg_audio.c b/modules/codec/mpeg_audio.c +index 91aa7db..b8bf3e5 100644 +--- a/modules/codec/mpeg_audio.c ++++ vlc-0.8.6.h/modules/codec/mpeg_audio.c +@@ -95,8 +96,8 @@ static int OpenPacketizer( vlc_object_t * ); + static void CloseDecoder ( vlc_object_t * ); + static void *DecodeBlock ( decoder_t *, block_t ** ); + +-static uint8_t *GetOutBuffer ( decoder_t *, void ** ); +-static aout_buffer_t *GetAoutBuffer( decoder_t * ); ++static uint8_t *GetOutBuffer ( decoder_t *, block_t ** ); ++static block_t *GetAoutBuffer( decoder_t * ); + static block_t *GetSoutBuffer( decoder_t * ); + + static int SyncInfo( uint32_t i_header, unsigned int * pi_channels, +@@ -204,7 +205,7 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) + uint8_t p_header[MAD_BUFFER_GUARD]; + uint32_t i_header; + uint8_t *p_buf; +- void *p_out_buffer; ++ block_t *p_out_buffer; + + if( !pp_block || !*pp_block ) return NULL; + +@@ -462,11 +463,13 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) + + /* Copy the whole frame into the buffer. When we reach this point + * we already know we have enough data available. */ +- block_GetBytes( &p_sys->bytestream, p_buf, p_sys->i_frame_size ); ++ block_GetBytes( &p_sys->bytestream, ++ p_buf, __MIN( (unsigned)p_sys->i_frame_size, p_out_buffer->i_buffer ) ); + + /* Get beginning of next frame for libmad */ + if( !p_sys->b_packetizer ) + { ++ assert( p_out_buffer->i_buffer >= (unsigned)p_sys->i_frame_size + MAD_BUFFER_GUARD ); + memcpy( p_buf + p_sys->i_frame_size, + p_header, MAD_BUFFER_GUARD ); + } +@@ -490,7 +493,7 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) + /***************************************************************************** + * GetOutBuffer: + *****************************************************************************/ +-static uint8_t *GetOutBuffer( decoder_t *p_dec, void **pp_out_buffer ) ++static uint8_t *GetOutBuffer( decoder_t *p_dec, block_t **pp_out_buffer ) + { + decoder_sys_t *p_sys = p_dec->p_sys; + uint8_t *p_buf; +@@ -524,7 +527,7 @@ static uint8_t *GetOutBuffer( decoder_t *p_dec, void **pp_out_buffer ) + } + else + { +- aout_buffer_t *p_aout_buffer = GetAoutBuffer( p_dec ); ++ block_t *p_aout_buffer = GetAoutBuffer( p_dec ); + p_buf = p_aout_buffer ? p_aout_buffer->p_buffer : NULL; + *pp_out_buffer = p_aout_buffer; + } +@@ -535,7 +538,7 @@ static uint8_t *GetOutBuffer( decoder_t *p_dec, void **pp_out_buffer ) + /***************************************************************************** + * GetAoutBuffer: + *****************************************************************************/ +-static aout_buffer_t *GetAoutBuffer( decoder_t *p_dec ) ++static block_t *GetAoutBuffer( decoder_t *p_dec ) + { + decoder_sys_t *p_sys = p_dec->p_sys; + aout_buffer_t *p_buf; +@@ -550,9 +553,14 @@ static aout_buffer_t *GetAoutBuffer( decoder_t *p_dec ) + p_sys->b_discontinuity = false; + + /* Hack for libmad filter */ +- p_buf->i_nb_bytes = p_sys->i_frame_size + MAD_BUFFER_GUARD; ++#if 0 ++ p_buf = block_Realloc( p_buf, 0, p_sys->i_frame_size + MAD_BUFFER_GUARD ); + + return p_buf; ++#else ++ decoder_DeleteAudioBuffer( p_dec, p_buf ); ++ return 0; ++#endif + } + + /***************************************************************************** +-- +1.7.2.3 + --- vlc-0.8.6.h.orig/debian/patches/200_osdmenu_paths.diff +++ vlc-0.8.6.h/debian/patches/200_osdmenu_paths.diff @@ -0,0 +1,33 @@ +Index: vlc-0.8.5-test3.debian/share/osdmenu/default.cfg +=================================================================== +--- vlc-0.8.5-test3.debian.orig/share/osdmenu/default.cfg 2006-04-19 09:25:02.000000000 +0200 ++++ vlc-0.8.5-test3.debian/share/osdmenu/default.cfg 2006-04-24 16:21:46.000000000 +0200 +@@ -1,4 +1,4 @@ +-dir share/osdmenu/default ++dir /usr/share/vlc/osdmenu/default + action key-play-pause (0,0) + unselect unselected.png + select selection/play_pause.png +Index: vlc-0.8.5-test3.debian/share/osdmenu/dvd.cfg +=================================================================== +--- vlc-0.8.5-test3.debian.orig/share/osdmenu/dvd.cfg 2006-04-19 09:25:02.000000000 +0200 ++++ vlc-0.8.5-test3.debian/share/osdmenu/dvd.cfg 2006-04-24 16:21:46.000000000 +0200 +@@ -1,4 +1,4 @@ +-dir share/osdmenu/dvd ++dir /usr/share/vlc/osdmenu/dvd + action key-play (0,0) + unselect unselect/barroff.png + select selection/play.png +Index: vlc-0.8.5-test3.debian/modules/video_filter/osdmenu.c +=================================================================== +--- vlc-0.8.5-test3.debian.orig/modules/video_filter/osdmenu.c 2006-04-19 09:25:11.000000000 +0200 ++++ vlc-0.8.5-test3.debian/modules/video_filter/osdmenu.c 2006-04-24 16:21:46.000000000 +0200 +@@ -92,7 +92,7 @@ + #if defined( WIN32 ) || defined( UNDER_CE ) + #define OSD_DEFAULT_CFG "osdmenu/default.cfg" + #else +-#define OSD_DEFAULT_CFG "share/osdmenu/default.cfg" ++#define OSD_DEFAULT_CFG "/usr/share/vlc/osdmenu/default.cfg" + #endif + + #define OSD_UPDATE_MIN 0 --- vlc-0.8.6.h.orig/debian/patches/050_bootstrap.diff +++ vlc-0.8.6.h/debian/patches/050_bootstrap.diff @@ -0,0 +1,466 @@ +--- a/configure ++++ b/configure +@@ -988,13 +988,13 @@ HAS_WIDL_COMPILER_TRUE + HAS_WIDL_COMPILER_FALSE + BUILD_ACTIVEX_TRUE + BUILD_ACTIVEX_FALSE +-FIREFOX_CFLAGS +-FIREFOX_LIBS ++ICEAPE_CFLAGS ++ICEAPE_LIBS + MOZILLA_CONFIG + SEAMONKEY_CONFIG + XULRUNNER_CONFIG +-FIREFOX_XPCOM_CFLAGS +-FIREFOX_XPCOM_LIBS ++ICEAPE_XPCOM_CFLAGS ++ICEAPE_XPCOM_LIBS + MOZILLA_NSPR_CFLAGS + MOZILLA_NSPR_LIBS + NSPR_CFLAGS +@@ -1091,10 +1091,10 @@ GNUTLS_CFLAGS + GNUTLS_LIBS + MIDL + WIDL +-FIREFOX_CFLAGS +-FIREFOX_LIBS +-FIREFOX_XPCOM_CFLAGS +-FIREFOX_XPCOM_LIBS ++ICEAPE_CFLAGS ++ICEAPE_LIBS ++ICEAPE_XPCOM_CFLAGS ++ICEAPE_XPCOM_LIBS + MOZILLA_NSPR_CFLAGS + MOZILLA_NSPR_LIBS + NSPR_CFLAGS +@@ -1973,14 +1973,13 @@ Some influential environment variables: + GNUTLS_LIBS linker flags for GNUTLS, overriding pkg-config + MIDL Microsoft IDL compiler (Win32 platform only) + WIDL Wine IDL compiler (requires Wine SDK) +- FIREFOX_CFLAGS +- C compiler flags for FIREFOX, overriding pkg-config +- FIREFOX_LIBS +- linker flags for FIREFOX, overriding pkg-config +- FIREFOX_XPCOM_CFLAGS +- C compiler flags for FIREFOX_XPCOM, overriding pkg-config +- FIREFOX_XPCOM_LIBS +- linker flags for FIREFOX_XPCOM, overriding pkg-config ++ ICEAPE_CFLAGS ++ C compiler flags for ICEAPE, overriding pkg-config ++ ICEAPE_LIBS linker flags for ICEAPE, overriding pkg-config ++ ICEAPE_XPCOM_CFLAGS ++ C compiler flags for ICEAPE_XPCOM, overriding pkg-config ++ ICEAPE_XPCOM_LIBS ++ linker flags for ICEAPE_XPCOM, overriding pkg-config + MOZILLA_NSPR_CFLAGS + C compiler flags for MOZILLA_NSPR, overriding pkg-config + MOZILLA_NSPR_LIBS +@@ -3023,11 +3022,6 @@ ac_config_headers="$ac_config_headers co + + + +-if test "x${enable_maintainer_mode}" != "xno"; then +- enable_maintainer_mode="yes" +-fi +- +- + { echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 + echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6; } + # Check whether --enable-maintainer-mode was given. +@@ -6577,7 +6571,7 @@ ia64-*-hpux*) + ;; + *-*-irix6*) + # Find out which ABI we are using. +- echo '#line 6580 "configure"' > conftest.$ac_ext ++ echo '#line 6574 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +@@ -9216,11 +9210,11 @@ else + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:9219: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:9213: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:9223: \$? = $ac_status" >&5 ++ echo "$as_me:9217: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -9506,11 +9500,11 @@ else + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:9509: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:9503: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:9513: \$? = $ac_status" >&5 ++ echo "$as_me:9507: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -9610,11 +9604,11 @@ else + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:9613: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:9607: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:9617: \$? = $ac_status" >&5 ++ echo "$as_me:9611: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -11987,7 +11981,7 @@ else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext < conftest.$ac_ext <&5) ++ (eval echo "\"\$as_me:14485: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:14495: \$? = $ac_status" >&5 ++ echo "$as_me:14489: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -14592,11 +14586,11 @@ else + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:14595: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:14589: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:14599: \$? = $ac_status" >&5 ++ echo "$as_me:14593: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -16190,11 +16184,11 @@ else + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:16193: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:16187: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:16197: \$? = $ac_status" >&5 ++ echo "$as_me:16191: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -16294,11 +16288,11 @@ else + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:16297: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:16291: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:16301: \$? = $ac_status" >&5 ++ echo "$as_me:16295: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -18514,11 +18508,11 @@ else + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:18517: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:18511: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:18521: \$? = $ac_status" >&5 ++ echo "$as_me:18515: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -18804,11 +18798,11 @@ else + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:18807: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:18801: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:18811: \$? = $ac_status" >&5 ++ echo "$as_me:18805: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -18908,11 +18902,11 @@ else + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:18911: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:18905: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:18915: \$? = $ac_status" >&5 ++ echo "$as_me:18909: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -62427,20 +62421,20 @@ then + then + + pkg_failed=no +-{ echo "$as_me:$LINENO: checking for FIREFOX" >&5 +-echo $ECHO_N "checking for FIREFOX... $ECHO_C" >&6; } ++{ echo "$as_me:$LINENO: checking for ICEAPE" >&5 ++echo $ECHO_N "checking for ICEAPE... $ECHO_C" >&6; } + + if test -n "$PKG_CONFIG"; then +- if test -n "$FIREFOX_CFLAGS"; then +- pkg_cv_FIREFOX_CFLAGS="$FIREFOX_CFLAGS" ++ if test -n "$ICEAPE_CFLAGS"; then ++ pkg_cv_ICEAPE_CFLAGS="$ICEAPE_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"firefox-plugin\"") >&5 +- ($PKG_CONFIG --exists --print-errors "firefox-plugin") 2>&5 ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"iceape-plugin\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "iceape-plugin") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- pkg_cv_FIREFOX_CFLAGS=`$PKG_CONFIG --cflags "firefox-plugin" 2>/dev/null` ++ pkg_cv_ICEAPE_CFLAGS=`$PKG_CONFIG --cflags "iceape-plugin" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -62449,16 +62443,16 @@ else + pkg_failed=untried + fi + if test -n "$PKG_CONFIG"; then +- if test -n "$FIREFOX_LIBS"; then +- pkg_cv_FIREFOX_LIBS="$FIREFOX_LIBS" ++ if test -n "$ICEAPE_LIBS"; then ++ pkg_cv_ICEAPE_LIBS="$ICEAPE_LIBS" + else + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"firefox-plugin\"") >&5 +- ($PKG_CONFIG --exists --print-errors "firefox-plugin") 2>&5 ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"iceape-plugin\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "iceape-plugin") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- pkg_cv_FIREFOX_LIBS=`$PKG_CONFIG --libs "firefox-plugin" 2>/dev/null` ++ pkg_cv_ICEAPE_LIBS=`$PKG_CONFIG --libs "iceape-plugin" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -62477,12 +62471,12 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- FIREFOX_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "firefox-plugin"` ++ ICEAPE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "iceape-plugin"` + else +- FIREFOX_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "firefox-plugin"` ++ ICEAPE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "iceape-plugin"` + fi + # Put the nasty error message in config.log where it belongs +- echo "$FIREFOX_PKG_ERRORS" >&5 ++ echo "$ICEAPE_PKG_ERRORS" >&5 + + { echo "$as_me:$LINENO: result: no" >&5 + echo "${ECHO_T}no" >&6; } +@@ -62774,27 +62768,27 @@ echo "$as_me: error: Please install the + + + else +- FIREFOX_CFLAGS=$pkg_cv_FIREFOX_CFLAGS +- FIREFOX_LIBS=$pkg_cv_FIREFOX_LIBS ++ ICEAPE_CFLAGS=$pkg_cv_ICEAPE_CFLAGS ++ ICEAPE_LIBS=$pkg_cv_ICEAPE_LIBS + { echo "$as_me:$LINENO: result: yes" >&5 + echo "${ECHO_T}yes" >&6; } + + + pkg_failed=no +-{ echo "$as_me:$LINENO: checking for FIREFOX_XPCOM" >&5 +-echo $ECHO_N "checking for FIREFOX_XPCOM... $ECHO_C" >&6; } ++{ echo "$as_me:$LINENO: checking for ICEAPE_XPCOM" >&5 ++echo $ECHO_N "checking for ICEAPE_XPCOM... $ECHO_C" >&6; } + + if test -n "$PKG_CONFIG"; then +- if test -n "$FIREFOX_XPCOM_CFLAGS"; then +- pkg_cv_FIREFOX_XPCOM_CFLAGS="$FIREFOX_XPCOM_CFLAGS" ++ if test -n "$ICEAPE_XPCOM_CFLAGS"; then ++ pkg_cv_ICEAPE_XPCOM_CFLAGS="$ICEAPE_XPCOM_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"firefox-xpcom\"") >&5 +- ($PKG_CONFIG --exists --print-errors "firefox-xpcom") 2>&5 ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"iceape-xpcom\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "iceape-xpcom") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- pkg_cv_FIREFOX_XPCOM_CFLAGS=`$PKG_CONFIG --cflags "firefox-xpcom" 2>/dev/null` ++ pkg_cv_ICEAPE_XPCOM_CFLAGS=`$PKG_CONFIG --cflags "iceape-xpcom" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -62803,16 +62797,16 @@ else + pkg_failed=untried + fi + if test -n "$PKG_CONFIG"; then +- if test -n "$FIREFOX_XPCOM_LIBS"; then +- pkg_cv_FIREFOX_XPCOM_LIBS="$FIREFOX_XPCOM_LIBS" ++ if test -n "$ICEAPE_XPCOM_LIBS"; then ++ pkg_cv_ICEAPE_XPCOM_LIBS="$ICEAPE_XPCOM_LIBS" + else + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"firefox-xpcom\"") >&5 +- ($PKG_CONFIG --exists --print-errors "firefox-xpcom") 2>&5 ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"iceape-xpcom\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "iceape-xpcom") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- pkg_cv_FIREFOX_XPCOM_LIBS=`$PKG_CONFIG --libs "firefox-xpcom" 2>/dev/null` ++ pkg_cv_ICEAPE_XPCOM_LIBS=`$PKG_CONFIG --libs "iceape-xpcom" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -62831,12 +62825,12 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- FIREFOX_XPCOM_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "firefox-xpcom"` ++ ICEAPE_XPCOM_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "iceape-xpcom"` + else +- FIREFOX_XPCOM_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "firefox-xpcom"` ++ ICEAPE_XPCOM_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "iceape-xpcom"` + fi + # Put the nasty error message in config.log where it belongs +- echo "$FIREFOX_XPCOM_PKG_ERRORS" >&5 ++ echo "$ICEAPE_XPCOM_PKG_ERRORS" >&5 + + { echo "$as_me:$LINENO: result: no" >&5 + echo "${ECHO_T}no" >&6; } +@@ -63320,13 +63314,13 @@ echo "${ECHO_T}yes" >&6; } + fi + + else +- FIREFOX_XPCOM_CFLAGS=$pkg_cv_FIREFOX_XPCOM_CFLAGS +- FIREFOX_XPCOM_LIBS=$pkg_cv_FIREFOX_XPCOM_LIBS ++ ICEAPE_XPCOM_CFLAGS=$pkg_cv_ICEAPE_XPCOM_CFLAGS ++ ICEAPE_XPCOM_LIBS=$pkg_cv_ICEAPE_XPCOM_LIBS + { echo "$as_me:$LINENO: result: yes" >&5 + echo "${ECHO_T}yes" >&6; } + : + fi +- CPPFLAGS="${CPPFLAGS_save} ${FIREFOX_CFLAGS} ${FIREFOX_XPCOM_CFLAGS} ${MOZILLA_NSPR_CFLAGS} ${NSPR_CFLAGS} ${MOZILLA_CPPFLAGS}" ++ CPPFLAGS="${CPPFLAGS_save} ${ICEAPE_CFLAGS} ${ICEAPE_XPCOM_CFLAGS} ${MOZILLA_NSPR_CFLAGS} ${NSPR_CFLAGS} ${MOZILLA_CPPFLAGS}" + MOZILLA_REQUIRED_HEADERS=1 + + for ac_header in mozilla-config.h +@@ -63682,7 +63676,7 @@ echo "$as_me: error: Please install the + fi + MOZILLA_REQUIRED_HEADERS= + mozilla=: +- firefox_include=`pkg-config --variable=includedir firefox-plugin` ++ firefox_include=`pkg-config --variable=includedir iceape-plugin` + if test -f "${firefox_include}/mozilla-config.h" -a -f "${firefox_include}/mozilla-config32.h"; then + MOZILLA_CONFIG_H="${firefox_include}/mozilla-config32.h" + elif test -f "${firefox_include}/mozilla-config.h" -a -f "${firefox_include}/mozilla-config64.h"; then +@@ -63706,7 +63700,7 @@ echo "$as_me: error: Please install the + + + for element in mozilla; do +- eval "LDFLAGS_${element}="'"'"${FIREFOX_LIBS} ${MOZILLA_NSPR_LIBS} ${NSPR_LIBS} ${MOZILLA_LDFLAGS} "'$'"{LDFLAGS_${element}} "'"' ++ eval "LDFLAGS_${element}="'"'"${ICEAPE_LIBS} ${MOZILLA_NSPR_LIBS} ${NSPR_LIBS} ${MOZILLA_LDFLAGS} "'$'"{LDFLAGS_${element}} "'"' + am_modules_with_ldflags="${am_modules_with_ldflags} ${element}" + done + +@@ -64829,7 +64823,7 @@ else + JAVA_TEST=Test.java + CLASS_TEST=Test.class + cat << \EOF > $JAVA_TEST +-/* #line 64832 "configure" */ ++/* #line 64826 "configure" */ + public class Test { + } + EOF +@@ -65005,7 +64999,7 @@ EOF + if uudecode$EXEEXT Test.uue; then + ac_cv_prog_uudecode_base64=yes + else +- echo "configure: 65008: uudecode had trouble decoding base 64 file 'Test.uue'" >&5 ++ echo "configure: 65002: uudecode had trouble decoding base 64 file 'Test.uue'" >&5 + echo "configure: failed file was:" >&5 + cat Test.uue >&5 + ac_cv_prog_uudecode_base64=no +@@ -65127,7 +65121,7 @@ else + JAVA_TEST=Test.java + CLASS_TEST=Test.class + cat << \EOF > $JAVA_TEST +-/* #line 65130 "configure" */ ++/* #line 65124 "configure" */ + public class Test { + } + EOF +@@ -65164,7 +65158,7 @@ JAVA_TEST=Test.java + CLASS_TEST=Test.class + TEST=Test + cat << \EOF > $JAVA_TEST +-/* [#]line 65167 "configure" */ ++/* [#]line 65161 "configure" */ + public class Test { + public static void main (String args[]) { + System.exit (0); +@@ -67203,13 +67197,13 @@ HAS_WIDL_COMPILER_TRUE!$HAS_WIDL_COMPILE + HAS_WIDL_COMPILER_FALSE!$HAS_WIDL_COMPILER_FALSE$ac_delim + BUILD_ACTIVEX_TRUE!$BUILD_ACTIVEX_TRUE$ac_delim + BUILD_ACTIVEX_FALSE!$BUILD_ACTIVEX_FALSE$ac_delim +-FIREFOX_CFLAGS!$FIREFOX_CFLAGS$ac_delim +-FIREFOX_LIBS!$FIREFOX_LIBS$ac_delim ++ICEAPE_CFLAGS!$ICEAPE_CFLAGS$ac_delim ++ICEAPE_LIBS!$ICEAPE_LIBS$ac_delim + MOZILLA_CONFIG!$MOZILLA_CONFIG$ac_delim + SEAMONKEY_CONFIG!$SEAMONKEY_CONFIG$ac_delim + XULRUNNER_CONFIG!$XULRUNNER_CONFIG$ac_delim +-FIREFOX_XPCOM_CFLAGS!$FIREFOX_XPCOM_CFLAGS$ac_delim +-FIREFOX_XPCOM_LIBS!$FIREFOX_XPCOM_LIBS$ac_delim ++ICEAPE_XPCOM_CFLAGS!$ICEAPE_XPCOM_CFLAGS$ac_delim ++ICEAPE_XPCOM_LIBS!$ICEAPE_XPCOM_LIBS$ac_delim + MOZILLA_NSPR_CFLAGS!$MOZILLA_NSPR_CFLAGS$ac_delim + MOZILLA_NSPR_LIBS!$MOZILLA_NSPR_LIBS$ac_delim + NSPR_CFLAGS!$NSPR_CFLAGS$ac_delim --- vlc-0.8.6.h.orig/debian/patches/104_notify.diff +++ vlc-0.8.6.h/debian/patches/104_notify.diff @@ -0,0 +1,13 @@ +Index: vlc-0.8.6a.debian/modules/misc/notify.c +=================================================================== +--- vlc-0.8.6a.debian.orig/modules/misc/notify.c 2007-01-03 19:27:57.000000000 +0100 ++++ vlc-0.8.6a.debian/modules/misc/notify.c 2007-01-11 18:30:48.000000000 +0100 +@@ -205,7 +205,7 @@ + NotifyNotification * notification; + notification = notify_notification_new( _("Now Playing"), + psz_temp, +- DATA_PATH "/vlc48x48.png",NULL); ++ "/usr/share/pixmaps/vlc.png",NULL); + notify_notification_set_timeout( notification, + config_GetInt(p_this, "notify-timeout") ); + notify_notification_set_urgency( notification, NOTIFY_URGENCY_LOW ); --- vlc-0.8.6.h.orig/debian/patches/405-CVE-2008-3732.diff +++ vlc-0.8.6.h/debian/patches/405-CVE-2008-3732.diff @@ -0,0 +1,141 @@ +diff --git a/modules/demux/tta.c b/modules/demux/tta.c +index e400908..eede5bb 100644 +--- a/modules/demux/tta.c ++++ b/modules/demux/tta.c +@@ -60,10 +60,10 @@ struct demux_sys_t + es_out_id_t *p_es; + + /* */ +- int i_totalframes; +- int i_currentframe; ++ uint32_t i_totalframes; ++ uint32_t i_currentframe; + uint32_t *pi_seektable; +- int i_datalength; ++ uint32_t i_datalength; + int i_framelength; + + /* */ +@@ -81,10 +81,11 @@ static int Open( vlc_object_t * p_this ) + es_format_t fmt; + uint8_t *p_peek; + uint8_t p_header[22]; +- uint8_t *p_seektable; +- int i_seektable_size = 0, i; ++ uint8_t *p_fullheader; ++ int i_seektable_size = 0; + //char psz_info[4096]; + //module_t *p_id3; ++ uint32_t i; + + if( stream_Peek( p_demux->s, &p_peek, 4 ) < 4 ) + return VLC_EGENERIC; +@@ -94,7 +95,7 @@ static int Open( vlc_object_t * p_this ) + if( !p_demux->b_force ) return VLC_EGENERIC; + + /* User forced */ +- msg_Err( p_demux, "this doesn't look like a flac stream, " ++ msg_Err( p_demux, "this doesn't look like a true-audio stream, " + "continuing anyway" ); + } + +@@ -106,11 +107,22 @@ static int Open( vlc_object_t * p_this ) + p_demux->pf_control = Control; + p_demux->p_sys = p_sys = malloc( sizeof( demux_sys_t ) ); + ++ if( !p_sys ) ++ return VLC_ENOMEM; ++ ++ p_sys->pi_seektable = NULL; ++ + /* Read the metadata */ + es_format_Init( &fmt, AUDIO_ES, VLC_FOURCC( 'T', 'T', 'A', '1' ) ); + fmt.audio.i_channels = GetWLE( &p_header[6] ); + fmt.audio.i_bitspersample = GetWLE( &p_header[8] ); + fmt.audio.i_rate = GetDWLE( &p_header[10] ); ++ if( fmt.audio.i_rate == 0 || /* Avoid divide by 0 */ ++ fmt.audio.i_rate > ( 1 << 20 ) /* Avoid i_framelength overflow */ ) ++ { ++ msg_Warn( p_demux, "Wrong sample rate" ); ++ goto error; ++ } + + p_sys->i_datalength = GetDWLE( &p_header[14] ); + p_sys->i_framelength = TTA_FRAMETIME * fmt.audio.i_rate; +@@ -118,25 +130,36 @@ static int Open( vlc_object_t * p_this ) + p_sys->i_totalframes = p_sys->i_datalength / p_sys->i_framelength + + ((p_sys->i_datalength % p_sys->i_framelength) ? 1 : 0); + p_sys->i_currentframe = 0; ++ if( p_sys->i_totalframes > (1 << 29)) ++ goto error; + + i_seektable_size = sizeof(uint32_t)*p_sys->i_totalframes; +- p_seektable = (uint8_t *)malloc( i_seektable_size ); +- stream_Read( p_demux->s, p_seektable, i_seektable_size ); +- p_sys->pi_seektable = (uint32_t *)malloc(i_seektable_size); + ++ /* Store the header and Seektable for avcodec */ ++ fmt.i_extra = 22 + i_seektable_size + 4; ++ fmt.p_extra = p_fullheader = malloc( fmt.i_extra ); ++ if( !p_fullheader ) ++ goto error; ++ ++ memcpy( p_fullheader, p_header, 22 ); ++ p_fullheader += 22; ++ if( stream_Read( p_demux->s, p_fullheader, i_seektable_size ) ++ != i_seektable_size ) ++ goto error; ++ ++ p_sys->pi_seektable = calloc( p_sys->i_totalframes, sizeof(uint32_t) ); ++ if( !p_sys->pi_seektable ) ++ goto error; + for( i = 0; i < p_sys->i_totalframes; i++ ) +- p_sys->pi_seektable[i] = GetDWLE( &p_seektable[i*4] ); +- +- stream_Read( p_demux->s, NULL, 4 ); /* CRC */ ++ { ++ p_sys->pi_seektable[i] = GetDWLE( p_fullheader ); ++ p_fullheader += 4; ++ } + +- /* Store the header and Seektable for avcodec */ +- fmt.i_extra = 22 + (p_sys->i_totalframes * 4) + 4; +- fmt.p_extra = malloc( fmt.i_extra ); +- memcpy( fmt.p_extra, p_header, 22 ); +- memcpy( fmt.p_extra+22, p_seektable, fmt.i_extra -22 ); ++ stream_Read( p_demux->s, p_fullheader, 4 ); /* CRC */ ++ p_fullheader += 4; + + p_sys->p_es = es_out_Add( p_demux->out, &fmt ); +- free( p_seektable ); + p_sys->i_start = stream_Tell( p_demux->s ); + + #if 0 +@@ -152,6 +175,10 @@ static int Open( vlc_object_t * p_this ) + p_sys->p_meta = vlc_meta_New(); + #endif + return VLC_SUCCESS; ++error: ++ es_format_Clean( &fmt ); ++ Close( p_this ); ++ return VLC_EGENERIC; + } + + /***************************************************************************** +@@ -162,6 +189,7 @@ static void Close( vlc_object_t * p_this ) + demux_t *p_demux = (demux_t*)p_this; + demux_sys_t *p_sys = p_demux->p_sys; + ++ free( p_sys->pi_seektable ); + free( p_sys ); + } + +@@ -221,7 +249,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) + if( i64 > 0 ) + { + int64_t tmp = 0; +- int i; ++ uint32_t i; + for( i=0; i < p_sys->i_totalframes && tmp+p_sys->pi_seektable[i] < i64; i++) + { + tmp += p_sys->pi_seektable[i]; --- vlc-0.8.6.h.orig/debian/patches/101_certificates_paths.diff +++ vlc-0.8.6.h/debian/patches/101_certificates_paths.diff @@ -0,0 +1,13 @@ +--- a/modules/misc/gnutls.c ++++ b/modules/misc/gnutls.c +@@ -714,6 +714,10 @@ gnutls_ClientCreate( tls_t *p_tls ) + p_sys->x509_cred, psz_path, VLC_FALSE ); + free( psz_path ); + } ++ gnutls_Addx509File( (vlc_object_t *)p_session, ++ p_sys->x509_cred, ++ "/etc/ssl/certs/ca-certificates.crt",VLC_FALSE ); ++ + p_session->pf_handshake2 = gnutls_HandshakeAndValidate; + } + else --- vlc-0.8.6.h.orig/debian/patches/407-mms-overflow.diff +++ vlc-0.8.6.h/debian/patches/407-mms-overflow.diff @@ -0,0 +1,117 @@ +commit 2947f778df4f440ceeb6f5dc1bdb0e9f5cd31e74 +Author: Rémi Denis-Courmont +Date: Sun Aug 24 13:18:01 2008 +0300 + + MMS integers handling fixes, including buffer overflow + + Pointed-out-by: Pınar Yanardağ + (cherry picked from commit afe3464a1c7c6f9d7640a3f5db17010c34212440) + + Conflicts: + + modules/access/mms/mmstu.c + +diff --git a/modules/access/mms/mmstu.c b/modules/access/mms/mmstu.c +index 61f9e38..df5ec78 100644 +--- a/modules/access/mms/mmstu.c ++++ b/modules/access/mms/mmstu.c +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + #include + #include + +@@ -695,7 +696,7 @@ static int MMSOpen( access_t *p_access, vlc_url_t *p_url, int i_proto ) + GetDWLE( p_sys->p_cmd + MMS_CMD_HEADERSIZE + 60 ); + + msg_Dbg( p_access, +- "answer 0x06 flags:0x%8.8x media_length:%us packet_length:%lu packet_count:%u max_bit_rate:%d header_size:%d", ++ "answer 0x06 flags:0x%8.8"PRIx32" media_length:%"PRIu32"s packet_length:%zu packet_count:%"PRIu32" max_bit_rate:%d header_size:%zu", + p_sys->i_flags_broadcast, + p_sys->i_media_length, + p_sys->i_packet_length, +@@ -749,12 +750,12 @@ static int MMSOpen( access_t *p_access, vlc_url_t *p_url, int i_proto ) + if( p_sys->i_header >= p_sys->i_header_size ) + { + msg_Dbg( p_access, +- "header complete(%d)", ++ "header complete(%zu)", + p_sys->i_header ); + break; + } + msg_Dbg( p_access, +- "header incomplete (%d/%d), reading more", ++ "header incomplete (%zu/%zu), reading more", + p_sys->i_header, + p_sys->i_header_size ); + } +@@ -1128,7 +1129,7 @@ static int NetFillBuffer( access_t *p_access ) + + static int mms_ParseCommand( access_t *p_access, + uint8_t *p_data, +- int i_data, ++ size_t i_data, + int *pi_used ) + { + #define GET32( i_pos ) \ +@@ -1137,7 +1138,7 @@ static int mms_ParseCommand( access_t *p_access, + ( p_sys->p_cmd[i_pos + 3] << 24 ) ) + + access_sys_t *p_sys = p_access->p_sys; +- int i_length; ++ uint32_t i_length; + uint32_t i_id; + + if( p_sys->p_cmd ) +@@ -1159,10 +1160,10 @@ static int mms_ParseCommand( access_t *p_access, + i_id = GetDWLE( p_data + 4 ); + i_length = GetDWLE( p_data + 8 ) + 16; + +- if( i_id != 0xb00bface ) ++ if( i_id != 0xb00bface || i_length < 16 ) + { + msg_Err( p_access, +- "incorrect command header (0x%x)", i_id ); ++ "incorrect command header (0x%"PRIx32")", i_id ); + p_sys->i_command = 0; + return -1; + } +@@ -1170,8 +1171,8 @@ static int mms_ParseCommand( access_t *p_access, + if( i_length > p_sys->i_cmd ) + { + msg_Warn( p_access, +- "truncated command (missing %d bytes)", +- i_length - i_data ); ++ "truncated command (missing %zu bytes)", ++ (size_t)i_length - i_data ); + p_sys->i_command = 0; + return -1; + } +diff --git a/modules/access/mms/mmstu.h b/modules/access/mms/mmstu.h +index b265127..8d41fe7 100644 +--- a/modules/access/mms/mmstu.h ++++ b/modules/access/mms/mmstu.h +@@ -62,10 +62,10 @@ struct access_sys_t + int i_packet_seq_num; + + uint8_t *p_cmd; /* latest command read */ +- int i_cmd; /* allocated at the begining */ ++ size_t i_cmd; /* allocated at the begining */ + + uint8_t *p_header; /* allocated by mms_ReadPacket */ +- int i_header; ++ size_t i_header; + + uint8_t *p_media; /* allocated by mms_ReadPacket */ + size_t i_media; +@@ -86,7 +86,7 @@ struct access_sys_t + size_t i_packet_length; + uint32_t i_packet_count; + int i_max_bit_rate; +- int i_header_size; ++ size_t i_header_size; + + /* */ + vlc_bool_t b_seekable; --- vlc-0.8.6.h.orig/debian/patches/001_am_maintainer_mode.diff +++ vlc-0.8.6.h/debian/patches/001_am_maintainer_mode.diff @@ -0,0 +1,12 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -24,9 +24,6 @@ dnl you can specify "--disable-maintaine + dnl automake behavior, you've likely never heard of maintainer mode, so we + dnl can't expect you to enable it manually. + +-AS_IF([test "x${enable_maintainer_mode}" != "xno"], +- [enable_maintainer_mode="yes"]) +- + dnl HA! HA! + AM_MAINTAINER_MODE + --- vlc-0.8.6.h.orig/debian/patches/300_manpage_syntax.diff +++ vlc-0.8.6.h/debian/patches/300_manpage_syntax.diff @@ -0,0 +1,17 @@ +Index: vlc-0.8.6.a.debian/doc/vlc.1 +=================================================================== +--- vlc-0.8.6.a.debian.orig/doc/vlc.1 2007-03-17 20:16:25.000000000 +0100 ++++ vlc-0.8.6.a.debian/doc/vlc.1 2007-03-17 20:18:24.000000000 +0100 +@@ -70,6 +70,11 @@ + (close VLC). + + .SH SEE ALSO ++The ++.B videolan-doc ++package contains comprehensive documents on how to use ++.B VLC ++both as a media player and as a streaming server. + Online documentation: http://www.videolan.org/doc/ + .PP + .SH AUTHOR + --- vlc-0.8.6.h.orig/debian/patches/CVE-2010-0522.patch +++ vlc-0.8.6.h/debian/patches/CVE-2010-0522.patch @@ -0,0 +1,35 @@ +From 97e73c5d445f8180287e59e7f1051012f42e380c Mon Sep 17 00:00:00 2001 +From: Laurent Aimar +Date: Tue, 23 Feb 2010 23:31:57 +0100 +Subject: [PATCH] Fixed invalid accesses in decoder with corrupted subtitles streams. +MIME-Version: 1.0 +Content-Type: text/plain; charset=utf8 +Content-Transfer-Encoding: 8bit + +(cherry picked from commit 4602023991ab63c6b47f091795cd6fa393b41c2c) +Signed-off-by: Rémi Denis-Courmont +--- + modules/codec/subtitles/subsdec.c | 15 ++++++++++----- + 1 files changed, 10 insertions(+), 5 deletions(-) + +diff --git a/modules/codec/subtitles/subsdec.c b/modules/codec/subtitles/subsdec.c +index 6a3612f..8fd5aa2 100644 +--- a/modules/codec/subtitles/subsdec.c ++++ vlc-0.8.6.h/modules/codec/subsdec.c +@@ -426,10 +426,11 @@ static subpicture_t *ParseText( decoder_t *p_dec, block_t *p_block ) + } + + /* Should be resiliant against bad subtitles */ +- psz_subtitle = strndup( (const char *)p_block->p_buffer, +- p_block->i_buffer ); ++ psz_subtitle = malloc( p_block->i_buffer + 1 ); + if( psz_subtitle == NULL ) + return NULL; ++ memcpy( psz_subtitle, p_block->p_buffer, p_block->i_buffer ); ++ psz_subtitle[p_block->i_buffer] = '\0'; + + if( p_sys->iconv_handle == (vlc_iconv_t)-1 ) + { +-- +1.7.2.3 + --- vlc-0.8.6.h.orig/debian/patches/102_dejavu_font.diff +++ vlc-0.8.6.h/debian/patches/102_dejavu_font.diff @@ -0,0 +1,13 @@ +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 "/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf" + #endif + + #if defined(HAVE_FRIBIDI) --- vlc-0.8.6.h.orig/debian/patches/100_no_wx_updates.diff +++ vlc-0.8.6.h/debian/patches/100_no_wx_updates.diff @@ -0,0 +1,15 @@ +Index: vlc-0.8.6-svn20061012.debian/modules/gui/wxwidgets/interface.cpp +=================================================================== +--- vlc-0.8.6-svn20061012.debian.orig/modules/gui/wxwidgets/interface.cpp 2006-09-18 12:28:21.000000000 +0200 ++++ vlc-0.8.6-svn20061012.debian/modules/gui/wxwidgets/interface.cpp 2007-01-08 02:25:50.000000000 +0100 +@@ -606,8 +606,8 @@ + /* Create the "Help" menu */ + wxMenu *help_menu = new wxMenu; + help_menu->Append( About_Event, wxU(_("About...")) ); +- help_menu->AppendSeparator(); +- help_menu->Append( UpdateVLC_Event, wxU(_("Check for Updates...")) ); ++// help_menu->AppendSeparator(); ++// help_menu->Append( UpdateVLC_Event, wxU(_("Check for Updates...")) ); + + /* Append the freshly created menus to the menu bar... */ + wxMenuBar *menubar = new wxMenuBar(); --- vlc-0.8.6.h.orig/debian/patches/CVE-2010-1442-3.patch +++ vlc-0.8.6.h/debian/patches/CVE-2010-1442-3.patch @@ -0,0 +1,30 @@ +From ca13e21cc5c948908f618cc4a76443bd30e5658c Mon Sep 17 00:00:00 2001 +From: Laurent Aimar +Date: Sat, 27 Feb 2010 22:57:50 +0100 +Subject: [PATCH] Fixed segfault with corrupted mkv files with compressed data. +MIME-Version: 1.0 +Content-Type: text/plain; charset=utf8 +Content-Transfer-Encoding: 8bit + +(cherry picked from commit 34500c14bf7d9e58a62ff0f0d6a98ec4a9cf4e91) +Signed-off-by: Rémi Denis-Courmont +--- + modules/demux/mkv/mkv.cpp | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/modules/demux/mkv/mkv.cpp vlc-0.8.6.h/modules/demux/mkv/mkv.cpp +index 102a807..f2c2a75 100644 +--- a/modules/demux/mkv/mkv.cpp ++++ vlc-0.8.6.h/modules/demux/mkv.cpp +@@ -549,6 +549,8 @@ static void BlockDecode( demux_t *p_demux, KaxBlock *block, KaxSimpleBlock *simp + if( tk->i_compression_type == MATROSKA_COMPRESSION_ZLIB ) + { + p_block = block_zlib_decompress( VLC_OBJECT(p_demux), p_block ); ++ if( p_block == NULL ) ++ break; + } + else + #endif +-- +1.7.2.3 + --- vlc-0.8.6.h.orig/debian/patches/409-cue-overflow.diff +++ vlc-0.8.6.h/debian/patches/409-cue-overflow.diff @@ -0,0 +1,125 @@ +From: Rémi Denis-Courmont +Date: Tue, 4 Nov 2008 19:31:17 +0000 (+0200) +Subject: Fix buffer overflow +X-Git-Tag: 0.9.6~3 +X-Git-Url: http://git.videolan.org/gitweb.cgi?p=vlc.git;a=commitdiff_plain;h=5f63f1562d43f32331006c2c1a61742de031b84d;hp=c486b8e603f4d49a86c4891511e4f99f85bba3b1 + +Fix buffer overflow + +Pointed-out-by. Tobias Klein +--- + +Index: vlc-0.8.6.h/modules/access/vcd/cdrom.c +=================================================================== +--- vlc-0.8.6.h.orig/modules/access/vcd/cdrom.c 2008-05-25 20:28:57.000000000 +0200 ++++ vlc-0.8.6.h/modules/access/vcd/cdrom.c 2008-11-05 23:08:43.000000000 +0100 +@@ -835,6 +835,7 @@ + char *psz_vcdfile2 = NULL; + char *psz_cuefile = NULL; + FILE *cuefile = NULL; ++ int *p_sectors = NULL; + char line[1024]; + + /* Check if we are dealing with a .cue file */ +@@ -880,7 +881,6 @@ + cuefile = utf8_fopen( psz_cuefile, "rt" ); + if( cuefile == NULL ) + { +- i_ret = -1; + msg_Dbg( p_this, "could not find .cue file" ); + goto error; + } +@@ -921,58 +921,56 @@ + } + + if( p_vcddev->i_vcdimage_handle == -1) +- { +- i_ret = -1; + goto error; +- } +- else i_ret = 0; + + /* Try to parse the i_tracks and p_sectors info so we can just forget + * about the cuefile */ +- if( i_ret == 0 ) ++ size_t i_tracks = 0; ++ ++ while( fgets( line, 1024, cuefile ) ) + { +- int p_sectors[100]; +- int i_tracks = 0; +- int i_num; +- char psz_dummy[10]; ++ /* look for a TRACK line */ ++ char psz_dummy[9]; ++ if( !sscanf( line, "%9s", psz_dummy ) || strcmp(psz_dummy, "TRACK") ) ++ continue; + ++ /* look for an INDEX line */ + while( fgets( line, 1024, cuefile ) ) + { +- /* look for a TRACK line */ +- if( !sscanf( line, "%9s", psz_dummy ) || +- strcmp(psz_dummy, "TRACK") ) +- continue; ++ int i_num, i_min, i_sec, i_frame; + +- /* look for an INDEX line */ +- while( fgets( line, 1024, cuefile ) ) +- { +- int i_min, i_sec, i_frame; ++ if( (sscanf( line, "%*9s %2u %2u:%2u:%2u", &i_num, ++ &i_min, &i_sec, &i_frame ) != 4) || (i_num != 1) ) ++ continue; + +- if( (sscanf( line, "%9s %2u %2u:%2u:%2u", psz_dummy, &i_num, +- &i_min, &i_sec, &i_frame ) != 5) || (i_num != 1) ) +- continue; +- +- i_tracks++; +- p_sectors[i_tracks - 1] = MSF_TO_LBA(i_min, i_sec, i_frame); +- msg_Dbg( p_this, "vcd track %i begins at sector:%i", +- i_tracks - 1, p_sectors[i_tracks - 1] ); +- break; +- } ++ int *buf = realloc (p_sectors, (i_tracks + 1) * sizeof (int)); ++ if (buf == NULL) ++ goto error; ++ p_sectors = buf; ++ p_sectors[i_tracks] = MSF_TO_LBA(i_min, i_sec, i_frame); ++ msg_Dbg( p_this, "vcd track %i begins at sector:%i", ++ i_tracks, p_sectors[i_tracks] ); ++ i_tracks++; ++ break; + } +- +- /* fill in the last entry */ +- p_sectors[i_tracks] = lseek(p_vcddev->i_vcdimage_handle, 0, SEEK_END) +- / VCD_SECTOR_SIZE; +- msg_Dbg( p_this, "vcd track %i, begins at sector:%i", +- i_tracks, p_sectors[i_tracks] ); +- p_vcddev->i_tracks = i_tracks; +- p_vcddev->p_sectors = malloc( (i_tracks + 1) * sizeof(int) ); +- memcpy( p_vcddev->p_sectors, p_sectors, (i_tracks + 1) * sizeof(int) ); +- + } + ++ /* fill in the last entry */ ++ int *buf = realloc (p_sectors, (i_tracks + 1) * sizeof (int)); ++ if (buf == NULL) ++ goto error; ++ p_sectors = buf; ++ p_sectors[i_tracks] = lseek(p_vcddev->i_vcdimage_handle, 0, SEEK_END) ++ / VCD_SECTOR_SIZE; ++ msg_Dbg( p_this, "vcd track %i, begins at sector:%i", ++ i_tracks, p_sectors[i_tracks] ); ++ p_vcddev->i_tracks = ++i_tracks; ++ p_vcddev->p_sectors = p_sectors; ++ i_ret = 0; ++ + error: + if( cuefile ) fclose( cuefile ); ++ free( p_sectors ); + if( psz_cuefile ) free( psz_cuefile ); + if( psz_vcdfile ) free( psz_vcdfile ); + --- vlc-0.8.6.h.orig/debian/patches/CVE-2011-0531.patch +++ vlc-0.8.6.h/debian/patches/CVE-2011-0531.patch @@ -0,0 +1,29 @@ +From 59491dcedffbf97612d2c572943b56ee4289dd07 Mon Sep 17 00:00:00 2001 +From: Steve Lhomme +Date: Sat, 29 Jan 2011 14:27:43 +0100 +Subject: [PATCH] the ID could be OK but the class mismatching +MIME-Version: 1.0 +Content-Type: text/plain; charset=utf8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Rémi Denis-Courmont +--- + modules/demux/mkv/mkv.hpp | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/modules/demux/mkv/mkv.hpp vlc-0.8.6.h/modules/demux/mkv/mkv.hpp +index f0e87c6..664cafa 100644 +--- a/modules/demux/mkv/mkv.hpp ++++ vlc-0.8.6.h/modules/demux/mkv.cpp +@@ -115,7 +115,7 @@ extern "C" { + + #define MKVD_TIMECODESCALE 1000000 + +-#define MKV_IS_ID( el, C ) ( EbmlId( (*el) ) == C::ClassInfos.GlobalId ) ++#define MKV_IS_ID( el, C ) ( el != NULL && typeid( *el ) == typeid( C ) ) + + + using namespace LIBMATROSKA_NAMESPACE; +-- +1.7.2.5 + --- vlc-0.8.6.h.orig/debian/patches/CVE-2010-1442-2.patch +++ vlc-0.8.6.h/debian/patches/CVE-2010-1442-2.patch @@ -0,0 +1,16 @@ +diff -aur vlc-0.8.6.h.orig/modules/demux/avi/avi.c vlc-0.8.6.h/modules/demux/avi/avi.c +--- vlc-0.8.6.h.orig/modules/demux/avi/avi.c 2008-05-25 18:28:57.000000000 +0000 ++++ vlc-0.8.6.h/modules/demux/avi/avi.c 2011-04-05 20:43:12.000000000 +0000 +@@ -399,7 +399,10 @@ + fmt.audio.i_bitspersample = p_auds->p_wf->wBitsPerSample; + fmt.i_extra = __MIN( p_auds->p_wf->cbSize, + p_auds->i_chunk_size - sizeof(WAVEFORMATEX) ); +- fmt.p_extra = &p_auds->p_wf[1]; ++ fmt.p_extra = malloc( fmt.i_extra ); ++ if( !fmt.p_extra ) goto error; ++ memcpy( fmt.p_extra, &p_vids->p_bih[1], fmt.i_extra ); ++ + msg_Dbg( p_demux, "stream[%d] audio(0x%x) %d channels %dHz %dbits", + i, p_auds->p_wf->wFormatTag, p_auds->p_wf->nChannels, + p_auds->p_wf->nSamplesPerSec, p_auds->p_wf->wBitsPerSample); +Only in vlc-0.8.6.h/modules/demux/avi: avi.c~ --- vlc-0.8.6.h.orig/debian/patches/401-CVE-2008-2430.diff +++ vlc-0.8.6.h/debian/patches/401-CVE-2008-2430.diff @@ -0,0 +1,56 @@ +commit 3de60bf5b886ad81d7c05d68dff7a1ba461c0ac1 +Author: Rémi Denis-Courmont +Date: Sat Jun 28 14:00:57 2008 +0300 + + wav: fix integer overflow (CVE-2008-2430) + + When i_size is sufficiently large, we would overflow malloc(), and then + overwrite the heap with stream_Read(). + + Bug reported by: Alin Rad Pop, Secunia Research. + + (cherry-picked from commit 95e2f0ff579a5b987cbde9454aa1fc86080528e2) + +diff --git a/modules/demux/wav.c b/modules/demux/wav.c +index 0c271d3..045344a 100644 +--- a/modules/demux/wav.c ++++ b/modules/demux/wav.c +@@ -106,7 +106,8 @@ static int Open( vlc_object_t * p_this ) + demux_sys_t *p_sys; + + uint8_t *p_peek; +- unsigned int i_size, i_extended; ++ uint32_t i_size; ++ unsigned int i_extended; + char *psz_name; + + WAVEFORMATEXTENSIBLE *p_wf_ext = NULL; +@@ -139,7 +140,8 @@ static int Open( vlc_object_t * p_this ) + msg_Err( p_demux, "cannot find 'fmt ' chunk" ); + goto error; + } +- if( i_size < sizeof( WAVEFORMATEX ) - 2 ) /* XXX -2 isn't a typo */ ++ i_size += 2; ++ if( i_size < sizeof( WAVEFORMATEX ) ) + { + msg_Err( p_demux, "invalid 'fmt ' chunk" ); + goto error; +@@ -147,14 +149,15 @@ static int Open( vlc_object_t * p_this ) + stream_Read( p_demux->s, NULL, 8 ); /* Cannot fail */ + + /* load waveformatex */ +- p_wf_ext = malloc( __EVEN( i_size ) + 2 ); ++ p_wf_ext = malloc( i_size ); + if( p_wf_ext == NULL ) + goto error; + + p_wf = (WAVEFORMATEX *)p_wf_ext; + p_wf->cbSize = 0; +- if( stream_Read( p_demux->s, +- p_wf, __EVEN( i_size ) ) < (int)__EVEN( i_size ) ) ++ i_size -= 2; ++ if( stream_Read( p_demux->s, p_wf, i_size ) != (int)i_size ++ || ( ( i_size & 1 ) && stream_Read( p_demux->s, NULL, 1 ) != 1 ) ) + { + msg_Err( p_demux, "cannot load 'fmt ' chunk" ); + goto error; --- vlc-0.8.6.h.orig/debian/patches/010_iceape.diff +++ vlc-0.8.6.h/debian/patches/010_iceape.diff @@ -0,0 +1,41 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -5150,9 +5150,9 @@ then + if test "${with_mozilla_sdk_path}" = "" -o "${with_mozilla_sdk_path}" = "no" + then + dnl New firefox-1.5 SDK api +- PKG_CHECK_MODULES([FIREFOX], [firefox-plugin], ++ PKG_CHECK_MODULES([ICEAPE], [iceape-plugin], + [ +- PKG_CHECK_MODULES([FIREFOX_XPCOM], [firefox-xpcom], ++ PKG_CHECK_MODULES([ICEAPE_XPCOM], [iceape-xpcom], + [], + [ + PKG_CHECK_MODULES([MOZILLA_NSPR], [mozilla-nspr], +@@ -5167,7 +5167,7 @@ then + ] + ) + ]) +- CPPFLAGS="${CPPFLAGS_save} ${FIREFOX_CFLAGS} ${FIREFOX_XPCOM_CFLAGS} ${MOZILLA_NSPR_CFLAGS} ${NSPR_CFLAGS} ${MOZILLA_CPPFLAGS}" ++ CPPFLAGS="${CPPFLAGS_save} ${ICEAPE_CFLAGS} ${ICEAPE_XPCOM_CFLAGS} ${MOZILLA_NSPR_CFLAGS} ${NSPR_CFLAGS} ${MOZILLA_CPPFLAGS}" + MOZILLA_REQUIRED_HEADERS=1 + AC_CHECK_HEADERS(mozilla-config.h,,MOZILLA_REQUIRED_HEADERS=0) + AC_CHECK_HEADERS(npapi.h,,MOZILLA_REQUIRED_HEADERS=0) +@@ -5181,7 +5181,7 @@ then + fi + MOZILLA_REQUIRED_HEADERS= + mozilla=: +- firefox_include=`pkg-config --variable=includedir firefox-plugin` ++ firefox_include=`pkg-config --variable=includedir iceape-plugin` + if test -f "${firefox_include}/mozilla-config.h" -a -f "${firefox_include}/mozilla-config32.h"; then + MOZILLA_CONFIG_H="${firefox_include}/mozilla-config32.h" + elif test -f "${firefox_include}/mozilla-config.h" -a -f "${firefox_include}/mozilla-config64.h"; then +@@ -5193,7 +5193,7 @@ then + VLC_ADD_LDFLAGS([mozilla], [${X_LIBS} ${X_PRE_LIBS} -lX11 -lXt]) + fi + VLC_ADD_CPPFLAGS([mozilla],[${CPPFLAGS}]) +- VLC_ADD_LDFLAGS([mozilla],[${FIREFOX_LIBS} ${MOZILLA_NSPR_LIBS} ${NSPR_LIBS} ${MOZILLA_LDFLAGS}]) ++ VLC_ADD_LDFLAGS([mozilla],[${ICEAPE_LIBS} ${MOZILLA_NSPR_LIBS} ${NSPR_LIBS} ${MOZILLA_LDFLAGS}]) + VLC_ADD_PLUGINS([mozilla]) + MOZILLA_CONFIG= + CPPFLAGS="${CPPFLAGS_save}" --- vlc-0.8.6.h.orig/debian/bug/presubj +++ vlc-0.8.6.h/debian/bug/presubj @@ -0,0 +1,3 @@ +Make sure you have reset your plugins cache before reporting a bug. +Use "rm ~/.cache/vlc/plugins-*.dat" to remove your plugins cache. + --- vlc-0.8.6.h.orig/debian/bug/control +++ vlc-0.8.6.h/debian/bug/control @@ -0,0 +1 @@ +report-width: vlc vlc-nox libvlc0