multimedia/bino: Updated for version 1.6.8, fix 15.0 build.

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

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

4 files changed, 38 insertions, 30 deletions

diff --git a/multimedia/bino/README b/multimedia/bino/README
index 89a0a9c9e9..c272804882 100644
--- a/multimedia/bino/README
+++ b/multimedia/bino/README
@@ -2,15 +2,12 @@ bino (3D video player)
 
 Bino is a 3D video player with multi-display support.
 
-3D videos are more accurately called stereoscopic videos. Such videos 
-have separate views for the left and right eye and thus allow depth 
+3D videos are more accurately called stereoscopic videos. Such videos
+have separate views for the left and right eyes and thus allow depth
 perception through stereopsis.
-The left and right view of a stereoscopic video can be stored using 
-different layouts. Bino supports all commonly used layouts.
 
-NOTE:
-This SlackBuild build with Qt4 even though the default from upstream
-is Qt5. It's still broken at this moment.
+The left and right view of a stereoscopic video can be stored using
+different layouts. Bino supports all commonly used layouts.
 
-Optional dependency: lirc for infra-red support.
-You may need to edit the SlackBuild to enable lirc.
+Optional dependency: lirc for infra-red support. Autodetected, but
+may be disabled with LIRC=no in the environment.
diff --git a/multimedia/bino/bino.SlackBuild b/multimedia/bino/bino.SlackBuild
index a8a4e7fb0f..63b9ce2019 100644
--- a/multimedia/bino/bino.SlackBuild
+++ b/multimedia/bino/bino.SlackBuild
@@ -22,10 +22,17 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220215 bkw: Modified by SlackBuilds.org:
+# - updated for v1.6.8 (old version wouldn't build on Slack 15.0).
+# - build with qt5, not qt4.
+# - autodetect and build with lirc if present.
+# - drop freealut dep from .info (because upstream dropped it).
+# - include the texinfo documentation in the package (/usr/info).
+
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=bino
-VERSION=${VERSION:-1.6.5}
+VERSION=${VERSION:-1.6.8}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -38,9 +45,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
@@ -75,10 +79,20 @@ 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 {} \+
 
+# 20220215 bkw: configure script doesn't pick up lirc's libraries,
+# help it out a little.
+if [ "${LIRC:-yes}" = "yes" ] && pkg-config --exists lirc; then
+  LIRCLIBS="-llirc -llirc_client"
+  LIRCOPT="--with-lirc"
+else
+  LIRCOPT="--without-lirc"
+fi
+
+lirc_LIBS="$LIRCLIBS" \
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -89,20 +103,17 @@ CXXFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --without-equalizer \
-  --without-lirc \
-  --with-qt-version=4 \
+  $LIRCOPT \
+  --with-qt-version=5 \
   --build=$ARCH-slackware-linux
 
 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
+make install-strip DESTDIR=$PKG
 
-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
+mv $PKG/usr/share/info $PKG/usr/info
+rm -f $PKG/usr/info/dir
 
-rm -Rf $PKG/usr/info/dir $PKG/usr/share/info
+gzip -9 $PKG/usr/man/man*/* $PKG/usr/info/*
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a AUTHORS COPYING README README.Linux $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/multimedia/bino/bino.info b/multimedia/bino/bino.info
index 70fe81c67c..f3e5842ea3 100644
--- a/multimedia/bino/bino.info
+++ b/multimedia/bino/bino.info
@@ -1,10 +1,10 @@
 PRGNAM="bino"
-VERSION="1.6.5"
+VERSION="1.6.8"
 HOMEPAGE="http://bino3d.org"
-DOWNLOAD="http://download.savannah.nongnu.org/releases/bino/bino-1.6.5.tar.xz"
-MD5SUM="36da300a320481ae9637c66f1f4617d9"
+DOWNLOAD="https://bino3d.org/releases/bino-1.6.8.tar.xz"
+MD5SUM="8a8e250e62e5e3c136eafc1ffc63e71d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="freealut libass"
+REQUIRES="libass"
 MAINTAINER="William PC"
 EMAIL="w_calandrini[at]hotmail[dot]com"
diff --git a/multimedia/bino/slack-desc b/multimedia/bino/slack-desc
index 5fbdd2c990..422ba902d8 100644
--- a/multimedia/bino/slack-desc
+++ b/multimedia/bino/slack-desc
@@ -11,9 +11,9 @@ bino:
 bino: Bino is a 3D video player with multi-display support.
 bino:
 bino: 3D videos are more accurately called stereoscopic videos. Such videos
-bino: have separate views for the left and right eye and thus allow depth
+bino: have separate views for the left and right eyes and thus allow depth
 bino: perception through stereopsis.
+bino:
 bino: The left and right view of a stereoscopic video can be stored using
 bino: different layouts. Bino supports all commonly used layouts.
 bino:
-bino: