[vlc-commits] [Git][videolan/vlc][master] 7 commits: contrib: qt: compile qt 5.15.8
Steve Lhomme (@robUx4)
gitlab at videolan.org
Fri Jan 6 05:26:13 UTC 2023
Steve Lhomme pushed to branch master at VideoLAN / VLC
Commits:
57c6de32 by Steve Lhomme at 2023-01-06T04:44:23+00:00
contrib: qt: compile qt 5.15.8
without KDE patches for now
- - - - -
389a6949 by Steve Lhomme at 2023-01-06T04:44:23+00:00
contrib: qtsvg: update to 5.15.8
- - - - -
07b4e8ec by Steve Lhomme at 2023-01-06T04:44:23+00:00
contrib: qtquickcontrols2: update to 5.15.8
- - - - -
ac5f1768 by Steve Lhomme at 2023-01-06T04:44:23+00:00
contrib: qtdeclarative: update to 5.15.8
- - - - -
7f9a03e1 by Steve Lhomme at 2023-01-06T04:44:23+00:00
contrib: qtgraphicaleffects: update to 5.15.8
- - - - -
d32ad1a6 by Steve Lhomme at 2023-01-06T04:44:23+00:00
contrib: qtwayland: update to 5.15.8
- - - - -
55d8479e by Steve Lhomme at 2023-01-06T04:44:23+00:00
contrib: qt11extras: update to 5.15.8
- - - - -
19 changed files:
- − contrib/src/qt/0003-fix-angle-compilation.patch
- − contrib/src/qt/0006-ANGLE-don-t-use-msvc-intrinsics-when-crosscompiling-.patch
- − contrib/src/qt/0010-Windows-QPA-Fix-build-with-mingw64-Win32-threading.patch
- contrib/src/qt/SHA512SUMS
- contrib/src/qt/rules.mak
- contrib/src/qt/set-mkspecs-properties.patch
- contrib/src/qtdeclarative/SHA512SUMS
- − contrib/src/qtdeclarative/fix-gcc11-build.patch
- contrib/src/qtdeclarative/rules.mak
- contrib/src/qtgraphicaleffects/SHA512SUMS
- contrib/src/qtgraphicaleffects/rules.mak
- contrib/src/qtquickcontrols2/SHA512SUMS
- contrib/src/qtquickcontrols2/rules.mak
- contrib/src/qtsvg/SHA512SUMS
- contrib/src/qtsvg/rules.mak
- contrib/src/qtwayland/SHA512SUMS
- contrib/src/qtwayland/rules.mak
- contrib/src/qtx11extras/SHA512SUMS
- contrib/src/qtx11extras/rules.mak
Changes:
=====================================
contrib/src/qt/0003-fix-angle-compilation.patch deleted
=====================================
@@ -1,76 +0,0 @@
-From 5b0815cdbdc729da3135d3a9c41d7579883f739d Mon Sep 17 00:00:00 2001
-From: Pierre Lamot <pierre at videolabs.io>
-Date: Tue, 9 Apr 2019 16:39:23 +0200
-Subject: [PATCH] allow cross-compilation of angle with wine
-
----
- src/angle/src/common/common.pri | 2 +-
- src/gui/configure.json | 2 +-
- src/gui/configure.pri | 24 ++----------------------
- 3 files changed, 4 insertions(+), 24 deletions(-)
-
-diff --git a/src/angle/src/common/common.pri b/src/angle/src/common/common.pri
-index df29269..b6bde4d 100644
---- a/src/angle/src/common/common.pri
-+++ b/src/angle/src/common/common.pri
-@@ -22,7 +22,7 @@ lib_replace.replace = \$\$\$\$[QT_INSTALL_LIBS]
- lib_replace.CONFIG = path
- QMAKE_PRL_INSTALL_REPLACE += lib_replace
-
--FXC = $$shell_quote($$shell_path($$QMAKE_FXC_LOCATION))
-+FXC = $$shell_path($$QMAKE_FXC_LOCATION)
-
- win32 {
- VERSION = $$MODULE_VERSION
-diff --git a/src/gui/configure.json b/src/gui/configure.json
-index 44140bc..53f4984 100644
---- a/src/gui/configure.json
-+++ b/src/gui/configure.json
-@@ -1106,7 +1106,7 @@
- "angle": {
- "label": "ANGLE",
- "autoDetect": "features.opengles2 || features.opengl-dynamic",
-- "condition": "features.dxguid && tests.fxc && (features.direct3d9 || (config.winrt && features.direct3d11 && libs.d3dcompiler))",
-+ "condition": "features.dxguid && tests.fxc && (features.direct3d9 || (features.direct3d11 && libs.d3dcompiler))",
- "output": [
- "publicFeature",
- { "type": "define", "name": "QT_OPENGL_ES_2_ANGLE" },
-diff --git a/src/gui/configure.pri b/src/gui/configure.pri
-index 1b95449..875e890 100644
---- a/src/gui/configure.pri
-+++ b/src/gui/configure.pri
-@@ -20,29 +20,9 @@ defineTest(qtConfLibrary_freetype) {
- # DXSDK_DIR variable. Starting with Windows Kit 8, it is included in
- # the Windows SDK.
- defineTest(qtConfTest_fxc) {
-- !mingw {
-- fxc = $$qtConfFindInPath("fxc.exe")
-- } else {
-- equals(QMAKE_HOST.arch, x86_64): \
-- fns = x64/fxc.exe
-- else: \
-- fns = x86/fxc.exe
-- dxdir = $$(DXSDK_DIR)
-- !isEmpty(dxdir) {
-- fxc = $$dxdir/Utilities/bin/$$fns
-- } else {
-- winkitbindir = $$(WindowsSdkVerBinPath)
-- !isEmpty(winkitbindir) {
-- fxc = $$winkitbindir/$$fns
-- } else {
-- winkitdir = $$(WindowsSdkDir)
-- !isEmpty(winkitdir): \
-- fxc = $$winkitdir/bin/$$fns
-- }
-- }
-- }
-+ fxc = "$$(DXSDK_DIR)/fxc2.exe"
-
-- !isEmpty(fxc):exists($$fxc) {
-+ !isEmpty(fxc) {
- $${1}.value = $$clean_path($$fxc)
- export($${1}.value)
- $${1}.cache += value
---
-2.19.1
-
=====================================
contrib/src/qt/0006-ANGLE-don-t-use-msvc-intrinsics-when-crosscompiling-.patch deleted
=====================================
@@ -1,35 +0,0 @@
-From 209447aba5fa2e6f0b60ce9baa11a2fd23b5ee8f Mon Sep 17 00:00:00 2001
-From: Pierre Lamot <pierre at videolabs.io>
-Date: Thu, 21 Mar 2019 15:46:27 +0100
-Subject: [PATCH 1/2] ANGLE: don't use msvc intrinsics when crosscompiling with
- GCC
-
----
- src/3rdparty/angle/src/common/mathutil.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/3rdparty/angle/src/common/mathutil.h b/src/3rdparty/angle/src/common/mathutil.h
-index 372e432..7e8cdfe 100644
---- a/src/3rdparty/angle/src/common/mathutil.h
-+++ b/src/3rdparty/angle/src/common/mathutil.h
-@@ -883,7 +883,7 @@
- }
-
- // Count the 1 bits.
--#if defined(ANGLE_PLATFORM_WINDOWS)
-+#if defined(_MSC_VER)
- #if defined(_M_ARM) || defined(_M_ARM64)
- inline int BitCount(uint32_t bits)
- {
-@@ -905,7 +905,7 @@
- #endif // defined(ANGLE_IS_64_BIT_CPU)
- #endif // defined(ANGLE_PLATFORM_WINDOWS)
-
--#if defined(ANGLE_PLATFORM_POSIX)
-+#if defined(__GNUC__) || defined(__clang__)
- inline int BitCount(uint32_t bits)
- {
- return __builtin_popcount(bits);
---
-2.19.1
-
=====================================
contrib/src/qt/0010-Windows-QPA-Fix-build-with-mingw64-Win32-threading.patch deleted
=====================================
@@ -1,69 +0,0 @@
-From 983132212c7f3541a8c5fbaf4c5309d92345107f Mon Sep 17 00:00:00 2001
-From: Friedemann Kleint <Friedemann.Kleint at qt.io>
-Date: Tue, 15 Sep 2020 06:17:32 +0200
-Subject: [PATCH] Windows QPA: Fix build with mingw64/Win32 threading
-
-For this build, cxx11_future is not available and thus
-QThread::create() as introduced by
-ed114b728d9dc5265333c593254d9f6527464a60 does not work.
-Revert back to implementing a QThread.
-
-Pick-to: 5.15
-Fixes: QTBUG-86575
-Task-number: QTBUG-85676
-Change-Id: I86a91f6bcdfc88804b35bf617362d92f37e51dea
-Reviewed-by: Kai Koehne <kai.koehne at qt.io>
----
- .../platforms/windows/qwindowsservices.cpp | 32 +++++++++++++++----
- 1 file changed, 25 insertions(+), 7 deletions(-)
-
-diff --git a/src/plugins/platforms/windows/qwindowsservices.cpp b/src/plugins/platforms/windows/qwindowsservices.cpp
-index 8a95cc53a85..f8d2b8f04e0 100644
---- a/src/plugins/platforms/windows/qwindowsservices.cpp
-+++ b/src/plugins/platforms/windows/qwindowsservices.cpp
-@@ -56,6 +56,26 @@ QT_BEGIN_NAMESPACE
-
- enum { debug = 0 };
-
-+class QWindowsShellExecuteThread : public QThread
-+{
-+public:
-+ explicit QWindowsShellExecuteThread(const wchar_t *path) : m_path(path) { }
-+
-+ void run() override
-+ {
-+ if (SUCCEEDED(CoInitializeEx(NULL, COINIT_APARTMENTTHREADED | COINIT_DISABLE_OLE1DDE))) {
-+ m_result = ShellExecute(nullptr, nullptr, m_path, nullptr, nullptr, SW_SHOWNORMAL);
-+ CoUninitialize();
-+ }
-+ }
-+
-+ HINSTANCE result() const { return m_result; }
-+
-+private:
-+ HINSTANCE m_result = nullptr;
-+ const wchar_t *m_path;
-+};
-+
- static quintptr runShellExecute(const wchar_t *path)
- {
- HINSTANCE result = nullptr;
-@@ -75,13 +95,11 @@ static inline bool shellExecute(const QUrl &url)
-
- // Run ShellExecute() in a thread since it may spin the event loop.
- // Prevent it from interfering with processing of posted events (QTBUG-85676).
-- quintptr result = 0;
-- quintptr *resultPtr = &result;
-- const auto path = reinterpret_cast<const wchar_t *>(nativeFilePath.utf16());
-- QScopedPointer<QThread> thread(QThread::create([path, resultPtr]
-- () { *resultPtr = runShellExecute(path); }));
-- thread->start();
-- thread->wait();
-+ QWindowsShellExecuteThread thread(reinterpret_cast<const wchar_t *>(nativeFilePath.utf16()));
-+ thread.start();
-+ thread.wait();
-+
-+ const auto result = reinterpret_cast<quintptr>(thread.result());
-
- // ShellExecute returns a value greater than 32 if successful
- if (result <= 32) {
=====================================
contrib/src/qt/SHA512SUMS
=====================================
@@ -1 +1 @@
-40b687c046b25a6717834ffe2616ee4f373d75214ec1c7e3a26502cd0cde9f0a872eaee99f06c54c7a3625ae85df5cdd3a3b54a160e8e37c7cfeb5800d026fe4 qtbase-everywhere-src-5.15.1.tar.xz
\ No newline at end of file
+29e8877bafdbc908072209f1b27a5040b022e2b71f17f4ab4cecd570adeae21597f9af7f1d38758760f3cb30376eeb15c5f066bf02c6e9a9e3a4d07f967046ce qtbase-everywhere-src-5.15.8.tar.xz
=====================================
contrib/src/qt/rules.mak
=====================================
@@ -1,10 +1,10 @@
# Qt
QT_VERSION_MAJOR := 5.15
-QT_VERSION := $(QT_VERSION_MAJOR).1
+QT_VERSION := $(QT_VERSION_MAJOR).8
# Insert potential -betaX suffix here:
QT_VERSION_FULL := $(QT_VERSION)
-QT_URL := $(QT)/$(QT_VERSION_MAJOR)/$(QT_VERSION_FULL)/submodules/qtbase-everywhere-src-$(QT_VERSION_FULL).tar.xz
+QT_URL := $(QT)/$(QT_VERSION_MAJOR)/$(QT_VERSION_FULL)/submodules/qtbase-everywhere-opensource-src-$(QT_VERSION_FULL).tar.xz
ifdef HAVE_MACOSX
#PKGS += qt
@@ -33,27 +33,12 @@ $(TARBALLS)/qtbase-everywhere-src-$(QT_VERSION_FULL).tar.xz:
qt: qtbase-everywhere-src-$(QT_VERSION_FULL).tar.xz .sum-qt
$(UNPACK)
-ifdef HAVE_WIN32
$(APPLY) $(SRC)/qt/0002-Windows-QPA-Disable-systray-notification-sounds.patch
-ifndef HAVE_WIN64
$(APPLY) $(SRC)/qt/0001-disable-qt_random_cpu.patch
-endif
- $(APPLY) $(SRC)/qt/0006-ANGLE-don-t-use-msvc-intrinsics-when-crosscompiling-.patch
$(APPLY) $(SRC)/qt/0007-ANGLE-remove-static-assert-that-can-t-be-evaluated-b.patch
$(APPLY) $(SRC)/qt/0008-ANGLE-disable-ANGLE_STD_ASYNC_WORKERS-when-compiling.patch
$(APPLY) $(SRC)/qt/0009-Add-KHRONOS_STATIC-to-allow-static-linking-on-Windows.patch
-
-ifdef HAVE_CROSS_COMPILE
$(APPLY) $(SRC)/qt/0003-allow-cross-compilation-of-angle-with-wine.patch
-ifndef HAVE_CLANG
- $(APPLY) $(SRC)/qt/0010-Windows-QPA-Fix-build-with-mingw64-Win32-threading.patch
-endif
-else
- $(APPLY) $(SRC)/qt/0003-fix-angle-compilation.patch
- cd $(UNPACK_DIR); for i in QtFontDatabaseSupport QtWindowsUIAutomationSupport QtEventDispatcherSupport QtCore; do \
- sed -i.orig -e 's,"../../../../../src,"../src,g' include/$$i/$(QT_VERSION)/$$i/private/*.h; done
-endif
-endif
$(APPLY) $(SRC)/qt/qt-fix-gcc11-build.patch
$(APPLY) $(SRC)/qt/qt-add-missing-header-darwin.patch
# force path replacement in pkg-config output files
=====================================
contrib/src/qt/set-mkspecs-properties.patch
=====================================
@@ -1,25 +1,22 @@
---- a/qmake/generators/makefile.cpp 2020-09-02 12:15:07.000000000 +0200
-+++ b/qmake/generators/makefile.cpp 2022-09-12 11:42:01.170411450 +0200
-@@ -3431,11 +3431,18 @@
- + "," + windowsifyPath(replace.toQString()) + ",gi");
- }
- }
-- if (sedargs.isEmpty()) {
-- ret += "$(INSTALL_FILE) " + escapeFilePath(src) + ' ' + escapeFilePath(dst);
-- } else {
-- ret += "$(SED) " + sedargs + ' ' + escapeFilePath(src) + " > " + escapeFilePath(dst);
-+
-+ QString escaped_src = escapeFilePath(src);
-+ if (!sedargs.isEmpty()) {
-+ int pos = src.lastIndexOf('.');
-+ QString filename = src.left(pos);
-+ QString ext = src.mid(pos + 1);
-+ escaped_src = escapeFilePath(filename + ".qmakereplace." + ext);
-+ ret += "$(SED) " + sedargs + ' ' + escapeFilePath(src) + " > "
-+ + escaped_src + " && ";
- }
-+
-+ ret += "$(INSTALL_FILE) " + escaped_src + ' ' + escapeFilePath(dst);
+--- qt/qmake/generators/makefile.cpp.orig 2022-12-09 12:33:15.756774500 +0100
++++ qt/qmake/generators/makefile.cpp 2022-12-09 12:41:41.744418400 +0100
+@@ -3471,11 +3471,16 @@ QString MakefileGenerator::installMetaFi
+ {
+ QString ret;
+ QString sedargs = createSedArgs(replace_rule);
+- if (sedargs.isEmpty()) {
+- ret = "$(INSTALL_FILE) " + escapeFilePath(src) + ' ' + escapeFilePath(dst);
+- } else {
+- ret = "$(SED) " + sedargs + ' ' + escapeFilePath(src) + " > " + escapeFilePath(dst);
++ QString escaped_src = escapeFilePath(src);
++ if (!sedargs.isEmpty()) {
++ int pos = src.lastIndexOf('.');
++ QString filename = src.left(pos);
++ QString ext = src.mid(pos + 1);
++ escaped_src = escapeFilePath(filename + ".qmakereplace." + ext);
++ ret += "$(SED) " + sedargs + ' ' + escapeFilePath(src) + " > "
++ + escaped_src + " && ";
}
++ ret += "$(INSTALL_FILE) " + escaped_src + ' ' + escapeFilePath(dst);
return ret;
}
=====================================
contrib/src/qtdeclarative/SHA512SUMS
=====================================
@@ -1 +1 @@
-193ec706b764330a2ae00614b13482b7586642f9cfd32458e8c975daa07ba25f0f9887de0918c4034f52f613b860677c09c46a3b7d07d4229446cfc0805bcccd qtdeclarative-everywhere-src-5.15.1.tar.xz
\ No newline at end of file
+c611cc1d25b7eea1da3e5932d253d024459044d8fff6a31066033ea5867dd20aeb183b2d2ba8a2ca71cf263fc1921126509212dd43ab680134e7a9df8d937d73 qtdeclarative-everywhere-src-5.15.8.tar.xz
=====================================
contrib/src/qtdeclarative/fix-gcc11-build.patch deleted
=====================================
@@ -1,11 +0,0 @@
---- qtdeclarative/src/3rdparty/masm/yarr/Yarr.h.old 2022-01-18 18:04:29.778230868 +0100
-+++ qtdeclarative/src/3rdparty/masm/yarr/Yarr.h 2022-01-18 18:04:57.625743037 +0100
-@@ -27,7 +27,7 @@
-
- #pragma once
-
--#include <limits.h>
-+#include <limits>
- #include "YarrErrorCode.h"
-
- namespace JSC { namespace Yarr {
=====================================
contrib/src/qtdeclarative/rules.mak
=====================================
@@ -1,8 +1,8 @@
# QtDeclarative
QTDECLARATIVE_VERSION_MAJOR := 5.15
-QTDECLARATIVE_VERSION := $(QTDECLARATIVE_VERSION_MAJOR).1
-QTDECLARATIVE_URL := $(QT)/$(QTDECLARATIVE_VERSION_MAJOR)/$(QTDECLARATIVE_VERSION)/submodules/qtdeclarative-everywhere-src-$(QTDECLARATIVE_VERSION).tar.xz
+QTDECLARATIVE_VERSION := $(QTDECLARATIVE_VERSION_MAJOR).8
+QTDECLARATIVE_URL := $(QT)/$(QTDECLARATIVE_VERSION_MAJOR)/$(QTDECLARATIVE_VERSION)/submodules/qtdeclarative-everywhere-opensource-src-$(QTDECLARATIVE_VERSION).tar.xz
DEPS_qtdeclarative += qt $(DEPS_qt)
@@ -21,7 +21,6 @@ $(TARBALLS)/qtdeclarative-everywhere-src-$(QTDECLARATIVE_VERSION).tar.xz:
qtdeclarative: qtdeclarative-everywhere-src-$(QTDECLARATIVE_VERSION).tar.xz .sum-qtdeclarative
$(UNPACK)
- $(APPLY) $(SRC)/qtdeclarative/fix-gcc11-build.patch
# do not build qml.exe and other useless tools
sed -i.orig 's,!wasm:!rtems ,!wasm:!rtems:!static ,' "$(UNPACK_DIR)/tools/tools.pro"
$(MOVE)
=====================================
contrib/src/qtgraphicaleffects/SHA512SUMS
=====================================
@@ -1 +1 @@
-651f8d96199b6324726fcf97eebf16a3ee40e5a9523a3c03255ca4201228b8d02314d5dd9722f59d44f09b4ff8dd722fb276b9af7f65728693a2c4ee62f781c1 qtgraphicaleffects-everywhere-src-5.15.1.tar.xz
\ No newline at end of file
+bac9d18492b7ce0092ae9e3b27bcbc2fa421531eb76b3f4c69d20eeaa0520201eca850a2cc692c38f00b8efb24015cd28f53bd892b350e3c1d1337003b399c28 qtgraphicaleffects-everywhere-src-5.15.8.tar.xz
=====================================
contrib/src/qtgraphicaleffects/rules.mak
=====================================
@@ -1,8 +1,8 @@
# QtGraphicalEffects
QTGE_VERSION_MAJOR := 5.15
-QTGE_VERSION := $(QTGE_VERSION_MAJOR).1
-QTGE_URL := $(QT)/$(QTGE_VERSION_MAJOR)/$(QTGE_VERSION)/submodules/qtgraphicaleffects-everywhere-src-$(QTGE_VERSION).tar.xz
+QTGE_VERSION := $(QTGE_VERSION_MAJOR).8
+QTGE_URL := $(QT)/$(QTGE_VERSION_MAJOR)/$(QTGE_VERSION)/submodules/qtgraphicaleffects-everywhere-opensource-src-$(QTGE_VERSION).tar.xz
DEPS_qtgraphicaleffects += qtdeclarative $(DEPS_qtdeclarative)
=====================================
contrib/src/qtquickcontrols2/SHA512SUMS
=====================================
@@ -1 +1 @@
-ecb75619e80b737e3ae214f65a5175d933f8dc7832eb4eccd469fc1cb1eb85ef5c47f81563165da2d75abf15d7c47b868e68ab758d95183371b4ef64e7c52a39 qtquickcontrols2-everywhere-src-5.15.1.tar.xz
\ No newline at end of file
+d42fd70f1d9d1d951e5a8eee886311bf70f0c9b21718b3b76b87ee38fee010c654abc82259e73883c9aca36dafcefb25e5297bf34213cafe4da6a68c4f45d816 qtquickcontrols2-everywhere-src-5.15.8.tar.xz
=====================================
contrib/src/qtquickcontrols2/rules.mak
=====================================
@@ -1,8 +1,8 @@
# QtQuickControls 2
QTQC2_VERSION_MAJOR := 5.15
-QTQC2_VERSION := $(QTQC2_VERSION_MAJOR).1
-QTQC2_URL := $(QT)/$(QTQC2_VERSION_MAJOR)/$(QTQC2_VERSION)/submodules/qtquickcontrols2-everywhere-src-$(QTQC2_VERSION).tar.xz
+QTQC2_VERSION := $(QTQC2_VERSION_MAJOR).8
+QTQC2_URL := $(QT)/$(QTQC2_VERSION_MAJOR)/$(QTQC2_VERSION)/submodules/qtquickcontrols2-everywhere-opensource-src-$(QTQC2_VERSION).tar.xz
ifdef HAVE_WIN32
PKGS += qtquickcontrols2
=====================================
contrib/src/qtsvg/SHA512SUMS
=====================================
@@ -1 +1 @@
-c0289bbce4682eef9cd87811ad11a4ce2141cb89bd026f9cc595123e6b4ebbe9e81a91b54bcf25fbf4225bc66e8a5e4f49e4fabde43e9da066583f22aab4f35f qtsvg-everywhere-src-5.15.1.tar.xz
\ No newline at end of file
+a110a815e7399fc96b0197b96e9c6dec289b9a2c38393711ccfc536c087791009f8452e222f9364b5b133930fa4dea77d7bea2f250511c0511a1a76aa511dcda qtsvg-everywhere-src-5.15.8.tar.xz
=====================================
contrib/src/qtsvg/rules.mak
=====================================
@@ -1,8 +1,8 @@
# Qt
QTSVG_VERSION_MAJOR := 5.15
-QTSVG_VERSION := $(QTSVG_VERSION_MAJOR).1
-QTSVG_URL := $(QT)/$(QTSVG_VERSION_MAJOR)/$(QTSVG_VERSION)/submodules/qtsvg-everywhere-src-$(QTSVG_VERSION).tar.xz
+QTSVG_VERSION := $(QTSVG_VERSION_MAJOR).8
+QTSVG_URL := $(QT)/$(QTSVG_VERSION_MAJOR)/$(QTSVG_VERSION)/submodules/qtsvg-everywhere-opensource-src-$(QTSVG_VERSION).tar.xz
DEPS_qtsvg += qt $(DEPS_qt)
=====================================
contrib/src/qtwayland/SHA512SUMS
=====================================
@@ -1 +1 @@
-d6619f35b3ab163372a0d49a2221c487d5936b6d9ebeb92a7fd41521c424d550eea7c5c584e07f15bde1ec5ece1bd5774845eb9956ce793e546197ffdb28d594 qtwayland-5.15.1.tar.xz
+6c6e9dc20f98d71abd7dba54ff278bf4535e70f86bfc4e6dd46c1af7c87777f045a6aba02bba3eb786f7cf383da5fb72b03e1e6ec636c8be0cde0e4e5b7b5b2d qtwayland-everywhere-src-5.15.8.tar.xz
=====================================
contrib/src/qtwayland/rules.mak
=====================================
@@ -1,19 +1,18 @@
# qtwayland
QTWAYLAND_VERSION_MAJOR := 5.15
-QTWAYLAND_VERSION := $(QTWAYLAND_VERSION_MAJOR).1
-QTWAYLAND_URL := $(QT)/$(QTWAYLAND_VERSION_MAJOR)/$(QTWAYLAND_VERSION)/submodules/qtwayland-everywhere-src-$(QTWAYLAND_VERSION).tar.xz
+QTWAYLAND_VERSION := $(QTWAYLAND_VERSION_MAJOR).8
+QTWAYLAND_URL := $(QT)/$(QTWAYLAND_VERSION_MAJOR)/$(QTWAYLAND_VERSION)/submodules/qtwayland-everywhere-opensource-src-$(QTWAYLAND_VERSION).tar.xz
DEPS_qtwayland = qtdeclarative $(DEPS_qtdeclarative)
-$(TARBALLS)/qtwayland-$(QTWAYLAND_VERSION).tar.xz:
+$(TARBALLS)/qtwayland-everywhere-src-$(QTWAYLAND_VERSION).tar.xz:
$(call download,$(QTWAYLAND_URL))
-.sum-qtwayland: qtwayland-$(QTWAYLAND_VERSION).tar.xz
+.sum-qtwayland: qtwayland-everywhere-src-$(QTWAYLAND_VERSION).tar.xz
-qtwayland: qtwayland-$(QTWAYLAND_VERSION).tar.xz .sum-qtwayland
+qtwayland: qtwayland-everywhere-src-$(QTWAYLAND_VERSION).tar.xz .sum-qtwayland
$(UNPACK)
- mv qtwayland-everywhere-src-$(QTWAYLAND_VERSION) qtwayland-$(QTWAYLAND_VERSION)
sed -i.orig '/SUBDIRS/d' "$(UNPACK_DIR)/tests/tests.pro"
sed -i.orig 's/"egl drm"/"egl"/g' \
$(UNPACK_DIR)/src/compositor/configure.json \
=====================================
contrib/src/qtx11extras/SHA512SUMS
=====================================
@@ -1 +1 @@
-59155fc97da3f7571da37dd63bed79f61580fa4df7d4886df51520ea6fe8e01e7c09f0aa9caaeaa986c0e5eac11d4479c99c892da4d075c6369b535fd505b084 qtx11extras-5.15.1.tar.xz
+a7b2cd611ec863b43cbf16a09868a9543b4dfc3c40b21c23317a3520345a9464e2ad34f884f3619fa67fdf563bc2d1a8b31d97d063766a8988454ee4a8c8e1fd qtx11extras-everywhere-src-5.15.8.tar.xz
=====================================
contrib/src/qtx11extras/rules.mak
=====================================
@@ -1,19 +1,18 @@
# qtx11extras
QTX11_VERSION_MAJOR := 5.15
-QTX11_VERSION:= $(QTX11_VERSION_MAJOR).1
-QTX11_URL := $(QT)/$(QTX11_VERSION_MAJOR)/$(QTX11_VERSION)/submodules/qtx11extras-everywhere-src-$(QTX11_VERSION).tar.xz
+QTX11_VERSION:= $(QTX11_VERSION_MAJOR).8
+QTX11_URL := $(QT)/$(QTX11_VERSION_MAJOR)/$(QTX11_VERSION)/submodules/qtx11extras-everywhere-opensource-src-$(QTX11_VERSION).tar.xz
DEPS_qtx11extras += qt $(DEPS_qt)
-$(TARBALLS)/qtx11extras-$(QTX11_VERSION).tar.xz:
+$(TARBALLS)/qtx11extras-everywhere-src-$(QTX11_VERSION).tar.xz:
$(call download,$(QTX11_URL))
-.sum-qtx11extras: qtx11extras-$(QTX11_VERSION).tar.xz
+.sum-qtx11extras: qtx11extras-everywhere-src-$(QTX11_VERSION).tar.xz
-qtx11extras: qtx11extras-$(QTX11_VERSION).tar.xz .sum-qtx11extras
+qtx11extras: qtx11extras-everywhere-src-$(QTX11_VERSION).tar.xz .sum-qtx11extras
$(UNPACK)
- mv qtx11extras-everywhere-src-$(QTX11_VERSION) qtx11extras-$(QTX11_VERSION)
$(MOVE)
.qtx11extras: qtx11extras
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/c839ffd9a6e61fb7d119838aac0b54c436a3394b...55d8479ef7046c410e0c1a08b8cdabaf44b8c6cc
--
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/c839ffd9a6e61fb7d119838aac0b54c436a3394b...55d8479ef7046c410e0c1a08b8cdabaf44b8c6cc
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance
More information about the vlc-commits
mailing list