[Mplayer-cvslog] CVS: main Makefile,1.140,1.141 configure,1.371,1.372 mencoder.c,1.58,1.59 mp_msg.c,1.8,1.9 mplayer.c,1.367,1.368

[Zoltan Ponekker]

Update of /cvsroot/mplayer/main
In directory mplayer:/var/tmp.root/cvs-serv22546

Modified Files:
	Makefile configure mencoder.c mp_msg.c mplayer.c 
Log Message:
small gtk bug fix (-display bug, baze gabu, miattad fogok elkarhozni:), and remove gui dependencie in mencoder

Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/Makefile,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- Makefile	14 Jan 2002 23:38:49 -0000	1.140
+++ Makefile	15 Jan 2002 17:03:18 -0000	1.141
@@ -187,14 +187,14 @@
 endif
 
 $(PRG):	$(MPLAYER_DEP)
-	$(CC) $(CFLAGS) -o $(PRG) $(OBJS_MPLAYER) $(CODEC_LIBS) -Llibmpdemux -lmpdemux $(VO_LIBS) $(AO_LIBS) $(LIB_LOADER) $(GUI_LIBS) $(COMMON_LIBS) $(EXTRA_LIB) $(A_LIBS) $(V_LIBS) $(LIRC_LIB) $(CSS_LIB) $(ARCH_LIB) $(DECORE_LIB) $(TERMCAP_LIB) $(STATIC_LIB) $(GTK_LIBS) $(PNG_LIB) $(Z_LIB) $(STREAMING_LIB) $(VIDIX_LIBS) -lm
+	$(CC) $(CFLAGS) -o $(PRG) $(OBJS_MPLAYER) $(CODEC_LIBS) -Llibmpdemux -lmpdemux $(GUI_LIBS) $(VO_LIBS) $(AO_LIBS) $(LIB_LOADER) $(COMMON_LIBS) $(EXTRA_LIB) $(A_LIBS) $(V_LIBS) $(LIRC_LIB) $(CSS_LIB) $(ARCH_LIB) $(DECORE_LIB) $(TERMCAP_LIB) $(STATIC_LIB) $(GTK_LIBS) $(PNG_LIB) $(Z_LIB) $(STREAMING_LIB) $(VIDIX_LIBS) -lm
 
 $(PRG_FIBMAP): fibmap_mplayer.o
 	$(CC) -o $(PRG_FIBMAP) fibmap_mplayer.o
 
 ifeq ($(MENCODER),yes)
 $(PRG_MENCODER): $(MENCODER_DEP)
-	$(CC) $(CFLAGS) -o $(PRG_MENCODER) $(OBJS_MENCODER) $(CODEC_LIBS) -Llibmpdemux -lmpdemux $(LIB_LOADER) $(GUI_LIBS) $(COMMON_LIBS) $(EXTRA_LIB) $(A_LIBS) $(CSS_LIB) $(GTK_LIBS) $(PNG_LIB) $(Z_LIB) $(ARCH_LIB) $(DECORE_LIB) $(ENCORE_LIB) $(TERMCAP_LIB) $(STREAMING_LIB) -lm
+	$(CC) $(CFLAGS) -o $(PRG_MENCODER) $(OBJS_MENCODER) $(CODEC_LIBS) -Llibmpdemux -lmpdemux $(LIB_LOADER) $(COMMON_LIBS) $(EXTRA_LIB) $(A_LIBS) $(CSS_LIB) $(GTK_LIBS) $(PNG_LIB) $(Z_LIB) $(ARCH_LIB) $(DECORE_LIB) $(ENCORE_LIB) $(TERMCAP_LIB) $(STREAMING_LIB) -lm
 endif
 
 # Every mplayer dependancy depends on version.h, to force building version.h

Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.371
retrieving revision 1.372
diff -u -r1.371 -r1.372
--- configure	15 Jan 2002 14:49:35 -0000	1.371
+++ configure	15 Jan 2002 17:03:18 -0000	1.372
@@ -2507,6 +2507,12 @@
 
 fi
 
+echocheck "mencoder"
+_mencoder_flag='#undef HAVE_MENCODER'
+if test "$_mencoder" = yes ; then
+  _mencoder_flag='#define HAVE_MENCODER'
+fi
+echores "$_mencoder"
 
 echocheck "lirc"
 if test "$_lirc" = auto ; then
@@ -2882,6 +2888,9 @@
 /* Define for using new DivX4Linux library, instead of open-source OpenDivX */
 /* You have to change DECORE_LIBS in config.mak too! */
 $_def_decore
+
+/* If build mencoder */
+$_mencoder_flag
 
 /* Indicates if Divx4linux encore is available
    Note: for mencoder */

Index: mencoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/mencoder.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- mencoder.c	15 Jan 2002 00:20:50 -0000	1.58
+++ mencoder.c	15 Jan 2002 17:03:18 -0000	1.59
@@ -193,28 +193,6 @@
 
 //---------------------------------------------------------------------------
 
-// dummy datas for gui :(
-
-#ifdef HAVE_NEW_GUI
-float rel_seek_secs=0;
-int abs_seek_pos=0;
-int use_gui=0;
-
-void exit_player(char* how){
-}
-void vo_x11_putkey(int key){
-}
-void vo_setwindow( int w,int g ) {
-}
-void vo_setwindowsize( int w,int h ) {
-}
-
-int       vo_resize = 0;
-int       vo_expose = 0;
-
-#endif
-// ---
-
 // mini dummy libvo:
 
 static unsigned char* vo_image=NULL;

Index: mp_msg.c
===================================================================
RCS file: /cvsroot/mplayer/main/mp_msg.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mp_msg.c	27 Dec 2001 00:34:00 -0000	1.8
+++ mp_msg.c	15 Jan 2002 17:03:18 -0000	1.9
@@ -28,7 +28,7 @@
     va_list va;
     if((x&255)>mp_msg_levels[x>>8]) return; // do not display
     va_start(va, format);
-#ifdef HAVE_NEW_GUI
+#if defined( HAVE_NEW_GUI ) && !defined( HAVE_MENCODER )
     if(use_gui){
       char tmp[16*80];
       vsnprintf( tmp,8*80,format,va ); tmp[8*80-1]=0;

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.367
retrieving revision 1.368
diff -u -r1.367 -r1.368
--- mplayer.c	15 Jan 2002 00:22:34 -0000	1.367
+++ mplayer.c	15 Jan 2002 17:03:18 -0000	1.368
@@ -657,8 +657,11 @@
 	} else
 	    printf("Using Linux's hardware RTC timing (%ldHz)\n", irqp);
     }
+#ifdef HAVE_NEW_GUI
 // breaks DGA and SVGAlib and VESA drivers:  --A'rpi
-//    setuid( getuid() ); // strongly test, please check this.
+// and now ? -- Pontscho
+    if(use_gui) setuid( getuid() ); // strongly test, please check this.
+#endif
     if(rtc_fd<0)
 #endif
 	printf("Using %s timing\n",softsleep?"software":"usleep()");