Skip to content

V
vlc
Commit ff9c8878 authored by Sam Hocevar's avatar Sam Hocevar
Browse files
Options 

  * 0.2.90 release.
  * Updated ChangeLog files.
  * XVideo module now compiled as built-in for Debian packages, to avoid
    PIC and non-PIC code collision (Closes Debian bug #111790).
parent 90c9dfa9
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 355 additions and 237 deletions
ChangeLog
View file @ ff9c8878
This diff is collapsed.
ChangeLog.libdvdcss
View file @ ff9c8878
......@@ -4,6 +4,7 @@
HEAD
* Darwin ioctl, courtesy of ej0.
* If we see 3000 unencrypted blocks assume that the title is unencrypted.
* If we have not seen any encrypted block and then discover that the block
just read is not a valid block of an MPEG2 Program stream, assume that the
......
Makefile
View file @ ff9c8878
......@@ -66,6 +66,8 @@ ifneq (,$(findstring mingw32,$(SYS)))
RESOURCE_OBJ := share/vlc_win32_rc.o
endif
VLC_OBJ := $(C_OBJ) $(CPP_OBJ) $(BUILTIN_OBJ) $(RESOURCE_OBJ)
#
# Generated header
#
......@@ -379,8 +381,8 @@ endif
#
# Main application target
#
vlc: Makefile.opts Makefile.dep Makefile $(H_OBJ) $(C_OBJ) $(CPP_OBJ) $(BUILTIN_OBJ) $(RESOURCE_OBJ) plugins
$(CC) $(CFLAGS) -o $@ $(C_OBJ) $(CPP_OBJ) $(BUILTIN_OBJ) $(RESOURCE_OBJ) $(LCFLAGS)
vlc: Makefile.opts Makefile.dep Makefile $(H_OBJ) $(VLC_OBJ) $(BUILTIN_OBJ) plugins
$(CC) $(CFLAGS) -o $@ $(VLC_OBJ) $(BUILTIN_OBJ) $(LCFLAGS)
ifeq ($(SYS),beos)
xres -o $@ ./share/vlc_beos.rsrc
mimeset -f $@
......
configure
View file @ ff9c8878
This diff is collapsed.
configure.in
View file @ ff9c8878
......@@ -7,7 +7,7 @@ AC_CANONICAL_SYSTEM
HAVE_VLC=0
if test -r src/interface/main.c; then
HAVE_VLC=1
VLC_VERSION=0.2.83
VLC_VERSION=0.2.90
AC_SUBST(VLC_VERSION)
VLC_CODENAME=Ourumov
AC_SUBST(VLC_CODENAME)
......
debian/changelog
View file @ ff9c8878
vlc (0.2.83-3) unstable; urgency=low
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 <sam@zoy.org> Sun, 9 Sep 2001 09:28:06 +0200
-- Samuel Hocevar <sam@zoy.org> Wed, 10 Oct 2001 15:00:29 +0200
vlc (0.2.83-2) unstable; urgency=low
......
debian/rules
View file @ ff9c8878
......@@ -25,7 +25,7 @@ build-stamp:
case $(DEB_BUILD_ARCH) in \
i386) \
ARCH_FLAGS="--enable-alsa --with-glide --disable-ppro" ;; \
ARCH_FLAGS="--enable-alsa --with-glide" ;; \
alpha|ia64|m68k|powerpc) \
ARCH_FLAGS="--enable-alsa" ;; \
*) \
......@@ -35,6 +35,11 @@ build-stamp:
--infodir=$${prefix}/share/info \
$(shell echo $(CONFIG_FLAGS)) $(shell echo $(LIBDVDCSS_FLAGS))
# Fix Makefile
sed -e 's/^\(PLUGINS.*\)xvideo/\1/' -e 's/^BUILTINS.*/& xvideo/' \
< Makefile.opts > Makefile.opts.tmp
mv -f Makefile.opts.tmp Makefile.opts
$(MAKE)
touch build-stamp
......
plugins/gtk/gtk_open.c
View file @ ff9c8878
......@@ -2,7 +2,7 @@
* gtk_open.c : functions to handle file/disc/network open widgets.
*****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN
* $Id: gtk_open.c,v 1.6 2001/07/25 03:12:33 sam Exp $
* $Id: gtk_open.c,v 1.7 2001/10/10 14:25:15 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
* Stphane Borel <stef@via.ecp.fr>
......@@ -336,10 +336,10 @@ void GtkNetworkOpenOk( GtkButton *button, gpointer user_data )
}
/* Build source name and add it to playlist */
sprintf( psz_source, "%s://%s:%i::%s", psz_protocol,
psz_server,
i_port,
psz_broadcast );
sprintf( psz_source, "%s://%s:%i/%s", psz_protocol,
psz_server,
i_port,
psz_broadcast );
}
else
{
......
src/input/input.c
View file @ ff9c8878
......@@ -4,7 +4,7 @@
* decoders.
*****************************************************************************
* Copyright (C) 1998, 1999, 2000 VideoLAN
* $Id: input.c,v 1.141 2001/10/03 15:10:55 sam Exp $
* $Id: input.c,v 1.142 2001/10/10 14:25:15 sam Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
......@@ -729,7 +729,7 @@ static void NetworkOpen( input_thread_t * p_input )
psz_port++;
psz_broadcast = psz_port;
while( *psz_broadcast && *psz_broadcast != ':' )
while( *psz_broadcast && *psz_broadcast != '/' )
{
psz_broadcast++;
}
......@@ -738,7 +738,7 @@ static void NetworkOpen( input_thread_t * p_input )
{
*psz_broadcast = '\0';
psz_broadcast++;
while( *psz_broadcast && *psz_broadcast == ':' )
while( *psz_broadcast && *psz_broadcast == '/' )
{
psz_broadcast++;
}
......@@ -844,8 +844,8 @@ static void NetworkOpen( input_thread_t * p_input )
if( i_opt < 0x80000 )
{
intf_WarnMsg( 1, "input warning: socket receive buffer size just %d instead of %d bytes.",
i_opt, 0x80000 );
intf_WarnMsg( 1, "input warning: socket receive buffer size just 0x%x"
" instead of 0x%x bytes.", i_opt, 0x80000 );
}
/* Build the local socket */
......
src/misc/netutils.c
View file @ ff9c8878
......@@ -2,7 +2,7 @@
* netutils.c: various network functions
*****************************************************************************
* Copyright (C) 1999, 2000, 2001 VideoLAN
* $Id: netutils.c,v 1.38 2001/10/03 02:20:39 tcastley Exp $
* $Id: netutils.c,v 1.39 2001/10/10 14:25:15 sam Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Benoit Steiner <benny@via.ecp.fr>
......@@ -58,7 +58,7 @@
#endif
#if defined( WIN32 ) /* tools to get the MAC adress from */
#include <windows.h> /* the interface under Windows */
#include <windows.h> /* the interface under Windows */
#include <stdio.h>
#endif
......@@ -219,8 +219,9 @@ int network_ChannelCreate( void )
intf_ErrMsg( "error: channel changing is not yet supported under BeOS" );
return( 1 );
/* FIXME : channel handling only work for linux */
#elif defined( SYS_LINUX ) || defined( WIN32 )
/* FIXME : channels handling only work for linux */
/* Allocate structure */
p_main->p_channel = malloc( sizeof( input_channel_t ) );
if( p_main->p_channel == NULL )
......@@ -485,7 +486,7 @@ static int GetMacAddress( int i_socket, char *psz_mac )
{
if ( GetAdapterInfo ( AdapterList.lana[ i ], psz_mac ) == 0 )
{
i_ret = 0;
i_ret = 0;
}
}
......@@ -544,7 +545,7 @@ static int GetAdapterInfo( int i_adapter, char *psz_string )
(int) ( Adapter.adapt.adapter_address[4] ),
(int) ( Adapter.adapt.adapter_address[5] ) );
intf_WarnMsg( 2, "network: found MAC address %s", psz_string );
intf_WarnMsg( 2, "network: found MAC address %s", psz_string );
return 0;
}
......
vlc.spec
View file @ ff9c8878
# This is borrowed and adapted from Mandrake's Cooker
%define name vlc
%define vlc_ver 0.2.83
%define vlc_ver 0.2.90
%define version %vlc_ver
# libdvdcss
......@@ -103,7 +103,7 @@ install vlc-ncurses
%build
%configure --with-dvdcss=local-shared \
--enable-gnome --enable-gtk \
--enable-gnome --enable-gtk \
--enable-x11 --enable-qt --enable-ncurses \
--enable-esd --disable-alsa \
--enable-fb \
......@@ -156,6 +156,9 @@ rm -fr %buildroot
%changelog
* Wed Oct 10 2001 Christophe Massiot <massiot@via.ecp.fr> 0.2.90-1
- version 0.2.90
* Tue Oct 02 2001 Christophe Massiot <massiot@via.ecp.fr>
- Imported Mandrake's vlc.spec into the CVS
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment