In r1767 an ifdef was introduced that broke my kaa.display build:

building 'kaa.display._X11module' extension
i686-pc-linux-gnu-gcc -pthread -fno-strict-aliasing -DNDEBUG -fPIC -I/usr/include/python2.4 -c src/x11display.c -o build/temp.linux-i686-2.4/src/x11display.o -Wall
src/x11display.c: In function `X11Display_PyObject__glx_supported':
src/x11display.c:213: error: `GLX_RGBA' undeclared (first use in this function) src/x11display.c:213: error: (Each undeclared identifier is reported only once
src/x11display.c:213: error: for each function it appears in.)
src/x11display.c:213: error: initializer element is not constant
src/x11display.c:213: error: (near initialization for `attribs[0]')
src/x11display.c:214: warning: implicit declaration of function `glXChooseVisual'
failed to build display


I fixed it by putting the conditional GL/glx.h include under config.h (since config.h seems to be the only place where ENABLE_ENGINE_GL_X11 is actually set). Builds now, not sure how it would work if someone would actually not have glx-evas..


Index: display/src/x11display.c
===================================================================
--- display/src/x11display.c    (revision 1779)
+++ display/src/x11display.c    (working copy)
@@ -33,14 +33,14 @@
 #include <Python.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
-#ifdef ENABLE_ENGINE_GL_X11
-#include <GL/glx.h>
-#endif
 #include "x11display.h"
 #include "structmember.h"
 
 #include "config.h"
 
+#ifdef ENABLE_ENGINE_GL_X11
+#include <GL/glx.h>
+#endif
 extern PyTypeObject X11Display_PyObject_Type;
 
 
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Freevo-devel mailing list
Freevo-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/freevo-devel

Reply via email to