diff options
| author | Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> | 2021-10-11 20:03:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-11 11:03:50 -0700 |
| commit | 1d4128f08e30cec31b94500840c7eca8ebc579cb (patch) | |
| tree | aaca2568a99d89d6a6992085ae3d0eccc9aea7f9 /ports/qtbase | |
| parent | 694b757525e36c8b3bcaf1b913b23c812d2fd211 (diff) | |
| download | vcpkg-1d4128f08e30cec31b94500840c7eca8ebc579cb.tar.gz vcpkg-1d4128f08e30cec31b94500840c7eca8ebc579cb.zip | |
[qt] Fix qtmultimedia with gstreamer on windows (#20555)
* apply patches to make qtmultimedia work with gestreamer on windows
* version stuff
* remove libnice from ci.baseline
* move gstreamer on osx as fail to baseline
* add supports field to qtmultimedia. Qt does not officially support x86 on windows
* version stuff
* remove duplicated patch
* version stuff
* add upstream patch to fix x86-windows
* [skip actions] version stuff
Diffstat (limited to 'ports/qtbase')
| -rw-r--r-- | ports/qtbase/fix_qthread_max.patch | 13 | ||||
| -rw-r--r-- | ports/qtbase/portfile.cmake | 1 | ||||
| -rw-r--r-- | ports/qtbase/vcpkg.json | 2 |
3 files changed, 15 insertions, 1 deletions
diff --git a/ports/qtbase/fix_qthread_max.patch b/ports/qtbase/fix_qthread_max.patch new file mode 100644 index 000000000..9138c3c88 --- /dev/null +++ b/ports/qtbase/fix_qthread_max.patch @@ -0,0 +1,13 @@ +diff --git a/src/corelib/thread/qthread.h b/src/corelib/thread/qthread.h
+index 5dc4d2222..1696dbc80 100644
+--- a/src/corelib/thread/qthread.h
++++ b/src/corelib/thread/qthread.h
+@@ -120,7 +120,7 @@ public:
+ bool wait(QDeadlineTimer deadline = QDeadlineTimer(QDeadlineTimer::Forever));
+ bool wait(unsigned long time)
+ {
+- if (time == std::numeric_limits<unsigned long>::max())
++ if (time == (std::numeric_limits<unsigned long>::max)())
+ return wait(QDeadlineTimer(QDeadlineTimer::Forever));
+ return wait(QDeadlineTimer(time));
+ }
diff --git a/ports/qtbase/portfile.cmake b/ports/qtbase/portfile.cmake index 60a247254..fb3eca7c3 100644 --- a/ports/qtbase/portfile.cmake +++ b/ports/qtbase/portfile.cmake @@ -17,6 +17,7 @@ set(${PORT}_PATCHES fix_cmake_build.patch harfbuzz.patch fix_egl.patch + fix_qthread_max.patch ) if(NOT VCPKG_USE_HEAD_VERSION AND NOT QT_IS_LATEST) diff --git a/ports/qtbase/vcpkg.json b/ports/qtbase/vcpkg.json index 25f24be83..56b49db00 100644 --- a/ports/qtbase/vcpkg.json +++ b/ports/qtbase/vcpkg.json @@ -1,7 +1,7 @@ { "name": "qtbase", "version-semver": "6.2.0", - "port-version": 1, + "port-version": 2, "description": "Qt Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.", "homepage": "https://www.qt.io/", "dependencies": [ |