Alexander Neumann 1e2c7c3d57
[qt] update port to 6.4 (#26693)
* try qt 6.4-beta4

* fix patch

* fix copyright install

* fix qtdeclarative

* always perform import prefix correction

* adjust qtmultimedia

* fix qttools

* add missing "

* fix linux ?

* fix qtmultimedia with gstreamer

* fix qtvirtualkeyboard

* fix qtwebengine

* fix qmllint regression in qtdeclarative on osx/linux

* fix details

* fix qttools deps

* fix qtdeclarative deps

* remove xcb feature

* fix hunspell patch

* bump qtbase

* add qt3d

* format manifest

* test features in CI

* pass ci baseline stuff

* vulkan is skip in ci so cannot force it.

* remove extra ,

* fix deps

* try to fix promotion

* gstreamer adjustments.

* fix gstreamer on linux

* fix gstreamer stuff

* fix x264 api import macro

* fix gst-rsp-server

* correctly replace

* promote targets....

* enable arm64 qtwebengine

* --trace-expand

* install wrapper for egl.

* add newline

* remove opengl from skip list

* add gl to link

* another try

* retry again

* test dynamic angle linkage

* retry

* link XNVCtrl

* retry

* add libxnvctrl

* retry

* retry again...

* move wrapper to angle

* revert changes to egl-reg

* more debugging

* try again

* fix stuff

* add missing ,

* egl stuff

* wrapper stuff

* fix angle

* remove double dep

* remove libxnvctrl

* format manifest

* revert trace

* bump version

* bump v

* v db

* remove trace

* v db

* refine supports

* v db

* remove qtmultimedia from baseline

* format manifest

* update all the stuff

* refine qtmultimedia

* fix qtmultimedia?

* fix stuff

* fix stuff ?

* trace again

* Try fixing qtmultimedia for static windows builds.

* is ci faster than me...?

* refine

* fix gstreamer static usage

* fix all the qt things!

* fix the path

* try getting logs.

* fix patch

* trace stuff

* only fix stuff when it needs fixing

* force lookup of system EGL. migth need a wrapper in opengl instead.

* try fixing opengl

* don't directly call _find_package

* don't search in install prefix

* retry

* disable trace

* have the correct fix for linux ?

* move angle into a subfolder. No way to deal with it otherwise on linux.

* make the wrapper do nothing

* try fixing allegro5

* lower case

* remove wrapper

* v db

* remove trace

* v db

* remove trace

* v db

* try fixing allegro5 on arm

* retry again

* try again

* revert allegro

* put on ci baseline

* v db

* v db

* bump port

* v db fix

* remove conflicting wrapper

* v db

* glib now uses pcre2

* fix gstreamer picking up egl on windows

* v db

* fix find_package call

* Add bullet feature control

* Disable Qt

* Update versions

* Remove obsolete qt patch junk

* Update versions

* v db

* comments

* v db

* v db

* v db

* v db

* restore correction lost in merge

* v db

* promote to global

* v db

* Fix minimal qtbase builds with opengl disabled

* make host dependency on qtshadertools a normal dependency in qtmultimedia.

* v db

* opengl dynamic doesn't work on !windows

* v db

Co-authored-by: Kai Pastor <dg0yt@darc.de>
2022-11-18 12:31:51 -08:00

65 lines
2.5 KiB
CMake

set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase")
include("${SCRIPT_PATH}/qt_install_submodule.cmake")
set(${PORT}_PATCHES
bump-cmake-version.patch
wrapper-fixes.patch
stack-walker-arm64.patch
)
set(TOOL_NAMES appman
appman-controller
appman-dumpqmltypes
appman-packager
appman-qmltestrunner
appman-launcher-qml
package-uploader
)
qt_download_submodule(PATCHES ${${PORT}_PATCHES})
if(QT_UPDATE_VERSION)
return()
endif()
set(qt_plugindir ${QT6_DIRECTORY_PREFIX}plugins)
set(qt_qmldir ${QT6_DIRECTORY_PREFIX}qml)
qt_cmake_configure(${_opt}
OPTIONS
-DCMAKE_FIND_PACKAGE_TARGETS_GLOBAL=ON
-DINPUT_libarchive=system
-DINPUT_libyaml=system
-DFEATURE_am_system_libyaml=ON
-DFEATURE_am_system_libarchive=ON
OPTIONS_DEBUG
OPTIONS_RELEASE)
### Need to fix one post-build.bat; Couldn't find the place where it gets generated!
if(VCPKG_TARGET_IS_WINDOWS)
set(scriptfile "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/src/tools/dumpqmltypes/CMakeFiles/appman-dumpqmltypes.dir/post-build.bat")
file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}" CURRENT_INSTALLED_DIR_NATIVE)
if(EXISTS "${scriptfile}")
vcpkg_replace_string("${scriptfile}" "${CURRENT_INSTALLED_DIR_NATIVE}\\bin" "${CURRENT_INSTALLED_DIR_NATIVE}\\debug\\bin")
endif()
endif()
vcpkg_cmake_install(ADD_BIN_TO_PATH)
qt_fixup_and_cleanup(TOOL_NAMES ${TOOL_NAMES})
qt_install_copyright("${SOURCE_PATH}")
# Switch to a more complicated script due to the one post-build script which needed fixing after configure.
# If somebody finds out how/where post-build.bat gets generated please fix it there instead.
#qt_install_submodule(PATCHES ${${PORT}_PATCHES}
# TOOL_NAMES ${TOOL_NAMES}
# CONFIGURE_OPTIONS
# --trace-expand
# -DINPUT_libarchive=system
# -DINPUT_libyaml=system
# -DFEATURE_am_system_libyaml=ON
# -DFEATURE_am_system_libarchive=ON
# CONFIGURE_OPTIONS_RELEASE
# CONFIGURE_OPTIONS_DEBUG
# )
set(VCPKG_POLICY_MISMATCHED_NUMBER_OF_BINARIES enabled) #Debug tracing libraries are only build if CMAKE_BUILD_TYPE is equal to Debug