freeglut: bugfix release. Fixes compilation against nVidia headers, and a mis-generated GLUT cursors
This commit is contained in:
parent
dd904283b3
commit
5ba6c49a90
@ -1 +1,2 @@
|
||||
d6ba7e22ebb0fd7904b8e18c97475ba6 freeglut-2.4.0.patch
|
||||
6d16873bd876fbf4980a927cfbc496a1 freeglut-2.4.0.tar.gz
|
||||
|
@ -6,12 +6,15 @@
|
||||
|
||||
name=freeglut
|
||||
version=2.4.0
|
||||
release=1
|
||||
source=(http://dl.sourceforge.net/sourceforge/$name/$name-$version.tar.gz)
|
||||
release=2
|
||||
source=(http://dl.sourceforge.net/sourceforge/$name/$name-$version.tar.gz \
|
||||
freeglut-2.4.0.patch)
|
||||
|
||||
build() {
|
||||
patch -p0 -i $SRC/freeglut-2.4.0.patch
|
||||
cd $name-$version
|
||||
./configure --prefix=/usr
|
||||
./configure --prefix=/usr \
|
||||
--disable-warnings
|
||||
make
|
||||
make DESTDIR=$PKG install
|
||||
}
|
||||
|
23
freeglut/freeglut-2.4.0.patch
Normal file
23
freeglut/freeglut-2.4.0.patch
Normal file
@ -0,0 +1,23 @@
|
||||
--- freeglut-2.4.0.orig/src/freeglut_cursor.c
|
||||
+++ freeglut-2.4.0/src/freeglut_cursor.c
|
||||
@@ -130,7 +130,9 @@
|
||||
XCreateFontCursor( fgDisplay.Display, entry->cursorShape );
|
||||
}
|
||||
cursor = entry->cachedCursor;
|
||||
- } else {
|
||||
+ if (cursor == None)
|
||||
+ fgError( "Failed to create cursor" );
|
||||
+ } else {
|
||||
switch( cursorIDToUse )
|
||||
{
|
||||
case GLUT_CURSOR_NONE:
|
||||
@@ -147,9 +149,6 @@
|
||||
}
|
||||
}
|
||||
|
||||
- if ( ( cursorIDToUse != GLUT_CURSOR_NONE ) && ( cursor == None ) ) {
|
||||
- fgError( "Failed to create cursor" );
|
||||
- }
|
||||
XDefineCursor( fgDisplay.Display,
|
||||
window->Window.Handle, cursor );
|
||||
}
|
Loading…
x
Reference in New Issue
Block a user