From ca86d831910c707a936b8f3eb053e05c6b2219c8 Mon Sep 17 00:00:00 2001
From: Christoph Willing
Date: Mon, 19 Feb 2018 15:03:28 +1000
Subject: multimedia/vlc: Temporarily remove default opencv support

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

(limited to 'multimedia/vlc')

diff --git a/multimedia/vlc/README b/multimedia/vlc/README
index 1177672e27..d1ecfa9112 100644
--- a/multimedia/vlc/README
+++ b/multimedia/vlc/README
@@ -9,8 +9,16 @@ This build aims to support as many options as possible using
 the SlackBuilds listed in the REQUIRES field of the vlc.info file.
 No script changes are necessary to include particular options; if they
 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.
+optional packages are not available at build time, vlc will generally
+continue to build with a reduced feature set.
+
+Support for OpenCV is temporarily disabled by default due to build error.
+However it is possible to include opencv support using the somewhat
+older opencv-legacy SlackBuild rather than opencv. It then needs to
+be explicitly enabled by setting the the OPENCV environment variable
+to "yes" e.g.
+  OPENCV=yes sh vlc.SlackBuild
+This requires the opencv-legacy package to be installed at build time.
 
 Support for Wayland is a special case. It is not supported by default
 but can be enabled setting the WAYLAND environment variable to "yes"
diff --git a/multimedia/vlc/vlc.SlackBuild b/multimedia/vlc/vlc.SlackBuild
index 7440672d62..5d528c6988 100644
--- a/multimedia/vlc/vlc.SlackBuild
+++ b/multimedia/vlc/vlc.SlackBuild
@@ -29,7 +29,7 @@
 
 PRGNAM=vlc
 VERSION=${VERSION:-3.0.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -59,6 +59,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"
+opencv="--disable-opencv" ; [ "${OPENCV:-no}" != "no" ] && opencv="--enable-opencv"
 
 # In an ordinary virtual machine, since a different kernal is running,
 # a unique dbus id is needed.
@@ -105,6 +106,7 @@ LDFLAGS="$SLKLDFLAGS" \
   --build=$ARCH-slackware-linux \
   $qtversion \
   $wayland \
+  $opencv \
   --enable-merge-ffmpeg \
   --enable-libva=no \
   --with-kde-solid=no \
diff --git a/multimedia/vlc/vlc.info b/multimedia/vlc/vlc.info
index 545be23dfc..fb7f16fe67 100644
--- a/multimedia/vlc/vlc.info
+++ b/multimedia/vlc/vlc.info
@@ -5,6 +5,6 @@ DOWNLOAD="http://get.videolan.org/vlc/3.0.0/vlc-3.0.0.tar.xz"
 MD5SUM="a953d8b90e56f06828c4ca8e390c5c9b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="libass libdc1394 libdvbpsi libmpeg2 libupnp lua portaudio twolame opus ffmpeg libwebp gsm opencv libtar libkate faac libdca libmatroska libshout speex avahi projectM jack-audio-connection-kit libsidplay2 zvbi faad2 libavc1394 libmodplug musepack-tools vcdimager dirac gnome-vfs live555 qt5 rtmpdump libdvdcss fluidsynth schroedinger libminizip chromaprint x264 x265 libbluray"
+REQUIRES="libass libdc1394 libdvbpsi libmpeg2 libupnp lua portaudio twolame opus ffmpeg libwebp gsm libtar libkate faac libdca libmatroska libshout speex avahi projectM jack-audio-connection-kit libsidplay2 zvbi faad2 libavc1394 libmodplug musepack-tools vcdimager dirac gnome-vfs live555 qt5 rtmpdump libdvdcss fluidsynth schroedinger libminizip chromaprint x264 x265 libbluray libnfs protobuf"
 MAINTAINER="Christoph Willing"
 EMAIL="chris.willing@linux.com"
-- 
cgit v1.2.3