summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--development/glm/glm.SlackBuild49
-rw-r--r--libraries/glm/README (renamed from development/glm/README)0
-rw-r--r--libraries/glm/glm.SlackBuild75
-rw-r--r--libraries/glm/glm.info (renamed from development/glm/glm.info)6
-rw-r--r--libraries/glm/slack-desc (renamed from development/glm/slack-desc)0
5 files changed, 78 insertions, 52 deletions
diff --git a/development/glm/glm.SlackBuild b/development/glm/glm.SlackBuild
deleted file mode 100644
index 4163ff4254..0000000000
--- a/development/glm/glm.SlackBuild
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for glm
-# Written by Matteo Bernardini <ponce@slackbuilds.org>
-
-PRGNAM=glm
-VERSION=${VERSION:-0.9.3.4}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-ARCH=noarch
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-unzip $CWD/$PRGNAM-$VERSION.zip
-cd $PRGNAM-$VERSION
-chown -R root.root .
-find . \
- \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-mkdir -p build
-cd build
- cmake \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DGLM_TEST_ENABLE:STRING="ON" ..
- make
- make install DESTDIR=$PKG
-cd ..
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a readme.txt copying.txt $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/glm/README b/libraries/glm/README
index 31a795555f..31a795555f 100644
--- a/development/glm/README
+++ b/libraries/glm/README
diff --git a/libraries/glm/glm.SlackBuild b/libraries/glm/glm.SlackBuild
new file mode 100644
index 0000000000..84632049b2
--- /dev/null
+++ b/libraries/glm/glm.SlackBuild
@@ -0,0 +1,75 @@
+#!/bin/sh
+
+# Slackware build script for glm
+# Copyright Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=glm
+VERSION=${VERSION:-0.9.4.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+ case "$( uname -m )" in
+ i?86) ARCH=i486 ;;
+ arm*) ARCH=arm ;;
+ *) ARCH=$( uname -m ) ;;
+ esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+mkdir -p $PRGNAM-$VERSION
+cd $PRGNAM-$VERSION
+unzip $CWD/$PRGNAM-$VERSION.zip
+chown -R root.root .
+find . \
+ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+ -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \;
+
+mkdir -p build
+cd build
+ cmake \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DGLM_TEST_ENABLE:STRING="ON" ..
+ make
+ make install DESTDIR=$PKG
+cd ..
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a readme.txt copying.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/glm/glm.info b/libraries/glm/glm.info
index 99f4b3dd5e..2cb408f5cb 100644
--- a/development/glm/glm.info
+++ b/libraries/glm/glm.info
@@ -1,8 +1,8 @@
PRGNAM="glm"
-VERSION="0.9.3.4"
+VERSION="0.9.4.1"
HOMEPAGE="http://glm.g-truc.net/"
-DOWNLOAD="http://downloads.sourceforge.net/ogl-math/glm-0.9.3.4.zip"
-MD5SUM="a0cea0871bd39f2d628c12f1181faffb"
+DOWNLOAD="http://downloads.sourceforge.net/ogl-math/glm-0.9.4.1.zip"
+MD5SUM="51e638f826bb9ec2f1b75520d9df9ffc"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/development/glm/slack-desc b/libraries/glm/slack-desc
index cf6a8896b5..cf6a8896b5 100644
--- a/development/glm/slack-desc
+++ b/libraries/glm/slack-desc