Backported stable changes.

diff --git a/ChangeLog b/ChangeLog
index a497da3a57ac81027b764a9fc0be3882d29649f8..adb3c88a9aed20b9170467bbcd518f5a01319a3d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -67,9 +67,17 @@ Not released yet
   * ALL: the first libvlc commit.
 
 0.4.2
-Not released yet
-
-  * ./plugins/gtk/gnome_callbacks.c: fixed a crash when activating preferences 
+Mon, 20 Jun 2002 00:41:26 +0200
+
+  * ./plugins/macosx: new controls for audio output, and deinterlacing
+    support.
+  * ./plugins/macosx: fixed a bug with language and subtitle menus.
+  * ./plugins/access/http.c: should be more tolerant with old servers and
+    non-seekable streams.
+  * ./plugins/filter/deinterlace.c: backported new deinterlacing routines.
+  * ./include/threads.h, ./include/threads_funcs.h: backported the new Win32
+    cond_wait implementation from MAIN.
+  * ./plugins/gtk/gnome_callbacks.c: fixed a crash when activating preferences
     from the popup menu.
 
 0.4.1

diff --git a/README.MacOSX.rtf b/README.MacOSX.rtf
index 663c4e5d62866a3af91e4c45cd55656ace81f4ca..e85bbe23c0315aac73318a6f50dd5e154f82a94d 100644 (file)
--- a/README.MacOSX.rtf
+++ b/README.MacOSX.rtf
@@ -82,7 +82,15 @@ Simply drag VLC from the place where you have installed it, to the Trash.\
 \f0\b0 \ulnone There is no version for Mac OS 9. VLC is originally a UNIX application and has never been ported to Mac OS 9. Considering the amount of differences between Mac OS 9 and modern systems, it would require a tremendous work to port VLC. We do not plan to do it. So please don't ask.\
 \
 \
+
+\f1\b \ul 9. How do I enable deinterlacing ?\
+
+\f0\b0 \ulnone You must select the "Deinterlace" menu item 
+\f1\b before
+\f0\b0  opening any file. If the item is selected while reading a file, nothing will happen. This is a known issue, please do not report it.\
+\
+\
 Thanks for reading this file. For additional information, subscribe to the vlc mailing list on \ul http://www.videolan.org/.\ulnone \
 -- \
 Christophe Massiot <massiot@via.ecp.fr>, for the VideoLAN team.\
-$Id: README.MacOSX.rtf,v 1.5 2002/06/18 23:18:40 massiot Exp $}
\ No newline at end of file
+$Id: README.MacOSX.rtf,v 1.6 2002/06/19 22:47:14 massiot Exp $}
\ No newline at end of file

diff --git a/doc/release-howto.txt b/doc/release-howto.txt
index aa003555a3656fca11edf5f72d84b28b46432810..771b5f179cee09cd878b404b56285bcf795f4107 100644 (file)
--- a/doc/release-howto.txt
+++ b/doc/release-howto.txt
@@ -14,6 +14,7 @@
      · vlc.spec
      · ipkg/control
      · debian/changelog
+     · extras/MacOSX/vlc.pbprj/project.pbxproj
   - mettre à jour les ChangeLog et la TODO list pour ceux qui auraient
     étourdiment oublié de l'updater à chaque commit
   - updater le numéro de version et le timestamp dans :

