vlc | branch: master | Jean-Baptiste Kempf <[email protected]> | Tue Jun 19 11:20:09 2018 +0200| [bf633b67431cc85156d3e2a8912c08b262dedd72] | committer: Jean-Baptiste Kempf
Contribs, Qt: work-around compiler crash on Mingw/32 > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=bf633b67431cc85156d3e2a8912c08b262dedd72 --- contrib/src/qt/0001-disable-qt_random_cpu.patch | 11 +++++++++++ contrib/src/qt/rules.mak | 5 +++++ 2 files changed, 16 insertions(+) diff --git a/contrib/src/qt/0001-disable-qt_random_cpu.patch b/contrib/src/qt/0001-disable-qt_random_cpu.patch new file mode 100644 index 0000000000..a271da4e9d --- /dev/null +++ b/contrib/src/qt/0001-disable-qt_random_cpu.patch @@ -0,0 +1,11 @@ +--- qt-5.11.0/src/corelib/global/qrandom.cpp.orig 2018-06-19 11:22:03.011543136 +0200 ++++ qt-5.11.0/src/corelib/global/qrandom.cpp 2018-06-19 11:23:45.231337043 +0200 +@@ -90,7 +90,7 @@ + + QT_BEGIN_NAMESPACE + +-#if defined(Q_PROCESSOR_X86) && QT_COMPILER_SUPPORTS_HERE(RDRND) ++#if 0 + static qsizetype qt_random_cpu(void *buffer, qsizetype count) Q_DECL_NOTHROW; + + # ifdef Q_PROCESSOR_X86_64 diff --git a/contrib/src/qt/rules.mak b/contrib/src/qt/rules.mak index 3b56febcb5..9bcdee5144 100644 --- a/contrib/src/qt/rules.mak +++ b/contrib/src/qt/rules.mak @@ -22,8 +22,13 @@ $(TARBALLS)/qt-$(QT_VERSION).tar.xz: qt: qt-$(QT_VERSION).tar.xz .sum-qt $(UNPACK) mv qtbase-everywhere-src-$(QT_VERSION) qt-$(QT_VERSION) +ifdef HAVE_WIN32 $(APPLY) $(SRC)/qt/0001-Windows-QPA-prefer-lower-value-when-rounding-fractio.patch $(APPLY) $(SRC)/qt/0002-Windows-QPA-Disable-systray-notification-sounds.patch +ifndef HAVE_WIN64 + $(APPLY) $(SRC)/qt/0001-disable-qt_random_cpu.patch +endif +endif $(MOVE) ifdef HAVE_MACOSX _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
