diff options
| author | Larry Hajali <larryhaja[at]gmail[dot]com> | 2015-10-16 13:56:42 +0700 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2015-10-16 23:27:30 +0700 |
| commit | 6776d56b59b92271d396aee55a54f52c9ba3cf6c (patch) | |
| tree | b3531f8d7ba01d18bae1a41c58a21ea664cffffd /libraries/irrlicht | |
| parent | 83c83a425a46e96d6f2e5d12ae2cac95f7b69578 (diff) | |
libraries/irrlicht: Updated for version 1.8.3.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'libraries/irrlicht')
| -rw-r--r-- | libraries/irrlicht/irrlicht-1.8.1-mesa10.patch | 26 | ||||
| -rw-r--r-- | libraries/irrlicht/irrlicht.SlackBuild | 11 | ||||
| -rw-r--r-- | libraries/irrlicht/irrlicht.info | 6 |
3 files changed, 37 insertions, 6 deletions
diff --git a/libraries/irrlicht/irrlicht-1.8.1-mesa10.patch b/libraries/irrlicht/irrlicht-1.8.1-mesa10.patch new file mode 100644 index 0000000000000..ca8e4a7614adf --- /dev/null +++ b/libraries/irrlicht/irrlicht-1.8.1-mesa10.patch @@ -0,0 +1,26 @@ +diff -up irrlicht-1.8.1/source/Irrlicht/COpenGLExtensionHandler.h.mesa10 irrlicht-1.8.1/source/Irrlicht/COpenGLExtensionHandler.h +--- irrlicht-1.8.1/source/Irrlicht/COpenGLExtensionHandler.h.mesa10 2013-12-13 23:05:43.208343706 -0500 ++++ irrlicht-1.8.1/source/Irrlicht/COpenGLExtensionHandler.h 2013-12-13 23:05:43.213343691 -0500 +@@ -59,6 +59,9 @@ + #endif
+ #include <GL/gl.h>
+ #include <GL/glx.h>
++ #ifndef PFNGLBLENDEQUATIONPROC
++ typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);
++ #endif
+ #if defined(_IRR_OPENGL_USE_EXTPOINTER_)
+ #include <GL/glext.h>
+ typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE2DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data);
+diff -up irrlicht-1.8.1/source/Irrlicht/glxext.h.mesa10 irrlicht-1.8.1/source/Irrlicht/glxext.h +--- irrlicht-1.8.1/source/Irrlicht/glxext.h.mesa10 2013-12-30 12:18:38.368368241 -0500 ++++ irrlicht-1.8.1/source/Irrlicht/glxext.h 2013-12-30 12:18:54.305386790 -0500 +@@ -44,6 +44,9 @@ extern "C" { + #ifndef GLAPI
+ #define GLAPI extern
+ #endif
++#ifndef GLXContextID
++#define GLXContextID XID
++#endif
+
+ /*************************************************************/
+
diff --git a/libraries/irrlicht/irrlicht.SlackBuild b/libraries/irrlicht/irrlicht.SlackBuild index c40a3de712f4d..aa493f5875934 100644 --- a/libraries/irrlicht/irrlicht.SlackBuild +++ b/libraries/irrlicht/irrlicht.SlackBuild @@ -26,7 +26,7 @@ # Revision date 2013/03/28 PRGNAM=irrlicht -VERSION=${VERSION:-1.8.1} +VERSION=${VERSION:-1.8.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -72,6 +72,12 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +# Set maximum number of textures. +sed -i '/_IRR_MATERIAL_MAX_TEXTURES_/s|4|8|' include/IrrCompileConfig.h + +# Patch for Mesa 10. +patch -p1 < $CWD/irrlicht-1.8.1-mesa10.patch + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ NDEBUG=1 \ @@ -92,8 +98,7 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild # Fix end-of-line encoding. for i in $PKG/usr/include/$PRGNAM/* $PKG/usr/doc/$PRGNAM-$VERSION/*; do - cp $i ${i}.new - sed -i 's/\r//' ${i}.new + sed -e 's/\r//' $i > ${i}.new touch -r $i ${i}.new mv ${i}.new $i done diff --git a/libraries/irrlicht/irrlicht.info b/libraries/irrlicht/irrlicht.info index 9f5545326286a..3466bf3de7a19 100644 --- a/libraries/irrlicht/irrlicht.info +++ b/libraries/irrlicht/irrlicht.info @@ -1,8 +1,8 @@ PRGNAM="irrlicht" -VERSION="1.8.1" +VERSION="1.8.3" HOMEPAGE="http://irrlicht.sourceforge.net/" -DOWNLOAD="http://downloads.sourceforge.net/irrlicht/irrlicht-1.8.1.zip" -MD5SUM="f4f7fa33bd1060eb0dd51dcd66b0f6e3" +DOWNLOAD="http://downloads.sourceforge.net/irrlicht/irrlicht-1.8.3.zip" +MD5SUM="d13dbdad9609741de02023627ee51078" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" |