3 files changed, 28 insertions, 21 deletions
diff --git a/multimedia/aom/README b/multimedia/aom/README
index 60aa084072..dbddf20cbb 100644
--- a/multimedia/aom/README
+++ b/multimedia/aom/README
@@ -3,5 +3,5 @@ video transmission over the Internet. AV1 is planned to surpass
 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
+as shared libraries which can be utilised by suitable versions of
 both FFmpeg and vlc.
diff --git a/multimedia/aom/aom.SlackBuild b/multimedia/aom/aom.SlackBuild
index f0c6dfdd4a..1045d3e0a3 100644
--- a/multimedia/aom/aom.SlackBuild
+++ b/multimedia/aom/aom.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 # ----------------------------------------------------------------------
 # Slackware build script for aom
 #
-# Copyright (c) 2018-2020 Andrew Strong, Blue Mountains, Australia.
+# Copyright (c) 2018-2023 Andrew Strong, Blue Mountains, Australia.
 #
 #   Permission to use, copy, modify, and distribute this software for
 #   any purpose with or without fee is hereby granted, provided that
@@ -24,13 +24,16 @@
 # ----------------------------------------------------------------------
 
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=aom
-# The 'official' archive for the aom 2.0.0 release has the git commit in
+# The 'official' archive for the aom 3.6.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}
+VERSION=${VERSION:-3.6.0}
+GITCOMMIT=${GITCOMMIT:-3c65175b1972da4a1992c1dae2365b48d13f9a8d}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -40,7 +43,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -78,22 +85,22 @@ find -L . \
 cd build
 
   # I don't build either the HTML or the Latex docs as IMHO at this stage
-  # of aom development they are not terribly useful for non-developers.
-  # To enable these docs change '-DENABLE_DOCS:BOOL=OFF' below to 'ON' to
-  # build the docs and then uncomment the 'extra docs' section below to
-  # install them...
+  # of aom development they are still not terribly useful for non-developers.
+  # To enable these docs change '-DENABLE_DOCS=0' below to '1' to build
+  # the docs and then uncomment the 'extra docs' section below to install them...
 
   cmake \
     -G "Unix Makefiles" \
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_INSTALL_LIBDIR=/lib${LIBDIRSUFFIX} \
-    -DCMAKE_INSTALL_INCLUDEDIR=/include \
+    -DCMAKE_INSTALL_LIBDIR=lib${LIBDIRSUFFIX} \
+    -DCMAKE_INSTALL_INCLUDEDIR=include \
     -DCMAKE_BUILD_TYPE=Release \
-    -DENABLE_NASM=ON \
-    -DENABLE_DOCS=OFF \
-    -DBUILD_SHARED_LIBS=ON \
+    -DENABLE_NASM=1 \
+    -DENABLE_DOCS=0 \
+    -DBUILD_SHARED_LIBS=1 \
+    -DENABLE_TESTS=0 \
     ../
   make -j1
   make install DESTDIR=$PKG
@@ -103,7 +110,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS CHANGELOG LICENSE PATENTS README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS CHANGELOG LICENSE PATENTS README.md Sample.cfg $PKG/usr/doc/$PRGNAM-$VERSION
 
 # These are the 'extra docs', more details above...
 # mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/{html,latex}
@@ -116,4 +123,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/multimedia/aom/aom.info b/multimedia/aom/aom.info
index 7cae618dfe..815f782382 100644
--- a/multimedia/aom/aom.info
+++ b/multimedia/aom/aom.info
@@ -1,8 +1,8 @@
 PRGNAM="aom"
-VERSION="2.0.0"
+VERSION="3.6.0"
 HOMEPAGE="https://aomedia.googlesource.com/aom"
-DOWNLOAD="http://www.andrews-corner.org/downloads/aom-bb35ba9148543f22ba7d8642e4fbd29ae301f5dc.tar.gz"
-MD5SUM="ebca14bf0ef8843cf89fb8cbbab7b6ef"
+DOWNLOAD="http://www.andrews-corner.org/downloads/aom-3c65175b1972da4a1992c1dae2365b48d13f9a8d.tar.gz"
+MD5SUM="4c73a44a710688e8c496b3740ecee84b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""