From 65253b502f5b9765385b1530d64f392d39ae0e1c Mon Sep 17 00:00:00 2001
From: Andrew Strong
Date: Sat, 25 May 2019 00:50:56 +0700
Subject: libraries/libaom: Updated for version 1.0.0.r1804.gcb43f766c.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 libraries/libaom/libaom.SlackBuild | 30 ++++++++++++++----------------
 libraries/libaom/libaom.info       |  6 +++---
 2 files changed, 17 insertions(+), 19 deletions(-)

(limited to 'libraries/libaom')

diff --git a/libraries/libaom/libaom.SlackBuild b/libraries/libaom/libaom.SlackBuild
index 962250e0c4..db4df3bc7f 100644
--- a/libraries/libaom/libaom.SlackBuild
+++ b/libraries/libaom/libaom.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 # ----------------------------------------------------------------------
-# Copyright (c) 2018 Andrew Strong, Blue Mountains, Australia.
+# Copyright (c) 2018-2019 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
@@ -28,7 +28,7 @@ PRGNAM=libaom
 #  git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 #
 # Borrowed from our Arch colleagues with thanks :).
-VERSION=${VERSION:-1.0.0.r994.g67aec0fc6}
+VERSION=${VERSION:-1.0.0.r1804.gcb43f766c}
 
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -75,29 +75,27 @@ 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 {} \;
 
-mkdir -p build
 cd build
 
   # Two points here:
-  #   1. I don't build the HTML / Latex docs as IMHO at this stage of aom
-  #      development they are not terribly useful for non-developers. If
-  #      you want them anyway change: '-DENABLE_DOCS:BOOL=OFF' to 'ON' and
-  #      uncomment the extra docs section below to install them...
+  #   1. I don't build either the HTML or the Latex docs as IMHO at this early
+  #      stage of aom development they are not terribly useful for non-developers.
+  #      To enable these change '-DENABLE_DOCS:BOOL=OFF' to 'ON' and then uncomment
+  #      the 'extra docs' section below to install them...
   #   2. I am only building static libs here, if you are keen for dynamic
-  #      libs you will need to change: '-DBUILD_SHARED_LIBS=0' to '1'.
+  #      libs you will need to change: '-DBUILD_SHARED_LIBS=OFF' to 'ON'.
 
   cmake \
     -G "Unix Makefiles" \
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DINCLUDE_INSTALL_DIR=/usr/include \
-    -DLIB_INSTALL_DIR=/usr/lib${LIBDIRSUFFIX} \
+    -DCMAKE_INSTALL_LIBDIR=/lib${LIBDIRSUFFIX} \
+    -DCMAKE_INSTALL_INCLUDEDIR=/include \
     -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_COLOR_MAKEFILE:BOOL=ON \
     -DENABLE_NASM=ON \
-    -DENABLE_DOCS:BOOL=OFF \
-    -DBUILD_SHARED_LIBS=0 \
+    -DENABLE_DOCS=OFF \
+    -DBUILD_SHARED_LIBS=OFF \
     ../
   make
   make install DESTDIR=$PKG
@@ -109,10 +107,10 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a AUTHORS CHANGELOG LICENSE PATENTS README.md $PKG/usr/doc/$PRGNAM-$VERSION
 
-# In case you really want all of the docs :)
+# These are the 'extra docs', more details in 'Point 1' above...
 # mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/{html,latex}
-# cp -a aom_build/docs/html/* $PKG/usr/doc/$PRGNAM-$VERSION/html
-# cp -a aom_build/docs/latex/* $PKG/usr/doc/$PRGNAM-$VERSION/latex
+# cp -a build/docs/html/* $PKG/usr/doc/$PRGNAM-$VERSION/html
+# cp -a build/docs/latex/* $PKG/usr/doc/$PRGNAM-$VERSION/latex
 
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/libraries/libaom/libaom.info b/libraries/libaom/libaom.info
index b3d6ee5929..17c61d1d7e 100644
--- a/libraries/libaom/libaom.info
+++ b/libraries/libaom/libaom.info
@@ -1,8 +1,8 @@
 PRGNAM="libaom"
-VERSION="1.0.0.r994.g67aec0fc6"
+VERSION="1.0.0.r1804.gcb43f766c"
 HOMEPAGE="https://aomedia.googlesource.com/aom"
-DOWNLOAD="http://www.andrews-corner.org/downloads/SBo/libaom-1.0.0.r994.g67aec0fc6.tar.gz"
-MD5SUM="38a8769e84bd30d908a9d7757ec0a7e7"
+DOWNLOAD="http://www.andrews-corner.org/downloads/SBo/libaom-1.0.0.r1804.gcb43f766c.tar.gz"
+MD5SUM="d4991899ae7f92d13ca896bdb838fbbc"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-- 
cgit v1.2.3