vlc | branch: master | Steve Lhomme <[email protected]> | Thu Mar 19 15:19:10 2020 +0100| [6b9589f09d3c98ae7e6cb4fc3c92d228434149ed] | committer: Steve Lhomme
contrib: qt: fix the path of Angle compiled binaries in msys The pathes generated are too long for msys > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=6b9589f09d3c98ae7e6cb4fc3c92d228434149ed --- contrib/src/qt/qt-fix-msys-long-pathes.patch | 8 ++++++++ contrib/src/qt/rules.mak | 1 + 2 files changed, 9 insertions(+) diff --git a/contrib/src/qt/qt-fix-msys-long-pathes.patch b/contrib/src/qt/qt-fix-msys-long-pathes.patch new file mode 100644 index 0000000000..42da415925 --- /dev/null +++ b/contrib/src/qt/qt-fix-msys-long-pathes.patch @@ -0,0 +1,8 @@ +--- qt/src/angle/src/common/gles_common.pri.msys 2020-03-19 15:10:05.865014200 +0100 ++++ qt/src/angle/src/common/gles_common.pri 2020-03-19 15:10:09.946228700 +0100 +@@ -1,4 +1,4 @@ +-CONFIG += simd no_batch object_parallel_to_source ++CONFIG += simd no_batch + include(common.pri) + + INCLUDEPATH += \ diff --git a/contrib/src/qt/rules.mak b/contrib/src/qt/rules.mak index fc9bb7b41a..72d60ca6f1 100644 --- a/contrib/src/qt/rules.mak +++ b/contrib/src/qt/rules.mak @@ -42,6 +42,7 @@ endif ifdef HAVE_CROSS_COMPILE $(APPLY) $(SRC)/qt/0003-allow-cross-compilation-of-angle-with-wine.patch else + $(APPLY) $(SRC)/qt/qt-fix-msys-long-pathes.patch $(APPLY) $(SRC)/qt/0003-fix-angle-compilation.patch cd $(UNPACK_DIR); for i in QtFontDatabaseSupport QtWindowsUIAutomationSupport QtEventDispatcherSupport QtCore; do \ sed -i -e 's,"../../../../../src,"../src,g' include/$$i/$(QT_VERSION)/$$i/private/*.h; done _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
