mirror of
https://github.com/feather-wallet/feather.git
synced 2024-12-22 19:49:28 +00:00
depends: qt: bump to v6.4.1
This commit is contained in:
parent
3c93c565fd
commit
708832d7fd
10 changed files with 830 additions and 1011 deletions
|
@ -1,40 +1,39 @@
|
|||
package=native_qt
|
||||
$(package)_version=6.4.0
|
||||
$(package)_version=6.4.1
|
||||
$(package)_download_path=https://download.qt.io/official_releases/qt/6.4/$($(package)_version)/submodules
|
||||
$(package)_suffix=everywhere-src-$($(package)_version).tar.xz
|
||||
$(package)_file_name=qtbase-$($(package)_suffix)
|
||||
$(package)_sha256_hash=cb6475a0bd8567c49f7ffbb072a05516ee6671171bed55db75b22b94ead9b37d
|
||||
$(package)_sha256_hash=532ad71cc0f9c8f7cb92766c47bc3d23263c60876becd9053802f9727af24fae
|
||||
$(package)_dependencies=native_cmake native_libxcb native_libxkbcommon native_libxcb_util native_libxcb_util_render native_libxcb_util_keysyms native_libxcb_util_image native_libxcb_util_wm
|
||||
$(package)_qt_libs=corelib network widgets gui plugins testlib
|
||||
$(package)_linguist_tools = lrelease lupdate lconvert
|
||||
$(package)_patches = root_CMakeLists.txt
|
||||
$(package)_patches += mac-qmake.conf
|
||||
$(package)_patches += no-xlib.patch
|
||||
$(package)_patches += dont_hardcode_pwd.patch
|
||||
$(package)_patches += qtbase-moc-ignore-gcc-macro.patch
|
||||
$(package)_patches += rcc_hardcode_timestamp.patch
|
||||
$(package)_patches = dont_hardcode_pwd.patch
|
||||
$(package)_patches += fast_fixed_dtoa_no_optimize.patch
|
||||
$(package)_patches += guix_cross_lib_path.patch
|
||||
$(package)_patches += no-statx.patch
|
||||
$(package)_patches += no-renameat2.patch
|
||||
$(package)_patches += mac-qmake.conf
|
||||
$(package)_patches += no_pthread_cond_clockwait.patch
|
||||
$(package)_patches += QTBUG-92199-fix.patch
|
||||
$(package)_patches += no-renameat2.patch
|
||||
$(package)_patches += no-statx.patch
|
||||
$(package)_patches += no-xlib.patch
|
||||
$(package)_patches += qtbase-moc-ignore-gcc-macro.patch
|
||||
$(package)_patches += rcc_hardcode_timestamp.patch
|
||||
$(package)_patches += remove-shaders.patch
|
||||
$(package)_patches += root_CMakeLists.txt
|
||||
|
||||
$(package)_qttranslations_file_name=qttranslations-$($(package)_suffix)
|
||||
$(package)_qttranslations_sha256_hash=7ab93a930b693eeb53ab97b038b4e6e057d06374e6f49a3814d99145a276925f
|
||||
$(package)_qttranslations_sha256_hash=44dbc6f1d256d2048c96fa665c240e0075c2e67188c93986a39ede3556a16a12
|
||||
|
||||
$(package)_qttools_file_name=qttools-$($(package)_suffix)
|
||||
$(package)_qttools_sha256_hash=97f3d5f88c458be7a8f7b7b08efc06c4ebad39ca51669476b18bf9e4c11afba2
|
||||
$(package)_qttools_sha256_hash=9e20562c6b04c21fbdb4ed89e59226169ffeaafaab8f45f7d81ea49b0e4b0933
|
||||
|
||||
$(package)_qtsvg_file_name=qtsvg-$($(package)_suffix)
|
||||
$(package)_qtsvg_sha256_hash=03fdae9437d074dcfa387dc1f2c6e7e14fea0f989bf7e1aa265fd35ffc2c5b25
|
||||
$(package)_qtsvg_sha256_hash=5e5345c5941567db883f9daf8ab25108c6f3a527453b1a13c62290849bce9ce5
|
||||
|
||||
$(package)_qtmultimedia_file_name=qtmultimedia-$($(package)_suffix)
|
||||
$(package)_qtmultimedia_sha256_hash=e82e8e847cae2a951a11db05b6d10a22b21e3a1d72e06a7781cce4bd197e796f
|
||||
$(package)_qtmultimedia_sha256_hash=c086d43a026e6090971fd7a697ef8370c5c455115240609cd08d5e2f840dbaaf
|
||||
|
||||
$(package)_qtshadertools_file_name=qtshadertools-$($(package)_suffix)
|
||||
$(package)_qtshadertools_sha256_hash=dbd6a5f00e8178cd2fea7e84c4eef3818de5287d34e20a68383929c754ae3b90
|
||||
$(package)_qtshadertools_sha256_hash=6bc1748326088c87f562fa3a68140e33fde162fd1333fbfecb775aeb66114504
|
||||
|
||||
$(package)_extra_sources = $($(package)_qttranslations_file_name)
|
||||
$(package)_extra_sources += $($(package)_qttools_file_name)
|
||||
|
@ -183,7 +182,6 @@ define $(package)_preprocess_cmds
|
|||
patch -p1 -i $($(package)_patch_dir)/no-statx.patch && \
|
||||
patch -p1 -i $($(package)_patch_dir)/no-renameat2.patch && \
|
||||
patch -p1 -i $($(package)_patch_dir)/no_pthread_cond_clockwait.patch && \
|
||||
patch -p1 -i $($(package)_patch_dir)/QTBUG-92199-fix.patch && \
|
||||
cd qtmultimedia && \
|
||||
patch -p1 -i $($(package)_patch_dir)/remove-shaders.patch && \
|
||||
cd .. && \
|
||||
|
|
|
@ -1,57 +1,52 @@
|
|||
package=qt
|
||||
$(package)_version=6.4.0
|
||||
$(package)_version=6.4.1
|
||||
$(package)_download_path=https://download.qt.io/official_releases/qt/6.4/$($(package)_version)/submodules
|
||||
$(package)_suffix=everywhere-src-$($(package)_version).tar.xz
|
||||
$(package)_file_name=qtbase-$($(package)_suffix)
|
||||
$(package)_sha256_hash=cb6475a0bd8567c49f7ffbb072a05516ee6671171bed55db75b22b94ead9b37d
|
||||
$(package)_sha256_hash=532ad71cc0f9c8f7cb92766c47bc3d23263c60876becd9053802f9727af24fae
|
||||
$(package)_darwin_dependencies=native_cctools native_qt openssl
|
||||
$(package)_mingw32_dependencies=openssl native_cmake native_qt native_freetype native_fontconfig native_libxkbcommon
|
||||
$(package)_linux_dependencies=openssl native_qt native_cmake native_freetype native_fontconfig libxcb libxkbcommon libxcb_util libxcb_util_render libxcb_util_keysyms libxcb_util_image libxcb_util_wm
|
||||
$(package)_qt_libs=corelib network widgets gui plugins testlib
|
||||
$(package)_linguist_tools = lrelease lupdate lconvert
|
||||
$(package)_patches = root_CMakeLists.txt
|
||||
$(package)_patches += mac-qmake.conf
|
||||
$(package)_patches += no-xlib.patch
|
||||
$(package)_patches = aarch64Toolchain.cmake
|
||||
$(package)_patches += dont_hardcode_pwd.patch
|
||||
$(package)_patches += qtbase-moc-ignore-gcc-macro.patch
|
||||
$(package)_patches += rcc_hardcode_timestamp.patch
|
||||
$(package)_patches += fast_fixed_dtoa_no_optimize.patch
|
||||
$(package)_patches += guix_cross_lib_path.patch
|
||||
$(package)_patches += no-statx.patch
|
||||
$(package)_patches += no-renameat2.patch
|
||||
$(package)_patches += no_pthread_cond_clockwait.patch
|
||||
$(package)_patches += QTBUG-92199-fix.patch
|
||||
$(package)_patches += WindowsToolchain.cmake
|
||||
$(package)_patches += windows_func_fix.patch
|
||||
$(package)_patches += fix_include_capitalization.patch
|
||||
$(package)_patches += dont_capitalize_wmf_libs.patch
|
||||
$(package)_patches += MacToolchain.cmake
|
||||
$(package)_patches += no_wraprt_on_apple.patch
|
||||
$(package)_patches += ___isOSVersionAtLeast_hack.patch
|
||||
$(package)_patches += missing-include.patch
|
||||
$(package)_patches += no-__builtin_available.patch
|
||||
$(package)_patches += no-ffmpeg.patch
|
||||
$(package)_patches += remove-shaders.patch
|
||||
$(package)_patches += aarch64Toolchain.cmake
|
||||
$(package)_patches += gnueabihfToolchain.cmake
|
||||
$(package)_patches += guix_cross_lib_path.patch
|
||||
$(package)_patches += ___isOSVersionAtLeast_hack.patch
|
||||
$(package)_patches += mac-qmake.conf
|
||||
$(package)_patches += MacToolchain.cmake
|
||||
$(package)_patches += no_pthread_cond_clockwait.patch
|
||||
$(package)_patches += no-renameat2.patch
|
||||
$(package)_patches += no-statx.patch
|
||||
$(package)_patches += no_wraprt_on_apple.patch
|
||||
$(package)_patches += no-xlib.patch
|
||||
$(package)_patches += qtbase-moc-ignore-gcc-macro.patch
|
||||
$(package)_patches += qtmultimedia-fixes.patch
|
||||
$(package)_patches += rcc_hardcode_timestamp.patch
|
||||
$(package)_patches += remove-shaders.patch
|
||||
$(package)_patches += root_CMakeLists.txt
|
||||
$(package)_patches += windows_func_fix.patch
|
||||
$(package)_patches += WindowsToolchain.cmake
|
||||
|
||||
$(package)_qttranslations_file_name=qttranslations-$($(package)_suffix)
|
||||
$(package)_qttranslations_sha256_hash=7ab93a930b693eeb53ab97b038b4e6e057d06374e6f49a3814d99145a276925f
|
||||
$(package)_qttranslations_sha256_hash=44dbc6f1d256d2048c96fa665c240e0075c2e67188c93986a39ede3556a16a12
|
||||
|
||||
$(package)_qttools_file_name=qttools-$($(package)_suffix)
|
||||
$(package)_qttools_sha256_hash=97f3d5f88c458be7a8f7b7b08efc06c4ebad39ca51669476b18bf9e4c11afba2
|
||||
$(package)_qttools_sha256_hash=9e20562c6b04c21fbdb4ed89e59226169ffeaafaab8f45f7d81ea49b0e4b0933
|
||||
|
||||
$(package)_qtsvg_file_name=qtsvg-$($(package)_suffix)
|
||||
$(package)_qtsvg_sha256_hash=03fdae9437d074dcfa387dc1f2c6e7e14fea0f989bf7e1aa265fd35ffc2c5b25
|
||||
$(package)_qtsvg_sha256_hash=5e5345c5941567db883f9daf8ab25108c6f3a527453b1a13c62290849bce9ce5
|
||||
|
||||
$(package)_qtwebsockets_file_name=qtwebsockets-$($(package)_suffix)
|
||||
$(package)_qtwebsockets_sha256_hash=ff3c6629cd6537266123c441709acdd67f231ff2a07216fc848448255bec9bca
|
||||
$(package)_qtwebsockets_sha256_hash=537789ea56403ea8a15e115d7f503c3ead630192e97ec99464810fcdb5d67a24
|
||||
|
||||
$(package)_qtmultimedia_file_name=qtmultimedia-$($(package)_suffix)
|
||||
$(package)_qtmultimedia_sha256_hash=e82e8e847cae2a951a11db05b6d10a22b21e3a1d72e06a7781cce4bd197e796f
|
||||
$(package)_qtmultimedia_sha256_hash=c086d43a026e6090971fd7a697ef8370c5c455115240609cd08d5e2f840dbaaf
|
||||
|
||||
$(package)_qtshadertools_file_name=qtshadertools-$($(package)_suffix)
|
||||
$(package)_qtshadertools_sha256_hash=dbd6a5f00e8178cd2fea7e84c4eef3818de5287d34e20a68383929c754ae3b90
|
||||
$(package)_qtshadertools_sha256_hash=6bc1748326088c87f562fa3a68140e33fde162fd1333fbfecb775aeb66114504
|
||||
|
||||
$(package)_extra_sources = $($(package)_qttranslations_file_name)
|
||||
$(package)_extra_sources += $($(package)_qttools_file_name)
|
||||
|
@ -265,21 +260,15 @@ define $(package)_preprocess_cmds
|
|||
patch -p1 -i $($(package)_patch_dir)/no-statx.patch && \
|
||||
patch -p1 -i $($(package)_patch_dir)/no-renameat2.patch && \
|
||||
patch -p1 -i $($(package)_patch_dir)/no_pthread_cond_clockwait.patch && \
|
||||
patch -p1 -i $($(package)_patch_dir)/QTBUG-92199-fix.patch && \
|
||||
patch -p1 -i $($(package)_patch_dir)/windows_func_fix.patch && \
|
||||
patch -p1 -i $($(package)_patch_dir)/fix_include_capitalization.patch && \
|
||||
patch -p1 -i $($(package)_patch_dir)/dont_capitalize_wmf_libs.patch && \
|
||||
patch -p1 -i $($(package)_patch_dir)/no_wraprt_on_apple.patch && \
|
||||
patch -p1 -i $($(package)_patch_dir)/___isOSVersionAtLeast_hack.patch && \
|
||||
patch -p1 -i $($(package)_patch_dir)/missing-include.patch && \
|
||||
patch -p1 -i $($(package)_patch_dir)/no-__builtin_available.patch && \
|
||||
mv $($(package)_patch_dir)/WindowsToolchain.cmake . && \
|
||||
mv $($(package)_patch_dir)/MacToolchain.cmake . && \
|
||||
mv $($(package)_patch_dir)/aarch64Toolchain.cmake . && \
|
||||
mv $($(package)_patch_dir)/gnueabihfToolchain.cmake . && \
|
||||
cd qtmultimedia && \
|
||||
patch -p1 -i $($(package)_patch_dir)/no-ffmpeg.patch && \
|
||||
patch -p1 -i $($(package)_patch_dir)/remove-shaders.patch && \
|
||||
patch -p1 -i $($(package)_patch_dir)/qtmultimedia-fixes.patch && \
|
||||
cd .. && \
|
||||
mkdir -p qtbase/mkspecs/macx-clang-linux &&\
|
||||
cp -f qtbase/mkspecs/macx-clang/qplatformdefs.h qtbase/mkspecs/macx-clang-linux/ &&\
|
||||
|
|
|
@ -1,59 +0,0 @@
|
|||
From c765bc51864b90ebc46c11780ccc20ad16eddd6a Mon Sep 17 00:00:00 2001
|
||||
From: tobtoht <tob@featherwallet.org>
|
||||
Date: Tue, 8 Nov 2022 00:59:36 +0100
|
||||
Subject: [PATCH] Fix QTBUG-92199
|
||||
|
||||
---
|
||||
src/widgets/styles/qstylesheetstyle.cpp | 1 -
|
||||
.../qstylesheetstyle/tst_qstylesheetstyle.cpp | 16 ----------------
|
||||
2 files changed, 17 deletions(-)
|
||||
|
||||
diff --git a/qtbase/src/widgets/styles/qstylesheetstyle.cpp b/qtbase/src/widgets/styles/qstylesheetstyle.cpp
|
||||
index 6abef62835..7aca4d5788 100644
|
||||
--- a/qtbase/src/widgets/styles/qstylesheetstyle.cpp
|
||||
+++ b/qtbase/src/widgets/styles/qstylesheetstyle.cpp
|
||||
@@ -1474,7 +1474,6 @@ void QRenderRule::configurePalette(QPalette *p, QPalette::ColorGroup cg, const Q
|
||||
p->setBrush(cg, w->foregroundRole(), pal->foreground);
|
||||
p->setBrush(cg, QPalette::WindowText, pal->foreground);
|
||||
p->setBrush(cg, QPalette::Text, pal->foreground);
|
||||
- p->setBrush(cg, QPalette::PlaceholderText, pal->foreground);
|
||||
}
|
||||
if (pal->selectionBackground.style() != Qt::NoBrush)
|
||||
p->setBrush(cg, QPalette::Highlight, pal->selectionBackground);
|
||||
diff --git a/qtbase/tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp b/qtbase/tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp
|
||||
index 82d48b1692..9add99325b 100644
|
||||
--- a/qtbase/tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp
|
||||
+++ b/qtbase/tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp
|
||||
@@ -103,7 +103,6 @@ private slots:
|
||||
void QTBUG15910_crashNullWidget();
|
||||
void QTBUG36933_brokenPseudoClassLookup();
|
||||
void styleSheetChangeBeforePolish();
|
||||
- void placeholderColor();
|
||||
void enumPropertySelector_data();
|
||||
void enumPropertySelector();
|
||||
//at the end because it mess with the style.
|
||||
@@ -2331,21 +2330,6 @@ void tst_QStyleSheetStyle::highdpiImages()
|
||||
QHighDpiScaling::updateHighDpiScaling(); // reset to normal
|
||||
}
|
||||
|
||||
-void tst_QStyleSheetStyle::placeholderColor()
|
||||
-{
|
||||
- const QColor red(Qt::red);
|
||||
- qApp->setStyleSheet("* { color: red; }");
|
||||
- QLineEdit le1;
|
||||
- QLineEdit le2;
|
||||
- le2.setEnabled(false);
|
||||
- le1.ensurePolished();
|
||||
- QCOMPARE(le1.palette().placeholderText(), red);
|
||||
- le2.ensurePolished();
|
||||
- QCOMPARE(le2.palette().placeholderText(), red);
|
||||
- le2.setEnabled(true);
|
||||
- QCOMPARE(le2.palette().placeholderText(), red);
|
||||
-}
|
||||
-
|
||||
void tst_QStyleSheetStyle::enumPropertySelector_data()
|
||||
{
|
||||
QTest::addColumn<QString>("styleSheet");
|
||||
--
|
||||
2.38.1
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
--- old/qtbase/src/tools/rcc/rcc.cpp
|
||||
+++ new/qtbase/src/tools/rcc/rcc.cpp
|
||||
@@ -207,7 +207,11 @@ void RCCFileInfo::writeDataInfo(RCCResourceLibrary &lib)
|
||||
if (lib.formatVersion() >= 2) {
|
||||
// last modified time stamp
|
||||
const QDateTime lastModified = m_fileInfo.lastModified();
|
||||
- lib.writeNumber8(quint64(lastModified.isValid() ? lastModified.toMSecsSinceEpoch() : 0));
|
||||
+ quint64 lastmod = quint64(lastModified.isValid() ? lastModified.toMSecsSinceEpoch() : 0);
|
||||
+ static const quint64 sourceDate = 1000 * qgetenv("QT_RCC_SOURCE_DATE_OVERRIDE").toULongLong();
|
||||
+ if (sourceDate != 0)
|
||||
+ lastmod = sourceDate;
|
||||
+ lib.writeNumber8(lastmod);
|
||||
if (text || pass1)
|
||||
lib.writeChar('\n');
|
||||
}
|
|
@ -1,59 +0,0 @@
|
|||
From c765bc51864b90ebc46c11780ccc20ad16eddd6a Mon Sep 17 00:00:00 2001
|
||||
From: tobtoht <tob@featherwallet.org>
|
||||
Date: Tue, 8 Nov 2022 00:59:36 +0100
|
||||
Subject: [PATCH] Fix QTBUG-92199
|
||||
|
||||
---
|
||||
src/widgets/styles/qstylesheetstyle.cpp | 1 -
|
||||
.../qstylesheetstyle/tst_qstylesheetstyle.cpp | 16 ----------------
|
||||
2 files changed, 17 deletions(-)
|
||||
|
||||
diff --git a/qtbase/src/widgets/styles/qstylesheetstyle.cpp b/qtbase/src/widgets/styles/qstylesheetstyle.cpp
|
||||
index 6abef62835..7aca4d5788 100644
|
||||
--- a/qtbase/src/widgets/styles/qstylesheetstyle.cpp
|
||||
+++ b/qtbase/src/widgets/styles/qstylesheetstyle.cpp
|
||||
@@ -1474,7 +1474,6 @@ void QRenderRule::configurePalette(QPalette *p, QPalette::ColorGroup cg, const Q
|
||||
p->setBrush(cg, w->foregroundRole(), pal->foreground);
|
||||
p->setBrush(cg, QPalette::WindowText, pal->foreground);
|
||||
p->setBrush(cg, QPalette::Text, pal->foreground);
|
||||
- p->setBrush(cg, QPalette::PlaceholderText, pal->foreground);
|
||||
}
|
||||
if (pal->selectionBackground.style() != Qt::NoBrush)
|
||||
p->setBrush(cg, QPalette::Highlight, pal->selectionBackground);
|
||||
diff --git a/qtbase/tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp b/qtbase/tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp
|
||||
index 82d48b1692..9add99325b 100644
|
||||
--- a/qtbase/tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp
|
||||
+++ b/qtbase/tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp
|
||||
@@ -103,7 +103,6 @@ private slots:
|
||||
void QTBUG15910_crashNullWidget();
|
||||
void QTBUG36933_brokenPseudoClassLookup();
|
||||
void styleSheetChangeBeforePolish();
|
||||
- void placeholderColor();
|
||||
void enumPropertySelector_data();
|
||||
void enumPropertySelector();
|
||||
//at the end because it mess with the style.
|
||||
@@ -2331,21 +2330,6 @@ void tst_QStyleSheetStyle::highdpiImages()
|
||||
QHighDpiScaling::updateHighDpiScaling(); // reset to normal
|
||||
}
|
||||
|
||||
-void tst_QStyleSheetStyle::placeholderColor()
|
||||
-{
|
||||
- const QColor red(Qt::red);
|
||||
- qApp->setStyleSheet("* { color: red; }");
|
||||
- QLineEdit le1;
|
||||
- QLineEdit le2;
|
||||
- le2.setEnabled(false);
|
||||
- le1.ensurePolished();
|
||||
- QCOMPARE(le1.palette().placeholderText(), red);
|
||||
- le2.ensurePolished();
|
||||
- QCOMPARE(le2.palette().placeholderText(), red);
|
||||
- le2.setEnabled(true);
|
||||
- QCOMPARE(le2.palette().placeholderText(), red);
|
||||
-}
|
||||
-
|
||||
void tst_QStyleSheetStyle::enumPropertySelector_data()
|
||||
{
|
||||
QTest::addColumn<QString>("styleSheet");
|
||||
--
|
||||
2.38.1
|
||||
|
|
@ -1,33 +0,0 @@
|
|||
From 2c284ef4e533b4a0f10e337b2998884c381377e6 Mon Sep 17 00:00:00 2001
|
||||
From: tobtoht <tob@featherwallet.org>
|
||||
Date: Wed, 16 Nov 2022 20:02:52 +0100
|
||||
Subject: [PATCH] don't capitalize WMF libs
|
||||
|
||||
---
|
||||
cmake/FindWMF.cmake | 10 +++++-----
|
||||
1 file changed, 5 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/qtmultimedia/cmake/FindWMF.cmake b/qtmultimedia/cmake/FindWMF.cmake
|
||||
index 7c6923c1e..b69274be5 100644
|
||||
--- a/qtmultimedia/cmake/FindWMF.cmake
|
||||
+++ b/qtmultimedia/cmake/FindWMF.cmake
|
||||
@@ -22,11 +22,11 @@ find_library(WMF_UUID_LIBRARY uuid HINTS ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES})
|
||||
find_library(WMF_MSDMO_LIBRARY msdmo HINTS ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES})
|
||||
find_library(WMF_OLE32_LIBRARY ole32 HINTS ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES})
|
||||
find_library(WMF_OLEAUT32_LIBRARY oleaut32 HINTS ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES})
|
||||
-find_library(WMF_MF_LIBRARY Mf HINTS ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES})
|
||||
-find_library(WMF_MFUUID_LIBRARY Mfuuid HINTS ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES})
|
||||
-find_library(WMF_MFPLAT_LIBRARY Mfplat HINTS ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES})
|
||||
-find_library(WMF_MFCORE_LIBRARY Mfcore HINTS ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES})
|
||||
-find_library(WMF_PROPSYS_LIBRARY Propsys HINTS ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES})
|
||||
+find_library(WMF_MF_LIBRARY mf HINTS ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES})
|
||||
+find_library(WMF_MFUUID_LIBRARY mfuuid HINTS ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES})
|
||||
+find_library(WMF_MFPLAT_LIBRARY mfplat HINTS ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES})
|
||||
+find_library(WMF_MFCORE_LIBRARY mfcore HINTS ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES})
|
||||
+find_library(WMF_PROPSYS_LIBRARY propsys HINTS ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES})
|
||||
|
||||
|
||||
set(WMF_LIBRARIES ${WMF_STRMIIDS_LIBRARY} ${WMF_AMSTRMID_LIBRARY} ${WMF_DMOGUIDS_LIBRARY} ${WMF_UUID_LIBRARY}
|
||||
--
|
||||
2.38.1
|
||||
|
|
@ -1,159 +0,0 @@
|
|||
From 97148cac4d938d426d410815ac3488ae8a970cad Mon Sep 17 00:00:00 2001
|
||||
From: tobtoht <tob@featherwallet.org>
|
||||
Date: Wed, 16 Nov 2022 19:19:16 +0100
|
||||
Subject: [PATCH] Fix include capitalization
|
||||
|
||||
---
|
||||
src/multimedia/windows/qwindowsmediadevices.cpp | 2 +-
|
||||
src/multimedia/windows/qwindowsresampler.cpp | 2 +-
|
||||
src/plugins/multimedia/ffmpeg/qwindowscamera.cpp | 4 ++--
|
||||
src/plugins/multimedia/windows/common/mfmetadata_p.h | 2 +-
|
||||
.../multimedia/windows/decoder/mfaudiodecodercontrol.cpp | 2 +-
|
||||
.../windows/mediacapture/qwindowsmediadevicereader_p.h | 4 ++--
|
||||
.../multimedia/windows/mediacapture/qwindowsmediaencoder.cpp | 2 +-
|
||||
src/plugins/multimedia/windows/player/mfplayercontrol_p.h | 2 +-
|
||||
src/plugins/multimedia/windows/player/mfplayersession.cpp | 2 +-
|
||||
src/plugins/multimedia/windows/player/mftvideo.cpp | 2 +-
|
||||
src/plugins/multimedia/windows/qwindowsvideodevices.cpp | 4 ++--
|
||||
11 files changed, 14 insertions(+), 14 deletions(-)
|
||||
|
||||
diff --git a/qtmultimedia/src/multimedia/windows/qwindowsmediadevices.cpp b/qtmultimedia/src/multimedia/windows/qwindowsmediadevices.cpp
|
||||
index c91597102..8c2df5816 100644
|
||||
--- a/qtmultimedia/src/multimedia/windows/qwindowsmediadevices.cpp
|
||||
+++ b/qtmultimedia/src/multimedia/windows/qwindowsmediadevices.cpp
|
||||
@@ -13,7 +13,7 @@
|
||||
#include <mmddk.h>
|
||||
#include <mfobjects.h>
|
||||
#include <mfidl.h>
|
||||
-#include <Mferror.h>
|
||||
+#include <mferror.h>
|
||||
#include <mmdeviceapi.h>
|
||||
#include <qwindowsmfdefs_p.h>
|
||||
|
||||
diff --git a/qtmultimedia/src/multimedia/windows/qwindowsresampler.cpp b/qtmultimedia/src/multimedia/windows/qwindowsresampler.cpp
|
||||
index 16249af84..97e8558f0 100644
|
||||
--- a/qtmultimedia/src/multimedia/windows/qwindowsresampler.cpp
|
||||
+++ b/qtmultimedia/src/multimedia/windows/qwindowsresampler.cpp
|
||||
@@ -5,7 +5,7 @@
|
||||
#include <qwindowsaudioutils_p.h>
|
||||
#include <qloggingcategory.h>
|
||||
|
||||
-#include <Wmcodecdsp.h>
|
||||
+#include <wmcodecdsp.h>
|
||||
#include <mftransform.h>
|
||||
#include <mfapi.h>
|
||||
#include <mferror.h>
|
||||
diff --git a/qtmultimedia/src/plugins/multimedia/windows/common/mfmetadata_p.h b/qtmultimedia/src/plugins/multimedia/windows/common/mfmetadata_p.h
|
||||
index 81a03b126..9ff196240 100644
|
||||
--- a/qtmultimedia/src/plugins/multimedia/windows/common/mfmetadata_p.h
|
||||
+++ b/qtmultimedia/src/plugins/multimedia/windows/common/mfmetadata_p.h
|
||||
@@ -16,7 +16,7 @@
|
||||
//
|
||||
|
||||
#include <qmediametadata.h>
|
||||
-#include "Mfidl.h"
|
||||
+#include "mfidl.h"
|
||||
|
||||
QT_USE_NAMESPACE
|
||||
|
||||
diff --git a/qtmultimedia/src/plugins/multimedia/windows/decoder/mfaudiodecodercontrol.cpp b/qtmultimedia/src/plugins/multimedia/windows/decoder/mfaudiodecodercontrol.cpp
|
||||
index 45bc70d65..0e27a2779 100644
|
||||
--- a/qtmultimedia/src/plugins/multimedia/windows/decoder/mfaudiodecodercontrol.cpp
|
||||
+++ b/qtmultimedia/src/plugins/multimedia/windows/decoder/mfaudiodecodercontrol.cpp
|
||||
@@ -4,7 +4,7 @@
|
||||
#include <system_error>
|
||||
#include <mferror.h>
|
||||
#include <qglobal.h>
|
||||
-#include "Wmcodecdsp.h"
|
||||
+#include "wmcodecdsp.h"
|
||||
#include "mfaudiodecodercontrol_p.h"
|
||||
#include <private/qwindowsaudioutils_p.h>
|
||||
|
||||
diff --git a/qtmultimedia/src/plugins/multimedia/windows/mediacapture/qwindowsmediadevicereader_p.h b/qtmultimedia/src/plugins/multimedia/windows/mediacapture/qwindowsmediadevicereader_p.h
|
||||
index 0205eafe2..4699a463a 100644
|
||||
--- a/qtmultimedia/src/plugins/multimedia/windows/mediacapture/qwindowsmediadevicereader_p.h
|
||||
+++ b/qtmultimedia/src/plugins/multimedia/windows/mediacapture/qwindowsmediadevicereader_p.h
|
||||
@@ -17,8 +17,8 @@
|
||||
|
||||
#include <mfapi.h>
|
||||
#include <mfidl.h>
|
||||
-#include <Mferror.h>
|
||||
-#include <Mfreadwrite.h>
|
||||
+#include <mferror.h>
|
||||
+#include <mfreadwrite.h>
|
||||
|
||||
#include <QtCore/qobject.h>
|
||||
#include <QtCore/qmutex.h>
|
||||
diff --git a/qtmultimedia/src/plugins/multimedia/windows/mediacapture/qwindowsmediaencoder.cpp b/qtmultimedia/src/plugins/multimedia/windows/mediacapture/qwindowsmediaencoder.cpp
|
||||
index d5eb07980..dc87afc4b 100644
|
||||
--- a/qtmultimedia/src/plugins/multimedia/windows/mediacapture/qwindowsmediaencoder.cpp
|
||||
+++ b/qtmultimedia/src/plugins/multimedia/windows/mediacapture/qwindowsmediaencoder.cpp
|
||||
@@ -8,7 +8,7 @@
|
||||
#include "mfmetadata_p.h"
|
||||
#include <QtCore/QUrl>
|
||||
#include <QtCore/QMimeType>
|
||||
-#include <Mferror.h>
|
||||
+#include <mferror.h>
|
||||
#include <shobjidl.h>
|
||||
#include <private/qmediastoragelocation_p.h>
|
||||
#include <private/qmediarecorder_p.h>
|
||||
diff --git a/qtmultimedia/src/plugins/multimedia/windows/player/mfplayercontrol_p.h b/qtmultimedia/src/plugins/multimedia/windows/player/mfplayercontrol_p.h
|
||||
index ac60e8c29..78ff71439 100644
|
||||
--- a/qtmultimedia/src/plugins/multimedia/windows/player/mfplayercontrol_p.h
|
||||
+++ b/qtmultimedia/src/plugins/multimedia/windows/player/mfplayercontrol_p.h
|
||||
@@ -15,7 +15,7 @@
|
||||
// We mean it.
|
||||
//
|
||||
|
||||
-#include "QUrl.h"
|
||||
+#include "qurl.h"
|
||||
#include "private/qplatformmediaplayer_p.h"
|
||||
|
||||
#include <QtCore/qcoreevent.h>
|
||||
diff --git a/qtmultimedia/src/plugins/multimedia/windows/player/mfplayersession.cpp b/qtmultimedia/src/plugins/multimedia/windows/player/mfplayersession.cpp
|
||||
index 152604f1d..301315b59 100644
|
||||
--- a/qtmultimedia/src/plugins/multimedia/windows/player/mfplayersession.cpp
|
||||
+++ b/qtmultimedia/src/plugins/multimedia/windows/player/mfplayersession.cpp
|
||||
@@ -32,7 +32,7 @@
|
||||
|
||||
#include <mmdeviceapi.h>
|
||||
#include <propvarutil.h>
|
||||
-#include <Functiondiscoverykeys_devpkey.h>
|
||||
+#include <functiondiscoverykeys_devpkey.h>
|
||||
|
||||
//#define DEBUG_MEDIAFOUNDATION
|
||||
|
||||
diff --git a/qtmultimedia/src/plugins/multimedia/windows/player/mftvideo.cpp b/qtmultimedia/src/plugins/multimedia/windows/player/mftvideo.cpp
|
||||
index 601c51e42..06a8769a7 100644
|
||||
--- a/qtmultimedia/src/plugins/multimedia/windows/player/mftvideo.cpp
|
||||
+++ b/qtmultimedia/src/plugins/multimedia/windows/player/mftvideo.cpp
|
||||
@@ -7,7 +7,7 @@
|
||||
#include <mferror.h>
|
||||
#include <strmif.h>
|
||||
#include <uuids.h>
|
||||
-#include <InitGuid.h>
|
||||
+#include <initguid.h>
|
||||
#include <d3d9.h>
|
||||
#include <qdebug.h>
|
||||
|
||||
diff --git a/qtmultimedia/src/plugins/multimedia/windows/qwindowsvideodevices.cpp b/qtmultimedia/src/plugins/multimedia/windows/qwindowsvideodevices.cpp
|
||||
index a6f933bd9..be52b3633 100644
|
||||
--- a/qtmultimedia/src/plugins/multimedia/windows/qwindowsvideodevices.cpp
|
||||
+++ b/qtmultimedia/src/plugins/multimedia/windows/qwindowsvideodevices.cpp
|
||||
@@ -8,11 +8,11 @@
|
||||
#include <private/qwindowsmultimediautils_p.h>
|
||||
#include <private/qwindowsiupointer_p.h>
|
||||
|
||||
-#include <Dbt.h>
|
||||
+#include <dbt.h>
|
||||
|
||||
#include <mfapi.h>
|
||||
#include <mfreadwrite.h>
|
||||
-#include <Mferror.h>
|
||||
+#include <mferror.h>
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
--
|
||||
2.38.1
|
||||
|
|
@ -1,24 +0,0 @@
|
|||
From 34d17721428fbf74340a25acc057fe96ed418d7c Mon Sep 17 00:00:00 2001
|
||||
From: tobtoht <tob@featherwallet.org>
|
||||
Date: Sat, 26 Nov 2022 21:34:39 +0100
|
||||
Subject: [PATCH] missing include
|
||||
|
||||
---
|
||||
src/plugins/multimedia/darwin/camera/qavfcamerabase.mm | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/qtmultimedia/src/plugins/multimedia/darwin/camera/qavfcamerabase.mm b/qtmultimedia/src/plugins/multimedia/darwin/camera/qavfcamerabase.mm
|
||||
index f9e353558..271849508 100644
|
||||
--- a/qtmultimedia/src/plugins/multimedia/darwin/camera/qavfcamerabase.mm
|
||||
+++ b/qtmultimedia/src/plugins/multimedia/darwin/camera/qavfcamerabase.mm
|
||||
@@ -7,6 +7,7 @@
|
||||
#include <private/qcameradevice_p.h>
|
||||
#include "qavfhelpers_p.h"
|
||||
#include <private/qplatformmediaintegration_p.h>
|
||||
+#include <QtCore/qset.h>
|
||||
|
||||
QT_USE_NAMESPACE
|
||||
|
||||
--
|
||||
2.38.1
|
||||
|
|
@ -1,26 +0,0 @@
|
|||
From fa539c42901922c1b5dfde96030b3fe38490c7ee Mon Sep 17 00:00:00 2001
|
||||
From: tobtoht <tob@featherwallet.org>
|
||||
Date: Sat, 26 Nov 2022 21:53:33 +0100
|
||||
Subject: [PATCH] no __builtin_available
|
||||
|
||||
---
|
||||
src/plugins/multimedia/darwin/qdarwinintegration.mm | 3 +--
|
||||
1 file changed, 1 insertion(+), 2 deletions(-)
|
||||
|
||||
diff --git a/qtmultimedia/src/plugins/multimedia/darwin/qdarwinintegration.mm b/qtmultimedia/src/plugins/multimedia/darwin/qdarwinintegration.mm
|
||||
index 314ceaff6..32d8a2f6e 100644
|
||||
--- a/qtmultimedia/src/plugins/multimedia/darwin/qdarwinintegration.mm
|
||||
+++ b/qtmultimedia/src/plugins/multimedia/darwin/qdarwinintegration.mm
|
||||
@@ -39,8 +39,7 @@ public:
|
||||
QDarwinIntegration::QDarwinIntegration()
|
||||
{
|
||||
#if defined(Q_OS_MACOS) && QT_MACOS_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_11_0)
|
||||
- if (__builtin_available(macOS 11.0, *))
|
||||
- VTRegisterSupplementalVideoDecoderIfAvailable(kCMVideoCodecType_VP9);
|
||||
+ VTRegisterSupplementalVideoDecoderIfAvailable(kCMVideoCodecType_VP9);
|
||||
#endif
|
||||
m_videoDevices = new QAVFVideoDevices(this);
|
||||
}
|
||||
--
|
||||
2.38.1
|
||||
|
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue