aboutsummaryrefslogtreecommitdiff
path: root/multimedia
diff options
context:
space:
mode:
authorChristoph Willing <chris.willing@iinet.net.au>2017-04-29 10:49:32 +1000
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2017-04-29 12:50:50 +0700
commitb96c9e60c642e81416ef6fb3e3da4033573ce17f (patch)
tree3536d75e44ddb4250a993188d2edcc2b085e27ff /multimedia
parenteb97a7fe5b4932ee38a258b1716957155a20fed0 (diff)
multimedia/vlc: Added optional Wayland support
Signed-off-by: Christoph Willing <chris.willing@iinet.net.au>
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/vlc/README9
-rw-r--r--multimedia/vlc/vlc.SlackBuild4
2 files changed, 12 insertions, 1 deletions
diff --git a/multimedia/vlc/README b/multimedia/vlc/README
index 7288e78811985..1177672e2795f 100644
--- a/multimedia/vlc/README
+++ b/multimedia/vlc/README
@@ -12,6 +12,15 @@ are detected at build time, they will be included. Conversely if
optional packages are not available at build time, vlc will continue
to build with a reduced feature set.
+Support for Wayland is a special case. It is not supported by default
+but can be enabled setting the WAYLAND environment variable to "yes"
+when running the SlackBuild e.g.
+ WAYLAND=yes sh vlc.SlackBuild
+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.
+
The vsxu SlackBuild is now optional for x86 machines; removed from
REQUIRES since it does not compile on arm machines at the moment.
diff --git a/multimedia/vlc/vlc.SlackBuild b/multimedia/vlc/vlc.SlackBuild
index c5b54d1ea7f9a..c67f32245662e 100644
--- a/multimedia/vlc/vlc.SlackBuild
+++ b/multimedia/vlc/vlc.SlackBuild
@@ -29,7 +29,7 @@
PRGNAM=vlc
VERSION=${VERSION:-20170406_8268fe0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -58,6 +58,7 @@ fi
DOCS="ABOUT-NLS AUTHORS COPYING INSTALL NEWS README THANKS"
qtversion="--enable-qt=4" ; [ "${QTVERSION:-5}" != "4" ] && qtversion="--enable-qt=5"
+wayland="--disable-wayland" ; [ "${WAYLAND:-no}" != "no" ] && wayland="--enable-wayland"
# In an ordinary virtual machine, since a different kernal is running,
# a unique dbus id is needed.
@@ -103,6 +104,7 @@ LDFLAGS="$SLKLDFLAGS" \
--localstatedir=/var \
--build=$ARCH-slackware-linux \
$qtversion \
+ $wayland \
--enable-merge-ffmpeg \
--enable-libva=no \
--with-kde-solid=no \