[MPlayer-dev-eng] [PATCH] vidix/drivers/radeon_vid compile error

[Steven M. Schultz]

Hi -

	Ever since the '#ifdef HAVE_X11' section was added to
	vidix/drivers/radeon_vid.c I've had the following compile error:

cc -c -I../libvo/ -I../../libvo -O4 -march=i686 -mcpu=i686 -pipe -ffast-math -fomit-frame-pointer -D_THREAD_SAFE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE  -fPIC -I. -I.. -o radeon_vid.o radeon_vid.c
radeon_vid.c:29: X11/Xlib.h: No such file or directory
radeon_vid.c: In function `probe_fireGL_driver':
radeon_vid.c:925: `Display' undeclared (first use in this function)
radeon_vid.c:925: (Each undeclared identifier is reported only once
radeon_vid.c:925: for each function it appears in.)
radeon_vid.c:925: `dp' undeclared (first use in this function)
radeon_vid.c:926: syntax error before `int'
radeon_vid.c:929: `extlist' undeclared (first use in this function)
radeon_vid.c:932: `n' undeclared (first use in this function)
gmake[2]: *** [radeon_vid.o] Error 1
gmake[2]: Leaving directory `/usr/local/src/MPlayer-cvs/vidix/drivers'
gmake[1]: *** [all] Error 2
gmake[1]: Leaving directory `/usr/local/src/MPlayer-cvs/vidix'

	HAVE_X11 is set, the X11 header path was detected:

Checking for X11 headers presence ... yes (using /usr/X11/include)
Checking for X11 libs presence ... yes (using /usr/X11R6/lib)

	The problem is that OPTFLAGS does not have $_inc_x11 and 
	'RADEON_CFLAGS=$(OPTFLAGS) -fPIC -I. -I..'  does not have a path
	to the X11 headers.

	To fix this problem I made the small change to the top level
	configure script:

--- configure.dist	Wed Apr 28 09:49:55 2004
+++ configure	Fri Apr 30 08:42:03 2004
@@ -5934,7 +5934,7 @@
 INSTALL = $_install
 # OPTFLAGS = -O4 $_profile $_debug $_march $_mcpu -pipe -fomit-frame-pointer -ffast-math
 EXTRA_INC = $_inc_extra $_inc_gtk
-OPTFLAGS = -I../libvo/ -I../../libvo $CFLAGS \$(EXTRA_INC)
+OPTFLAGS = -I../libvo/ -I../../libvo $_inc_x11 $CFLAGS \$(EXTRA_INC)
 STRIPBINARIES = $_stripbinaries
 
 $_live_libs_def

	and the build works fine.  Doesn't appear to affect anything else
	so it'd be nice if the attached patch could be applied.

	Thanks.

	Steven Schultz
-------------- next part --------------
--- configure.dist	Wed Apr 28 09:49:55 2004
+++ configure	Fri Apr 30 08:42:03 2004
@@ -5934,7 +5934,7 @@
 INSTALL = $_install
 # OPTFLAGS = -O4 $_profile $_debug $_march $_mcpu -pipe -fomit-frame-pointer -ffast-math
 EXTRA_INC = $_inc_extra $_inc_gtk
-OPTFLAGS = -I../libvo/ -I../../libvo $CFLAGS \$(EXTRA_INC)
+OPTFLAGS = -I../libvo/ -I../../libvo $_inc_x11 $CFLAGS \$(EXTRA_INC)
 STRIPBINARIES = $_stripbinaries
 
 $_live_libs_def