CVS commit: pkgsrc/multimedia/vlc

["Mark Davies" <markd%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   markd
Date:           Sun Jun  7 02:02:45 UTC 2020

Modified Files:
        pkgsrc/multimedia/vlc: Makefile distinfo
Added Files:
        pkgsrc/multimedia/vlc/patches:
            patch-modules_gui_qt_components_playlist_views.cpp
            patch-modules_gui_qt_dialogs_plugins.cpp
            patch-modules_gui_qt_util_timetooltip.hpp

Log Message:
vlc: build with qt5.15


To generate a diff of this commit:
cvs rdiff -u -r1.235 -r1.236 pkgsrc/multimedia/vlc/Makefile
cvs rdiff -u -r1.77 -r1.78 pkgsrc/multimedia/vlc/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/multimedia/vlc/patches/patch-modules_gui_qt_components_playlist_views.cpp \
    pkgsrc/multimedia/vlc/patches/patch-modules_gui_qt_dialogs_plugins.cpp \
    pkgsrc/multimedia/vlc/patches/patch-modules_gui_qt_util_timetooltip.hpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/multimedia/vlc/Makefile
diff -u pkgsrc/multimedia/vlc/Makefile:1.235 pkgsrc/multimedia/vlc/Makefile:1.236
--- pkgsrc/multimedia/vlc/Makefile:1.235        Tue Jun  2 08:24:28 2020
+++ pkgsrc/multimedia/vlc/Makefile      Sun Jun  7 02:02:45 2020
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.235 2020/06/02 08:24:28 adam Exp $
+# $NetBSD: Makefile,v 1.236 2020/06/07 02:02:45 markd Exp $
 
 DISTNAME=              vlc-3.0.10
-PKGREVISION=           3
+PKGREVISION=           4
 CATEGORIES=            multimedia
 MASTER_SITES=          https://download.videolan.org/pub/videolan/vlc/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=          .tar.xz

Index: pkgsrc/multimedia/vlc/distinfo
diff -u pkgsrc/multimedia/vlc/distinfo:1.77 pkgsrc/multimedia/vlc/distinfo:1.78
--- pkgsrc/multimedia/vlc/distinfo:1.77 Fri May  1 13:51:54 2020
+++ pkgsrc/multimedia/vlc/distinfo      Sun Jun  7 02:02:45 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.77 2020/05/01 13:51:54 nia Exp $
+$NetBSD: distinfo,v 1.78 2020/06/07 02:02:45 markd Exp $
 
 SHA1 (vlc-3.0.10.tar.xz) = 4b3c75d1861bf463db53ba9059e8cc165f5c30a7
 RMD160 (vlc-3.0.10.tar.xz) = b3b0d383f34dbf58e2e79729884c8b9fcdd02807
@@ -10,4 +10,7 @@ SHA1 (patch-lib_core.c) = 8ec5557424e6dd
 SHA1 (patch-lib_video.c) = 362aaf7977c264bb70a79e98cf18da923ae62e39
 SHA1 (patch-m4_dolt.m4) = a1aac0c1021001a489f9b515e218904e065ed659
 SHA1 (patch-modules_access_http_Makefile.am) = d91904c6cba1a75a6872d042e4fe87ed9ce65a22
+SHA1 (patch-modules_gui_qt_components_playlist_views.cpp) = b4f4ee5de10db5cb74769866036181e2cd481e92
+SHA1 (patch-modules_gui_qt_dialogs_plugins.cpp) = b5cffc0bd54fd07e77f891f6bca58132d333afdd
+SHA1 (patch-modules_gui_qt_util_timetooltip.hpp) = 01344f4b5df0d1f2520839143324b22f94887918
 SHA1 (patch-share_Makefile.am) = 4f126948c73159d06aef323b47a702442b5981e8

Added files:

Index: pkgsrc/multimedia/vlc/patches/patch-modules_gui_qt_components_playlist_views.cpp
diff -u /dev/null pkgsrc/multimedia/vlc/patches/patch-modules_gui_qt_components_playlist_views.cpp:1.1
--- /dev/null   Sun Jun  7 02:02:45 2020
+++ pkgsrc/multimedia/vlc/patches/patch-modules_gui_qt_components_playlist_views.cpp    Sun Jun  7 02:02:45 2020
@@ -0,0 +1,14 @@
+$NetBSD: patch-modules_gui_qt_components_playlist_views.cpp,v 1.1 2020/06/07 02:02:45 markd Exp $
+
+qt5.15 patch
+
+--- modules/gui/qt/components/playlist/views.cpp.orig  2017-11-24 15:29:17.000000000 +0000
++++ 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: pkgsrc/multimedia/vlc/patches/patch-modules_gui_qt_dialogs_plugins.cpp
diff -u /dev/null pkgsrc/multimedia/vlc/patches/patch-modules_gui_qt_dialogs_plugins.cpp:1.1
--- /dev/null   Sun Jun  7 02:02:45 2020
+++ pkgsrc/multimedia/vlc/patches/patch-modules_gui_qt_dialogs_plugins.cpp      Sun Jun  7 02:02:45 2020
@@ -0,0 +1,14 @@
+$NetBSD: patch-modules_gui_qt_dialogs_plugins.cpp,v 1.1 2020/06/07 02:02:45 markd Exp $
+
+qt5.15 patch
+
+--- modules/gui/qt/dialogs/plugins.cpp.orig    2017-11-24 15:29:17.000000000 +0000
++++ modules/gui/qt/dialogs/plugins.cpp
+@@ -53,6 +53,7 @@
+ #include <QListView>
+ #include <QListWidget>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QStyleOptionViewItem>
+ #include <QKeyEvent>
+ #include <QPushButton>
Index: pkgsrc/multimedia/vlc/patches/patch-modules_gui_qt_util_timetooltip.hpp
diff -u /dev/null pkgsrc/multimedia/vlc/patches/patch-modules_gui_qt_util_timetooltip.hpp:1.1
--- /dev/null   Sun Jun  7 02:02:45 2020
+++ pkgsrc/multimedia/vlc/patches/patch-modules_gui_qt_util_timetooltip.hpp     Sun Jun  7 02:02:45 2020
@@ -0,0 +1,14 @@
+$NetBSD: patch-modules_gui_qt_util_timetooltip.hpp,v 1.1 2020/06/07 02:02:45 markd Exp $
+
+qt5.15 patch
+
+--- modules/gui/qt/util/timetooltip.hpp.orig   2018-05-03 12:03:21.000000000 +0000
++++ modules/gui/qt/util/timetooltip.hpp
+@@ -24,6 +24,7 @@
+ 
+ #include "qt.hpp"
+ 
++#include <QPainterPath>
+ #include <QWidget>
+ 
+ class TimeTooltip : public QWidget