Author: sten Date: 2006-08-03 23:19:53 +0200 (Thu, 03 Aug 2006) New Revision: 1681 Added: crux-2.2/ports/opt/freeglut/freeglut-2.4.0.patch Modified: crux-2.2/ports/opt/freeglut/.md5sum crux-2.2/ports/opt/freeglut/Pkgfile Log: freeglut: bugfix release. Fixes compilation against nVidia headers, and a mis-generated GLUT cursors Modified: crux-2.2/ports/opt/freeglut/.md5sum =================================================================== --- crux-2.2/ports/opt/freeglut/.md5sum 2006-08-03 19:13:05 UTC (rev 1680) +++ crux-2.2/ports/opt/freeglut/.md5sum 2006-08-03 21:19:53 UTC (rev 1681) @@ -1 +1,2 @@ +d6ba7e22ebb0fd7904b8e18c97475ba6 freeglut-2.4.0.patch 6d16873bd876fbf4980a927cfbc496a1 freeglut-2.4.0.tar.gz Modified: crux-2.2/ports/opt/freeglut/Pkgfile =================================================================== --- crux-2.2/ports/opt/freeglut/Pkgfile 2006-08-03 19:13:05 UTC (rev 1680) +++ crux-2.2/ports/opt/freeglut/Pkgfile 2006-08-03 21:19:53 UTC (rev 1681) @@ -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 } Added: crux-2.2/ports/opt/freeglut/freeglut-2.4.0.patch =================================================================== --- crux-2.2/ports/opt/freeglut/freeglut-2.4.0.patch (rev 0) +++ crux-2.2/ports/opt/freeglut/freeglut-2.4.0.patch 2006-08-03 21:19:53 UTC (rev 1681) @@ -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 ); + }