From cd84378d75facdeff8ec08369c4dd0b553ffcd2e Mon Sep 17 00:00:00 2001
From: Christoph Willing <chris.willing@linux.com>
Date: Fri, 10 Jan 2020 23:08:06 +1000
Subject: multimedia/vlc: Add RUNASROOT & LIBAOM options

Signed-off-by: Christoph Willing <chris.willing@linux.com>
---
 multimedia/vlc/README         | 14 +++++++++++++-
 multimedia/vlc/vlc.SlackBuild | 10 +++++++++-
 2 files changed, 22 insertions(+), 2 deletions(-)

(limited to 'multimedia')

diff --git a/multimedia/vlc/README b/multimedia/vlc/README
index 5490cd6e4c..0ac727b531 100644
--- a/multimedia/vlc/README
+++ b/multimedia/vlc/README
@@ -28,10 +28,22 @@ This support also requires additional SBo packages wayland-egl and
 wayland-protocols. It also depends on the qt5 package having been
 built with wayland support i.e. wayland package was installed when the
 qt5 package was built.
- 
+
+By default, the vlc runtime is not able to be run as root. This
+security feature may be side stepped by building vlc with the RUNASROOT
+environment variable set e.g.
+  RUNASROOT=yes sh vlc.SlackBuild
+
+Some versions of the automatically deteced optional libaom package are
+incompatible with this version of vlc (the build will fail with an
+incompatible libaom). Such an incompatible libaom may be ignored
+during building by setting the LIBAOM environmant variable to "no"
+e.g.
+  LIBAOM=no sh vlc.SlackBuild
 
 Please advise the maintainer to suggest support for any further options.
 
+
 *NOTES*
 - the qt4 interface seems not to be working ATM so the qt5 one is
   enabled by default: this means qt5 is a new mandatory dependency
diff --git a/multimedia/vlc/vlc.SlackBuild b/multimedia/vlc/vlc.SlackBuild
index 011a9b62da..4f21102ecd 100644
--- a/multimedia/vlc/vlc.SlackBuild
+++ b/multimedia/vlc/vlc.SlackBuild
@@ -6,7 +6,7 @@
 # modified to build VLC only, shared libraries needed.
 
 # Copyright (c) 2007,2008,2009,2010,2011  Eric Hameleers, Eindhoven, Netherlands
-# Copyright (c) 2014-2019  Christoph Willing, Brisbane, Australia
+# Copyright (c) 2014-2020  Christoph Willing, Brisbane, Australia
 #
 #   Permission to use, copy, modify, and distribute this software for
 #   any purpose with or without fee is hereby granted, provided that
@@ -100,6 +100,12 @@ else
   fi
 fi
 
+# Enable vlc to be run as root
+runasroot=""; [ "${RUNASROOT:-no}" != "no" ] && runasroot="--enable-run-as-root"
+
+# Disable use of libaom
+libaom=""; [ "${LIBAOM:-yes}" = "no" ] && libaom="--disable-aom"
+
 autoreconf -fiv
 
 chown -R root:root .
@@ -123,6 +129,8 @@ LDFLAGS="$SLKLDFLAGS" \
   $qtversion \
   $wayland \
   $opencv \
+  $runasroot \
+  $libaom \
   --enable-merge-ffmpeg \
   --enable-libva=no \
   --with-kde-solid=no \
-- 
cgit v1.2.3