From 2e1dcfd9fccee0014ad51ab6433197a578bdd946 Mon Sep 17 00:00:00 2001
From: Christoph Willing <chris.willing@iinet.net.au>
Date: Mon, 8 Aug 2016 13:22:11 +1000
Subject: multimedia/vlc: Updated for version 2.2.4

Signed-off-by: Christoph Willing <chris.willing@iinet.net.au>
---
 multimedia/vlc/vlc.SlackBuild | 12 ++++++------
 multimedia/vlc/vlc.info       |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'multimedia')

diff --git a/multimedia/vlc/vlc.SlackBuild b/multimedia/vlc/vlc.SlackBuild
index 9af14c1f51541..85e2969e08ea8 100644
--- a/multimedia/vlc/vlc.SlackBuild
+++ b/multimedia/vlc/vlc.SlackBuild
@@ -6,7 +6,7 @@
 # modified to build VLC only, shared libraries needed.
 
 # Copyright (c) 2007,2008,2009,2010,2011  Eric Hameleers, Eindhoven, Netherlands
-# Copyright (c) 2014  Christoph Willing, Brisbane, Australia
+# Copyright (c) 2014-2016  Christoph Willing, Brisbane, Australia
 #
 #   Permission to use, copy, modify, and distribute this software for
 #   any purpose with or without fee is hereby granted, provided that
@@ -28,13 +28,13 @@
 # -----------------------------------------------------------------------------
 
 PRGNAM=vlc
-VERSION=${VERSION:-2.2.3}
+VERSION=${VERSION:-2.2.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
@@ -45,7 +45,7 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
+if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
@@ -63,7 +63,7 @@ DOCS="ABOUT-NLS AUTHORS COPYING INSTALL NEWS README THANKS"
 # However with LXC, the same kernel is used in each container,
 # so we insert an arbitrary value
 #
-grep "CONTAINER=yes" /etc/rc.d/rc.S >/dev/null 2>/dev/null
+grep "container=" /etc/rc.d/rc.S >/dev/null 2>/dev/null
 if [ $? -eq 0 ]; then
   mkdir -p /var/lib/dbus/
   echo "4349d719fcf875a557a8c00400000014" > /var/lib/dbus/machine-id
@@ -81,7 +81,7 @@ cd $PRGNAM-$VERSION
 patch -p0 < $CWD/patch-projectM-fontpath.diff
 patch -p0 < $CWD/patch_vlc_cache_gen.diff
 
-autoreconf -f
+autoreconf -fiv
 
 chown -R root:root .
 find -L . \
diff --git a/multimedia/vlc/vlc.info b/multimedia/vlc/vlc.info
index 79cc29ca5905a..376d64c07e571 100644
--- a/multimedia/vlc/vlc.info
+++ b/multimedia/vlc/vlc.info
@@ -1,8 +1,8 @@
 PRGNAM="vlc"
-VERSION="2.2.3"
+VERSION="2.2.4"
 HOMEPAGE="http://www.videolan.org/vlc/"
-DOWNLOAD="http://download.videolan.org/vlc/2.2.3/vlc-2.2.3.tar.xz"
-MD5SUM="ecbc65be549e5cc83e4cbe0129e66dcd"
+DOWNLOAD="http://download.videolan.org/vlc/2.2.4/vlc-2.2.4.tar.xz"
+MD5SUM="55666c9898f658c7fcca12725bf7dd1b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libass libdc1394 libdvbpsi libmpeg2 libupnp lua portaudio twolame opus ffmpeg libwebp gsm opencv libtar libkate faac libdca libmatroska libshout speex avahi projectM jack-audio-connection-kit libsidplay2 zvbi faad2 libavc1394 libmodplug musepack-tools vcdimager dirac vsxu gnome-vfs live555 rtmpdump libdvdcss fluidsynth schroedinger libminizip chromaprint x264 x265 libbluray"
-- 
cgit v1.2.3