summaryrefslogtreecommitdiff
path: root/development/ola
diff options
context:
space:
mode:
authorGeorg Nagel <g.schlmm [at] gmail [dot] com>2011-12-22 23:25:31 -0600
committerRobby Workman <rworkman@slackbuilds.org>2011-12-23 18:07:47 -0600
commite17fb36848fc1fe705b16a49be9db4aea73fc986 (patch)
tree16f9c64cd852b4a4965554432ef94b730f51c118 /development/ola
parente8774632e575794c177070e3c0c77d3609fbce99 (diff)
downloadslackbuilds-e17fb36848fc1fe705b16a49be9db4aea73fc986.tar.gz
development/ola: Updated for version 0.8.15.
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
Diffstat (limited to 'development/ola')
-rw-r--r--development/ola/README11
-rw-r--r--development/ola/ola.SlackBuild21
-rw-r--r--development/ola/ola.info8
3 files changed, 17 insertions, 23 deletions
diff --git a/development/ola/README b/development/ola/README
index 824b8bd947..8490327f8a 100644
--- a/development/ola/README
+++ b/development/ola/README
@@ -4,10 +4,9 @@ and Python libraries which abstract away the underlying DMX over IP
protocol or DMX interface. See http://opendmx.net/index.php/OLA for
more information.
-To disable the python libs
-run the script as follows: WITH_PYTHON=no ./ola.SlackBuild
+This requires protobuf and cppunit.
-To disable the builtin http server (requires libmicrohttp)
-run the script as follows: WITH_HTTP=no ./ola.SlackBuild
-
-ola requires protobuf and cppunit.
+The build script can optionally disable python bindings and/or enable the
+embedded http server. WITH_PYTHON=no will disable the python bindings,
+and WITH_HTTP=yes will enable the embedded http server (in which case
+libmicrohttp also be required).
diff --git a/development/ola/ola.SlackBuild b/development/ola/ola.SlackBuild
index 05e042cb67..f7628becc9 100644
--- a/development/ola/ola.SlackBuild
+++ b/development/ola/ola.SlackBuild
@@ -5,11 +5,11 @@
# Written by Georg Nagel (g.schlmm [at] gmail [dot] com)
PRGNAM=ola
-VERSION=${VERSION:-0.8.14}
+VERSION=${VERSION:-0.8.15}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
-WITH_HTTP=${WITH_HTTP:-yes}
+WITH_HTTP=${WITH_HTTP:-no}
WITH_PYTHON=${WITH_PYTHON:-yes}
if [ -z "$ARCH" ]; then
@@ -54,15 +54,11 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
-BUILD_HTTP="--enable-http"
-if [ "$WITH_HTTP" = "no" ]; then
- BUILD_HTTP="--disable-http"
-fi
+BUILD_HTTP="--disable-http"
+[ "$WITH_HTTP" != "no" ] && BUILD_HTTP="--enable-http"
-BUILD_PYTHON=""
-if [ "$WITH_PYTHON" = "yes" ]; then
- BUILD_PYTHON="--enable-python-libs"
-fi
+BUILD_PYTHON="--enable-python-libs"
+[ "$WITH_PYTHON" != "yes" ] && BUILD_PYTHON=""
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
@@ -73,9 +69,8 @@ CXXFLAGS="$SLKCFLAGS" \
--localstatedir=/var \
--mandir=/usr/man \
--docdir=/usr/doc/$PRGNAM-$VERSION \
- $BUILD_HTTP \
- $BUILD_PYTHON \
- --build=$ARCH-slackware-linux
+ --build=$ARCH-slackware-linux \
+ $BUILD_HTTP $BUILD_PYTHON
make
make install DESTDIR=$PKG
diff --git a/development/ola/ola.info b/development/ola/ola.info
index 2b4dc470ad..32d7a6b5ab 100644
--- a/development/ola/ola.info
+++ b/development/ola/ola.info
@@ -1,10 +1,10 @@
PRGNAM="ola"
-VERSION="0.8.14"
+VERSION="0.8.15"
HOMEPAGE="http://opendmx.net/index.php/OLA"
-DOWNLOAD="http://linux-lighting.googlecode.com/files/ola-0.8.14.tar.gz"
-MD5SUM="6bd8f105a5c6105946a86aeec0582f7e"
+DOWNLOAD="http://linux-lighting.googlecode.com/files/ola-0.8.15.tar.gz"
+MD5SUM="50bc3c853b54ed685314b3236efb458f"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
MAINTAINER="Georg Nagel"
EMAIL="g.schlmm [at] gmail [dot] com"
-APPROVED="Erik Hanson"
+APPROVED="rworkman"