diff options
| author | tu-maurice <valentin.gehrke@zom.bi> | 2021-01-21 20:04:20 +0100 |
|---|---|---|
| committer | tu-maurice <valentin.gehrke@zom.bi> | 2021-01-22 18:10:49 +0100 |
| commit | 6973cc608ee57c46b1398676526ba93ec5aa4ccb (patch) | |
| tree | 4fa5366b1370ba4591364945f51e9225b60d32c2 /pkgs/applications/video | |
| parent | 728097646c0911bfc7b4986745f1f915f7d4e34e (diff) | |
vlc: 3.0.11.1 -> 3.0.12
Diffstat (limited to 'pkgs/applications/video')
| -rw-r--r-- | pkgs/applications/video/vlc/default.nix | 13 | ||||
| -rw-r--r-- | pkgs/applications/video/vlc/fix-missing-includes-with-qt-5.15.patch | 37 |
2 files changed, 2 insertions, 48 deletions
diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index cab42ae3f6f72..c925eca302a87 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -24,19 +24,13 @@ with lib; stdenv.mkDerivation rec { pname = "${optionalString onlyLibVLC "lib"}vlc"; - version = "3.0.11.1"; + version = "3.0.12"; src = fetchurl { url = "http://get.videolan.org/vlc/${version}/vlc-${version}.tar.xz"; - sha256 = "1f46h0hv7fk35zg4iczlp7ib7h2jmh8m4r5klw3g2558ib9134qq"; + sha256 = "0ygqihw2c5vvzv8950dlf7rdwz1cpz1668jgyja604ljibrmix7g"; }; - patches = [ - # Couldn't find an upstream version of this patch - # https://build.opensuse.org/package/view_file/openSUSE:Factory/vlc/fix-missing-includes-with-qt-5.15.patch?expand=1 - ./fix-missing-includes-with-qt-5.15.patch - ]; - # VLC uses a *ton* of libraries for various pieces of functionality, many of # which are not included here for no other reason that nobody has mentioned # needing them @@ -67,9 +61,6 @@ stdenv.mkDerivation rec { BUILDCC = "${stdenv.cc}/bin/gcc"; postPatch = '' - substituteInPlace configure \ - --replace /bin/echo echo - substituteInPlace modules/text_renderer/freetype/platform_fonts.h --replace \ /usr/share/fonts/truetype/freefont ${freefont_ttf}/share/fonts/truetype ''; diff --git a/pkgs/applications/video/vlc/fix-missing-includes-with-qt-5.15.patch b/pkgs/applications/video/vlc/fix-missing-includes-with-qt-5.15.patch deleted file mode 100644 index d980fd2f6da87..0000000000000 --- a/pkgs/applications/video/vlc/fix-missing-includes-with-qt-5.15.patch +++ /dev/null @@ -1,37 +0,0 @@ -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> - |