Author: tack
Date: Sat Apr 1 02:16:21 2006
New Revision: 1376
Modified:
trunk/display/setup.py
Log:
Only link with libGL if evas isn't already linked. This works around a
peculiar issue where if we linked with libGL and so was evas, got an undefined
symbol XF86VidModeQueryVersion.
Tested this on FC4 and evas-0.9.9.022 (pre modularization), FC4 and evas-
0.9.9.026 (post modularization), and FC5 and evas-0.9.9.026.
Modified: trunk/display/setup.py
==============================================================================
--- trunk/display/setup.py (original)
+++ trunk/display/setup.py Sat Apr 1 02:16:21 2006
@@ -104,6 +104,12 @@
engine = line.strip()
config.define("ENABLE_ENGINE_%s" % engine.upper())
evas_engines.append(engine)
+ if engine == "gl_x11":
+ # Determine if libGL.so is linked to evas (this is not
+ # the case with recent evas); if not, we must link
+ # explicitly to libGL.
+ evas_gl_linked = os.system("ldd %s | grep -q libGL.so" %
out) == 0
+
os.unlink(out)
@@ -130,7 +136,8 @@
if 'gl_x11' in evas_engines:
features.append('evasGL')
x11.add_library('evas')
- x11.libraries += ['GL', 'Xxf86vm']
+ if not evas_gl_linked:
+ x11.libraries.append("GL")
if not features:
features = [ 'yes' ]
else:
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
