summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--development/ola/ola.SlackBuild25
-rw-r--r--development/ola/ola.info8
2 files changed, 17 insertions, 16 deletions
diff --git a/development/ola/ola.SlackBuild b/development/ola/ola.SlackBuild
index 6535cd777d..63c1643be4 100644
--- a/development/ola/ola.SlackBuild
+++ b/development/ola/ola.SlackBuild
@@ -5,7 +5,8 @@
# Written by Georg Nagel (g.schlmm [at] gmail [dot] com)
PRGNAM=ola
-VERSION=${VERSION:-0.8.33}
+VERSION=${VERSION:-git_98ee4066}
+GITVER="98ee4066b6445f943a789611610515b45bbeac25"
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -14,7 +15,7 @@ WITH_PYTHON=${WITH_PYTHON:-yes}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -25,8 +26,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -39,20 +40,20 @@ else
LIBDIRSUFFIX=""
fi
-set -e
+set -e
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
+rm -rf $PRGNAM-$GITVER
+unzip $CWD/$PRGNAM-$GITVER.zip
+cd $PRGNAM-$GITVER
chown -R root:root .
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-o -perm 511 \) -exec chmod 755 {} \; -o \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
BUILD_HTTP="--disable-http"
[ "$WITH_HTTP" != "no" ] && BUILD_HTTP="--enable-http"
@@ -60,8 +61,10 @@ BUILD_HTTP="--disable-http"
BUILD_PYTHON="--enable-python-libs"
[ "$WITH_PYTHON" != "yes" ] && BUILD_PYTHON=""
+autoreconf -fiv
CFLAGS="-Wno-error=conversion $SLKCFLAGS" \
CXXFLAGS="-Wno-error=conversion $SLKCFLAGS" \
+CPPFLAGS="$CPPFLAGS -std=gnu++98 -Wno-error=deprecated-declarations" \
./configure \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -82,9 +85,7 @@ find $PKG/usr/man -type f -exec gzip -9 {} \;
for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
- README INSTALL COPYING AUTHORS ChangeLog \
- $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README INSTALL COPYING AUTHORS ChangeLog $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
diff --git a/development/ola/ola.info b/development/ola/ola.info
index 6fb9a28b6a..506eff78d5 100644
--- a/development/ola/ola.info
+++ b/development/ola/ola.info
@@ -1,8 +1,8 @@
PRGNAM="ola"
-VERSION="0.8.33"
-HOMEPAGE="http://opendmx.net/index.php/OLA"
-DOWNLOAD="http://open-lighting.googlecode.com/files/ola-0.8.33.tar.gz"
-MD5SUM="0e143cc6abd76ad4463689b7ffbe2a02"
+VERSION="git_98ee4066"
+HOMEPAGE="https://www.openlighting.org/"
+DOWNLOAD="https://github.com/OpenLightingProject/ola/archive/98ee4066b6445f943a789611610515b45bbeac25/ola-98ee4066b6445f943a789611610515b45bbeac25.zip"
+MD5SUM="d29bcd0107d358f4daa10202fa11de83"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="cppunit protobuf"