[MPlayer-dev-eng] Four small patches addressing build problems (fwd)

[Diego Biurrun]

On Wed, Dec 07, 2005 at 09:42:16AM +0100, Peter Breitenlohner wrote:
> 
> attached please find four small patches for various (build) problems I
> encountered when building MPlayer-1.0pre7try2.
> 
> Yes I know, I should have gotten the most recent CVS version and patched
> against that one. But since the patches (1) are rather short and (2) equally
> apply to MPlayer-1.0pre7 and MPlayer-1.0pre7try2, that shouldn't cause any
> problems.

Wrong.

The only difference between pre7 and pre7try2 is a security fix.  If you
had gotten yourself the latest CVS version you would have spared
yourself some work, since two of the issues you point out have already
been fixed in CVS.

> patch-01-manpage_typos:
> 	Fix some manpage (formatting) typos

Already fixed in CVS.

> patch-02-enable_gtk2:
> 	This patch allows to (optionally) use GTK+-2.x instead of GTK+-1.2.

Already fixed in CVS.

> patch-03-uninitialized:
> 	Avoid gcc warnings:
> 		'...' might be used uninitialized in this function
> 
> 	I think, in this case 'H', 'N', 'D', and 'F' can indeed be
> 	used unitialized, thus possibly causing all sorts of problems.
> 
> patch-04-redefined:
> 	Avoid gcc warnings:
> 		"..." redefined
> 		this is the location of the previous definition

These might be worth looking into, they still apply to CVS.  Anyone?

> --- MPlayer-1.0pre7try2.orig/Gui/mplayer/gtk/menu.c	2005-01-25 13:44:38.000000000 +0100
> +++ MPlayer-1.0pre7try2/Gui/mplayer/gtk/menu.c	2005-12-04 23:29:32.000000000 +0100
> @@ -594,14 +594,13 @@
>      N=AddMenuCheckItem( window1, (const char*)normal_xpm, Menu,MSGTR_MENU_NormalSize"      ",b1,evNormalSize );
>      D=AddMenuCheckItem( window1, (const char*)double_xpm, Menu,MSGTR_MENU_DoubleSize,b2,evDoubleSize );
>      F=AddMenuCheckItem( window1, (const char*)fs_xpm, Menu,MSGTR_MENU_FullScreen,appMPlayer.subWindow.isFullScreen,evFullScreen );
> -   }
> -
> -  if ( !gtkShowVideoWindow && !guiIntfStruct.Playing )
> -   {
> -    gtk_widget_set_sensitive( H,FALSE );
> -    gtk_widget_set_sensitive( N,FALSE );
> -    gtk_widget_set_sensitive( D,FALSE );
> -    gtk_widget_set_sensitive( F,FALSE );
> +    if ( !gtkShowVideoWindow && !guiIntfStruct.Playing )
> +     {
> +      gtk_widget_set_sensitive( H,FALSE );
> +      gtk_widget_set_sensitive( N,FALSE );
> +      gtk_widget_set_sensitive( D,FALSE );
> +      gtk_widget_set_sensitive( F,FALSE );
> +     }

Strictly speaking this patch contains cosmetics.  I won't complain,
though.

Diego