summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortnut <thierryn1 at hispeed dot ch>2010-10-14 09:09:57 +0200
committertnut <thierryn1 at hispeed dot ch>2010-10-14 09:09:57 +0200
commit6c482c4d25c06c3caa8b4d4f831bfceb75221e6c (patch)
tree422f7101d772c6691dc4f4f39f86fca0e7f3d6b7
parent5f6509fb03e9b7afd901bc7dd4d5ca30dcb35757 (diff)
downloadnutyx-extra-6c482c4d25c06c3caa8b4d4f831bfceb75221e6c.tar.gz
nutyx-extra-6c482c4d25c06c3caa8b4d4f831bfceb75221e6c.tar.bz2
nutyx-extra-6c482c4d25c06c3caa8b4d4f831bfceb75221e6c.tar.xz
nutyx-extra-6c482c4d25c06c3caa8b4d4f831bfceb75221e6c.zip
freeglut, port nettoyé
-rwxr-xr-xextra/freeglut/Pkgfile2
-rw-r--r--extra/freeglut/glut-cursor-inherit.patch23
2 files changed, 1 insertions, 24 deletions
diff --git a/extra/freeglut/Pkgfile b/extra/freeglut/Pkgfile
index 600492126..1b6492336 100755
--- a/extra/freeglut/Pkgfile
+++ b/extra/freeglut/Pkgfile
@@ -8,7 +8,7 @@ name=freeglut
version=2.4.0
release=1
source=(http://downloads.sourceforge.net/freeglut//$name-$version.tar.gz \
- glut-cursor-inherit.patch)
+ http://nutyx.meticul.eu/files/patchs/$name/glut-cursor-inherit.patch)
build() {
cd $name-$version
patch -Np1 -i ../glut-cursor-inherit.patch
diff --git a/extra/freeglut/glut-cursor-inherit.patch b/extra/freeglut/glut-cursor-inherit.patch
deleted file mode 100644
index b56a37cb8..000000000
--- a/extra/freeglut/glut-cursor-inherit.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- 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 );
- }