network/mkvserver_mk2: Updated for version 20201203_c62abc3.

Signed-off-by: Dave Woodfall <dave@slackbuilds.org>

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

4 files changed, 28 insertions, 40 deletions

diff --git a/network/mkvserver_mk2/doinst.sh b/network/mkvserver_mk2/doinst.sh
deleted file mode 100644
index aea0f894eb32b..0000000000000
--- a/network/mkvserver_mk2/doinst.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-if [ -x /usr/bin/update-desktop-database ]; then
-  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
-fi
-
-if [ -x /usr/bin/update-mime-database ]; then
-  /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
-fi
-
-if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
-  if [ -x /usr/bin/gtk-update-icon-cache ]; then
-    /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
-  fi
-fi
diff --git a/network/mkvserver_mk2/mkvserver_mk2.SlackBuild b/network/mkvserver_mk2/mkvserver_mk2.SlackBuild
index d039faca4ad3e..95cdb40b575f9 100644
--- a/network/mkvserver_mk2/mkvserver_mk2.SlackBuild
+++ b/network/mkvserver_mk2/mkvserver_mk2.SlackBuild
@@ -22,9 +22,11 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# Modified by slackbuilds.org
+
 PRGNAM=mkvserver_mk2
-SRCNAM=a6f18126bd5a35b77f47e2fc32ffc221d0937aeb
-VERSION=${VERSION:-1.0}
+VERSION=${VERSION:-20201203_c62abc3}
+COMMIT=${COMMIT:-c62abc30f4cca6147ddc732570b30fcb4bee30ec}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -42,16 +44,16 @@ PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686 -std=c++11"
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686 -std=c++11"
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC -std=c++11"
+  SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
 else
-  SLKCFLAGS="-O2 -std=c++11"
+  SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
 fi
 
@@ -60,10 +62,10 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$SRCNAM.tar.gz
-mv $PRGNAM-$SRCNAM $PRGNAM-$VERSION
-cd $PRGNAM-$VERSION
+rm -rf $PRGNAM-$COMMIT
+tar xvf $CWD/$PRGNAM-$COMMIT.tar.gz
+#mv $PRGNAM-$COMMIT $PRGNAM-$VERSION
+cd $PRGNAM-$COMMIT
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -71,20 +73,19 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-  make VERBOSE=1
-  mkdir -p $PKG/usr/bin/
-  install -m755 server $PKG/usr/bin/mkvserver_mk2
+# Use slackware CFLAGS
+sed -i "s,\$(LAV_CFLAGS),$SLKCFLAGS &,g" Makefile
 
-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
+export PKG_CONFIG_PATH="/usr/lib$LIBDIRSUFFIX/ffmpeg4/pkgconfig:$PKG_CONFIG_PATH"
+make VERBOSE=1
+install --strip -D -m0755 server $PKG/usr/bin/mkvserver
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a Readme.md $PKG/usr/doc/$PRGNAM-$VERSION
+cp Readme.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/mkvserver_mk2/mkvserver_mk2.info b/network/mkvserver_mk2/mkvserver_mk2.info
index 7b90539939e14..17d266d7d0357 100644
--- a/network/mkvserver_mk2/mkvserver_mk2.info
+++ b/network/mkvserver_mk2/mkvserver_mk2.info
@@ -1,10 +1,10 @@
 PRGNAM="mkvserver_mk2"
-VERSION="1.0"
+VERSION="20201203_c62abc3"
 HOMEPAGE="https://github.com/klaxa/mkvserver_mk2"
-DOWNLOAD="https://github.com/klaxa/mkvserver_mk2/archive/a6f18126bd5a35b77f47e2fc32ffc221d0937aeb/mkvserver_mk2-a6f18126bd5a35b77f47e2fc32ffc221d0937aeb.tar.gz"
-MD5SUM="87e513b3b0e85a18471bdffaf972661b"
+DOWNLOAD="https://github.com/klaxa/mkvserver_mk2/archive/c62abc30f4cca6147ddc732570b30fcb4bee30ec/mkvserver_mk2-c62abc30f4cca6147ddc732570b30fcb4bee30ec.tar.gz"
+MD5SUM="f49feb40138a9c47bb4ccea3a695499d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="ffmpeg4"
 MAINTAINER="Fernando Lopez Jr."
 EMAIL="fernando.lopezjr@gmail.com"
diff --git a/network/mkvserver_mk2/slack-desc b/network/mkvserver_mk2/slack-desc
index acd259773712e..471c6200fff9f 100644
--- a/network/mkvserver_mk2/slack-desc
+++ b/network/mkvserver_mk2/slack-desc
@@ -8,12 +8,12 @@
              |-----handy-ruler------------------------------------------------------|
 mkvserver_mk2: mkvserver_mk2 (Matroska Server Mk2)
 mkvserver_mk2:
-mkvserver_mk2: Matroska Server Mk2 project is the result of years of thinking, try-
-mkvserver_mk2: ing and finally succeeding.
+mkvserver_mk2: Stream (almost) anything remuxed as matroska live in real-time over
+mkvserver_mk2: http to multiple clients.
+mkvserver_mk2:
+mkvserver_mk2: https://github.com/klaxa/mkvserver_mk2
+mkvserver_mk2:
+mkvserver_mk2:
 mkvserver_mk2:
-mkvserver_mk2: This software makes it possible to stream (almost) anything remuxed
-mkvserver_mk2: as matroska live in real-time over http to multiple clients.
 mkvserver_mk2:
-mkvserver_mk2: This is probably also one of the first real world usages of FFmpeg's
-mkvserver_mk2: http server component (which I wrote as part of GSoC 2015).
 mkvserver_mk2: