* ./plugins/win32/mainframe.dfm: swapped two mixed up tooltips.
  * ./Makefile: fixed make dist and make distclean.
  * ./plugins/dvd/dvd.c: compilation fix.
  * ./plugins/gtk/gtk_callbacks.c: fixed ejection code.
  * ./plugins/text/ncurses.c: fixed compilation of the ncurses plugin.
  * ./vlc.spec: updated specfile.

ChangeLog

@@ -4,6 +4,17 @@
 
 HEAD
 
+  * Nothing yet.
+
+0.3.0
+Sat,  6 Apr 2002 04:27:50 +0200
+
+  * ./plugins/win32/mainframe.dfm: swapped two mixed up tooltips.
+  * ./Makefile: fixed make dist and make distclean.
+  * ./plugins/dvd/dvd.c: compilation fix.
+  * ./plugins/gtk/gtk_callbacks.c: fixed ejection code.
+  * ./plugins/text/ncurses.c: fixed compilation of the ncurses plugin.
+  * ./vlc.spec: updated specfile.
   * ./Makefile, ./configure.in: misc BeOS build fixes.
   * ./plugins/win32/win32.cpp: fixed `--intf intfwin' which wasn't working.
   * ./Makefile: we don't include the Gtk+ and SDL DLLs in the win32 package

Makefile

@@ -274,7 +274,7 @@ distclean: clean
 	rm -f Makefile.opts
 	rm -f include/defs.h include/modules_builtin.h
 	rm -f src/misc/modules_builtin.h
-	rm -f config*status config*cache config*log
+	rm -f config*status config*cache config*log conftest*
 	rm -f gmon.out core build-stamp
 	rm -Rf .dep
 	rm -f .gdb_history
@@ -339,8 +339,11 @@ dist:
 	find debian -mindepth 1 -maxdepth 1 -type d | \
 		while read i ; do rm -Rf tmp/vlc/$$i ; done
 	# Copy .c .h .in .cpp and .glade files
-	find include src plugins -type f -name '*.[chig]*' | while read i ; \
+	find include src plugins -type f -name '*.[bcdhigrst]*' | while read i ; \
 		do cp $$i tmp/vlc/$$i ; done
+	# Grmbl... special case...
+	for i in API BUGS DESIGN TODO ; \
+		do cp plugins/mad/$$i tmp/vlc/plugins/mad ; done
 	# Copy plugin Makefiles
 	find plugins -type f -name Makefile | while read i ; \
 		do cp $$i tmp/vlc/$$i ; done
@@ -351,12 +354,13 @@ dist:
 		-type d -name CVS -o -name '.*' -o -name '*.[o]' | \
 			while read i ; do rm -Rf $$i ; done
 	# Copy gettext stuff
-	cp po/*.po tmp/vlc/po
+	cp po/ChangeLog po/vlc.pot po/*.po tmp/vlc/po
 	for i in Makefile.in.in POTFILES.in ; do cp po/$$i tmp/vlc/po ; done
 	# Copy misc files
 	cp FAQ AUTHORS COPYING TODO todo.pl ChangeLog* README* INSTALL* \
+		ABOUT-NLS BUGS MODULES vlc.spec \
 		Makefile Makefile.opts.in Makefile.dep Makefile.modules \
-		configure configure.in install-sh install-win32 vlc.spec \
+		configure configure.in install-sh install-win32 macosx-dmg \
 		config.sub config.guess aclocal.m4 mkinstalldirs \
 			tmp/vlc/
 	# Copy Debian control files
@@ -365,18 +369,14 @@ dist:
 	for file in control changelog rules ; do \
 		cp debian/$$file tmp/vlc/debian/ ; done
 	# Copy ipkg control files
-	for file in control rules ; do \
+	for file in control rules patch ; do \
 		cp ipkg/$$file tmp/vlc/ipkg/ ; done
 	# Copy fonts and icons
-	for file in share/*png share/*xpm share/*psf ; do \
+	for file in share/*vlc* share/*psf; do \
 		cp $$file tmp/vlc/share ; done
-	for file in vlc_beos.rsrc vlc.icns gvlc_win32.ico vlc_win32_rc.rc ; do \
-			cp share/$$file tmp/vlc/share/ ; done
 	# Build archives
 	F=vlc-${VERSION}; \
-	mv tmp/vlc tmp/$$F; (cd tmp ; tar cf $$F.tar $$F); \
-	bzip2 -f -9 < tmp/$$F.tar > $$F.tar.bz2; \
-	gzip -f -9 tmp/$$F.tar ; mv tmp/$$F.tar.gz .
+	mv tmp/vlc tmp/$$F; (cd tmp ; tar czf ../$$F.tar.gz $$F); \
 	# Clean up
 	rm -Rf tmp
 

debian/changelog

 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 <sam@zoy.org>  Thu,  4 Apr 2002 07:37:17 +0200
+ -- Samuel Hocevar <sam@zoy.org>  Sat,  6 Apr 2002 04:27:50 +0200
 
 vlc (0.2.92-8) unstable; urgency=high
 

debian/rules

@@ -10,8 +10,8 @@ export DH_COMPAT=3
 
 # Compilation options
 export CONFIG_FLAGS="--enable-release --prefix=/usr --enable-gnome --enable-gtk --enable-fb --enable-ggi --enable-sdl --enable-esd --enable-qt --enable-mad --enable-arts --enable-alsa --enable-lirc --enable-a52 --enable-aa"
-# Change this to --without-dvdcss in totalitarian countries
-export DVDCSS_FLAGS="--enable-dvd"
+# Remove --without-dvdcss here in non-totalitarian countries
+export DVDCSS_FLAGS="--enable-dvd --without-dvdcss"
 
 export VIDDIR="usr/share/videolan"
 export PIXDIR="usr/share/pixmaps"

ipkg/control

 Package: vlc
 Section: graphics
 Priority: optional
-Version: 0.2.92-dev
+Version: 0.3.0
 Architecture: arm
 Maintainer: Christophe Massiot <massiot@via.ecp.fr>
 Depends: libc6, task-x

plugins/dvd/dvd.c

@@ -2,7 +2,7 @@
  * dvd.c : DVD input module for vlc
  *****************************************************************************
  * Copyright (C) 2000-2001 VideoLAN
- * $Id: dvd.c,v 1.29 2002/04/04 05:08:05 sam Exp $
+ * $Id: dvd.c,v 1.30 2002/04/06 04:22:27 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -105,13 +105,13 @@ MODULE_DEACTIVATE_STOP
  *****************************************************************************/
 static void ProbeLibDVDCSS( void )
 {
-    static char *pp_filelist[4] = { "libdvdcss.so.2",
-                                    "./libdvdcss.so.2",
-                                    "./lib/libdvdcss.so.2",
-                                    "libdvdcss.so.1",
-                                    "./libdvdcss.so.1",
-                                    "./lib/libdvdcss.so.1",
-                                    NULL };
+    static char *pp_filelist[] = { "libdvdcss.so.2",
+                                   "./libdvdcss.so.2",
+                                   "./lib/libdvdcss.so.2",
+                                   "libdvdcss.so.1",
+                                   "./libdvdcss.so.1",
+                                   "./lib/libdvdcss.so.1",
+                                   NULL };
     char **pp_file = pp_filelist;
 
     /* Try to open the dynamic object */

plugins/gtk/gtk_callbacks.c

@@ -2,7 +2,7 @@
  * gtk_callbacks.c : Callbacks for the Gtk+ plugin.
  *****************************************************************************
  * Copyright (C) 2000, 2001 VideoLAN
- * $Id: gtk_callbacks.c,v 1.36 2002/04/03 06:19:43 gbazin Exp $
+ * $Id: gtk_callbacks.c,v 1.37 2002/04/06 04:22:27 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *          Stphane Borel <stef@via.ecp.fr>
@@ -481,6 +481,7 @@ gboolean GtkDiscEject ( GtkWidget *widget, GdkEventButton *event,
                         gpointer user_data )
 {
     char *psz_device = NULL;
+    char *psz_parser;
 
     /*
      * Get the active input
@@ -533,6 +534,17 @@ gboolean GtkDiscEject ( GtkWidget *widget, GdkEventButton *event,
         return TRUE;
     }
 
+    /* Remove what we have after @ */
+    psz_parser = psz_device;
+    for( psz_parser = psz_device ; *psz_parser ; psz_parser++ )
+    {
+        if( *psz_parser == '@' )
+        {
+            *psz_parser = '\0';
+            break;
+        }
+    }
+
     /* If there's a stream playing, we aren't allowed to eject ! */
     if( p_input_bank->pp_input[0] == NULL )
     {

plugins/text/ncurses.c

@@ -2,7 +2,7 @@
  * ncurses.c : NCurses plugin for vlc
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: ncurses.c,v 1.12 2002/02/24 20:51:10 gbazin Exp $
+ * $Id: ncurses.c,v 1.13 2002/04/06 04:22:27 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *      
@@ -53,9 +53,9 @@ MODULE_CONFIG_START
 MODULE_CONFIG_STOP
 
 MODULE_INIT_START
-    p_module->i_capabilities = MODULE_CAPABILITY_NULL
-                                | MODULE_CAPABILITY_INTF;
-    p_module->psz_longname = "ncurses interface module";
+    SET_DESCRIPTION( "ncurses interface module" )
+    ADD_CAPABILITY( INTF, 10 )
+    ADD_SHORTCUT( "curses" )
     ADD_SHORTCUT( "ncurses" )
 MODULE_INIT_STOP
 

plugins/win32/mainframe.dfm

@@ -200,7 +200,7 @@ object MainFrameDlg: TMainFrameDlg
     object ToolButtonEject: TToolButton
       Left = 203
       Top = 2
-      Hint = 'Play stream'
+      Hint = 'Eject disc'
       Caption = 'Eject'
       ImageIndex = 5
       OnClick = ToolButtonEjectClick
@@ -208,7 +208,7 @@ object MainFrameDlg: TMainFrameDlg
     object ToolButtonPlay: TToolButton
       Left = 242
       Top = 2
-      Hint = 'Eject disc'
+      Hint = 'Play stream'
       Caption = 'Play'
       ImageIndex = 6
       OnClick = ToolButtonPlayClick

vlc.spec

@@ -135,6 +135,7 @@ If you are going to watch DVD with the ALSA plugin, you should install vlc-alsa
 # Dadou - 0.1.99h-mdk - Don't use configure here. It breaks build at present
 #                       time.
 ./configure --enable-release \
+	    --enable-dvd --without-dvdcss \
 	    --prefix=%_prefix \
 	    --enable-gnome --enable-x11 --enable-gtk --enable-qt \
 	    --enable-esd \
@@ -146,6 +147,7 @@ perl -pi -e "s|#CFLAGS \+= -mcpu=750|CFLAGS \+= -mcpu=750 -mtune=750|" Makefile
 %else
 #export CC="gcc-3.0.1" CXX="g++-3.0.1"
 %configure --enable-release \
+           --enable-dvd --without-dvdcss \
            --enable-gnome --enable-gtk \
 	   --enable-x11 --disable-qt --enable-ncurses \
 	   --enable-esd --enable-alsa \
@@ -154,8 +156,6 @@ perl -pi -e "s|#CFLAGS \+= -mcpu=750|CFLAGS \+= -mcpu=750 -mtune=750|" Makefile
 	   --enable-ggi \
 	   --enable-sdl 
 %endif
-# thier configure check if /dev/dsp exists...
-perl -pi -e 's#(PLUGINS :=\s)#$1dsp #' Makefile.opts
 export QTDIR=%{_libdir}/qt2 
 %make
 
@@ -298,9 +298,10 @@ rm -fr %buildroot
 %endif
 
 %changelog
-* Thu Apr 04 2002 Samuel Hocevar <sam@zoy.org> 0.3.0
+* Thu Apr 06 2002 Samuel Hocevar <sam@zoy.org> 0.3.0
 - version 0.3.0.
 - removed libdvdcss from the whole tarball.
+- removed the workaround for vlc's bad /dev/dsp detection.
 
 * Thu Jan 17 2002 Yves Duret <yduret@mandrakesoft.com> 0.2.92-2mdk
 - readded libdvdcss rpm in specfile. use %%define css 1 with correct sources