FTGL package workarounds (#8812)
* FTGL package workarounds * Remove blank line * Only require doxygen at build time
This commit is contained in:
parent
61aa1831e3
commit
c03dcdedb1
2 changed files with 21 additions and 0 deletions
|
@ -37,6 +37,9 @@ class Ftgl(AutotoolsPackage):
|
||||||
|
|
||||||
version('2.1.2', 'f81c0a7128192ba11e036186f9a968f2')
|
version('2.1.2', 'f81c0a7128192ba11e036186f9a968f2')
|
||||||
|
|
||||||
|
# There is an unnecessary qualifier around, which makes modern GCC sad
|
||||||
|
patch('remove-extra-qualifier.diff')
|
||||||
|
|
||||||
# Ftgl does not come with a configure script
|
# Ftgl does not come with a configure script
|
||||||
depends_on('autoconf', type='build')
|
depends_on('autoconf', type='build')
|
||||||
depends_on('automake', type='build')
|
depends_on('automake', type='build')
|
||||||
|
@ -48,6 +51,13 @@ class Ftgl(AutotoolsPackage):
|
||||||
depends_on('glu')
|
depends_on('glu')
|
||||||
depends_on('freetype@2.0.9:')
|
depends_on('freetype@2.0.9:')
|
||||||
|
|
||||||
|
# Currently, "make install" will fail if the docs weren't built
|
||||||
|
#
|
||||||
|
# FIXME: Can someone with autotools experience fix the build system
|
||||||
|
# so that it doesn't fail when that happens?
|
||||||
|
#
|
||||||
|
depends_on('doxygen', type='build')
|
||||||
|
|
||||||
@property
|
@property
|
||||||
@when('@2.1.2')
|
@when('@2.1.2')
|
||||||
def configure_directory(self):
|
def configure_directory(self):
|
||||||
|
|
|
@ -0,0 +1,11 @@
|
||||||
|
--- FTGL/include/FTTextureGlyph.h 2018-07-26 08:30:55.144488976 +0000
|
||||||
|
+++ FTGL/include/FTTextureGlyph.h 2018-07-26 08:29:42.072489186 +0000
|
||||||
|
@@ -52,7 +52,7 @@
|
||||||
|
* Reset the currently active texture to zero to get into a known state before
|
||||||
|
* drawing a string. This is to get round possible threading issues.
|
||||||
|
*/
|
||||||
|
- static void FTTextureGlyph::ResetActiveTexture(){ activeTextureID = 0;}
|
||||||
|
+ static void ResetActiveTexture(){ activeTextureID = 0;}
|
||||||
|
|
||||||
|
private:
|
||||||
|
/**
|
Loading…
Reference in a new issue