From b4f164a81cd8b24517e17b7c5adad38d09968638 Mon Sep 17 00:00:00 2001 From: Matteo Bernardini Date: Sat, 11 Apr 2020 16:09:18 +0200 Subject: 20200411.1 global branch merge. Signed-off-by: Matteo Bernardini --- multimedia/vlc/README | 4 ---- multimedia/vlc/vlc.SlackBuild | 8 +++++--- 2 files changed, 5 insertions(+), 7 deletions(-) (limited to 'multimedia/vlc') diff --git a/multimedia/vlc/README b/multimedia/vlc/README index 0ac727b531..6452b33095 100644 --- a/multimedia/vlc/README +++ b/multimedia/vlc/README @@ -47,7 +47,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 4f21102ecd..05f24423a7 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 @@ -132,7 +134,8 @@ LDFLAGS="$SLKLDFLAGS" \ $runasroot \ $libaom \ --enable-merge-ffmpeg \ - --enable-libva=no \ + --disable-opencv \ + --disable-vpx \ --with-kde-solid=no \ make @@ -141,8 +144,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 -- cgit v1.2.3