JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vlc: 3.0.11.1 -> 3.0.12

Browse Source
This commit is contained in:
tu-maurice 2021-01-21 20:04:20 +01:00
parent 728097646c
commit 6973cc608e
2 changed files with 2 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/applications/video/vlc/default.nix
View File

@ -24,19 +24,13 @@ with lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "${optionalString onlyLibVLC "lib"}vlc"; pname = "${optionalString onlyLibVLC "lib"}vlc";
version = "3.0.11.1"; version = "3.0.12";
src = fetchurl { src = fetchurl {
url = "http://get.videolan.org/vlc/${version}/vlc-${version}.tar.xz"; 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 # 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 # which are not included here for no other reason that nobody has mentioned
# needing them # needing them
@ -67,9 +61,6 @@ stdenv.mkDerivation rec {
BUILDCC = "${stdenv.cc}/bin/gcc"; BUILDCC = "${stdenv.cc}/bin/gcc";
postPatch = '' postPatch = ''
substituteInPlace configure \
--replace /bin/echo echo
substituteInPlace modules/text_renderer/freetype/platform_fonts.h --replace \ substituteInPlace modules/text_renderer/freetype/platform_fonts.h --replace \
/usr/share/fonts/truetype/freefont ${freefont_ttf}/share/fonts/truetype /usr/share/fonts/truetype/freefont ${freefont_ttf}/share/fonts/truetype
''; '';

37
pkgs/applications/video/vlc/fix-missing-includes-with-qt-5.15.patch
View File

@ -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>