From d6719c95b8e506f9437318a9244e1e0d2fa552a6 Mon Sep 17 00:00:00 2001
From: Matteo Bernardini
Date: Tue, 20 Nov 2018 14:04:21 +0100
Subject: 20181120.1 global branch merge.

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
---
 audio/pithos/doinst.sh         |  6 ++++++
 audio/pithos/pithos.SlackBuild | 32 +++++++++++++++++++++-----------
 audio/pithos/pithos.info       | 10 +++++-----
 audio/pithos/slack-desc        |  2 +-
 4 files changed, 33 insertions(+), 17 deletions(-)

(limited to 'audio/pithos')

diff --git a/audio/pithos/doinst.sh b/audio/pithos/doinst.sh
index 4a25de5e6f..e924bab47c 100644
--- a/audio/pithos/doinst.sh
+++ b/audio/pithos/doinst.sh
@@ -8,3 +8,9 @@ if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
   fi
 fi
 
+if [ -e usr/share/glib-2.0/schemas ]; then
+  if [ -x /usr/bin/glib-compile-schemas ]; then
+    /usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas >/dev/null 2>&1
+  fi
+fi
+
diff --git a/audio/pithos/pithos.SlackBuild b/audio/pithos/pithos.SlackBuild
index 32579cffe5..0d7c1f9b1e 100644
--- a/audio/pithos/pithos.SlackBuild
+++ b/audio/pithos/pithos.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for pithos
 
-# Copyright 2013  Robby Workman, Northport, Alabama, USA
+# Copyright 2013,2017  Robby Workman, Tuscaloosa, Alabama, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,13 +23,13 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=pithos
-VERSION=${VERSION:-git_ed501485}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.4.0}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -40,8 +40,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"
@@ -61,15 +61,25 @@ mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
+chown -R root:root $PRGNAM-$VERSION
+find -L $PRGNAM-$VERSION \
  \( -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 {} \;
 
-python setup.py install --root=$PKG
+mkdir -p $PRGNAM-$VERSION/build
+meson \
+  --prefix=/usr \
+  --libdir=/usr/lib64 \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --infodir=/usr/info \
+  $PRGNAM-$VERSION \
+  $PRGNAM-$VERSION/build
+
+DESTDIR=$PKG ninja -C $PRGNAM-$VERSION/build install 
 
 cat $CWD/contrib/pithosctl > $PKG/usr/bin/pithosctl
 chmod 0755 $PKG/usr/bin/pithosctl
@@ -78,7 +88,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a CHANGELOG README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $PRGNAM-$VERSION/README.md $PRGNAM-$VERSION/license $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/audio/pithos/pithos.info b/audio/pithos/pithos.info
index c276852bd2..198bec9218 100644
--- a/audio/pithos/pithos.info
+++ b/audio/pithos/pithos.info
@@ -1,10 +1,10 @@
 PRGNAM="pithos"
-VERSION="git_ed501485"
-HOMEPAGE="http://kevinmehall.net/p/pithos/"
-DOWNLOAD="http://harrier.slackbuilds.org/misc/pithos-git_ed501485.tar.xz"
-MD5SUM="fb7f45ff93b5aab7b60e5b943d7bb024"
+VERSION="1.4.0"
+HOMEPAGE="https://github.com/pithos/pithos"
+DOWNLOAD="https://github.com/pithos/pithos/releases/download/1.4.0/pithos-1.4.0.tar.xz"
+MD5SUM="2324a9ed104682fb2417f662a82cc8bb"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="gst0-python gst0-ffmpeg"
+REQUIRES="meson gst-python gst-libav"
 MAINTAINER="Robby Workman"
 EMAIL="rworkman@slackbuilds.org"
diff --git a/audio/pithos/slack-desc b/audio/pithos/slack-desc
index 3ac97f0f7d..c55001e893 100644
--- a/audio/pithos/slack-desc
+++ b/audio/pithos/slack-desc
@@ -13,7 +13,7 @@ pithos: lightweight than the Pandora.com web client and integrates with
 pithos: desktop features such as media keys, notifications, and the sound
 pithos: menu.
 pithos:
-pithos: Homepage: http://kevinmehall.net/p/pithos/
+pithos: Homepage: https://github.com/pithos/pithos
 pithos:
 pithos:
 pithos:
-- 
cgit v1.2.3