* configure.ac.in: worked around an ffmpeg-cvs detection problem on OS X

* Makefile.am: fixed FAQ, THANKS and NEWS handling in package* rules
* src/misc/darwin_specific.m: more generic language detection
* NEWS: summarized changes from 0.4.6 to 0.5.0

diff --git a/Makefile.am b/Makefile.am
index 663dfa45ffdf9fdc7a86788022aeea16f8e6dfcb..7f896b038971bb4ab469f760f23c3ff68538a41f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,7 +8,7 @@
 SUBDIRS = po intl m4 share
 DIST_SUBDIRS = $(SUBDIRS) modules src debian doc ipkg lib
 
-EXTRA_DIST = FAQ HACKING MAINTAINERS THANKS src/extras/COPYING \
+EXTRA_DIST = HACKING MAINTAINERS src/extras/COPYING \
              INSTALL.win32 README.MacOSX.rtf vlc.spec install-win32 \
              Modules.am macosx-dmg \
              configure.ac.in mkinstalldirs bootstrap
@@ -512,7 +512,7 @@ package-win32:
        cp vlc.exe tmp/ 
        $(STRIP) tmp/vlc.exe
        cp INSTALL.win32 tmp/INSTALL.txt ; unix2dos tmp/INSTALL.txt
-       for file in AUTHORS COPYING ChangeLog README FAQ ; \
+       for file in AUTHORS COPYING ChangeLog README THANKS NEWS ; \
                        do cp $$file tmp/$${file}.txt ; \
                        unix2dos tmp/$${file}.txt ; done
        mkdir tmp/plugins
@@ -544,7 +544,7 @@ package-beos:
        cp vlc tmp/vlc/
        $(STRIP) tmp/vlc/vlc
        xres -o tmp/vlc/vlc ./share/vlc_beos.rsrc
-       cp AUTHORS COPYING ChangeLog README FAQ tmp/vlc/
+       cp AUTHORS COPYING ChangeLog README THANKS NEWS tmp/vlc/
        for file in default8x16.psf default8x9.psf ; \
                do cp share/$$file tmp/vlc/share/ ; done
        mkdir tmp/vlc/plugins
@@ -570,7 +570,7 @@ package-macosx:
 
 # Copy relevant files 
        cp -R vlc.app tmp/
