aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2020-07-29 13:03:57 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2020-07-29 13:04:07 +0000
commitf80cf501907070235f898c200d2124eb9149e8b0 (patch)
treec0adb52f9d87c068b52965c7b413ae51fe51ec8d
parentcc43f7d8dfb9a350b9d88ba8413f9dbe6c3c820b (diff)
downloadaports-f80cf501907070235f898c200d2124eb9149e8b0.tar.gz
aports-f80cf501907070235f898c200d2124eb9149e8b0.tar.bz2
aports-f80cf501907070235f898c200d2124eb9149e8b0.tar.xz
community/vlc: upgrade to 3.0.11.1 and fix build with qt 5.15
-rw-r--r--community/vlc/APKBUILD8
-rw-r--r--community/vlc/qt-5.15-QPainterPath.patch36
2 files changed, 41 insertions, 3 deletions
diff --git a/community/vlc/APKBUILD b/community/vlc/APKBUILD
index 77f7b9c792..e76c2f4f9a 100644
--- a/community/vlc/APKBUILD
+++ b/community/vlc/APKBUILD
@@ -2,8 +2,8 @@
# Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=vlc
-pkgver=3.0.11
-pkgrel=3
+pkgver=3.0.11.1
+pkgrel=0
pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
triggers="vlc-libs.trigger=/usr/lib/vlc/plugins"
pkgusers="vlc"
@@ -96,6 +96,7 @@ source="https://download.videolan.org/vlc/$pkgver/vlc-$pkgver.tar.xz
disable-sub-autodetect-fuzzy-1-test.patch
test-s390x.patch
fribidi_allow_deprecated.patch
+ qt-5.15-QPainterPath.patch
vlc.initd
vlc.confd
"
@@ -232,11 +233,12 @@ libs() {
default_libs
}
-sha512sums="8219cc46e434c7b2f12321d4e1b21eae123a546eeb22f768c463537a4a4986ab395053f8a794628cfd17236f81665f12b2b3f6867af73b102b81628204b6c444 vlc-3.0.11.tar.xz
+sha512sums="8ce1e2f11aabf847dc5c55cf21ce6d7c0419a1051b5f4795e36cd060eab82d5056e44b4c070b80af56744e6aa841ef538386d08bc3b397a444e7258b2ba3f76b vlc-3.0.11.1.tar.xz
e13e398b7bfd977f6e099bcb6cf8dc5cd5bad6dea3eff715881826246dc4329468846084aff2576de2b7fd28d3f06e7c327a6e4511a28d22e5cd198a81146c89 omxil-rpi-codecs.patch
22d80df599b8b65a5439cefbb7140af8e9530f326d54945da3769af65f37518b99ec2cc8647aafd2763324a0698280915afe043cc87e5720c4694881ed35bffa check-headless.patch
e214b407235cb3afb8bec93f20c9b42957b57e6fd3960679d3d4235e77762e03e64d03c01f00ef63d589e7c85aaad02ce6abbeeccd66b1867bc92451a5b5e9b0 disable-sub-autodetect-fuzzy-1-test.patch
c0107655249687655846a9547ca1a5670b9207443180600e7a149c69ffb96d7226787c19b018d4033db9b284c1a5faa8d7d42188ed40c3b8bb051256febf11c5 test-s390x.patch
8230a83306905cdda07fecdb6cb2b791196034775cc5c8986ab63e97cd3476317544011cbce92948059ac9f7b57ef450cd71820f0f134bc3ab3bed38463a67c3 fribidi_allow_deprecated.patch
+af12eb7bebc61cb0cb545db4fc63e26a884875534d009add1493fa05f8cc364dbc623e25f2ff9d36f6466aab39d9b5420814872d558620a88d836f99b92a8e8f qt-5.15-QPainterPath.patch
55e245190b443dde9c7215ea5210612fcca164900a9a4b025ccf0d1e3fc5206d00b52355b256974421e37c609875627f1db19f0f5a084511aec0daf677ecc9d6 vlc.initd
d89190dca1b8b2c3faca5863dc6c7e6eb24e05178e6f75ed752fd3c6a73cb8a42d2625b6e56453296b7096ea868be642ecd42745dac20e7f13fc67dd3c3c7c49 vlc.confd"
diff --git a/community/vlc/qt-5.15-QPainterPath.patch b/community/vlc/qt-5.15-QPainterPath.patch
new file mode 100644
index 0000000000..568f3e7337
--- /dev/null
+++ b/community/vlc/qt-5.15-QPainterPath.patch
@@ -0,0 +1,36 @@
+diff --git a/modules/gui/qt/components/playlist/views.cpp b/modules/gui/qt/components/playlist/views.cpp
+index 24db9d9..73c1779 100644
+--- a/modules/gui/qt/components/playlist/views.cpp
++++ b/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>
+diff --git a/modules/gui/qt/dialogs/plugins.cpp b/modules/gui/qt/dialogs/plugins.cpp
+index d233382..9ae9a63 100644
+--- a/modules/gui/qt/dialogs/plugins.cpp
++++ b/modules/gui/qt/dialogs/plugins.cpp
+@@ -66,6 +66,7 @@
+ #include <QSplitter>
+ #include <QToolButton>
+ #include <QStackedWidget>
++#include <QPainterPath>
+
+ //match the image source (width/height)
+ #define SCORE_ICON_WIDTH_SCALE 4
+diff --git a/modules/gui/qt/util/timetooltip.hpp b/modules/gui/qt/util/timetooltip.hpp
+index 6a1329e..15fcc77 100644
+--- a/modules/gui/qt/util/timetooltip.hpp
++++ b/modules/gui/qt/util/timetooltip.hpp
+@@ -24,6 +24,7 @@
+
+ #include "qt.hpp"
+
++#include <QPainterPath>
+ #include <QWidget>
+
+ class TimeTooltip : public QWidget