[MPlayer-cvslog] CVS: main/libvo gl_common.c, 1.6, 1.7 gl_common.h, 1.5, 1.6 vo_gl.c, 1.74, 1.75

[Ivo]

On Tuesday 26 July 2005 12:16, Reimar Döffinger CVS wrote:
[..]
> Index: gl_common.c
> ===================================================================
> RCS file: /cvsroot/mplayer/main/libvo/gl_common.c,v
> retrieving revision 1.6
> retrieving revision 1.7
> diff -u -r1.6 -r1.7
> --- gl_common.c	29 Dec 2004 14:33:40 -0000	1.6
> +++ gl_common.c	26 Jul 2005 10:16:18 -0000	1.7
[..]
> @@ -319,6 +399,12 @@
>      if (*vinfo)
>        XFree(*vinfo);
>      *vinfo = new_vinfo;
> +#ifdef GLX_ARB_get_proc_address
> +    getProcAddress = (void *)glXGetProcAddressARB;
> +#else
> +    getProcAddress = NULL;
> +#endif
> +    getFunctions();

This breaks compilation on my system:

...
cc -c -I../libvo -I../../libvo -I/usr/X11R6/include -fno-PIC -W -Wall 
-Wno-unused-parameter -O2 -march=athlon-4 -mcpu=athlon-4 -g  -D_REENTRANT 
-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64  -std=gnu99 -I. -I.. -I../osdep 
-I/usr/include/freetype2 -I/usr/include/SDL -D_REENTRANT 
-I/usr/X11R6/include    -DMPG12PLAY  -o gl_common.o gl_common.c
gl_common.c: In function `setGlWindow':
gl_common.c:407: `glXGetProcAddressARB' undeclared (first use in this 
function)
gl_common.c:407: (Each undeclared identifier is reported only once
gl_common.c:407: for each function it appears in.)
make: *** [gl_common.o] Error 1


I'm no OpenGL expert, but I got it fixed with:

Index: gl_common.h
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/gl_common.h,v
retrieving revision 1.7
diff -u -r1.7 gl_common.h
--- gl_common.h 26 Jul 2005 13:47:18 -0000      1.7
+++ gl_common.h 26 Jul 2005 16:40:54 -0000
@@ -13,6 +13,7 @@
 #include "w32_common.h"
 #else
 #include <X11/Xlib.h>
+#define GLX_GLXEXT_LEGACY
 #include <GL/glx.h>
 #include "x11_common.h"
 #endif


Don't know if that's the correct way though :)

--Ivo