[Mplayer-cvslog] CVS: main Makefile,1.111,1.112 cfg-mplayer.h,1.108,1.109 configure,1.312,1.313

[Arpi of Ize]

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

Modified Files:
	Makefile cfg-mplayer.h configure 
Log Message:
vo DirectFB support by Jiri Svoboda <Jiri.Svoboda at seznam.cz>

Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/Makefile,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- Makefile	29 Nov 2001 18:20:59 -0000	1.111
+++ Makefile	3 Dec 2001 01:07:52 -0000	1.112
@@ -146,7 +146,7 @@
 endif
 
 $(PRG):	$(MPLAYER_DEP)
-	$(CC) $(CFLAGS) -o $(PRG) $(OBJS_MPLAYER) -Llibmpdemux -lmpdemux $(AV_LIB) $(EXTRA_LIB) $(LIRC_LIB) $(LIB_LOADER) $(MP1E_LIB) -Llibmpeg2 -lmpeg2 -Llibao2 -lao2 $(A_LIBS) $(VO_LIBS) $(CSS_LIB) $(ARCH_LIB) $(OSDEP_LIBS) $(PP_LIBS) $(XA_LIBS) $(DECORE_LIB) $(TERMCAP_LIB) -lm $(STATIC_LIB) $(GUI_LIBS) $(PNG_LIB) $(Z_LIB)
+	$(CC) $(CFLAGS) -o $(PRG) $(OBJS_MPLAYER) -Llibmpdemux -lmpdemux $(AV_LIB) $(EXTRA_LIB) $(LIRC_LIB) $(LIB_LOADER) $(MP1E_LIB) -Llibmpeg2 -lmpeg2 -Llibao2 -lao2 $(A_LIBS) $(VO_LIBS) $(CSS_LIB) $(ARCH_LIB) $(OSDEP_LIBS) $(PP_LIBS) $(XA_LIBS) $(DECORE_LIB) $(TERMCAP_LIB) $(DIRECTFB_LIB) -lm $(STATIC_LIB) $(GUI_LIBS) $(PNG_LIB) $(Z_LIB)
 
 $(PRG_FIBMAP): fibmap_mplayer.o
 	$(CC) -o $(PRG_FIBMAP) fibmap_mplayer.o

Index: cfg-mplayer.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-mplayer.h,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- cfg-mplayer.h	2 Dec 2001 20:03:26 -0000	1.108
+++ cfg-mplayer.h	3 Dec 2001 01:07:52 -0000	1.109
@@ -13,6 +13,10 @@
 extern char *monitor_hfreq_str;
 extern char *monitor_vfreq_str;
 extern char *monitor_dotclock_str;
+#else
+#ifdef HAVE_DIRECTFB
+extern char *fb_dev_name;
+#endif
 #endif
 #ifdef HAVE_PNG
 extern int z_compression;
@@ -118,6 +122,10 @@
 	{"monitor_hfreq", &monitor_hfreq_str, CONF_TYPE_STRING, 0, 0, 0},
 	{"monitor_vfreq", &monitor_vfreq_str, CONF_TYPE_STRING, 0, 0, 0},
 	{"monitor_dotclock", &monitor_dotclock_str, CONF_TYPE_STRING, 0, 0, 0},
+#else
+#ifdef HAVE_DIRECTFB
+	{"fb", &fb_dev_name, CONF_TYPE_STRING, 0, 0, 0},
+#endif
 #endif
 //	{"encode", &encode_name, CONF_TYPE_STRING, 0, 0, 0},
 #ifdef USE_SUB

Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.312
retrieving revision 1.313
diff -u -r1.312 -r1.313
--- configure	1 Dec 2001 23:38:57 -0000	1.312
+++ configure	3 Dec 2001 01:07:52 -0000	1.313
@@ -148,6 +148,7 @@
   --enable-mlib          build with MLIB support (Solaris only) [autodetect]
   --enable-3dfx          build with 3dfx support [disable]
   --enable-tdfxfb        build with tdfxfb support [disable]
+  --enable-directfb      build with DirectFB support [autodetect]
 
 Audio:
   --disable-ossaudio     disable OSS sound support [autodetect]
@@ -684,6 +685,7 @@
 _termios=auto
 _3dfx=no
 _tdfxfb=no
+_directfb=auto
 _largefiles=no
 _vo2=no
 _language=en
@@ -784,6 +786,8 @@
   --disable-3dfx)	_3dfx=no	;;
   --enable-tdfxfb)	_tdfxfb=yes	;;
   --disable-tdfxfb)	_tdfxfb=no	;;
+  --enable-directfb)	_directfb=yes	;;
+  --disable-directfb)	_directfb=no	;;
   --enable-mtrr)	_mtrr=yes	;;
   --disable-mtrr)	_mtrr=no	;;
   --enable-largefiles)	_largefiles=yes	;;
@@ -1258,6 +1262,25 @@
 echores "$_tdfxfb"
 
 
+echocheck "DirectFB"
+if test "$_directfb" = auto ; then
+  _directfb=no
+  cat > $TMPC <<EOF
+#include <directfb.h>
+int main(void) { IDirectFB *foo; return 0; }
+EOF
+  cc_check -ldirectfb && _directfb=yes
+fi
+if test "$_directfb" = yes ; then
+  _def_directfb='#define HAVE_DIRECTFB 1'
+  _vosrc="$_vosrc vo_directfb.c"
+  _ld_directfb='-ldirectfb'
+else
+  _def_directfb='#undef HAVE_DIRECTFB'
+fi
+echores "$_directfb"
+
+
 # Checking for localization ...
 echocheck "language"
 test -z "$LINGUAS" && LINGUAS="en"
@@ -2597,6 +2620,7 @@
 DECORE_LIB = $_ld_decore
 MENCODER = $_mencoder
 ENCORE_LIB =  $_ld_encore 
+DIRECTFB_LIB = $_ld_directfb
 
 # --- Some stuff for autoconfigure ----
 $_target_arch
@@ -2856,6 +2880,7 @@
 $_def_ggi
 $_def_3dfx
 $_def_tdfxfb
+$_def_directfb
 $_def_mga
 $_def_xmga
 $_def_syncfb