* extras/contrib/src/ dvdnav packages

* REST: stringreview round 1

diff --git a/INSTALL.win32 b/INSTALL.win32
index 44dfcb4273420a82806448c82c62a145e6d04d99..eaee8e0d1d10023f0994af94c4df007d4d788750 100644 (file)
--- a/INSTALL.win32
+++ b/INSTALL.win32
@@ -1,4 +1,4 @@
-$Id: INSTALL.win32,v 1.21 2003/11/13 14:23:30 lool Exp $
+$Id: INSTALL.win32,v 1.22 2004/01/24 21:06:51 hartman Exp $
 
 INSTALL file for the Windows9x/Me/NT4/2k/XP version of the VLC media player
 
@@ -87,17 +87,15 @@ Depending on your needs you will have to compile/install some or all of these
 external libraries.
 
 They can be found here (source code):
-http://www.videolan.org/pub/testing/contrib/
+http://download.videolan.org/pub/testing/contrib/
 
 We also provide a package with all the libraries already compiled so it is
 actually really easy to compile a full-featured version of vlc (these compiled
 libraries will only work with mingw or cygwin):
-http://www.videolan.org/pub/testing/win32/contrib-20030729-win32-bin.tar.bz2 or
-http://www.videolan.org/pub/testing/win32/contrib-20031026-win32-bin-gcc3.3.1-only.tar.bz2
-if you are using the new version of gcc (3.3.1).
+http://download.videolan.org/pub/testing/win32/contrib-20040106-win32-bin-gcc3.3.1-only.tar.bz2
 All you need to do is extract it in your root directory (the include files
 and libraries will be put in /usr/win32). You can do this with the following
-command: "tar xjvf contrib-20030729-win32-bin.tar.bz2 -C /"
+command: "tar xjvf contrib-20040106-win32-bin-gcc3.3.1-only.tar.bz2 -C /"
 
 A complete list of the libraries on which we depend can be found here:
 http://developers.videolan.org/vlc/

diff --git a/MAINTAINERS b/MAINTAINERS
index 4ff6aa61e25ea74fdd1bfd46cbd57c8e4b642b23..a5b3021fedae4d3cd0ec1c01f8f3173550aeaea9 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1,4 +1,4 @@
-# $Id: MAINTAINERS,v 1.6 2003/02/27 12:44:01 marcari Exp $
+# $Id: MAINTAINERS,v 1.7 2004/01/24 21:06:51 hartman Exp $
 #
 #                            VLC MAINTAINERS
 #
@@ -25,7 +25,7 @@
   - Mandrake Linux : Yves Duret
   - BeOS : Eric Petit (Stephan Assmus)
   - Windows : [gibalou]
-  - Mac OS X : [jlj] ([meuuh])
+  - Mac OS X : [thedj])
   - QNX RTOS : [jlj]
   - Solaris : [meuuh]
   - *BSD : [meuuh]
@@ -103,3 +103,4 @@
 [saman] = Jean-Paul Saman
 [sigmund] = Sigmund Augdal
 [stef] = Stéphane Borel
+[thedj] = Derk-Jan Hartman

diff --git a/README b/README
index 0f99cd8952d45003e07b3ad410867a338fc9bd89..0eab4f2a7644ec5cf609cc8cc92c17e26c6785de 100644 (file)
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-$Id: README,v 1.15 2003/02/02 04:01:29 sam Exp $
+$Id: README,v 1.16 2004/01/24 21:06:51 hartman Exp $
 
 README for the VLC media player
 ===============================
@@ -14,11 +14,12 @@ INSTALL.win32      - Installation instructions for the Win32 version of vlc.
 README             - This file.
 README.MacOSX.rtf  - Information specific to the MacOS X port.
 THANKS             - All VLC contributors.
-doc/               - miscellaneous documentation.
+doc/               - Miscellaneous documentation.
 
 Resources
 =========
 
 The VideoLAN web site : http://www.videolan.org/
-Mailing-lists : http://www.videolan.org/lists.html
+Mailing-lists : http://developers.videolan.org/lists.html
+Forums: http://forum.videolan.org/
 

diff --git a/debian/copyright b/debian/copyright
index c9fcbf26e61b6dd6b7ddabd1bc08d09ab97492a0..692421174e0d4f63669ddf622c22323696b22be7 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,11 +1,11 @@
 This package was debianized by Sam Hocevar <sam@zoy.org> on
 Mon, 13 Mar 2000 02:21:45 +0100.
 
