mirror of
https://github.com/microsoft/vcpkg.git
synced 2026-01-18 01:11:23 +01:00
[gstreamer,libde265,libmodplug,wildmidi] Revise gstreamer features, fix pkgconfig (#45134)
This commit is contained in:
Kai Pastor
12
ports/gstreamer/duplicate-unused.diff
Normal file
12
ports/gstreamer/duplicate-unused.diff
Normal file
@@ -0,0 +1,12 @@
|
||||
diff --git a/subprojects/gst-plugins-bad/sys/wasapi/gstwasapiutil.c b/subprojects/gst-plugins-bad/sys/wasapi/gstwasapiutil.c
|
||||
index 3fd15a0..232ac14 100644
|
||||
--- a/subprojects/gst-plugins-bad/sys/wasapi/gstwasapiutil.c
|
||||
+++ b/subprojects/gst-plugins-bad/sys/wasapi/gstwasapiutil.c
|
||||
@@ -39,6 +39,7 @@ GST_DEBUG_CATEGORY_EXTERN (gst_wasapi_debug);
|
||||
/* __uuidof is only available in C++, so we hard-code the GUID values for all
|
||||
* these. This is ok because these are ABI. MSYS2 provides these in C. */
|
||||
#ifndef HAVE_AUDCLNT_GUIDS
|
||||
+static
|
||||
const CLSID CLSID_MMDeviceEnumerator = { 0xbcde0395, 0xe52f, 0x467c,
|
||||
{0x8e, 0x3d, 0xc4, 0x57, 0x92, 0x91, 0x69, 0x2e}
|
||||
};
|
||||
@@ -1,84 +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/meson.build b/subprojects/gst-plugins-bad/meson.build
|
||||
index 6707dce..b8c6018 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 ff557be..d5bf0db 100644
|
||||
--- a/subprojects/gst-plugins-bad/sys/d3d11/meson.build
|
||||
+++ b/subprojects/gst-plugins-bad/sys/d3d11/meson.build
|
||||
@@ -118,7 +118,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/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 51bf953..e30e138 100644
|
||||
--- a/subprojects/gst-plugins-bad/sys/msdk/meson.build
|
||||
+++ b/subprojects/gst-plugins-bad/sys/msdk/meson.build
|
||||
@@ -175,12 +175,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'), allow_fallback: true)
|
||||
@@ -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
|
||||
@@ -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')
|
||||
@@ -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
|
||||
@@ -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
|
||||
@@ -1,8 +1,8 @@
|
||||
diff --git a/meson.build b/meson.build
|
||||
index 1316366ed..daeaf3cb1 100644
|
||||
index abd42b9..dcb15be 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -62,7 +62,7 @@ endif
|
||||
@@ -78,7 +78,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().
|
||||
@@ -11,7 +11,7 @@ index 1316366ed..daeaf3cb1 100644
|
||||
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'
|
||||
@@ -453,7 +453,7 @@ if building_full
|
||||
if cc.has_link_argument(link_arg)
|
||||
gstfull_link_args += link_arg
|
||||
link_deps += symbol_map
|
||||
@@ -20,3 +20,173 @@ index 1316366ed..daeaf3cb1 100644
|
||||
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/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/meson.build b/subprojects/gst-plugins-bad/meson.build
|
||||
index 541b723..6703e0c 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 ff557be..d5bf0db 100644
|
||||
--- a/subprojects/gst-plugins-bad/sys/d3d11/meson.build
|
||||
+++ b/subprojects/gst-plugins-bad/sys/d3d11/meson.build
|
||||
@@ -118,7 +118,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/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 b73370c..f3994e2 100644
|
||||
--- a/subprojects/gst-plugins-bad/sys/msdk/meson.build
|
||||
+++ b/subprojects/gst-plugins-bad/sys/msdk/meson.build
|
||||
@@ -175,12 +175,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 = gstd3d11_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'), allow_fallback: true)
|
||||
diff --git a/subprojects/gst-plugins-base/meson.build b/subprojects/gst-plugins-base/meson.build
|
||||
index c2e035f..33ce9bc 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/subprojects/gst-plugins-good/meson.build b/subprojects/gst-plugins-good/meson.build
|
||||
index e79b337..c8190b1 100644
|
||||
--- a/subprojects/gst-plugins-good/meson.build
|
||||
+++ b/subprojects/gst-plugins-good/meson.build
|
||||
@@ -40,7 +40,7 @@ static_build = get_option('default_library') == 'static'
|
||||
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
|
||||
@@ -222,7 +222,7 @@ cdata.set('HAVE_RTLD_NOLOAD', have_rtld_noload)
|
||||
# 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/subprojects/gst-plugins-ugly/meson.build b/subprojects/gst-plugins-ugly/meson.build
|
||||
index 8fa3aa2..6602fb7 100644
|
||||
--- a/subprojects/gst-plugins-ugly/meson.build
|
||||
+++ b/subprojects/gst-plugins-ugly/meson.build
|
||||
@@ -38,7 +38,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/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 dc9dbe2..b75b61b 100644
|
||||
--- a/subprojects/gstreamer/meson.build
|
||||
+++ b/subprojects/gstreamer/meson.build
|
||||
@@ -48,7 +48,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
|
||||
@@ -354,9 +354,11 @@ static __uint128_t v2 = 10;
|
||||
static __uint128_t u;
|
||||
u = v1 / v2;
|
||||
}'''
|
||||
+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
|
||||
cdata.set('HAVE_LONG_LONG', 1)
|
||||
|
||||
@@ -1,13 +0,0 @@
|
||||
diff --git a/subprojects/gstreamer/meson.build b/subprojects/gstreamer/meson.build
|
||||
index 3b2cbba..18dd8d0 100644
|
||||
--- a/subprojects/gstreamer/meson.build
|
||||
+++ b/subprojects/gstreamer/meson.build
|
||||
@@ -493,7 +493,7 @@ if cc.has_header('execinfo.h')
|
||||
endif
|
||||
|
||||
gst_debug = get_option('gst_debug')
|
||||
-if not gst_debug
|
||||
+if not gst_debug and cc.has_argument('-Wno-unused')
|
||||
if cc.get_argument_syntax() == 'msvc'
|
||||
msvc_args = cc.get_supported_arguments([
|
||||
'/wd4101', # 'identifier' : unreferenced local variable
|
||||
@@ -1,26 +0,0 @@
|
||||
diff --git a/meson.build b/meson.build
|
||||
index 3815aa3..6aeeab4 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -125,20 +125,7 @@ subprojects = [
|
||||
]
|
||||
|
||||
if get_option('build-tools-source') == 'subproject'
|
||||
- if build_system == 'windows'
|
||||
- subproject('win-flex-bison-binaries')
|
||||
- subproject('win-nasm')
|
||||
- subproject('win-pkgconfig')
|
||||
- elif build_system == 'darwin'
|
||||
- subproject('macos-bison-binary')
|
||||
- # Newer macOS provides /usr/lib/pkgconfig/libpcre2-8.pc which is broken
|
||||
- # because it says headers are in /usr/include but that directory doesn't
|
||||
- # exist. It can only be used to find the library, which only exists on
|
||||
- # newer macOS at /usr/lib/libpcre2-8.dylib, so it's also unusable.
|
||||
- #
|
||||
- # jit support requires macOS 11.0 or newer, so disable it by default
|
||||
- subproject('pcre2', default_options: ['default_library=static', 'jit=disabled'])
|
||||
- endif
|
||||
+
|
||||
endif
|
||||
|
||||
orc_option = get_option('orc')
|
||||
@@ -1,21 +0,0 @@
|
||||
diff --git a/subprojects/gst-plugins-base/meson.build b/subprojects/gst-plugins-base/meson.build
|
||||
index 2c09e7b..e51f5a8 100644
|
||||
--- a/subprojects/gst-plugins-base/meson.build
|
||||
+++ b/subprojects/gst-plugins-base/meson.build
|
||||
@@ -412,6 +412,7 @@ int32x4_t testfunc(int16_t *a, int16_t *b) {
|
||||
endif
|
||||
|
||||
# Disable compiler warnings for unused variables and args if gst debug system is disabled
|
||||
+build_system = build_machine.system()
|
||||
if gst_dep.type_name() == 'internal'
|
||||
gst_proj = subproject('gstreamer')
|
||||
gst_debug_disabled = not gst_proj.get_variable('gst_debug')
|
||||
@@ -421,7 +422,7 @@ else
|
||||
gst_debug_disabled = cc.has_header_symbol('gst/gstconfig.h', 'GST_DISABLE_GST_DEBUG', dependencies: gst_dep)
|
||||
endif
|
||||
|
||||
-if gst_debug_disabled
|
||||
+if gst_debug_disabled and build_system != 'windows'
|
||||
message('GStreamer debug system is disabled')
|
||||
if cc.get_argument_syntax() == 'msvc'
|
||||
msvc_args = cc.get_supported_arguments([
|
||||
@@ -1,9 +1,3 @@
|
||||
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
|
||||
@@ -13,23 +7,22 @@ vcpkg_from_gitlab(
|
||||
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
|
||||
no-downloads.patch
|
||||
${PATCHES}
|
||||
fix-multiple-def.patch
|
||||
x264-api-imports.diff
|
||||
duplicate-unused.diff
|
||||
)
|
||||
|
||||
vcpkg_find_acquire_program(FLEX)
|
||||
vcpkg_find_acquire_program(BISON)
|
||||
vcpkg_find_acquire_program(NASM)
|
||||
|
||||
# gstreamer/meson tends to pick host modules (e.g. libdrm),
|
||||
# so clean the search root unless explicitly set externally.
|
||||
if(VCPKG_CROSSCOMPILING AND "$ENV{PKG_CONFIG}$ENV{PKG_CONFIG_LIBDIR}" STREQUAL "")
|
||||
set(ENV{PKG_CONFIG_LIBDIR} "${CURRENT_INSTALLED_DIR}/share/pkgconfig")
|
||||
endif()
|
||||
|
||||
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+
|
||||
@@ -49,23 +42,24 @@ endif()
|
||||
# General features
|
||||
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
||||
FEATURES
|
||||
ges ges
|
||||
gpl gpl
|
||||
libav libav
|
||||
nls nls
|
||||
ges ges
|
||||
|
||||
plugins-base base
|
||||
gl-graphene gst-plugins-base:gl-graphene
|
||||
alsa gst-plugins-base:alsa
|
||||
gl gst-plugins-base:gl
|
||||
gl-graphene gst-plugins-base:gl-graphene
|
||||
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
|
||||
x11 gst-plugins-base:x11
|
||||
x11 gst-plugins-base:xshm
|
||||
|
||||
plugins-good good
|
||||
bzip2-good gst-plugins-good:bz2
|
||||
bzip2 gst-plugins-good:bz2
|
||||
cairo gst-plugins-good:cairo
|
||||
flac gst-plugins-good:flac
|
||||
gdk-pixbuf gst-plugins-good:gdk-pixbuf
|
||||
@@ -82,8 +76,9 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
||||
plugins-bad bad
|
||||
aes gst-plugins-bad:aes
|
||||
aom gst-plugins-bad:aom
|
||||
asio gst-plugins-bad:asio
|
||||
assrender gst-plugins-bad:assrender
|
||||
bzip2-bad gst-plugins-bad:bz2
|
||||
bzip2 gst-plugins-bad:bz2
|
||||
chromaprint gst-plugins-bad:chromaprint
|
||||
closedcaption gst-plugins-bad:closedcaption
|
||||
colormanagement gst-plugins-bad:colormanagement
|
||||
@@ -93,6 +88,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
||||
faad gst-plugins-bad:faad
|
||||
fdkaac gst-plugins-bad:fdkaac
|
||||
fluidsynth gst-plugins-bad:fluidsynth
|
||||
gl gst-plugins-bad:gl
|
||||
libde265 gst-plugins-bad:libde265
|
||||
microdns gst-plugins-bad:microdns
|
||||
modplug gst-plugins-bad:modplug
|
||||
@@ -107,21 +103,33 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
||||
soundtouch gst-plugins-bad:soundtouch
|
||||
srt gst-plugins-bad:srt
|
||||
srtp gst-plugins-bad:srtp
|
||||
vulkan gst-plugins-bad:vulkan
|
||||
wayland gst-plugins-bad:wayland
|
||||
webp gst-plugins-bad:webp
|
||||
webrtc gst-plugins-bad:webrtc
|
||||
wildmidi gst-plugins-bad:wildmidi
|
||||
x11-bad gst-plugins-bad:x11
|
||||
x11 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)
|
||||
# Align with dependencies of feature gl.
|
||||
if(NOT "gl" IN_LIST FEATURES)
|
||||
set(PLUGIN_BASE_GL_API "")
|
||||
set(PLUGIN_BASE_WINDOW_SYSTEM "")
|
||||
set(PLUGIN_BASE_GL_PLATFORM "")
|
||||
elseif(VCPKG_TARGET_IS_ANDROID)
|
||||
set(PLUGIN_BASE_GL_API gles2)
|
||||
set(PLUGIN_BASE_WINDOW_SYSTEM android,egl)
|
||||
set(PLUGIN_BASE_GL_PLATFORM egl)
|
||||
elseif(VCPKG_TARGET_IS_WINDOWS)
|
||||
set(PLUGIN_BASE_GL_API opengl)
|
||||
set(PLUGIN_BASE_WINDOW_SYSTEM win32)
|
||||
set(PLUGIN_BASE_GL_PLATFORM wgl)
|
||||
else()
|
||||
set(PLUGIN_BASE_GL_API opengl)
|
||||
set(PLUGIN_BASE_WINDOW_SYSTEM auto)
|
||||
set(PLUGIN_BASE_GL_PLATFORM auto)
|
||||
endif()
|
||||
@@ -151,7 +159,9 @@ vcpkg_configure_meson(
|
||||
SOURCE_PATH "${SOURCE_PATH}"
|
||||
OPTIONS
|
||||
${FEATURE_OPTIONS}
|
||||
|
||||
# General options
|
||||
-Dbuild-tools-source=system
|
||||
-Dpython=disabled
|
||||
-Dlibnice=disabled
|
||||
-Ddevtools=disabled
|
||||
@@ -180,6 +190,7 @@ vcpkg_configure_meson(
|
||||
-Dgstreamer:gst_debug=true
|
||||
-Dgstreamer:ptp-helper=disabled # needs rustc toolchain setup
|
||||
# gst-plugins-base
|
||||
-Dgst-plugins-base:gl_api=${PLUGIN_BASE_GL_API}
|
||||
-Dgst-plugins-base:gl_winsys=${PLUGIN_BASE_WINDOW_SYSTEM}
|
||||
-Dgst-plugins-base:gl_platform=${PLUGIN_BASE_GL_PLATFORM}
|
||||
-Dgst-plugins-base:cdparanoia=disabled
|
||||
@@ -200,7 +211,7 @@ vcpkg_configure_meson(
|
||||
-Dgst-plugins-good:oss4=disabled
|
||||
-Dgst-plugins-good:osxaudio=auto
|
||||
-Dgst-plugins-good:osxvideo=auto
|
||||
-Dgst-plugins-good:pulse=auto
|
||||
-Dgst-plugins-good:pulse=disabled # Port pulseaudio depends on gstreamer
|
||||
-Dgst-plugins-good:qt5=disabled
|
||||
-Dgst-plugins-good:shout2=disabled
|
||||
#-Dgst-plugins-good:soup=disabled
|
||||
@@ -271,7 +282,6 @@ vcpkg_configure_meson(
|
||||
-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
|
||||
@@ -294,6 +304,7 @@ vcpkg_configure_meson(
|
||||
nasm='${NASM}'
|
||||
glib-genmarshal='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-genmarshal'
|
||||
glib-mkenums='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-mkenums'
|
||||
glslc='${CURRENT_HOST_INSTALLED_DIR}/tools/shaderc/glslc${VCPKG_HOST_EXECUTABLE_SUFFIX}'
|
||||
)
|
||||
|
||||
vcpkg_install_meson()
|
||||
@@ -303,50 +314,50 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/KHR"
|
||||
"${CURRENT_PACKAGES_DIR}/include/GL"
|
||||
)
|
||||
|
||||
if("plugins-base" IN_LIST FEATURES)
|
||||
if("gl" 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)
|
||||
if(NOT VCPKG_LIBRARY_LINKAGE STREQUAL "static") # AND tools
|
||||
list(APPEND GST_BIN_TOOLS
|
||||
gst-device-monitor-1.0
|
||||
gst-discoverer-1.0
|
||||
gst-play-1.0
|
||||
gst-inspect-1.0
|
||||
gst-launch-1.0
|
||||
gst-stats-1.0
|
||||
gst-typefind-1.0
|
||||
)
|
||||
list(APPEND GST_LIBEXEC_TOOLS
|
||||
gst-completion-helper
|
||||
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()
|
||||
endif()
|
||||
|
||||
if("plugins-bad" IN_LIST FEATURES)
|
||||
list(APPEND GST_BIN_TOOLS
|
||||
gst-transcoder-1.0
|
||||
)
|
||||
|
||||
if(GST_BIN_TOOLS)
|
||||
vcpkg_copy_tools(TOOL_NAMES ${GST_BIN_TOOLS} AUTO_CLEAN)
|
||||
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
|
||||
)
|
||||
if(GST_LIBEXEC_TOOLS)
|
||||
vcpkg_copy_tools(TOOL_NAMES ${GST_LIBEXEC_TOOLS} SEARCH_DIR "${CURRENT_PACKAGES_DIR}/libexec/gstreamer-1.0" AUTO_CLEAN)
|
||||
endif()
|
||||
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share"
|
||||
"${CURRENT_PACKAGES_DIR}/debug/libexec"
|
||||
|
||||
@@ -1,31 +0,0 @@
|
||||
diff --git a/subprojects/gst-plugins-bad/ext/srtp/meson.build b/subprojects/gst-plugins-bad/ext/srtp/meson.build
|
||||
index d15d58c..0a3b1a2 100644
|
||||
--- a/subprojects/gst-plugins-bad/ext/srtp/meson.build
|
||||
+++ b/subprojects/gst-plugins-bad/ext/srtp/meson.build
|
||||
@@ -6,6 +6,8 @@ srtp_sources = [
|
||||
'gstsrtpenc.c',
|
||||
]
|
||||
|
||||
+gst_plugins_install_dir = join_paths(get_option('libdir'), 'gstreamer-1.0')
|
||||
+
|
||||
srtp_cargs = []
|
||||
srtp_option = get_option('srtp').enable_if(get_option('webrtc').enabled(), error_message: 'webrtc option is enabled')
|
||||
if srtp_option.disabled()
|
||||
@@ -13,7 +15,7 @@ if srtp_option.disabled()
|
||||
subdir_done()
|
||||
endif
|
||||
|
||||
-srtp_dep = dependency('libsrtp2', version : '>= 2.1.0', required : false, allow_fallback: true)
|
||||
+srtp_dep = dependency('libSRTP', modules: ['libSRTP::srtp2'], version : '>= 2.1.0', required : false)
|
||||
if srtp_dep.found()
|
||||
srtp_cargs += ['-DHAVE_SRTP2']
|
||||
else
|
||||
@@ -39,7 +41,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
|
||||
@@ -1,6 +1,7 @@
|
||||
{
|
||||
"name": "gstreamer",
|
||||
"version": "1.24.12",
|
||||
"port-version": 1,
|
||||
"description": "GStreamer open-source multimedia framework core library",
|
||||
"homepage": "https://gstreamer.freedesktop.org/",
|
||||
"license": "LGPL-2.0-only",
|
||||
@@ -11,10 +12,6 @@
|
||||
"name": "glib",
|
||||
"host": true
|
||||
},
|
||||
{
|
||||
"name": "opengl",
|
||||
"platform": "windows | osx"
|
||||
},
|
||||
{
|
||||
"name": "vcpkg-tool-meson",
|
||||
"host": true
|
||||
@@ -69,12 +66,9 @@
|
||||
]
|
||||
},
|
||||
"asio": {
|
||||
"description": "Enable support for the Steinberg Audio Streaming Input Output (ASIO) library (Windows only)",
|
||||
"description": "Enable support for the Steinberg Audio Streaming Input Output (ASIO) library",
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "asiosdk",
|
||||
"platform": "windows"
|
||||
},
|
||||
"asiosdk",
|
||||
{
|
||||
"name": "gstreamer",
|
||||
"default-features": false,
|
||||
@@ -97,30 +91,10 @@
|
||||
"libass"
|
||||
]
|
||||
},
|
||||
"bzip2-bad": {
|
||||
"description": "Enable bzip2 stream compression in bad plugins",
|
||||
"bzip2": {
|
||||
"description": "Enable bzip2 stream compression in 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"
|
||||
]
|
||||
}
|
||||
"bzip2"
|
||||
]
|
||||
},
|
||||
"cairo": {
|
||||
@@ -303,6 +277,26 @@
|
||||
}
|
||||
]
|
||||
},
|
||||
"gl": {
|
||||
"description": "Enable OpenGL integration library and OpenGL plugin",
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "egl",
|
||||
"platform": "android"
|
||||
},
|
||||
{
|
||||
"name": "gstreamer",
|
||||
"default-features": false,
|
||||
"features": [
|
||||
"plugins-base"
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "opengl",
|
||||
"platform": "!android"
|
||||
}
|
||||
]
|
||||
},
|
||||
"gl-graphene": {
|
||||
"description": "Use Graphene in OpenGL plugin",
|
||||
"dependencies": [
|
||||
@@ -311,7 +305,7 @@
|
||||
"name": "gstreamer",
|
||||
"default-features": false,
|
||||
"features": [
|
||||
"plugins-base"
|
||||
"gl"
|
||||
]
|
||||
}
|
||||
]
|
||||
@@ -437,7 +431,7 @@
|
||||
},
|
||||
"nvcodec": {
|
||||
"description": "Enable support for the NVCODEC encoders and decoders",
|
||||
"supports": "!osx & !ios & !android & !emscripten",
|
||||
"supports": "(windows & x64 & !uwp & !xbox) | (linux & x64) | (linux & arm64)",
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "gstreamer",
|
||||
@@ -561,6 +555,14 @@
|
||||
"features": [
|
||||
"plugins-base"
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "gstreamer",
|
||||
"default-features": false,
|
||||
"features": [
|
||||
"gl"
|
||||
],
|
||||
"platform": "osx"
|
||||
}
|
||||
]
|
||||
},
|
||||
@@ -739,6 +741,45 @@
|
||||
"libvpx"
|
||||
]
|
||||
},
|
||||
"vulkan": {
|
||||
"description": "Enable Vulkan video sink plugin",
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "gstreamer",
|
||||
"default-features": false,
|
||||
"features": [
|
||||
"plugins-bad"
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "gstreamer",
|
||||
"default-features": false,
|
||||
"features": [
|
||||
"wayland"
|
||||
],
|
||||
"platform": "!android & !ios & !osx & !windows"
|
||||
},
|
||||
{
|
||||
"name": "shaderc",
|
||||
"host": true
|
||||
},
|
||||
"vulkan"
|
||||
]
|
||||
},
|
||||
"wayland": {
|
||||
"description": "Enable Wayland plugin/library",
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "gstreamer",
|
||||
"default-features": false,
|
||||
"features": [
|
||||
"plugins-bad"
|
||||
]
|
||||
},
|
||||
"wayland",
|
||||
"wayland-protocols"
|
||||
]
|
||||
},
|
||||
"webp": {
|
||||
"description": "Enable support for WebP image format",
|
||||
"dependencies": [
|
||||
@@ -778,23 +819,8 @@
|
||||
"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",
|
||||
"x11": {
|
||||
"description": "Enable X11 support in libraries and plugins",
|
||||
"supports": "!windows",
|
||||
"dependencies": [
|
||||
{
|
||||
@@ -805,7 +831,9 @@
|
||||
]
|
||||
},
|
||||
"libx11",
|
||||
"libxext"
|
||||
"libxext",
|
||||
"libxkbcommon",
|
||||
"xcb"
|
||||
]
|
||||
},
|
||||
"x264": {
|
||||
|
||||
12
ports/gstreamer/x264-api-imports.diff
Normal file
12
ports/gstreamer/x264-api-imports.diff
Normal file
@@ -0,0 +1,12 @@
|
||||
diff --git a/subprojects/gst-plugins-ugly/ext/x264/gstx264enc.h b/subprojects/gst-plugins-ugly/ext/x264/gstx264enc.h
|
||||
index 6cbfc5c..16a564e 100644
|
||||
--- a/subprojects/gst-plugins-ugly/ext/x264/gstx264enc.h
|
||||
+++ b/subprojects/gst-plugins-ugly/ext/x264/gstx264enc.h
|
||||
@@ -36,7 +36,6 @@
|
||||
* 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 <x264.h>
|
||||
|
||||
28
ports/libde265/pkgconfig-cxx-linkage.diff
Normal file
28
ports/libde265/pkgconfig-cxx-linkage.diff
Normal file
@@ -0,0 +1,28 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 4da9921..14cef0d 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -44,13 +44,16 @@ if(CMAKE_COMPILER_IS_GNUCXX OR ${CMAKE_CXX_COMPILER_ID} MATCHES Clang)
|
||||
add_definitions(-Wall)
|
||||
endif()
|
||||
|
||||
-include(CheckCXXSymbolExists)
|
||||
-check_cxx_symbol_exists(_LIBCPP_VERSION cstdlib HAVE_LIBCPP)
|
||||
-if(HAVE_LIBCPP)
|
||||
- set(LIBS_PRIVATE "-lc++")
|
||||
-else()
|
||||
- set(LIBS_PRIVATE "-lstdc++")
|
||||
-endif()
|
||||
+set(LIBS_PRIVATE "")
|
||||
+foreach(lib IN LISTS CMAKE_CXX_IMPLICIT_LINK_LIBRARIES)
|
||||
+ if(lib IN_LIST CMAKE_C_IMPLICIT_LINK_LIBRARIES)
|
||||
+ continue()
|
||||
+ elseif(EXISTS "${lib}")
|
||||
+ string(APPEND LIBS_PRIVATE " ${CMAKE_LINK_LIBRARY_FILE_FLAG}${lib}")
|
||||
+ else()
|
||||
+ string(APPEND LIBS_PRIVATE " ${CMAKE_LINK_LIBRARY_FLAG}${lib}")
|
||||
+ endif()
|
||||
+endforeach()
|
||||
|
||||
option(BUILD_SHARED_LIBS "Build shared library" ON)
|
||||
if(NOT BUILD_SHARED_LIBS)
|
||||
@@ -6,6 +6,7 @@ vcpkg_from_github(
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
fix-interface-include.patch
|
||||
pkgconfig-cxx-linkage.diff
|
||||
)
|
||||
|
||||
vcpkg_cmake_configure(
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
{
|
||||
"name": "libde265",
|
||||
"version": "1.0.16",
|
||||
"port-version": 1,
|
||||
"description": "Open h.265 video codec implementation.",
|
||||
"homepage": "https://www.libde265.org/",
|
||||
"license": "LGPL-3.0-only",
|
||||
|
||||
@@ -1,13 +0,0 @@
|
||||
diff --git a/src/modplug.h b/src/modplug.h
|
||||
index 3ffbf9d..fd19ae5 100644
|
||||
--- a/src/modplug.h
|
||||
+++ b/src/modplug.h
|
||||
@@ -11,6 +11,8 @@
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
+#define MODPLUG_STATIC
|
||||
+
|
||||
#if defined(_WIN32) || defined(__CYGWIN__)
|
||||
# if defined(MODPLUG_BUILD) && defined(DLL_EXPORT) /* building libmodplug as a dll for windows */
|
||||
# define MODPLUG_EXPORT __declspec(dllexport)
|
||||
@@ -1,35 +1,29 @@
|
||||
set(MODPLUG_HASH 5a39f5913d07ba3e61d8d5afdba00b70165da81d)
|
||||
|
||||
if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
|
||||
set(STATIC_PATCH "001-automagically-define-modplug-static.patch")
|
||||
endif()
|
||||
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO Konstanty/libmodplug
|
||||
REF ${MODPLUG_HASH}
|
||||
REF 5a39f5913d07ba3e61d8d5afdba00b70165da81d # cf. https://github.com/Konstanty/libmodplug/issues/48
|
||||
SHA512 c43bb3190b62c3a4e3636bba121b5593bbf8e6577ca9f2aa04d90b03730ea7fb590e640cdadeb565758b92e81187bc456e693fe37f1f4deace9b9f37556e3ba1
|
||||
PATCHES
|
||||
${STATIC_PATCH}
|
||||
002-detect_sinf.patch
|
||||
003-use-static-cast-for-ctype.patch
|
||||
004-export-pkgconfig.patch
|
||||
005-fix-install-paths.patch # https://github.com/Konstanty/libmodplug/pull/61
|
||||
)
|
||||
|
||||
set(EXTRA_OPTIONS "-DCMAKE_CXX_STANDARD=11")
|
||||
|
||||
vcpkg_cmake_configure(
|
||||
SOURCE_PATH "${SOURCE_PATH}"
|
||||
OPTIONS ${EXTRA_OPTIONS}
|
||||
OPTIONS
|
||||
-DCMAKE_CXX_STANDARD=11
|
||||
)
|
||||
|
||||
vcpkg_cmake_install()
|
||||
vcpkg_copy_pdbs()
|
||||
vcpkg_fixup_pkgconfig()
|
||||
|
||||
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
|
||||
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libmodplug/modplug.h" "defined(MODPLUG_STATIC)" "1")
|
||||
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libmodplug/stdafx.h" "defined(MODPLUG_STATIC)" "1")
|
||||
endif()
|
||||
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
||||
|
||||
vcpkg_copy_pdbs()
|
||||
|
||||
vcpkg_fixup_pkgconfig()
|
||||
|
||||
file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
||||
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "libmodplug",
|
||||
"version": "0.8.9.0",
|
||||
"port-version": 14,
|
||||
"port-version": 15,
|
||||
"description": "The ModPlug mod file playing library.",
|
||||
"homepage": "https://github.com/Konstanty/libmodplug",
|
||||
"license": null,
|
||||
|
||||
@@ -4,14 +4,11 @@ vcpkg_from_github(
|
||||
REF "wildmidi-${VERSION}"
|
||||
SHA512 b7259578c1b334de13b49e27aef32ad43e41bc04f569601b765ecea789b8da536d07afdb581986b7c91de552db2a625b13d061e52a2c8c51652f3cf3d1a30000
|
||||
HEAD_REF master
|
||||
PATCHES fix-include-path.patch
|
||||
PATCHES
|
||||
fix-include-path.patch
|
||||
)
|
||||
|
||||
if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
|
||||
set(WANT_STATIC "OFF")
|
||||
else()
|
||||
set(WANT_STATIC "ON")
|
||||
endif()
|
||||
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" WANT_STATIC)
|
||||
|
||||
vcpkg_cmake_configure(
|
||||
SOURCE_PATH "${SOURCE_PATH}"
|
||||
@@ -25,6 +22,18 @@ vcpkg_cmake_config_fixup(PACKAGE_NAME WildMidi CONFIG_PATH lib/cmake/WildMidi)
|
||||
vcpkg_fixup_pkgconfig()
|
||||
vcpkg_copy_pdbs()
|
||||
|
||||
if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
|
||||
string(REPLACE "-dynamic" "" lib_suffix "-${VCPKG_LIBRARY_LINKAGE}")
|
||||
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/wildmidi.pc" " -lWildMidi" " -llibWildMidi${lib_suffix}")
|
||||
if(NOT VCPKG_BUILD_TYPE)
|
||||
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/wildmidi.pc" " -lWildMidi" " -llibWildMidi${lib_suffix}")
|
||||
endif()
|
||||
endif()
|
||||
|
||||
if(WANT_STATIC)
|
||||
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/wildmidi_lib.h" "defined(WILDMIDI_STATIC)" "1")
|
||||
endif()
|
||||
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/man")
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
{
|
||||
"name": "wildmidi",
|
||||
"version": "0.4.6",
|
||||
"port-version": 1,
|
||||
"description": "MIDI software synthesizer library.",
|
||||
"homepage": "https://github.com/Mindwerks/wildmidi",
|
||||
"license": "LGPL-3.0-only",
|
||||
|
||||
@@ -400,12 +400,6 @@ gsoap:x64-windows-static-md=skip
|
||||
gsoap:x64-windows-static=skip
|
||||
gsoap:x64-windows=skip
|
||||
gsoap:x86-windows=skip
|
||||
gstreamer:arm-neon-android=fail
|
||||
gstreamer:arm64-android=fail
|
||||
gstreamer:x64-android=fail
|
||||
# upstream issue https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1629.
|
||||
gstreamer:x64-windows-static-md=skip
|
||||
gstreamer:x64-windows-static=skip
|
||||
gul14:arm-neon-android=fail
|
||||
gul14:arm64-android=fail
|
||||
gul14:x64-android=fail
|
||||
|
||||
@@ -950,8 +950,9 @@ grppi[tbb]:arm64-uwp = cascade
|
||||
grppi[tbb]:x64-uwp = cascade
|
||||
gst-rtsp-server:arm64-uwp = cascade
|
||||
gst-rtsp-server:x64-uwp = cascade
|
||||
gstreamer[asio,gl-graphene,x265]:arm64-windows = cascade
|
||||
gstreamer[faad]:x64-linux = cascade
|
||||
gstreamer[asio](arm | !windows) = cascade
|
||||
gstreamer[dc1394](android) = cascade
|
||||
gstreamer[wayland](osx | windows) = cascade
|
||||
gtk:arm64-uwp = cascade
|
||||
gtk:arm64-windows = cascade
|
||||
gtk:x64-uwp = cascade
|
||||
@@ -2189,9 +2190,9 @@ glib-networking[openssl, gnutls] = options # You have to select exactly one ssl
|
||||
google-cloud-cpp[storagetransfer](osx) = feature-fails # See https://github.com/microsoft/vcpkg/issues/32149
|
||||
graphviz(osx) = fail # CMake configure error. See https://github.com/microsoft/vcpkg/issues/44414
|
||||
grpc[codegen](uwp) = feature-fails # linker errors. See https://github.com/microsoft/vcpkg/issues/33622
|
||||
gstreamer[chromaprint](osx) = feature-fails # see https://github.com/microsoft/vcpkg/issues/31109
|
||||
gstreamer[openal](osx) = feature-fails # see https://github.com/microsoft/vcpkg/issues/43419
|
||||
gstreamer[x11-bad](osx) = feature-fails # no x11 on macOS
|
||||
gstreamer[nvcodec](windows) = feature-fails
|
||||
gstreamer[vulkan](android | osx | windows) = feature-fails
|
||||
gstreamer[x11](android | osx) = feature-fails # no system X11 in CI
|
||||
hdf5[fortran](android | windows) = feature-fails # No fortran compiler
|
||||
hdf5[fortran,parallel](linux | osx) = options # Fortran disabled in port openmpi
|
||||
hdf5[threadsafe](android) = feature-fails # pthread_setcancelstate
|
||||
|
||||
@@ -3386,7 +3386,7 @@
|
||||
},
|
||||
"gstreamer": {
|
||||
"baseline": "1.24.12",
|
||||
"port-version": 0
|
||||
"port-version": 1
|
||||
},
|
||||
"gtest": {
|
||||
"baseline": "1.17.0",
|
||||
@@ -4566,7 +4566,7 @@
|
||||
},
|
||||
"libde265": {
|
||||
"baseline": "1.0.16",
|
||||
"port-version": 0
|
||||
"port-version": 1
|
||||
},
|
||||
"libdeflate": {
|
||||
"baseline": "1.24",
|
||||
@@ -4978,7 +4978,7 @@
|
||||
},
|
||||
"libmodplug": {
|
||||
"baseline": "0.8.9.0",
|
||||
"port-version": 14
|
||||
"port-version": 15
|
||||
},
|
||||
"libmorton": {
|
||||
"baseline": "0.2.12",
|
||||
@@ -10046,7 +10046,7 @@
|
||||
},
|
||||
"wildmidi": {
|
||||
"baseline": "0.4.6",
|
||||
"port-version": 0
|
||||
"port-version": 1
|
||||
},
|
||||
"wincrypt": {
|
||||
"baseline": "0.0",
|
||||
|
||||
@@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "e911d866875f7d15538fe43b452186c3f46d181c",
|
||||
"version": "1.24.12",
|
||||
"port-version": 1
|
||||
},
|
||||
{
|
||||
"git-tree": "d6aeef9d1bd7507a0456624f0074842bee9c44b9",
|
||||
"version": "1.24.12",
|
||||
|
||||
@@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "48f50bad067ea7eea6d5db8bd58c493f4d5de736",
|
||||
"version": "1.0.16",
|
||||
"port-version": 1
|
||||
},
|
||||
{
|
||||
"git-tree": "88fc0d2a520755fb90f5955bfbb720a8f6df3e3d",
|
||||
"version": "1.0.16",
|
||||
|
||||
@@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "c01d4a4b8c7eae815e10bcb67f932ee150c2fd40",
|
||||
"version": "0.8.9.0",
|
||||
"port-version": 15
|
||||
},
|
||||
{
|
||||
"git-tree": "ff73830b584f9c52036cfa1d31b12cf936beabe8",
|
||||
"version": "0.8.9.0",
|
||||
|
||||
@@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "1ee7ea0a9fed3d8abd92fc325787900e678c08d6",
|
||||
"version": "0.4.6",
|
||||
"port-version": 1
|
||||
},
|
||||
{
|
||||
"git-tree": "6125f3402595c56f9454a09af832cdd2aa379cc3",
|
||||
"version": "0.4.6",
|
||||
|
||||
Reference in New Issue
Block a user