4 files changed, 17 insertions, 16 deletions
diff --git a/libraries/nv-codec-headers/README b/libraries/nv-codec-headers/README
index 6bdc98889a5e..e0fae6c4d4b7 100644
--- a/libraries/nv-codec-headers/README
+++ b/libraries/nv-codec-headers/README
@@ -1,18 +1,18 @@
 The FFmpeg version of Nvidia Codec SDK headers which are required
 to interface with Nvidia's codec APIs. The purpose of these
 headers is to allow hardware (GPU) encoding with suitable NVidia
-cards. This version corresponds to Video Codec SDK version 8.2.15.7
-and is best used with NVidia drivers version 4.10.48 or newer.
+cards. This version corresponds to Video Codec SDK version 9.0.18
+and requires NVidia drivers version 418.30 or newer.
 
-There are 3 stages of the history of NVidia GPU encoding with FFmpeg:
+There are 3 stages in the history of NVidia GPU encoding with FFmpeg:
 
  1. Pre August 27th 2016 it was necessary to track down your own
     headers to build nvenc.
  2. Post August 27th 2016 the required headers were incorporated
     as part of the FFmpeg source.
  3. Post February 26th 2018 the NVidia headers were removed from
-    the FFmpeg source. A separate git repository was created to hold
-    continuing work with these headers.
+    the FFmpeg source and a separate git repository was created
+    to hold continuing work with these headers.
 
 This nv-codec-headers script is for point 3 where the headers will
 need to be installed before compiling FFmpeg.
diff --git a/libraries/nv-codec-headers/nv-codec-headers.SlackBuild b/libraries/nv-codec-headers/nv-codec-headers.SlackBuild
index ee250c060cf6..4eeb50e12b59 100644
--- a/libraries/nv-codec-headers/nv-codec-headers.SlackBuild
+++ b/libraries/nv-codec-headers/nv-codec-headers.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for nv-codec-headers
 
-# Copyright 2018, Andrew Strong, Blue Mountains, Australia.
+# Copyright 2018-2019, Andrew Strong, Blue Mountains, Australia.
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,7 +25,7 @@
 PRGNAM=nv-codec-headers
 # Note that the version number is contained
 # within the file ffnvcodec.pc.in:
-VERSION=${VERSION:-8.2.15.7}
+VERSION=9.0.18.1
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -33,6 +33,7 @@ if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -55,17 +56,17 @@ fi
 set -e
 
 rm -rf $PKG
+mkdir -p $PKG
+cd $TMP
+rm -rf $PRGNAM
+
+rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$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 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 # Adjust Makefile for Slackware needs:
 sed -i 's#PREFIX = /usr/local#PREFIX = /usr#' Makefile
diff --git a/libraries/nv-codec-headers/nv-codec-headers.info b/libraries/nv-codec-headers/nv-codec-headers.info
index e7ab501e1e54..1d74f4295a8e 100644
--- a/libraries/nv-codec-headers/nv-codec-headers.info
+++ b/libraries/nv-codec-headers/nv-codec-headers.info
@@ -1,8 +1,8 @@
 PRGNAM="nv-codec-headers"
-VERSION="8.2.15.7"
+VERSION="9.0.18.1"
 HOMEPAGE="http://git.videolan.org/?p=ffmpeg/nv-codec-headers.git;a=summary"
-DOWNLOAD="http://www.andrews-corner.org/downloads/SBo/nv-codec-headers-8.2.15.7.tar.gz"
-MD5SUM="7b5a0dc150ad03f469d1a52cb309f944"
+DOWNLOAD="http://www.andrews-corner.org/downloads/SBo/nv-codec-headers-9.0.18.1.tar.gz"
+MD5SUM="be53563f72e1ac812086838f44a41540"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/nv-codec-headers/slack-desc b/libraries/nv-codec-headers/slack-desc
index e337e238cf7e..6a14b897f95e 100644
--- a/libraries/nv-codec-headers/slack-desc
+++ b/libraries/nv-codec-headers/slack-desc
@@ -9,7 +9,7 @@
 nv-codec-headers: nv-codec-headers (FFmpeg version of Nvidia Codec SDK headers)
 nv-codec-headers:
 nv-codec-headers: FFmpeg version of headers required to interface with Nvidia's
-nv-codec-headers: codec APIs. Corresponds to Video Codec SDK version 8.2.15.7
+nv-codec-headers: codec APIs. Corresponds to Video Codec SDK version 9.0.18.
 nv-codec-headers:
 nv-codec-headers:
 nv-codec-headers: