diff --git a/vcpkg/ports/gstreamer/base-must-be-enabled.patch b/vcpkg/ports/gstreamer/base-must-be-enabled.patch deleted file mode 100644 index 5a4d3abeb3..0000000000 --- a/vcpkg/ports/gstreamer/base-must-be-enabled.patch +++ /dev/null @@ -1,13 +0,0 @@ -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 deleted file mode 100644 index 2be3d28aee..0000000000 --- a/vcpkg/ports/gstreamer/fix-bz2-windows-debug-dependency.patch +++ /dev/null @@ -1,26 +0,0 @@ -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 deleted file mode 100644 index c3eeaf1e07..0000000000 --- a/vcpkg/ports/gstreamer/fix-clang-cl-bad.patch +++ /dev/null @@ -1,111 +0,0 @@ -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 deleted file mode 100644 index 227a7e05ba..0000000000 --- a/vcpkg/ports/gstreamer/fix-clang-cl-base.patch +++ /dev/null @@ -1,13 +0,0 @@ -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 deleted file mode 100644 index 10be6030a4..0000000000 --- a/vcpkg/ports/gstreamer/fix-clang-cl-good.patch +++ /dev/null @@ -1,22 +0,0 @@ -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 deleted file mode 100644 index a89167b303..0000000000 --- a/vcpkg/ports/gstreamer/fix-clang-cl-gstreamer.patch +++ /dev/null @@ -1,39 +0,0 @@ -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 deleted file mode 100644 index 100b6a7b62..0000000000 --- a/vcpkg/ports/gstreamer/fix-clang-cl-ugly.patch +++ /dev/null @@ -1,13 +0,0 @@ -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 deleted file mode 100644 index ac00b9e135..0000000000 --- a/vcpkg/ports/gstreamer/fix-clang-cl.patch +++ /dev/null @@ -1,22 +0,0 @@ -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 deleted file mode 100644 index 971d802959..0000000000 --- a/vcpkg/ports/gstreamer/gstreamer-disable-no-unused.patch +++ /dev/null @@ -1,14 +0,0 @@ -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 deleted file mode 100644 index caf1280217..0000000000 --- a/vcpkg/ports/gstreamer/no-downloads.patch +++ /dev/null @@ -1,17 +0,0 @@ -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 deleted file mode 100644 index f8c249d961..0000000000 --- a/vcpkg/ports/gstreamer/plugin-base-disable-no-unused.patch +++ /dev/null @@ -1,26 +0,0 @@ -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 deleted file mode 100644 index f42551948c..0000000000 --- a/vcpkg/ports/gstreamer/plugins-base-x11.patch +++ /dev/null @@ -1,13 +0,0 @@ -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 deleted file mode 100644 index 86a4068c84..0000000000 --- a/vcpkg/ports/gstreamer/portfile.cmake +++ /dev/null @@ -1,420 +0,0 @@ -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 deleted file mode 100644 index 044fb926bd..0000000000 --- a/vcpkg/ports/gstreamer/remove_x264_define.patch +++ /dev/null @@ -1,18 +0,0 @@ -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 deleted file mode 100644 index ed4601d458..0000000000 --- a/vcpkg/ports/gstreamer/srtp_fix.patch +++ /dev/null @@ -1,30 +0,0 @@ -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 deleted file mode 100644 index af363911be..0000000000 --- a/vcpkg/ports/gstreamer/vcpkg.json +++ /dev/null @@ -1,841 +0,0 @@ -{ - "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/libxml2/fix_ios_compilation.patch b/vcpkg/ports/libxml2/fix_ios_compilation.patch index c38896fd42..16a2423f5f 100644 --- a/vcpkg/ports/libxml2/fix_ios_compilation.patch +++ b/vcpkg/ports/libxml2/fix_ios_compilation.patch @@ -7,7 +7,7 @@ index 0a279c8..8e771ee 100644 check_function_exists(fpclass HAVE_FPCLASS) check_function_exists(ftime HAVE_FTIME) - check_function_exists(getentropy HAVE_GETENTROPY) -+ check_symbol_exists(getentropy "sys/random.h" HAVE_DECL_GETENTROPY) ++ check_symbol_exists(getentropy "sys/random.h" HAVE_GETENTROPY) check_function_exists(gettimeofday HAVE_GETTIMEOFDAY) check_library_exists(history append_history "" HAVE_LIBHISTORY) check_library_exists(readline readline "" HAVE_LIBREADLINE) @@ -23,15 +23,6 @@ diff --git a/config.h.cmake.in b/config.h.cmake.in index 2f4aeba..79f1cdb 100644 --- a/config.h.cmake.in +++ b/config.h.cmake.in -@@ -23,7 +23,7 @@ - #cmakedefine HAVE_FTIME 1 - - /* Define to 1 if you have the `getentropy' function. */ --#cmakedefine HAVE_GETENTROPY 1 -+#cmakedefine HAVE_DECL_GETENTROPY 1 - - /* Define to 1 if you have the `gettimeofday' function. */ - #cmakedefine HAVE_GETTIMEOFDAY 1 @@ -69,9 +69,6 @@ /* Define to 1 if you have the header file. */ #cmakedefine HAVE_SYS_MMAN_H 1 @@ -74,7 +65,7 @@ index 49e1c6b..46bb4d4 100644 #include #include -#elif defined(HAVE_GETENTROPY) -+#elif HAVE_DECL_GETENTROPY ++#elif HAVE_GETENTROPY #ifdef HAVE_UNISTD_H #include #endif @@ -90,30 +81,7 @@ index 49e1c6b..46bb4d4 100644 abort(); } -#elif defined(HAVE_GETENTROPY) -+#elif HAVE_DECL_GETENTROPY ++#elif HAVE_GETENTROPY while (1) { if (getentropy(globalRngState, sizeof(globalRngState)) == 0) break; -diff --git a/meson.build b/meson.build -index b6939c7..bbee96d 100644 ---- a/meson.build -+++ b/meson.build -@@ -314,13 +314,15 @@ xml_check_functions = [ - ['gettimeofday', 'sys/time.h'], - ['ftime', 'sys/timeb.h'], - ['stat', 'sys/stat.h'], -- ['mmap', 'sys/mman.h'], -- ['munmap', 'sys/mman.h'], -+ ['getentropy', 'sys/random.h', 'HAVE_DECL_GETENTROPY'], -+ ['mmap', 'sys/mman.h', 'HAVE_MMAP'], -+ ['munmap', 'sys/mman.h', 'HAVE_MUNMAP'], -+ - ] - - foreach function : xml_check_functions - if cc.has_header_symbol(function[1], function[0]) -- config_h.set10('HAVE_' + function[0].to_upper(), true) -+ config_h.set10(function[2], true) - endif - endforeach - diff --git a/vcpkg/ports/qtmultimedia/ffmpeg-compile-def.patch b/vcpkg/ports/qtmultimedia/ffmpeg-compile-def.patch deleted file mode 100644 index 473eab8328..0000000000 --- a/vcpkg/ports/qtmultimedia/ffmpeg-compile-def.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/plugins/multimedia/ffmpeg/CMakeLists.txt b/src/plugins/multimedia/ffmpeg/CMakeLists.txt -index 77c459a..af5229e 100644 ---- a/src/plugins/multimedia/ffmpeg/CMakeLists.txt -+++ b/src/plugins/multimedia/ffmpeg/CMakeLists.txt -@@ -273,7 +273,7 @@ if(BUILD_SHARED_LIBS) - else() - foreach(ffmpeg_lib IN LISTS ffmpeg_libs) - qt_internal_add_target_include_dirs(QFFmpegMediaPlugin ${ffmpeg_lib}) -- target_include_directories(QFFmpegMediaPlugin PRIVATE -+ target_compile_definitions(QFFmpegMediaPlugin PRIVATE - "$") - endforeach() - endif() diff --git a/vcpkg/ports/qtmultimedia/fix_avfoundation_target.patch b/vcpkg/ports/qtmultimedia/fix_avfoundation_target.patch deleted file mode 100644 index 83c457821b..0000000000 --- a/vcpkg/ports/qtmultimedia/fix_avfoundation_target.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/plugins/multimedia/darwin/CMakeLists.txt b/src/plugins/multimedia/darwin/CMakeLists.txt -index a1a0cb1..242ceac 100644 ---- a/src/plugins/multimedia/darwin/CMakeLists.txt -+++ b/src/plugins/multimedia/darwin/CMakeLists.txt -@@ -34,7 +34,7 @@ qt_internal_add_plugin(QDarwinMediaPlugin - ${FWMetal} - ${FWQuartzCore} - ${FWAudioToolbox} -- AVFoundation::AVFoundation -+ ${FWAVFoundation} - ) - - qt_internal_extend_target(QDarwinMediaPlugin CONDITION NOT TVOS diff --git a/vcpkg/ports/qtmultimedia/portfile.cmake b/vcpkg/ports/qtmultimedia/portfile.cmake deleted file mode 100644 index d601786534..0000000000 --- a/vcpkg/ports/qtmultimedia/portfile.cmake +++ /dev/null @@ -1,74 +0,0 @@ -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 - remove-static-ssl-stub.patch - private_libs.patch - ffmpeg-compile-def.patch -) - -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS -FEATURES - "qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Quick - "widgets" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Widgets -INVERTED_FEATURES - "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick - "widgets" CMAKE_DISABLE_FIND_PACKAGE_Qt6Widgets - "gstreamer" CMAKE_DISABLE_FIND_PACKAGE_GStreamer - "ffmpeg" CMAKE_DISABLE_FIND_PACKAGE_FFmpeg - # Features not yet added in the manifest: - "vaapi" CMAKE_DISABLE_FIND_PACKAGE_VAAPI # not in vpckg -) - -set(unused "") -if("gstreamer" IN_LIST FEATURES) - list(APPEND FEATURE_OPTIONS "-DINPUT_gstreamer='yes'") -else() - list(APPEND FEATURE_OPTIONS "-DINPUT_gstreamer='no'") - list(APPEND unused INPUT_gstreamer_gl INPUT_gstreamer_photography) -endif() -list(APPEND FEATURE_OPTIONS "-DINPUT_gstreamer_gl='no'") -list(APPEND FEATURE_OPTIONS "-DINPUT_gstreamer_photography='no'") - -if(VCPKG_TARGET_IS_WINDOWS) - list(APPEND FEATURE_OPTIONS "-DFEATURE_wmf=ON") -else() - list(APPEND FEATURE_OPTIONS "-DFEATURE_wmf=OFF") -endif() - -if("ffmpeg" IN_LIST FEATURES) - # Note: Requires pulsadio on linux and wmfsdk on windows - list(APPEND FEATURE_OPTIONS "-DINPUT_ffmpeg='yes'") - if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_ANDROID) - list(APPEND FEATURE_OPTIONS "-DINPUT_pulseaudio='no'") - else() - list(APPEND FEATURE_OPTIONS "-DINPUT_pulseaudio='yes'") - endif() -else() - list(APPEND FEATURE_OPTIONS "-DINPUT_ffmpeg='no'") - list(APPEND FEATURE_OPTIONS "-DINPUT_pulseaudio='no'") -endif() - -# alsa is not ready -if(NOT "ffmpeg" IN_LIST FEATURES AND NOT "gstreamer" IN_LIST FEATURES AND VCPKG_TARGET_IS_LINUX) - #list(APPEND FEATURE_OPTIONS "-DFEATURE_alsa=ON") # alsa is experimental so don't activate it (also missing the dep on it.) - message(FATAL_ERROR "You need to activate at least one backend.") -else() - list(APPEND FEATURE_OPTIONS "-DFEATURE_alsa=OFF") -endif() - -qt_install_submodule(PATCHES ${${PORT}_PATCHES} - CONFIGURE_OPTIONS - --trace-expand - ${FEATURE_OPTIONS} - -DCMAKE_FIND_PACKAGE_TARGETS_GLOBAL=ON - CONFIGURE_OPTIONS_RELEASE - CONFIGURE_OPTIONS_DEBUG - CONFIGURE_OPTIONS_MAYBE_UNUSED ${unused} - ) - -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\;\;\;" IGNORE_UNCHANGED) -endif() diff --git a/vcpkg/ports/qtmultimedia/private_libs.patch b/vcpkg/ports/qtmultimedia/private_libs.patch deleted file mode 100644 index 3ffc253f4c..0000000000 --- a/vcpkg/ports/qtmultimedia/private_libs.patch +++ /dev/null @@ -1,19 +0,0 @@ -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 deleted file mode 100644 index 1bd76b28c2..0000000000 --- a/vcpkg/ports/qtmultimedia/remove-static-ssl-stub.patch +++ /dev/null @@ -1,26 +0,0 @@ -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 deleted file mode 100644 index 1fc348de64..0000000000 --- a/vcpkg/ports/qtmultimedia/static_find_modules.patch +++ /dev/null @@ -1,82 +0,0 @@ -diff --git a/cmake/FindFFmpeg.cmake b/cmake/FindFFmpeg.cmake -index 47d8769..46a5c9b 100644 ---- a/cmake/FindFFmpeg.cmake -+++ b/cmake/FindFFmpeg.cmake -@@ -215,7 +215,7 @@ foreach (_component ${FFmpeg_FIND_COMPONENTS}) - find_component(${_component} "lib${library}" ${library} "lib${library}/${library}.h") - - if (${_component}_FOUND) -- list(APPEND FFMPEG_LIBRARIES ${${_component}_LIBRARY_NAME}) -+ list(APPEND FFMPEG_LIBRARIES ${${_component}_LIBRARY}) - list(APPEND FFMPEG_DEFINITIONS ${${_component}_DEFINITIONS}) - list(APPEND FFMPEG_INCLUDE_DIRS ${${_component}_INCLUDE_DIR}) - list(APPEND FFMPEG_LIBRARY_DIRS ${${_component}_LIBRARY_DIR}) -@@ -306,18 +306,19 @@ endfunction() - string(TOLOWER ${_component} _lowerComponent) - if (NOT TARGET FFmpeg::${_lowerComponent}) -- add_library(FFmpeg::${_lowerComponent} INTERFACE IMPORTED) -+ add_library(FFmpeg::${_lowerComponent} UNKNOWN IMPORTED) - set_target_properties(FFmpeg::${_lowerComponent} PROPERTIES - INTERFACE_COMPILE_OPTIONS "${${_component}_DEFINITIONS}" - INTERFACE_INCLUDE_DIRECTORIES ${${_component}_INCLUDE_DIR} -- INTERFACE_LINK_LIBRARIES "${${_component}_LIBRARY_NAME}" -- INTERFACE_LINK_DIRECTORIES "${${_component}_LIBRARY_DIR}" -+ IMPORTED_LOCATION "${${_component}_LIBRARY}" - ) - - __ffmpeg_internal_set_dependencies(${_component}) -- target_link_libraries(FFmpeg::${_lowerComponent} INTERFACE "${${_component}_LIBRARY_NAME}") -+ 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 () -@@ -361,14 +364,18 @@ if (shared_libs_desired AND NOT FFMPEG_SHARED_COMPONENTS) - endif() - - if (NOT TARGET FFmpeg::FFmpeg) -- add_library(FFmpeg INTERFACE) -+ add_library(FFmpeg INTERFACE IMPORTED) - set_target_properties(FFmpeg PROPERTIES - INTERFACE_COMPILE_OPTIONS "${FFMPEG_DEFINITIONS}" - INTERFACE_INCLUDE_DIRECTORIES "${FFMPEG_INCLUDE_DIRS}" -- INTERFACE_LINK_LIBRARIES "${FFMPEG_LIBRARIES}" - INTERFACE_LINK_DIRECTORIES "${FFMPEG_LIBRARY_DIRS}" - ) -+ target_link_libraries(FFmpeg INTERFACE ${FFMPEG_LIBRARIES}) -- add_library(FFmpeg::FFmpeg ALIAS FFmpeg) -+ if(WIN32) -+ target_link_libraries(FFmpeg INTERFACE "Bcrypt.lib") -+ endif() -+ add_library(FFmpeg::FFmpeg INTERFACE IMPORTED) -+ target_link_libraries(FFmpeg::FFmpeg INTERFACE FFmpeg) - endif() - - # Compile the list of required vars -diff --git a/cmake/FindGObject.cmake b/cmake/FindGObject.cmake -index 19a8a67..09e95d1 100644 ---- a/cmake/FindGObject.cmake -+++ b/cmake/FindGObject.cmake -@@ -13,8 +13,8 @@ - # ``GObject::GObject`` - # The gobject-2.0 library - --include(CMakeFindDependencyMacro) --find_dependency(GLIB2) -+find_package(GLIB2) -+find_package(libffi) - qt_internal_disable_find_package_global_promotion(GLIB2::GLIB2) - - if(NOT TARGET GObject::GObject) -@@ -40,6 +40,7 @@ if(NOT TARGET GObject::GObject) - target_link_libraries(GObject::GObject INTERFACE - ${GObject_LIBRARY} - GLIB2::GLIB2 -+ libffi - ) - endif() - include(FindPackageHandleStandardArgs) diff --git a/vcpkg/ports/qtmultimedia/vcpkg.json b/vcpkg/ports/qtmultimedia/vcpkg.json deleted file mode 100644 index 220390d08a..0000000000 --- a/vcpkg/ports/qtmultimedia/vcpkg.json +++ /dev/null @@ -1,86 +0,0 @@ -{ - "name": "qtmultimedia", - "version": "6.8.1", - "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, - "dependencies": [ - { - "name": "qtbase", - "default-features": false, - "features": [ - "concurrent", - "gui", - "network" - ] - }, - { - "name": "qtshadertools", - "default-features": false - } - ], - "default-features": [ - "widgets" - ], - "features": { - "ffmpeg": { - "description": "Build with ffmpeg", - "dependencies": [ - { - "name": "ffmpeg", - "default-features": false, - "features": [ - "avcodec", - "avdevice", - "avformat", - "swresample", - "swscale" - ] - }, - { - "name": "pulseaudio", - "platform": "linux" - }, - { - "name": "qtdeclarative", - "default-features": false - } - ] - }, - "gstreamer": { - "description": "Build with gstreamer", - "supports": "linux", - "dependencies": [ - "egl", - { - "name": "gstreamer", - "default-features": false, - "features": [ - "plugins-base" - ] - } - ] - }, - "qml": { - "description": "Build QML imports", - "dependencies": [ - { - "name": "qtdeclarative", - "default-features": false - } - ] - }, - "widgets": { - "description": "Build Multimedia Widgets", - "dependencies": [ - { - "name": "qtbase", - "default-features": false, - "features": [ - "widgets" - ] - } - ] - } - } -}