summaryrefslogtreecommitdiffstats
path: root/multimedia/vlc
diff options
context:
space:
mode:
author Matteo Bernardini2019-08-31 16:24:12 +0200
committer Matteo Bernardini2019-08-31 16:24:12 +0200
commit82a6c2e466d4bdb1017e46447e56b0bce264f84b (patch)
treec13bd3ae8c2eae3546619b0d2912dbee78400d79 /multimedia/vlc
parent155fd2582041b19a6ca7ca2efa805052553bf90a (diff)
downloadslackbuilds-82a6c2e466d4bdb1017e46447e56b0bce264f84b.tar.gz
20190831.1 global branch merge.current-20190831.1
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
Diffstat (limited to 'multimedia/vlc')
-rw-r--r--multimedia/vlc/README4
-rw-r--r--multimedia/vlc/vlc.SlackBuild8
2 files changed, 5 insertions, 7 deletions
diff --git a/multimedia/vlc/README b/multimedia/vlc/README
index 5490cd6e4c..9d901b0659 100644
--- a/multimedia/vlc/README
+++ b/multimedia/vlc/README
@@ -35,7 +35,3 @@ 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
-- you *need* to version-bump the libva and libva-intel-driver in
- Slackware to versions 1.7.3 for VAAPI support: as we suppose
- a standard install, "--enable-libva=no" is added between the
- configure options, instead
diff --git a/multimedia/vlc/vlc.SlackBuild b/multimedia/vlc/vlc.SlackBuild
index 6f4294ca38..75c6fed10b 100644
--- a/multimedia/vlc/vlc.SlackBuild
+++ b/multimedia/vlc/vlc.SlackBuild
@@ -81,6 +81,8 @@ rm -rf $PRGNAM-$VERSION
tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
cd $PRGNAM-$VERSION
+sed -i '/DEPRECATED/s:^://:' modules/text_renderer/freetype/text_layout.c
+
patch -p0 < $CWD/patch-projectM-fontpath.diff
patch -p0 < $CWD/patch_vlc_cache_gen.diff
@@ -124,7 +126,8 @@ LDFLAGS="$SLKLDFLAGS" \
$wayland \
$opencv \
--enable-merge-ffmpeg \
- --enable-libva=no \
+ --disable-opencv \
+ --disable-vpx \
--with-kde-solid=no \
make
@@ -133,8 +136,7 @@ make DESTDIR=$PKG install
mkdir -p $PKG/usr/man/man1
gzip -9c doc/vlc.1 > $PKG/usr/man/man1/vlc.1.gz
-mkdir -p $PKG/$(cd /usr/share/vim/vim*/syntax ; pwd)
-cp extras/analyser/vlc.vim $PKG/$(cd /usr/share/vim/vim*/syntax ; pwd)/
+install -D -m0644 extras/analyser/vlc.vim $PKG/usr/share/vim/vimfiles/syntax/vlc.vim
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION