[MPlayer-dev-eng] [PATCH] directfb2 compilation without fbdev

[Ville Syrjälä]

On Fri, Nov 19, 2004 at 09:49:35PM +0100, Jiri Svoboda wrote:
> > -----Original Message-----
> > From: mplayer-dev-eng-bounces at mplayerhq.hu 
> > [mailto:mplayer-dev-eng-bounces at mplayerhq.hu] On Behalf Of 
> > Reimar Döffinger
> > Sent: Friday, November 19, 2004 8:56 PM
> > To: mplayer-dev-eng at mplayerhq.hu
> > Subject: [MPlayer-dev-eng] [PATCH] directfb2 compilation without fbdev
> > 
> > Hi,
> > vo_directfb2 won't work when vo_fbdev isn't compiled, because the
> > fb_dev_name variable is missing. The attached patch adds it to
> > vo_directfb2 although it (currently) is not used.
> > Not sure if that's such a good idea, it might be better to remove the
> > global fbdev option instead, but that would be more work.
> 
> No,
> just remove it from cfg-mplayer.h

That would break vo_directfb.c (not that anyone should seriously be using 
it anyway)

The attached patch should make everyone happy. The alternative would be 
removing both the fb_dev_name stuff and vo_directfb.c (perhaps this would 
be the best option).

-- 
Ville Syrjälä
syrjala at sci.fi
http://www.sci.fi/~syrjala/
-------------- next part --------------
Index: cfg-mplayer.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-mplayer.h,v
retrieving revision 1.231
diff -u -r1.231 cfg-mplayer.h
--- cfg-mplayer.h	14 Nov 2004 11:27:57 -0000	1.231
+++ cfg-mplayer.h	20 Nov 2004 11:27:50 -0000
@@ -17,15 +17,13 @@
 extern char *fb_mode_cfgfile;
 extern char *fb_mode_name;
 #else
-#ifdef HAVE_DIRECTFB
+#if defined(HAVE_DIRECTFB) && DIRECTFBVERSION < 913
 extern char *fb_dev_name;
 #endif
 #endif
-#ifdef HAVE_DIRECTFB
-#if DIRECTFBVERSION > 912
+#if defined(HAVE_DIRECTFB) && DIRECTFBVERSION > 912
 extern char *dfb_params;
 #endif
-#endif
 #ifdef HAVE_PNG
 extern int z_compression;
 #endif
@@ -234,15 +232,13 @@
 	{"fbmode", &fb_mode_name, CONF_TYPE_STRING, 0, 0, 0, NULL},
 	{"fbmodeconfig", &fb_mode_cfgfile, CONF_TYPE_STRING, 0, 0, 0, NULL},
 #else
-#ifdef HAVE_DIRECTFB
+#if defined(HAVE_DIRECTFB) && DIRECTFBVERSION < 913
 	{"fb", &fb_dev_name, CONF_TYPE_STRING, 0, 0, 0, NULL},
 #endif
 #endif
-#ifdef HAVE_DIRECTFB
-#if DIRECTFBVERSION > 912
+#if defined(HAVE_DIRECTFB) && DIRECTFBVERSION > 912
 	{"dfbopts", &dfb_params, CONF_TYPE_STRING, 0, 0, 0, NULL},
 #endif
-#endif
 
 	// force window width/height or resolution (with -vm)
 	{"x", &opt_screen_size_x, CONF_TYPE_INT, CONF_RANGE, 0, 4096, NULL},