Merge remote branch 'lesibel/master'

7 files changed, 68 insertions, 4 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 );
+     }
diff --git a/extra/imagemagick/.footprint b/extra/imagemagick/.footprint
index f5b0291f0..54a63f7b0 100644
--- a/extra/imagemagick/.footprint
+++ b/extra/imagemagick/.footprint
@@ -87,6 +87,7 @@ drwxr-xr-x	root/root	usr/include/ImageMagick/magick/
 -rw-r--r--	root/root	usr/include/ImageMagick/magick/module.h
 -rw-r--r--	root/root	usr/include/ImageMagick/magick/monitor.h
 -rw-r--r--	root/root	usr/include/ImageMagick/magick/montage.h
+-rw-r--r--	root/root	usr/include/ImageMagick/magick/morphology.h
 -rw-r--r--	root/root	usr/include/ImageMagick/magick/option.h
 -rw-r--r--	root/root	usr/include/ImageMagick/magick/paint.h
 -rw-r--r--	root/root	usr/include/ImageMagick/magick/pixel.h
diff --git a/extra/imagemagick/.md5sum b/extra/imagemagick/.md5sum
index 0688fe98b..43cf27f63 100644
--- a/extra/imagemagick/.md5sum
+++ b/extra/imagemagick/.md5sum
@@ -1 +1 @@
-8f4c1ea8b5616a9e6196153a67fcde7d  ImageMagick-6.5.7-8.tar.bz2
+5f2d4d0eacbeea48af5c4cfb37c4afe2  ImageMagick-6.5.7-10.tar.bz2
diff --git a/extra/imagemagick/Pkgfile b/extra/imagemagick/Pkgfile
index c262f920f..b92c747f9 100755
--- a/extra/imagemagick/Pkgfile
+++ b/extra/imagemagick/Pkgfile
@@ -1,13 +1,13 @@
 # Description: Manipulateur d'image en ligne de commande
 # Maintainer: NuTyX core team
-# Packager: fred.galusik at gmail dot com
+# Packager: lesibel at free dot fr
 # URL: http://www.imagemagick.org/
 # Depends on: freetype, ghostscript, lcms, libgsf, giflib, libxml2, openexr
 
 name=imagemagick
-version=6.5.7.8
+version=6.5.7.10
 release=1
-_version=6.5.7-8
+_version=6.5.7-10
 source=(ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-${_version}.tar.bz2)
 
 build () {