development/glm: Updated for version 0.9.8.5.
Add a patch for gcc-7.3.x Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
This commit is contained in:
parent
915d8b219f
commit
2a8743ff53
|
@ -0,0 +1,35 @@
|
|||
diff -ur glm-0.9.8.5.orig/glm/simd/platform.h glm-0.9.8.5/glm/simd/platform.h
|
||||
--- glm-0.9.8.5.orig/glm/simd/platform.h 2017-08-16 05:15:24.000000000 -0700
|
||||
+++ glm-0.9.8.5/glm/simd/platform.h 2018-01-26 15:38:57.584130263 -0800
|
||||
@@ -111,7 +111,8 @@
|
||||
#define GLM_COMPILER_GCC70 0x02000A00
|
||||
#define GLM_COMPILER_GCC71 0x02000B00
|
||||
#define GLM_COMPILER_GCC72 0x02000C00
|
||||
-#define GLM_COMPILER_GCC80 0x02000D00
|
||||
+#define GLM_COMPILER_GCC73 0x02000D00
|
||||
+#define GLM_COMPILER_GCC80 0x02000E00
|
||||
|
||||
// CUDA
|
||||
#define GLM_COMPILER_CUDA 0x10000000
|
||||
@@ -283,6 +284,8 @@
|
||||
# define GLM_COMPILER (GLM_COMPILER_GCC71)
|
||||
# elif (__GNUC__ == 7) && (__GNUC_MINOR__ == 2)
|
||||
# define GLM_COMPILER (GLM_COMPILER_GCC72)
|
||||
+# elif (__GNUC__ == 7) && (__GNUC_MINOR__ == 3)
|
||||
+# define GLM_COMPILER (GLM_COMPILER_GCC73)
|
||||
# elif (__GNUC__ >= 8)
|
||||
# define GLM_COMPILER (GLM_COMPILER_GCC80)
|
||||
# else
|
||||
diff -ur glm-0.9.8.5.orig/test/core/core_setup_message.cpp glm-0.9.8.5/test/core/core_setup_message.cpp
|
||||
--- glm-0.9.8.5.orig/test/core/core_setup_message.cpp 2017-08-16 05:15:24.000000000 -0700
|
||||
+++ glm-0.9.8.5/test/core/core_setup_message.cpp 2018-01-26 15:37:56.953298475 -0800
|
||||
@@ -86,6 +86,9 @@
|
||||
case GLM_COMPILER_GCC72:
|
||||
std::printf("GCC 7.2\n");
|
||||
break;
|
||||
+ case GLM_COMPILER_GCC73:
|
||||
+ std::printf("GCC 7.3\n");
|
||||
+ break;
|
||||
case GLM_COMPILER_GCC80:
|
||||
std::printf("GCC 8.0\n");
|
||||
break;
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
# Slackware build script for glm
|
||||
|
||||
# Copyright 2012-2017 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
|
||||
# Copyright 2012-2018 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
|
||||
# All rights reserved.
|
||||
#
|
||||
# Redistribution and use of this script, with or without modification, is
|
||||
|
@ -23,7 +23,7 @@
|
|||
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
PRGNAM=glm
|
||||
VERSION=${VERSION:-0.9.8.4}
|
||||
VERSION=${VERSION:-0.9.8.5}
|
||||
BUILD=${BUILD:-1}
|
||||
TAG=${TAG:-_SBo}
|
||||
|
||||
|
@ -46,7 +46,7 @@ rm -rf $PKG
|
|||
mkdir -p $TMP $PKG $OUTPUT
|
||||
cd $TMP
|
||||
rm -rf $PRGNAM-$VERSION
|
||||
tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/$VERSION.tar.gz
|
||||
tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
|
||||
cd $PRGNAM-$VERSION
|
||||
chown -R root.root .
|
||||
find -L . \
|
||||
|
@ -55,6 +55,9 @@ 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 {} \;
|
||||
|
||||
# thanks gentoo
|
||||
patch -p1 < $CWD/glm-gcc73.patch
|
||||
|
||||
mkdir -p build
|
||||
cd build
|
||||
cmake \
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
PRGNAM="glm"
|
||||
VERSION="0.9.8.4"
|
||||
VERSION="0.9.8.5"
|
||||
HOMEPAGE="http://glm.g-truc.net/"
|
||||
DOWNLOAD="https://github.com/g-truc/glm/archive/0.9.8.4.tar.gz"
|
||||
MD5SUM="26ca8792038da90f67301fa0a3d5b693"
|
||||
DOWNLOAD="https://github.com/g-truc/glm/archive/0.9.8.5/glm-0.9.8.5.tar.gz"
|
||||
MD5SUM="70eac538d5681132dd363f814c81ce22"
|
||||
DOWNLOAD_x86_64=""
|
||||
MD5SUM_x86_64=""
|
||||
REQUIRES=""
|
||||
|
|
Loading…
Reference in New Issue