From 203ccc4ae68c0f2e7f908495e059db976b165420 Mon Sep 17 00:00:00 2001
From: Christoph Willing <chris.willing@iinet.net.au>
Date: Tue, 16 Aug 2016 19:59:33 +1000
Subject: multimedia/obs-studio: Updated for version 0.15.4 + new maintainer

Signed-off-by: Christoph Willing <chris.willing@iinet.net.au>
---
 multimedia/obs-studio/README                |  9 ++++++---
 multimedia/obs-studio/obs-studio.SlackBuild | 19 +++++++++----------
 multimedia/obs-studio/obs-studio.info       | 10 +++++-----
 3 files changed, 20 insertions(+), 18 deletions(-)

(limited to 'multimedia/obs-studio')

diff --git a/multimedia/obs-studio/README b/multimedia/obs-studio/README
index 3236fb0183..fa4cca19c6 100644
--- a/multimedia/obs-studio/README
+++ b/multimedia/obs-studio/README
@@ -1,4 +1,7 @@
-This project is a rewrite of what was formerly known as "Open Broadcaster Software", software originally
-designed for recording and streaming live video content, efficiently.
+This project is a rewrite of what was formerly known as
+"Open Broadcaster Software", software originally designed
+for recording and streaming live video content, efficiently.
 
-OBS has plug-ins for JACK and PulseAudio, so these can be viewed as optional dependencies.
+For full functionality, plug-ins using jack-audio-connection-kit, libfdk-aac and
+vlc will be constructed if those packages (all available at SBo) are detected
+at build time.
diff --git a/multimedia/obs-studio/obs-studio.SlackBuild b/multimedia/obs-studio/obs-studio.SlackBuild
index 05fa396d63..5ca9c0aaf3 100644
--- a/multimedia/obs-studio/obs-studio.SlackBuild
+++ b/multimedia/obs-studio/obs-studio.SlackBuild
@@ -3,11 +3,9 @@
 # Slackware build script for Open Broadcaster Software
 #
 # Copyright 2015 Gethyn ThomasQuail <gethyn@bloodbathsoftworks.com>
+# Copyright 2016 Christoph Willing  Brisbane, Australia
 # All rights reserved.
 #
-# Based on:
-# SBo's cmake-template
-#
 # Redistribution and use of this script, with or without modification, is
 # permitted provided that the following conditions are met:
 #
@@ -26,13 +24,13 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=obs-studio
-VERSION=${VERSION:-0.14.1}
+VERSION=${VERSION:-0.15.4}
 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
@@ -43,8 +41,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"
@@ -63,7 +61,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/$VERSION.tar.gz
+tar xf $CWD/$PRGNAM-$VERSION.tar.gz 2>/dev/null || tar xf $CWD/$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -79,14 +77,15 @@ cd build
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DOBS_MULTIARCH_SUFFIX="$LIBDIRSUFFIX" \
-    -DUNIX_STRUCTURE=1 \
+    -DUNIX_STRUCTURE=ON \
+    -DUSE_SSL=ON \
     -DCMAKE_BUILD_TYPE=Release ..
   make
   make install DESTDIR=$PKG
 cd ..
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING INSTALL README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CONTRIBUTING COPYING INSTALL README $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/multimedia/obs-studio/obs-studio.info b/multimedia/obs-studio/obs-studio.info
index 0fc14b630e..e2fe68939f 100644
--- a/multimedia/obs-studio/obs-studio.info
+++ b/multimedia/obs-studio/obs-studio.info
@@ -1,10 +1,10 @@
 PRGNAM="obs-studio"
-VERSION="0.14.1"
+VERSION="0.15.4"
 HOMEPAGE="https://obsproject.com/"
-DOWNLOAD="https://github.com/jp9000/obs-studio/archive/0.14.1.tar.gz"
-MD5SUM="f78798e504c7f486d54d4ee01a31b3bb"
+DOWNLOAD="https://github.com/jp9000/obs-studio/archive/0.15.4.tar.gz"
+MD5SUM="380f195e3073eed4a9909a7f8b7babcf"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="faac ffmpeg jansson qt5 rtmpdump x264"
-MAINTAINER="Gethyn ThomasQuail"
-EMAIL="gethyn@bloodbathsoftworks.com"
+MAINTAINER="Christoph Willing"
+EMAIL="chris.willing@linux.com"
-- 
cgit v1.2.3