-It was taken from the CVS tree. See http://www.videolan.org/cvs.html
+It was taken from the CVS tree. See http://developers.videolan.org/cvs.html
 
 Upstream Authors: The VideoLAN Team <videolan@videolan.org>
 
-VideoLAN is Copyright 1996, 1997, 1998, 1999, 2000, 2001 The VideoLAN Team
+VideoLAN is Copyright 1996-2004 The VideoLAN Team
 
 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

diff --git a/doc/win32/Cross-Compile-Howto.txt b/doc/win32/Cross-Compile-Howto.txt
index 6f104f1a32be5f356fb5648776652b29c065c187..bf8620d495020898d40e8228f35e2539fd02814b 100644 (file)
--- a/doc/win32/Cross-Compile-Howto.txt
+++ b/doc/win32/Cross-Compile-Howto.txt
@@ -50,7 +50,7 @@ Get vlc from:
 (who needs a release version? you're compiling, after all :)
 or grab the cvs at:
 
-        http://www.videolan.org/cvs.html
+        http://developers.videolan.org/cvs.html
 
 using the command:
 

diff --git a/evc/vlc.c b/evc/vlc.c
index 12cd02b7be4f8085f094dfd9e16acf7222ee0606..4f6ba1585f3dd39af501457ffde4b941c1ff2ed4 100644 (file)
--- a/evc/vlc.c
+++ b/evc/vlc.c
@@ -2,7 +2,7 @@
  * vlc.c: the vlc player, WinCE version
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: vlc.c,v 1.5 2002/11/21 13:53:31 sam Exp $
+ * $Id: vlc.c,v 1.6 2004/01/24 21:06:52 hartman Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -88,7 +88,7 @@ int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance,
     RegisterClass(&wc);
 
     /* Print the version information */
-    sprintf( psz_title, "VideoLAN Client %s", VLC_Version() );
+    sprintf( psz_title, "VLC media player %s", VLC_Version() );
     MultiByteToWideChar( CP_ACP, 0, psz_title, -1, pwz_title, 100 );
 
     /* Create our nice window */

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 97520881325fc44b080674fade572e205754d330..b1be21efcdce14d835f443bdb182a55623eba414 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1,10 +1,11 @@
 # ***************************************************************************
 # src/Makefile : Dearchive and compile all files necessary
 # ***************************************************************************
-# Copyright (C) 2003 VideoLAN
-# $Id: Makefile,v 1.13 2004/01/19 01:11:47 hartman Exp $
+# Copyright (C) 2003, 2004 VideoLAN
+# $Id: Makefile,v 1.14 2004/01/24 21:06:52 hartman Exp $
 #
 # Authors: Christophe Massiot <massiot@via.ecp.fr>
+#          Derk-Jan Hartman <hartman at videolan dot org>
 #
 # 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
@@ -42,7 +43,7 @@ export LDFLAGS = -L$(PREFIX)/lib
 all: .autoconf .libtool .automake .iconv .intl .freetype .fribidi \
        .a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
        .FLAC .speex .faad .lame .ebml .matroska .ffmpeg .openslp \
-       .dvdcss .dvdread .dvdplay .dvbpsi .live .goom .caca
+       .dvdcss .dvdread .dvdplay .dvdnav .dvbpsi .live .goom .caca
 FORCE:
 
 # ***************************************************************************
@@ -612,6 +613,25 @@ CLEAN_FILE += .dvdplay
 CLEAN_PKG += libdvdplay
 DISTCLEAN_PKG += libdvdplay-$(LIBDVDPLAY_VERSION).tar.gz
 
+# ***************************************************************************
+# libdvdnav
+# ***************************************************************************
+
+libdvdnav-$(LIBDVDNAV_VERSION).tar.gz:
+       $(WGET) $(LIBDVDNAV_URL)
+
+libdvdnav: libdvdnav-$(LIBDVDNAV_VERSION).tar.gz
+       $(EXTRACT_GZ)
+
+.dvdnav: libdvdnav .dvdread
+       (cd $<; ./configure --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -Dlseek64=lseek -Doff64_t=off_t" && make && make install)
+       $(INSTALL_NAME)
+       touch $@
+
+CLEAN_FILE += .dvdnav
+CLEAN_PKG += libdvdnav
+DISTCLEAN_PKG += libdvdnav-$(LIBDVDNAV_VERSION).tar.gz
+
 # ***************************************************************************
 # libdvbpsi
 # ***************************************************************************
@@ -686,7 +706,6 @@ CLEAN_FILE += .caca
 CLEAN_PKG += libcaca
 DISTCLEAN_PKG += libcaca-$(LIBCACA_VERSION).tar.gz
 
-# ***************************************************************************
 # ***************************************************************************
 # Some cleansing
 # ***************************************************************************

diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index 460d156e8e0fd64ef7aed9b60beaa8a12e702c8b..ba42bfb85d909f3c2c8722d4ba8c00bc20c29da9 100644 (file)
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -1,10 +1,11 @@
 # ***************************************************************************
-# src/packages.mak : Archives locations
+# src/packages.mak : Archive locations
 # ***************************************************************************
-# Copyright (C) 2003 VideoLAN   
-# $Id: packages.mak,v 1.11 2004/01/21 19:21:23 hartman Exp $
+# Copyright (C) 2003, 2004 VideoLAN
+# $Id: packages.mak,v 1.12 2004/01/24 21:06:52 hartman Exp $
 #
 # Authors: Christophe Massiot <massiot@via.ecp.fr>
+#          Derk-Jan Hartman <hartman at videolan dot org>
 #
 # 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
@@ -89,6 +90,4 @@ LIVEDOTCOM_URL=http://download.videolan.org/pub/testing/contrib/live.$(LIVEDOTCO
 GOOMDJ_URL=http://sidekick.student.utwente.nl/videolan/goom-dj.tar.gz
 LIBCACA_VERSION=0.8
 LIBCACA_URL=http://sam.zoy.org/projects/libcaca/libcaca-$(LIBCACA_VERSION).tar.gz
-LIBMODPLUG_VERSION=0.7
-LIBMODPLUG_URL=$(SF)/modplug-xmms/libmodplug-$(LIBMODPLUG_VERSION).tar.gz
 

diff --git a/menuconfig b/menuconfig
index a8f60c12e0ceee3da7ff24350d59a979bfbc8cc5..a0c02af3ded35c925bd6bafcb60aa2187077faee 100755 (executable)
--- a/menuconfig
+++ b/menuconfig
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# VideoLAN Client configuration script, borrowed from linux menuconfig
+# VLC media player configuration script, borrowed from linux menuconfig
 # Cyril Deguet <asmax@videolan.org>
 #
 #-----------------------------------------------------------------

diff --git a/vlc.spec b/vlc.spec
index e3e108344ee14eb65816aaa49db08db6b98084b6..dbb9d5cb4b0f699670bb4aebc0e0fe365827e1f8 100644 (file)
--- a/vlc.spec
+++ b/vlc.spec
@@ -1,13 +1,13 @@
 %define mozver 1.4.1
 
-Summary: The VideoLAN client, also a very good standalone video player.
+Summary: VLC media player, a multimedia player and streaming application.
 Name: vlc
 Version: 0.7.0
 Release: 1
 Group: Applications/Multimedia
 License: GPL
 URL: http://www.videolan.org/
-Source: http://www.videolan.org/pub/videolan/vlc/vlc-%{version}-%{release}.tar.bz2
+Source: http://download.videolan.org/pub/videolan/vlc/vlc-%{version}-%{release}.tar.bz2
 Buildroot: %{_tmppath}/%{name}-root
 Packager: Jason Luka <jason@geshp.com>
 Buildrequires: XFree86-devel, desktop-file-utils, libpostproc >= 1.0
@@ -79,9 +79,10 @@ Requires: XFree86, desktop-file-utils
 %{!?_without_fribidi:Requires: fribidi}
 
 %description
-VideoLAN Client (VLC) is a highly portable multimedia player for various
-audio and video formats (MPEG-1, MPEG-2, MPEG-4, DivX, mp3, ogg, ...) as
-well as DVDs, VCDs, and various streaming protocols.
+VLC media player is a highly portable multimedia player for various audio and 
+video formats (MPEG-1, MPEG-2, MPEG-4, DivX, mp3, ogg, ...) as well as DVD's, 
+VCD's, and various streaming protocols. It can also be used as a server to 
+stream in unicast or multicast in IPv4 or IPv6 on a high-bandwidth network.
 
 Available rpmbuild rebuild options :
 --without dvd dvdread dvdplay dvbpsi dv v4l avi asf aac ogg rawdv mad ffmpeg xvid
@@ -93,14 +94,15 @@ Options that would need not yet existing add-on packages :
 
 
 %package devel
-Summary: Header files and static library from the Videolan Client.
+Summary: Header files and static library from VLC media player.
 Group: Development/Libraries
 Requires: %{name} = %{version}
 
 %description devel
-VideoLAN Client (VLC) is a highly portable multimedia player for various
-audio and video formats (MPEG-1, MPEG-2, MPEG-4, DivX, mp3, ogg, ...) as
-well as DVDs, VCDs, and various streaming protocols.
+VLC media player is a highly portable multimedia player for various audio and 
+video formats (MPEG-1, MPEG-2, MPEG-4, DivX, mp3, ogg, ...) as well as DVD's, 
+VCD's, and various streaming protocols. It can also be used as a server to 
+stream in unicast or multicast in IPv4 or IPv6 on a high-bandwidth network.
 
 Install this package if you need to build Videolan Client plugins or intend
 to link statically to it.
@@ -194,7 +196,7 @@ find  %{buildroot}%{_libdir}/vlc -name "*.so" | xargs strip
 
 cat > %{name}.desktop << EOF
 [Desktop Entry]
-Name=VideoLAN Media Player
+Name=VLC Media Player
 Comment=%{summary}
 Icon=%{_datadir}/vlc/vlc48x48.png
 Exec=vlc

diff --git a/vlc.spec.mdk b/vlc.spec.mdk
index 319efd0fc3871a10200c87fc40f9915f9d39b33f..61a4672956834a03e42f459e8ad48557027ec408 100644 (file)
--- a/vlc.spec.mdk
+++ b/vlc.spec.mdk
@@ -134,18 +134,18 @@
 %{?_with_slp:          %{expand: %%global with_slp 1}}
 %{?_with_tar:          %{expand: %%global with_tar 1}}
 
-Summary:       VLC is a free MPEG, MPEG2, DVD and DivX player.
+Summary:       VLC media player, a multimedia player and streaming application.
 Name:          %{name}
 Version:       %{version}
 Release:       %{release}
 
 %if %{cvs}
-Source0:       http://www.videolan.org/pub/videolan/vlc/snapshots/%{cvs_name}.tar.bz2
+Source0:       http://download.videolan.org/pub/videolan/vlc/snapshots/%{cvs_name}.tar.bz2
 %else
-Source0:       http://www.videolan.org/packages/%{version}/%{name}-%{version}.tar.bz2
+Source0:       http://download.videolan.org/packages/%{version}/%{name}-%{version}.tar.bz2
 %endif
-Source1:       http://www.videolan.org/pub/videolan/vlc/0.6.0/contrib/ffmpeg-%ffcvs.tar.bz2
-Source2:       http://www.videolan.org/pub/videolan/vlc/0.6.0/contrib/mpeg2dec-%mpegcvs.tar.bz2        
+Source1:       http://download.videolan.org/pub/videolan/vlc/0.6.0/contrib/ffmpeg-%ffcvs.tar.bz2
+Source2:       http://download.videolan.org/pub/videolan/vlc/0.6.0/contrib/mpeg2dec-%mpegcvs.tar.bz2   
 #gw remove NP_GetValue, as it was already defined in the mozilla headers
 Patch:         vlc-0.6.0-mozilla-conflict.patch.bz2
 License:       GPL
@@ -269,10 +269,11 @@ BuildRequires: kernel-source
 VideoLAN is an OpenSource streaming solution for every OS developed by
 students from the Ecole Centrale Paris and developers from all over the
 World.
-VLC (VideoLAN Client) is a media player that can play MPEG1, MPEG2 and
-MPEG4 (aka DivX) files, DVDs, VCDs, SVCDs, from a satellite card, from
-a stream sent by VLS (VideoLAN Server), from another VLC, or from a Web
-server.
+VLC media player is a highly portable multimedia player for various audio 
+and video formats (MPEG-1, MPEG-2, MPEG-4, DivX, mp3, ogg, ...) as well as 
+DVD's, VCD's, and various streaming protocols. It can also be used as a 
+server to stream in unicast or multicast in IPv4 or IPv6 on a 
+high-bandwidth network.
 You may install vlc-gnome or vlc-gtk to have a nice graphical interface.
 This package contains no CSS unscrambling functionality for DVDs ;
 you need the libdvdcss library available from