← Back to branch summary

~ubuntu-branches/ubuntu/trusty/openscenegraph/trusty-updates

« back to all changes in this revision

Viewing changes to debian/patches/change-typedef.patch

  • Committer: Package Import Robot
  • Author(s): Saikrishna Arcot
  • Date: 2014-08-06 17:41:46 UTC
  • Revision ID: package-import@ubuntu.com-20140806174146-w82pp968w8ri91er
Tags: 3.2.0~rc1-4ubuntu0.1
https://launchpad.net/bugs/1284190
https://launchpad.net/bugs/1339264
* Add support for building on armhf by building with OpenGL ES 2.0
  (LP: #1284190).
* Backport part of a commit to not build osgframerenderer example.
* Add change-typedef.patch to fix conflicting typedefs for GLdouble
  with OpenGL ES 2.0
* Exclude freeglut3-dev from dependencies for armhf
* Add patch to fix FreeType library detection (LP: #1339264).

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/change-typedef.patch
 
1
Index: openscenegraph/OpenSceneGraph/include/osg/GL
 
2
===================================================================
 
3
--- openscenegraph.orig/OpenSceneGraph/include/osg/GL   2014-08-05 16:58:36.000000000 -0500
 
4
+++ openscenegraph/OpenSceneGraph/include/osg/GL        2014-08-06 06:45:29.857287930 -0500
 
5
@@ -168,7 +168,7 @@
 
6
 // add defines for OpenGL targets that don't define them, just to ease compatibility across targets
 
7
 #ifndef GL_DOUBLE
 
8
     #define GL_DOUBLE 0x140A
 
9
-    typedef double GLdouble;
 
10
+    #define GLdouble double
 
11
 #endif
 
12
 
 
13
 #ifndef GL_INT