diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2004-12-28 01:52:03 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2004-12-28 01:52:03 +0000 |
| commit | 79305262c1125bd48bc595f0d46e0464bc64558a (patch) | |
| tree | ab8011852f92eb98281365ec09d6b485c0726dd9 /dev-games/crystalspace/files | |
| parent | Apply patch to fix segfault from bug #75846. Keeping stable keywords. (Manife... (diff) | |
| download | gentoo-2-79305262c1125bd48bc595f0d46e0464bc64558a.tar.gz gentoo-2-79305262c1125bd48bc595f0d46e0464bc64558a.tar.bz2 gentoo-2-79305262c1125bd48bc595f0d46e0464bc64558a.zip | |
Add patch to make GL happy #75702 by Tom Wesley.
Diffstat (limited to 'dev-games/crystalspace/files')
| -rw-r--r-- | dev-games/crystalspace/files/0.98.4-gl.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/dev-games/crystalspace/files/0.98.4-gl.patch b/dev-games/crystalspace/files/0.98.4-gl.patch new file mode 100644 index 000000000000..20418f00b4ab --- /dev/null +++ b/dev-games/crystalspace/files/0.98.4-gl.patch @@ -0,0 +1,29 @@ +Some GL header files (like nvidia) define GLcharARB/GLhandleARB +differently ... this pisses off newer gcc's :) + +C++ ./out/linuxx86/optimize/plugins/video/renderer/opengl/ogl_g3d.o +In file included from ./plugins/video/canvas/openglcommon/glstates.h:29, + from plugins/video/renderer/opengl/ogl_g3dcom.h:49, + from plugins/video/renderer/opengl/ogl_g3d.h:29, + from plugins/video/renderer/opengl/ogl_g3d.cpp:33: +./plugins/video/canvas/openglcommon/glextmanager.h:110: error: conflicting declaration 'typedef unsigned int GLhandleARB' +/usr/X11R6/include/GL/glext.h:2268: error: 'GLhandleARB' has a previous declaration as `typedef long unsigned int GLhandleARB' +./plugins/video/canvas/openglcommon/glextmanager.h:110: error: declaration of `typedef unsigned int GLhandleARB' +/usr/X11R6/include/GL/glext.h:2268: error: conflicts with previous declaration `typedef long unsigned int GLhandleARB' +./plugins/video/canvas/openglcommon/glextmanager.h:110: error: declaration of `typedef unsigned int GLhandleARB' +/usr/X11R6/include/GL/glext.h:2268: error: conflicts with previous declaration `typedef long unsigned int GLhandleARB' + +Patch by Tom Wesley resolves this +http://bugs.gentoo.org/show_bug.cgi?id=75702 + +--- CS/plugins/video/canvas/openglcommon/glextmanager.h.orig 2004-12-27 19:38:02.640064016 -0500 ++++ CS/plugins/video/canvas/openglcommon/glextmanager.h 2004-12-27 19:38:08.371192752 -0500 +@@ -106,8 +106,6 @@ + /* + Appear in the ARB_shader_objects ext spec. + */ +-typedef char GLcharARB; +-typedef unsigned int GLhandleARB; + + #include "iutil/cmdline.h" + #include "iutil/objreg.h" |