vlc: fixed footprint and build against qt 5.15

This commit is contained in:
Tim Biermann 2020-07-07 17:42:50 +00:00
parent aa5a2bda8d
commit e6242e193a
Signed by: tb
GPG Key ID: 42F8B4E30B673606
4 changed files with 40 additions and 23 deletions

View File

@ -122,10 +122,6 @@ drwxr-xr-x root/root usr/lib/pkgconfig/
drwxr-xr-x root/root usr/lib/vlc/
-rw-r--r-- root/root usr/lib/vlc/libcompat.a
-rwxr-xr-x root/root usr/lib/vlc/libcompat.la
-rwxr-xr-x root/root usr/lib/vlc/libvlc_vdpau.la
lrwxrwxrwx root/root usr/lib/vlc/libvlc_vdpau.so -> libvlc_vdpau.so.0.0.0
lrwxrwxrwx root/root usr/lib/vlc/libvlc_vdpau.so.0 -> libvlc_vdpau.so.0.0.0
-rwxr-xr-x root/root usr/lib/vlc/libvlc_vdpau.so.0.0.0
-rwxr-xr-x root/root usr/lib/vlc/libvlc_xcb_events.la
lrwxrwxrwx root/root usr/lib/vlc/libvlc_xcb_events.so -> libvlc_xcb_events.so.0.0.0
lrwxrwxrwx root/root usr/lib/vlc/libvlc_xcb_events.so.0 -> libvlc_xcb_events.so.0.0.0
@ -613,19 +609,6 @@ drwxr-xr-x root/root usr/lib/vlc/plugins/text_renderer/
-rwxr-xr-x root/root usr/lib/vlc/plugins/text_renderer/libfreetype_plugin.so
-rwxr-xr-x root/root usr/lib/vlc/plugins/text_renderer/libtdummy_plugin.la
-rwxr-xr-x root/root usr/lib/vlc/plugins/text_renderer/libtdummy_plugin.so
drwxr-xr-x root/root usr/lib/vlc/plugins/vdpau/
-rwxr-xr-x root/root usr/lib/vlc/plugins/vdpau/libvdpau_adjust_plugin.la
-rwxr-xr-x root/root usr/lib/vlc/plugins/vdpau/libvdpau_adjust_plugin.so
-rwxr-xr-x root/root usr/lib/vlc/plugins/vdpau/libvdpau_avcodec_plugin.la
-rwxr-xr-x root/root usr/lib/vlc/plugins/vdpau/libvdpau_avcodec_plugin.so
-rwxr-xr-x root/root usr/lib/vlc/plugins/vdpau/libvdpau_chroma_plugin.la
-rwxr-xr-x root/root usr/lib/vlc/plugins/vdpau/libvdpau_chroma_plugin.so
-rwxr-xr-x root/root usr/lib/vlc/plugins/vdpau/libvdpau_deinterlace_plugin.la
-rwxr-xr-x root/root usr/lib/vlc/plugins/vdpau/libvdpau_deinterlace_plugin.so
-rwxr-xr-x root/root usr/lib/vlc/plugins/vdpau/libvdpau_display_plugin.la
-rwxr-xr-x root/root usr/lib/vlc/plugins/vdpau/libvdpau_display_plugin.so
-rwxr-xr-x root/root usr/lib/vlc/plugins/vdpau/libvdpau_sharpen_plugin.la
-rwxr-xr-x root/root usr/lib/vlc/plugins/vdpau/libvdpau_sharpen_plugin.so
drwxr-xr-x root/root usr/lib/vlc/plugins/video_chroma/
-rwxr-xr-x root/root usr/lib/vlc/plugins/video_chroma/libchain_plugin.la
-rwxr-xr-x root/root usr/lib/vlc/plugins/video_chroma/libchain_plugin.so
@ -757,8 +740,6 @@ drwxr-xr-x root/root usr/lib/vlc/plugins/video_output/
-rwxr-xr-x root/root usr/lib/vlc/plugins/video_output/libflaschen_plugin.so
-rwxr-xr-x root/root usr/lib/vlc/plugins/video_output/libgl_plugin.la
-rwxr-xr-x root/root usr/lib/vlc/plugins/video_output/libgl_plugin.so
-rwxr-xr-x root/root usr/lib/vlc/plugins/video_output/libglconv_vdpau_plugin.la
-rwxr-xr-x root/root usr/lib/vlc/plugins/video_output/libglconv_vdpau_plugin.so
-rwxr-xr-x root/root usr/lib/vlc/plugins/video_output/libglx_plugin.la
-rwxr-xr-x root/root usr/lib/vlc/plugins/video_output/libglx_plugin.so
-rwxr-xr-x root/root usr/lib/vlc/plugins/video_output/libvdummy_plugin.la