-       cp AUTHORS COPYING ChangeLog README README.MacOSX.rtf FAQ tmp/
+       cp AUTHORS COPYING ChangeLog README README.MacOSX.rtf THANKS NEWS tmp/
 
 # Create disk image 
        ./macosx-dmg 18 "vlc-${VERSION}" tmp/* 

diff --git a/NEWS b/NEWS
index a802aea732c29a30772bfbcd61d96e68da06acae..5911192611df689c2538dcf8ab8fd0fc0832db06 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,8 +1,78 @@
-$Id: NEWS,v 1.3 2003/02/01 18:41:09 sam Exp $
-                                                                                
+$Id: NEWS,v 1.4 2003/02/01 20:34:55 massiot Exp $
+
 Changes between 0.4.6 and 0.5.0:
 --------------------------------
-                                                                                
-  * add stuff here
 
+Core structure:
+  * object structure which allows for full re-entrancy, known as libvlc
+  * new audio output architecture based on filter pipelines, providing
+    S/PDIF and multi-channel support
+  * localization support via gettext on most architectures
+  * new stream output architecture, allowing, using VLC to unicast,
+    multicast or broadcast a stream to another VLC (only MPEG 1, 2 and 4
+    and A/52 streams are supported)
+  * build system now uses autoconf/automake/autopoint
+
+Input access:
+  * mms:// support
+  * ftp:// support
+  * stability fixes in the HTTP access
+  * auto-detection of RTP encapsulation
+
+Input demux:
+  * support for *.asf format
+  * improved support for *.avi, especially over an HTTP connection
+  * support for *.mp4 and *.mov format
+  * support for ogg encapsulation
+  * support for raw DV format
+  * support for *.wav format
+  * support for *.mp3 format
+  * new demuxdump demux allowing to save a stream to a file
+  * raw AAC support
+
+Stream discovery & playlists:
+  * support for the SAP/SDP and SLP protocols
+  * support for .m3u file format
+
+Codecs:
+  * support for the microdvd, subrip, ssa1, ssa2-4 subtitles file formats
+    (only available with the .avi demux)
+  * support for ADPCM audio codec
+  * support for raw PCM data
+  * support for Cinepak video codec
+  * support for DV video codec via libdv
+  * support for AAC audio codec via libfaad2
+  * support for Xvid codec
+  * support for Xiph.org's Vorbis audio codec
+  * support for Xiph.org's Tarkin and Theora video codecs
+  * new codecs supported by latest ffmpeg versions: WMV, WMA, SVQ 1, H263,
+    H263i, MJPEG A/B
+  * fixed an endianness bug in LPCM codec
+
+DVD support:
+  * experimental preliminary support for DVD menus via libdvdplay
+
+Miscellaneous:
+  * new WxWindows interface
+  * all interfaces allow to dynamically change the volume, the audio
+    device and the channels configuration
+
+GNU/Linux, *BSD & misc. UNIX ports:
+  * OSS and ALSA audio output modules support A/52 over S/PDIF output
+  * OSS support for multi-channel (up to 6) analog sound cards
+
+Mac OS X port:
+  * localization support via GNU gettext software
+  * completely revamped Cocoa interface
+  * new preferences panel
+  * new open panel with full features
+  * video output screen can be chosen in the Video menu
+  * audio device and channels configuration can be chosen in the Audio menu
+  * new playlist and messages windows
+
+Win32 port:
+  * waveout modules supports multi-channel audio output
+  * support for VCDs
+
+BeOS port:
 

diff --git a/configure.ac.in b/configure.ac.in
index 2486bda1e309262ef9dd213f997754cb3773e725..64f2ff5931c4da93135f16c6f1a2215459527b70 100644 (file)
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -95,6 +95,7 @@ case "x${target_os}" in
     CXXFLAGS_save="${CXXFLAGS_save} -no-cpp-precomp -D_INTL_REDIRECT_MACROS"; CXXFLAGS="${CXXFLAGS_save}"
     OBJCFLAGS_save="${OBJCFLAGS_save} -no-cpp-precomp -D_INTL_REDIRECT_MACROS"; OBJCFLAGS="${OBJCFLAGS_save}"
     LDFLAGS_vlc="${LDFLAGS_vlc} -all_load"
+    LDFLAGS_ffmpeg="${LDFLAGS_ffmpeg} -all_load"
     LIBEXT=".dylib"
     ;;
   x*mingw32* | x*cygwin*)

diff --git a/src/misc/darwin_specific.m b/src/misc/darwin_specific.m
index 63966e4d8cf1fee6287a10d2592c23d589e52821..bf4be93ecc3368191bddce481ff3cb6844b60432 100644 (file)
--- a/src/misc/darwin_specific.m
+++ b/src/misc/darwin_specific.m
@@ -2,7 +2,7 @@
  * darwin_specific.m: Darwin specific features 
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: darwin_specific.m,v 1.7 2003/01/19 03:16:24 sam Exp $
+ * $Id: darwin_specific.m,v 1.8 2003/02/01 20:34:55 massiot Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *          Christophe Massiot <massiot@via.ecp.fr>
@@ -59,25 +59,10 @@ static int FindLanguage( const char * psz_lang )
     {
         psz_short = "nl";
     }
-    else if ( !strcmp(psz_lang, "no") )
+    else
     {
-        psz_short = "no";
-    }
-    else if ( !strcmp(psz_lang, "pl") )
-    {
-        psz_short = "pl";
-    }
-    else if ( !strcmp(psz_lang, "ru") )
-    {
-        psz_short = "ru";
-    }
-    else if ( !strcmp(psz_lang, "sv") )
-    {
-        psz_short = "sv";
-    }
-    else if ( !strcmp(psz_lang, "English") )
-    {
-        psz_short = "C";
+        /* Just in case gettext knows about this. */
+        psz_short = psz_lang;
     }
 
     if ( psz_short != NULL )