development/ola: Updated for version 0.10.8.

Signed-off-by: B. Watson <yalhcru@gmail.com>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

2 files changed, 35 insertions, 23 deletions

diff --git a/development/ola/ola.SlackBuild b/development/ola/ola.SlackBuild
index 60dd4c4ab2..d5a800863d 100644
--- a/development/ola/ola.SlackBuild
+++ b/development/ola/ola.SlackBuild
@@ -4,11 +4,18 @@
 
 # Written by Georg Nagel (g.schlmm [at] gmail [dot] com)
 
+# 20220217 bkw: Modified by SlackBuilds.org:
+# - updated for v0.10.8. needed for protobuf3 (because the old
+#   protobuf is going away). also it's better to ship a release
+#   than a git commit from ~4 years ago.
+# - don't ship static libraries.
+# - get rid of .la files (they are verboten in 15.0).
+# - remove useless INSTALL from doc dir.
+
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=ola
-VERSION=${VERSION:-git_98ee4066}
-GITVER="98ee4066b6445f943a789611610515b45bbeac25"
+VERSION=${VERSION:-0.10.8}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -24,9 +31,6 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
 if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
   echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
   exit 0
@@ -55,15 +59,15 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$GITVER
-unzip $CWD/$PRGNAM-$GITVER.zip
-cd $PRGNAM-$GITVER
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
 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 \
+  -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"
@@ -72,9 +76,12 @@ 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" \
+
+SLKCFLAGS+=" -Wno-error"
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+CPPFLAGS="$CPPFLAGS" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -83,21 +90,26 @@ CPPFLAGS="$CPPFLAGS -std=gnu++98 -Wno-error=deprecated-declarations" \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --build=$ARCH-slackware-linux \
+  --disable-static \
+  --enable-shared \
   $BUILD_HTTP $BUILD_PYTHON
 
 make
-make install DESTDIR=$PKG
 
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+# 20220217 bkw: Makefile installs symlinks with absolute paths, e.g.
+# /usr/bin/ola_patch => /usr/bin/ola_dev_info, which are broken
+# because we use DESTDIR. Make them relative.
+sed '/LN_S/s,\$(bindir)/,,' Makefile
 
-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
+make install-strip DESTDIR=$PKG
+gzip -9 $PKG/usr/man/man*/*
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a README INSTALL COPYING AUTHORS ChangeLog $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README COPYING AUTHORS ChangeLog $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+rm -f $PKG/usr/lib*/*.la
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
diff --git a/development/ola/ola.info b/development/ola/ola.info
index 506eff78d5..9719078c3b 100644
--- a/development/ola/ola.info
+++ b/development/ola/ola.info
@@ -1,10 +1,10 @@
 PRGNAM="ola"
-VERSION="git_98ee4066"
+VERSION="0.10.8"
 HOMEPAGE="https://www.openlighting.org/"
-DOWNLOAD="https://github.com/OpenLightingProject/ola/archive/98ee4066b6445f943a789611610515b45bbeac25/ola-98ee4066b6445f943a789611610515b45bbeac25.zip"
-MD5SUM="d29bcd0107d358f4daa10202fa11de83"
+DOWNLOAD="https://github.com/OpenLightingProject/ola/releases/download/0.10.8/ola-0.10.8.tar.gz"
+MD5SUM="ba52dd61f7d47d33b79ccd0502a6522d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="cppunit protobuf"
+REQUIRES="cppunit protobuf3"
 MAINTAINER="Georg Nagel"
 EMAIL="g.schlmm [at] gmail [dot] com"