diff options
author | tnut <thierryn1 at hispeed dot ch> | 2009-11-23 22:04:20 +0100 |
---|---|---|
committer | tnut <thierryn1 at hispeed dot ch> | 2009-11-23 22:04:20 +0100 |
commit | 69e089ddc125ffc018f8499d0bfbf03049f5bf3b (patch) | |
tree | 031834021ad771f69e1d2d553065dc4f538ffe84 /extra/freeglut | |
parent | 91311b0817e2e0b1a6dabb3743b19a391858cafc (diff) | |
parent | ec3668450f4999fdb4294435dc5df4f41455666e (diff) | |
download | nutyx-pakxe-69e089ddc125ffc018f8499d0bfbf03049f5bf3b.tar.gz nutyx-pakxe-69e089ddc125ffc018f8499d0bfbf03049f5bf3b.tar.bz2 nutyx-pakxe-69e089ddc125ffc018f8499d0bfbf03049f5bf3b.tar.xz nutyx-pakxe-69e089ddc125ffc018f8499d0bfbf03049f5bf3b.zip |
Merge remote branch 'lesibel/master'
Diffstat (limited to 'extra/freeglut')
-rw-r--r-- | extra/freeglut/.footprint | 17 | ||||
-rw-r--r-- | extra/freeglut/.md5sum | 2 | ||||
-rwxr-xr-x | extra/freeglut/Pkgfile | 21 | ||||
-rw-r--r-- | extra/freeglut/glut-cursor-inherit.patch | 23 |
4 files changed, 63 insertions, 0 deletions
diff --git a/extra/freeglut/.footprint b/extra/freeglut/.footprint new file mode 100644 index 000000000..229cd6876 --- /dev/null +++ b/extra/freeglut/.footprint @@ -0,0 +1,17 @@ +drwxr-xr-x root/root usr/ +drwxr-xr-x root/root usr/include/ +drwxr-xr-x root/root usr/include/GL/ +-rw-r--r-- root/root usr/include/GL/freeglut.h +-rw-r--r-- root/root usr/include/GL/freeglut_ext.h +-rw-r--r-- root/root usr/include/GL/freeglut_std.h +-rw-r--r-- root/root usr/include/GL/glut.h +drwxr-xr-x root/root usr/lib/ +-rw-r--r-- root/root usr/lib/libglut.a +-rwxr-xr-x root/root usr/lib/libglut.la +lrwxrwxrwx root/root usr/lib/libglut.so -> libglut.so.3.8.0 +lrwxrwxrwx root/root usr/lib/libglut.so.3 -> libglut.so.3.8.0 +-rwxr-xr-x root/root usr/lib/libglut.so.3.8.0 +drwxr-xr-x root/root usr/share/ +drwxr-xr-x root/root usr/share/licenses/ +drwxr-xr-x root/root usr/share/licenses/freeglut/ +-rw-r--r-- root/root usr/share/licenses/freeglut/COPYING diff --git a/extra/freeglut/.md5sum b/extra/freeglut/.md5sum new file mode 100644 index 000000000..ee112ddf5 --- /dev/null +++ b/extra/freeglut/.md5sum @@ -0,0 +1,2 @@ +6d16873bd876fbf4980a927cfbc496a1 freeglut-2.4.0.tar.gz +d6ba7e22ebb0fd7904b8e18c97475ba6 glut-cursor-inherit.patch diff --git a/extra/freeglut/Pkgfile b/extra/freeglut/Pkgfile new file mode 100755 index 000000000..233dc54e7 --- /dev/null +++ b/extra/freeglut/Pkgfile @@ -0,0 +1,21 @@ +# Description: Fournit des fonctionalités a de petit programmes en OpenGL +# URL: http://freeglut.sourceforge.net/ +# Maintainer: NuTyX packager team +# Packager: lesibel at free dot fr +# Depends on: ibxxf86vm, mesa + +name=freeglut +version=2.4.0 +release=1 +source=(http://downloads.sourceforge.net/freeglut//$name-$version.tar.gz \ + glut-cursor-inherit.patch) +build() { + cd $name-$version + patch -Np1 -i ../glut-cursor-inherit.patch + sed -i 's/-Werror//' configure + ./configure --prefix=/usr + make all + make DESTDIR=$PKG install + install -m755 -d $PKG/usr/share/licenses/$name + install -m644 COPYING $PKG/usr/share/licenses/$name/ +} diff --git a/extra/freeglut/glut-cursor-inherit.patch b/extra/freeglut/glut-cursor-inherit.patch new file mode 100644 index 000000000..b56a37cb8 --- /dev/null +++ b/extra/freeglut/glut-cursor-inherit.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 ); + } |