diff options
| author | Christoph Willing <chris.willing@linux.com> | 2021-04-21 22:29:14 -0500 |
|---|---|---|
| committer | Robby Workman <rworkman@slackbuilds.org> | 2021-04-21 22:29:14 -0500 |
| commit | 970579f8690240666db7abd3bc4daefa5c671541 (patch) | |
| tree | 110714d0aa4b7f5d4425f095daa95b02c98d5054 /multimedia/vlc | |
| parent | 4ade6c65ff899a23b918284553cc8942f332151a (diff) | |
multimedia/vlc: Fixes for Slackware 15.0
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
Diffstat (limited to 'multimedia/vlc')
| -rw-r--r-- | multimedia/vlc/README | 12 | ||||
| -rw-r--r-- | multimedia/vlc/vlc.SlackBuild | 25 |
2 files changed, 4 insertions, 33 deletions
diff --git a/multimedia/vlc/README b/multimedia/vlc/README index 8a5179e3bad6..b1628da15234 100644 --- a/multimedia/vlc/README +++ b/multimedia/vlc/README @@ -12,14 +12,6 @@ are detected at build time, they will be included. Conversely if optional packages are not available at build time, vlc will generally continue to build with a reduced feature set. -Support for OpenCV is supported using either the "default" opencv -package or the opencv-legacy package (version 3.1.0) from SBo. Either -package will be detected and used if already installed. If opencv support -is not wanted despite the presence of opencv or opencv-legacy, it can be -explicitly disabled by setting the the OPENCV environment variable -to "no" e.g. - OPENCV=no sh vlc.SlackBuild - 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 @@ -40,7 +32,3 @@ e.g. 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 c024322aca7f..0bee64ca873f 100644 --- a/multimedia/vlc/vlc.SlackBuild +++ b/multimedia/vlc/vlc.SlackBuild @@ -58,8 +58,6 @@ fi SLKLDFLAGS="-lrt" 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. @@ -88,21 +86,8 @@ patch -p0 < $CWD/patch-dvdnav-503.diff patch -p0 < $CWD/patch-projectM-fontpath.diff patch -p0 < $CWD/patch_vlc_cache_gen.diff -opencv="" -if [ "${OPENCV:-yes}" != "yes" ]; then - opencv="--disable-opencv" ; -else - if pkg-config --exists opencv4 ; then - opencv="--enable-opencv" - patch -p0 < $CWD/patch-opencv4.diff - mv modules/video_filter/opencv_wrapper.c modules/video_filter/opencv_wrapper.cpp - elif pkg-config --exists opencv ; then - # opencv-legacy - opencv="--enable-opencv" - else - opencv="--disable-opencv" - fi -fi +# Don't enable wayland by default +wayland="--disable-wayland" ; [ "${WAYLAND:-no}" != "no" ] && wayland="--enable-wayland" # Enable vlc to be run as root runasroot=""; [ "${RUNASROOT:-no}" != "no" ] && runasroot="--enable-run-as-root" @@ -130,13 +115,11 @@ LDFLAGS="$SLKLDFLAGS" \ --docdir=/usr/doc/vlc-$VERSION \ --localstatedir=/var \ --build=$ARCH-slackware-linux \ - $qtversion \ + --enable-qt=5 \ + --enable-merge-ffmpeg \ $wayland \ $runasroot \ $aom \ - --disable-opencv \ - --enable-merge-ffmpeg \ - --with-kde-solid=no \ make make DESTDIR=$PKG install |