diff --git a/CMakeLists.txt b/CMakeLists.txt index 43011df7ea..8845f610ab 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ # CMake settings cmake_minimum_required(VERSION 3.19) -set(VCPKG_TAG 1318ab14aae14db20085441cd71366891a9c9d0c) +set(VCPKG_TAG e4fef94e1b861202de1fc0138f6e759e8216c4e9) set(QML_IMPORT_PATH ${CMAKE_SOURCE_DIR}/src/qml/imports CACHE PATH "QML import path for Qt Creator to detect custom modules properly") diff --git a/vcpkg.json b/vcpkg.json index 356a26eeda..94a161e1bd 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -56,6 +56,14 @@ "name": "qtbase", "default-features": false }, + { + "name": "qtbase", + "default-features": false, + "features": [ + "gles3" + ], + "platform": "!windows & !osx & !android" + }, { "name": "qtcharts", "features": [ diff --git a/vcpkg/ports/gstreamer/base-must-be-enabled.patch b/vcpkg/ports/gstreamer/base-must-be-enabled.patch new file mode 100644 index 0000000000..5a4d3abeb3 --- /dev/null +++ b/vcpkg/ports/gstreamer/base-must-be-enabled.patch @@ -0,0 +1,13 @@ +diff --git a/meson.build b/meson.build +index 6d07929..df015cb 100644 +--- a/meson.build ++++ b/meson.build +@@ -159,7 +159,7 @@ foreach sp : subprojects + subproj = subproject(project_name, required: is_required, default_options: default_options) + endif + +- if project_name == 'gst-plugins-base' ++ if project_name == 'gst-plugins-base' and subproj.found() + gst_base_orc_req = subproj.get_variable('orc_req', '') + if gst_base_orc_req != orc_req + error('orc_req is "@0@" but it should be "@1@" from subprojects/gst-plugins-base/meson.build' diff --git a/vcpkg/ports/gstreamer/fix-bz2-windows-debug-dependency.patch b/vcpkg/ports/gstreamer/fix-bz2-windows-debug-dependency.patch new file mode 100644 index 0000000000..2be3d28aee --- /dev/null +++ b/vcpkg/ports/gstreamer/fix-bz2-windows-debug-dependency.patch @@ -0,0 +1,26 @@ +diff --git a/subprojects/gst-plugins-bad/ext/bz2/meson.build b/subprojects/gst-plugins-bad/ext/bz2/meson.build +index 08d1596..be5fa02 100644 +--- a/subprojects/gst-plugins-bad/ext/bz2/meson.build ++++ b/subprojects/gst-plugins-bad/ext/bz2/meson.build +@@ -4,7 +4,7 @@ bz2_sources = [ + 'gstbz2enc.c', + ] + +-bz2_dep = cc.find_library('bz2', required : get_option('bz2')) ++bz2_dep = dependency('bzip2', required : get_option('bz2')) + + if bz2_dep.found() and cc.has_header_symbol('bzlib.h', 'BZ2_bzlibVersion') + gstbz2 = library('gstbz2', +diff --git a/subprojects/gst-plugins-good/gst/matroska/meson.build b/subprojects/gst-plugins-good/gst/matroska/meson.build +index d8a6a96..dd03de2 100644 +--- a/subprojects/gst-plugins-good/gst/matroska/meson.build ++++ b/subprojects/gst-plugins-good/gst/matroska/meson.build +@@ -12,7 +12,7 @@ matroska_sources = [ + 'lzo.c', + ] + +-bz2_dep = cc.find_library('bz2', required : get_option('bz2')) ++bz2_dep = dependency('bzip2', required : get_option('bz2')) + cdata.set('HAVE_BZ2', bz2_dep.found() and cc.has_header('bzlib.h')) + + gstmatroska = library('gstmatroska', diff --git a/vcpkg/ports/gstreamer/fix-clang-cl-bad.patch b/vcpkg/ports/gstreamer/fix-clang-cl-bad.patch new file mode 100644 index 0000000000..c3eeaf1e07 --- /dev/null +++ b/vcpkg/ports/gstreamer/fix-clang-cl-bad.patch @@ -0,0 +1,111 @@ +diff --git a/subprojects/gst-plugins-bad/ext/dts/meson.build b/subprojects/gst-plugins-bad/ext/dts/meson.build +index c4868a4..6b34cb7 100644 +--- a/subprojects/gst-plugins-bad/ext/dts/meson.build ++++ b/subprojects/gst-plugins-bad/ext/dts/meson.build +@@ -20,7 +20,7 @@ if not dca_dep.found() + endif + + no_warn_c_args = [] +-if cc.get_id() != 'msvc' ++if cc.get_argument_syntax() != 'msvc' + # autotools didn't use the libdca pkg-config cflags, and they + # can point to a non-existing location (/usr/include/dca) + no_warn_c_args = ['-Wno-missing-include-dirs'] +diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/d3d11/meson.build b/subprojects/gst-plugins-bad/gst-libs/gst/d3d11/meson.build +index 160080a..6acf110 100644 +--- a/subprojects/gst-plugins-bad/gst-libs/gst/d3d11/meson.build ++++ b/subprojects/gst-plugins-bad/gst-libs/gst/d3d11/meson.build +@@ -158,7 +158,7 @@ endif + + # MinGW 32bits compiler seems to be complaining about redundant-decls + # when ComPtr is in use. Let's just disable the warning +-if cc.get_id() != 'msvc' ++if cc.get_argument_syntax() != 'msvc' + extra_args = cc.get_supported_arguments([ + '-Wno-redundant-decls', + ]) +diff --git a/subprojects/gst-plugins-bad/meson.build b/subprojects/gst-plugins-bad/meson.build +index 84eeb17..1743f41 100644 +--- a/subprojects/gst-plugins-bad/meson.build ++++ b/subprojects/gst-plugins-bad/meson.build +@@ -54,7 +54,7 @@ endif + + cdata = configuration_data() + cdata.set('ENABLE_NLS', 1) + +-if cc.get_id() == 'msvc' ++if cc.get_argument_syntax() == 'msvc' + msvc_args = [ + # Ignore several spurious warnings for things gstreamer does very commonly + # If a warning is completely useless and spammy, use '/wdXXXX' to suppress it +diff --git a/subprojects/gst-plugins-bad/sys/asio/meson.build b/subprojects/gst-plugins-bad/sys/asio/meson.build +index c61ad4e..b30793c 100644 +--- a/subprojects/gst-plugins-bad/sys/asio/meson.build ++++ b/subprojects/gst-plugins-bad/sys/asio/meson.build +@@ -15,7 +15,7 @@ endif + + # FIXME: non-msvc is not tested, and unlikely supported yet because of + # tool-chain issue +-if cxx.get_id() != 'msvc' ++if cxx.get_argument_syntax() != 'msvc' + if asio_option.enabled() + error('asio plugin can only be built with MSVC') + else +diff --git a/subprojects/gst-plugins-bad/sys/d3d11/meson.build b/subprojects/gst-plugins-bad/sys/d3d11/meson.build +index 1368b79..8dd3b30 100644 +--- a/subprojects/gst-plugins-bad/sys/d3d11/meson.build ++++ b/subprojects/gst-plugins-bad/sys/d3d11/meson.build +@@ -96,7 +96,7 @@ endif + + # MinGW 32bits compiler seems to be complaining about redundant-decls + # when ComPtr is in use. Let's just disable the warning +-if cc.get_id() != 'msvc' ++if cc.get_argument_syntax() != 'msvc' + extra_mingw_args = cc.get_supported_arguments([ + '-Wno-redundant-decls', + ]) +diff --git a/subprojects/gst-plugins-bad/sys/decklink/meson.build b/subprojects/gst-plugins-bad/sys/decklink/meson.build +index d869e79a4..c7b37a7c6 100644 +--- a/subprojects/gst-plugins-bad/sys/decklink/meson.build ++++ b/subprojects/gst-plugins-bad/sys/decklink/meson.build +@@ -18,7 +18,7 @@ decklink_libs = [] + + if host_system == 'windows' + decklink_sources += ['win/DeckLinkAPIDispatch.cpp', 'win/DeckLinkAPI_i.c'] +- if cxx.get_id() == 'msvc' ++ if cxx.get_argument_syntax() == 'msvc' + # FIXME: Use commsuppwd.lib for debug builds? + comutil_dep = cxx.find_library('comsuppw', required : get_option('decklink')) + if comutil_dep.found() +diff --git a/subprojects/gst-plugins-bad/sys/mediafoundation/meson.build b/subprojects/gst-plugins-bad/sys/mediafoundation/meson.build +index 6b9a059..40713ce 100644 +--- a/subprojects/gst-plugins-bad/sys/mediafoundation/meson.build ++++ b/subprojects/gst-plugins-bad/sys/mediafoundation/meson.build +@@ -54,7 +54,7 @@ if host_system != 'windows' or mf_option.disabled() + subdir_done() + endif + +-if cc.get_id() != 'msvc' ++if cc.get_argument_syntax() != 'msvc' + if mf_option.enabled() + error('mediafoundation plugin can only be built with MSVC') + endif +diff --git a/subprojects/gst-plugins-bad/sys/msdk/meson.build b/subprojects/gst-plugins-bad/sys/msdk/meson.build +index 659b96c..92e6bc4 100644 +--- a/subprojects/gst-plugins-bad/sys/msdk/meson.build ++++ b/subprojects/gst-plugins-bad/sys/msdk/meson.build +@@ -176,12 +176,12 @@ if use_onevpl and have_mfx_ver205 + endif + + if host_machine.system() == 'windows' +- if cc.get_id() != 'msvc' and msdk_option.enabled() ++ if cc.get_argument_syntax() != 'msvc' and msdk_option.enabled() + error('msdk plugin can only be built with MSVC') + endif + legacy_stdio_dep = cc.find_library('legacy_stdio_definitions', required: get_option('msdk')) + msdk_deps = declare_dependency(dependencies: [gstd3d11_dep, legacy_stdio_dep]) +- msdk_deps_found = gstd3d11_dep.found() and legacy_stdio_dep.found() and cc.get_id() == 'msvc' ++ msdk_deps_found = d3d11_dep.found() and legacy_stdio_dep.found() and cc.get_argument_syntax() == 'msvc' + else + libdl_dep = cc.find_library('dl', required: get_option('msdk')) + libgudev_dep = dependency('gudev-1.0', required: get_option('msdk')) diff --git a/vcpkg/ports/gstreamer/fix-clang-cl-base.patch b/vcpkg/ports/gstreamer/fix-clang-cl-base.patch new file mode 100644 index 0000000000..227a7e05ba --- /dev/null +++ b/vcpkg/ports/gstreamer/fix-clang-cl-base.patch @@ -0,0 +1,13 @@ +diff --git a/subprojects/gst-plugins-base/meson.build b/subprojects/gst-plugins-base/meson.build +index c040bc9..ce9071c 100644 +--- a/subprojects/gst-plugins-base/meson.build ++++ b/subprojects/gst-plugins-base/meson.build +@@ -51,7 +51,7 @@ gst_libraries = [] + + cc = meson.get_compiler('c') + +-if cc.get_id() == 'msvc' ++if cc.get_argument_syntax() == 'msvc' + msvc_args = [ + # Ignore several spurious warnings for things gstreamer does very commonly + # If a warning is completely useless and spammy, use '/wdXXXX' to suppress it diff --git a/vcpkg/ports/gstreamer/fix-clang-cl-good.patch b/vcpkg/ports/gstreamer/fix-clang-cl-good.patch new file mode 100644 index 0000000000..10be6030a4 --- /dev/null +++ b/vcpkg/ports/gstreamer/fix-clang-cl-good.patch @@ -0,0 +1,22 @@ +diff --git a/subprojects/gst-plugins-good/meson.build b/subprojects/gst-plugins-good/meson.build +index 64705379f..0c55b9732 100644 +--- a/subprojects/gst-plugins-good/meson.build ++++ b/subprojects/gst-plugins-good/meson.build +@@ -30,7 +30,7 @@ plugins = [] + cc = meson.get_compiler('c') + host_system = host_machine.system() + +-if cc.get_id() == 'msvc' ++if cc.get_argument_syntax() == 'msvc' + msvc_args = [ + # Ignore several spurious warnings for things gstreamer does very commonly + # If a warning is completely useless and spammy, use '/wdXXXX' to suppress it +@@ -183,7 +183,7 @@ cdata.set('SIZEOF_OFF_T', cc.sizeof('off_t')) + # Here be fixmes. + # FIXME: check if this is correct + cdata.set('HAVE_CPU_X86_64', host_machine.cpu() == 'amd64') +-cdata.set('HAVE_GCC_ASM', cc.get_id() != 'msvc') ++cdata.set('HAVE_GCC_ASM', cc.get_argument_syntax() != 'msvc') + cdata.set_quoted('VERSION', gst_version) + cdata.set_quoted('PACKAGE_VERSION', gst_version) + cdata.set_quoted('GST_LICENSE', 'LGPL') diff --git a/vcpkg/ports/gstreamer/fix-clang-cl-gstreamer.patch b/vcpkg/ports/gstreamer/fix-clang-cl-gstreamer.patch new file mode 100644 index 0000000000..a89167b303 --- /dev/null +++ b/vcpkg/ports/gstreamer/fix-clang-cl-gstreamer.patch @@ -0,0 +1,39 @@ +diff --git a/subprojects/gstreamer/gst/parse/meson.build b/subprojects/gstreamer/gst/parse/meson.build +index b79a07c..891f907 100644 +--- a/subprojects/gstreamer/gst/parse/meson.build ++++ b/subprojects/gstreamer/gst/parse/meson.build +@@ -16,7 +16,7 @@ else + endif + + flex_cdata.set('FLEX', flex.full_path()) +-if cc.get_id() == 'msvc' ++if cc.get_argument_syntax() == 'msvc' + flex_cdata.set('FLEX_ARGS', '--nounistd') + else + flex_cdata.set('FLEX_ARGS', '') +diff --git a/subprojects/gstreamer/meson.build b/subprojects/gstreamer/meson.build +index 941bedc..cd37a40 100644 +--- a/subprojects/gstreamer/meson.build ++++ b/subprojects/gstreamer/meson.build +@@ -47,7 +47,7 @@ endif + + cdata = configuration_data() + +-if cc.get_id() == 'msvc' ++if cc.get_argument_syntax() == 'msvc' + msvc_args = [ + # Ignore several spurious warnings for things gstreamer does very commonly + # If a warning is completely useless and spammy, use '/wdXXXX' to suppress it +@@ -347,8 +347,10 @@ static __uint128_t v2 = 10; + static __uint128_t u; + u = v1 / v2; + }''' +-if cc.compiles(uint128_t_src, name : '__uint128_t available') +- cdata.set('HAVE_UINT128_T', 1) ++if cc.get_argument_syntax() != 'msvc' ++ if cc.compiles(uint128_t_src, name : '__uint128_t available') ++ cdata.set('HAVE_UINT128_T', 1) ++ endif + endif + + # All supported platforms have long long now diff --git a/vcpkg/ports/gstreamer/fix-clang-cl-ugly.patch b/vcpkg/ports/gstreamer/fix-clang-cl-ugly.patch new file mode 100644 index 0000000000..100b6a7b62 --- /dev/null +++ b/vcpkg/ports/gstreamer/fix-clang-cl-ugly.patch @@ -0,0 +1,13 @@ +diff --git a/subprojects/gst-plugins-ugly/meson.build b/subprojects/gst-plugins-ugly/meson.build +index 14be48c4c..83d019874 100644 +--- a/subprojects/gst-plugins-ugly/meson.build ++++ b/subprojects/gst-plugins-ugly/meson.build +@@ -31,7 +31,7 @@ if have_cxx + cxx = meson.get_compiler('cpp') + endif + +-if cc.get_id() == 'msvc' ++if cc.get_argument_syntax() == 'msvc' + msvc_args = [ + # Ignore several spurious warnings for things gstreamer does very commonly + # If a warning is completely useless and spammy, use '/wdXXXX' to suppress it diff --git a/vcpkg/ports/gstreamer/fix-clang-cl.patch b/vcpkg/ports/gstreamer/fix-clang-cl.patch new file mode 100644 index 0000000000..ac00b9e135 --- /dev/null +++ b/vcpkg/ports/gstreamer/fix-clang-cl.patch @@ -0,0 +1,22 @@ +diff --git a/meson.build b/meson.build +index 1316366ed..daeaf3cb1 100644 +--- a/meson.build ++++ b/meson.build +@@ -62,7 +62,7 @@ endif + # Ensure that MSVC interprets all source code as UTF-8. Only do this when we're + # not a subproject, because subprojects are not allowed to call + # add_global_arguments(). +-if not meson.is_subproject() and cc.get_id() == 'msvc' ++if not meson.is_subproject() and cc.get_argument_syntax() == 'msvc' + add_global_arguments( + cc.get_supported_arguments(['/utf-8']), # set the input encoding to utf-8 + language: ['c', 'cpp']) +@@ -316,7 +316,7 @@ if get_option('default_library') == 'static' + if cc.has_link_argument(link_arg) + gstfull_link_args += link_arg + link_deps += symbol_map +- elif cc.get_id() == 'msvc' ++ elif cc.get_argument_syntax() == 'msvc' + warning('FIXME: Provide a def file to publish the public symbols') + else + warning('FIXME: Linker does not support the supplied version script (' + symbol_map + '), please disable the "gst-full-version-script" option') diff --git a/vcpkg/ports/gstreamer/gstreamer-disable-no-unused.patch b/vcpkg/ports/gstreamer/gstreamer-disable-no-unused.patch new file mode 100644 index 0000000000..971d802959 --- /dev/null +++ b/vcpkg/ports/gstreamer/gstreamer-disable-no-unused.patch @@ -0,0 +1,14 @@ +diff --git a/subprojects/gstreamer/meson.build b/subprojects/gstreamer/meson.build +index bed8c4e..772809e 100644 +--- a/subprojects/gstreamer/meson.build ++++ b/subprojects/gstreamer/meson.build +@@ -435,8 +435,8 @@ if cc.has_header('execinfo.h') + endif + endif + + gst_debug = get_option('gst_debug') +-if not gst_debug ++if not gst_debug and cc.has_argument('-Wno-unused') + add_project_arguments(['-Wno-unused'], language: 'c') + endif + diff --git a/vcpkg/ports/gstreamer/no-downloads.patch b/vcpkg/ports/gstreamer/no-downloads.patch new file mode 100644 index 0000000000..caf1280217 --- /dev/null +++ b/vcpkg/ports/gstreamer/no-downloads.patch @@ -0,0 +1,17 @@ +diff --git a/meson.build b/meson.build +index df015cb..93cf7e9 100644 +--- a/meson.build ++++ b/meson.build +@@ -105,12 +105,6 @@ subprojects = [ + ['gst-plugins-rs', { 'option': get_option('rs'), 'build-hotdoc': true, 'match_gst_version': false}], + ] + +-if build_system == 'windows' +- subproject('win-flex-bison-binaries') +- subproject('win-nasm') +-elif build_system == 'darwin' +- subproject('macos-bison-binary') +-endif + + orc_option = get_option('orc') + # There is a check below to keep this in sync with subprojects/gst-plugins-base/meson.build diff --git a/vcpkg/ports/gstreamer/plugin-base-disable-no-unused.patch b/vcpkg/ports/gstreamer/plugin-base-disable-no-unused.patch new file mode 100644 index 0000000000..f8c249d961 --- /dev/null +++ b/vcpkg/ports/gstreamer/plugin-base-disable-no-unused.patch @@ -0,0 +1,26 @@ +diff --git a/subprojects/gst-plugins-base/meson.build b/subprojects/gst-plugins-base/meson.build +index 9b00253..495671e 100644 +--- a/subprojects/gst-plugins-base/meson.build ++++ b/subprojects/gst-plugins-base/meson.build +@@ -388,10 +388,11 @@ int32x4_t testfunc(int16_t *a, int16_t *b) { + endif + endif + ++build_system = build_machine.system() + if gst_dep.type_name() == 'internal' + gst_proj = subproject('gstreamer') + +- if not gst_proj.get_variable('gst_debug') ++ if not gst_proj.get_variable('gst_debug') and build_system != 'windows' + message('GStreamer debug system is disabled') + add_project_arguments('-Wno-unused', language: 'c') + else +@@ -404,7 +405,7 @@ else + #include + #ifdef GST_DISABLE_GST_DEBUG + #error "debugging disabled, make compiler fail" +-#endif''' , dependencies: gst_dep) ++#endif''' , dependencies: gst_dep) and build_system != 'windows' + message('GStreamer debug system is disabled') + add_project_arguments('-Wno-unused', language: 'c') + else diff --git a/vcpkg/ports/gstreamer/plugins-base-x11.patch b/vcpkg/ports/gstreamer/plugins-base-x11.patch new file mode 100644 index 0000000000..f42551948c --- /dev/null +++ b/vcpkg/ports/gstreamer/plugins-base-x11.patch @@ -0,0 +1,13 @@ +diff --git a/subprojects/gst-plugins-base/meson.build b/subprojects/gst-plugins-base/meson.build +index 9b00253a0f..e3c3a0d920 100644 +--- a/subprojects/gst-plugins-base/meson.build ++++ b/subprojects/gst-plugins-base/meson.build +@@ -316,7 +316,7 @@ else + gtk_quartz_dep = dependency('', required : false) + endif + +-core_conf.set('HAVE_X11', x11_dep.found()) ++core_conf.set('HAVE_X11', false) + core_conf.set('HAVE_GIO_UNIX_2_0', giounix_dep.found()) + + if gio_dep.type_name() == 'pkgconfig' diff --git a/vcpkg/ports/gstreamer/portfile.cmake b/vcpkg/ports/gstreamer/portfile.cmake new file mode 100644 index 0000000000..86a4068c84 --- /dev/null +++ b/vcpkg/ports/gstreamer/portfile.cmake @@ -0,0 +1,420 @@ +if(VCPKG_TARGET_IS_WINDOWS) + set(PATCHES + plugin-base-disable-no-unused.patch + ) +endif() + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org + OUT_SOURCE_PATH SOURCE_PATH + REPO gstreamer/gstreamer + REF "${VERSION}" + SHA512 0d69896d0a83452320df0d0f56c710df1365a259cd3f48dc7cd4df18d45b27caea7174aafa15ae5eb8637ccdef192c1047185b369b7232db4eaacbc57ffaaa22 + HEAD_REF main + PATCHES + fix-clang-cl.patch + fix-clang-cl-gstreamer.patch + fix-clang-cl-base.patch + fix-clang-cl-good.patch + fix-clang-cl-bad.patch + fix-clang-cl-ugly.patch + gstreamer-disable-no-unused.patch + srtp_fix.patch + fix-bz2-windows-debug-dependency.patch + base-must-be-enabled.patch + no-downloads.patch + ${PATCHES} +) + +vcpkg_find_acquire_program(FLEX) +vcpkg_find_acquire_program(BISON) +vcpkg_find_acquire_program(NASM) + +if(VCPKG_TARGET_IS_OSX) + # In Darwin platform, there can be an old version of `bison`, + # Which can't be used for `gst-build`. It requires 2.4+ + execute_process( + COMMAND ${BISON} --version + OUTPUT_VARIABLE BISON_OUTPUT + ) + string(REGEX MATCH "([0-9]+)\\.([0-9]+)\\.([0-9]+)" BISON_VERSION "${BISON_OUTPUT}") + set(BISON_MAJOR ${CMAKE_MATCH_1}) + set(BISON_MINOR ${CMAKE_MATCH_2}) + message(STATUS "Using bison: ${BISON_MAJOR}.${BISON_MINOR}.${CMAKE_MATCH_3}") + if(NOT (BISON_MAJOR GREATER_EQUAL 2 AND BISON_MINOR GREATER_EQUAL 4)) + message(WARNING "'bison' upgrade is required. Please check the https://stackoverflow.com/a/35161881") + endif() +endif() + +# General features +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + gpl gpl + libav libav + nls nls + ges ges + + plugins-base base + gl-graphene gst-plugins-base:gl-graphene + alsa gst-plugins-base:alsa + ogg gst-plugins-base:ogg + opus-base gst-plugins-base:opus + pango gst-plugins-base:pango + vorbis gst-plugins-base:vorbis + x11-base gst-plugins-base:x11 + x11-base gst-plugins-base:xshm + + plugins-good good + bzip2-good gst-plugins-good:bz2 + cairo gst-plugins-good:cairo + flac gst-plugins-good:flac + gdk-pixbuf gst-plugins-good:gdk-pixbuf + jpeg gst-plugins-good:jpeg + mpg123 gst-plugins-good:mpg123 + png gst-plugins-good:png + speex gst-plugins-good:speex + taglib gst-plugins-good:taglib + vpx gst-plugins-good:vpx + + plugins-ugly ugly + x264 gst-plugins-ugly:x264 + + plugins-bad bad + aes gst-plugins-bad:aes + aom gst-plugins-bad:aom + assrender gst-plugins-bad:assrender + bzip2-bad gst-plugins-bad:bz2 + chromaprint gst-plugins-bad:chromaprint + closedcaption gst-plugins-bad:closedcaption + colormanagement gst-plugins-bad:colormanagement + dash gst-plugins-bad:dash + dc1394 gst-plugins-bad:dc1394 + dtls gst-plugins-bad:dtls + faad gst-plugins-bad:faad + fdkaac gst-plugins-bad:fdkaac + fluidsynth gst-plugins-bad:fluidsynth + libde265 gst-plugins-bad:libde265 + microdns gst-plugins-bad:microdns + modplug gst-plugins-bad:modplug + nvcodec gst-plugins-bad:nvcodec + openal gst-plugins-bad:openal + openh264 gst-plugins-bad:openh264 + openjpeg gst-plugins-bad:openjpeg + openmpt gst-plugins-bad:openmpt + opus-bad gst-plugins-bad:opus + smoothstreaming gst-plugins-bad:smoothstreaming + sndfile gst-plugins-bad:sndfile + soundtouch gst-plugins-bad:soundtouch + srt gst-plugins-bad:srt + srtp gst-plugins-bad:srtp + webp gst-plugins-bad:webp + webrtc gst-plugins-bad:webrtc + wildmidi gst-plugins-bad:wildmidi + x11-bad gst-plugins-bad:x11 + x265 gst-plugins-bad:x265 + asio gst-plugins-bad:asio +) + +string(REPLACE "OFF" "disabled" FEATURE_OPTIONS "${FEATURE_OPTIONS}") +string(REPLACE "ON" "enabled" FEATURE_OPTIONS "${FEATURE_OPTIONS}") + +if(VCPKG_TARGET_IS_WINDOWS) + set(PLUGIN_BASE_WINDOW_SYSTEM win32) + set(PLUGIN_BASE_GL_PLATFORM wgl) +else() + set(PLUGIN_BASE_WINDOW_SYSTEM auto) + set(PLUGIN_BASE_GL_PLATFORM auto) +endif() + +if("asio" IN_LIST FEATURES) + set(PLUGIN_BAD_ASIO_SDK_PATH ${CURRENT_INSTALLED_DIR}/include/asiosdk) +else() + set(PLUGIN_BAD_ASIO_SDK_PATH "") +endif() + +# +# References +# https://gitlab.freedesktop.org/gstreamer/gstreamer/-/blob/1.20.4/subprojects/gstreamer/meson_options.txt +# https://gitlab.freedesktop.org/gstreamer/gstreamer/-/blob/1.20.4/subprojects/gst-plugins-base/meson_options.txt +# https://gitlab.freedesktop.org/gstreamer/gstreamer/-/blob/1.20.4/subprojects/gst-plugins-good/meson_options.txt +# https://gitlab.freedesktop.org/gstreamer/gstreamer/-/blob/1.20.4/subprojects/gst-plugins-ugly/meson_options.txt +# https://gitlab.freedesktop.org/gstreamer/gstreamer/-/blob/1.20.4/subprojects/gst-plugins-bad/meson_options.txt +# +# Rationale for added options +# Common options are added below systematically +# Feature options are added below only if the feature needs an external dependency +# Feature options that are dependent on the operating system type (like wasapi or osxaudio) are set to auto +# Every other feature options are made available if the dependency is available on vcpkg and if the plugin has managed to build during tests +# + +vcpkg_configure_meson( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + # General options + -Dpython=disabled + -Dlibnice=disabled + -Ddevtools=disabled + -Drtsp_server=disabled + -Domx=disabled + -Dvaapi=disabled + -Dsharp=disabled + -Drs=disabled + -Dgst-examples=disabled + -Dtls=disabled + -Dqt5=disabled + # Common options + -Dtests=disabled + -Dexamples=disabled + -Dintrospection=disabled + -Dorc=disabled # gstreamer requires a specific version of orc which is not available in vcpkg + -Ddoc=disabled + -Dgtk_doc=disabled + # gstreamer + -Dgstreamer:check=disabled + -Dgstreamer:libunwind=disabled + -Dgstreamer:libdw=disabled + -Dgstreamer:dbghelp=disabled + -Dgstreamer:bash-completion=disabled + -Dgstreamer:coretracers=disabled + -Dgstreamer:benchmarks=disabled + -Dgstreamer:gst_debug=true + # gst-plugins-base + -Dgst-plugins-base:gl_winsys=${PLUGIN_BASE_WINDOW_SYSTEM} + -Dgst-plugins-base:gl_platform=${PLUGIN_BASE_GL_PLATFORM} + -Dgst-plugins-base:cdparanoia=disabled + -Dgst-plugins-base:libvisual=disabled + -Dgst-plugins-base:theora=disabled + -Dgst-plugins-base:tremor=disabled + -Dgst-plugins-base:xvideo=disabled + # gst-plugins-good + -Dgst-plugins-good:aalib=disabled + -Dgst-plugins-good:directsound=auto + -Dgst-plugins-good:dv=disabled + -Dgst-plugins-good:dv1394=disabled + -Dgst-plugins-good:gtk3=disabled # GTK version 3 only + -Dgst-plugins-good:jack=disabled + -Dgst-plugins-good:lame=disabled + -Dgst-plugins-good:libcaca=disabled + -Dgst-plugins-good:oss=disabled + -Dgst-plugins-good:oss4=disabled + -Dgst-plugins-good:osxaudio=auto + -Dgst-plugins-good:osxvideo=auto + -Dgst-plugins-good:pulse=auto + -Dgst-plugins-good:qt5=disabled + -Dgst-plugins-good:shout2=disabled + #-Dgst-plugins-good:soup=disabled + -Dgst-plugins-good:twolame=disabled + -Dgst-plugins-good:waveform=auto + -Dgst-plugins-good:wavpack=disabled # Error during plugin build + # gst-plugins-ugly + -Dgst-plugins-ugly:a52dec=disabled + -Dgst-plugins-ugly:amrnb=disabled + -Dgst-plugins-ugly:amrwbdec=disabled + -Dgst-plugins-ugly:cdio=disabled + -Dgst-plugins-ugly:dvdread=disabled + -Dgst-plugins-ugly:mpeg2dec=disabled # libmpeg2 not found + -Dgst-plugins-ugly:sidplay=disabled + # gst-plugins-bad + -Dgst-plugins-bad:avtp=disabled + -Dgst-plugins-bad:androidmedia=auto + -Dgst-plugins-bad:applemedia=auto + -Dgst-plugins-bad:asio-sdk-path=${PLUGIN_BAD_ASIO_SDK_PATH} + -Dgst-plugins-bad:bluez=disabled + -Dgst-plugins-bad:bs2b=disabled + -Dgst-plugins-bad:curl=disabled # Error during plugin build + -Dgst-plugins-bad:curl-ssh2=disabled + -Dgst-plugins-bad:d3dvideosink=auto + -Dgst-plugins-bad:d3d11=auto + -Dgst-plugins-bad:decklink=disabled + -Dgst-plugins-bad:directfb=disabled + -Dgst-plugins-bad:directsound=auto + -Dgst-plugins-bad:dts=disabled + -Dgst-plugins-bad:dvb=auto + -Dgst-plugins-bad:faac=disabled + -Dgst-plugins-bad:fbdev=auto + -Dgst-plugins-bad:flite=disabled + -Dgst-plugins-bad:gl=auto + -Dgst-plugins-bad:gme=disabled + -Dgst-plugins-bad:gs=disabled # Error during plugin configuration (abseil pkg-config file missing) + -Dgst-plugins-bad:gsm=disabled + -Dgst-plugins-bad:ipcpipeline=auto + -Dgst-plugins-bad:iqa=disabled + -Dgst-plugins-bad:kate=disabled + -Dgst-plugins-bad:kms=disabled + -Dgst-plugins-bad:ladspa=disabled + -Dgst-plugins-bad:ldac=disabled + -Dgst-plugins-bad:lv2=disabled # Error during plugin configuration (lilv pkg-config file missing) + -Dgst-plugins-bad:mediafoundation=auto + -Dgst-plugins-bad:mpeg2enc=disabled + -Dgst-plugins-bad:mplex=disabled + -Dgst-plugins-bad:msdk=disabled + -Dgst-plugins-bad:musepack=disabled + -Dgst-plugins-bad:neon=disabled + -Dgst-plugins-bad:onnx=disabled # libonnxruntime not found + -Dgst-plugins-bad:openaptx=disabled + -Dgst-plugins-bad:opencv=disabled # opencv not found + -Dgst-plugins-bad:openexr=disabled # OpenEXR::IlmImf target not found + -Dgst-plugins-bad:openni2=disabled # libopenni2 not found + -Dgst-plugins-bad:opensles=disabled + -Dgst-plugins-bad:qroverlay=disabled + -Dgst-plugins-bad:resindvd=disabled + -Dgst-plugins-bad:rsvg=disabled # librsvg-2.0 not found + -Dgst-plugins-bad:rtmp=disabled # librtmp not found + -Dgst-plugins-bad:sbc=disabled + -Dgst-plugins-bad:sctp=auto + -Dgst-plugins-bad:shm=disabled + -Dgst-plugins-bad:spandsp=disabled + -Dgst-plugins-bad:svthevcenc=disabled + -Dgst-plugins-bad:teletext=disabled + -Dgst-plugins-bad:tinyalsa=disabled + -Dgst-plugins-bad:transcode=disabled + -Dgst-plugins-bad:ttml=disabled + -Dgst-plugins-bad:uvch264=disabled + -Dgst-plugins-bad:va=disabled + -Dgst-plugins-bad:voaacenc=disabled + -Dgst-plugins-bad:voamrwbenc=disabled + -Dgst-plugins-bad:vulkan=auto + -Dgst-plugins-bad:wasapi=auto + -Dgst-plugins-bad:wasapi2=auto + -Dgst-plugins-bad:wayland=auto + -Dgst-plugins-bad:winks=disabled + -Dgst-plugins-bad:winscreencap=auto + -Dgst-plugins-bad:zbar=disabled # Error during plugin build + -Dgst-plugins-bad:zxing=disabled # Error during plugin build + -Dgst-plugins-bad:wpe=disabled + -Dgst-plugins-bad:magicleap=disabled + -Dgst-plugins-bad:v4l2codecs=disabled + -Dgst-plugins-bad:isac=disabled + OPTIONS_RELEASE + -Dgobject-cast-checks=disabled + -Dglib-asserts=disabled + -Dglib-checks=disabled + -Dgstreamer:extra-checks=disabled + ADDITIONAL_BINARIES + flex='${FLEX}' + bison='${BISON}' + nasm='${NASM}' + glib-genmarshal='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-genmarshal' + glib-mkenums='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-mkenums' +) + +vcpkg_install_meson() + +# Remove duplicated GL headers (we already have `opengl-registry`) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/KHR" + "${CURRENT_PACKAGES_DIR}/include/GL" +) + +if(NOT VCPKG_TARGET_IS_LINUX AND "plugins-base" IN_LIST FEATURES) + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/gstreamer-1.0/include/gst/gl/gstglconfig.h" + "${CURRENT_PACKAGES_DIR}/include/gstreamer-1.0/gst/gl/gstglconfig.h" + ) +endif() + +list(APPEND GST_BIN_TOOLS + gst-inspect-1.0 + gst-launch-1.0 + gst-stats-1.0 + gst-typefind-1.0 +) +list(APPEND GST_LIBEXEC_TOOLS + gst-plugin-scanner +) + +if("ges" IN_LIST FEATURES) + list(APPEND GST_BIN_TOOLS ges-launch-1.0) +endif() + +if("plugins-base" IN_LIST FEATURES) + list(APPEND GST_BIN_TOOLS + gst-device-monitor-1.0 + gst-discoverer-1.0 + gst-play-1.0 + ) +endif() + +if("plugins-bad" IN_LIST FEATURES) + list(APPEND GST_BIN_TOOLS + gst-transcoder-1.0 + ) +endif() + +vcpkg_copy_tools( + TOOL_NAMES ${GST_BIN_TOOLS} + AUTO_CLEAN +) + +vcpkg_copy_tools( + TOOL_NAMES ${GST_LIBEXEC_TOOLS} + SEARCH_DIR "${CURRENT_PACKAGES_DIR}/libexec/gstreamer-1.0" + AUTO_CLEAN +) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/debug/libexec" + "${CURRENT_PACKAGES_DIR}/debug/lib/gstreamer-1.0/include" + "${CURRENT_PACKAGES_DIR}/libexec" + "${CURRENT_PACKAGES_DIR}/lib/gstreamer-1.0/include" + "${CURRENT_PACKAGES_DIR}/share/gdb" +) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + # Move plugin pkg-config files + file(GLOB pc_files "${CURRENT_PACKAGES_DIR}/lib/gstreamer-1.0/pkgconfig/*") + file(COPY ${pc_files} DESTINATION "${CURRENT_PACKAGES_DIR}/lib/pkgconfig") + file(GLOB pc_files_dbg "${CURRENT_PACKAGES_DIR}/debug/lib/gstreamer-1.0/pkgconfig/*") + file(COPY ${pc_files_dbg} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/gstreamer-1.0/pkgconfig/" + "${CURRENT_PACKAGES_DIR}/lib/gstreamer-1.0/pkgconfig/") + + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin" + "${CURRENT_PACKAGES_DIR}/bin" + ) + set(PREFIX "${CMAKE_SHARED_LIBRARY_PREFIX}") + set(SUFFIX "${CMAKE_SHARED_LIBRARY_SUFFIX}") + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/${PREFIX}gstreamer-full-1.0${SUFFIX}" + "${CURRENT_PACKAGES_DIR}/lib/${PREFIX}gstreamer-full-1.0${SUFFIX}" + ) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/gstreamer-1.0/gst/gstconfig.h" "!defined(GST_STATIC_COMPILATION)" "0") +endif() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + # move plugins to ${prefix}/plugins/${PORT} instead of ${prefix}/lib/gstreamer-1.0 + if(NOT VCPKG_BUILD_TYPE) + file(GLOB DBG_BINS "${CURRENT_PACKAGES_DIR}/debug/lib/gstreamer-1.0/${CMAKE_SHARED_LIBRARY_PREFIX}*${CMAKE_SHARED_LIBRARY_SUFFIX}" + "${CURRENT_PACKAGES_DIR}/debug/lib/gstreamer-1.0/*.pdb" + ) + file(COPY ${DBG_BINS} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/plugins/${PORT}") + endif() + file(GLOB REL_BINS "${CURRENT_PACKAGES_DIR}/lib/gstreamer-1.0/${CMAKE_SHARED_LIBRARY_PREFIX}*${CMAKE_SHARED_LIBRARY_SUFFIX}" + "${CURRENT_PACKAGES_DIR}/lib/gstreamer-1.0/*.pdb" + ) + file(COPY ${REL_BINS} DESTINATION "${CURRENT_PACKAGES_DIR}/plugins/${PORT}") + file(REMOVE ${DBG_BINS} ${REL_BINS}) + if(NOT VCPKG_TARGET_IS_WINDOWS) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/gstreamer-1.0" "${CURRENT_PACKAGES_DIR}/lib/gstreamer-1.0") + endif() + + set(_file "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/gstreamer-1.0.pc") + if(EXISTS "${_file}") + file(READ "${_file}" _contents) + string(REPLACE [[toolsdir=${exec_prefix}/bin]] "toolsdir=\${prefix}/../tools/${PORT}" _contents "${_contents}") + string(REPLACE [[pluginscannerdir=${libexecdir}/gstreamer-1.0]] "pluginscannerdir=\${prefix}/../tools/${PORT}" _contents "${_contents}") + string(REPLACE [[pluginsdir=${libdir}/gstreamer-1.0]] "pluginsdir=\${prefix}/plugins/${PORT}" _contents "${_contents}") + file(WRITE "${_file}" "${_contents}") + endif() + + set(_file "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/gstreamer-1.0.pc") + if(EXISTS "${_file}") + file(READ "${_file}" _contents) + string(REPLACE [[toolsdir=${exec_prefix}/bin]] "toolsdir=\${prefix}/tools/${PORT}" _contents "${_contents}") + string(REPLACE [[pluginscannerdir=${libexecdir}/gstreamer-1.0]] "pluginscannerdir=\${prefix}/tools/${PORT}" _contents "${_contents}") + string(REPLACE [[pluginsdir=${libdir}/gstreamer-1.0]] "pluginsdir=\${prefix}/plugins/${PORT}" _contents "${_contents}") + file(WRITE "${_file}" "${_contents}") + endif() +endif() + +vcpkg_fixup_pkgconfig() + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/vcpkg/ports/gstreamer/remove_x264_define.patch b/vcpkg/ports/gstreamer/remove_x264_define.patch new file mode 100644 index 0000000000..044fb926bd --- /dev/null +++ b/vcpkg/ports/gstreamer/remove_x264_define.patch @@ -0,0 +1,18 @@ +diff --git a/ext/x264/gstx264enc.h b/ext/x264/gstx264enc.h +index 6cbfc5c3d..ba7845b20 100644 +--- a/ext/x264/gstx264enc.h ++++ b/ext/x264/gstx264enc.h +@@ -31,13 +31,6 @@ + #include + #endif + +-/* The x264.h header says this isn't needed with MinGW, but sometimes the +- * compiler is unable to correctly do the pointer indirection for us, which +- * leads to a segfault when you try to dereference any const values provided +- * by x264.dll. See: https://bugzilla.gnome.org/show_bug.cgi?id=779249 */ +-#if defined(_WIN32) && !defined(X264_API_IMPORTS) +-# define X264_API_IMPORTS +-#endif + #include + + G_BEGIN_DECLS diff --git a/vcpkg/ports/gstreamer/srtp_fix.patch b/vcpkg/ports/gstreamer/srtp_fix.patch new file mode 100644 index 0000000000..ed4601d458 --- /dev/null +++ b/vcpkg/ports/gstreamer/srtp_fix.patch @@ -0,0 +1,30 @@ +diff --git a/subprojects/gst-plugins-bad/ext/srtp/meson.build b/subprojects/gst-plugins-bad/ext/srtp/meson.build +index 49eed5b..db5aed0 100644 +--- a/subprojects/gst-plugins-bad/ext/srtp/meson.build ++++ b/subprojects/gst-plugins-bad/ext/srtp/meson.build +@@ -6,13 +6,15 @@ srtp_sources = [ + 'gstsrtpenc.c', + ] + ++gst_plugins_install_dir = join_paths(get_option('libdir'), 'gstreamer-1.0') ++ + srtp_cargs = [] + if get_option('srtp').disabled() + srtp_dep = dependency('', required : false) + subdir_done() + endif + +-srtp_dep = dependency('libsrtp2', version : '>= 2.1.0', required : false) ++srtp_dep = dependency('libSRTP', modules: ['libSRTP::srtp2'], version : '>= 2.1.0', required : false) + if srtp_dep.found() + srtp_cargs += ['-DHAVE_SRTP2'] + else +@@ -38,7 +40,7 @@ if srtp_dep.found() + include_directories : [configinc], + dependencies : [gstrtp_dep, gstvideo_dep, srtp_dep], + install : true, +- install_dir : plugins_install_dir, ++ install_dir : gst_plugins_install_dir, + ) + plugins += [gstsrtp] + endif diff --git a/vcpkg/ports/gstreamer/vcpkg.json b/vcpkg/ports/gstreamer/vcpkg.json new file mode 100644 index 0000000000..af363911be --- /dev/null +++ b/vcpkg/ports/gstreamer/vcpkg.json @@ -0,0 +1,841 @@ +{ + "name": "gstreamer", + "version": "1.22.5", + "port-version": 8, + "description": "GStreamer open-source multimedia framework core library", + "homepage": "https://gstreamer.freedesktop.org/", + "license": "LGPL-2.0-only", + "supports": "!uwp & !xbox", + "dependencies": [ + "glib", + { + "name": "glib", + "host": true + }, + { + "name": "opengl", + "platform": "windows | osx" + }, + { + "name": "vcpkg-tool-meson", + "host": true + } + ], + "default-features": [ + "plugins-base" + ], + "features": { + "aes": { + "description": "Enable support for AES encryption/decryption", + "dependencies": [ + { + "name": "gstreamer", + "default-features": false, + "features": [ + "plugins-bad" + ] + }, + "openssl" + ] + }, + "alsa": { + "description": "Enable support for ALSA (Advanced Linux Sound Architecture)", + "supports": "linux", + "dependencies": [ + { + "name": "alsa", + "platform": "linux" + }, + { + "name": "gstreamer", + "default-features": false, + "features": [ + "plugins-base" + ] + } + ] + }, + "aom": { + "description": "Enable support for the Alliance for Open Media (AOM) AV1 encoder and decoder", + "supports": "!windows", + "dependencies": [ + "aom", + { + "name": "gstreamer", + "default-features": false, + "features": [ + "plugins-bad" + ] + } + ] + }, + "asio": { + "description": "Enable support for the Steinberg Audio Streaming Input Output (ASIO) library (Windows only)", + "dependencies": [ + { + "name": "asiosdk", + "platform": "windows" + }, + { + "name": "gstreamer", + "default-features": false, + "features": [ + "plugins-bad" + ] + } + ] + }, + "assrender": { + "description": "Enable support for the ASS/SSA subtitle renderer", + "dependencies": [ + { + "name": "gstreamer", + "default-features": false, + "features": [ + "plugins-bad" + ] + }, + "libass" + ] + }, + "bzip2-bad": { + "description": "Enable bzip2 stream compression in bad plugins", + "dependencies": [ + "bzip2", + { + "name": "gstreamer", + "default-features": false, + "features": [ + "plugins-bad" + ] + } + ] + }, + "bzip2-good": { + "description": "Enable bzip2 stream compression in good plugins", + "dependencies": [ + "bzip2", + { + "name": "gstreamer", + "default-features": false, + "features": [ + "plugins-good" + ] + } + ] + }, + "cairo": { + "description": "Enable support for the cairo graphics library", + "dependencies": [ + { + "name": "cairo", + "features": [ + "gobject" + ] + }, + { + "name": "gstreamer", + "default-features": false, + "features": [ + "plugins-good" + ] + } + ] + }, + "chromaprint": { + "description": "Enable support for the Chromaprint audio fingerprint library", + "dependencies": [ + "chromaprint", + { + "name": "gstreamer", + "default-features": false, + "features": [ + "plugins-bad" + ] + } + ] + }, + "closedcaption": { + "description": "Enable support for the closed caption extractor, decoder, and overlay", + "dependencies": [ + { + "name": "gstreamer", + "default-features": false, + "features": [ + "plugins-bad" + ] + }, + "pango" + ] + }, + "colormanagement": { + "description": "Enable support for the color management correction", + "dependencies": [ + { + "name": "gstreamer", + "default-features": false, + "features": [ + "plugins-bad" + ] + }, + "lcms" + ] + }, + "dash": { + "description": "Enable support for the DASH demuxer", + "dependencies": [ + { + "name": "gstreamer", + "default-features": false, + "features": [ + "plugins-bad" + ] + }, + "libxml2" + ] + }, + "dc1394": { + "description": "Enable support for the libdc1394 IIDC camera source", + "supports": "!windows", + "dependencies": [ + { + "name": "gstreamer", + "default-features": false, + "features": [ + "plugins-bad" + ] + }, + "libdc1394" + ] + }, + "dtls": { + "description": "Enable support for the DTLS encoder and decoder", + "dependencies": [ + { + "name": "gstreamer", + "default-features": false, + "features": [ + "plugins-bad" + ] + }, + "openssl" + ] + }, + "faad": { + "description": "Enable support for the free AAC audio decoder (GPL licensed)", + "dependencies": [ + "faad2", + { + "name": "gstreamer", + "default-features": false, + "features": [ + "gpl", + "plugins-bad" + ] + } + ] + }, + "fdkaac": { + "description": "Enable support for the Fraunhofer AAC audio codec", + "dependencies": [ + "fdk-aac", + { + "name": "gstreamer", + "default-features": false, + "features": [ + "plugins-bad" + ] + } + ] + }, + "flac": { + "description": "Enable support for FLAC: Free Lossless Audio Codec", + "dependencies": [ + { + "name": "gstreamer", + "default-features": false, + "features": [ + "ogg", + "plugins-good" + ] + }, + "libflac" + ] + }, + "fluidsynth": { + "description": "Enable support for the Fluidsynth MIDI decoder", + "supports": "!windows", + "dependencies": [ + { + "name": "fluidsynth", + "platform": "!windows" + }, + { + "name": "gstreamer", + "default-features": false, + "features": [ + "plugins-bad" + ] + } + ] + }, + "gdk-pixbuf": { + "description": "Enable support for gdk-pixbuf image loader", + "dependencies": [ + "gdk-pixbuf", + { + "name": "gstreamer", + "default-features": false, + "features": [ + "plugins-good" + ] + } + ] + }, + "ges": { + "description": "Enable support for GStreamer Editing Services", + "dependencies": [ + { + "name": "gstreamer", + "default-features": false, + "features": [ + "plugins-base" + ] + } + ] + }, + "gl-graphene": { + "description": "Use Graphene in OpenGL plugin", + "dependencies": [ + "graphene", + { + "name": "gstreamer", + "default-features": false, + "features": [ + "plugins-base" + ] + } + ] + }, + "gpl": { + "description": "Allow build of plugins that have (A)GPL-licensed dependencies", + "dependencies": [ + { + "name": "gstreamer", + "default-features": false, + "features": [ + "plugins-base" + ] + } + ] + }, + "jpeg": { + "description": "Enable support for the JPEG file format", + "dependencies": [ + { + "name": "gstreamer", + "default-features": false, + "features": [ + "plugins-base", + "plugins-good" + ] + }, + "libjpeg-turbo" + ] + }, + "libav": { + "description": "libav plugins", + "dependencies": [ + { + "name": "ffmpeg", + "default-features": false + }, + { + "name": "gstreamer", + "default-features": false, + "features": [ + "plugins-base" + ] + } + ] + }, + "libde265": { + "description": "Enable support for the HEVC/H.265 video decoder", + "dependencies": [ + { + "name": "gstreamer", + "default-features": false, + "features": [ + "plugins-bad" + ] + }, + "libde265" + ] + }, + "microdns": { + "description": "Enable support for the microdns device provider", + "dependencies": [ + { + "name": "gstreamer", + "default-features": false, + "features": [ + "plugins-bad" + ] + }, + "libmicrodns" + ] + }, + "modplug": { + "description": "Enable support for the ModPlug audio decoder", + "supports": "!uwp", + "dependencies": [ + { + "name": "gstreamer", + "default-features": false, + "features": [ + "plugins-bad" + ] + }, + { + "name": "libmodplug", + "platform": "!uwp" + } + ] + }, + "mpg123": { + "description": "Enable support for the MPG123 decoding library", + "dependencies": [ + { + "name": "gstreamer", + "default-features": false, + "features": [ + "plugins-good" + ] + }, + "mpg123" + ] + }, + "nls": { + "description": "National language support", + "dependencies": [ + "gettext", + { + "name": "gettext", + "host": true, + "default-features": false, + "features": [ + "tools" + ] + }, + { + "name": "gstreamer", + "default-features": false, + "features": [ + "plugins-base" + ] + } + ] + }, + "nvcodec": { + "description": "Enable support for the NVCODEC encoders and decoders", + "supports": "!osx & !ios & !android & !emscripten", + "dependencies": [ + { + "name": "gstreamer", + "default-features": false, + "features": [ + "plugins-bad" + ] + } + ] + }, + "ogg": { + "description": "Enable support for the Ogg container format (commonly used by Vorbis, Theora and flac)", + "dependencies": [ + { + "name": "gstreamer", + "default-features": false, + "features": [ + "plugins-base" + ] + }, + "libogg" + ] + }, + "openal": { + "description": "Enable support for the OpenAL audio library", + "dependencies": [ + { + "name": "gstreamer", + "default-features": false, + "features": [ + "plugins-bad" + ] + }, + "openal-soft" + ] + }, + "openh264": { + "description": "Enable support for the OpenH264 codec", + "dependencies": [ + { + "name": "gstreamer", + "default-features": false, + "features": [ + "plugins-bad" + ] + }, + "openh264" + ] + }, + "openjpeg": { + "description": "Enable support for the JPEG2000 codec", + "dependencies": [ + { + "name": "gstreamer", + "default-features": false, + "features": [ + "plugins-bad" + ] + }, + "openjpeg" + ] + }, + "openmpt": { + "description": "Enable support for the OpenMPT codec", + "dependencies": [ + { + "name": "gstreamer", + "default-features": false, + "features": [ + "plugins-bad" + ] + }, + "libopenmpt" + ] + }, + "opus-bad": { + "description": "Enable support for the Opus codec in bad plugins", + "dependencies": [ + { + "name": "gstreamer", + "default-features": false, + "features": [ + "plugins-bad" + ] + }, + "opus" + ] + }, + "opus-base": { + "description": "Enable support for the Opus codec in base plugins", + "dependencies": [ + { + "name": "gstreamer", + "default-features": false, + "features": [ + "plugins-base" + ] + }, + "opus" + ] + }, + "pango": { + "description": "Enable support for pango font rendering", + "dependencies": [ + { + "name": "gstreamer", + "default-features": false, + "features": [ + "plugins-base" + ] + }, + "pango" + ] + }, + "plugins-bad": { + "description": "'Bad' GStreamer plugins and helper libraries", + "dependencies": [ + { + "name": "gstreamer", + "default-features": false, + "features": [ + "plugins-base" + ] + } + ] + }, + "plugins-base": { + "description": "'Base' GStreamer plugins and helper libraries", + "dependencies": [ + "zlib" + ] + }, + "plugins-good": { + "description": "'Good' GStreamer plugins and helper libraries", + "dependencies": [ + { + "name": "gstreamer", + "default-features": false, + "features": [ + "plugins-base" + ] + }, + "zlib" + ] + }, + "plugins-ugly": { + "description": "'Ugly' GStreamer plugins and helper libraries", + "dependencies": [ + { + "name": "gstreamer", + "default-features": false, + "features": [ + "plugins-base" + ] + } + ] + }, + "png": { + "description": "Enable support for the PNG image format", + "dependencies": [ + { + "name": "gstreamer", + "default-features": false, + "features": [ + "plugins-good" + ] + }, + "libpng" + ] + }, + "smoothstreaming": { + "description": "Enable support for the Microsoft Smooth Streaming format", + "dependencies": [ + { + "name": "gstreamer", + "default-features": false, + "features": [ + "plugins-bad" + ] + }, + "libxml2" + ] + }, + "sndfile": { + "description": "Enable support for the SndFile file reader/writer", + "dependencies": [ + { + "name": "gstreamer", + "default-features": false, + "features": [ + "plugins-bad" + ] + }, + "libsndfile" + ] + }, + "soundtouch": { + "description": "Enable support for the SoundTouch audio processing library", + "dependencies": [ + { + "name": "gstreamer", + "default-features": false, + "features": [ + "plugins-bad" + ] + }, + "soundtouch" + ] + }, + "soup": { + "description": "Enable support for the soup plugin", + "dependencies": [ + { + "name": "gstreamer", + "default-features": false, + "features": [ + "plugins-good" + ] + }, + "libsoup" + ] + }, + "speex": { + "description": "Enable support for the speex codec", + "dependencies": [ + { + "name": "gstreamer", + "default-features": false, + "features": [ + "plugins-good" + ] + }, + "speex" + ] + }, + "srt": { + "description": "Enable support for the SRT protocol", + "dependencies": [ + { + "name": "gstreamer", + "default-features": false, + "features": [ + "plugins-bad" + ] + }, + "libsrt" + ] + }, + "srtp": { + "description": "Enable support for the SRTP protocol", + "dependencies": [ + { + "name": "gstreamer", + "default-features": false, + "features": [ + "plugins-bad" + ] + }, + "libsrtp" + ] + }, + "taglib": { + "description": "Enable support for the taglib library", + "dependencies": [ + { + "name": "gstreamer", + "default-features": false, + "features": [ + "plugins-good" + ] + }, + "taglib" + ] + }, + "vorbis": { + "description": "Enable support for the OggVorbis audio codec", + "dependencies": [ + { + "name": "gstreamer", + "default-features": false, + "features": [ + "ogg", + "plugins-base" + ] + }, + "libvorbis" + ] + }, + "vpx": { + "description": "Enable support for the VP8 and VP9 codecs", + "dependencies": [ + { + "name": "gstreamer", + "default-features": false, + "features": [ + "plugins-good" + ] + }, + "libvpx" + ] + }, + "webp": { + "description": "Enable support for WebP image format", + "dependencies": [ + { + "name": "gstreamer", + "default-features": false, + "features": [ + "plugins-bad" + ] + }, + "libwebp" + ] + }, + "webrtc": { + "description": "Enable support for WebRTC", + "dependencies": [ + { + "name": "gstreamer", + "default-features": false, + "features": [ + "plugins-bad" + ] + }, + "libnice" + ] + }, + "wildmidi": { + "description": "Enable support for the WildMIDI synthesizer", + "dependencies": [ + { + "name": "gstreamer", + "default-features": false, + "features": [ + "plugins-bad" + ] + }, + "wildmidi" + ] + }, + "x11-bad": { + "description": "Enable support for X11 in bad plugins", + "supports": "!windows", + "dependencies": [ + { + "name": "gstreamer", + "default-features": false, + "features": [ + "plugins-bad" + ] + }, + "libxkbcommon", + "xcb" + ] + }, + "x11-base": { + "description": "Enable support for X11 in base plugins", + "supports": "!windows", + "dependencies": [ + { + "name": "gstreamer", + "default-features": false, + "features": [ + "plugins-good" + ] + }, + "libx11", + "libxext" + ] + }, + "x264": { + "description": "Enable support for the x264 encoder (GPL license)", + "dependencies": [ + { + "name": "gstreamer", + "default-features": false, + "features": [ + "gpl", + "plugins-ugly" + ] + }, + "x264" + ] + }, + "x265": { + "description": "Enable support for the x265 encoder (GPL license)", + "dependencies": [ + { + "name": "gstreamer", + "default-features": false, + "features": [ + "gpl", + "plugins-bad" + ] + }, + "x265" + ] + } + } +} diff --git a/vcpkg/ports/libqglviewer/Add-compile-definitions.patch b/vcpkg/ports/libqglviewer/Add-compile-definitions.patch deleted file mode 100644 index addf619c29..0000000000 --- a/vcpkg/ports/libqglviewer/Add-compile-definitions.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -58,9 +58,19 @@ - "${PROJECT_SOURCE_DIR}/QGLViewer/quaternion.cpp" - "${PROJECT_SOURCE_DIR}/QGLViewer/saveSnapshot.cpp" - "${PROJECT_SOURCE_DIR}/QGLViewer/vec.cpp") --add_library(QGLViewer SHARED ${QGLViewer_SRC}) -+add_library(QGLViewer ${QGLViewer_SRC}) - target_include_directories(QGLViewer INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}) - target_link_libraries(QGLViewer PRIVATE ${QtLibs} OpenGL::GL OpenGL::GLU) -+if(MSVC) -+ target_compile_definitions(QGLViewer PRIVATE NOMINMAX) -+endif() -+if(WIN32) -+ if(BUILD_SHARED_LIBS) -+ target_compile_definitions(QGLViewer PRIVATE CREATE_QGLVIEWER_DLL) -+ else() -+ target_compile_definitions(QGLViewer PUBLIC QGLVIEWER_STATIC) -+ endif() -+endif() - - # Example: animation. - set(animation_SRC diff --git a/vcpkg/ports/libqglviewer/Fix-error-c2039.patch b/vcpkg/ports/libqglviewer/Fix-error-c2039.patch deleted file mode 100644 index 629380dc63..0000000000 --- a/vcpkg/ports/libqglviewer/Fix-error-c2039.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff --git a/QGLViewer/VRender/NVector3.h b/QGLViewer/VRender/NVector3.h -index 40b7f98..f2d8305 100644 ---- a/QGLViewer/VRender/NVector3.h -+++ b/QGLViewer/VRender/NVector3.h -@@ -7,6 +7,8 @@ - namespace vrender - { - class Vector3; -+ class NVector3; -+ std::ostream& operator<<(std::ostream &out,const NVector3 &u); - - class NVector3 - { -diff --git a/QGLViewer/VRender/Primitive.h b/QGLViewer/VRender/Primitive.h -index 88ab11d..d38470d 100644 ---- a/QGLViewer/VRender/Primitive.h -+++ b/QGLViewer/VRender/Primitive.h -@@ -21,6 +21,7 @@ namespace vrender - { - class Feedback3DColor ; - class Primitive ; -+ std::ostream& operator<<(std::ostream&, const Feedback3DColor&) ; - - #define EPS_SMOOTH_LINE_FACTOR 0.06 /* Lower for better smooth lines. */ - -diff --git a/QGLViewer/VRender/Vector2.h b/QGLViewer/VRender/Vector2.h -index f6aaaf3..7b9b82a 100644 ---- a/QGLViewer/VRender/Vector2.h -+++ b/QGLViewer/VRender/Vector2.h -@@ -6,7 +6,9 @@ - - namespace vrender - { -+ class Vector2; - class Vector3; -+ std::ostream& operator<< (std::ostream&,const Vector2&); - - class Vector2 - { -diff --git a/QGLViewer/VRender/Vector3.h b/QGLViewer/VRender/Vector3.h -index 32597e8..f6d5099 100644 ---- a/QGLViewer/VRender/Vector3.h -+++ b/QGLViewer/VRender/Vector3.h -@@ -10,6 +10,8 @@ - namespace vrender - { - class NVector3; -+ class Vector3; -+ std::ostream& operator<< (std::ostream&, const Vector3&); - - class Vector3 - { diff --git a/vcpkg/ports/libqglviewer/portfile.cmake b/vcpkg/ports/libqglviewer/portfile.cmake deleted file mode 100644 index d8c64a1fd5..0000000000 --- a/vcpkg/ports/libqglviewer/portfile.cmake +++ /dev/null @@ -1,21 +0,0 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO GillesDebunne/libQGLViewer - REF "v${VERSION}" - SHA512 09bfc5c0f07e51625a9af0094b83f40f84ead55a67c6e492c9702521f58c6b461bc840382fb73b64d16ad71a0a2a75d04aa12a77a78ced0a19e0e784e8d36bd7 - PATCHES - Add-compile-definitions.patch - Fix-error-c2039.patch #https://github.com/GillesDebunne/libQGLViewer/pull/80 -) - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" -) - -vcpkg_cmake_install() - -vcpkg_fixup_pkgconfig() - -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") - -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENCE") diff --git a/vcpkg/ports/libqglviewer/vcpkg.json b/vcpkg/ports/libqglviewer/vcpkg.json deleted file mode 100644 index 11cbb9890a..0000000000 --- a/vcpkg/ports/libqglviewer/vcpkg.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "name": "libqglviewer", - "version": "2.9.1", - "port-version": 2, - "description": "libQGLViewer is an open source C++ library based on Qt that eases the creation of OpenGL 3D viewers.", - "homepage": "http://libqglviewer.com/", - "license": "GPL-2.0-or-later", - "supports": "!xbox", - "dependencies": [ - { - "name": "qtbase", - "default-features": false - }, - { - "name": "vcpkg-cmake", - "host": true - } - ] -} diff --git a/vcpkg/ports/litehtml/fix-relative-includes.patch b/vcpkg/ports/litehtml/fix-relative-includes.patch deleted file mode 100644 index c9b42e9575..0000000000 --- a/vcpkg/ports/litehtml/fix-relative-includes.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 42cf79c0292d655eec41c486710bf610063bdfd8 Mon Sep 17 00:00:00 2001 -From: Sean Farrell -Date: Thu, 23 Feb 2023 14:17:52 +0100 -Subject: [PATCH] Fix relative includes. - ---- - include/litehtml.h | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/include/litehtml.h b/include/litehtml.h -index 98a24e0..d20addd 100644 ---- a/include/litehtml.h -+++ b/include/litehtml.h -@@ -1,10 +1,10 @@ - #ifndef LITEHTML_H - #define LITEHTML_H - --#include --#include --#include --#include --#include -+#include "html.h" -+#include "document.h" -+#include "html_tag.h" -+#include "stylesheet.h" -+#include "element.h" - - #endif // LITEHTML_H --- -2.33.0.windows.2 - diff --git a/vcpkg/ports/litehtml/portfile.cmake b/vcpkg/ports/litehtml/portfile.cmake deleted file mode 100644 index 679c8d46ba..0000000000 --- a/vcpkg/ports/litehtml/portfile.cmake +++ /dev/null @@ -1,29 +0,0 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO litehtml/litehtml - REF v0.6 - SHA512 b774ed96e53780865e789875f571f96ebce1cd2ff0c05a06ae68a67aec44375cc282c07f77fc87131d422aceddba32bbf3e8e498c870883d8e042adb30834c39 - PATCHES - use-vcpkg-gumbo.patch - fix-relative-includes.patch -) - -if (VCPKG_TARGET_IS_WINDOWS) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -endif() - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - -DBUILD_TESTING=OFF - -DLITEHTML_UTF8=ON -) - -vcpkg_cmake_install() -vcpkg_cmake_config_fixup(PACKAGE_NAME litehtml CONFIG_PATH lib/cmake/litehtml) - - -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") - -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/vcpkg/ports/litehtml/use-vcpkg-gumbo.patch b/vcpkg/ports/litehtml/use-vcpkg-gumbo.patch deleted file mode 100644 index c7796fb000..0000000000 --- a/vcpkg/ports/litehtml/use-vcpkg-gumbo.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 4ca6d9846bfc39c4aa98d6a41f298078b4bebf8d Mon Sep 17 00:00:00 2001 -From: Sean Farrell -Date: Thu, 23 Feb 2023 08:15:37 +0100 -Subject: [PATCH] Use vcpkg's gumbo - ---- - CMakeLists.txt | 8 ++------ - cmake/litehtmlConfig.cmake | 2 +- - src/document.cpp | 2 +- - 3 files changed, 4 insertions(+), 8 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index fe71729..21e77c8 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -10,11 +10,7 @@ enable_testing() - set(PROJECT_MAJOR 0) - set(PROJECT_MINOR 0) - --option(EXTERNAL_GUMBO "Link against external gumbo instead of shipping a bundled copy" OFF) -- --if(NOT EXTERNAL_GUMBO) -- add_subdirectory(src/gumbo) --endif() -+find_package(unofficial-gumbo CONFIG REQUIRED) - - set(SOURCE_LITEHTML - src/background.cpp -@@ -153,7 +149,7 @@ if (LITEHTML_UTF8) - endif() - - # Gumbo --target_link_libraries(${PROJECT_NAME} PUBLIC gumbo) -+target_link_libraries(${PROJECT_NAME} PRIVATE unofficial::gumbo::gumbo) - - # install and export - install(TARGETS ${PROJECT_NAME} -diff --git a/cmake/litehtmlConfig.cmake b/cmake/litehtmlConfig.cmake -index 5eedcf4..1027913 100644 ---- a/cmake/litehtmlConfig.cmake -+++ b/cmake/litehtmlConfig.cmake -@@ -1,3 +1,3 @@ - include(CMakeFindDependencyMacro) --find_dependency(gumbo) -+find_dependency(unofficial-gumbo) - include(${CMAKE_CURRENT_LIST_DIR}/litehtmlTargets.cmake) -diff --git a/src/document.cpp b/src/document.cpp -index 8bd1ea8..51a9d42 100644 ---- a/src/document.cpp -+++ b/src/document.cpp -@@ -26,7 +26,7 @@ - #include - #include - #include --#include "gumbo.h" -+#include - #include "utf8_strings.h" - - litehtml::document::document(litehtml::document_container* objContainer, litehtml::context* ctx) --- -2.33.0.windows.2 - diff --git a/vcpkg/ports/litehtml/vcpkg.json b/vcpkg/ports/litehtml/vcpkg.json deleted file mode 100644 index da8c92718a..0000000000 --- a/vcpkg/ports/litehtml/vcpkg.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "name": "litehtml", - "version": "0.6.0", - "port-version": 2, - "description": "litehtml is the lightweight HTML rendering engine with CSS2/CSS3 support.", - "homepage": "https://github.com/litehtml/litehtml", - "license": "BSD-3-Clause", - "dependencies": [ - "gumbo", - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - } - ] -} diff --git a/vcpkg/ports/qgis/portfile.cmake b/vcpkg/ports/qgis/portfile.cmake index 6199820a67..cd68533424 100644 --- a/vcpkg/ports/qgis/portfile.cmake +++ b/vcpkg/ports/qgis/portfile.cmake @@ -169,6 +169,11 @@ if(VCPKG_TARGET_IS_IOS) list(APPEND QGIS_OPTIONS -DWITH_QTSERIALPORT=FALSE) endif() +# Build crssync only runs when building natively. +if(NOT HOST_TRIPLET STREQUAL TARGET_TRIPLET) + list(APPEND QGIS_OPTIONS -DNATIVE_CRSSYNC_BIN=true) +endif() + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} #PREFER_NINJA diff --git a/vcpkg/ports/qgis/vcpkg.json b/vcpkg/ports/qgis/vcpkg.json index c9867d3cb2..3d71b5ddac 100644 --- a/vcpkg/ports/qgis/vcpkg.json +++ b/vcpkg/ports/qgis/vcpkg.json @@ -57,6 +57,7 @@ "harfbuzz", "jpeg", "network", + "opengl", { "name": "openssl", "platform": "!ios" diff --git a/vcpkg/ports/qt/portfile.cmake b/vcpkg/ports/qt/portfile.cmake deleted file mode 100644 index 9aefc82414..0000000000 --- a/vcpkg/ports/qt/portfile.cmake +++ /dev/null @@ -1 +0,0 @@ -set(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/vcpkg/ports/qt/vcpkg.json b/vcpkg/ports/qt/vcpkg.json deleted file mode 100644 index a24ede1174..0000000000 --- a/vcpkg/ports/qt/vcpkg.json +++ /dev/null @@ -1,214 +0,0 @@ -{ - "name": "qt", - "version": "6.6.3", - "description": "A cross-platform application and UI framework.", - "homepage": "https://www.qt.io/", - "license": null, - "dependencies": [ - { - "name": "qt3d", - "default-features": false, - "features": [ - "animation", - "assimp", - "extras", - "input", - "logic", - "qml", - "render", - "rhi" - ] - }, - { - "name": "qt5compat", - "default-features": false, - "features": [ - "big-codecs", - "codecs", - "qml", - "textcodec" - ] - }, - "qtapplicationmanager", - { - "name": "qtbase", - "default-features": false - }, - { - "name": "qtcharts", - "default-features": false, - "features": [ - "designer", - "qml" - ] - }, - "qtcoap", - "qtconnectivity", - "qtdatavis3d", - "qtdeclarative", - { - "name": "qtdeviceutilities", - "default-features": false, - "platform": "linux" - }, - "qtdoc", - "qtgraphs", - "qtgrpc", - { - "name": "qtimageformats", - "default-features": false, - "features": [ - "jasper", - "tiff", - "webp" - ] - }, - "qtinterfaceframework", - "qtlanguageserver", - { - "name": "qtlottie", - "default-features": false, - "features": [ - "qml" - ] - }, - "qtmqtt", - { - "name": "qtmultimedia", - "default-features": false, - "features": [ - "ffmpeg", - "qml", - "widgets" - ] - }, - { - "name": "qtmultimedia", - "default-features": false, - "features": [ - "gstreamer" - ], - "platform": "!windows" - }, - "qtnetworkauth", - { - "name": "qtopcua", - "features": [ - "qml" - ] - }, - { - "name": "qtpositioning", - "default-features": false, - "features": [ - "qml" - ] - }, - { - "name": "qtquick3d", - "default-features": false - }, - "qtquicktimeline", - { - "name": "qtremoteobjects", - "default-features": false, - "features": [ - "qml" - ] - }, - { - "name": "qtscxml", - "default-features": false, - "features": [ - "qml" - ] - }, - { - "name": "qtsensors", - "default-features": false, - "features": [ - "qml" - ] - }, - "qtserialbus", - "qtserialport", - "qtshadertools", - { - "name": "qtspeech", - "default-features": false, - "platform": "!(windows & x86)" - }, - "qtsvg", - { - "name": "qttools", - "default-features": false, - "features": [ - "assistant", - "designer", - "qml" - ] - }, - "qttranslations", - "qtvirtualkeyboard", - { - "name": "qtwebchannel", - "default-features": false, - "features": [ - "qml" - ] - }, - { - "name": "qtwebengine", - "default-features": false, - "features": [ - "geolocation", - "spellchecker", - "webchannel" - ], - "platform": "!static & !(windows & arm)" - }, - { - "name": "qtwebsockets", - "default-features": false, - "features": [ - "qml" - ] - }, - { - "name": "qtwebview", - "default-features": false - }, - { - "name": "qtwebview", - "default-features": false, - "features": [ - "webengine" - ], - "platform": "!static & !(windows & arm)" - } - ], - "default-features": [ - "default-features" - ], - "features": { - "default-features": { - "description": "Platform-dependent default features", - "dependencies": [ - { - "name": "qtactiveqt", - "features": [ - "qml" - ], - "platform": "windows" - }, - { - "name": "qtwayland", - "features": [ - "qml" - ], - "platform": "linux" - } - ] - } - } -} diff --git a/vcpkg/ports/qt3d/portfile.cmake b/vcpkg/ports/qt3d/portfile.cmake deleted file mode 100644 index add3092152..0000000000 --- a/vcpkg/ports/qt3d/portfile.cmake +++ /dev/null @@ -1,35 +0,0 @@ -set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") -include("${SCRIPT_PATH}/qt_install_submodule.cmake") - -# General features: -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS -FEATURES - "qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Quick - "vulkan" CMAKE_REQUIRE_FIND_PACKAGE_Vulkan - "vulkan" FEATURE_qt3d_vulkan - "rhi" FEATURE_qt3d_rhi_renderer - "render" FEATURE_qt3d_render - "input" FEATURE_qt3d_input - "logic" FEATURE_qt3d_logic - "extras" FEATURE_qt3d_extras - "animation" FEATURE_qt3d_animation -INVERTED_FEATURES - "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick - "vulkan" CMAKE_DISABLE_FIND_PACKAGE_Vulkan - ) - -if("assimp" IN_LIST FEATURES) - list(APPEND FEATURE_OPTIONS -DINPUT_assimp=system) -else() - list(APPEND FEATURE_OPTIONS -DINPUT_assimp=no) -endif() - -qt_install_submodule(PATCHES ${${PORT}_PATCHES} - CONFIGURE_OPTIONS - ${FEATURE_OPTIONS} - #-DINPUT_fbxsdk=no - -DFEATURE_qt3d_fbxsdk=OFF # OpenFBX? Probably not! - -DCMAKE_FIND_PACKAGE_TARGETS_GLOBAL=ON - CONFIGURE_OPTIONS_RELEASE - CONFIGURE_OPTIONS_DEBUG - ) diff --git a/vcpkg/ports/qt3d/vcpkg.json b/vcpkg/ports/qt3d/vcpkg.json deleted file mode 100644 index 5c2e5de035..0000000000 --- a/vcpkg/ports/qt3d/vcpkg.json +++ /dev/null @@ -1,106 +0,0 @@ -{ - "name": "qt3d", - "version": "6.6.3", - "description": "Qt wrapper for existing OPC UA stacks", - "homepage": "https://www.qt.io/", - "license": null, - "dependencies": [ - "assimp", - { - "name": "qtbase", - "default-features": false, - "features": [ - "concurrent", - "gui", - "network", - "widgets" - ] - } - ], - "default-features": [ - "animation", - "assimp", - "extras", - "input", - "logic", - "render" - ], - "features": { - "animation": { - "description": "Use the 3D Animation Aspect library", - "dependencies": [ - { - "name": "qt3d", - "default-features": false, - "features": [ - "render" - ] - } - ] - }, - "assimp": { - "description": "Build with assimp", - "dependencies": [ - "assimp" - ] - }, - "extras": { - "description": "Use the 3D Extra library", - "dependencies": [ - { - "name": "qt3d", - "default-features": false, - "features": [ - "input", - "logic", - "render" - ] - } - ] - }, - "input": { - "description": "Use the 3D Input Aspect library" - }, - "logic": { - "description": "Use the 3D Logic Aspect library" - }, - "qml": { - "description": "Build QML imports", - "dependencies": [ - { - "name": "qtbase", - "default-features": false, - "features": [ - "gui" - ] - }, - { - "name": "qtdeclarative", - "default-features": false - } - ] - }, - "render": { - "description": "Use the 3D Render Aspect library" - }, - "rhi": { - "description": "Enable RHI renderer", - "dependencies": [ - "qtshadertools" - ] - }, - "vulkan": { - "description": "Build with vulkan support", - "dependencies": [ - { - "name": "qt3d", - "default-features": false, - "features": [ - "rhi" - ] - }, - "vulkan" - ] - } - } -} diff --git a/vcpkg/ports/qt5compat/portfile.cmake b/vcpkg/ports/qt5compat/portfile.cmake deleted file mode 100644 index d13a078b94..0000000000 --- a/vcpkg/ports/qt5compat/portfile.cmake +++ /dev/null @@ -1,40 +0,0 @@ -set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") -include("${SCRIPT_PATH}/qt_install_submodule.cmake") - -set(${PORT}_PATCHES) - -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS -FEATURES - "textcodec" FEATURE_textcodec - "codecs" FEATURE_codecs - "big-codecs" FEATURE_big_codecs - "iconv" FEATURE_iconv - "iconv" CMAKE_DISABLE_FIND_PACKAGE_ICU - #"iconv" CMAKE_REQUIRE_FIND_PACKAGE_WrapIconv - "qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Quick -INVERTED_FEATURES - "iconv" CMAKE_DISABLE_FIND_PACKAGE_WrapIconv - "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick - ) - -#For iconv feature to work the following must be true: -#CONDITION NOT FEATURE_icu AND FEATURE_textcodec AND NOT WIN32 AND NOT QNX AND NOT ANDROID AND NOT APPLE AND WrapIconv_FOUND -if("iconv" IN_LIST FEATURES) - include("${SCRIPT_PATH}/port_status.cmake") - if(qtbase_with_icu) - message(FATAL_ERROR "qtbase was built with ICU. The iconv feature is not compatible with ICU.") - endif() -endif() - -set(TOOL_NAMES) -qt_install_submodule(PATCHES ${${PORT}_PATCHES} - TOOL_NAMES ${TOOL_NAMES} - CONFIGURE_OPTIONS - ${FEATURE_OPTIONS} - CONFIGURE_OPTIONS_RELEASE - CONFIGURE_OPTIONS_DEBUG - ) - -#For my documentation: -# find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core) -# find_package(Qt6 ${PROJECT_VERSION} QUIET CONFIG OPTIONAL_COMPONENTS Network Xml Gui Quick) diff --git a/vcpkg/ports/qt5compat/vcpkg.json b/vcpkg/ports/qt5compat/vcpkg.json deleted file mode 100644 index 9210c4ac32..0000000000 --- a/vcpkg/ports/qt5compat/vcpkg.json +++ /dev/null @@ -1,81 +0,0 @@ -{ - "name": "qt5compat", - "version": "6.6.3", - "description": "The Qt 5 Core Compat module contains the Qt 5 Core APIs that were removed in Qt 6. The module facilitates the transition to Qt 6.", - "homepage": "https://www.qt.io/", - "license": null, - "dependencies": [ - { - "name": "qtbase", - "default-features": false - } - ], - "default-features": [ - "big-codecs", - "codecs", - "default-features", - "qml", - "textcodec" - ], - "features": { - "big-codecs": { - "description": "Supports big codecs, e.g. CJK.", - "dependencies": [ - { - "name": "qt5compat", - "default-features": false, - "features": [ - "textcodec" - ] - } - ] - }, - "codecs": { - "description": "Supports non-unicode text conversions.", - "dependencies": [ - { - "name": "qt5compat", - "default-features": false, - "features": [ - "textcodec" - ] - } - ] - }, - "default-features": { - "description": "Platform-dependent default features" - }, - "iconv": { - "description": "Provides internationalization on Unix.", - "dependencies": [ - "libiconv", - { - "name": "qt5compat", - "default-features": false, - "features": [ - "textcodec" - ] - } - ] - }, - "qml": { - "description": "Build QML imports", - "dependencies": [ - { - "name": "qtbase", - "default-features": false, - "features": [ - "gui" - ] - }, - { - "name": "qtdeclarative", - "default-features": false - } - ] - }, - "textcodec": { - "description": "Supports conversions between text encodings." - } - } -} diff --git a/vcpkg/ports/qtactiveqt/portfile.cmake b/vcpkg/ports/qtactiveqt/portfile.cmake deleted file mode 100644 index 32b1aa7b18..0000000000 --- a/vcpkg/ports/qtactiveqt/portfile.cmake +++ /dev/null @@ -1,36 +0,0 @@ -set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") -include("${SCRIPT_PATH}/qt_install_submodule.cmake") - -set(${PORT}_PATCHES) - -set(NO_BIN_AND_TOOLS FALSE) -if(VCPKG_TARGET_ARCHITECTURE MATCHES "^arm" AND VCPKG_TARGET_IS_WINDOWS) - set(NO_BIN_AND_TOOLS TRUE) -endif() - -if(NOT NO_BIN_AND_TOOLS) - set(TOOL_NAMES - dumpcpp - dumpdoc - idc - testcon - ) -endif() - -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS -FEATURES - "qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Quick -INVERTED_FEATURES - "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick -) - -qt_install_submodule(PATCHES ${${PORT}_PATCHES} - TOOL_NAMES ${TOOL_NAMES} - CONFIGURE_OPTIONS ${FEATURE_OPTIONS} - CONFIGURE_OPTIONS_RELEASE - CONFIGURE_OPTIONS_DEBUG - ) - -if(NO_BIN_AND_TOOLS) - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin" "${CURRENT_PACKAGES_DIR}/tools") -endif() diff --git a/vcpkg/ports/qtactiveqt/vcpkg.json b/vcpkg/ports/qtactiveqt/vcpkg.json deleted file mode 100644 index 336d187fc7..0000000000 --- a/vcpkg/ports/qtactiveqt/vcpkg.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "name": "qtactiveqt", - "version": "6.6.3", - "description": "ActiveQt", - "homepage": "https://www.qt.io/", - "license": null, - "supports": "windows", - "dependencies": [ - { - "name": "qtactiveqt", - "host": true, - "default-features": false - }, - { - "$comment": "also requires printsupport!", - "name": "qtbase", - "default-features": false, - "features": [ - "gui", - "widgets" - ] - } - ], - "features": { - "qml": { - "description": "Build QML imports", - "dependencies": [ - { - "name": "qtdeclarative", - "default-features": false - } - ] - } - } -} diff --git a/vcpkg/ports/qtapplicationmanager/portfile.cmake b/vcpkg/ports/qtapplicationmanager/portfile.cmake deleted file mode 100644 index 68686b02f3..0000000000 --- a/vcpkg/ports/qtapplicationmanager/portfile.cmake +++ /dev/null @@ -1,64 +0,0 @@ -set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") -include("${SCRIPT_PATH}/qt_install_submodule.cmake") - -set(${PORT}_PATCHES - 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 - --trace-expand - 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 diff --git a/vcpkg/ports/qtapplicationmanager/stack-walker-arm64.patch b/vcpkg/ports/qtapplicationmanager/stack-walker-arm64.patch deleted file mode 100644 index 4dd674ede3..0000000000 --- a/vcpkg/ports/qtapplicationmanager/stack-walker-arm64.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/src/3rdparty/stackwalker/stackwalker.cpp b/src/3rdparty/stackwalker/stackwalker.cpp -index 7008ac6..cfa0d0e 100644 ---- a/src/3rdparty/stackwalker/stackwalker.cpp -+++ b/src/3rdparty/stackwalker/stackwalker.cpp -@@ -1121,6 +1121,14 @@ BOOL StackWalker::ShowCallstack(HANDLE hThread, - s.AddrBStore.Mode = AddrModeFlat; - s.AddrStack.Offset = c.IntSp; - s.AddrStack.Mode = AddrModeFlat; -+#elif _M_ARM64 -+ imageType = IMAGE_FILE_MACHINE_ARM64; -+ s.AddrPC.Offset = c.Pc; -+ s.AddrPC.Mode = AddrModeFlat; -+ s.AddrFrame.Offset = c.Fp; -+ s.AddrFrame.Mode = AddrModeFlat; -+ s.AddrStack.Offset = c.Sp; -+ s.AddrStack.Mode = AddrModeFlat; - #else - #error "Platform not supported!" - #endif diff --git a/vcpkg/ports/qtapplicationmanager/vcpkg.json b/vcpkg/ports/qtapplicationmanager/vcpkg.json deleted file mode 100644 index 86c3958031..0000000000 --- a/vcpkg/ports/qtapplicationmanager/vcpkg.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "name": "qtapplicationmanager", - "version": "6.6.3", - "description": "Qt component for application lifecycle management", - "homepage": "https://www.qt.io/", - "license": null, - "dependencies": [ - "libarchive", - "libyaml", - { - "name": "qtapplicationmanager", - "host": true, - "default-features": false - }, - { - "name": "qtbase", - "default-features": false - }, - { - "name": "qtdeclarative", - "default-features": false - }, - { - "name": "qtwayland", - "default-features": false, - "platform": "!windows" - } - ] -} diff --git a/vcpkg/ports/qtapplicationmanager/wrapper-fixes.patch b/vcpkg/ports/qtapplicationmanager/wrapper-fixes.patch deleted file mode 100644 index 194e35f816..0000000000 --- a/vcpkg/ports/qtapplicationmanager/wrapper-fixes.patch +++ /dev/null @@ -1,56 +0,0 @@ -diff --git a/cmake/FindWrapLibArchive.cmake b/cmake/FindWrapLibArchive.cmake -index 67e4ce0..887b766 100644 ---- a/cmake/FindWrapLibArchive.cmake -+++ b/cmake/FindWrapLibArchive.cmake -@@ -16,3 +16,24 @@ add_library(WrapLibArchive::WrapLibArchive INTERFACE IMPORTED) - target_link_libraries(WrapLibArchive::WrapLibArchive INTERFACE ${LibArchive_LIBRARIES}) - target_include_directories(WrapLibArchive::WrapLibArchive INTERFACE ${LibArchive_INCLUDE_DIRS}) - set(WrapLibArchive_FOUND TRUE) -+if(TARGET BZip2::BZip2) -+ set_property(TARGET BZip2::BZip2 PROPERTY _qt_no_promote_global TRUE) -+endif() -+if(TARGET Threads::Threads) -+ set_property(TARGET Threads::Threads PROPERTY _qt_no_promote_global TRUE) -+endif() -+if(TARGET OpenSSL::Crypto) -+ set_property(TARGET OpenSSL::Crypto PROPERTY _qt_no_promote_global TRUE) -+endif() -+if(TARGET zstd::libzstd) -+ set_property(TARGET zstd::libzstd PROPERTY _qt_no_promote_global TRUE) -+endif() -+if(TARGET zstd::libzstd_shared) -+ set_property(TARGET zstd::libzstd_shared PROPERTY _qt_no_promote_global TRUE) -+endif() -+if(TARGET zstd::libzstd_static) -+ set_property(TARGET zstd::libzstd_static PROPERTY _qt_no_promote_global TRUE) -+endif() -+if(TARGET ZLIB::ZLIB) -+ set_property(TARGET ZLIB::ZLIB PROPERTY _qt_no_promote_global TRUE) -+endif() -diff --git a/cmake/FindWrapLibYaml.cmake b/cmake/FindWrapLibYaml.cmake -index 1dab912..c09e97f 100644 ---- a/cmake/FindWrapLibYaml.cmake -+++ b/cmake/FindWrapLibYaml.cmake -@@ -10,10 +10,17 @@ pkg_check_modules(pc_libyaml yaml-0.1 IMPORTED_TARGET) - - - if (NOT pc_libyaml_FOUND) -- set(WrapLibYaml_FOUND FALSE) -- return() -+ find_package(yaml) -+ if(yaml_FOUND) -+ add_library(WrapLibYaml::WrapLibYaml INTERFACE IMPORTED) -+ target_link_libraries(WrapLibYaml::WrapLibYaml INTERFACE ${yaml_LIBRARIES}) -+ else() -+ set(WrapLibYaml_FOUND FALSE) -+ return() -+ endif() -+else() -+ add_library(WrapLibYaml::WrapLibYaml INTERFACE IMPORTED) -+ target_link_libraries(WrapLibYaml::WrapLibYaml INTERFACE PkgConfig::pc_libyaml) - endif() -- --add_library(WrapLibYaml::WrapLibYaml INTERFACE IMPORTED) --target_link_libraries(WrapLibYaml::WrapLibYaml INTERFACE ${pc_libyaml_LIBRARIES}) - set(WrapLibYaml_FOUND TRUE) -+ diff --git a/vcpkg/ports/qtbase/GLIB2-static.patch b/vcpkg/ports/qtbase/GLIB2-static.patch deleted file mode 100644 index 0384482bbc..0000000000 --- a/vcpkg/ports/qtbase/GLIB2-static.patch +++ /dev/null @@ -1,103 +0,0 @@ -diff --git a/cmake/3rdparty/extra-cmake-modules/find-modules/FindGLIB2.cmake b/cmake/3rdparty/extra-cmake-modules/find-modules/FindGLIB2.cmake -index 24a194c..91c8e41 100644 ---- a/cmake/3rdparty/extra-cmake-modules/find-modules/FindGLIB2.cmake -+++ b/cmake/3rdparty/extra-cmake-modules/find-modules/FindGLIB2.cmake -@@ -95,6 +95,18 @@ find_library(GLIB2_GIO_LIBRARIES - HINTS ${PC_GIO_LIBDIR} - ) - -+pkg_check_modules(PC_GMODULE QUIET gmodule-2.0) -+ -+find_path(GLIB2_GMODULE_INCLUDE_DIRS -+ NAMES gmodule.h -+ HINTS ${PC_GMODULE} -+ PATH_SUFFIXES glib-2.0) -+ -+find_library(GLIB2_GMODULE_LIBRARIES -+ NAMES gmodule-2.0 -+ HINTS ${PC_GMODULE} -+) -+ - # search the glibconfig.h include dir under the same root where the library is found - get_filename_component(glib2LibDir "${GLIB2_LIBRARIES}" PATH) - -@@ -126,6 +138,11 @@ if(GLIB2_GIO_LIBRARIES AND GLIB2_GIO_INCLUDE_DIRS) - set(GLIB2_GIO_FOUND TRUE) - endif() - -+if(GLIB2_GMODULE_LIBRARIES AND GLIB2_GMODULE_INCLUDE_DIRS) -+ set(GLIB2_GMODULE_FOUND TRUE) -+endif() -+ -+ - include(FindPackageHandleStandardArgs) - find_package_handle_standard_args(GLIB2 - REQUIRED_VARS GLIB2_LIBRARIES GTHREAD2_LIBRARIES GLIB2_INCLUDE_DIRS -@@ -137,6 +154,16 @@ if(GLIB2_FOUND AND NOT TARGET GLIB2::GLIB2) - IMPORTED_LOCATION "${GLIB2_LIBRARIES}" - INTERFACE_LINK_LIBRARIES "${GTHREAD2_LIBRARIES}" - INTERFACE_INCLUDE_DIRECTORIES "${GLIB2_INCLUDE_DIRS}") -+ #vcpkg specific -+ pkg_check_modules(PC_PCRE2_8BIT QUIET libpcre2-8) -+ find_library(PCRE2_8BIT_LIBRARIES -+ NAMES pcre2-8 -+ HINTS ${PC_PCRE2_8BIT} -+ ) -+ target_link_libraries(GLIB2::GLIB2 INTERFACE ${PCRE2_8BIT_LIBRARIES}) -+ find_package(Iconv) -+ find_package(Intl) -+ target_link_libraries(GLIB2::GLIB2 INTERFACE Intl::Intl Iconv::Iconv) - endif() - - if(GLIB2_GOBJECT_FOUND AND NOT TARGET GLIB2::GOBJECT) -@@ -153,12 +180,21 @@ if(GLIB2_GIO_FOUND AND NOT TARGET GLIB2::GIO) - INTERFACE_INCLUDE_DIRECTORIES "${GLIB2_GIO_INCLUDE_DIRS}") - endif() - -+if(GLIB2_GMODULE_FOUND AND NOT TARGET GLIB2::GMODULE) -+ add_library(GLIB2::GMODULE UNKNOWN IMPORTED) -+ set_target_properties(GLIB2::GMODULE PROPERTIES -+ IMPORTED_LOCATION "${GLIB2_GMODULE_LIBRARIES}" -+ INTERFACE_INCLUDE_DIRECTORIES "${GLIB2_GMODULE_INCLUDE_DIRS}") -+endif() -+ -+ - mark_as_advanced(GLIB2_INCLUDE_DIRS GLIB2_INCLUDE_DIR - GLIB2_LIBRARIES GLIB2_LIBRARY - GLIB2_GOBJECT_INCLUDE_DIRS GLIB2_GOBJECT_INCLUDE_DIR - GLIB2_GOBJECT_LIBRARIES GLIB2_GOBJECT_LIBRARY - GLIB2_GIO_INCLUDE_DIRS GLIB2_GIO_INCLUDE_DIR -- GLIB2_GIO_LIBRARIES GLIB2_GIO_LIBRARY) -+ GLIB2_GIO_LIBRARIES GLIB2_GIO_LIBRARY -+ GLIB2_GMODULE_LIBRARIES GLIB2_GMODULE_INCLUDE_DIRS) - - include(FeatureSummary) - set_package_properties(GLIB2 PROPERTIES -diff --git a/src/corelib/configure.cmake b/src/corelib/configure.cmake -index 7d52f48..2b1b221 100644 ---- a/src/corelib/configure.cmake -+++ b/src/corelib/configure.cmake -@@ -25,7 +25,7 @@ endif() - qt_find_package(WrapSystemDoubleConversion - PROVIDED_TARGETS WrapSystemDoubleConversion::WrapSystemDoubleConversion - MODULE_NAME core QMAKE_LIB doubleconversion) --qt_find_package(GLIB2 PROVIDED_TARGETS GLIB2::GLIB2 MODULE_NAME core QMAKE_LIB glib) -+qt_find_package(GLIB2 PROVIDED_TARGETS GLIB2::GLIB2 MODULE MODULE_NAME core QMAKE_LIB glib) - qt_find_package(ICU 50.1 COMPONENTS i18n uc data PROVIDED_TARGETS ICU::i18n ICU::uc ICU::data - MODULE_NAME core QMAKE_LIB icu) - -diff --git a/src/network/configure.cmake b/src/network/configure.cmake -index aef7f15..21b0c1d 100644 ---- a/src/network/configure.cmake -+++ b/src/network/configure.cmake -@@ -10,8 +10,8 @@ - qt_find_package(WrapBrotli PROVIDED_TARGETS WrapBrotli::WrapBrotliDec MODULE_NAME network QMAKE_LIB brotli) - qt_find_package(Libproxy PROVIDED_TARGETS PkgConfig::Libproxy MODULE_NAME network QMAKE_LIB libproxy) - qt_find_package(GSSAPI PROVIDED_TARGETS GSSAPI::GSSAPI MODULE_NAME network QMAKE_LIB gssapi) --qt_find_package(GLIB2 OPTIONAL_COMPONENTS GOBJECT PROVIDED_TARGETS GLIB2::GOBJECT MODULE_NAME core QMAKE_LIB gobject) --qt_find_package(GLIB2 OPTIONAL_COMPONENTS GIO PROVIDED_TARGETS GLIB2::GIO MODULE_NAME core QMAKE_LIB gio) -+qt_find_package(GLIB2 OPTIONAL_COMPONENTS GOBJECT PROVIDED_TARGETS GLIB2::GOBJECT MODULE MODULE_NAME core QMAKE_LIB gobject) -+qt_find_package(GLIB2 OPTIONAL_COMPONENTS GIO PROVIDED_TARGETS GLIB2::GIO MODULE MODULE_NAME core QMAKE_LIB gio) - qt_find_package(WrapResolv PROVIDED_TARGETS WrapResolv::WrapResolv MODULE_NAME network QMAKE_LIB libresolv) - - #### Tests diff --git a/vcpkg/ports/qtbase/allow_outside_prefix.patch b/vcpkg/ports/qtbase/allow_outside_prefix.patch deleted file mode 100644 index cd5a256a7b..0000000000 --- a/vcpkg/ports/qtbase/allow_outside_prefix.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/cmake/QtBuildPathsHelpers.cmake b/cmake/QtBuildPathsHelpers.cmake -index bd186c28b..2c1994d2e 100644 ---- a/cmake/QtBuildPathsHelpers.cmake -+++ b/cmake/QtBuildPathsHelpers.cmake -@@ -135,11 +135,13 @@ function(qt_configure_process_path name default docstring) - elseif(rel_path MATCHES "^\.\./") - # INSTALL_SYSCONFDIR is allowed to be outside the prefix. - if(NOT name STREQUAL "INSTALL_SYSCONFDIR") -- message(FATAL_ERROR -- "Path component '${name}' is outside computed install prefix: ${rel_path} ") -- return() -+ #message(FATAL_ERROR -+ # "Path component '${name}' is outside computed install prefix: ${rel_path} ") -+ #return() -+ set("${name}" "${rel_path}" CACHE STRING "${docstring}" FORCE) -+ else() -+ set("${name}" "${${name}}" CACHE STRING "${docstring}" FORCE) - endif() -- set("${name}" "${${name}}" CACHE STRING "${docstring}" FORCE) - else() - set("${name}" "${rel_path}" CACHE STRING "${docstring}" FORCE) - endif() diff --git a/vcpkg/ports/qtbase/clang-cl_QGADGET_fix.diff b/vcpkg/ports/qtbase/clang-cl_QGADGET_fix.diff deleted file mode 100644 index 0304bcc47d..0000000000 --- a/vcpkg/ports/qtbase/clang-cl_QGADGET_fix.diff +++ /dev/null @@ -1,38 +0,0 @@ -diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h -index e40cd85..ba68a01 100644 ---- a/src/corelib/kernel/qmetatype.h -+++ b/src/corelib/kernel/qmetatype.h -@@ -18,6 +18,7 @@ - #endif - #include - -+#include - #include - #include - #include -@@ -826,7 +829,13 @@ - struct IsGadgetHelper { enum { IsRealGadget = false, IsGadgetOrDerivedFrom = false }; }; - - template -+#if defined(__clang__) && (__clang_major__ > 11) -+ // Clang does not reject T::QtGadgetHelper as ambiguous if a class inherits from two QGADGETS -+ // but is not a QGADGET itself -+ struct IsGadgetHelper> -+#else - struct IsGadgetHelper -+#endif - { - template - static char checkType(void (X::*)()); -@@ -841,7 +850,11 @@ - struct IsPointerToGadgetHelper { enum { IsRealGadget = false, IsGadgetOrDerivedFrom = false }; }; - - template -+#if defined(__clang__) && (__clang_major__ > 11) -+ struct IsPointerToGadgetHelper> -+#else - struct IsPointerToGadgetHelper -+#endif - { - using BaseType = T; - template diff --git a/vcpkg/ports/qtbase/clang-cl_source_location.patch b/vcpkg/ports/qtbase/clang-cl_source_location.patch deleted file mode 100644 index 5155fb4bbb..0000000000 --- a/vcpkg/ports/qtbase/clang-cl_source_location.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src/corelib/kernel/qproperty.h b/src/corelib/kernel/qproperty.h -index 823b2057b..4a8cd4fa8 100644 ---- a/src/corelib/kernel/qproperty.h -+++ b/src/corelib/kernel/qproperty.h -@@ -16,8 +16,8 @@ - - #include - --#if __has_include() && __cplusplus >= 202002L && !defined(Q_QDOC) -+#if __has_include() && __cplusplus >= 202002L && !defined(Q_QDOC) && ( (defined(__cpp_consteval) && defined(_MSC_VER)) || !defined(_MSC_VER) ) - #include - #if defined(__cpp_lib_source_location) - #define QT_SOURCE_LOCATION_NAMESPACE std - #define QT_PROPERTY_COLLECT_BINDING_LOCATION diff --git a/vcpkg/ports/qtbase/cmake/qt_install_copyright.cmake b/vcpkg/ports/qtbase/cmake/qt_install_copyright.cmake deleted file mode 100644 index 8ec395fe62..0000000000 --- a/vcpkg/ports/qtbase/cmake/qt_install_copyright.cmake +++ /dev/null @@ -1,27 +0,0 @@ -include_guard(GLOBAL) - -#Could probably be the beginning of a vcpkg_install_copyright? -function(qt_install_copyright SOURCE_PATH) - #Find the relevant license file and install it - if(EXISTS "${SOURCE_PATH}/LICENSE.LGPLv3") - set(LICENSE_PATH "${SOURCE_PATH}/LICENSE.LGPLv3") - elseif(EXISTS "${SOURCE_PATH}/LICENSE.LGPL3") - set(LICENSE_PATH "${SOURCE_PATH}/LICENSE.LGPL3") - elseif(EXISTS "${SOURCE_PATH}/LICENSE.GPLv3") - set(LICENSE_PATH "${SOURCE_PATH}/LICENSE.GPLv3") - elseif(EXISTS "${SOURCE_PATH}/LICENSE.GPL3") - set(LICENSE_PATH "${SOURCE_PATH}/LICENSE.GPL3") - elseif(EXISTS "${SOURCE_PATH}/LICENSE.GPL3-EXCEPT") - set(LICENSE_PATH "${SOURCE_PATH}/LICENSE.GPL3-EXCEPT") - elseif(EXISTS "${SOURCE_PATH}/LICENSE.FDL") - set(LICENSE_PATH "${SOURCE_PATH}/LICENSE.FDL") - endif() - if(LICENSE_PATH) - file(INSTALL "${LICENSE_PATH}" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) - elseif(EXISTS "${SOURCE_PATH}/LICENSES") - file(GLOB LICENSES "${SOURCE_PATH}/LICENSES/*") - vcpkg_install_copyright(FILE_LIST ${LICENSES}) - else() - message(WARNING "No license/copyright file found!") - endif() -endfunction() diff --git a/vcpkg/ports/qtbase/cmake/qt_install_submodule.cmake b/vcpkg/ports/qtbase/cmake/qt_install_submodule.cmake deleted file mode 100644 index 8537f48775..0000000000 --- a/vcpkg/ports/qtbase/cmake/qt_install_submodule.cmake +++ /dev/null @@ -1,358 +0,0 @@ -include_guard(GLOBAL) - -include("${CURRENT_HOST_INSTALLED_DIR}/share/vcpkg-cmake/vcpkg-port-config.cmake") -include("${CURRENT_HOST_INSTALLED_DIR}/share/vcpkg-cmake-config/vcpkg-port-config.cmake") -include("${CMAKE_CURRENT_LIST_DIR}/qt_install_copyright.cmake") - -if(NOT DEFINED QT6_DIRECTORY_PREFIX) - set(QT6_DIRECTORY_PREFIX "Qt6/") -endif() - -if(VCPKG_TARGET_IS_ANDROID AND NOT ANDROID_SDK_ROOT) - message(FATAL_ERROR "${PORT} requires ANDROID_SDK_ROOT to be set. Consider adding it to the triplet." ) -endif() - -function(qt_download_submodule_impl) - cmake_parse_arguments(PARSE_ARGV 0 "_qarg" "" "SUBMODULE" "PATCHES") - - if("${_qarg_SUBMODULE}" IN_LIST QT_FROM_QT_GIT) - # qtinterfaceframework is not available in the release, so we fall back to a `git clone`. - vcpkg_from_git( - OUT_SOURCE_PATH SOURCE_PATH - URL "https://code.qt.io/qt/${_qarg_SUBMODULE}.git" - REF "${${_qarg_SUBMODULE}_REF}" - PATCHES ${_qarg_PATCHES} - ) - if(PORT STREQUAL "qttools") # Keep this for beta & rc's - vcpkg_from_git( - OUT_SOURCE_PATH SOURCE_PATH_QLITEHTML - URL git://code.qt.io/playground/qlitehtml.git # git://code.qt.io/playground/qlitehtml.git - REF "${${PORT}_qlitehtml_REF}" - FETCH_REF master - HEAD_REF master - ) - # port 'litehtml' is not in vcpkg! - vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH_LITEHTML - REPO litehtml/litehtml - REF "${${PORT}_litehtml_REF}" - SHA512 "${${PORT}_litehtml_HASH}" - HEAD_REF master - ) - file(COPY "${SOURCE_PATH_QLITEHTML}/" DESTINATION "${SOURCE_PATH}/src/assistant/qlitehtml") - file(COPY "${SOURCE_PATH_LITEHTML}/" DESTINATION "${SOURCE_PATH}/src/assistant/qlitehtml/src/3rdparty/litehtml") - elseif(PORT STREQUAL "qtwebengine") - vcpkg_from_git( - OUT_SOURCE_PATH SOURCE_PATH_WEBENGINE - URL git://code.qt.io/qt/qtwebengine-chromium.git - REF "${${PORT}_chromium_REF}" - ) - if(NOT EXISTS "${SOURCE_PATH}/src/3rdparty/chromium") - file(RENAME "${SOURCE_PATH_WEBENGINE}/chromium" "${SOURCE_PATH}/src/3rdparty/chromium") - endif() - if(NOT EXISTS "${SOURCE_PATH}/src/3rdparty/gn") - file(RENAME "${SOURCE_PATH_WEBENGINE}/gn" "${SOURCE_PATH}/src/3rdparty/gn") - endif() - endif() - else() - if(VCPKG_USE_HEAD_VERSION) - set(sha512 SKIP_SHA512) - elseif(NOT DEFINED "${_qarg_SUBMODULE}_HASH") - message(FATAL_ERROR "No information for ${_qarg_SUBMODULE} -- add it to QT_PORTS and run qtbase in QT_UPDATE_VERSION mode first") - else() - set(sha512 SHA512 "${${_qarg_SUBMODULE}_HASH}") - endif() - - qt_get_url_filename("${_qarg_SUBMODULE}" urls filename) - vcpkg_download_distfile(archive - URLS ${urls} - FILENAME "${filename}" - ${sha512} - ) - vcpkg_extract_source_archive( - SOURCE_PATH - ARCHIVE "${archive}" - PATCHES ${_qarg_PATCHES} - ) - endif() - set(SOURCE_PATH "${SOURCE_PATH}" PARENT_SCOPE) -endfunction() - -function(qt_download_submodule) - cmake_parse_arguments(PARSE_ARGV 0 "_qarg" "" "" "PATCHES") - - qt_download_submodule_impl(SUBMODULE "${PORT}" PATCHES ${_qarg_PATCHES}) - - set(SOURCE_PATH "${SOURCE_PATH}" PARENT_SCOPE) -endfunction() - - -function(qt_cmake_configure) - cmake_parse_arguments(PARSE_ARGV 0 "_qarg" "DISABLE_NINJA;DISABLE_PARALLEL_CONFIGURE" - "" - "TOOL_NAMES;OPTIONS;OPTIONS_DEBUG;OPTIONS_RELEASE;OPTIONS_MAYBE_UNUSED") - - vcpkg_find_acquire_program(PERL) # Perl is probably required by all qt ports for syncqt - get_filename_component(PERL_PATH ${PERL} DIRECTORY) - vcpkg_add_to_path(${PERL_PATH}) - if(NOT PORT STREQUAL "qtwebengine" OR QT_IS_LATEST) # qtwebengine requires python2; since 6.3 python3 - vcpkg_find_acquire_program(PYTHON3) # Python is required by some qt ports - get_filename_component(PYTHON3_PATH ${PYTHON3} DIRECTORY) - vcpkg_add_to_path(${PYTHON3_PATH}) - endif() - - if(NOT PORT MATCHES "^qtbase") - list(APPEND _qarg_OPTIONS "-DQT_SYNCQT:PATH=${CURRENT_HOST_INSTALLED_DIR}/tools/Qt6/bin/syncqt.pl") - endif() - set(PERL_OPTION "-DHOST_PERL:PATH=${PERL}") - - set(ninja_option "") - if(_qarg_DISABLE_NINJA) - set(ninja_option WINDOWS_USE_MSBUILD) - endif() - - set(disable_parallel "") - if(_qarg_DISABLE_PARALLEL_CONFIGURE) - set(disable_parallel DISABLE_PARALLEL_CONFIGURE) - endif() - - if(VCPKG_CROSSCOMPILING) - list(APPEND _qarg_OPTIONS "-DQT_HOST_PATH=${CURRENT_HOST_INSTALLED_DIR}") - list(APPEND _qarg_OPTIONS "-DQT_HOST_PATH_CMAKE_DIR:PATH=${CURRENT_HOST_INSTALLED_DIR}/share") - endif() - - # Disable warning for CMAKE_(REQUIRE|DISABLE)_FIND_PACKAGE_ - string(REGEX MATCHALL "CMAKE_DISABLE_FIND_PACKAGE_[^:=]+" disabled_find_package "${_qarg_OPTIONS}") - list(APPEND _qarg_OPTIONS_MAYBE_UNUSED ${disabled_find_package}) - - string(REGEX MATCHALL "CMAKE_REQUIRE_FIND_PACKAGE_[^:=]+(:BOOL)?=OFF" require_find_package "${_qarg_OPTIONS}") - list(TRANSFORM require_find_package REPLACE "(:BOOL)?=OFF" "") - list(APPEND _qarg_OPTIONS_MAYBE_UNUSED ${require_find_package}) - - # Disable unused warnings for disabled features. Qt might decide to not emit the feature variables if other features are deactivated. - string(REGEX MATCHALL "(QT_)?FEATURE_[^:=]+(:BOOL)?=OFF" disabled_features "${_qarg_OPTIONS}") - list(TRANSFORM disabled_features REPLACE "(:BOOL)?=OFF" "") - list(APPEND _qarg_OPTIONS_MAYBE_UNUSED ${disabled_features}) - - list(APPEND _qarg_OPTIONS "-DQT_NO_FORCE_SET_CMAKE_BUILD_TYPE:BOOL=ON") - - if(VCPKG_TARGET_IS_ANDROID) - list(APPEND _qarg_OPTIONS "-DANDROID_SDK_ROOT=${ANDROID_SDK_ROOT}") - endif() - - if(NOT PORT MATCHES "qtbase") - list(APPEND _qarg_OPTIONS "-DQT_MKSPECS_DIR:PATH=${CURRENT_HOST_INSTALLED_DIR}/share/Qt6/mkspecs") - endif() - - vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - ${ninja_option} - ${disable_parallel} - OPTIONS - -DQT_NO_FORCE_SET_CMAKE_BUILD_TYPE:BOOL=ON - -DQT_USE_DEFAULT_CMAKE_OPTIMIZATION_FLAGS:BOOL=ON # We don't want Qt to screw with users toolchain settings. - -DCMAKE_FIND_PACKAGE_TARGETS_GLOBAL=ON # Because Qt doesn't correctly scope find_package calls. - #-DQT_HOST_PATH= # For crosscompiling - #-DQT_PLATFORM_DEFINITION_DIR=mkspecs/win32-msvc - #-DQT_QMAKE_TARGET_MKSPEC=win32-msvc - #-DQT_USE_CCACHE - -DQT_BUILD_EXAMPLES:BOOL=OFF - -DQT_BUILD_TESTS:BOOL=OFF - -DQT_BUILD_BENCHMARKS:BOOL=OFF - ${PERL_OPTION} - -DINSTALL_BINDIR:STRING=bin - -DINSTALL_LIBEXECDIR:STRING=bin - -DINSTALL_PLUGINSDIR:STRING=${qt_plugindir} - -DINSTALL_QMLDIR:STRING=${qt_qmldir} - ${_qarg_OPTIONS} - OPTIONS_RELEASE - ${_qarg_OPTIONS_RELEASE} - -DINSTALL_DOCDIR:STRING=doc/${QT6_DIRECTORY_PREFIX} - -DINSTALL_INCLUDEDIR:STRING=include/${QT6_DIRECTORY_PREFIX} - -DINSTALL_DESCRIPTIONSDIR:STRING=share/Qt6/modules - -DINSTALL_MKSPECSDIR:STRING=share/Qt6/mkspecs - -DINSTALL_TRANSLATIONSDIR:STRING=translations/${QT6_DIRECTORY_PREFIX} - OPTIONS_DEBUG - # -DFEATURE_debug:BOOL=ON only needed by qtbase and auto detected? - -DINSTALL_DOCDIR:STRING=../doc/${QT6_DIRECTORY_PREFIX} - -DINSTALL_INCLUDEDIR:STRING=../include/${QT6_DIRECTORY_PREFIX} - -DINSTALL_TRANSLATIONSDIR:STRING=../translations/${QT6_DIRECTORY_PREFIX} - -DINSTALL_DESCRIPTIONSDIR:STRING=../share/Qt6/modules - -DINSTALL_MKSPECSDIR:STRING=../share/Qt6/mkspecs - ${_qarg_OPTIONS_DEBUG} - MAYBE_UNUSED_VARIABLES - INSTALL_BINDIR - INSTALL_DOCDIR - INSTALL_LIBEXECDIR - INSTALL_QMLDIR # No qml files - INSTALL_TRANSLATIONSDIR # No translations - INSTALL_PLUGINSDIR # No plugins - INSTALL_DESCRIPTIONSDIR - INSTALL_INCLUDEDIR - HOST_PERL - QT_SYNCQT - QT_NO_FORCE_SET_CMAKE_BUILD_TYPE - ${_qarg_OPTIONS_MAYBE_UNUSED} - INPUT_bundled_xcb_xinput - INPUT_freetype - INPUT_harfbuzz - INPUT_libjpeg - INPUT_libmd4c - INPUT_libpng - INPUT_opengl - INPUT_openssl - INPUT_xcb - INPUT_xkbcommon - ) - set(Z_VCPKG_CMAKE_GENERATOR "${Z_VCPKG_CMAKE_GENERATOR}" PARENT_SCOPE) -endfunction() - -function(qt_fix_prl_files) - file(TO_CMAKE_PATH "${CURRENT_PACKAGES_DIR}/lib" package_dir) - file(TO_CMAKE_PATH "${package_dir}/lib" lib_path) - file(TO_CMAKE_PATH "${package_dir}/include/Qt6" include_path) - file(TO_CMAKE_PATH "${CURRENT_INSTALLED_DIR}" install_prefix) - file(GLOB_RECURSE prl_files "${CURRENT_PACKAGES_DIR}/*.prl" "${CURRENT_PACKAGES_DIR}/*.pri") - foreach(prl_file IN LISTS prl_files) - file(READ "${prl_file}" _contents) - string(REPLACE "${lib_path}" "\$\$[QT_INSTALL_LIBS]" _contents "${_contents}") - string(REPLACE "${include_path}" "\$\$[QT_INSTALL_HEADERS]" _contents "${_contents}") - string(REPLACE "${install_prefix}" "\$\$[QT_INSTALL_PREFIX]" _contents "${_contents}") - string(REPLACE "[QT_INSTALL_PREFIX]/lib/objects-Debug" "[QT_INSTALL_LIBS]/objects-Debug" _contents "${_contents}") - string(REPLACE "[QT_INSTALL_PREFIX]/Qt6/qml" "[QT_INSTALL_QML]" _contents "${_contents}") - #Note: This only works without an extra if case since QT_INSTALL_PREFIX is the same for debug and release - file(WRITE "${prl_file}" "${_contents}") - endforeach() -endfunction() - -function(qt_fixup_and_cleanup) - cmake_parse_arguments(PARSE_ARGV 0 "_qarg" "" - "" - "TOOL_NAMES") - vcpkg_copy_pdbs() - - ## Handle PRL files - qt_fix_prl_files() - - ## Handle CMake files. - set(COMPONENTS) - file(GLOB COMPONENTS_OR_FILES LIST_DIRECTORIES true "${CURRENT_PACKAGES_DIR}/share/Qt6*") - list(REMOVE_ITEM COMPONENTS_OR_FILES "${CURRENT_PACKAGES_DIR}/share/Qt6") - foreach(_glob IN LISTS COMPONENTS_OR_FILES) - if(IS_DIRECTORY "${_glob}") - string(REPLACE "${CURRENT_PACKAGES_DIR}/share/Qt6" "" _component "${_glob}") - debug_message("Adding cmake component: '${_component}'") - list(APPEND COMPONENTS ${_component}) - endif() - endforeach() - - foreach(_comp IN LISTS COMPONENTS) - if(EXISTS "${CURRENT_PACKAGES_DIR}/share/Qt6${_comp}") - vcpkg_cmake_config_fixup(PACKAGE_NAME "Qt6${_comp}" CONFIG_PATH "share/Qt6${_comp}" TOOLS_PATH "tools/Qt6/bin") - # Would rather put it into share/cmake as before but the import_prefix correction in vcpkg_cmake_config_fixup is working against that. - else() - message(STATUS "WARNING: Qt component ${_comp} not found/built!") - endif() - endforeach() - #fix debug plugin paths (should probably be fixed in vcpkg_cmake_config_fixup) - file(GLOB_RECURSE DEBUG_CMAKE_TARGETS "${CURRENT_PACKAGES_DIR}/share/**/*Targets-debug.cmake") - debug_message("DEBUG_CMAKE_TARGETS:${DEBUG_CMAKE_TARGETS}") - foreach(_debug_target IN LISTS DEBUG_CMAKE_TARGETS) - vcpkg_replace_string("${_debug_target}" "{_IMPORT_PREFIX}/${qt_plugindir}" "{_IMPORT_PREFIX}/debug/${qt_plugindir}") - vcpkg_replace_string("${_debug_target}" "{_IMPORT_PREFIX}/${qt_qmldir}" "{_IMPORT_PREFIX}/debug/${qt_qmldir}") - endforeach() - - file(GLOB_RECURSE STATIC_CMAKE_TARGETS "${CURRENT_PACKAGES_DIR}/share/Qt6Qml/QmlPlugins/*.cmake") - foreach(_plugin_target IN LISTS STATIC_CMAKE_TARGETS) - # restore a single get_filename_component which was remove by vcpkg_cmake_config_fixup - vcpkg_replace_string("${_plugin_target}" - [[get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)]] - "get_filename_component(_IMPORT_PREFIX \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)\nget_filename_component(_IMPORT_PREFIX \"\${_IMPORT_PREFIX}\" PATH)") - endforeach() - - set(qt_tooldest "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin") - set(qt_searchdir "${CURRENT_PACKAGES_DIR}/bin") - ## Handle Tools - foreach(_tool IN LISTS _qarg_TOOL_NAMES) - if(NOT EXISTS "${CURRENT_PACKAGES_DIR}/bin/${_tool}${VCPKG_TARGET_EXECUTABLE_SUFFIX}") - debug_message("Removed '${_tool}' from copy tools list since it was not found!") - list(REMOVE_ITEM _qarg_TOOL_NAMES ${_tool}) - endif() - endforeach() - if(_qarg_TOOL_NAMES) - set(tool_names ${_qarg_TOOL_NAMES}) - vcpkg_copy_tools(TOOL_NAMES ${tool_names} SEARCH_DIR "${qt_searchdir}" DESTINATION "${qt_tooldest}" AUTO_CLEAN) - if(EXISTS "${CURRENT_PACKAGES_DIR}/${qt_plugindir}" AND NOT PORT STREQUAL "qtdeclarative") #qmllint conflict - file(COPY "${CURRENT_PACKAGES_DIR}/${qt_plugindir}/" DESTINATION "${qt_tooldest}") - endif() - endif() - - if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/") - file(COPY "${CURRENT_PACKAGES_DIR}/bin/" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin") - endif() - file(GLOB_RECURSE _installed_dll_files RELATIVE "${CURRENT_INSTALLED_DIR}/tools/Qt6/bin" "${CURRENT_INSTALLED_DIR}/tools/Qt6/bin/*.dll") - foreach(_dll_to_remove IN LISTS _installed_dll_files) - file(GLOB_RECURSE _packaged_dll_file "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/${_dll_to_remove}") - if(EXISTS "${_packaged_dll_file}") - file(REMOVE "${_packaged_dll_file}") - endif() - endforeach() - file(GLOB_RECURSE _folders LIST_DIRECTORIES true "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/**/") - file(GLOB_RECURSE _files "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/**/") - if(_files) - list(REMOVE_ITEM _folders ${_files}) - endif() - foreach(_dir IN LISTS _folders) - if(NOT "${_remaining_dll_files}" MATCHES "${_dir}") - file(REMOVE_RECURSE "${_dir}") - endif() - endforeach() - endif() - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/cmake/" - "${CURRENT_PACKAGES_DIR}/debug/share" - "${CURRENT_PACKAGES_DIR}/lib/cmake/" - "${CURRENT_PACKAGES_DIR}/debug/include" - ) - - if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(GLOB_RECURSE _bin_files "${CURRENT_PACKAGES_DIR}/bin/*") - if(NOT _bin_files STREQUAL "") - message(STATUS "Remaining files in bin: '${_bin_files}'") - else() # Only clean if empty otherwise let vcpkg throw and error. - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin/" "${CURRENT_PACKAGES_DIR}/debug/bin/") - endif() - endif() - - vcpkg_fixup_pkgconfig() -endfunction() - -function(qt_install_submodule) - cmake_parse_arguments(PARSE_ARGV 0 "_qis" "DISABLE_NINJA" - "" - "PATCHES;TOOL_NAMES;CONFIGURE_OPTIONS;CONFIGURE_OPTIONS_DEBUG;CONFIGURE_OPTIONS_RELEASE;CONFIGURE_OPTIONS_MAYBE_UNUSED") - - set(qt_plugindir ${QT6_DIRECTORY_PREFIX}plugins) - set(qt_qmldir ${QT6_DIRECTORY_PREFIX}qml) - - qt_download_submodule(PATCHES ${_qis_PATCHES}) - - if(_qis_DISABLE_NINJA) - set(_opt DISABLE_NINJA) - endif() - qt_cmake_configure(${_opt} - OPTIONS ${_qis_CONFIGURE_OPTIONS} - OPTIONS_DEBUG ${_qis_CONFIGURE_OPTIONS_DEBUG} - OPTIONS_RELEASE ${_qis_CONFIGURE_OPTIONS_RELEASE} - OPTIONS_MAYBE_UNUSED ${_qis_CONFIGURE_OPTIONS_MAYBE_UNUSED} - ) - - vcpkg_cmake_install(ADD_BIN_TO_PATH) - - qt_fixup_and_cleanup(TOOL_NAMES ${_qis_TOOL_NAMES}) - - qt_install_copyright("${SOURCE_PATH}") - set(SOURCE_PATH "${SOURCE_PATH}" PARENT_SCOPE) -endfunction() - -include("${CMAKE_CURRENT_LIST_DIR}/qt_port_details.cmake") diff --git a/vcpkg/ports/qtbase/cmake/qt_port_data.cmake b/vcpkg/ports/qtbase/cmake/qt_port_data.cmake deleted file mode 100644 index 12ff990b0b..0000000000 --- a/vcpkg/ports/qtbase/cmake/qt_port_data.cmake +++ /dev/null @@ -1,50 +0,0 @@ -set(qtbase_HASH "cd96903a3947a1f5cf6a3ff21ab0b3209ed421d2a8c45acb34ae5aa7ad0501cb79e26cfa81bc02141d5731ebfa662442f37806e97994332077d963c9e70a5f54") -set(qttools_HASH "621277c1f8ea7b0742ce2679bc938d8c5611f712b06f6ec7afa8231e9d8ae3184870f0d9d9358076bdeac220072798e236745bf68c33eaf23dc7896a1a478235") -set(qtdeclarative_HASH "78b19353ddc447dc2b850987ee1e9fe5c898c641190fdc45001369d3d08487d62b3a20f22532c9bd9a365d3e2fcb910091001c7766142c4c6c510ac61c6a6fca") -set(qtsvg_HASH "78d588ebc60d90b86f8d639b49081a616abe0adedbd32381dd7853693065ee2e41b40ee4221d4c13c04c71a7f9780b35f3c472f5b9b5fa96af6835d711eb4937") -set(qt5compat_HASH "11a1e03216c434c07ff984fc7f225072067bd17f1d469513e84d610d067953ad8f0e492973cfab3afbaaadffd5b1d0db3e84cc96f1abfad4fced0ee852729330") -set(qtshadertools_HASH "7c6aefb6fe18e7febaa45ef84853d9400d57dfa424c7fc847dee50d155a95a54e27dafdd9a0186a8ce9476dec8b3715ad8d5b9fe6053ab777f6acb9213ab0519") -set(qtquicktimeline_HASH "1e0976a34496f3961f958a38296b1aebf5bb0be7e077b70a91d93ff4e2c652b09ba5cdf94e26c748988ce489d025328a0bd9feca77bc2ddfb360815682055e47") -set(qtquick3d_HASH "49c9a5e336a011c592c2273420044d4cdea45a11db9c684fe7289b9e552d1f8c3e2cb690350a53ddad739f5334d045e213cc225c451c9e0f2a481afb9b1e255b") -set(qttranslations_HASH "b764161def8d9e7f1f7e6417dc37e166cde402642234f8a3b55f93a56ef2f46c68799d4e80c283fe76f9790b3d84274e6be680189bc04cc09fa8ca2ea68397e7") -set(qtwayland_HASH "6829c9aef2b7fc37a6a94c0093d478c13742d8c2b3d2b9444b7a1dbe022bfce1f6a5665d16bebe221e93bddd964b726451b2949352877b25d65654df17a58eb1") -set(qtdoc_HASH "3d508ef311718aa72cb5e3ede55b6237e2e15d632261c320751dd3245c6a93978c0e0513bffea64a81f7cdff80f61675a21bc79cebd4bdc4923e5a36a699a5bb") -set(qtcoap_HASH "1aff7d048beab105b380b468bf3e893084a95bb05edae06981cf71a32d5d4b8323e0009cca9b7150a08a2f84f2c71e8ce268e13a47870e8c2e89585b2268469b") -set(qtopcua_HASH "7cd67a49d010b631ce99128f8cf0a632fdb9144e81f073b6f813f01e476f53cebc155920f2f57410d736a010fe8980544c8e8652034dcf1822c00a8fdf6b7633") -set(qtimageformats_HASH "4fe56a787742f4af5e3e5c41c8c7850190bacea6a6d13ccde4ce299dbd15d2a1ab8b1825353ad324ca159333c0adc5dede823e79e217de3ab5910c5803b96d6d") -set(qtmqtt_HASH "a4564279f486b6e0ee5d5f398c2598e9d8f2493ec6b4d5a94d2369eac4c5dac873debfd23174a8ad5a3318c2927729634a1975d9475fbba2fc0cb3f890bc6ee4") -set(qtnetworkauth_HASH "c9976ab38f8a28a5944a70c6312490df9d3823d2125fe7a23aa8752a2d5dc9c2a7bc5f256f7e95acd475806cb64fcb703ae1f633311d8f03f690e87b2de49f8e") -set(qt3d_HASH "de47d1131fb4219481cb59d3b61f9f06b3785ac429d267da197d637fde1c72b6f8a0633bf1b6e4469dd22c95f2f2fd70f5eadc3b7d7e6324fad764271f741b71") -set(qtactiveqt_HASH "8b627209bd3089b20af1c93dce408315a05f39c947f3e4a4abe30af5ffc5078ede6e9af6bf20ae1273c99e1466bdb149f9859fdc78926a6fa6d996c5f390d494") -set(qtdatavis3d_HASH "a81fb36da432d2b5ec6b79263c8ceaeb81f413d793e7af77fad27a1c094e842debfe08174d26ea511cfe28127deecaad9e2ec88125e603225230ebf31e26751b") -set(qtdeviceutilities_HASH "04da4ca56e1481e93d4ce9c77f7785a8a9e9b061acc1198aa8776fc3f4647480cbbc58245eabf6bd0d7d5bab6e6d97ead4bdb0094c83f0cf327c453c49fdeda2") -set(qtlottie_HASH "4ea0c56d5c2d12bda1d3ee0e5d820000f8ebef36ca957d69de9f40180cb07dab4f2301b4e3b06a01e33339da4b326a26d7d43de8566e6c42a42b322aeaf32a4b") -set(qtscxml_HASH "626efd53f5f54d1742b86e95c8eb240354a88492601fc650bde0229670a1c75a009320ebf50b135634a3deaddb111ddffd878e392b806f723f8b0e965dacb270") -set(qtvirtualkeyboard_HASH "badfb9145315bb60a2a3a7b858e23af25a99e4209356f94ba098fc7a9f903d4ca7c995c3d0185b8c6492394846959136479c9b2e1c94d88a41f0c68d88d2fe36") -set(qtcharts_HASH "86f201d22104789d1e0de5c7cb8241301ab4cb138cc2e82dace9509e96afcbfbd05e1d7990a8d1939567f6086dfb4acccf954c1cd558fcf2a12332f279be4e61") -set(qtconnectivity_HASH "e75eea3d9c95532dafd3e2c765b1109f066e4b583d00205d18655e39f43f7373122e4d014d405d655d12b2246470083f1ac5dada0698bc1b0fb1d115a9fca6ea") -set(qtpositioning_HASH "6ae48b27851a18c44fa3167fa05d7da9b885a85e8b99c2efc750092d1bc0bc2c438b10e085486fce143b4f961189be843fd1a58581d31bd212e79596ce52a686") -set(qtlocation_HASH "3a014f498158151ad3932d9bed40622d54e75c2cc64660f12ea02645b93777eaad67b743c073d561f1b48a3558b3b66a5cd65a6f8bcb25a57ffc20d6f7371825") -set(qtmultimedia_HASH "4cad4a7c248adba709f5fda91780151a1136bd7ebb3a249602e401c2e3ae5aceb57a3ddc3825079bfbdb0200af403ad5cf3aa252b2090102f5ab22122445dc02") -set(qtremoteobjects_HASH "4cf25b3b6d8574ebd0028b605a96c74737f35895ffe267b8986e2145c180f383e4c21002a18fa45ded11610f6f54775893f7af8ac22d0006a5f127e7e93e85ae") -set(qtsensors_HASH "2a0b56bab4eebb09236ef2e0fb6dc54a719bef955833c24ba8c28eedee0abe4a06fb3f7d804c3189b4f8ffe6d0b93bceb9c53ed6fdf23d914402ace81f219b4c") -set(qtserialbus_HASH "22e3ba8a454abb46ac776ea33b3ff7f9e83573451226cb3801ad6e3a09d4d8089e5ba33263c7a43058cf44057f1be189ff06e7d394dca12c6f74660597642fd0") -set(qtserialport_HASH "b5a92452889f6fdcf05bd9395b803557ade0df60b49c698d7131df611cde1980d0b957127034aa6aae23f24dec6e97dff129c60e5d0291f057ba6d9fb51dcfca") -set(qtwebchannel_HASH "81b264aa661460b7872bfdf49b4404f090382346997ee288afc8c00a92c52a72d963cba9667ef99e02b8bd696456ee34e811e5885ed5d400076cdcc1e6cf72fa") -set(qtwebengine_HASH "cb026f2dd389d83fbeff3eedc3fa77fc22ff5cf6d444ec163b0dc4649abdf2d16683e9d31f46324f7b3546bb1ec80e40d35854537aa3c09959457fa3c79fa96d") -set(qtwebsockets_HASH "d9d6ab3380dfd0f74dc5c37d9aedcbd3349535d97f732e1fd6adef9a8d7ca3eb5a99b0cf94d0b7dafccd910689b82c0e2fcb631b3befe89e04778f92612d0190") -set(qtwebview_HASH "ea35725f666930fa7e5d83457ad7eb30c635cd2aa469111592850307b62888140077ed7e6c659ff1523c1d048fb1c90c506694133a5048d0daa189f9b01fb356") -set(qtinterfaceframework_REF "0455bf81a5777bf19894a2dc917b20df98d2ed0c") -set(qtapplicationmanager_HASH "dbc43da631ee0d76981f3667507e3daad566ef660f909da915890a92bea8bae7b8c047bf338cf3b5c66ab3f8fbdfcdc648c3c1e478fe225204599467a4f1d927") -set(qtlanguageserver_HASH "13d4fff90e45332337b822cdb77f1b6844d1e2754846788bf8a88b1d7b526dc820b9c3d570c26371ae318020de5417133e98a75d8309b596f4973130c4c842a5") -set(qthttpserver_HASH "a1a792beedef9c4e492ecae46d20c683773db690ac6d879b557a9223b64cedc6b7260668ee8fa781db16f478b2e98a0fd3ecd81fa9620766c9ee308a49d1bda1") -set(qtquick3dphysics_HASH "b6831732fa063df7303709d06ebb831e643a3b0a3a23e9e1101c3e7c1268e75f444d3e9ffd1b21c5ae403af317b588700dba5a07fef2481fdf8dbc4ce7e19a43") -set(qtspeech_HASH "4a43e1895ae477f6b6890a36ba2da365420e7778dece26535642ead39aab39c0c10d3be1c78a5b823eaddc646bdb60c5bd16bf3ac02f279832bc9724cfedc5d2") -set(qtgrpc_HASH "2633d1693d28343b58a1a69ecc88f27a34899d0a0a1a2e3010158944323330aeb166dd02fe4e981fb88a279d333670f4be205db686057912e51e68b7b7d1606d") -set(qtquickeffectmaker_HASH "8431c06a918530d93db54cb05528c84eaf39c0e68b7c769a09e5ffd896a2a5f4a774bcf8cc153d814b64728f3841a1c897297d775bec0129f69d1436e4c31cfd") -set(qtgraphs_HASH "2bb24700d486e3dc866521e680f772e9ddf2e9d07869d4f2a11c9a5853d830f28f3624e0f547a534fcf6ab7eb1d95fe3ebca69ee389a1dee0489bf936826bd74") - - -# Keep for beta/rc -#set(qttools_qlitehtml_REF bd70f93ce41443a6a90a269531393f575685283e) -#set(qtwebengine_chromium_REF 0b138dc30d0aec7930c76a2595065629948ad9f7) diff --git a/vcpkg/ports/qtbase/cmake/qt_port_details.cmake b/vcpkg/ports/qtbase/cmake/qt_port_details.cmake deleted file mode 100644 index 574442394a..0000000000 --- a/vcpkg/ports/qtbase/cmake/qt_port_details.cmake +++ /dev/null @@ -1,183 +0,0 @@ -### Steps to update the qt6 ports -## 1. Change QT_VERSION below to the new version -## 2. Set QT_UPDATE_VERSION to 1 -## 3. Add any new Qt modules to QT_PORTS -## 4. Run a build of `qtbase` -## 5. Fix any intermediate failures by adding the module into QT_FROM_GITHUB, QT_FROM_GITHUB_BRANCH, or QT_FROM_QT_GIT as appropriate -## 6. The build should fail with "Done downloading version and emitting hashes." This will have changed out the vcpkg.json versions of the qt ports and rewritten qt_port_data.cmake -## 7. Set QT_UPDATE_VERSION back to 0 - -set(QT_VERSION 6.6.3) -set(QT_DEV_BRANCH 0) - -set(QT_UPDATE_VERSION 0) - -if(PORT MATCHES "(qtquickcontrols2)") - set(VCPKG_POLICY_EMPTY_PACKAGE enabled) - return() -endif() - -### Setting up the git tag. - -set(QT_PORTS qt - qtbase - qttools - qtdeclarative - qtsvg - qt5compat - qtshadertools - qtquicktimeline - qtquick3d - qttranslations - qtwayland - qtdoc - qtcoap - qtopcua - qtimageformats - qtmqtt - qtnetworkauth - qt3d) - # qtquickcontrols2 -> moved into qtdeclarative -if(QT_VERSION VERSION_GREATER_EQUAL 6.1) - list(APPEND QT_PORTS - ## New in 6.1 - qtactiveqt - qtdatavis3d - qtdeviceutilities - qtlottie - qtscxml - qtvirtualkeyboard - qtcharts) -endif() -if(QT_VERSION VERSION_GREATER_EQUAL 6.2) - list(APPEND QT_PORTS - ## New in 6.2 - qtconnectivity - qtpositioning - qtlocation # back in 6.5 as tech preview - qtmultimedia - qtremoteobjects - qtsensors - qtserialbus - qtserialport - qtwebchannel - qtwebengine - qtwebsockets - qtwebview) -endif() -if(QT_VERSION VERSION_GREATER_EQUAL 6.2.2) - list(APPEND QT_PORTS - ## New in 6.2.2 - qtinterfaceframework - qtapplicationmanager) -endif() -if(QT_VERSION VERSION_GREATER_EQUAL 6.3.0) - list(APPEND QT_PORTS - ## New in 6.3.0 - qtlanguageserver) -endif() -if(QT_VERSION VERSION_GREATER_EQUAL 6.4.0) - list(APPEND QT_PORTS - ## New in 6.4.0 - qthttpserver - qtquick3dphysics - qtspeech) -endif() -if(QT_VERSION VERSION_GREATER_EQUAL 6.5.0) - list(APPEND QT_PORTS - ## New in 6.5.0 - qtgrpc - qtquickeffectmaker - ) -endif() -if(QT_VERSION VERSION_GREATER_EQUAL 6.6.0) - list(APPEND QT_PORTS - ## New in 6.6.0 - qtgraphs - #qtvncserver # only commercial - #qtinsighttracker - ) -endif() -#qtinsighttracker -#qtvncserver -#qtgraphs - -# 1. By default, modules come from the official release -# 2. These modules are mirrored to github and have tags matching the release -set(QT_FROM_GITHUB qtcoap qtopcua qtmqtt qtapplicationmanager) -# 3. These modules are mirrored to github and have branches matching the release -set(QT_FROM_GITHUB_BRANCH qtdeviceutilities) -# 4. These modules are not mirrored to github and not part of the release -set(QT_FROM_QT_GIT qtinterfaceframework) -# For beta releases uncomment the next two lines and comment the lines with QT_FROM_GITHUB, QT_FROM_GITHUB_BRANCH, QT_FROM_QT_GIT -#set(QT_FROM_QT_GIT ${QT_PORTS}) -#list(POP_FRONT QT_FROM_QT_GIT) - -function(qt_get_url_filename qt_port out_urls out_filename) - if("${qt_port}" IN_LIST QT_FROM_GITHUB) - set(urls "https://github.com/qt/${qt_port}/archive/v${QT_VERSION}.tar.gz") - set(filename "qt-${qt_port}-v${QT_VERSION}.tar.gz") - elseif("${qt_port}" IN_LIST QT_FROM_GITHUB_BRANCH) - set(urls "https://github.com/qt/${qt_port}/archive/${QT_VERSION}.tar.gz") - set(filename "qt-${qt_port}-${QT_VERSION}.tar.gz") - else() - string(SUBSTRING "${QT_VERSION}" 0 3 qt_major_minor) - - if(NOT QT_DEV_BRANCH) - set(branch_subpath "archive") - else() - set(branch_subpath "development_releases") - endif() - - set(filename "${qt_port}-everywhere-src-${QT_VERSION}.tar.xz") - set(mirrors - "https://download.qt.io/" - "https://mirrors.ocf.berkeley.edu/qt/" - ) - set(url_subpath "${branch_subpath}/qt/${qt_major_minor}/${QT_VERSION}/submodules/${filename}") - list(TRANSFORM mirrors APPEND "${url_subpath}" OUTPUT_VARIABLE urls) - endif() - set(${out_urls} ${urls} PARENT_SCOPE) - set(${out_filename} "${filename}" PARENT_SCOPE) -endfunction() - -if(QT_UPDATE_VERSION) - if(NOT PORT STREQUAL "qtbase") - message(FATAL_ERROR "QT_UPDATE_VERSION must be used from the root 'qtbase' package") - endif() - set(VCPKG_USE_HEAD_VERSION 1) - set(msg "" CACHE INTERNAL "") - foreach(qt_port IN LISTS QT_PORTS) - set(port_json "${CMAKE_CURRENT_LIST_DIR}/../../${qt_port}/vcpkg.json") - file(READ "${port_json}" _control_contents) - string(REGEX REPLACE "\"version(-(string|semver))?\": [^\n]+\n" "\"version\": \"${QT_VERSION}\",\n" _control_contents "${_control_contents}") - string(REGEX REPLACE "\"port-version\": [^\n]+\n" "" _control_contents "${_control_contents}") - file(WRITE "${port_json}" "${_control_contents}") - if(qt_port STREQUAL "qt") - continue() - endif() - if("${qt_port}" IN_LIST QT_FROM_QT_GIT) - vcpkg_find_acquire_program(GIT) - execute_process( - COMMAND "${GIT}" ls-remote -t "https://code.qt.io/cgit/qt/${qt_port}.git" "v${QT_VERSION}" - OUTPUT_VARIABLE out - ) - string(SUBSTRING "${out}" 0 40 tag_sha) - string(APPEND msg "set(${qt_port}_REF ${tag_sha})\n") - else() - qt_get_url_filename("${qt_port}" urls filename) - vcpkg_download_distfile(archive - URLS ${urls} - FILENAME "${filename}" - SKIP_SHA512 - ) - file(SHA512 "${archive}" hash) - string(APPEND msg "set(${qt_port}_HASH \"${hash}\")\n") - endif() - endforeach() - message("${msg}") - file(WRITE "${CMAKE_CURRENT_LIST_DIR}/qt_port_data_new.cmake" "${msg}") - message(FATAL_ERROR "Done downloading version and emitting hashes.") -endif() - -include("${CMAKE_CURRENT_LIST_DIR}/qt_port_data.cmake") diff --git a/vcpkg/ports/qtbase/config_install.patch b/vcpkg/ports/qtbase/config_install.patch deleted file mode 100644 index fdfc703301..0000000000 --- a/vcpkg/ports/qtbase/config_install.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/cmake/QtBuildPathsHelpers.cmake b/cmake/QtBuildPathsHelpers.cmake -index bd186c28b..edee52e8b 100644 ---- a/cmake/QtBuildPathsHelpers.cmake -+++ b/cmake/QtBuildPathsHelpers.cmake -@@ -100,7 +100,7 @@ function(qt_internal_set_up_global_paths) - if(QT_CONFIG_INSTALL_DIR) - string(APPEND QT_CONFIG_INSTALL_DIR "/") - endif() -- string(APPEND QT_CONFIG_INSTALL_DIR ${__config_path_part}) -+ string(APPEND QT_CONFIG_INSTALL_DIR "share") - - set(QT_BUILD_DIR "${QT_BUILD_DIR}" PARENT_SCOPE) - set(QT_INSTALL_DIR "${QT_INSTALL_DIR}" PARENT_SCOPE) diff --git a/vcpkg/ports/qtbase/dont_force_cmakecache_latest.patch b/vcpkg/ports/qtbase/dont_force_cmakecache_latest.patch deleted file mode 100644 index 752cefe6d2..0000000000 --- a/vcpkg/ports/qtbase/dont_force_cmakecache_latest.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/cmake/QtPostProcessHelpers.cmake b/cmake/QtPostProcessHelpers.cmake -index 4f8106dfa..bec5c402e 100644 ---- a/cmake/QtPostProcessHelpers.cmake -+++ b/cmake/QtPostProcessHelpers.cmake -@@ -414,7 +414,7 @@ function(qt_generate_install_prefixes out_var) - - foreach(var ${vars}) - get_property(docstring CACHE "${var}" PROPERTY HELPSTRING) -- string(APPEND content "set(${var} \"${${var}}\" CACHE STRING \"${docstring}\" FORCE)\n") -+ string(APPEND content "set(${var} \"${${var}}\" CACHE STRING \"${docstring}\")\n") - endforeach() - - set(${out_var} "${content}" PARENT_SCOPE) diff --git a/vcpkg/ports/qtbase/env.patch b/vcpkg/ports/qtbase/env.patch deleted file mode 100644 index 6a37167592..0000000000 --- a/vcpkg/ports/qtbase/env.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/cmake/QtTestHelpers.cmake b/cmake/QtTestHelpers.cmake -index 279ab07dd..951fd3d36 100644 ---- a/cmake/QtTestHelpers.cmake -+++ b/cmake/QtTestHelpers.cmake -@@ -653,9 +653,9 @@ function(qt_internal_collect_command_environment out_path out_plugin_path) - # The regular CMAKE_INSTALL_PREFIX can be different for example when building standalone tests. - # Any given CMAKE_INSTALL_PREFIX takes priority over qt_relocatable_install_prefix for the - # PATH environment variable. -- set(install_prefixes "${CMAKE_INSTALL_PREFIX}") -+ set(install_prefixes "${CMAKE_INSTALL_PREFIX}$<$:/debug>") - if(QT_BUILD_INTERNALS_RELOCATABLE_INSTALL_PREFIX) -- list(APPEND install_prefixes "${QT_BUILD_INTERNALS_RELOCATABLE_INSTALL_PREFIX}") -+ list(APPEND install_prefixes "${QT_BUILD_INTERNALS_RELOCATABLE_INSTALL_PREFIX}$<$:/debug>") - endif() - - file(TO_NATIVE_PATH "${CMAKE_CURRENT_BINARY_DIR}" test_env_path) diff --git a/vcpkg/ports/qtbase/fix-host-aliasing.patch b/vcpkg/ports/qtbase/fix-host-aliasing.patch deleted file mode 100644 index 1823a351d9..0000000000 --- a/vcpkg/ports/qtbase/fix-host-aliasing.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/cmake/QtTargetHelpers.cmake b/cmake/QtTargetHelpers.cmake -index 180ec33..a03e3b1 100644 ---- a/cmake/QtTargetHelpers.cmake -+++ b/cmake/QtTargetHelpers.cmake -@@ -281,10 +281,10 @@ function(qt_internal_add_target_aliases target) - set_target_properties("${target}" PROPERTIES _qt_versionfull_alias "${versionfull_alias}") - - get_target_property(type "${target}" TYPE) -- if (type STREQUAL EXECUTABLE) -+ if (type STREQUAL EXECUTABLE AND NOT TARGET "${versionfull_alias}") - add_executable("${versionless_alias}" ALIAS "${target}") - add_executable("${versionfull_alias}" ALIAS "${target}") -- else() -+ elseif(NOT type STREQUAL EXECUTABLE) - add_library("${versionless_alias}" ALIAS "${target}") - add_library("${versionfull_alias}" ALIAS "${target}") - endif() diff --git a/vcpkg/ports/qtbase/fix_cmake_build.patch b/vcpkg/ports/qtbase/fix_cmake_build.patch deleted file mode 100644 index 65410e3fc7..0000000000 --- a/vcpkg/ports/qtbase/fix_cmake_build.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/cmake/QtBuildInternalsExtra.cmake.in b/cmake/QtBuildInternalsExtra.cmake.in -index ffc9d90f8..0b3a7d59e 100644 ---- a/cmake/QtBuildInternalsExtra.cmake.in -+++ b/cmake/QtBuildInternalsExtra.cmake.in -@@ -51,8 +51,8 @@ endif() - set(QT_WILL_INSTALL @QT_WILL_INSTALL@ CACHE BOOL - "Boolean indicating if doing a Qt prefix build (vs non-prefix build)." FORCE) - --set(QT_SOURCE_TREE "@QT_SOURCE_TREE@" CACHE PATH --"A path to the source tree of the previously configured QtBase project." FORCE) -+# set(QT_SOURCE_TREE "@QT_SOURCE_TREE@" CACHE PATH -+# "A path to the source tree of the previously configured QtBase project." FORCE) - - # Propagate decision of building tests and examples to other repositories. - set(QT_BUILD_TESTS @QT_BUILD_TESTS@ CACHE BOOL "Build the testing tree.") diff --git a/vcpkg/ports/qtbase/fix_cmake_build_type.patch b/vcpkg/ports/qtbase/fix_cmake_build_type.patch deleted file mode 100644 index ceb5eaa032..0000000000 --- a/vcpkg/ports/qtbase/fix_cmake_build_type.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/cmake/QtBuildInternalsExtra.cmake.in b/cmake/QtBuildInternalsExtra.cmake.in -index 21c40f2..c212148 100644 ---- a/cmake/QtBuildInternalsExtra.cmake.in -+++ b/cmake/QtBuildInternalsExtra.cmake.in -@@ -162,6 +162,7 @@ function(qt_internal_force_set_cmake_build_type_conditionally value) - # STREQUAL check needs to be expanded variables because an undefined var is not equal to an - # empty defined var. - if("${CMAKE_BUILD_TYPE}" STREQUAL "${CMAKE_BUILD_TYPE_INIT}" -+ AND NOT DEFINED CACHE{CMAKE_BUILD_TYPE} - AND NOT __qt_toolchain_cmake_build_type_before_project_call - AND NOT QT_NO_FORCE_SET_CMAKE_BUILD_TYPE - AND NOT __qt_internal_extras_is_multi_config) ---- a/cmake/QtBuildOptionsHelpers.cmake -+++ b/cmake/QtBuildOptionsHelpers.cmake -@@ -18,6 +18,7 @@ macro(qt_internal_set_default_build_type) - # See also qt_internal_force_set_cmake_build_type_conditionally which is used - # to set the build type when building other repos or tests. - if("${CMAKE_BUILD_TYPE}" STREQUAL "${CMAKE_BUILD_TYPE_INIT}" -+ AND NOT DEFINED CACHE{CMAKE_BUILD_TYPE} - AND NOT __qt_auto_detect_cmake_build_type_before_project_call - AND NOT __qt_build_internals_cmake_build_type - AND NOT CMAKE_CONFIGURATION_TYPES) diff --git a/vcpkg/ports/qtbase/fix_egl.patch b/vcpkg/ports/qtbase/fix_egl.patch deleted file mode 100644 index 7868310687..0000000000 --- a/vcpkg/ports/qtbase/fix_egl.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/cmake/3rdparty/extra-cmake-modules/find-modules/FindEGL.cmake b/cmake/3rdparty/extra-cmake-modules/find-modules/FindEGL.cmake -index eafbc1ff9..dd4068838 100644 ---- a/cmake/3rdparty/extra-cmake-modules/find-modules/FindEGL.cmake -+++ b/cmake/3rdparty/extra-cmake-modules/find-modules/FindEGL.cmake -@@ -82,6 +82,7 @@ find_path(EGL_INCLUDE_DIR - find_library(EGL_LIBRARY - NAMES - EGL -+ libEGL # required to find angle on windows within vcpkg. - HINTS - ${PKG_EGL_LIBRARY_DIRS} - ) diff --git a/vcpkg/ports/qtbase/fix_egl_2.patch b/vcpkg/ports/qtbase/fix_egl_2.patch deleted file mode 100644 index 78b1c360fc..0000000000 --- a/vcpkg/ports/qtbase/fix_egl_2.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/cmake/3rdparty/extra-cmake-modules/find-modules/FindEGL.cmake b/cmake/3rdparty/extra-cmake-modules/find-modules/FindEGL.cmake -index db48f79b9..4b1686132 100644 ---- a/cmake/3rdparty/extra-cmake-modules/find-modules/FindEGL.cmake -+++ b/cmake/3rdparty/extra-cmake-modules/find-modules/FindEGL.cmake -@@ -116,7 +116,7 @@ if(EGL_INCLUDE_DIR) - unset(_EGL_version_lines) - endif() - --cmake_push_check_state(RESET) -+cmake_push_check_state() # To be able to fix the compile check in vcpkg-cmake-wrapper - list(APPEND CMAKE_REQUIRED_LIBRARIES "${EGL_LIBRARY}") - list(APPEND CMAKE_REQUIRED_INCLUDES "${EGL_INCLUDE_DIR}") - list(APPEND CMAKE_REQUIRED_DEFINITIONS "${EGL_DEFINITIONS}") diff --git a/vcpkg/ports/qtbase/harfbuzz.patch b/vcpkg/ports/qtbase/harfbuzz.patch deleted file mode 100644 index a2f8e74249..0000000000 --- a/vcpkg/ports/qtbase/harfbuzz.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/cmake/FindWrapSystemHarfbuzz.cmake b/cmake/FindWrapSystemHarfbuzz.cmake -index 3cb44aa76..9bf0d7165 100644 ---- a/cmake/FindWrapSystemHarfbuzz.cmake -+++ b/cmake/FindWrapSystemHarfbuzz.cmake -@@ -6,7 +6,7 @@ if(TARGET WrapSystemHarfbuzz::WrapSystemHarfbuzz) - endif() - set(WrapSystemHarfbuzz_REQUIRED_VARS __harfbuzz_found) - --find_package(harfbuzz ${${CMAKE_FIND_PACKAGE_NAME}_FIND_VERSION} QUIET) -+find_package(harfbuzz QUIET) # VCPKG is missing the version file for harfbuzz. - - # Gentoo has some buggy version of a harfbuzz Config file. Check if include paths are valid. - set(__harfbuzz_target_name "harfbuzz::harfbuzz") diff --git a/vcpkg/ports/qtbase/installed_dir.patch b/vcpkg/ports/qtbase/installed_dir.patch deleted file mode 100644 index 9186731415..0000000000 --- a/vcpkg/ports/qtbase/installed_dir.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/cmake/qt.toolchain.cmake.in b/cmake/qt.toolchain.cmake.in -index 6e37ae02..e7e84468 100644 ---- a/cmake/qt.toolchain.cmake.in -+++ b/cmake/qt.toolchain.cmake.in -@@ -65,6 +65,10 @@ get_filename_component(QT_TOOLCHAIN_RELOCATABLE_INSTALL_PREFIX - # one level higher is what we're looking for. - get_filename_component(QT_TOOLCHAIN_RELOCATABLE_CMAKE_DIR "${CMAKE_CURRENT_LIST_DIR}/.." ABSOLUTE) - -+get_filename_component(vcpkg_installed_dir -+ ${CMAKE_CURRENT_LIST_DIR}/../../../ -+ ABSOLUTE) -+ - # REROOT_PATH_ISSUE_MARKER - # There's a subdirectory check in cmake's cmFindCommon::RerootPaths() function, that doesn't handle - # the case of CMAKE_PREFIX_PATH == CMAKE_FIND_ROOT_PATH for a particular pair of entries. diff --git a/vcpkg/ports/qtbase/portfile.cmake b/vcpkg/ports/qtbase/portfile.cmake deleted file mode 100644 index 3b4d4081c3..0000000000 --- a/vcpkg/ports/qtbase/portfile.cmake +++ /dev/null @@ -1,501 +0,0 @@ -# Reminder for myself and everybody else: -# Qt cross module dependency information within the Qt respository is wrong and/or incomplete. -# Always check the toplevel CMakeLists.txt for the find_package call and search for linkage against the Qt:: targets -# Often enough certain (bigger) dependencies are only used to build examples and/or tests. -# As such getting the correct dependency information relevant for vcpkg requires a manual search/check -set(QT_IS_LATEST ON) - -## All above goes into the qt_port_hashes in the future -include("${CMAKE_CURRENT_LIST_DIR}/cmake/qt_install_submodule.cmake") - -set(${PORT}_PATCHES - - allow_outside_prefix.patch - config_install.patch - fix_cmake_build.patch - harfbuzz.patch - fix_egl.patch - fix_egl_2.patch - installed_dir.patch - GLIB2-static.patch # alternative is to force pkg-config - clang-cl_source_location.patch - clang-cl_QGADGET_fix.diff - fix-host-aliasing.patch - ) - -if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) - list(APPEND ${PORT}_PATCHES env.patch) -endif() - -list(APPEND ${PORT}_PATCHES - dont_force_cmakecache_latest.patch - ) - -if(VCPKG_TARGET_IS_WINDOWS AND NOT "doubleconversion" IN_LIST FEATURES) - message(FATAL_ERROR "${PORT} requires feature doubleconversion on windows!" ) -endif() - -if(VCPKG_TARGET_IS_LINUX) - message(WARNING "qtbase currently requires packages from the system package manager. " - "They can be installed on Ubuntu systems via sudo apt-get install " - "'^libxcb.*-dev' libx11-xcb-dev libglu1-mesa-dev libxrender-dev libxi-dev libxkbcommon-dev " - "libxkbcommon-x11-dev libegl1-mesa-dev.") -endif() - -# Features can be found via searching for qt_feature in all configure.cmake files in the source: -# The files also contain information about the Platform for which it is searched -# Always use FEATURE_ in vcpkg_cmake_configure -# (using QT_FEATURE_X overrides Qts condition check for the feature.) -# Theoretically there is a feature for every widget to enable/disable it but that is way to much for vcpkg - -set(input_vars doubleconversion freetype harfbuzz libb2 jpeg libmd4c png sql-sqlite) -set(INPUT_OPTIONS) -foreach(_input IN LISTS input_vars) - if(_input MATCHES "(png|jpeg)" ) - list(APPEND INPUT_OPTIONS -DINPUT_lib${_input}:STRING=) - elseif(_input MATCHES "(sql-sqlite)") # Not yet used by the cmake build - else() - list(APPEND INPUT_OPTIONS -DINPUT_${_input}:STRING=) - endif() - if("${_input}" IN_LIST FEATURES) - string(APPEND INPUT_OPTIONS system) - elseif(_input STREQUAL "libb2" AND NOT VCPKG_TARGET_IS_WINDOWS) - string(APPEND INPUT_OPTIONS system) - elseif(_input STREQUAL "libmd4c") - string(APPEND INPUT_OPTIONS qt) # libmd4c is not yet in VCPKG (but required by qtdeclarative) - else() - string(APPEND INPUT_OPTIONS no) - endif() -endforeach() - -# General features: - -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS -FEATURES - "appstore-compliant" FEATURE_appstore_compliant - "zstd" FEATURE_zstd - "framework" FEATURE_framework - "concurrent" FEATURE_concurrent - "concurrent" FEATURE_future - "dbus" FEATURE_dbus - "gui" FEATURE_gui - "thread" FEATURE_thread - "network" FEATURE_network - "sql" FEATURE_sql - "widgets" FEATURE_widgets - #"xml" FEATURE_xml # Required to build moc - "testlib" FEATURE_testlib - "zstd" CMAKE_REQUIRE_FIND_PACKAGE_zstd - ${require_features} -INVERTED_FEATURES - "zstd" CMAKE_DISABLE_FIND_PACKAGE_ZSTD - "dbus" CMAKE_DISABLE_FIND_PACKAGE_WrapDBus1 - ) - -list(APPEND FEATURE_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_Libudev:BOOL=ON) -list(APPEND FEATURE_OPTIONS -DFEATURE_xml:BOOL=ON) - -if(VCPKG_QT_NAMESPACE) - list(APPEND FEATURE_OPTIONS "-DQT_NAMESPACE:STRING=${VCPKG_QT_NAMESPACE}") -endif() - -# Corelib features: -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_CORE_OPTIONS -FEATURES - "doubleconversion" FEATURE_doubleconversion - "glib" FEATURE_glib - "icu" FEATURE_icu - "pcre2" FEATURE_pcre2 - #"icu" CMAKE_REQUIRE_FIND_PACKAGE_ICU - "glib" CMAKE_REQUIRE_FIND_PACKAGE_GLIB2 -INVERTED_FEATURES - #"doubleconversion" CMAKE_DISABLE_FIND_PACKAGE_WrapDoubleConversion # Required - #"pcre2" CMAKE_DISABLE_FIND_PACKAGE_WrapSystemPCRE2 # Bug in qt cannot be deactivated - "icu" CMAKE_DISABLE_FIND_PACKAGE_ICU - "glib" CMAKE_DISABLE_FIND_PACKAGE_GLIB2 - ) - -list(APPEND FEATURE_CORE_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_LTTngUST:BOOL=ON) -list(APPEND FEATURE_CORE_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_PPS:BOOL=ON) -list(APPEND FEATURE_CORE_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_Slog2:BOOL=ON) -list(APPEND FEATURE_CORE_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_Libsystemd:BOOL=ON) -list(APPEND FEATURE_CORE_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_WrapBacktrace:BOOL=ON) -#list(APPEND FEATURE_CORE_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_WrapAtomic:BOOL=ON) # Cannot be disabled on x64 platforms -#list(APPEND FEATURE_CORE_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_WrapRt:BOOL=ON) # Cannot be disabled on osx -list(APPEND FEATURE_CORE_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_PPS:BOOL=ON) -list(APPEND FEATURE_CORE_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_Slog2:BOOL=ON) - -# Network features: - vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_NET_OPTIONS - FEATURES - "openssl" FEATURE_openssl - "brotli" FEATURE_brotli - "securetransport" FEATURE_securetransport - #"brotli" CMAKE_REQUIRE_FIND_PACKAGE_WrapBrotli - #"openssl" CMAKE_REQUIRE_FIND_PACKAGE_WrapOpenSSL - INVERTED_FEATURES - "brotli" CMAKE_DISABLE_FIND_PACKAGE_WrapBrotli - "openssl" CMAKE_DISABLE_FIND_PACKAGE_WrapOpenSSL - ) - -if("openssl" IN_LIST FEATURES) - list(APPEND FEATURE_NET_OPTIONS -DINPUT_openssl=linked) -else() - list(APPEND FEATURE_NET_OPTIONS -DINPUT_openssl=no) -endif() - -list(APPEND FEATURE_NET_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_Libproxy:BOOL=ON) -list(APPEND FEATURE_NET_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_GSSAPI:BOOL=ON) -list(APPEND FEATURE_NET_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_WrapResolv:BOOL=ON) - -# Gui features: -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_GUI_OPTIONS - FEATURES - "freetype" FEATURE_freetype # required on windows - "harfbuzz" FEATURE_harfbuzz - "fontconfig" FEATURE_fontconfig # NOT WINDOWS - "jpeg" FEATURE_jpeg - "png" FEATURE_png - "opengl" FEATURE_opengl - "xlib" FEATURE_xlib - "xkb" FEATURE_xkbcommon - "xcb" FEATURE_xcb - "xcb-xlib" FEATURE_xcb_xlib - "xkbcommon-x11" FEATURE_xkbcommon_x11 - "xrender" FEATURE_xrender # requires FEATURE_xcb_native_painting; otherwise disabled. - "xrender" FEATURE_xcb_native_painting # experimental - "gles2" FEATURE_opengles2 - "gles3" FEATURE_opengles3 - #Cannot be required since Qt will look in CONFIG mode first but is controlled via CMAKE_DISABLE_FIND_PACKAGE_Vulkan below - #"vulkan" CMAKE_REQUIRE_FIND_PACKAGE_WrapVulkanHeaders - "egl" FEATURE_egl - #"fontconfig" CMAKE_REQUIRE_FIND_PACKAGE_Fontconfig - #"harfbuzz" CMAKE_REQUIRE_FIND_PACKAGE_WrapSystemHarfbuzz - #"jpeg" CMAKE_REQUIRE_FIND_PACKAGE_JPEG - #"png" CMAKE_REQUIRE_FIND_PACKAGE_PNG - #"xlib" CMAKE_REQUIRE_FIND_PACKAGE_X11 - #"xkb" CMAKE_REQUIRE_FIND_PACKAGE_XKB - #"xcb" CMAKE_REQUIRE_FIND_PACKAGE_XCB - #"xcb-xlib" CMAKE_REQUIRE_FIND_PACKAGE_X11_XCB - #"xkbcommon-x11" CMAKE_REQUIRE_FIND_PACKAGE_XKB_COMMON_X11 - #"xrender" CMAKE_REQUIRE_FIND_PACKAGE_XRender - INVERTED_FEATURES - "vulkan" CMAKE_DISABLE_FIND_PACKAGE_Vulkan - "opengl" CMAKE_DISABLE_FIND_PACKAGE_WrapOpenGL - "egl" CMAKE_DISABLE_FIND_PACKAGE_EGL - "gles2" CMAKE_DISABLE_FIND_PACKAGE_GLESv2 - "gles3" CMAKE_DISABLE_FIND_PACKAGE_GLESv3 - "fontconfig" CMAKE_DISABLE_FIND_PACKAGE_Fontconfig - #"freetype" CMAKE_DISABLE_FIND_PACKAGE_WrapSystemFreetype # Bug in qt cannot be deactivated - "harfbuzz" CMAKE_DISABLE_FIND_PACKAGE_WrapSystemHarfbuzz - "jpeg" CMAKE_DISABLE_FIND_PACKAGE_JPEG - "png" CMAKE_DISABLE_FIND_PACKAGE_PNG - "xlib" CMAKE_DISABLE_FIND_PACKAGE_X11 - "xkb" CMAKE_DISABLE_FIND_PACKAGE_XKB - "xcb" CMAKE_DISABLE_FIND_PACKAGE_XCB - "xcb-xlib" CMAKE_DISABLE_FIND_PACKAGE_X11_XCB - "xkbcommon-x11" CMAKE_DISABLE_FIND_PACKAGE_XKB_COMMON_X11 - "xrender" CMAKE_DISABLE_FIND_PACKAGE_XRender - # There are more X features but I am unsure how to safely disable them! Most of them seem to be found automaticall with find_package(X11) - ) - -if("gles2" IN_LIST FEATURES) - list(APPEND FEATURE_GUI_OPTIONS -DINPUT_opengl='es2') - list(APPEND FEATURE_GUI_OPTIONS -DFEATURE_opengl_desktop=OFF) -endif() - -if(NOT "opengl" IN_LIST FEATURES AND NOT "gles2" IN_LIST FEATURES) - list(APPEND FEATURE_GUI_OPTIONS -DINPUT_opengl='no') - list(APPEND FEATURE_GUI_OPTIONS -DFEATURE_opengl_desktop=OFF) - list(APPEND FEATURE_GUI_OPTIONS -DFEATURE_opengl_dynamic=OFF) -endif() - -if("xcb" IN_LIST FEATURES) - list(APPEND FEATURE_GUI_OPTIONS -DINPUT_xcb=yes) -else() - list(APPEND FEATURE_GUI_OPTIONS -DINPUT_xcb=no) -endif() -if("xkb" IN_LIST FEATURES) - list(APPEND FEATURE_GUI_OPTIONS -DINPUT_xkbcommon=yes) -else() - list(APPEND FEATURE_GUI_OPTIONS -DINPUT_xkbcommon=no) -endif() - -# Disable OpenGL ES 3.1 and 3.2 -list(APPEND FEATURE_GUI_OPTIONS -DFEATURE_opengles3:BOOL=OFF) -list(APPEND FEATURE_GUI_OPTIONS -DFEATURE_opengles31:BOOL=OFF) -list(APPEND FEATURE_GUI_OPTIONS -DFEATURE_opengles32:BOOL=OFF) - -list(APPEND FEATURE_GUI_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_ATSPI2:BOOL=ON) -list(APPEND FEATURE_GUI_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_DirectFB:BOOL=ON) -list(APPEND FEATURE_GUI_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_Libdrm:BOOL=ON) -list(APPEND FEATURE_GUI_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_gbm:BOOL=ON) -list(APPEND FEATURE_GUI_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_Libinput:BOOL=ON) -list(APPEND FEATURE_GUI_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_Mtdev:BOOL=ON) -list(APPEND FEATURE_GUI_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_Tslib:BOOL=ON) -# sql-drivers features: - -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_SQLDRIVERS_OPTIONS - FEATURES - "sql-sqlite" FEATURE_system_sqlite - "sql-odbc" FEATURE_sql_odbc - "sql-mysql" FEATURE_sql_mysql - "sql-oci" FEATURE_sql_oci - #"sql-psql" CMAKE_REQUIRE_FIND_PACKAGE_PostgreSQL - #"sql-sqlite" CMAKE_REQUIRE_FIND_PACKAGE_SQLite3 - INVERTED_FEATURES - "sql-psql" CMAKE_DISABLE_FIND_PACKAGE_PostgreSQL - "sql-sqlite" CMAKE_DISABLE_FIND_PACKAGE_SQLite3 - "sql-odbc" CMAKE_DISABLE_FIND_PACKAGE_ODBC - "sql-mysql" CMAKE_DISABLE_FIND_PACKAGE_MySQL - "sql-oci" CMAKE_DISABLE_FIND_PACKAGE_Oracle - ) - -set(DB_LIST DB2 Interbase Mimer) -foreach(_db IN LISTS DB_LIST) - list(APPEND FEATURE_SQLDRIVERS_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_${_db}:BOOL=ON) -endforeach() - -# printsupport features: -# vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_PRINTSUPPORT_OPTIONS - # ) -list(APPEND FEATURE_PRINTSUPPORT_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_CUPS:BOOL=ON) - -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_WIDGETS_OPTIONS - FEATURES - "gtk3" FEATURE_gtk3 - INVERTED_FEATURES - "gtk3" CMAKE_DISABLE_FIND_PACKAGE_GTK3 -) - -set(TOOL_NAMES - androiddeployqt - androidtestrunner - cmake_automoc_parser - moc - qdbuscpp2xml - qdbusxml2cpp - qlalr - qmake - qmake6 - qvkgen - rcc - tracegen - uic - qtpaths - qtpaths6 - windeployqt - windeployqt6 - macdeployqt - macdeployqt6 - androiddeployqt6 - syncqt - tracepointgen - ) - -qt_install_submodule(PATCHES ${${PORT}_PATCHES} - TOOL_NAMES ${TOOL_NAMES} - CONFIGURE_OPTIONS - #--trace-expand - ${FEATURE_OPTIONS} - ${FEATURE_CORE_OPTIONS} - ${FEATURE_NET_OPTIONS} - ${FEATURE_GUI_OPTIONS} - ${FEATURE_SQLDRIVERS_OPTIONS} - ${FEATURE_PRINTSUPPORT_OPTIONS} - ${FEATURE_WIDGETS_OPTIONS} - ${INPUT_OPTIONS} - -DQT_USE_BUNDLED_BundledFreetype:BOOL=FALSE - -DQT_USE_BUNDLED_BundledHarfbuzz:BOOL=FALSE - -DQT_USE_BUNDLED_BundledLibpng:BOOL=FALSE - -DQT_USE_BUNDLED_BundledPcre2:BOOL=FALSE - -DINPUT_bundled_xcb_xinput:STRING=no - -DFEATURE_force_debug_info:BOOL=ON - -DFEATURE_relocatable:BOOL=ON - CONFIGURE_OPTIONS_RELEASE - CONFIGURE_OPTIONS_DEBUG - -DFEATURE_debug:BOOL=ON - CONFIGURE_OPTIONS_MAYBE_UNUSED - FEATURE_appstore_compliant # only used for android/ios - ) - -# Install CMake helper scripts -file(COPY - "${CMAKE_CURRENT_LIST_DIR}/cmake/" - DESTINATION - "${CURRENT_PACKAGES_DIR}/share/${PORT}" - ) - -file(CONFIGURE OUTPUT "${CURRENT_PACKAGES_DIR}/share/${PORT}/port_status.cmake" CONTENT "set(qtbase_with_icu ${FEATURE_icu})\n") - -set(other_files qt-cmake - qt-cmake-private - qt-cmake-standalone-test - qt-configure-module - qt-internal-configure-tests - qt-cmake-create - ) -if(CMAKE_HOST_WIN32) - set(script_suffix ".bat") -else() - set(script_suffix "") -endif() -list(TRANSFORM other_files APPEND "${script_suffix}") - -list(APPEND other_files - android_cmakelist_patcher.sh - android_emulator_launcher.sh - ensure_pro_file.cmake - syncqt.pl - target_qt.conf - qt-cmake-private-install.cmake - qt-testrunner.py - sanitizer-testrunner.py - ) - -foreach(_config debug release) - if(_config MATCHES "debug") - set(path_suffix debug/) - else() - set(path_suffix) - endif() - if(NOT EXISTS "${CURRENT_PACKAGES_DIR}/${path_suffix}bin") - continue() - endif() - file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/${path_suffix}") - foreach(other_file IN LISTS other_files) - if(EXISTS "${CURRENT_PACKAGES_DIR}/${path_suffix}bin/${other_file}") - set(target_file "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/${path_suffix}${other_file}") - file(RENAME "${CURRENT_PACKAGES_DIR}/${path_suffix}bin/${other_file}" "${target_file}") - file(READ "${target_file}" _contents) - if(_config MATCHES "debug") - string(REPLACE "..\\share\\" "..\\..\\..\\..\\share\\" _contents "${_contents}") - string(REPLACE "../share/" "../../../../share/" _contents "${_contents}") - else() - string(REPLACE "..\\share\\" "..\\..\\..\\share\\" _contents "${_contents}") - string(REPLACE "../share/" "../../../share/" _contents "${_contents}") - endif() - string(REGEX REPLACE "set cmake_path=[^\n]+\n" "set cmake_path=cmake\n" _contents "${_contents}") - string(REGEX REPLACE "original_cmake_path=[^\n]+\n" "original_cmake_path=does-not-exist\n" _contents "${_contents}") - file(WRITE "${target_file}" "${_contents}") - endif() - endforeach() -endforeach() - -# Fixup qt.toolchain.cmake -set(qttoolchain "${CURRENT_PACKAGES_DIR}/share/Qt6/qt.toolchain.cmake") -file(READ "${qttoolchain}" toolchain_contents) -string(REGEX REPLACE "set\\\(__qt_initially_configured_toolchain_file [^\\\n]+\\\n" "" toolchain_contents "${toolchain_contents}") -string(REGEX REPLACE "set\\\(__qt_chainload_toolchain_file [^\\\n]+\\\n" "set(__qt_chainload_toolchain_file \"\${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}\")" toolchain_contents "${toolchain_contents}") -string(REGEX REPLACE "set\\\(VCPKG_CHAINLOAD_TOOLCHAIN_FILE [^\\\n]+\\\n" "" toolchain_contents "${toolchain_contents}") -string(REGEX REPLACE "set\\\(__qt_initial_c_compiler [^\\\n]+\\\n" "" toolchain_contents "${toolchain_contents}") -string(REGEX REPLACE "set\\\(__qt_initial_cxx_compiler [^\\\n]+\\\n" "" toolchain_contents "${toolchain_contents}") -string(REPLACE "${CURRENT_HOST_INSTALLED_DIR}" "\${vcpkg_installed_dir}/${HOST_TRIPLET}" toolchain_contents "${toolchain_contents}") -file(WRITE "${qttoolchain}" "${toolchain_contents}") - -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" OR NOT VCPKG_TARGET_IS_WINDOWS) - if(VCPKG_CROSSCOMPILING) - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin/qmake" "${CURRENT_PACKAGES_DIR}/debug/bin/qmake") # qmake has been moved so this is the qmake helper script - endif() - file(GLOB_RECURSE _bin_files "${CURRENT_PACKAGES_DIR}/bin/*") - if(NOT _bin_files) # Only clean if empty otherwise let vcpkg throw and error. - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin/" "${CURRENT_PACKAGES_DIR}/debug/bin/") - else() - message(STATUS "Files in '/bin':${_bin_files}") - endif() -endif() - -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/Qt6/QtBuildInternals") - -if(NOT VCPKG_TARGET_IS_OSX) - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/Qt6/macos") -endif() -if(NOT VCPKG_TARGET_IS_IOS) - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/Qt6/ios") -endif() - -file(RELATIVE_PATH installed_to_host "${CURRENT_INSTALLED_DIR}" "${CURRENT_HOST_INSTALLED_DIR}") -file(RELATIVE_PATH host_to_installed "${CURRENT_HOST_INSTALLED_DIR}" "${CURRENT_INSTALLED_DIR}") -if(installed_to_host) - string(APPEND installed_to_host "/") - string(APPEND host_to_installed "/") -endif() -set(_file "${CMAKE_CURRENT_LIST_DIR}/qt.conf.in") -set(REL_PATH "") -set(REL_HOST_TO_DATA "\${CURRENT_INSTALLED_DIR}/") -configure_file("${_file}" "${CURRENT_PACKAGES_DIR}/tools/Qt6/qt_release.conf" @ONLY) # For vcpkg-qmake -set(BACKUP_CURRENT_INSTALLED_DIR "${CURRENT_INSTALLED_DIR}") -set(BACKUP_CURRENT_HOST_INSTALLED_DIR "${CURRENT_HOST_INSTALLED_DIR}") -set(CURRENT_INSTALLED_DIR "./../../../") -set(CURRENT_HOST_INSTALLED_DIR "${CURRENT_INSTALLED_DIR}${installed_to_host}") - -## Configure installed qt.conf -set(REL_HOST_TO_DATA "${host_to_installed}") -configure_file("${_file}" "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/qt.conf") -set(REL_PATH debug/) -configure_file("${_file}" "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/qt.debug.conf") - -set(CURRENT_INSTALLED_DIR "${BACKUP_CURRENT_INSTALLED_DIR}") -set(CURRENT_HOST_INSTALLED_DIR "${BACKUP_CURRENT_HOST_INSTALLED_DIR}") -set(REL_HOST_TO_DATA "\${CURRENT_INSTALLED_DIR}/") -configure_file("${_file}" "${CURRENT_PACKAGES_DIR}/tools/Qt6/qt_debug.conf" @ONLY) # For vcpkg-qmake - -if(VCPKG_TARGET_IS_WINDOWS) - set(_DLL_FILES brotlicommon brotlidec bz2 freetype harfbuzz libpng16) - set(DLLS_TO_COPY "") - foreach(_file IN LISTS _DLL_FILES) - if(EXISTS "${CURRENT_INSTALLED_DIR}/bin/${_file}.dll") - list(APPEND DLLS_TO_COPY "${CURRENT_INSTALLED_DIR}/bin/${_file}.dll") - endif() - endforeach() - file(COPY ${DLLS_TO_COPY} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin") -endif() - -set(hostinfofile "${CURRENT_PACKAGES_DIR}/share/Qt6HostInfo/Qt6HostInfoConfig.cmake") -file(READ "${hostinfofile}" _contents) -string(REPLACE [[set(QT6_HOST_INFO_LIBEXECDIR "bin")]] [[set(QT6_HOST_INFO_LIBEXECDIR "tools/Qt6/bin")]] _contents "${_contents}") -string(REPLACE [[set(QT6_HOST_INFO_BINDIR "bin")]] [[set(QT6_HOST_INFO_BINDIR "tools/Qt6/bin")]] _contents "${_contents}") -file(WRITE "${hostinfofile}" "${_contents}") - -if(NOT VCPKG_CROSSCOMPILING OR EXISTS "${CURRENT_PACKAGES_DIR}/share/Qt6CoreTools/Qt6CoreToolsAdditionalTargetInfo.cmake") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/Qt6CoreTools/Qt6CoreToolsAdditionalTargetInfo.cmake" - "PACKAGE_PREFIX_DIR}/bin/syncqt" - "PACKAGE_PREFIX_DIR}/tools/Qt6/bin/syncqt") -endif() - -set(configfile "${CURRENT_PACKAGES_DIR}/share/Qt6CoreTools/Qt6CoreToolsTargets-debug.cmake") -if(EXISTS "${configfile}") - file(READ "${configfile}" _contents) - if(EXISTS "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/qmake.exe") - file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/qmake.debug.bat" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin") - string(REPLACE [[ "${_IMPORT_PREFIX}/tools/Qt6/bin/qmake.exe"]] [[ "${_IMPORT_PREFIX}/tools/Qt6/bin/qmake.debug.bat"]] _contents "${_contents}") - endif() - if(EXISTS "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/qtpaths.exe") - file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/qtpaths.debug.bat" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin") - string(REPLACE [[ "${_IMPORT_PREFIX}/tools/Qt6/bin/qtpaths.exe"]] [[ "${_IMPORT_PREFIX}/tools/Qt6/bin/qtpaths.debug.bat"]] _contents "${_contents}") - endif() - if(EXISTS "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/windeployqt.exe") - file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/windeployqt.debug.bat" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin") - string(REPLACE [[ "${_IMPORT_PREFIX}/tools/Qt6/bin/windeployqt.exe"]] [[ "${_IMPORT_PREFIX}/tools/Qt6/bin/windeployqt.debug.bat"]] _contents "${_contents}") - endif() - file(WRITE "${configfile}" "${_contents}") -endif() - -if(VCPKG_CROSSCOMPILING) - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/Qt6/Qt6Dependencies.cmake" "${CURRENT_HOST_INSTALLED_DIR}" "\${CMAKE_CURRENT_LIST_DIR}/../../../${HOST_TRIPLET}") -endif() - -function(remove_original_cmake_path file) - file(READ "${file}" _contents) - string(REGEX REPLACE "original_cmake_path=[^\n]*" "original_cmake_path=''" _contents "${_contents}") - file(WRITE "${file}" "${_contents}") -endfunction() - -if(NOT VCPKG_TARGET_IS_WINDOWS) - foreach(file "qt-cmake" "qt-cmake-private") - remove_original_cmake_path("${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/${file}") - if(NOT VCPKG_BUILD_TYPE) - remove_original_cmake_path("${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/debug/${file}") - endif() - endforeach() -endif() diff --git a/vcpkg/ports/qtbase/qmake.debug.bat b/vcpkg/ports/qtbase/qmake.debug.bat deleted file mode 100644 index a7ed903a34..0000000000 --- a/vcpkg/ports/qtbase/qmake.debug.bat +++ /dev/null @@ -1,2 +0,0 @@ -@echo off -"%0\..\qmake.exe" -qtconf "%0\..\qt.debug.conf" %* diff --git a/vcpkg/ports/qtbase/qt.conf.in b/vcpkg/ports/qtbase/qt.conf.in deleted file mode 100644 index 8e76b8f6d3..0000000000 --- a/vcpkg/ports/qtbase/qt.conf.in +++ /dev/null @@ -1,31 +0,0 @@ -[DevicePaths] -Prefix=${CURRENT_INSTALLED_DIR} -Headers=include/@QT6_DIRECTORY_PREFIX@ -Libraries=@REL_PATH@lib -Plugins=@REL_PATH@@QT6_DIRECTORY_PREFIX@plugins -Qml2Imports=@REL_PATH@@QT6_DIRECTORY_PREFIX@qml -Documentation=doc/@QT6_DIRECTORY_PREFIX@ -Binaries=@REL_PATH@bin -LibraryExecutables=tools/Qt6/bin -ArchData=share/Qt6 -Data=share/Qt6 -Translations=translations/@QT6_DIRECTORY_PREFIX@ -Examples=share/examples/@QT6_DIRECTORY_PREFIX@ -[Paths] -Prefix=${CURRENT_INSTALLED_DIR} -Headers=include/@QT6_DIRECTORY_PREFIX@ -Libraries=@REL_PATH@lib -Plugins=@REL_PATH@@QT6_DIRECTORY_PREFIX@plugins -Qml2Imports=@REL_PATH@@QT6_DIRECTORY_PREFIX@qml -Documentation=doc/@QT6_DIRECTORY_PREFIX@ -Binaries=@REL_PATH@bin -LibraryExecutables=tools/Qt6/bin -ArchData=share/Qt6 -Data=share/Qt6 -Translations=translations/@QT6_DIRECTORY_PREFIX@ -Examples=share/examples/@QT6_DIRECTORY_PREFIX@ -HostPrefix=${CURRENT_HOST_INSTALLED_DIR} -HostData=@REL_HOST_TO_DATA@share/Qt6 -HostBinaries=@REL_PATH@bin -HostLibraries=@REL_PATH@lib -HostLibraryExecutables=tools/Qt6/bin diff --git a/vcpkg/ports/qtbase/qtpaths.debug.bat b/vcpkg/ports/qtbase/qtpaths.debug.bat deleted file mode 100644 index 4fef8e754e..0000000000 --- a/vcpkg/ports/qtbase/qtpaths.debug.bat +++ /dev/null @@ -1,2 +0,0 @@ -@echo off -"%0\..\qtpaths.exe" --qtconf "%0\..\qt.debug.conf" %* diff --git a/vcpkg/ports/qtbase/vcpkg.json b/vcpkg/ports/qtbase/vcpkg.json deleted file mode 100644 index 3fac13c6d2..0000000000 --- a/vcpkg/ports/qtbase/vcpkg.json +++ /dev/null @@ -1,526 +0,0 @@ -{ - "name": "qtbase", - "version": "6.6.3", - "description": "Qt Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.", - "homepage": "https://www.qt.io/", - "license": null, - "supports": "!uwp", - "dependencies": [ - { - "name": "libb2", - "platform": "!windows" - }, - "pcre2", - { - "name": "qtbase", - "host": true, - "default-features": false - }, - { - "name": "qtbase", - "default-features": false, - "features": [ - "doubleconversion" - ] - }, - { - "name": "qtbase", - "default-features": false, - "features": [ - "thread" - ], - "platform": "osx" - }, - { - "name": "qtbase", - "default-features": false, - "features": [ - "pcre2" - ], - "platform": "windows & static" - }, - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - }, - "zlib" - ], - "default-features": [ - "brotli", - "concurrent", - "dbus", - "default-features", - "doubleconversion", - "freetype", - "gui", - "harfbuzz", - "icu", - "jpeg", - "network", - "openssl", - "pcre2", - "png", - { - "name": "securetransport", - "platform": "ios" - }, - "sql", - "sql-psql", - "sql-sqlite", - "testlib", - "thread", - "widgets", - "zstd" - ], - "features": { - "appstore-compliant": { - "description": "Disable code that is not allowed in platform app stores. This is on by default for platforms which require distribution through an app store by default, in particular Android, iOS, tvOS, and watchOS." - }, - "brotli": { - "description": "Support for downloading and decompressing resources compressed with Brotli through QNetworkAccessManager.", - "dependencies": [ - "brotli", - { - "name": "qtbase", - "default-features": false, - "features": [ - "network" - ] - } - ] - }, - "concurrent": { - "description": "Provides a high-level multi-threading API. Qt Concurrent", - "dependencies": [ - { - "name": "qtbase", - "default-features": false, - "features": [ - "thread" - ] - } - ] - }, - "dbus": { - "description": "Qt D-Bus", - "dependencies": [ - { - "name": "qtbase", - "default-features": false, - "features": [ - "thread" - ] - } - ] - }, - "default-features": { - "description": "Platform-dependent default features", - "dependencies": [ - { - "name": "qtbase", - "default-features": false, - "features": [ - "appstore-compliant" - ], - "platform": "uwp" - }, - { - "name": "qtbase", - "default-features": false, - "features": [ - "fontconfig", - "xcb", - "xcb-xlib", - "xrender" - ], - "platform": "linux" - }, - { - "name": "qtbase", - "default-features": false, - "features": [ - "egl", - "gles2" - ], - "platform": "android" - }, - { - "name": "qtbase", - "default-features": false, - "features": [ - "opengl" - ], - "platform": "!ios" - } - ] - }, - "doubleconversion": { - "description": "Enable double conversion support", - "dependencies": [ - "double-conversion" - ] - }, - "egl": { - "description": "EGL", - "supports": "linux | android", - "dependencies": [ - "egl" - ] - }, - "fontconfig": { - "description": "Use fontconfig", - "dependencies": [ - "fontconfig", - { - "name": "qtbase", - "default-features": false, - "features": [ - "gui" - ] - } - ] - }, - "framework": { - "description": "MAC framework build", - "supports": "osx & !static" - }, - "freetype": { - "description": "Supports the FreeType 2 font engine (and its supported font formats).", - "dependencies": [ - { - "name": "freetype", - "default-features": false - } - ] - }, - "gles2": { - "description": "OpenGL ES 2.0", - "supports": "!windows & !osx", - "dependencies": [ - { - "name": "qtbase", - "default-features": false, - "features": [ - "gui" - ] - } - ] - }, - "gles3": { - "description": "OpenGL ES 3.0", - "supports": "!windows & !osx", - "dependencies": [ - { - "name": "qtbase", - "default-features": false, - "features": [ - "gles2" - ] - } - ] - }, - "glib": { - "description": "GLib", - "dependencies": [ - "glib" - ] - }, - "gtk3": { - "description": "GTK3 platform theme plugin", - "supports": "linux", - "dependencies": [ - "gtk3", - { - "name": "qtbase", - "default-features": false, - "features": [ - "glib" - ] - } - ] - }, - "gui": { - "description": "Qt Gui", - "dependencies": [ - { - "name": "opengl", - "platform": "!ios" - }, - { - "name": "qtbase", - "default-features": false, - "features": [ - "freetype" - ] - }, - { - "name": "qtbase", - "default-features": false, - "features": [ - "opengl" - ], - "platform": "osx" - }, - { - "name": "qtbase", - "default-features": false, - "features": [ - "thread" - ], - "platform": "windows" - } - ] - }, - "harfbuzz": { - "description": "Use harfbuzz", - "dependencies": [ - "harfbuzz", - { - "name": "qtbase", - "default-features": false, - "features": [ - "gui" - ] - } - ] - }, - "icu": { - "description": "Enable ICU support", - "dependencies": [ - "icu" - ] - }, - "jpeg": { - "description": "Enable JPEG", - "dependencies": [ - "libjpeg-turbo", - { - "name": "qtbase", - "default-features": false, - "features": [ - "gui" - ] - } - ] - }, - "network": { - "description": "Qt Network" - }, - "opengl": { - "description": "OpenGL", - "dependencies": [ - "opengl", - { - "name": "qtbase", - "default-features": false, - "features": [ - "gui" - ] - } - ] - }, - "openssl": { - "description": "Enable OpenSSL", - "dependencies": [ - "openssl", - { - "name": "qtbase", - "default-features": false, - "features": [ - "network" - ] - } - ] - }, - "pcre2": { - "description": "Enable PCRE2 support", - "dependencies": [ - "pcre2" - ] - }, - "png": { - "description": "Enable PNG", - "dependencies": [ - "libpng", - { - "name": "qtbase", - "default-features": false, - "features": [ - "gui" - ] - } - ] - }, - "securetransport": { - "description": "Enable Secure Transport", - "supports": "ios | osx" - }, - "sql": { - "description": "Qt Sql", - "dependencies": [ - { - "name": "qtbase", - "default-features": false, - "features": [ - "concurrent" - ] - } - ] - }, - "sql-mysql": { - "description": "Enable SQL Driver MySQL", - "dependencies": [ - "libmysql", - { - "name": "qtbase", - "default-features": false, - "features": [ - "sql" - ] - } - ] - }, - "sql-oci": { - "description": "Enable SQL Driver Oracle OCI", - "dependencies": [ - "ocilib", - { - "name": "qtbase", - "default-features": false, - "features": [ - "sql" - ] - } - ] - }, - "sql-odbc": { - "description": "Enable SQL Driver odbc", - "supports": "windows", - "dependencies": [ - { - "name": "qtbase", - "default-features": false, - "features": [ - "sql" - ] - } - ] - }, - "sql-psql": { - "description": "Enable SQL Driver psql", - "dependencies": [ - "libpq", - { - "name": "qtbase", - "default-features": false, - "features": [ - "sql" - ] - } - ] - }, - "sql-sqlite": { - "description": "Enable SQL Driver sqlite", - "dependencies": [ - { - "name": "qtbase", - "default-features": false, - "features": [ - "sql" - ] - }, - "sqlite3" - ] - }, - "testlib": { - "description": "Qt Testlib" - }, - "thread": { - "description": "Thread support; provides QThread and related classes." - }, - "vulkan": { - "description": "Enable Vulkan support", - "dependencies": [ - "vulkan" - ] - }, - "widgets": { - "description": "Qt Widgets", - "dependencies": [ - { - "name": "qtbase", - "default-features": false, - "features": [ - "gui" - ] - } - ] - }, - "xcb": { - "description": "XCB", - "dependencies": [ - { - "name": "qtbase", - "default-features": false, - "features": [ - "concurrent", - "xkbcommon-x11", - "xlib" - ] - } - ] - }, - "xcb-xlib": { - "description": "xcb-xlib", - "dependencies": [ - { - "name": "qtbase", - "default-features": false, - "features": [ - "xlib" - ] - } - ] - }, - "xkb": { - "description": "XKB" - }, - "xkbcommon-x11": { - "description": "xkbcommon_x11", - "dependencies": [ - { - "name": "qtbase", - "default-features": false, - "features": [ - "xkb" - ] - } - ] - }, - "xlib": { - "description": "XLib" - }, - "xrender": { - "description": "XRender for native painting", - "dependencies": [ - { - "name": "qtbase", - "default-features": false, - "features": [ - "xcb" - ] - } - ] - }, - "zstd": { - "description": "Zstandard support", - "dependencies": [ - "zstd" - ] - } - } -} diff --git a/vcpkg/ports/qtbase/windeployqt.debug.bat b/vcpkg/ports/qtbase/windeployqt.debug.bat deleted file mode 100644 index 796dc4f3e8..0000000000 --- a/vcpkg/ports/qtbase/windeployqt.debug.bat +++ /dev/null @@ -1,10 +0,0 @@ -@echo off -setlocal enabledelayedexpansion -set mypath=%~dp0 -set mypath=%mypath:~0,-1% -set BAKCD=!CD! -cd /D %mypath%\..\..\..\debug\bin -set PATH=!CD!;%PATH% -cd %BAKCD% -"%mypath%\windeployqt6.exe" --qtpaths "%mypath%\qtpaths.debug.bat" %* -endlocal diff --git a/vcpkg/ports/qtcharts/portfile.cmake b/vcpkg/ports/qtcharts/portfile.cmake deleted file mode 100644 index 0f5be8a036..0000000000 --- a/vcpkg/ports/qtcharts/portfile.cmake +++ /dev/null @@ -1,17 +0,0 @@ -set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") -include("${SCRIPT_PATH}/qt_install_submodule.cmake") - -set(${PORT}_PATCHES) - -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS -FEATURES - "qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Quick -INVERTED_FEATURES - "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick -) - -qt_install_submodule(PATCHES ${${PORT}_PATCHES} - CONFIGURE_OPTIONS ${FEATURE_OPTIONS} - CONFIGURE_OPTIONS_RELEASE - CONFIGURE_OPTIONS_DEBUG - ) diff --git a/vcpkg/ports/qtcharts/vcpkg.json b/vcpkg/ports/qtcharts/vcpkg.json deleted file mode 100644 index 0665dc084b..0000000000 --- a/vcpkg/ports/qtcharts/vcpkg.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "name": "qtcharts", - "version": "6.6.3", - "description": "The Qt Charts module provides a set of easy-to-use chart components. It uses the Qt Graphics View Framework to integrate charts with modern user interfaces.", - "homepage": "https://www.qt.io/", - "license": null, - "dependencies": [ - { - "name": "qtbase", - "default-features": false, - "features": [ - "gui", - "widgets" - ] - } - ], - "features": { - "designer": { - "description": "Build Designer plugin", - "dependencies": [ - { - "name": "qttools", - "default-features": false - } - ] - }, - "qml": { - "description": "Build QML imports", - "dependencies": [ - { - "name": "qtdeclarative", - "default-features": false - } - ] - } - } -} diff --git a/vcpkg/ports/qtcoap/portfile.cmake b/vcpkg/ports/qtcoap/portfile.cmake deleted file mode 100644 index 1940e3989d..0000000000 --- a/vcpkg/ports/qtcoap/portfile.cmake +++ /dev/null @@ -1,10 +0,0 @@ -set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") -include("${SCRIPT_PATH}/qt_install_submodule.cmake") - -set(${PORT}_PATCHES) - -qt_install_submodule(PATCHES ${${PORT}_PATCHES} - CONFIGURE_OPTIONS - CONFIGURE_OPTIONS_RELEASE - CONFIGURE_OPTIONS_DEBUG - ) diff --git a/vcpkg/ports/qtcoap/vcpkg.json b/vcpkg/ports/qtcoap/vcpkg.json deleted file mode 100644 index 35a34fe660..0000000000 --- a/vcpkg/ports/qtcoap/vcpkg.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "name": "qtcoap", - "version": "6.6.3", - "description": "Qt CoAP implements the client side of CoAP.", - "homepage": "https://www.qt.io/", - "license": null, - "dependencies": [ - { - "name": "qtbase", - "default-features": false, - "features": [ - "network" - ] - } - ] -} diff --git a/vcpkg/ports/qtconnectivity/portfile.cmake b/vcpkg/ports/qtconnectivity/portfile.cmake deleted file mode 100644 index 5eefc2decd..0000000000 --- a/vcpkg/ports/qtconnectivity/portfile.cmake +++ /dev/null @@ -1,12 +0,0 @@ -set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") -include("${SCRIPT_PATH}/qt_install_submodule.cmake") - -set(${PORT}_PATCHES) - -qt_install_submodule(PATCHES ${${PORT}_PATCHES} - CONFIGURE_OPTIONS - -DCMAKE_DISABLE_FIND_PACKAGE_BlueZ:BOOL=ON - -DCMAKE_DISABLE_FIND_PACKAGE_PCSCLITE:BOOL=ON - CONFIGURE_OPTIONS_RELEASE - CONFIGURE_OPTIONS_DEBUG - ) diff --git a/vcpkg/ports/qtconnectivity/vcpkg.json b/vcpkg/ports/qtconnectivity/vcpkg.json deleted file mode 100644 index 9efb88cca8..0000000000 --- a/vcpkg/ports/qtconnectivity/vcpkg.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "name": "qtconnectivity", - "version": "6.6.3", - "description": "The Qt Connectivity module provides access to Bluetooth and NFC hardware.", - "homepage": "https://www.qt.io/", - "license": null, - "dependencies": [ - { - "name": "qtbase", - "default-features": false, - "features": [ - "dbus", - "gui", - "network" - ] - } - ] -} diff --git a/vcpkg/ports/qtdatavis3d/portfile.cmake b/vcpkg/ports/qtdatavis3d/portfile.cmake deleted file mode 100644 index 1a3a6f1bfe..0000000000 --- a/vcpkg/ports/qtdatavis3d/portfile.cmake +++ /dev/null @@ -1,10 +0,0 @@ -set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") -include("${SCRIPT_PATH}/qt_install_submodule.cmake") - -set(${PORT}_PATCHES) - -qt_install_submodule(PATCHES ${${PORT}_PATCHES} - CONFIGURE_OPTIONS - CONFIGURE_OPTIONS_RELEASE - CONFIGURE_OPTIONS_DEBUG - ) diff --git a/vcpkg/ports/qtdatavis3d/vcpkg.json b/vcpkg/ports/qtdatavis3d/vcpkg.json deleted file mode 100644 index 93dc4a6432..0000000000 --- a/vcpkg/ports/qtdatavis3d/vcpkg.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "name": "qtdatavis3d", - "version": "6.6.3", - "description": "The Qt Data Visualization module enables you to visualize data in 3D as bar, scatter, and surface graphs.", - "homepage": "https://www.qt.io/", - "license": null, - "dependencies": [ - { - "name": "qtbase", - "default-features": false, - "features": [ - "gui", - "testlib" - ] - }, - { - "name": "qtdeclarative", - "default-features": false - } - ] -} diff --git a/vcpkg/ports/qtdeclarative/portfile.cmake b/vcpkg/ports/qtdeclarative/portfile.cmake deleted file mode 100644 index 3c9525d667..0000000000 --- a/vcpkg/ports/qtdeclarative/portfile.cmake +++ /dev/null @@ -1,31 +0,0 @@ -set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") -include("${SCRIPT_PATH}/qt_install_submodule.cmake") - -vcpkg_buildpath_length_warning(44) - - set(TOOL_NAMES - qml - qmlcachegen - qmleasing - qmlformat - qmlimportscanner - qmllint - qmlplugindump - qmlpreview - qmlprofiler - qmlscene - qmltestrunner - qmltime - qmltyperegistrar - qmldom - qmltc - qmlls - ) - -qt_install_submodule(PATCHES ${${PORT}_PATCHES} - TOOL_NAMES ${TOOL_NAMES} - CONFIGURE_OPTIONS - -DCMAKE_DISABLE_FIND_PACKAGE_LTTngUST:BOOL=ON - CONFIGURE_OPTIONS_RELEASE - CONFIGURE_OPTIONS_DEBUG - ) diff --git a/vcpkg/ports/qtdeclarative/vcpkg.json b/vcpkg/ports/qtdeclarative/vcpkg.json deleted file mode 100644 index 1db1201f9a..0000000000 --- a/vcpkg/ports/qtdeclarative/vcpkg.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "name": "qtdeclarative", - "version": "6.6.3", - "description": "Qt Declarative (Quick 2)", - "homepage": "https://www.qt.io/", - "license": null, - "dependencies": [ - { - "name": "qtbase", - "default-features": false, - "features": [ - "network", - "testlib" - ] - }, - { - "name": "qtdeclarative", - "host": true, - "default-features": false - }, - "qtlanguageserver", - { - "name": "qtshadertools", - "default-features": false - } - ] -} diff --git a/vcpkg/ports/qtdeviceutilities/portfile.cmake b/vcpkg/ports/qtdeviceutilities/portfile.cmake deleted file mode 100644 index f83d1fd6f0..0000000000 --- a/vcpkg/ports/qtdeviceutilities/portfile.cmake +++ /dev/null @@ -1,13 +0,0 @@ -set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") -include("${SCRIPT_PATH}/qt_install_submodule.cmake") - -set(${PORT}_PATCHES) - -set(TOOL_NAMES settingsui) - -qt_install_submodule(PATCHES ${${PORT}_PATCHES} - TOOL_NAMES ${TOOL_NAMES} - CONFIGURE_OPTIONS - CONFIGURE_OPTIONS_RELEASE - CONFIGURE_OPTIONS_DEBUG - ) diff --git a/vcpkg/ports/qtdeviceutilities/vcpkg.json b/vcpkg/ports/qtdeviceutilities/vcpkg.json deleted file mode 100644 index ce3f558354..0000000000 --- a/vcpkg/ports/qtdeviceutilities/vcpkg.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "name": "qtdeviceutilities", - "version": "6.6.3", - "description": "Qt Device Utilities provides functionality that is useful for controlling settings in embedded applications.", - "homepage": "https://www.qt.io/", - "license": null, - "supports": "linux", - "dependencies": [ - { - "name": "qtdeclarative", - "default-features": false - }, - { - "name": "qttools", - "default-features": false - } - ] -} diff --git a/vcpkg/ports/qtdoc/portfile.cmake b/vcpkg/ports/qtdoc/portfile.cmake deleted file mode 100644 index df99e640f4..0000000000 --- a/vcpkg/ports/qtdoc/portfile.cmake +++ /dev/null @@ -1,13 +0,0 @@ -set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") -include("${SCRIPT_PATH}/qt_install_submodule.cmake") - -set(${PORT}_PATCHES) - -qt_install_submodule(PATCHES ${${PORT}_PATCHES} - CONFIGURE_OPTIONS - CONFIGURE_OPTIONS_RELEASE - CONFIGURE_OPTIONS_DEBUG - ) - -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") -set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) diff --git a/vcpkg/ports/qtdoc/vcpkg.json b/vcpkg/ports/qtdoc/vcpkg.json deleted file mode 100644 index 5cbd71d8d2..0000000000 --- a/vcpkg/ports/qtdoc/vcpkg.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "name": "qtdoc", - "version": "6.6.3", - "description": "The Qt documentation.", - "homepage": "https://www.qt.io/", - "license": null, - "dependencies": [ - { - "name": "qtbase", - "default-features": false - } - ] -} diff --git a/vcpkg/ports/qtgraphs/portfile.cmake b/vcpkg/ports/qtgraphs/portfile.cmake deleted file mode 100644 index 014d19bd67..0000000000 --- a/vcpkg/ports/qtgraphs/portfile.cmake +++ /dev/null @@ -1,8 +0,0 @@ -set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") -include("${SCRIPT_PATH}/qt_install_submodule.cmake") - -qt_install_submodule(PATCHES ${${PORT}_PATCHES} - CONFIGURE_OPTIONS ${FEATURE_OPTIONS} - CONFIGURE_OPTIONS_RELEASE - CONFIGURE_OPTIONS_DEBUG - ) diff --git a/vcpkg/ports/qtgraphs/vcpkg.json b/vcpkg/ports/qtgraphs/vcpkg.json deleted file mode 100644 index 25fd11c310..0000000000 --- a/vcpkg/ports/qtgraphs/vcpkg.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "name": "qtgraphs", - "version": "6.6.3", - "description": "The Qt Graphs module enables you to visualize data in 3D as bar, scatter, and surface graphs.", - "homepage": "https://www.qt.io/", - "license": null, - "dependencies": [ - { - "name": "qtbase", - "default-features": false, - "features": [ - "gui", - "testlib", - "widgets" - ] - }, - { - "name": "qtdeclarative", - "default-features": false - }, - { - "name": "qtquick3d", - "default-features": false - } - ] -} diff --git a/vcpkg/ports/qtgrpc/portfile.cmake b/vcpkg/ports/qtgrpc/portfile.cmake deleted file mode 100644 index 4304d66390..0000000000 --- a/vcpkg/ports/qtgrpc/portfile.cmake +++ /dev/null @@ -1,17 +0,0 @@ -set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") -include("${SCRIPT_PATH}/qt_install_submodule.cmake") - -set(${PORT}_PATCHES protoc-host.patch) -set(TOOL_NAMES qtprotobufgen qtgrpcgen) -# native_grpc ->grpc WrapgRPC -# grp -> qt[network] -# qtprotobufgen -> protobuf WrapProtobuf -qt_install_submodule(PATCHES ${${PORT}_PATCHES} - TOOL_NAMES ${TOOL_NAMES} - CONFIGURE_OPTIONS - -DCMAKE_FIND_PACKAGE_TARGETS_GLOBAL=ON - #--trace-expand - CONFIGURE_OPTIONS_MAYBE_UNUSED - QT_BUILD_EXAMPLES - QT_USE_DEFAULT_CMAKE_OPTIMIZATION_FLAGS - ) diff --git a/vcpkg/ports/qtgrpc/protoc-host.patch b/vcpkg/ports/qtgrpc/protoc-host.patch deleted file mode 100644 index a2d81fb5af..0000000000 --- a/vcpkg/ports/qtgrpc/protoc-host.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/cmake/FindWrapProtoc.cmake b/cmake/FindWrapProtoc.cmake -index 82972c8f18..08335fa746 100644 ---- a/cmake/FindWrapProtoc.cmake -+++ b/cmake/FindWrapProtoc.cmake -@@ -13,7 +13,7 @@ if(${CMAKE_FIND_PACKAGE_NAME}_FIND_QUIETLY) - list(APPEND __WrapProtoc_find_package_args QUIET) - endif() - --if(NOT CMAKE_CROSSCOMPILING) -+if(0) - if(NOT TARGET Threads::Threads) - find_package(Threads ${__WrapProtoc_find_package_args}) - endif() -@@ -52,8 +52,8 @@ if(NOT CMAKE_CROSSCOMPILING) - endif() - endif() - --if(NOT __WrapProtoc_protoc_imported_location) -+if(1) - if(CMAKE_CROSSCOMPILING) - set(__WrapProtoc_extra_prefix_paths "${QT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH}") - endif() - find_program(__WrapProtoc_protoc_imported_location diff --git a/vcpkg/ports/qtgrpc/vcpkg.json b/vcpkg/ports/qtgrpc/vcpkg.json deleted file mode 100644 index 34de631fa5..0000000000 --- a/vcpkg/ports/qtgrpc/vcpkg.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "name": "qtgrpc", - "version": "6.6.3", - "description": "The Qt GRPC and Qt Protobuf modules together allow you to define data and messages in proto files, and then use the code generators, which generate client code allowing accessors for fields and gRPC services in the Qt framework.", - "homepage": "https://www.qt.io/", - "license": null, - "dependencies": [ - { - "name": "grpc", - "default-features": false - }, - { - "name": "protobuf", - "default-features": false - }, - { - "name": "qtbase", - "default-features": false - }, - { - "name": "qtgrpc", - "host": true, - "default-features": false - } - ] -} diff --git a/vcpkg/ports/qthttpserver/portfile.cmake b/vcpkg/ports/qthttpserver/portfile.cmake deleted file mode 100644 index 975bf122fd..0000000000 --- a/vcpkg/ports/qthttpserver/portfile.cmake +++ /dev/null @@ -1,13 +0,0 @@ -set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") -include("${SCRIPT_PATH}/qt_install_submodule.cmake") - -set(${PORT}_PATCHES) - -set(TOOL_NAMES) - -qt_install_submodule(PATCHES ${${PORT}_PATCHES} - TOOL_NAMES ${TOOL_NAMES} - CONFIGURE_OPTIONS - CONFIGURE_OPTIONS_RELEASE - CONFIGURE_OPTIONS_DEBUG - ) diff --git a/vcpkg/ports/qthttpserver/vcpkg.json b/vcpkg/ports/qthttpserver/vcpkg.json deleted file mode 100644 index e8b359a643..0000000000 --- a/vcpkg/ports/qthttpserver/vcpkg.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "name": "qthttpserver", - "version": "6.6.3", - "description": "Qt HTTP Server supports building HTTP server functionality into an application.", - "homepage": "https://www.qt.io/", - "license": null, - "dependencies": [ - { - "name": "qtbase", - "default-features": false, - "features": [ - "concurrent", - "network" - ] - } - ] -} diff --git a/vcpkg/ports/qtimageformats/no_target_promotion_latest.patch b/vcpkg/ports/qtimageformats/no_target_promotion_latest.patch deleted file mode 100644 index 244e09f4b1..0000000000 --- a/vcpkg/ports/qtimageformats/no_target_promotion_latest.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7fdd7ddbd..f189c472c 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -9,6 +9,15 @@ project(QtImageFormats # special case - HOMEPAGE_URL "https://qt.io/" - LANGUAGES CXX C - ) -- -+find_package(Threads) -+set_property(TARGET Threads::Threads PROPERTY _qt_no_promote_global TRUE) -+find_package(ZLIB) -+if(TARGET ZLIB::ZLIB) -+ set_property(TARGET ZLIB::ZLIB PROPERTY _qt_no_promote_global TRUE) -+endif() -+find_package(JPEG) -+if(TARGET JPEG::JPEG) -+ set_property(TARGET JPEG::JPEG PROPERTY _qt_no_promote_global TRUE) -+endif() - find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core) - find_package(Qt6 ${PROJECT_VERSION} QUIET CONFIG OPTIONAL_COMPONENTS Gui) diff --git a/vcpkg/ports/qtimageformats/portfile.cmake b/vcpkg/ports/qtimageformats/portfile.cmake deleted file mode 100644 index 74660c1a68..0000000000 --- a/vcpkg/ports/qtimageformats/portfile.cmake +++ /dev/null @@ -1,41 +0,0 @@ -set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) # Only plugins -set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") -include("${SCRIPT_PATH}/qt_install_submodule.cmake") - -set(${PORT}_PATCHES no_target_promotion_latest.patch) - -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - FEATURES - #"jasper" CMAKE_REQUIRE_FIND_PACKAGE_WrapJasper - #"webp" CMAKE_REQUIRE_FIND_PACKAGE_WrapWebP - #"tiff" CMAKE_REQUIRE_FIND_PACKAGE_TIFF - INVERTED_FEATURES - "jasper" CMAKE_DISABLE_FIND_PACKAGE_WrapJasper - "webp" CMAKE_DISABLE_FIND_PACKAGE_WrapWebP - "tiff" CMAKE_DISABLE_FIND_PACKAGE_TIFF - ) - -if("jasper" IN_LIST FEATURES) - list(APPEND FEATURE_OPTIONS -DINPUT_jasper=system) -else() - list(APPEND FEATURE_OPTIONS -DINPUT_jasper=no) -endif() -if("webp" IN_LIST FEATURES) - list(APPEND FEATURE_OPTIONS -DINPUT_webp=system) -else() - list(APPEND FEATURE_OPTIONS -DINPUT_webp=no) -endif() -if("tiff" IN_LIST FEATURES) - list(APPEND FEATURE_OPTIONS -DINPUT_tiff=system) -else() - list(APPEND FEATURE_OPTIONS -DINPUT_tiff=no) -endif() -list(APPEND FEATURE_OPTIONS -DINPUT_mng=no) # marked as FIXME - -qt_install_submodule(PATCHES ${${PORT}_PATCHES} - CONFIGURE_OPTIONS - ${FEATURE_OPTIONS} - -DCMAKE_FIND_PACKAGE_TARGETS_GLOBAL=ON # Cf. QTBUG-95052 - CONFIGURE_OPTIONS_RELEASE - CONFIGURE_OPTIONS_DEBUG - ) diff --git a/vcpkg/ports/qtimageformats/vcpkg.json b/vcpkg/ports/qtimageformats/vcpkg.json deleted file mode 100644 index bdb1cd412c..0000000000 --- a/vcpkg/ports/qtimageformats/vcpkg.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "name": "qtimageformats", - "version": "6.6.3", - "port-version": 1, - "description": "The Qt Image Formats add-on module provides optional support for other image file formats.", - "homepage": "https://www.qt.io/", - "license": null, - "dependencies": [ - { - "name": "qtbase", - "default-features": false, - "features": [ - "gui" - ] - } - ], - "default-features": [ - "default-features", - "jasper", - "tiff", - "webp" - ], - "features": { - "default-features": { - "description": "Platform-dependent default features" - }, - "jasper": { - "description": "Use jasper", - "dependencies": [ - "jasper" - ] - }, - "tiff": { - "description": "Use TIFF", - "dependencies": [ - { - "name": "tiff", - "default-features": false - } - ] - }, - "webp": { - "description": "Use WebP", - "dependencies": [ - "libwebp" - ] - } - } -} diff --git a/vcpkg/ports/qtinterfaceframework/fix-taglib-search.patch b/vcpkg/ports/qtinterfaceframework/fix-taglib-search.patch deleted file mode 100644 index b8027bdf6a..0000000000 --- a/vcpkg/ports/qtinterfaceframework/fix-taglib-search.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/cmake/FindWrapSystemTagLib.cmake b/cmake/FindWrapSystemTagLib.cmake -index e82d2c1a9..14463c791 100644 ---- a/cmake/FindWrapSystemTagLib.cmake -+++ b/cmake/FindWrapSystemTagLib.cmake -@@ -4,7 +4,7 @@ if(TARGET WrapSystemTagLib::WrapSystemTagLib) - set(WrapSystemTagLib_FOUND ON) - return() - endif() -- -+unset(PKG_CONFIG_EXECUTABLE CACHE) - find_package(PkgConfig) - - pkg_check_modules(TagLib taglib IMPORTED_TARGET) diff --git a/vcpkg/ports/qtinterfaceframework/portfile.cmake b/vcpkg/ports/qtinterfaceframework/portfile.cmake deleted file mode 100644 index e93aa878ce..0000000000 --- a/vcpkg/ports/qtinterfaceframework/portfile.cmake +++ /dev/null @@ -1,53 +0,0 @@ -set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") -include("${SCRIPT_PATH}/qt_install_submodule.cmake") - -set(${PORT}_PATCHES fix-taglib-search.patch # Strictly this is only required if qt does not use pkg-config since it forces it to off. - ) -set(TOOL_NAMES - ifmedia-simulation-server - ifvehiclefunctions-simulation-server - ) - -qt_download_submodule(PATCHES ${${PORT}_PATCHES}) -if(QT_UPDATE_VERSION) - return() -endif() - -if(_qis_DISABLE_NINJA) - set(_opt DISABLE_NINJA) -endif() - -vcpkg_find_acquire_program(PKGCONFIG) - -x_vcpkg_get_python_packages(PYTHON_VERSION "3" - REQUIREMENTS_FILE "${CURRENT_PORT_DIR}/requirements_minimal.txt" - PACKAGES qface==2.0.5 - OUT_PYTHON_VAR "PYTHON3") - -if(VCPKG_CROSSCOMPILING) - list(APPEND FEATURE_OPTIONS "-DVCPKG_HOST_TRIPLET=${_HOST_TRIPLET}") -endif() - -set(qt_plugindir ${QT6_DIRECTORY_PREFIX}plugins) -set(qt_qmldir ${QT6_DIRECTORY_PREFIX}qml) -qt_cmake_configure(${_opt} - OPTIONS ${FEATURE_OPTIONS} - "-DPython3_EXECUTABLE=${PYTHON3}" # Otherwise a VS installation might be found. - OPTIONS_DEBUG ${_qis_CONFIGURE_OPTIONS_DEBUG} - OPTIONS_RELEASE ${_qis_CONFIGURE_OPTIONS_RELEASE}) - -vcpkg_cmake_install(ADD_BIN_TO_PATH) - -qt_fixup_and_cleanup(TOOL_NAMES ${TOOL_NAMES}) - -qt_install_copyright("${SOURCE_PATH}") - -if(NOT VCPKG_CROSSCOMPILING) - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin/ifcodegen") - file(RENAME "${CURRENT_PACKAGES_DIR}/bin/ifcodegen" "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/ifcodegen") - if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") - endif() -endif() - -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/Qt6/QtInterfaceFramework/${VERSION}/QtInterfaceFramework/private/qifqueryparser_flex_p.h" "${CURRENT_BUILDTREES_DIR}" "") diff --git a/vcpkg/ports/qtinterfaceframework/requirements_minimal.txt b/vcpkg/ports/qtinterfaceframework/requirements_minimal.txt deleted file mode 100644 index 4e4ae361f6..0000000000 --- a/vcpkg/ports/qtinterfaceframework/requirements_minimal.txt +++ /dev/null @@ -1,14 +0,0 @@ -antlr4-python3-runtime==4.7.1 -argh==0.26.2 -click==6.7 -coloredlogs==10.0 -humanfriendly==4.15.1 -Jinja2==2.11.3 -MarkupSafe==1.1 -path.py==11.0.1 -pathtools==0.1.2 -PyYAML==6.0.1 -six==1.11.0 -watchdog==2.1.7 -pytest==5.3.5 -pytest-cov==2.8.1 diff --git a/vcpkg/ports/qtinterfaceframework/vcpkg.json b/vcpkg/ports/qtinterfaceframework/vcpkg.json deleted file mode 100644 index fe349f592f..0000000000 --- a/vcpkg/ports/qtinterfaceframework/vcpkg.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "name": "qtinterfaceframework", - "version": "6.6.3", - "description": "The Qt Interface Framework module provides both the tools and the core APIs, for you to implement Middleware APIs, Middleware Back ends, and Middleware Services.", - "homepage": "https://www.qt.io/", - "license": null, - "dependencies": [ - { - "name": "pkgconf", - "host": true - }, - { - "name": "qtdeclarative", - "default-features": false - }, - { - "name": "qtinterfaceframework", - "host": true, - "default-features": false - }, - { - "name": "qtmultimedia", - "default-features": false - }, - { - "name": "qtremoteobjects", - "default-features": false - }, - { - "name": "qttools", - "default-features": false - }, - "taglib", - { - "name": "vcpkg-get-python-packages", - "host": true, - "default-features": false - } - ] -} diff --git a/vcpkg/ports/qtlanguageserver/portfile.cmake b/vcpkg/ports/qtlanguageserver/portfile.cmake deleted file mode 100644 index b7de4dd7c8..0000000000 --- a/vcpkg/ports/qtlanguageserver/portfile.cmake +++ /dev/null @@ -1,12 +0,0 @@ -set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") -include("${SCRIPT_PATH}/qt_install_submodule.cmake") - -set(${PORT}_PATCHES) -set(TOOL_NAMES) - -qt_install_submodule(PATCHES ${${PORT}_PATCHES} - TOOL_NAMES ${TOOL_NAMES} - CONFIGURE_OPTIONS_MAYBE_UNUSED - QT_BUILD_EXAMPLES - QT_USE_DEFAULT_CMAKE_OPTIMIZATION_FLAGS - ) diff --git a/vcpkg/ports/qtlanguageserver/vcpkg.json b/vcpkg/ports/qtlanguageserver/vcpkg.json deleted file mode 100644 index 92caac3717..0000000000 --- a/vcpkg/ports/qtlanguageserver/vcpkg.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "name": "qtlanguageserver", - "version": "6.6.3", - "description": "An implementation of the Language Server Protocol.", - "homepage": "https://www.qt.io/", - "license": null, - "dependencies": [ - { - "name": "qtbase", - "default-features": false, - "features": [ - "concurrent", - "network" - ] - }, - { - "name": "qtbase", - "default-features": false, - "features": [ - "gui" - ], - "platform": "android" - } - ] -} diff --git a/vcpkg/ports/qtlocation/portfile.cmake b/vcpkg/ports/qtlocation/portfile.cmake deleted file mode 100644 index d4afa6dfbc..0000000000 --- a/vcpkg/ports/qtlocation/portfile.cmake +++ /dev/null @@ -1,22 +0,0 @@ -set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") -include("${SCRIPT_PATH}/qt_install_submodule.cmake") - -# set(${PORT}_PATCHES) - -# vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS -# FEATURES -# INVERTED_FEATURES - # "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick - # "nmea" CMAKE_DISABLE_FIND_PACKAGE_Qt6SerialPort - # "nmea" CMAKE_DISABLE_FIND_PACKAGE_Qt6Network -# ) - -# list(APPEND FEATURE_OPTIONS "-DCMAKE_DISABLE_FIND_PACKAGE_Gypsy=ON" - # "-DCMAKE_DISABLE_FIND_PACKAGE_Gconf=ON" -# ) - -qt_install_submodule(PATCHES ${${PORT}_PATCHES} - CONFIGURE_OPTIONS ${FEATURE_OPTIONS} - CONFIGURE_OPTIONS_RELEASE - CONFIGURE_OPTIONS_DEBUG - ) diff --git a/vcpkg/ports/qtlocation/vcpkg.json b/vcpkg/ports/qtlocation/vcpkg.json deleted file mode 100644 index 636038402f..0000000000 --- a/vcpkg/ports/qtlocation/vcpkg.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "name": "qtlocation", - "version": "6.6.3", - "description": "The Qt Location API helps you create viable mapping solutions using the data available from some of the popular location services.", - "homepage": "https://www.qt.io/", - "license": null, - "dependencies": [ - { - "name": "qtbase", - "default-features": false - }, - { - "name": "qtbase", - "default-features": false, - "features": [ - "dbus" - ], - "platform": "linux" - }, - { - "name": "qtpositioning", - "default-features": false, - "features": [ - "qml" - ] - }, - { - "name": "qtshadertools", - "default-features": false - } - ] -} diff --git a/vcpkg/ports/qtlottie/portfile.cmake b/vcpkg/ports/qtlottie/portfile.cmake deleted file mode 100644 index 2bffdc7d9e..0000000000 --- a/vcpkg/ports/qtlottie/portfile.cmake +++ /dev/null @@ -1,10 +0,0 @@ -set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") -include("${SCRIPT_PATH}/qt_install_submodule.cmake") - -set(${PORT}_PATCHES) - -qt_install_submodule(PATCHES ${${PORT}_PATCHES} - CONFIGURE_OPTIONS ${FEATURE_OPTIONS} - CONFIGURE_OPTIONS_RELEASE - CONFIGURE_OPTIONS_DEBUG - ) diff --git a/vcpkg/ports/qtlottie/vcpkg.json b/vcpkg/ports/qtlottie/vcpkg.json deleted file mode 100644 index 16794b0b3c..0000000000 --- a/vcpkg/ports/qtlottie/vcpkg.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "name": "qtlottie", - "version": "6.6.3", - "description": "Lottie is a family of player software for a certain json-based file format for describing 2d vector graphics animations. These files are created/exported directly from After Effects by a plugin called Bodymovin.", - "homepage": "https://www.qt.io/", - "license": null, - "dependencies": [ - { - "name": "qtbase", - "default-features": false, - "features": [ - "gui" - ] - }, - { - "name": "qtdeclarative", - "default-features": false - } - ], - "features": { - "qml": { - "description": "(deprecated since Qt 6.4)" - } - } -} diff --git a/vcpkg/ports/qtmqtt/portfile.cmake b/vcpkg/ports/qtmqtt/portfile.cmake deleted file mode 100644 index 1a3a6f1bfe..0000000000 --- a/vcpkg/ports/qtmqtt/portfile.cmake +++ /dev/null @@ -1,10 +0,0 @@ -set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") -include("${SCRIPT_PATH}/qt_install_submodule.cmake") - -set(${PORT}_PATCHES) - -qt_install_submodule(PATCHES ${${PORT}_PATCHES} - CONFIGURE_OPTIONS - CONFIGURE_OPTIONS_RELEASE - CONFIGURE_OPTIONS_DEBUG - ) diff --git a/vcpkg/ports/qtmqtt/vcpkg.json b/vcpkg/ports/qtmqtt/vcpkg.json deleted file mode 100644 index cfc25585c1..0000000000 --- a/vcpkg/ports/qtmqtt/vcpkg.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "name": "qtmqtt", - "version": "6.6.3", - "description": "The Qt MQTT module provides a standard compliant implementation of the MQTT protocol specification.", - "homepage": "https://www.qt.io/", - "license": null, - "dependencies": [ - { - "name": "qtbase", - "default-features": false, - "features": [ - "network" - ] - } - ] -} diff --git a/vcpkg/ports/qtmultimedia/portfile.cmake b/vcpkg/ports/qtmultimedia/portfile.cmake index a850621ab5..b160fd6c73 100644 --- a/vcpkg/ports/qtmultimedia/portfile.cmake +++ b/vcpkg/ports/qtmultimedia/portfile.cmake @@ -2,8 +2,10 @@ set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") include("${SCRIPT_PATH}/qt_install_submodule.cmake") set(${PORT}_PATCHES - static_find_modules.patch - fix_avfoundation_target.patch + static_find_modules.patch + fix_avfoundation_target.patch + remove-static-ssl-stub.patch + private_libs.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -55,12 +57,14 @@ else() endif() qt_install_submodule(PATCHES ${${PORT}_PATCHES} - CONFIGURE_OPTIONS ${FEATURE_OPTIONS} - -DCMAKE_FIND_PACKAGE_TARGETS_GLOBAL=ON + CONFIGURE_OPTIONS + --trace-expand + ${FEATURE_OPTIONS} + -DCMAKE_FIND_PACKAGE_TARGETS_GLOBAL=ON CONFIGURE_OPTIONS_RELEASE CONFIGURE_OPTIONS_DEBUG ) if("gstreamer" IN_LIST FEATURES AND VCPKG_LIBRARY_LINKAGE STREQUAL "static") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/Qt6Multimedia/Qt6QGstreamerMediaPluginDependencies.cmake" "GStreamer\;FALSE\;\;\;;GStreamer\;FALSE\;\;App\;;GStreamer\;FALSE\;\;\;Gl" "GStreamer\;FALSE\;\;\;;GStreamer\;FALSE\;\;App\;;GStreamer\;FALSE\;\;\;Gl;EGL\;FALSE\;\;\;" ) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/Qt6Multimedia/Qt6QGstreamerMediaPluginDependencies.cmake" "GStreamer\;FALSE\;\;\;;GStreamer\;FALSE\;\;App\;;GStreamer\;FALSE\;\;\;Gl" "GStreamer\;FALSE\;\;\;;GStreamer\;FALSE\;\;App\;;GStreamer\;FALSE\;\;\;Gl;EGL\;FALSE\;\;\;" IGNORE_UNCHANGED) endif() diff --git a/vcpkg/ports/qtmultimedia/private_libs.patch b/vcpkg/ports/qtmultimedia/private_libs.patch new file mode 100644 index 0000000000..3ffc253f4c --- /dev/null +++ b/vcpkg/ports/qtmultimedia/private_libs.patch @@ -0,0 +1,19 @@ +diff --git a/cmake/FindFFmpeg.cmake b/cmake/FindFFmpeg.cmake +index 6316dde..54f807b 100644 +--- a/cmake/FindFFmpeg.cmake ++++ b/cmake/FindFFmpeg.cmake +@@ -264,9 +264,11 @@ function(__ffmpeg_internal_set_dependencies _component) + string(REGEX MATCHALL "${prefix_l}[^ ]+" libs_dependency ${out}) + string(REGEX MATCHALL "[^ ]+${suffix_lib}" libs_dependency_lib ${out}) + +- string(REGEX REPLACE ".*Libs.private:([^\n\r]+).*" "\\1" out "${pcfile}") +- string(REGEX MATCHALL "${prefix_l}[^ ]+" libs_private_dependency ${out}) +- string(REGEX MATCHALL "[^ ]+${suffix_lib}" libs_private_dependency_lib ${out}) ++ if(out MATCHES "Libs.private:") ++ string(REGEX REPLACE ".*Libs.private:([^\n\r]+).*" "\\1" out "${pcfile}") ++ string(REGEX MATCHALL "${prefix_l}[^ ]+" libs_private_dependency ${out}) ++ string(REGEX MATCHALL "[^ ]+${suffix_lib}" libs_private_dependency_lib ${out}) ++ endif() + + list(APPEND deps_no_suffix ${libs_dependency} ${libs_private_dependency}) + foreach(dependency ${deps_no_suffix}) diff --git a/vcpkg/ports/qtmultimedia/remove-static-ssl-stub.patch b/vcpkg/ports/qtmultimedia/remove-static-ssl-stub.patch new file mode 100644 index 0000000000..1bd76b28c2 --- /dev/null +++ b/vcpkg/ports/qtmultimedia/remove-static-ssl-stub.patch @@ -0,0 +1,26 @@ +diff --git a/src/plugins/multimedia/ffmpeg/cmake/QtAddFFmpegStubs.cmake b/src/plugins/multimedia/ffmpeg/cmake/QtAddFFmpegStubs.cmake +index 5778ae4d23..8c0df4b44d 100644 +--- a/src/plugins/multimedia/ffmpeg/cmake/QtAddFFmpegStubs.cmake ++++ b/src/plugins/multimedia/ffmpeg/cmake/QtAddFFmpegStubs.cmake +@@ -70,7 +70,10 @@ macro(qt_internal_multimedia_find_openssl_soversion) + if (NOT OPENSSL_SSL_LIBRARY) + message(FATAL_ERROR "OPENSSL_SSL_LIBRARY is not found") + endif() +- ++ set(openssl_is_shared ON) ++ if(OPENSSL_SSL_LIBRARY MATCHES "${CMAKE_STATIC_LIBRARY_SUFFIX}$") ++ set(openssl_is_shared OFF) ++ endif() + get_filename_component(ssl_lib_realpath "${OPENSSL_SSL_LIBRARY}" REALPATH) + string(REGEX MATCH "[0-9]+(\\.[0-9]+)*$" ssl_soversion "${ssl_lib_realpath}") + string(REGEX REPLACE "^3(\\..*|$)" "3" ssl_soversion "${ssl_soversion}") +@@ -187,6 +190,9 @@ function(qt_internal_multimedia_add_ffmpeg_stubs) + + if (ffmpeg_has_openssl) + qt_internal_multimedia_find_openssl_soversion() ++ if(NOT openssl_is_shared) ++ list(REMOVE_ITEM FFMPEG_STUBS ssl crypto) ++ endif() + endif() + + foreach (stub ${FFMPEG_STUBS}) diff --git a/vcpkg/ports/qtmultimedia/static_find_modules.patch b/vcpkg/ports/qtmultimedia/static_find_modules.patch index 48659c6588..68957566f6 100644 --- a/vcpkg/ports/qtmultimedia/static_find_modules.patch +++ b/vcpkg/ports/qtmultimedia/static_find_modules.patch @@ -11,7 +11,7 @@ index 47d8769..46a5c9b 100644 list(APPEND FFMPEG_DEFINITIONS ${${_component}_DEFINITIONS}) list(APPEND FFMPEG_INCLUDE_DIRS ${${_component}_INCLUDE_DIR}) list(APPEND FFMPEG_LIBRARY_DIRS ${${_component}_LIBRARY_DIR}) -@@ -306,19 +306,21 @@ endfunction() +@@ -306,18 +306,19 @@ endfunction() string(TOLOWER ${_component} _lowerComponent) if (NOT TARGET FFmpeg::${_lowerComponent}) - add_library(FFmpeg::${_lowerComponent} INTERFACE IMPORTED) @@ -23,17 +23,15 @@ index 47d8769..46a5c9b 100644 - INTERFACE_LINK_DIRECTORIES "${${_component}_LIBRARY_DIR}" + IMPORTED_LOCATION "${${_component}_LIBRARY}" ) - if(NOT ${_component}_SHARED_LIBRARIES) - __ffmpeg_internal_set_dependencies(${_lowerComponent}) - endif() + + __ffmpeg_internal_set_dependencies(${_component}) - target_link_libraries(FFmpeg::${_lowerComponent} INTERFACE "${${_component}_LIBRARY_NAME}") -+ #target_link_libraries(FFmpeg::${_lowerComponent} INTERFACE "${${_component}_LIBRARY}") - if (UNIX AND NOT APPLE) - target_link_options(FFmpeg::${_lowerComponent} INTERFACE "-Wl,--exclude-libs=lib${_lowerComponent}") - endif () + if(WIN32 AND _lowerComponent STREQUAL "avutil") + target_link_libraries(FFmpeg::${_lowerComponent} INTERFACE "Bcrypt.lib") + endif() + if (UNIX AND NOT APPLE) + target_link_options(FFmpeg::${_lowerComponent} INTERFACE "-Wl,--exclude-libs=lib${_lowerComponent}") + endif () endif() endif() endforeach () @@ -82,40 +80,3 @@ index 19a8a67..09e95d1 100644 ) endif() include(FindPackageHandleStandardArgs) -diff --git a/cmake/FindGStreamer.cmake b/cmake/FindGStreamer.cmake -index c3becd7..895e1c8 100644 ---- a/cmake/FindGStreamer.cmake -+++ b/cmake/FindGStreamer.cmake -@@ -19,8 +19,8 @@ - # If the gstgl-1.0 library is available and target GStreamer::GStreamer exists - # - --include(CMakeFindDependencyMacro) --find_dependency(GObject) -+find_package(GObject) -+find_package(GLIB2) - - find_package(PkgConfig QUIET) - function(find_gstreamer_component component prefix header library) -@@ -74,7 +74,7 @@ find_gstreamer_component(Pbutils gstreamer-pbutils-1.0 gst/pbutils/pbutils.h gst - find_gstreamer_component(Allocators gstreamer-allocators-1.0 gst/allocators/allocators.h gstallocators-1.0) - - if(TARGET GStreamer::Core) -- target_link_libraries(GStreamer::Core INTERFACE GObject::GObject) -+ target_link_libraries(GStreamer::Core INTERFACE GObject::GObject GLIB2::GMODULE) - endif() - if(TARGET GStreamer::Base AND TARGET GStreamer::Core) - target_link_libraries(GStreamer::Base INTERFACE GStreamer::Core) -@@ -107,7 +107,11 @@ foreach(component ${GStreamer_FIND_COMPONENTS}) - elseif (${component} STREQUAL "Gl") - find_gstreamer_component(Gl gstreamer-gl-1.0 gst/gl/gl.h gstgl-1.0) - if(TARGET GStreamer::Gl AND TARGET GStreamer::Video AND TARGET GStreamer::Allocators) -- target_link_libraries(GStreamer::Gl INTERFACE GStreamer::Video GStreamer::Allocators) -+ find_package(OpenGL) -+ if(OpenGL_FOUND) -+ target_link_libraries(GStreamer::Gl INTERFACE OpenGL::GL) -+ endif() -+ target_link_libraries(GStreamer::Gl INTERFACE GStreamer::Video GStreamer::Allocators GLIB2::GMODULE) - endif() - else() - message(WARNING "FindGStreamer.cmake: Invalid Gstreamer component \"${component}\" requested") diff --git a/vcpkg/ports/qtmultimedia/vcpkg.json b/vcpkg/ports/qtmultimedia/vcpkg.json index 1a57e1eaff..1f0bd38348 100644 --- a/vcpkg/ports/qtmultimedia/vcpkg.json +++ b/vcpkg/ports/qtmultimedia/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtmultimedia", - "version": "6.6.3", + "version": "6.7.3", "description": "Qt Multimedia is an add-on module that provides a rich set of QML types and C++ classes to handle multimedia content.", "homepage": "https://www.qt.io/", "license": null, diff --git a/vcpkg/ports/qtnetworkauth/portfile.cmake b/vcpkg/ports/qtnetworkauth/portfile.cmake deleted file mode 100644 index 1a3a6f1bfe..0000000000 --- a/vcpkg/ports/qtnetworkauth/portfile.cmake +++ /dev/null @@ -1,10 +0,0 @@ -set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") -include("${SCRIPT_PATH}/qt_install_submodule.cmake") - -set(${PORT}_PATCHES) - -qt_install_submodule(PATCHES ${${PORT}_PATCHES} - CONFIGURE_OPTIONS - CONFIGURE_OPTIONS_RELEASE - CONFIGURE_OPTIONS_DEBUG - ) diff --git a/vcpkg/ports/qtnetworkauth/vcpkg.json b/vcpkg/ports/qtnetworkauth/vcpkg.json deleted file mode 100644 index 3273c47a6b..0000000000 --- a/vcpkg/ports/qtnetworkauth/vcpkg.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "name": "qtnetworkauth", - "version": "6.6.3", - "description": "Qt Network Authorization provides a set of APIs that enable Qt applications to obtain limited access to online accounts and HTTP services without exposing users' passwords.", - "homepage": "https://www.qt.io/", - "license": null, - "dependencies": [ - { - "name": "qtbase", - "default-features": false, - "features": [ - "network" - ] - } - ] -} diff --git a/vcpkg/ports/qtopcua/fix-build.patch b/vcpkg/ports/qtopcua/fix-build.patch deleted file mode 100644 index 33f4e84e7f..0000000000 --- a/vcpkg/ports/qtopcua/fix-build.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/cmake/FindOpen62541.cmake b/cmake/FindOpen62541.cmake -index b4fcea410..91958e554 100644 ---- a/cmake/FindOpen62541.cmake -+++ b/cmake/FindOpen62541.cmake -@@ -21,6 +21,7 @@ - # ``open62541`` - # The open62541 library - -+if(0) - find_path(Open62541_INCLUDE_DIRS - NAMES open62541.h - HINTS "${OPEN62541_INCDIR}") -@@ -46,6 +47,14 @@ if (Open62541_FOUND) - endif() - - mark_as_advanced(Open62541_INCLUDE_DIRS Open62541_LIBRARIES) -+elseif() -+ find_package(open62541 CONFIG REQUIRED) -+ if(NOT TARGET open62541) -+ add_library(open62541 INTERFACE IMPORTED) -+ set_property(TARGET open62541 APPEND PROPERTY -+ INTERFACE_LINK_LIBRARIES open62541::open62541) -+ endif() -+endif() - - include(FeatureSummary) - set_package_properties(Open62541 PROPERTIES diff --git a/vcpkg/ports/qtopcua/portfile.cmake b/vcpkg/ports/qtopcua/portfile.cmake deleted file mode 100644 index 0f2c0ed593..0000000000 --- a/vcpkg/ports/qtopcua/portfile.cmake +++ /dev/null @@ -1,36 +0,0 @@ -set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") -include("${SCRIPT_PATH}/qt_install_submodule.cmake") - -set(${PORT}_PATCHES fix-build.patch) - -# General features: -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS -FEATURES - "open62541" FEATURE_open62541 -# "open62541" FEATURE_open62541_security # requires vendored open62541 - "uacpp" FEATURE_uacpp - "ns0idnames" FEATURE_ns0idnames - "ns0idgenerator" FEATURE_ns0idgenerator - "qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Quick -INVERTED_FEATURES - "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick - ) -if("open62541" IN_LIST FEATURES) - list(APPEND FEATURE_OPTIONS -DINPUT_open62541=system - -DHAVE_open62541=true) - vcpkg_find_acquire_program(PYTHON3) -else() - list(APPEND FEATURE_OPTIONS -DINPUT_open62541=no) -endif() - -if("uacpp" IN_LIST FEATURES) - message(WARNING "\nPlease note that you have to install the Unified Automation C++ SDK yourself.\n") -endif() - -qt_install_submodule(PATCHES ${${PORT}_PATCHES} - CONFIGURE_OPTIONS - ${FEATURE_OPTIONS} - "-DPYTHON_EXECUTABLE=${PYTHON3}" - CONFIGURE_OPTIONS_RELEASE - CONFIGURE_OPTIONS_DEBUG - ) diff --git a/vcpkg/ports/qtopcua/vcpkg.json b/vcpkg/ports/qtopcua/vcpkg.json deleted file mode 100644 index 66d174b697..0000000000 --- a/vcpkg/ports/qtopcua/vcpkg.json +++ /dev/null @@ -1,70 +0,0 @@ -{ - "name": "qtopcua", - "version": "6.6.3", - "description": "The Qt OPC UA module implements a Qt API to interact with OPC UA on top of a 3rd party OPC UA stack.", - "homepage": "https://www.qt.io/", - "license": null, - "dependencies": [ - { - "name": "qtbase", - "default-features": false, - "features": [ - "network" - ] - } - ], - "default-features": [ - "default-features", - "gds", - "ns0idnames", - "open62541" - ], - "features": { - "default-features": { - "description": "Platform-dependent default features" - }, - "gds": { - "description": "Support for global discovery server" - }, - "ns0idgenerator": { - "description": "Namespace 0 NodeIds generator from the NodeIds.csv file.", - "supports": "native" - }, - "ns0idnames": { - "description": "Support for namespace 0 NodeId names" - }, - "open62541": { - "description": "Open62541 with plugin to connect to servers with signing and encryption", - "dependencies": [ - { - "name": "open62541", - "default-features": false, - "features": [ - "amalgamation", - "historizing", - "openssl" - ] - } - ] - }, - "qml": { - "description": "Build QML imports", - "dependencies": [ - { - "name": "qtbase", - "default-features": false, - "features": [ - "gui" - ] - }, - { - "name": "qtdeclarative", - "default-features": false - } - ] - }, - "uacpp": { - "description": "Unified Automation C++ SDK" - } - } -} diff --git a/vcpkg/ports/qtpositioning/devendor-poly2tri.patch b/vcpkg/ports/qtpositioning/devendor-poly2tri.patch deleted file mode 100644 index 85e18ca986..0000000000 --- a/vcpkg/ports/qtpositioning/devendor-poly2tri.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff --color -Naur a/src/3rdparty/clip2tri/CMakeLists.txt b/src/3rdparty/clip2tri/CMakeLists.txt ---- a/src/3rdparty/clip2tri/CMakeLists.txt 2023-05-13 16:59:42.377052155 +0200 -+++ b/src/3rdparty/clip2tri/CMakeLists.txt 2023-05-13 23:05:44.950379088 +0200 -@@ -4,6 +4,7 @@ - ## Bundled_Clip2Tri Generic Library: - ##################################################################### - -+find_package(poly2tri) - qt_internal_add_3rdparty_library(Bundled_Clip2Tri - QMAKE_LIB_NAME _clip2tri - STATIC -@@ -13,11 +14,12 @@ - clip2tri.cpp clip2tri.h - INCLUDE_DIRECTORIES - ../clipper -- ../poly2tri - LIBRARIES - Qt::Bundled_Clipper # special case -- Qt::Bundled_Poly2Tri # special case -+ poly2tri::poly2tri - ) -+target_link_libraries(Bundled_Clip2Tri PRIVATE poly2tri::poly2tri) -+set_target_properties(poly2tri::poly2tri PROPERTIES INTERFACE_QT_PACKAGE_NAME poly2tri) - qt_disable_warnings(Bundled_Clip2Tri) - qt_set_symbol_visibility_hidden(Bundled_Clip2Tri) - -diff --color -Naur a/src/CMakeLists.txt b/src/CMakeLists.txt ---- a/src/CMakeLists.txt 2023-05-13 16:59:42.379052157 +0200 -+++ b/src/CMakeLists.txt 2023-05-13 17:00:19.256085781 +0200 -@@ -2,7 +2,6 @@ - # SPDX-License-Identifier: BSD-3-Clause - - # special case begin --add_subdirectory(3rdparty/poly2tri) - add_subdirectory(3rdparty/clipper) - add_subdirectory(3rdparty/clip2tri) - add_subdirectory(positioning) diff --git a/vcpkg/ports/qtpositioning/portfile.cmake b/vcpkg/ports/qtpositioning/portfile.cmake deleted file mode 100644 index dc9da8a1d0..0000000000 --- a/vcpkg/ports/qtpositioning/portfile.cmake +++ /dev/null @@ -1,22 +0,0 @@ -set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") -include("${SCRIPT_PATH}/qt_install_submodule.cmake") - -set(${PORT}_PATCHES - devendor-poly2tri.patch) - -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS -FEATURES - "qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Quick -INVERTED_FEATURES - "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick -) - -list(APPEND FEATURE_OPTIONS "-DCMAKE_DISABLE_FIND_PACKAGE_Gypsy=ON" - "-DCMAKE_DISABLE_FIND_PACKAGE_Gconf=ON" -) - -qt_install_submodule(PATCHES ${${PORT}_PATCHES} - CONFIGURE_OPTIONS ${FEATURE_OPTIONS} - CONFIGURE_OPTIONS_RELEASE - CONFIGURE_OPTIONS_DEBUG - ) diff --git a/vcpkg/ports/qtpositioning/vcpkg.json b/vcpkg/ports/qtpositioning/vcpkg.json deleted file mode 100644 index 6dfcc05ee3..0000000000 --- a/vcpkg/ports/qtpositioning/vcpkg.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "name": "qtpositioning", - "version": "6.6.3", - "description": "The Qt Positioning API provides positioning information via QML and C++ interfaces.", - "homepage": "https://www.qt.io/", - "license": null, - "dependencies": [ - "jhasse-poly2tri", - { - "name": "qtbase", - "default-features": false - }, - { - "name": "qtserialport", - "default-features": false, - "platform": "!ios" - } - ], - "features": { - "qml": { - "description": "Build QML imports", - "dependencies": [ - { - "name": "qtdeclarative", - "default-features": false - } - ] - } - } -} diff --git a/vcpkg/ports/qtquick3d/portfile.cmake b/vcpkg/ports/qtquick3d/portfile.cmake deleted file mode 100644 index fc2e1d75ce..0000000000 --- a/vcpkg/ports/qtquick3d/portfile.cmake +++ /dev/null @@ -1,28 +0,0 @@ -set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") -include("${SCRIPT_PATH}/qt_install_submodule.cmake") - -# General features: -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS -FEATURES - "assimp" FEATURE_quick3d_assimp - #"assimp" CMAKE_REQUIRE_FIND_PACKAGE_WrapQuick3DAssimp -INVERTED_FEATURES - "assimp" CMAKE_DISABLE_FIND_PACKAGE_WrapQuick3DAssimp - ) - -if("assimp" IN_LIST FEATURES) - list(APPEND FEATURE_OPTIONS -DINPUT_quick3d_assimp=system -DTEST_quick3d_assimp=ON -DHAVE_Assimp=ON) -else() - list(APPEND FEATURE_OPTIONS -DINPUT_quick3d_assimp=no) -endif() - -set(TOOL_NAMES balsam balsamui meshdebug shadergen instancer materialeditor shapegen) - -qt_install_submodule(PATCHES ${${PORT}_PATCHES} - TOOL_NAMES ${TOOL_NAMES} - CONFIGURE_OPTIONS - ${FEATURE_OPTIONS} - -DCMAKE_FIND_PACKAGE_TARGETS_GLOBAL=ON - CONFIGURE_OPTIONS_RELEASE - CONFIGURE_OPTIONS_DEBUG - ) diff --git a/vcpkg/ports/qtquick3d/vcpkg.json b/vcpkg/ports/qtquick3d/vcpkg.json deleted file mode 100644 index ba54fc5934..0000000000 --- a/vcpkg/ports/qtquick3d/vcpkg.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "name": "qtquick3d", - "version": "6.6.3", - "description": "Qt Quick 3D provides a high-level API for creating 3D content and 3D user interfaces based on Qt Quick.", - "homepage": "https://www.qt.io/", - "license": null, - "dependencies": [ - { - "name": "qtbase", - "default-features": false, - "features": [ - "gui" - ] - }, - "qtdeclarative", - { - "name": "qtquick3d", - "host": true, - "default-features": false - }, - "qtquicktimeline", - "qtshadertools" - ], - "default-features": [ - "default-features" - ], - "features": { - "assimp": { - "description": "assimp", - "dependencies": [ - "assimp" - ] - }, - "default-features": { - "description": "Platform-dependent default features" - } - } -} diff --git a/vcpkg/ports/qtquick3dphysics/portfile.cmake b/vcpkg/ports/qtquick3dphysics/portfile.cmake deleted file mode 100644 index 1110561e65..0000000000 --- a/vcpkg/ports/qtquick3dphysics/portfile.cmake +++ /dev/null @@ -1,13 +0,0 @@ -set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") -include("${SCRIPT_PATH}/qt_install_submodule.cmake") - -set(${PORT}_PATCHES) - -set(TOOL_NAMES cooker) - -qt_install_submodule(PATCHES ${${PORT}_PATCHES} - TOOL_NAMES ${TOOL_NAMES} - CONFIGURE_OPTIONS - CONFIGURE_OPTIONS_RELEASE - CONFIGURE_OPTIONS_DEBUG - ) diff --git a/vcpkg/ports/qtquick3dphysics/vcpkg.json b/vcpkg/ports/qtquick3dphysics/vcpkg.json deleted file mode 100644 index 09660422e5..0000000000 --- a/vcpkg/ports/qtquick3dphysics/vcpkg.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "name": "qtquick3dphysics", - "version": "6.6.3", - "description": "Qt Quick 3D Physics provides a high-level API for physics simulation.", - "homepage": "https://www.qt.io/", - "license": null, - "dependencies": [ - { - "name": "qtquick3d", - "default-features": false - } - ] -} diff --git a/vcpkg/ports/qtquicktimeline/portfile.cmake b/vcpkg/ports/qtquicktimeline/portfile.cmake deleted file mode 100644 index 5ed735d38c..0000000000 --- a/vcpkg/ports/qtquicktimeline/portfile.cmake +++ /dev/null @@ -1,15 +0,0 @@ -set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") -include("${SCRIPT_PATH}/qt_install_submodule.cmake") - -set(${PORT}_PATCHES) - -set(TOOL_NAMES) - -qt_install_submodule(PATCHES ${${PORT}_PATCHES} - TOOL_NAMES ${TOOL_NAMES} - CONFIGURE_OPTIONS - CONFIGURE_OPTIONS_RELEASE - CONFIGURE_OPTIONS_DEBUG - ) - -set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) # QML plugin only diff --git a/vcpkg/ports/qtquicktimeline/vcpkg.json b/vcpkg/ports/qtquicktimeline/vcpkg.json deleted file mode 100644 index 7605251ede..0000000000 --- a/vcpkg/ports/qtquicktimeline/vcpkg.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "name": "qtquicktimeline", - "version": "6.6.3", - "description": "The Qt Quick Timeline module enables keyframe-based animations and parameterization.", - "homepage": "https://www.qt.io/", - "license": null, - "dependencies": [ - { - "name": "qtbase", - "default-features": false - }, - "qtdeclarative" - ] -} diff --git a/vcpkg/ports/qtremoteobjects/portfile.cmake b/vcpkg/ports/qtremoteobjects/portfile.cmake deleted file mode 100644 index f2b31ed8e5..0000000000 --- a/vcpkg/ports/qtremoteobjects/portfile.cmake +++ /dev/null @@ -1,19 +0,0 @@ -set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") -include("${SCRIPT_PATH}/qt_install_submodule.cmake") - -set(${PORT}_PATCHES) -set(TOOL_NAMES repc) - -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS -FEATURES - "qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Quick -INVERTED_FEATURES - "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick -) - -qt_install_submodule(PATCHES ${${PORT}_PATCHES} - TOOL_NAMES ${TOOL_NAMES} - CONFIGURE_OPTIONS ${FEATURE_OPTIONS} - CONFIGURE_OPTIONS_RELEASE - CONFIGURE_OPTIONS_DEBUG - ) diff --git a/vcpkg/ports/qtremoteobjects/vcpkg.json b/vcpkg/ports/qtremoteobjects/vcpkg.json deleted file mode 100644 index a3ee1746de..0000000000 --- a/vcpkg/ports/qtremoteobjects/vcpkg.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "name": "qtremoteobjects", - "version": "6.6.3", - "description": "Qt Remote Objects (QtRO) is an Inter-Process Communication (IPC) module developed for Qt. This module extends Qt's existing functionalities to enable information exchange between processes or computers, easily.", - "homepage": "https://www.qt.io/", - "license": null, - "dependencies": [ - { - "name": "qtbase", - "default-features": false, - "features": [ - "network" - ] - }, - { - "name": "qtdeclarative", - "default-features": false - }, - { - "name": "qtremoteobjects", - "host": true, - "default-features": false - } - ], - "features": { - "qml": { - "description": "Build QML imports", - "dependencies": [ - { - "name": "qtbase", - "default-features": false, - "features": [ - "gui" - ] - }, - { - "name": "qtdeclarative", - "default-features": false - } - ] - } - } -} diff --git a/vcpkg/ports/qtscxml/portfile.cmake b/vcpkg/ports/qtscxml/portfile.cmake deleted file mode 100644 index 74fa2ed04f..0000000000 --- a/vcpkg/ports/qtscxml/portfile.cmake +++ /dev/null @@ -1,20 +0,0 @@ -set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") -include("${SCRIPT_PATH}/qt_install_submodule.cmake") - -set(${PORT}_PATCHES) - -set(TOOL_NAMES qscxmlc) - -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS -FEATURES - "qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Qml -INVERTED_FEATURES - "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Qml -) - -qt_install_submodule(PATCHES ${${PORT}_PATCHES} - TOOL_NAMES ${TOOL_NAMES} - CONFIGURE_OPTIONS ${FEATURE_OPTIONS} - CONFIGURE_OPTIONS_RELEASE - CONFIGURE_OPTIONS_DEBUG - ) diff --git a/vcpkg/ports/qtscxml/vcpkg.json b/vcpkg/ports/qtscxml/vcpkg.json deleted file mode 100644 index bb0bbef248..0000000000 --- a/vcpkg/ports/qtscxml/vcpkg.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "name": "qtscxml", - "version": "6.6.3", - "description": "The Qt SCXML module provides functionality to create state machines from SCXML files.", - "homepage": "https://www.qt.io/", - "license": null, - "dependencies": [ - { - "name": "qtbase", - "default-features": false, - "features": [ - "gui" - ] - }, - { - "name": "qtscxml", - "host": true, - "default-features": false - } - ], - "features": { - "qml": { - "description": "Build QML imports", - "dependencies": [ - { - "name": "qtdeclarative", - "default-features": false - } - ] - } - } -} diff --git a/vcpkg/ports/qtsensors/portfile.cmake b/vcpkg/ports/qtsensors/portfile.cmake deleted file mode 100644 index 0f5be8a036..0000000000 --- a/vcpkg/ports/qtsensors/portfile.cmake +++ /dev/null @@ -1,17 +0,0 @@ -set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") -include("${SCRIPT_PATH}/qt_install_submodule.cmake") - -set(${PORT}_PATCHES) - -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS -FEATURES - "qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Quick -INVERTED_FEATURES - "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick -) - -qt_install_submodule(PATCHES ${${PORT}_PATCHES} - CONFIGURE_OPTIONS ${FEATURE_OPTIONS} - CONFIGURE_OPTIONS_RELEASE - CONFIGURE_OPTIONS_DEBUG - ) diff --git a/vcpkg/ports/qtsensors/vcpkg.json b/vcpkg/ports/qtsensors/vcpkg.json deleted file mode 100644 index 560e518fad..0000000000 --- a/vcpkg/ports/qtsensors/vcpkg.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "name": "qtsensors", - "version": "6.6.3", - "description": "The Qt Sensors API provides access to sensor hardware via QML and C++ interfaces. The Qt Sensors API also provides a motion gesture recognition API for devices.", - "homepage": "https://www.qt.io/", - "license": null, - "dependencies": [ - { - "name": "qtbase", - "default-features": false, - "features": [ - "dbus" - ] - }, - { - "name": "qtconnectivity", - "default-features": false - } - ], - "features": { - "qml": { - "description": "Build QML imports", - "dependencies": [ - { - "name": "qtdeclarative", - "default-features": false - } - ] - } - } -} diff --git a/vcpkg/ports/qtserialbus/portfile.cmake b/vcpkg/ports/qtserialbus/portfile.cmake deleted file mode 100644 index b69e37c31e..0000000000 --- a/vcpkg/ports/qtserialbus/portfile.cmake +++ /dev/null @@ -1,18 +0,0 @@ -set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") -include("${SCRIPT_PATH}/qt_install_submodule.cmake") - - set(TOOL_NAMES - canbusutil - ) - -# Probably not worth the time to make it features: -# qt_configure_add_summary_entry(ARGS "socketcan") # only unix -# qt_configure_add_summary_entry(ARGS "socketcan_fd") # only unix -# qt_configure_add_summary_entry(ARGS "modbus-serialport") - -qt_install_submodule(PATCHES ${${PORT}_PATCHES} - TOOL_NAMES ${TOOL_NAMES} - CONFIGURE_OPTIONS - CONFIGURE_OPTIONS_RELEASE - CONFIGURE_OPTIONS_DEBUG - ) diff --git a/vcpkg/ports/qtserialbus/vcpkg.json b/vcpkg/ports/qtserialbus/vcpkg.json deleted file mode 100644 index d8717c2d78..0000000000 --- a/vcpkg/ports/qtserialbus/vcpkg.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "name": "qtserialbus", - "version": "6.6.3", - "description": "The Qt Serial Bus API provides classes and functions to access the various industrial serial buses and protocols, such as CAN, ModBus, and others.", - "homepage": "https://www.qt.io/", - "license": null, - "dependencies": [ - { - "name": "qtbase", - "default-features": false, - "features": [ - "network" - ] - }, - { - "name": "qtserialbus", - "host": true, - "default-features": false - }, - { - "name": "qtserialport", - "default-features": false - } - ], - "default-features": [ - "default-features" - ], - "features": { - "default-features": { - "description": "Platform-dependent default features" - } - } -} diff --git a/vcpkg/ports/qtserialport/portfile.cmake b/vcpkg/ports/qtserialport/portfile.cmake deleted file mode 100644 index 1a3a6f1bfe..0000000000 --- a/vcpkg/ports/qtserialport/portfile.cmake +++ /dev/null @@ -1,10 +0,0 @@ -set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") -include("${SCRIPT_PATH}/qt_install_submodule.cmake") - -set(${PORT}_PATCHES) - -qt_install_submodule(PATCHES ${${PORT}_PATCHES} - CONFIGURE_OPTIONS - CONFIGURE_OPTIONS_RELEASE - CONFIGURE_OPTIONS_DEBUG - ) diff --git a/vcpkg/ports/qtserialport/vcpkg.json b/vcpkg/ports/qtserialport/vcpkg.json deleted file mode 100644 index d541894783..0000000000 --- a/vcpkg/ports/qtserialport/vcpkg.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "name": "qtserialport", - "version": "6.6.3", - "description": "Qt Serial Port provides basic functionality for configuration, I/O operations, and getting and setting the control signals of the RS-232 pinouts.", - "homepage": "https://www.qt.io/", - "license": null, - "supports": "!ios", - "dependencies": [ - { - "name": "qtbase", - "default-features": false - } - ] -} diff --git a/vcpkg/ports/qtshadertools/portfile.cmake b/vcpkg/ports/qtshadertools/portfile.cmake deleted file mode 100644 index 0311a481a0..0000000000 --- a/vcpkg/ports/qtshadertools/portfile.cmake +++ /dev/null @@ -1,13 +0,0 @@ -set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") -include("${SCRIPT_PATH}/qt_install_submodule.cmake") - -set(${PORT}_PATCHES) - -set(TOOL_NAMES qsb) - -qt_install_submodule(PATCHES ${${PORT}_PATCHES} - TOOL_NAMES ${TOOL_NAMES} - CONFIGURE_OPTIONS - CONFIGURE_OPTIONS_RELEASE - CONFIGURE_OPTIONS_DEBUG - ) diff --git a/vcpkg/ports/qtshadertools/vcpkg.json b/vcpkg/ports/qtshadertools/vcpkg.json deleted file mode 100644 index 48f1103224..0000000000 --- a/vcpkg/ports/qtshadertools/vcpkg.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "name": "qtshadertools", - "version": "6.6.3", - "description": "The Qt Shader Tools module is designed to provide a set of tools and utilities to work with graphics shaders.", - "homepage": "https://www.qt.io/", - "license": null, - "dependencies": [ - { - "name": "qtbase", - "default-features": false, - "features": [ - "gui" - ] - }, - { - "name": "qtshadertools", - "host": true, - "default-features": false - } - ] -} diff --git a/vcpkg/ports/qtspeech/portfile.cmake b/vcpkg/ports/qtspeech/portfile.cmake deleted file mode 100644 index 3b411aac08..0000000000 --- a/vcpkg/ports/qtspeech/portfile.cmake +++ /dev/null @@ -1,29 +0,0 @@ -set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") -include("${SCRIPT_PATH}/qt_install_submodule.cmake") - -set(${PORT}_PATCHES) -set(TOOL_NAMES) - -# Note: none of these features are implemented in the manifest yet -# flite -> Missing port for flite -# speechd -> missing port for speechd -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - FEATURES - "flite" FEATURE_flite - "flite-alsa" FEATURE_flite-alsa - "speechd" FEATURE_speechd -INVERTED_FEATURES - "flite" CMAKE_DISABLE_FIND_PACKAGE_Flite - "flite-alsa" CMAKE_DISABLE_FIND_PACKAGE_Alsa - "speechd" CMAKE_DISABLE_FIND_PACKAGE_SpeechDispatcher -) - -qt_install_submodule(PATCHES ${${PORT}_PATCHES} - TOOL_NAMES ${TOOL_NAMES} - CONFIGURE_OPTIONS - ${FEATURE_OPTIONS} - -DCMAKE_FIND_PACKAGE_TARGETS_GLOBAL=ON - CONFIGURE_OPTIONS_MAYBE_UNUSED - QT_BUILD_EXAMPLES - QT_USE_DEFAULT_CMAKE_OPTIMIZATION_FLAGS - ) diff --git a/vcpkg/ports/qtspeech/vcpkg.json b/vcpkg/ports/qtspeech/vcpkg.json deleted file mode 100644 index 13cb2c4f1a..0000000000 --- a/vcpkg/ports/qtspeech/vcpkg.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "name": "qtspeech", - "version": "6.6.3", - "description": "The Qt Speech module enables a Qt application to support accessibility features such as text-to-speech, which is useful for end-users who are visually challenged or cannot access the application for whatever reason.", - "homepage": "https://www.qt.io/", - "license": null, - "supports": "!(windows & x86)", - "dependencies": [ - { - "name": "qtbase", - "default-features": false, - "features": [ - "gui", - "widgets" - ] - }, - { - "name": "qtdeclarative", - "default-features": false - }, - { - "name": "qtmultimedia", - "default-features": false - } - ] -} diff --git a/vcpkg/ports/qtsvg/portfile.cmake b/vcpkg/ports/qtsvg/portfile.cmake deleted file mode 100644 index 975bf122fd..0000000000 --- a/vcpkg/ports/qtsvg/portfile.cmake +++ /dev/null @@ -1,13 +0,0 @@ -set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") -include("${SCRIPT_PATH}/qt_install_submodule.cmake") - -set(${PORT}_PATCHES) - -set(TOOL_NAMES) - -qt_install_submodule(PATCHES ${${PORT}_PATCHES} - TOOL_NAMES ${TOOL_NAMES} - CONFIGURE_OPTIONS - CONFIGURE_OPTIONS_RELEASE - CONFIGURE_OPTIONS_DEBUG - ) diff --git a/vcpkg/ports/qtsvg/vcpkg.json b/vcpkg/ports/qtsvg/vcpkg.json deleted file mode 100644 index 6fd5281f9f..0000000000 --- a/vcpkg/ports/qtsvg/vcpkg.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "name": "qtsvg", - "version": "6.6.3", - "description": "Qt SVG provides classes for rendering and displaying SVG drawings in widgets and on other paint devices.", - "homepage": "https://www.qt.io/", - "license": null, - "dependencies": [ - { - "name": "qtbase", - "default-features": false, - "features": [ - "gui" - ] - } - ] -} diff --git a/vcpkg/ports/qttools/devendor-litehtml.patch b/vcpkg/ports/qttools/devendor-litehtml.patch deleted file mode 100644 index ed3b43a152..0000000000 --- a/vcpkg/ports/qttools/devendor-litehtml.patch +++ /dev/null @@ -1,69 +0,0 @@ ---- a/src/assistant/qlitehtml/src/CMakeLists.txt -+++ b/src/assistant/qlitehtml/src/CMakeLists.txt -@@ -15,45 +15,11 @@ - set(QLITEHTML_VERSION_MAJOR ${PROJECT_VERSION_MAJOR}) - set(QLITEHTML_VERSION_COMPAT ${QLITEHTML_VERSION} CACHE STRING "qlitehtml compat version number.") - --find_package(litehtml QUIET) --if(NOT TARGET litehtml AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/litehtml/CMakeLists.txt) -- set(ORIG_FPIC ${CMAKE_POSITION_INDEPENDENT_CODE}) -- set(ORIG_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS}) -- if (WIN32) -- set(LITEHTML_UTF8 ON CACHE BOOL "") -- endif() -- set(CMAKE_POSITION_INDEPENDENT_CODE ON) -- set(BUILD_SHARED_LIBS OFF) -- -- add_subdirectory(3rdparty/litehtml EXCLUDE_FROM_ALL) -- -- # suppress compiler warnings from litehtml -- set_target_properties( -- litehtml -- PROPERTIES -- QT_COMPILE_OPTIONS_DISABLE_WARNINGS ON -- ) -- set_target_properties( -- gumbo -- PROPERTIES -- QT_COMPILE_OPTIONS_DISABLE_WARNINGS ON -- ) -- -- set(CMAKE_POSITION_INDEPENDENT_CODE "${ORIG_FPIC}") -- set(BUILD_SHARED_LIBS ${ORIG_BUILD_SHARED_LIBS}) -- # force optimized litehtml even in debug -- if (CMAKE_BUILD_TYPE STREQUAL "Debug") -- # except for windows -- if (NOT WIN32) -- target_compile_options(gumbo PRIVATE -O2) -- target_compile_options(litehtml PRIVATE -O2) -- endif() -- endif() --endif() -+find_package(litehtml CONFIG REQUIRED) - - # TODO error if litehtml was not found? - --if(TARGET litehtml) -+ - set(PUBLIC_HEADERS - container_qpainter.h - container_qpainter_p.h -@@ -155,5 +121,3 @@ - ${_DEVEL_COMPONENT} - OPTIONAL) - endif() -- --endif() -diff --git a/src/assistant/CMakeLists.txt b/src/assistant/CMakeLists.txt -index 5d2bf2b67c..abd9b513d3 100644 ---- a/src/assistant/CMakeLists.txt -+++ b/src/assistant/CMakeLists.txt -@@ -34,7 +34,7 @@ if(TARGET qlitehtml) - # but found in the system, because they are imported only to the subdirectory scope - # where find_package was called. But that's fine, we wouldn't be able to set compiler flags - # on them anyway. -- if(TARGET litehtml) -+ if(0) - qt_internal_set_exceptions_flags(litehtml OFF) - qt_disable_warnings(litehtml) - endif() diff --git a/vcpkg/ports/qttools/portfile.cmake b/vcpkg/ports/qttools/portfile.cmake deleted file mode 100644 index bb46599a62..0000000000 --- a/vcpkg/ports/qttools/portfile.cmake +++ /dev/null @@ -1,115 +0,0 @@ -set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") -include("${SCRIPT_PATH}/qt_install_submodule.cmake") - -set(${PORT}_PATCHES - devendor-litehtml.patch) - -#TODO check features and setup: (means force features!) - -# -- The following OPTIONAL packages have not been found: - - # * Qt6AxContainer - # * Clang - # * WrapLibClang (required version >= 8) - -# Configure summary: - -# Qt Tools: - # Qt Assistant ........................... yes - # QDoc ................................... no - # Clang-based lupdate parser ............. no - # Qt Designer ............................ yes - # Qt Distance Field Generator ............ yes - # kmap2qmap .............................. yes - # Qt Linguist ............................ yes - # Mac Deployment Tool .................... no - # pixeltool .............................. yes - # qdbus .................................. yes - # qev .................................... yes - # Qt Attributions Scanner ................ yes - # qtdiag ................................. yes - # qtpaths ................................ yes - # qtplugininfo ........................... yes - # Windows deployment tool ................ yes - -# General features: -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - FEATURES - "assistant" FEATURE_assistant - "designer" FEATURE_designer - "linguist" FEATURE_linguist - "qdbus" FEATURE_qdbus - "qdoc" CMAKE_REQUIRE_FIND_PACKAGE_Clang - #"qdoc" CMAKE_REQUIRE_FIND_PACKAGE_WrapLibClang - "qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Qml - "qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Quick - "qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6QuickWidgets - "qml" FEATURE_distancefieldgenerator - INVERTED_FEATURES - "qdoc" CMAKE_DISABLE_FIND_PACKAGE_Clang - "qdoc" CMAKE_DISABLE_FIND_PACKAGE_WrapLibClang - "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Qml - "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick - "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6QuickWidgets - ) - - set(TOOL_NAMES - assistant - designer - lconvert - linguist - lprodump - lrelease-pro - lrelease - lupdate-pro - lupdate - pixeltool - qcollectiongenerator - qdistancefieldgenerator - qhelpgenerator - qtattributionsscanner - qtdiag - qtdiag6 - qtpaths - qtplugininfo - qdbus - qdbusviewer - qdoc - ) -if(VCPKG_TARGET_IS_WINDOWS) - list(APPEND TOOL_NAMES windeployqt) -elseif(VCPKG_TARGET_IS_OSX) - list(APPEND TOOL_NAMES macdeployqt) -endif() - -qt_install_submodule(PATCHES ${${PORT}_PATCHES} - TOOL_NAMES ${TOOL_NAMES} - CONFIGURE_OPTIONS - ${FEATURE_OPTIONS} - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6AxContainer=ON - CONFIGURE_OPTIONS_RELEASE - CONFIGURE_OPTIONS_DEBUG - ) - -if(VCPKG_TARGET_IS_OSX) - set(OSX_APP_FOLDERS Designer.app Linguist.app pixeltool.app) - if (FEATURE_qdbus) - message(STATUS "Built qdbusviewer") - list(APPEND OSX_APP_FOLDERS qdbusviewer.app) - endif() - foreach(_appfolder IN LISTS OSX_APP_FOLDERS) - # Folders are only existing in case of native builds - if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/${_appfolder}") - message(STATUS "Moving: ${_appfolder}") - file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/${_appfolder}") - file(RENAME "${CURRENT_PACKAGES_DIR}/bin/${_appfolder}/" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/${_appfolder}/") - endif() - endforeach() - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") -endif() - -file(GLOB_RECURSE debug_dir "${CURRENT_PACKAGES_DIR}/debug/*") -list(LENGTH debug_dir debug_dir_elements) -if(debug_dir_elements EQUAL 0) - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") -endif() diff --git a/vcpkg/ports/qttools/vcpkg.json b/vcpkg/ports/qttools/vcpkg.json deleted file mode 100644 index e0d17fb77f..0000000000 --- a/vcpkg/ports/qttools/vcpkg.json +++ /dev/null @@ -1,106 +0,0 @@ -{ - "name": "qttools", - "version": "6.6.3", - "description": "A collection of tools and utilities that come with the Qt framework to assist developers in the creation, management, and deployment of Qt applications.", - "homepage": "https://www.qt.io/", - "license": null, - "dependencies": [ - "litehtml", - { - "name": "qtbase", - "default-features": false - }, - { - "name": "qttools", - "host": true, - "default-features": false, - "features": [ - "assistant", - "linguist" - ] - } - ], - "features": { - "assistant": { - "description": "Build Qt Assistant", - "dependencies": [ - { - "name": "qtbase", - "default-features": false, - "features": [ - "network", - "png", - "sql-sqlite", - "widgets" - ] - } - ] - }, - "designer": { - "description": "Build Qt Designer", - "dependencies": [ - { - "name": "qtbase", - "default-features": false, - "features": [ - "network" - ] - } - ] - }, - "linguist": { - "description": "Build Qt Linguist components", - "dependencies": [ - { - "name": "qttools", - "default-features": false, - "features": [ - "designer" - ] - } - ] - }, - "qdbus": { - "description": "Build QDBusViewer", - "dependencies": [ - { - "name": "qtbase", - "default-features": false, - "features": [ - "dbus", - "widgets" - ] - } - ] - }, - "qdoc": { - "description": "Build QDoc", - "dependencies": [ - { - "name": "llvm", - "default-features": false, - "features": [ - "clang", - "enable-rtti" - ] - } - ] - }, - "qml": { - "description": "Build QML imports", - "dependencies": [ - { - "name": "qtbase", - "default-features": false, - "features": [ - "gui" - ] - }, - { - "name": "qtdeclarative", - "default-features": false - } - ] - } - } -} diff --git a/vcpkg/ports/qttools/windeployqt.debug.bat b/vcpkg/ports/qttools/windeployqt.debug.bat deleted file mode 100644 index c0c41e34d8..0000000000 --- a/vcpkg/ports/qttools/windeployqt.debug.bat +++ /dev/null @@ -1,10 +0,0 @@ -@echo off -setlocal enabledelayedexpansion -set mypath=%~dp0 -set mypath=%mypath:~0,-1% -set BAKCD=!CD! -cd /D %mypath%\..\..\..\debug\bin -set PATH=!CD!;%PATH% -"%mypath%\windeployqt.exe" --qmake "%mypath%\qmake.debug.bat" %* -cd %BAKCD% -endlocal diff --git a/vcpkg/ports/qttranslations/portfile.cmake b/vcpkg/ports/qttranslations/portfile.cmake deleted file mode 100644 index f151f0a5b7..0000000000 --- a/vcpkg/ports/qttranslations/portfile.cmake +++ /dev/null @@ -1,15 +0,0 @@ -set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") -include("${SCRIPT_PATH}/qt_install_submodule.cmake") - -set(${PORT}_PATCHES) -set(TOOL_NAMES) - -qt_install_submodule(PATCHES ${${PORT}_PATCHES} - TOOL_NAMES ${TOOL_NAMES} - CONFIGURE_OPTIONS_MAYBE_UNUSED - QT_BUILD_EXAMPLES - QT_USE_DEFAULT_CMAKE_OPTIMIZATION_FLAGS - ) - -set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) # only translation files. -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") diff --git a/vcpkg/ports/qttranslations/vcpkg.json b/vcpkg/ports/qttranslations/vcpkg.json deleted file mode 100644 index 7ebf406755..0000000000 --- a/vcpkg/ports/qttranslations/vcpkg.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "name": "qttranslations", - "version": "6.6.3", - "description": "Qt translations.", - "homepage": "https://www.qt.io/", - "license": null, - "dependencies": [ - { - "name": "qtbase", - "default-features": false - }, - { - "name": "qttools", - "default-features": false, - "features": [ - "linguist" - ] - } - ], - "default-features": [ - "default-features" - ], - "features": { - "default-features": { - "description": "Platform-dependent default features" - } - } -} diff --git a/vcpkg/ports/qtvirtualkeyboard/hunspell_include_path_fix.patch b/vcpkg/ports/qtvirtualkeyboard/hunspell_include_path_fix.patch deleted file mode 100644 index f0d7390ad5..0000000000 --- a/vcpkg/ports/qtvirtualkeyboard/hunspell_include_path_fix.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/src/plugins/hunspell/module/hunspellworker_p.h b/src/plugins/hunspell/module/hunspellworker_p.h -index b79354429..a843bdfa6 100644 ---- a/src/plugins/hunspell/module/hunspellworker_p.h -+++ b/src/plugins/hunspell/module/hunspellworker_p.h -@@ -50,7 +50,7 @@ - #include - #include - #include --#include -+#include - #include "hunspellwordlist_p.h" - - QT_BEGIN_NAMESPACE -diff --git a/config.tests/hunspell/main.cpp b/config.tests/hunspell/main.cpp -index 76f2cb3df..91906bc48 100644 ---- a/config.tests/hunspell/main.cpp -+++ b/config.tests/hunspell/main.cpp -@@ -1,7 +1,7 @@ - // Copyright (C) 2020 The Qt Company Ltd. - // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only - --#include -+#include - - int main(int argc, char** argv) - { -diff --git a/src/plugins/hunspell/module/hunspellwordlist.cpp b/src/plugins/hunspell/module/hunspellwordlist.cpp -index ec55d4d3b..846af4726 100644 ---- a/src/plugins/hunspell/module/hunspellwordlist.cpp -+++ b/src/plugins/hunspell/module/hunspellwordlist.cpp -@@ -3,7 +3,7 @@ - - #include "hunspellwordlist_p.h" - #include --#include -+#include - - QT_BEGIN_NAMESPACE - namespace QtVirtualKeyboard { diff --git a/vcpkg/ports/qtvirtualkeyboard/portfile.cmake b/vcpkg/ports/qtvirtualkeyboard/portfile.cmake deleted file mode 100644 index 555acfb953..0000000000 --- a/vcpkg/ports/qtvirtualkeyboard/portfile.cmake +++ /dev/null @@ -1,31 +0,0 @@ -set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") -include("${SCRIPT_PATH}/qt_install_submodule.cmake") - -set(${PORT}_PATCHES hunspell_include_path_fix.patch) - -if("hunspell" IN_LIST FEATURES) - list(APPEND FEATURE_OPTIONS -DINPUT_vkb_hunspell:STRING=system) -else() - list(APPEND FEATURE_OPTIONS -DINPUT_vkb_hunspell=no) -endif() - -# -# To use t9write, overlay this port with the following line changed to: -# list(APPEND FEATURE_OPTIONS -DINPUT_vkb_handwriting=t9write) -# and add t9write as a dependency. -# -list(APPEND FEATURE_OPTIONS - -DINPUT_vkb_handwriting=no - -DCMAKE_DISABLE_FIND_PACKAGE_CerenceHwrAlphabetic:BOOL=ON - -DCMAKE_DISABLE_FIND_PACKAGE_CerenceHwrCjk:BOOL=ON - -DCMAKE_DISABLE_FIND_PACKAGE_CerenceXt9:BOOL=ON - -DCMAKE_DISABLE_FIND_PACKAGE_MyScript:BOOL=ON -) - -qt_install_submodule(PATCHES ${${PORT}_PATCHES} - CONFIGURE_OPTIONS ${FEATURE_OPTIONS} - -DINPUT_vkb_style:STRING=default - CONFIGURE_OPTIONS_RELEASE - CONFIGURE_OPTIONS_DEBUG -DFEATURE_vkb_record_trace_input=ON - -DFEATURE_vkb_sensitive_debug=ON - ) diff --git a/vcpkg/ports/qtvirtualkeyboard/vcpkg.json b/vcpkg/ports/qtvirtualkeyboard/vcpkg.json deleted file mode 100644 index e387ddef9c..0000000000 --- a/vcpkg/ports/qtvirtualkeyboard/vcpkg.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "name": "qtvirtualkeyboard", - "version": "6.6.3", - "description": "The Qt Virtual Keyboard project provides an input framework and reference keyboard frontend for Qt 6 on Linux Desktop/X11, Windows Desktop, and Boot2Qt targets.", - "homepage": "https://www.qt.io/", - "license": null, - "dependencies": [ - { - "name": "qtbase", - "default-features": false, - "features": [ - "gui" - ] - }, - { - "name": "qtdeclarative", - "default-features": false - }, - { - "name": "qtsvg", - "default-features": false - } - ], - "default-features": [ - "default-features", - "hunspell" - ], - "features": { - "default-features": { - "description": "Platform-dependent default features" - }, - "hunspell": { - "description": "Use hunspell", - "dependencies": [ - "hunspell" - ] - } - } -} diff --git a/vcpkg/ports/qtwayland/portfile.cmake b/vcpkg/ports/qtwayland/portfile.cmake deleted file mode 100644 index 54d9d93900..0000000000 --- a/vcpkg/ports/qtwayland/portfile.cmake +++ /dev/null @@ -1,25 +0,0 @@ -set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") -include("${SCRIPT_PATH}/qt_install_submodule.cmake") - -message(WARNING "qtwayland requires libwayland-dev from your system package manager. You can install it with -sudo apt install libwayland-dev -on Ubuntu systems.") - -set(${PORT}_PATCHES) - -set(TOOL_NAMES qtwaylandscanner) - - -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS -FEATURES - "qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Quick -INVERTED_FEATURES - "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick -) - -qt_install_submodule(PATCHES ${${PORT}_PATCHES} - TOOL_NAMES ${TOOL_NAMES} - CONFIGURE_OPTIONS ${FEATURE_OPTIONS} - CONFIGURE_OPTIONS_RELEASE - CONFIGURE_OPTIONS_DEBUG - ) diff --git a/vcpkg/ports/qtwayland/vcpkg.json b/vcpkg/ports/qtwayland/vcpkg.json deleted file mode 100644 index 476862e900..0000000000 --- a/vcpkg/ports/qtwayland/vcpkg.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "name": "qtwayland", - "version": "6.6.3", - "description": "A toolbox for making Qt based Wayland compositors", - "homepage": "https://www.qt.io/", - "license": null, - "supports": "!windows", - "dependencies": [ - { - "name": "qtbase", - "default-features": false, - "features": [ - "gui" - ] - } - ], - "features": { - "qml": { - "description": "Build QML imports", - "dependencies": [ - { - "name": "qtdeclarative", - "default-features": false - } - ] - } - } -} diff --git a/vcpkg/ports/qtwebchannel/portfile.cmake b/vcpkg/ports/qtwebchannel/portfile.cmake deleted file mode 100644 index f07e0c6e2e..0000000000 --- a/vcpkg/ports/qtwebchannel/portfile.cmake +++ /dev/null @@ -1,18 +0,0 @@ -set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") -include("${SCRIPT_PATH}/qt_install_submodule.cmake") - -set(${PORT}_PATCHES) - - -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS -FEATURES - "qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Quick -INVERTED_FEATURES - "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick -) - -qt_install_submodule(PATCHES ${${PORT}_PATCHES} - CONFIGURE_OPTIONS ${FEATURE_OPTIONS} - CONFIGURE_OPTIONS_RELEASE - CONFIGURE_OPTIONS_DEBUG - ) diff --git a/vcpkg/ports/qtwebchannel/vcpkg.json b/vcpkg/ports/qtwebchannel/vcpkg.json deleted file mode 100644 index c9cd04d6ea..0000000000 --- a/vcpkg/ports/qtwebchannel/vcpkg.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "name": "qtwebchannel", - "version": "6.6.3", - "description": "Qt WebChannel enables peer-to-peer communication between a server (QML/C++ application) and a client (HTML/JavaScript or QML application).", - "homepage": "https://www.qt.io/", - "license": null, - "dependencies": [ - { - "name": "qtbase", - "default-features": false - } - ], - "features": { - "qml": { - "description": "Build QML imports", - "dependencies": [ - { - "name": "qtdeclarative", - "default-features": false - } - ] - } - } -} diff --git a/vcpkg/ports/qtwebengine/clang-cl.patch b/vcpkg/ports/qtwebengine/clang-cl.patch deleted file mode 100644 index 03c87b84df..0000000000 --- a/vcpkg/ports/qtwebengine/clang-cl.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/src/3rdparty/gn/build/build_win.ninja.template b/src/3rdparty/gn/build/build_win.ninja.template -index 7d2704c..b14186b 100644 ---- a/src/3rdparty/gn/build/build_win.ninja.template -+++ b/src/3rdparty/gn/build/build_win.ninja.template -@@ -8,5 +8,5 @@ rule alink_thin - description = LIB $out - - rule link -- command = $ld /nologo $in /link $ldflags /PDB:$out.pdb /OUT:$out $solibs $libs -+ command = $ld /nologo $in $ldflags /PDB:$out.pdb /OUT:$out $solibs $libs - description = LINK $out -diff --git a/src/gn/CMakeLists.txt b/src/gn/CMakeLists.txt -index 0fe3e4e..1e2556f 100644 ---- a/src/gn/CMakeLists.txt -+++ b/src/gn/CMakeLists.txt -@@ -31,7 +31,7 @@ find_package(Ninja 1.7.2 REQUIRED) - - if(WIN32) - set(GN_EXECUTABLE gn.exe) -- if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND NOT MINGW) -+ if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND NOT MINGW OR MSVC) - # Use lld-link instead of clang-cl. - set(GN_LINKER ${CMAKE_LINKER}) - endif() diff --git a/vcpkg/ports/qtwebengine/portfile.cmake b/vcpkg/ports/qtwebengine/portfile.cmake deleted file mode 100644 index 332e17c990..0000000000 --- a/vcpkg/ports/qtwebengine/portfile.cmake +++ /dev/null @@ -1,126 +0,0 @@ -set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") -include("${SCRIPT_PATH}/qt_install_submodule.cmake") - -set(${PORT}_PATCHES - "clang-cl.patch" -) - -set(TOOL_NAMES gn QtWebEngineProcess qwebengine_convert_dict) - -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS -FEATURES - "proprietary-codecs" FEATURE_webengine_proprietary_codecs - "spellchecker" FEATURE_webengine_spellchecker - "geolocation" FEATURE_webengine_geolocation - "webchannel" FEATURE_webengine_webchannel - "geolocation" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Positioning - "webchannel" CMAKE_REQUIRE_FIND_PACKAGE_Qt6WebChannel -INVERTED_FEATURES - "geolocation" CMAKE_DISABLE_FIND_PACKAGE_Qt6Positioning - "webchannel" CMAKE_DISABLE_FIND_PACKAGE_Qt6WebChannel -) - -if(VCPKG_TARGET_IS_OSX AND "spellchecker" IN_LIST FEATRUES) - list(APPEND FEATURE_OPTIONS "-DFEATURE_webengine_native_spellchecker=ON") -endif() - -# webengine-extensions -# webengine-printing-and-pdf -# webengine-pepper-plugins -set(deactivated_features webengine_webrtc_pipewire) -foreach(_feat IN LISTS deactivated_features) - list(APPEND FEATURE_OPTIONS "-DFEATURE_${_feat}=OFF") -endforeach() -set(enabled_features webengine_webrtc) -foreach(_feat IN LISTS enabled_features) - list(APPEND FEATURE_OPTIONS "-DFEATURE_${_feat}=ON") -endforeach() - -if(VCPKG_TARGET_IS_LINUX) - # qt_configure_add_summary_entry(ARGS "webengine-system-lcms2") - # qt_configure_add_summary_entry(ARGS "webengine-system-libpci") - # + ALSA and PULSEAUDIO - set(system_libs re2 icu libwebp opus ffmpeg libvpx snappy glib zlib minizip libevent protobuf libxml libpng libjpeg harfbuzz freetype) - foreach(_sys_lib IN LISTS system_libs) - list(APPEND FEATURE_OPTIONS "-DFEATURE_webengine_system_${_sys_lib}=ON") - endforeach() -endif() - -vcpkg_find_acquire_program(FLEX) -vcpkg_find_acquire_program(BISON) - -#vcpkg_find_acquire_program(GN) # Qt builds its own internal version - -find_program(NODEJS NAMES node PATHS "${CURRENT_HOST_INSTALLED_DIR}/tools/node" "bin" NO_DEFAULT_PATHS) -find_program(NODEJS NAMES node) -if(NOT NODEJS) - message(FATAL_ERROR "node not found! Please install it via your system package manager!") -endif() - -get_filename_component(NODEJS_DIR "${NODEJS}" DIRECTORY ) -vcpkg_add_to_path(PREPEND "${NODEJS_DIR}") -get_filename_component(FLEX_DIR "${FLEX}" DIRECTORY ) -vcpkg_add_to_path(PREPEND "${FLEX_DIR}") -get_filename_component(BISON_DIR "${BISON}" DIRECTORY ) -vcpkg_add_to_path(PREPEND "${BISON_DIR}") - -x_vcpkg_get_python_packages(PYTHON_VERSION "3" PACKAGES html5lib OUT_PYTHON_VAR PYTHON3) - -vcpkg_add_to_path(PREPEND "${CURRENT_HOST_INSTALLED_DIR}/tools/gperf") -set(GPERF "${CURRENT_HOST_INSTALLED_DIR}/tools/gperf/gperf${VCPKG_HOST_EXECUTABLE_SUFFIX}") - -if(WIN32) # WIN32 HOST probably has win_flex and win_bison! - if(NOT EXISTS "${FLEX_DIR}/flex${VCPKG_HOST_EXECUTABLE_SUFFIX}") - file(CREATE_LINK "${FLEX}" "${FLEX_DIR}/flex${VCPKG_HOST_EXECUTABLE_SUFFIX}") - endif() - if(NOT EXISTS "${BISON_DIR}/BISON${VCPKG_HOST_EXECUTABLE_SUFFIX}") - file(CREATE_LINK "${BISON}" "${BISON_DIR}/bison${VCPKG_HOST_EXECUTABLE_SUFFIX}") - endif() -endif() - -string(LENGTH "${CURRENT_BUILDTREES_DIR}" buildtree_length) -# We know that C:/buildrees/${PORT} is to long to build Release. Debug works however. Means 24 length is too much but 23 might work. -if(buildtree_length GREATER 22 AND VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_ARCHITECTURE MATCHES "arm64") - message(WARNING "Buildtree path '${CURRENT_BUILDTREES_DIR}' is too long.\nConsider passing --x-buildtrees-root= to vcpkg!\nTrying to use '${CURRENT_BUILDTREES_DIR}/../tmp'") - set(CURRENT_BUILDTREES_DIR "${CURRENT_BUILDTREES_DIR}/../tmp") # activly avoid long path issues in CI. -> Means CI will not return logs - cmake_path(NORMAL_PATH CURRENT_BUILDTREES_DIR) - string(LENGTH "${CURRENT_BUILDTREES_DIR}" buildtree_length_new) - if(buildtree_length_new GREATER 22) - message(FATAL_ERROR "Buildtree path is too long. Build will fail! Pass --x-buildtrees-root= to vcpkg!") - endif() - file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}") -endif() - -##### qt_install_submodule -set(qt_plugindir ${QT6_DIRECTORY_PREFIX}plugins) -set(qt_qmldir ${QT6_DIRECTORY_PREFIX}qml) - -qt_download_submodule(PATCHES ${${PORT}_PATCHES}) -if(QT_UPDATE_VERSION) - return() -endif() - -qt_cmake_configure( DISABLE_PARALLEL_CONFIGURE # due to in source changes. - OPTIONS ${FEATURE_OPTIONS} - -DGPerf_EXECUTABLE=${GPERF} - -DBISON_EXECUTABLE=${BISON} - -DFLEX_EXECUTABLE=${FLEX} - -DNodejs_EXECUTABLE=${NODEJS} - -DPython3_EXECUTABLE=${PYTHON3} - -DQT_FEATURE_webengine_jumbo_build=0 - OPTIONS_DEBUG ${_qis_CONFIGURE_OPTIONS_DEBUG} - OPTIONS_RELEASE ${_qis_CONFIGURE_OPTIONS_RELEASE}) - -vcpkg_cmake_install(ADD_BIN_TO_PATH) - -qt_fixup_and_cleanup(TOOL_NAMES ${TOOL_NAMES}) - -if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_BUILD_TYPE) - file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/debug/") - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/bin/QtWebEngineProcessd.exe" "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/debug/QtWebEngineProcessd.exe") - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/bin/QtWebEngineProcessd.pdb" "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/debug/QtWebEngineProcessd.pdb") -endif() - -qt_install_copyright("${SOURCE_PATH}") - -##### qt_install_submodule diff --git a/vcpkg/ports/qtwebengine/vcpkg.json b/vcpkg/ports/qtwebengine/vcpkg.json deleted file mode 100644 index e0dcafa20f..0000000000 --- a/vcpkg/ports/qtwebengine/vcpkg.json +++ /dev/null @@ -1,158 +0,0 @@ -{ - "$comment": "x86-windows is not within the upstream support matrix of Qt6", - "name": "qtwebengine", - "version": "6.6.3", - "description": "Qt WebEngine provides functionality for rendering regions of dynamic web content.", - "homepage": "https://www.qt.io/", - "license": null, - "supports": "!static & !((x86 | arm) & windows)", - "dependencies": [ - { - "name": "ffmpeg", - "platform": "!windows" - }, - { - "name": "fontconfig", - "platform": "!windows" - }, - { - "name": "freetype", - "platform": "!windows" - }, - { - "name": "glib", - "platform": "!windows" - }, - { - "name": "gperf", - "host": true - }, - { - "name": "harfbuzz", - "platform": "!windows" - }, - { - "name": "icu", - "platform": "!windows" - }, - { - "name": "libevent", - "platform": "!windows" - }, - { - "name": "libjpeg-turbo", - "platform": "!windows" - }, - { - "name": "libpng", - "platform": "!windows" - }, - { - "name": "libvpx", - "platform": "!windows" - }, - { - "name": "libwebp", - "platform": "!windows" - }, - { - "name": "libxml2", - "default-features": false, - "features": [ - "icu" - ], - "platform": "!windows" - }, - { - "name": "minizip", - "platform": "!windows" - }, - "opengl", - { - "name": "opus", - "platform": "!windows" - }, - { - "name": "protobuf", - "platform": "!windows" - }, - { - "name": "qtbase", - "default-features": false, - "features": [ - "gui", - "network", - "widgets" - ] - }, - { - "name": "qtdeclarative", - "default-features": false - }, - { - "name": "qttools", - "default-features": false - }, - { - "$comment": "Requires GN host tool build by the port itself! (special version check)", - "name": "qtwebengine", - "host": true, - "default-features": false - }, - { - "name": "re2", - "platform": "!windows" - }, - { - "name": "snappy", - "platform": "!windows" - }, - { - "name": "vcpkg-get-python-packages", - "host": true - }, - { - "name": "vcpkg-tool-nodejs", - "host": true - }, - { - "name": "zlib", - "platform": "!windows" - } - ], - "default-features": [ - "default-features" - ], - "features": { - "default-features": { - "description": "Platform-dependent default features" - }, - "geolocation": { - "description": "Build with Geolocation", - "dependencies": [ - { - "name": "qtlocation", - "default-features": false - } - ] - }, - "proprietary-codecs": { - "description": "Enables the use of proprietary codecs such as h.264/h.265 and MP3." - }, - "spellchecker": { - "description": "Provides a spellchecker" - }, - "webchannel": { - "description": "Provides QtWebChannel integration", - "dependencies": [ - { - "name": "qtwebchannel", - "default-features": false, - "features": [ - "qml" - ] - } - ] - } - } -} diff --git a/vcpkg/ports/qtwebsockets/portfile.cmake b/vcpkg/ports/qtwebsockets/portfile.cmake deleted file mode 100644 index f07e0c6e2e..0000000000 --- a/vcpkg/ports/qtwebsockets/portfile.cmake +++ /dev/null @@ -1,18 +0,0 @@ -set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") -include("${SCRIPT_PATH}/qt_install_submodule.cmake") - -set(${PORT}_PATCHES) - - -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS -FEATURES - "qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Quick -INVERTED_FEATURES - "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick -) - -qt_install_submodule(PATCHES ${${PORT}_PATCHES} - CONFIGURE_OPTIONS ${FEATURE_OPTIONS} - CONFIGURE_OPTIONS_RELEASE - CONFIGURE_OPTIONS_DEBUG - ) diff --git a/vcpkg/ports/qtwebsockets/vcpkg.json b/vcpkg/ports/qtwebsockets/vcpkg.json deleted file mode 100644 index c56c62754f..0000000000 --- a/vcpkg/ports/qtwebsockets/vcpkg.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "name": "qtwebsockets", - "version": "6.6.3", - "description": "The Qt WebSockets module provides C++ and QML interfaces that enable Qt applications to act as a server that can process WebSocket requests, or a client that can consume data received from the server, or both.", - "homepage": "https://www.qt.io/", - "license": null, - "dependencies": [ - { - "name": "qtbase", - "default-features": false, - "features": [ - "network" - ] - } - ], - "features": { - "qml": { - "description": "Build QML imports", - "dependencies": [ - { - "name": "qtdeclarative", - "default-features": false - } - ] - } - } -} diff --git a/vcpkg/ports/qtwebview/portfile.cmake b/vcpkg/ports/qtwebview/portfile.cmake deleted file mode 100644 index 23218658c5..0000000000 --- a/vcpkg/ports/qtwebview/portfile.cmake +++ /dev/null @@ -1,18 +0,0 @@ -set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") -include("${SCRIPT_PATH}/qt_install_submodule.cmake") - -set(${PORT}_PATCHES) - - -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS -FEATURES - "webengine" CMAKE_REQUIRE_FIND_PACKAGE_WebEngineCore -INVERTED_FEATURES - "webengine" CMAKE_DISABLE_FIND_PACKAGE_WebEngineCore -) - -qt_install_submodule(PATCHES ${${PORT}_PATCHES} - CONFIGURE_OPTIONS ${FEATURE_OPTIONS} - CONFIGURE_OPTIONS_RELEASE - CONFIGURE_OPTIONS_DEBUG - ) diff --git a/vcpkg/ports/qtwebview/vcpkg.json b/vcpkg/ports/qtwebview/vcpkg.json deleted file mode 100644 index 5fd904d123..0000000000 --- a/vcpkg/ports/qtwebview/vcpkg.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "name": "qtwebview", - "version": "6.6.3", - "description": "Qt WebView provides a way to display web content in a QML application without necessarily including a full web browser stack by using native APIs where it makes sense.", - "homepage": "https://www.qt.io/", - "license": null, - "dependencies": [ - { - "name": "qtbase", - "default-features": false, - "features": [ - "gui" - ] - }, - { - "name": "qtdeclarative", - "default-features": false - } - ], - "features": { - "webengine": { - "description": "Build with Webengine", - "supports": "!static", - "dependencies": [ - { - "name": "qtwebengine", - "default-features": false - } - ] - } - } -}