View File

@ -1,5 +1,6 @@
untrusted comment: verify with /etc/ports/contrib.pub
RWSagIOpLGJF311jtrybjQR7Orp9rTnTD7xIlrZLQMI306+i3Czoi9BK/XQ7XTpjDKjY3Eia9ZVv5WNJbDlD7EkBQW4nBf6o/Q4=
SHA256 (Pkgfile) = fd919bede90abd4d0ea521127276ec4be9e171c524c995c7851be7c95e726e44
SHA256 (.footprint) = 83ea36a52e6136c64d7f4ee7109a271067302b5fab5df35ec3fbb2f0c99b5931
RWSagIOpLGJF3+r1Y7inHIQRt271lEewSsUH3IhdUuxIlTLcSp8bPfC9ZTdS4fItFtOB91GNXEsn9I5lHRHq4XZ1/LVo1n0Dew0=
SHA256 (Pkgfile) = 1cae99f594c296ce49cb21e32e4ce342c5425c10a22b1e6024b131f0162166ef
SHA256 (.footprint) = 613f5c72dca389b5bff56785fe1f770ba64a3129c1eba1f8643dcd3fc2c57a03
SHA256 (vlc-3.0.11.tar.xz) = 3e94a1acf33445e9da15d528aa48657aa26b912eaa2656b403d43860a8834919
SHA256 (qt-5.15.patch) = db3be0e5a79cddced198d53b0932be9ca397fe52369524ea37e4ef2872e28596

View File

@ -7,13 +7,15 @@
name=vlc
version=3.0.11
release=1
source=(https://download.videolan.org/pub/videolan/$name/$version/$name-$version.tar.xz)
source=(https://download.videolan.org/pub/videolan/$name/$version/$name-$version.tar.xz
qt-5.15.patch)
build() {
cd $name-$version
[ -z "$(pkg-config --libs --static libavutil | grep -- '-lvdpau')" ] && PKGMK_VLC+=' --disable-vdpau'
patch -Np1 -i $SRC/qt-5.15.patch
autoreconf -fi
export RCC=/usr/bin/rcc-qt5

33
vlc/qt-5.15.patch Normal file
View File

@ -0,0 +1,33 @@
diff -u -r vlc-3.0.10/modules/gui/qt/components/playlist/views.cpp vlc-3.0.10-qt-5.15/modules/gui/qt/components/playlist/views.cpp
--- vlc-3.0.10/modules/gui/qt/components/playlist/views.cpp 2017-11-24 15:29:17.000000000 +0000
+++ vlc-3.0.10-qt-5.15/modules/gui/qt/components/playlist/views.cpp 2020-05-29 20:50:09.267959371 +0000
@@ -27,6 +27,7 @@
#include "input_manager.hpp" /* THEMIM */
#include <QPainter>
+#include <QPainterPath>
#include <QRect>
#include <QStyleOptionViewItem>
#include <QFontMetrics>
diff -u -r vlc-3.0.10/modules/gui/qt/dialogs/plugins.cpp vlc-3.0.10-qt-5.15/modules/gui/qt/dialogs/plugins.cpp
--- vlc-3.0.10/modules/gui/qt/dialogs/plugins.cpp 2017-11-24 15:29:17.000000000 +0000
+++ vlc-3.0.10-qt-5.15/modules/gui/qt/dialogs/plugins.cpp 2020-05-29 20:49:44.114275108 +0000
@@ -53,6 +53,7 @@
#include <QListView>
#include <QListWidget>
#include <QPainter>
+#include <QPainterPath>
#include <QStyleOptionViewItem>
#include <QKeyEvent>
#include <QPushButton>
diff -u -r vlc-3.0.10/modules/gui/qt/util/timetooltip.hpp vlc-3.0.10-qt-5.15/modules/gui/qt/util/timetooltip.hpp
--- vlc-3.0.10/modules/gui/qt/util/timetooltip.hpp 2018-05-03 12:03:21.000000000 +0000
+++ vlc-3.0.10-qt-5.15/modules/gui/qt/util/timetooltip.hpp 2020-05-29 20:40:30.306628713 +0000
@@ -24,6 +24,7 @@
#include "qt.hpp"
+#include <QPainterPath>
#include <QWidget>
class TimeTooltip : public QWidget