diff options
Diffstat (limited to 'multimedia/vlc')
| -rw-r--r-- | multimedia/vlc/README | 13 | ||||
| -rw-r--r-- | multimedia/vlc/qt-5.15.patch | 38 | ||||
| -rw-r--r-- | multimedia/vlc/vlc.SlackBuild | 13 |
3 files changed, 53 insertions, 11 deletions
diff --git a/multimedia/vlc/README b/multimedia/vlc/README index 48a30411a4..6452b33095 100644 --- a/multimedia/vlc/README +++ b/multimedia/vlc/README @@ -34,9 +34,12 @@ security feature may be side stepped by building vlc with the RUNASROOT environment variable set e.g. RUNASROOT=yes sh vlc.SlackBuild -Playing of AV1 encoded video is supported when either of SBo's -multimedia/aom or libraries/dav1d packages is detected when vlc is built. -One of these is expected to become required in a future release. +Some versions of the automatically deteced optional libaom package are +incompatible with this version of vlc (the build will fail with an +incompatible libaom). Such an incompatible libaom may be ignored +during building by setting the LIBAOM environmant variable to "no" +e.g. + LIBAOM=no sh vlc.SlackBuild Please advise the maintainer to suggest support for any further options. @@ -44,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/qt-5.15.patch b/multimedia/vlc/qt-5.15.patch new file mode 100644 index 0000000000..c61299a48d --- /dev/null +++ b/multimedia/vlc/qt-5.15.patch @@ -0,0 +1,38 @@ +https://build.opensuse.org/package/view_file/openSUSE:Factory/vlc/fix-missing-includes-with-qt-5.15.patch + +Index: vlc-3.0.8/modules/gui/qt/util/timetooltip.hpp +=================================================================== +--- vlc-3.0.8.orig/modules/gui/qt/util/timetooltip.hpp ++++ vlc-3.0.8/modules/gui/qt/util/timetooltip.hpp +@@ -25,6 +25,7 @@ + #include "qt.hpp" + + #include <QWidget> ++#include <QPainterPath> + + class TimeTooltip : public QWidget + { +Index: vlc-3.0.8/modules/gui/qt/components/playlist/views.cpp +=================================================================== +--- vlc-3.0.8.orig/modules/gui/qt/components/playlist/views.cpp ++++ vlc-3.0.8/modules/gui/qt/components/playlist/views.cpp +@@ -27,6 +27,7 @@ + #include "input_manager.hpp" /* THEMIM */ + + #include <QPainter> ++#include <QPainterPath> + #include <QRect> + #include <QStyleOptionViewItem> + #include <QFontMetrics> +Index: vlc-3.0.8/modules/gui/qt/dialogs/plugins.cpp +=================================================================== +--- vlc-3.0.8.orig/modules/gui/qt/dialogs/plugins.cpp ++++ vlc-3.0.8/modules/gui/qt/dialogs/plugins.cpp +@@ -53,6 +53,7 @@ + #include <QListView> + #include <QListWidget> + #include <QPainter> ++#include <QPainterPath> + #include <QStyleOptionViewItem> + #include <QKeyEvent> + #include <QPushButton> diff --git a/multimedia/vlc/vlc.SlackBuild b/multimedia/vlc/vlc.SlackBuild index 3e47a3fc4c..e9abb3fcce 100644 --- a/multimedia/vlc/vlc.SlackBuild +++ b/multimedia/vlc/vlc.SlackBuild @@ -81,10 +81,13 @@ 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-dvdread-503.diff patch -p0 < $CWD/patch-dvdnav-503.diff patch -p0 < $CWD/patch-projectM-fontpath.diff patch -p0 < $CWD/patch_vlc_cache_gen.diff +patch -p1 < $CWD/qt-5.15.patch opencv="" if [ "${OPENCV:-yes}" != "yes" ]; then @@ -105,6 +108,9 @@ fi # Enable vlc to be run as root runasroot=""; [ "${RUNASROOT:-no}" != "no" ] && runasroot="--enable-run-as-root" +# Disable use of libaom +libaom=""; [ "${LIBAOM:-yes}" = "no" ] && libaom="--disable-aom" + autoreconf -fiv chown -R root:root . @@ -127,10 +133,10 @@ LDFLAGS="$SLKLDFLAGS" \ --build=$ARCH-slackware-linux \ $qtversion \ $wayland \ - $opencv \ $runasroot \ + $libaom \ + --disable-opencv \ --enable-merge-ffmpeg \ - --enable-libva=no \ --with-kde-solid=no \ make @@ -139,8 +145,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 |