3 files changed, 19 insertions, 16 deletions
diff --git a/multimedia/gpac/GIT-VERSION b/multimedia/gpac/GIT-VERSION
deleted file mode 100644
index b8c0e5a441..0000000000
--- a/multimedia/gpac/GIT-VERSION
+++ /dev/null
@@ -1,3 +0,0 @@
-git checkout - October 20, 2015
-
-git clone https://github.com/gpac/gpac.git
diff --git a/multimedia/gpac/gpac.SlackBuild b/multimedia/gpac/gpac.SlackBuild
index 3581f5e831..fe73a1badd 100644
--- a/multimedia/gpac/gpac.SlackBuild
+++ b/multimedia/gpac/gpac.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware Package Build Script for gpac
 # Home Page: https://gpac.wp.mines-telecom.fr/
 
-# Copyright (c) 2007-2015, Nishant Limbachia, Hoffman Estates, IL, USA
+# Copyright (c) 2007-2016, Nishant Limbachia, Hoffman Estates, IL, USA
 # (nishant _AT_ mnspace _DOT_ net)
 # All rights reserved.
 #
@@ -26,7 +26,7 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM="gpac"
-VERSION=${VERSION:-git20151020}
+VERSION=${VERSION:-0.6.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -66,12 +66,17 @@ else
   wx_option="--enable-wx"
 fi
 
+if [ "${AMR:-no}" = "no" ]; then
+    amr_option="--disable-amr"
+else
+    amr_option="--enable-amr"
+fi
+
 rm -rf $PKG $TMP/$PRGNAM-$VERSION
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/v$VERSION.tar.gz
 cd $PRGNAM-$VERSION
-
 chown -R root.root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -86,9 +91,12 @@ sed -i "s/^libdir=\".*\"$/libdir=\"lib$LIBDIRSUFFIX\"/" configure
   --prefix=/usr \
   --mandir=/usr/man \
   --disable-opt \
+  --enable-pic \
+  --enable-pulseaudio \
   --cpu=${ARCH} \
   --extra-cflags="$SLKCFLAGS" \
-  $wx_option
+  $wx_option \
+  $amr_option
 
 make -j1
 make install DESTDIR=$PKG
@@ -99,17 +107,15 @@ make install-lib DESTDIR=$PKG
 ### doesn't seem to play with mplayer
 rm -fr $PKG/usr/share
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | \
-  grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+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
 
 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
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  AUTHORS BUGS COPYING Changelog INSTALLME README.md TODO doc/configuration.html \
+cp -a AUTHORS BUGS COPYING Changelog INSTALLME README.md TODO doc/configuration.html \
   $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/GIT-VERSION > $PKG/usr/doc/$PRGNAM-$VERSION/GIT-VERSION
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/multimedia/gpac/gpac.info b/multimedia/gpac/gpac.info
index bd31b8ec0b..08ef6776ad 100644
--- a/multimedia/gpac/gpac.info
+++ b/multimedia/gpac/gpac.info
@@ -1,8 +1,8 @@
 PRGNAM="gpac"
-VERSION="git20151020"
+VERSION="0.6.1"
 HOMEPAGE="http://gpac.wp.mines-telecom.fr/"
-DOWNLOAD="https://www.dropbox.com/s/26k4chj4m4ym0su/gpac-git20151020.tar.xz"
-MD5SUM="026a306ac0f0c61a412e33ee49a86693"
+DOWNLOAD="https://github.com/gpac/gpac/archive/v0.6.1.tar.gz"
+MD5SUM="29c02dcb870073150f9d26e7410cc433"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""