diff options
| author | Nick Steeves <nick.steeves@shaw.ca> | 2006-08-03 21:19:53 +0000 |
|---|---|---|
| committer | Nick Steeves <nick.steeves@shaw.ca> | 2006-08-03 21:19:53 +0000 |
| commit | 5ba6c49a90a4d0772fa5243be488bb3251586c84 (patch) | |
| tree | 3b9debf24ac6eef22b592aa464d8a051c6064da5 /freeglut | |
| parent | dd904283b3987b7589b95da4c692c1074dbe188b (diff) | |
| download | opt-5ba6c49a90a4d0772fa5243be488bb3251586c84.tar.gz opt-5ba6c49a90a4d0772fa5243be488bb3251586c84.tar.xz | |
freeglut: bugfix release. Fixes compilation against nVidia headers, and a mis-generated GLUT cursors
Diffstat (limited to 'freeglut')
| -rw-r--r-- | freeglut/.md5sum | 1 | ||||
| -rw-r--r-- | freeglut/Pkgfile | 9 | ||||
| -rw-r--r-- | freeglut/freeglut-2.4.0.patch | 23 |
3 files changed, 30 insertions, 3 deletions
diff --git a/freeglut/.md5sum b/freeglut/.md5sum index e3fb31595..36ec4f4a9 100644 --- a/freeglut/.md5sum +++ b/freeglut/.md5sum @@ -1 +1,2 @@ +d6ba7e22ebb0fd7904b8e18c97475ba6 freeglut-2.4.0.patch 6d16873bd876fbf4980a927cfbc496a1 freeglut-2.4.0.tar.gz diff --git a/freeglut/Pkgfile b/freeglut/Pkgfile index 574215d17..cb4731a1d 100644 --- a/freeglut/Pkgfile +++ b/freeglut/Pkgfile @@ -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 } diff --git a/freeglut/freeglut-2.4.0.patch b/freeglut/freeglut-2.4.0.patch new file mode 100644 index 000000000..b56a37cb8 --- /dev/null +++ b/freeglut/freeglut-2.4.0.patch @@ -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 ); + } |