diff --git a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib
index f51f4abbb4b18d1f8399f32c3bd7960e78883c96..cb22fd6f143b98e1c2cad36114ab288e9dedf673 100644 (file)
--- a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib
+++ b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib
@@ -3,6 +3,7 @@
         {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, 
         {
             ACTIONS = {
+                deinterlace = id; 
                 eject = id; 
                 faster = id; 
                 fullscreen = id; 

diff --git a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib
index 11e88ca1902fb38dee4dcfa0ad59f6ecae4093a1..20601ed6fe1b2ded698b9c4380f3509bff12ac37 100644 (file)
--- a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib
+++ b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib
@@ -9,7 +9,7 @@
                <key>235</key>
                <string>401 417 350 182 0 0 1152 746 </string>
                <key>29</key>
-               <string>809 162 262 44 0 0 1152 746 </string>
+               <string>367 465 262 44 0 0 1152 746 </string>
                <key>445</key>
                <string>347 561 370 117 0 0 1152 746 </string>
                <key>460</key>
@@ -19,8 +19,8 @@
        <string>248.0</string>
        <key>IBOpenObjects</key>
        <array>
-               <integer>29</integer>
                <integer>528</integer>
+               <integer>29</integer>
        </array>
        <key>IBSystem Version</key>
        <string>5Q125</string>

diff --git a/ipkg/control b/ipkg/control
index dfdee248dc6f718bceaa47fb1ea8b5b5030c71ee..c83a0a5bfb7614f28fa348c181fea4c2fb3f359c 100644 (file)
--- a/ipkg/control
+++ b/ipkg/control
@@ -1,7 +1,7 @@
 Package: vlc
 Section: graphics
 Priority: optional
-Version: 0.5.0-cvs
+Version: 0.4.2
 Release: 1
 Architecture: arm
 Maintainer: Jean-Paul Saman <jpsaman@wxs.nl>,  Christophe Massiot <massiot@via.ecp.fr>

diff --git a/plugins/macosx/intf_controller.h b/plugins/macosx/intf_controller.h
index d5a4bdcac84974c9c00327866c42188e133fd9ba..2f3e3d4fbe2a643ed7124a56cbed465fd3f5ccdb 100644 (file)
--- a/plugins/macosx/intf_controller.h
+++ b/plugins/macosx/intf_controller.h
@@ -2,7 +2,7 @@
  * intf_controller.h: MacOS X plugin for vlc
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: intf_controller.h,v 1.10 2002/06/02 12:16:31 massiot Exp $
+ * $Id: intf_controller.h,v 1.11 2002/06/19 22:47:14 massiot Exp $
  *
  * Authors: Florian G. Pflug <fgp@phlo.org>
  *
@@ -79,6 +79,7 @@
 - (IBAction)prevChannel:(id)sender;
 - (IBAction)nextChannel:(id)sender;
 - (IBAction)loop:(id)sender;
+- (IBAction)deinterlace:(id)sender;
 - (IBAction)mute:(id)sender;
 - (IBAction)fullscreen:(id)fullscreen;
 - (IBAction)eject:(id)sender;

diff --git a/plugins/macosx/intf_controller.m b/plugins/macosx/intf_controller.m
index 2ccf4299614c28ed8a580321c47edcbfce61d07a..75849a5d74250356f72659ec2976c112081217fd 100644 (file)
--- a/plugins/macosx/intf_controller.m
+++ b/plugins/macosx/intf_controller.m
@@ -2,7 +2,7 @@
  * intf_controller.m: MacOS X plugin for vlc
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: intf_controller.m,v 1.9 2002/06/08 19:32:19 sam Exp $
+ * $Id: intf_controller.m,v 1.10 2002/06/19 22:47:14 massiot Exp $
  *
  * Authors: Florian G. Pflug <fgp@phlo.org>
  *          Jon Lech Johansen <jon-vl@nanocrew.net>
@@ -191,6 +191,22 @@
     }
 }
 
+- (IBAction)deinterlace:(id)sender
+{
+    NSMenuItem * item = (NSMenuItem *)sender;
+
+    if ( [item state] == NSOnState )
+    {
+        config_PutPszVariable( "filter", NULL );
+        [item setState:NSOffState];
+    }
+    else
+    {
+        config_PutPszVariable( "filter", "deinterlace:blend" );
+        [item setState:NSOnState];
+    }
+}
+
 - (IBAction)mute:(id)sender
 {
     NSMenuItem * item = (NSMenuItem *)sender;

diff --git a/vlc.spec b/vlc.spec
index bf050e81435d47b0cc7d939dd68b272b98e15e32..a4952a3564ca33e8aa70b060717353746674572c 100644 (file)
--- a/vlc.spec
+++ b/vlc.spec
@@ -1,7 +1,7 @@
 
 
 %define name           vlc
-%define vlc_ver        0.5.0-cvs
+%define vlc_ver        0.4.2
 %define version                %vlc_ver
 
 %define cvs            0
@@ -245,21 +245,21 @@ EOF
 
 # icons
 mkdir -p %{buildroot}/{%{_miconsdir},%{_liconsdir}}
-install -m 644 %buildroot/%_datadir/vlc/vlc16x16.png %buildroot/%{_miconsdir}/vlc.png
-install -m 644 %buildroot/%_datadir/vlc/vlc32x32.png %buildroot/%{_iconsdir}/vlc.png
-install -m 644 %buildroot/%_datadir/vlc/vlc48x48.png %buildroot/%{_liconsdir}/vlc.png
-install -m 644 %buildroot/%_datadir/vlc/gnome-vlc16x16.png %buildroot/%{_miconsdir}/gnome-vlc.png
-install -m 644 %buildroot/%_datadir/vlc/gnome-vlc32x32.png %buildroot/%{_iconsdir}/gnome-vlc.png
-install -m 644 %buildroot/%_datadir/vlc/gnome-vlc48x48.png %buildroot/%{_liconsdir}/gnome-vlc.png
-install -m 644 %buildroot/%_datadir/vlc/gvlc16x16.png %buildroot/%{_miconsdir}/gvlc.png
-install -m 644 %buildroot/%_datadir/vlc/gvlc32x32.png %buildroot/%{_iconsdir}/gvlc.png
-install -m 644 %buildroot/%_datadir/vlc/gvlc48x48.png %buildroot/%{_liconsdir}/gvlc.png
-install -m 644 %buildroot/%_datadir/vlc/kvlc16x16.png %buildroot/%{_miconsdir}/kvlc.png
-install -m 644 %buildroot/%_datadir/vlc/kvlc32x32.png %buildroot/%{_iconsdir}/kvlc.png
-install -m 644 %buildroot/%_datadir/vlc/kvlc48x48.png %buildroot/%{_liconsdir}/kvlc.png
-install -m 644 %buildroot/%_datadir/vlc/qvlc16x16.png %buildroot/%{_miconsdir}/qvlc.png
-install -m 644 %buildroot/%_datadir/vlc/qvlc32x32.png %buildroot/%{_iconsdir}/qvlc.png
-install -m 644 %buildroot/%_datadir/vlc/qvlc48x48.png %buildroot/%{_liconsdir}/qvlc.png
+install -m 644 %buildroot/%_datadir/videolan/vlc16x16.png %buildroot/%{_miconsdir}/vlc.png
+install -m 644 %buildroot/%_datadir/videolan/vlc32x32.png %buildroot/%{_iconsdir}/vlc.png
+install -m 644 %buildroot/%_datadir/videolan/vlc48x48.png %buildroot/%{_liconsdir}/vlc.png
+install -m 644 %buildroot/%_datadir/videolan/gnome-vlc16x16.png %buildroot/%{_miconsdir}/gnome-vlc.png
+install -m 644 %buildroot/%_datadir/videolan/gnome-vlc32x32.png %buildroot/%{_iconsdir}/gnome-vlc.png
+install -m 644 %buildroot/%_datadir/videolan/gnome-vlc48x48.png %buildroot/%{_liconsdir}/gnome-vlc.png
+install -m 644 %buildroot/%_datadir/videolan/gvlc16x16.png %buildroot/%{_miconsdir}/gvlc.png
+install -m 644 %buildroot/%_datadir/videolan/gvlc32x32.png %buildroot/%{_iconsdir}/gvlc.png
+install -m 644 %buildroot/%_datadir/videolan/gvlc48x48.png %buildroot/%{_liconsdir}/gvlc.png
+install -m 644 %buildroot/%_datadir/videolan/kvlc16x16.png %buildroot/%{_miconsdir}/kvlc.png
+install -m 644 %buildroot/%_datadir/videolan/kvlc32x32.png %buildroot/%{_iconsdir}/kvlc.png
+install -m 644 %buildroot/%_datadir/videolan/kvlc48x48.png %buildroot/%{_liconsdir}/kvlc.png
+install -m 644 %buildroot/%_datadir/videolan/qvlc16x16.png %buildroot/%{_miconsdir}/qvlc.png
+install -m 644 %buildroot/%_datadir/videolan/qvlc32x32.png %buildroot/%{_iconsdir}/qvlc.png
+install -m 644 %buildroot/%_datadir/videolan/qvlc48x48.png %buildroot/%{_liconsdir}/qvlc.png
 
 %post
 %update_menus
@@ -274,39 +274,39 @@ rm -fr %buildroot
 %doc README COPYING
 %{_bindir}/vlc
 
-%dir %{_libdir}/vlc
-%{_libdir}/vlc/ac3_spdif.so
-%{_libdir}/vlc/avi.so
-%{_libdir}/vlc/dsp.so
-%{_libdir}/vlc/dummy.so
-%{_libdir}/vlc/dvd.so
-%{_libdir}/vlc/fb.so
-%{_libdir}/vlc/file.so
-%{_libdir}/vlc/filter_clone.so
-%{_libdir}/vlc/filter_crop.so
-%{_libdir}/vlc/filter_deinterlace.so
-%{_libdir}/vlc/filter_distort.so
-%{_libdir}/vlc/filter_invert.so
-%{_libdir}/vlc/filter_transform.so
-%{_libdir}/vlc/filter_wall.so
-%{_libdir}/vlc/fx_scope.so
-%{_libdir}/vlc/http.so
-%{_libdir}/vlc/ipv4.so
-%{_libdir}/vlc/ipv6.so
-%{_libdir}/vlc/logger.so
-%{_libdir}/vlc/lpcm_adec.so
-%{_libdir}/vlc/memcpy.so
-%{_libdir}/vlc/mga.so
-%{_libdir}/vlc/mpeg_es.so
-%{_libdir}/vlc/mpeg_ps.so
-%{_libdir}/vlc/mpeg_ts.so
-%{_libdir}/vlc/null.so
-%{_libdir}/vlc/rc.so
-%{_libdir}/vlc/spudec.so
-%{_libdir}/vlc/udp.so
-%{_libdir}/vlc/vcd.so
-%{_libdir}/vlc/x11.so
-#%{_libdir}/vlc/xmga.so
+%dir %{_libdir}/videolan/vlc
+%{_libdir}/videolan/vlc/ac3_spdif.so
+%{_libdir}/videolan/vlc/avi.so
+%{_libdir}/videolan/vlc/dsp.so
+%{_libdir}/videolan/vlc/dummy.so
+%{_libdir}/videolan/vlc/dvd.so
+%{_libdir}/videolan/vlc/fb.so
+%{_libdir}/videolan/vlc/file.so
+%{_libdir}/videolan/vlc/filter_deinterlace.so
+%{_libdir}/videolan/vlc/filter_distort.so
+%{_libdir}/videolan/vlc/filter_invert.so
+%{_libdir}/videolan/vlc/filter_transform.so
+%{_libdir}/videolan/vlc/filter_wall.so
+%{_libdir}/videolan/vlc/filter_clone.so
+%{_libdir}/videolan/vlc/filter_crop.so
+%{_libdir}/videolan/vlc/fx_scope.so
+%{_libdir}/videolan/vlc/http.so
+%{_libdir}/videolan/vlc/ipv4.so
+%{_libdir}/videolan/vlc/ipv6.so
+%{_libdir}/videolan/vlc/logger.so
+%{_libdir}/videolan/vlc/lpcm_adec.so
+%{_libdir}/videolan/vlc/memcpy.so
+%{_libdir}/videolan/vlc/mga.so
+%{_libdir}/videolan/vlc/mpeg_es.so
+%{_libdir}/videolan/vlc/mpeg_ps.so
+%{_libdir}/videolan/vlc/mpeg_ts.so
+%{_libdir}/videolan/vlc/null.so
+%{_libdir}/videolan/vlc/rc.so
+%{_libdir}/videolan/vlc/spudec.so
+%{_libdir}/videolan/vlc/udp.so
+%{_libdir}/videolan/vlc/vcd.so
+%{_libdir}/videolan/vlc/x11.so
+#%{_libdir}/videolan/vlc/xmga.so
 
 %{_mandir}/man1/*
 %{_menudir}/vlc
@@ -319,7 +319,7 @@ rm -fr %buildroot
 %files gtk
 %defattr(-,root,root)
 %doc README
-%{_libdir}/vlc/gtk.so
+%{_libdir}/videolan/vlc/gtk.so
 %{_bindir}/gvlc
 %{_menudir}/vlc-gtk
 %{_miconsdir}/gvlc.png
@@ -333,7 +333,7 @@ rm -fr %buildroot
 %files gnome
 %defattr(-,root,root)
 %doc README
-%{_libdir}/vlc/gnome.so
+%{_libdir}/videolan/vlc/gnome.so
 %{_bindir}/gnome-vlc
 %{_menudir}/vlc-gnome
 %{_miconsdir}/gnome-vlc.png
@@ -348,7 +348,7 @@ rm -fr %buildroot
 %files qt
 %defattr(-,root,root)
 %doc README
-%{_libdir}/vlc/qt.so
+%{_libdir}/videolan/vlc/qt.so
 %{_bindir}/qvlc
 %{_menudir}/vlc-qt
 %{_miconsdir}/qvlc.png
@@ -363,54 +363,60 @@ rm -fr %buildroot
 %files ncurses
 %defattr(-,root,root)
 %doc README
-%{_libdir}/vlc/ncurses.so
+%{_libdir}/videolan/vlc/ncurses.so
 
 %if %plugin_lirc
 %files lirc
 %defattr(-,root,root)
 %doc README
-%{_libdir}/vlc/lirc.so
+%{_libdir}/videolan/vlc/lirc.so
 %endif
 
 # video plugins
 %files sdl
 %defattr(-,root,root)
 %doc README
-%{_libdir}/vlc/sdl.so
+%{_libdir}/videolan/vlc/sdl.so
 
 %files ggi
 %defattr(-,root,root)
 %doc README
-%{_libdir}/vlc/ggi.so
+%{_libdir}/videolan/vlc/ggi.so
 
 %files aa
 %defattr(-,root,root)
 %doc README
-%{_libdir}/vlc/aa.so
+%{_libdir}/videolan/vlc/aa.so
 
 # codec plugin
 %files mad
 %defattr(-,root,root)
 %doc README
-%{_libdir}/vlc/mad.so
+%{_libdir}/videolan/vlc/mad.so
 
 #audio plugins
 %files esd
 %defattr(-,root,root)
 %doc README
-%{_libdir}/vlc/esd.so
+%{_libdir}/videolan/vlc/esd.so
 
 %files arts
 %defattr(-,root,root)
 %doc README
-%{_libdir}/vlc/arts.so
+%{_libdir}/videolan/vlc/arts.so
 
 %files alsa
 %defattr(-,root,root)
 %doc README
-%{_libdir}/vlc/alsa.so
+%{_libdir}/videolan/vlc/alsa.so
 
 %changelog
+* Mon Jun 20 2002 Yves Duret <yduret@mandrakesoft.com> 0.4.2-1mdk
+- new upstream release
+
+* Mon Jun 3 2002 Yves Duret <yduret@mandrakesoft.com> 0.4.1-1mdk
+- new upstream release
+
 * Thu May 23 2002 Yves Duret <yduret@mandrakesoft.com> 0.4.0-1mdk
 - version 0.4.0 with MPEG4 (DivX) support thx ffmpeg.
   thus s/MPEG, MPEG2 and DVD/multimedia/g