upload.
* debian/rules: Build builtins in the first compile pass, and build plugins
and PIC builtins in the second pass, so that PIC and non-PIC never get
messed.
* modules/demux/mkv.cpp: Added minor verbosity in a warning message.
* modules/gui/kde/preferences.cpp: Fix for woody's KDE.
* modules/stream_out/transcode.c: Workaround for woody's vorbisenc.h.
+vlc (0.6.0+cvs-20030704-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:
+ + 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) <sam+deb@zoy.org> Thu, 3 Jul 2003 11:25:57 +0200
+
vlc (0.6.0+cvs-20030703-1) unstable; urgency=low
* New CVS snapshot.
# Build only VLC, with the non-PIC libs
$(MAKE) include/vlc_symbols.h
- cd modules && $(MAKE)
+ cd modules && AM_MAKEFLAGS='plugin=no pic=no' $(MAKE)
$(MAKE) vlc
ifneq ($(shell dpkg-architecture -qDEB_BUILD_GNU_CPU),i386)
endif
# Build all the rest, with the PIC libs
- $(MAKE)
+ AM_MAKEFLAGS='builtin=no' $(MAKE)
touch build-stamp
* mkv.cpp : matroska demuxer
*****************************************************************************
* Copyright (C) 2001 VideoLAN
- * $Id: mkv.cpp,v 1.16 2003/06/28 12:07:00 massiot Exp $
+ * $Id: mkv.cpp,v 1.17 2003/07/04 16:35:20 sam Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
/* is a valid file */
if( p_peek[0] != 0x1a || p_peek[1] != 0x45 || p_peek[2] != 0xdf || p_peek[3] != 0xa3 )
{
- msg_Warn( p_input, "matroska module discarded (invalid header)" );
+ msg_Warn( p_input, "matroska module discarded "
+ "(invalid header 0x%.2x%.2x%.2x%.2x)",
+ p_peek[0], p_peek[1], p_peek[2], p_peek[3] );
return VLC_EGENERIC;
}
* preferences.cpp: preferences window for the kde gui
*****************************************************************************
* Copyright (C) 2001 VideoLAN
- * $Id: preferences.cpp,v 1.16 2003/05/05 14:58:45 sigmunau Exp $
+ * $Id: preferences.cpp,v 1.17 2003/07/04 16:35:20 sam Exp $
*
* Authors: Sigmund Augdal <sigmunau@idi.ntnu.no> Mon Aug 12 2002
*
#include <klocale.h>
#include <knuminput.h>
#include <kurlrequester.h>
+#include <kfiledialog.h>
#include <kcombobox.h>
#include "QConfigItem.h"
hb );
if ( p_item->i_type == CONFIG_ITEM_DIRECTORY )
{
- kfile->setMode(KFile::Directory|KFile::ExistingOnly|KFile::LocalOnly);
+ kfile->fileDialog()->setMode(KFile::Directory|KFile::ExistingOnly|KFile::LocalOnly);
}
connect(kfile, SIGNAL(textChanged ( const QString & )),
ci, SLOT(setValue( const QString &)));
* transcode.c
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
- * $Id: transcode.c,v 1.21 2003/06/30 20:44:35 gbazin Exp $
+ * $Id: transcode.c,v 1.22 2003/07/04 16:35:20 sam Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
/* vorbis header */
#ifdef HAVE_VORBIS_VORBISENC_H
# include <vorbis/vorbisenc.h>
+# ifndef OV_ECTL_RATEMANAGE_AVG
+# define OV_ECTL_RATEMANAGE_AVG 0x0
+# endif
#endif
/*****************************************************************************