From 38dee70ccd621e9a078a4cb4f0e3847703f694f5 Mon Sep 17 00:00:00 2001
From: Andrew Strong <andrew.david.strong@gmail.com>
Date: Sat, 30 May 2020 01:15:05 +0100
Subject: [PATCH] multimedia/aom: Updated for version 2.0.0.

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

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 multimedia/aom/README         |  1 -
 multimedia/aom/aom.SlackBuild | 24 +++++++-----------------
 multimedia/aom/aom.info       |  4 ++--
 3 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/multimedia/aom/README b/multimedia/aom/README
index edda91a3aa..60aa084072 100644
--- a/multimedia/aom/README
+++ b/multimedia/aom/README
@@ -5,4 +5,3 @@ VP9 and also to eventually be a competitor with HEVC/H.265.
 This script builds the encoder aomenc, the decoder aomdec as well
 as shared libraries which can be utilised by recent versions of
 both FFmpeg and vlc.
-
diff --git a/multimedia/aom/aom.SlackBuild b/multimedia/aom/aom.SlackBuild
index 422dbebe7f..f0c6dfdd4a 100644
--- a/multimedia/aom/aom.SlackBuild
+++ b/multimedia/aom/aom.SlackBuild
@@ -25,9 +25,8 @@
 
 
 PRGNAM=aom
-# Git repository was tagged for release 2.0.0 but the downloadable archive
-# has the git commit in the filename, some adjustments therefore required
-# for a sane Slackware build:
+# The 'official' archive for the aom 2.0.0 release has the git commit in
+# the filename, so adjustments are required for a sane Slackware build:
 VERSION=${VERSION:-2.0.0}
 GITCOMMIT=${GITCOMMIT:-bb35ba9148543f22ba7d8642e4fbd29ae301f5dc}
 BUILD=${BUILD:-1}
@@ -63,20 +62,11 @@ fi
 set -e
 
 rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT $TMP/$PRGNAM-$VERSION
+mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-
-# Browser download and wget download will have a different filename.
-# Note as well the need to specify a suitable output folder name,
-# otherwise the extracted aom files are simply scattered across $TMP:
-
-rm -rf $PRGNAM
-if [ -e $CWD/$PRGNAM-$GITCOMMIT.tar.gz ]; then
-  tar xvf $CWD/$PRGNAM-$GITCOMMIT.tar.gz -C $TMP/$PRGNAM-$VERSION
-else
-  tar xvf $CWD/$GITCOMMIT.tar.gz -C $TMP/$PRGNAM-$VERSION
-fi
-
+rm -rf $PRGNAM-$VERSION
+mkdir -p $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$GITCOMMIT.tar.gz -C $TMP/$PRGNAM-$VERSION
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -105,7 +95,7 @@ cd build
     -DENABLE_DOCS=OFF \
     -DBUILD_SHARED_LIBS=ON \
     ../
-  make
+  make -j1
   make install DESTDIR=$PKG
 cd ..
 
diff --git a/multimedia/aom/aom.info b/multimedia/aom/aom.info
index 45c6b85990..7cae618dfe 100644
--- a/multimedia/aom/aom.info
+++ b/multimedia/aom/aom.info
@@ -1,8 +1,8 @@
 PRGNAM="aom"
 VERSION="2.0.0"
 HOMEPAGE="https://aomedia.googlesource.com/aom"
-DOWNLOAD="https://aomedia.googlesource.com/aom/+archive/bb35ba9148543f22ba7d8642e4fbd29ae301f5dc.tar.gz"
-MD5SUM="0b6d82f4b0f56c198e400ad829b27bba"
+DOWNLOAD="http://www.andrews-corner.org/downloads/aom-bb35ba9148543f22ba7d8642e4fbd29ae301f5dc.tar.gz"
+MD5SUM="ebca14bf0ef8843cf89fb8cbbab7b6ef"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""