[gstreamer,libsoup,libpsl,glib-networking] enable soup plugins of gstreamer (#36679)

<!-- If your PR fixes issues, please note that here by adding "Fixes
#NNNNNN." for each fixed issue on separate lines. -->

<!-- If you are still working on the PR, open it as a Draft:
https://github.blog/2019-02-14-introducing-draft-pull-requests/. -->

Update port gstreamer

- [x] Changes comply with the [maintainer
guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md).
- [x] SHA512s are updated for each updated download.
- [ ] The "supports" clause reflects platforms that may be fixed by this
new version.
- [ ] Any fixed [CI
baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt)
entries are removed from that file.
- [ ] Any patches that are no longer applied are deleted from the port's
directory.
- [x] The version database is fixed by rerunning `./vcpkg x-add-version
--all` and committing the result.
- [x] Only one version is added to each modified port's versions file.

Add port libsoup,libpsl,glib-networking
- [x] Changes comply with the [maintainer
guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md).
- [x] The name of the port matches an existing name for this component
on https://repology.org/ if possible, and/or is strongly associated with
that component on search engines.
- [x] Optional dependencies are resolved in exactly one way. For
example, if the component is built with CMake, all `find_package` calls
are REQUIRED, are satisfied by `vcpkg.json`'s declared dependencies, or
disabled with
[CMAKE_DISABLE_FIND_PACKAGE_Xxx](https://cmake.org/cmake/help/latest/variable/CMAKE_DISABLE_FIND_PACKAGE_PackageName.html).
- [x] The versioning scheme in `vcpkg.json` matches what upstream says.
- [x] The license declaration in `vcpkg.json` matches what upstream
says.
- [x] The installed as the "copyright" file matches what upstream says.
- [x] The source code of the component installed comes from an
authoritative source.
- [x] The generated "usage text" is accurate. See
[adding-usage](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/examples/adding-usage.md)
for context.
- [x] The version database is fixed by rerunning `./vcpkg x-add-version
--all` and committing the result.
- [x] Only one version is in the new port's versions file.
- [x] Only one version is added to each modified port's versions file.

I found the offical tutorials not work because the uridecodebin plugin
can not handle https uri. Then I found that soup plugins is disabled. So
I update the gstreamer to enable it. The gstreamer compiled successfuly
without new port which I add. However the soup plugins will not work
without libsoup. So I add the port libsoup. And it depend on libpsl and
glib-networking. The glib-networking is a gio module. To make it work,
we should set env GIO_MODULE_DIR to the plugins dir which
glib-networking dll live in. And now I uridecodebin works properly.
By the way, how vcpkg deal with plugin dll? I put them to a plugins dir
just like gstreamer. However to use them is a hard work. For a gio
module, we have to set the env GIO_MODULE_DIR to the dyamic library
location.
This commit is contained in:
vipcxj 2024-02-29 10:02:23 +08:00 коммит произвёл GitHub
Родитель fcae467932
Коммит 002c5b0659
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: B5690EEEBB952194
14 изменённых файлов: 321 добавлений и 3 удалений

Просмотреть файл

@ -0,0 +1,64 @@
set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled)
vcpkg_from_gitlab(
GITLAB_URL https://gitlab.gnome.org
OUT_SOURCE_PATH SOURCE_PATH
REPO GNOME/glib-networking
REF "${VERSION}"
SHA512 "35b6b05afab29da4f4d54f559ded3cc6a16376f188afdb72689b7d9bcba71b9963317bcbd1101327137ae31ee51e25438f9bfa267e23d6076706a64c3594cbb5"
HEAD_REF main
)
vcpkg_list(SET FEATURE_OPTIONS)
if (gnutls IN_LIST FEATURES)
list(APPEND FEATURE_OPTIONS -Dgnutls=enabled)
else()
list(APPEND FEATURE_OPTIONS -Dgnutls=disabled)
endif()
if (openssl IN_LIST FEATURES)
list(APPEND FEATURE_OPTIONS -Dopenssl=enabled)
else()
list(APPEND FEATURE_OPTIONS -Dopenssl=disabled)
endif()
if (libproxy IN_LIST FEATURES)
list(APPEND FEATURE_OPTIONS -Dlibproxy=enabled)
else()
list(APPEND FEATURE_OPTIONS -Dlibproxy=disabled)
endif()
if (environment-proxy IN_LIST FEATURES)
list(APPEND FEATURE_OPTIONS -Denvironment_proxy=enabled)
else()
list(APPEND FEATURE_OPTIONS -Denvironment_proxy=disabled)
endif()
vcpkg_configure_meson(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
${FEATURE_OPTIONS}
-Dgnome_proxy=disabled
ADDITIONAL_BINARIES
"gio-querymodules = '${CURRENT_HOST_INSTALLED_DIR}/tools/glib/gio-querymodules${CMAKE_EXECUTABLE_SUFFIX}'"
)
vcpkg_install_meson()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/gio/modules/pkgconfig")
file(GLOB MODULE_FILES "${CURRENT_PACKAGES_DIR}/lib/gio/modules/*")
file(COPY ${MODULE_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/plugins/${PORT}")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/gio/modules/pkgconfig")
file(GLOB MODULE_DEBUG_FILES "${CURRENT_PACKAGES_DIR}/debug/lib/gio/modules/*")
file(COPY ${MODULE_DEBUG_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/plugins/${PORT}")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib")
if(libproxy IN_LIST FEATURES)
vcpkg_copy_tools(TOOL_NAMES glib-pacrunner SEARCH_DIR "${CURRENT_PACKAGES_DIR}/libexec")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/libexec" "${CURRENT_PACKAGES_DIR}/debug/libexec")
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/dbus-1/services/org.gtk.GLib.PACRunner.service" "${CURRENT_PACKAGES_DIR}/libexec/glib-pacrunner" "${CURRENT_HOST_INSTALLED_DIR}/tools/${PORT}/glib-pacrunner")
endif()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")

Просмотреть файл

@ -0,0 +1 @@
glib-networking is a gio module, you should set GIO_MODULE_DIR to the location of dynamic libraries.

Просмотреть файл

@ -0,0 +1,54 @@
{
"name": "glib-networking",
"version": "2.78.0",
"description": "Network extensions for GLib",
"homepage": "https://gitlab.gnome.org/GNOME/glib-networking",
"license": "LGPL-2.1-only",
"supports": "!uwp",
"dependencies": [
"glib",
{
"name": "glib",
"host": true
},
{
"name": "vcpkg-tool-meson",
"host": true
}
],
"default-features": [
{
"name": "gnutls",
"platform": "linux | mingw"
},
{
"name": "openssl",
"platform": "!linux & !mingw"
}
],
"features": {
"environment-proxy": {
"description": "support for environment variable proxy configuration"
},
"gnutls": {
"description": "support for GnuTLS networking configuration",
"supports": "!windows | mingw",
"dependencies": [
"libgnutls"
]
},
"libproxy": {
"description": "support for libproxy proxy configuration",
"supports": "!(uwp | xbox | android)",
"dependencies": [
"libproxy"
]
},
"openssl": {
"description": "support for OpenSSL networking configuration",
"dependencies": [
"openssl"
]
}
}
}

Просмотреть файл

@ -203,7 +203,7 @@ vcpkg_configure_meson(
-Dgst-plugins-good:pulse=auto -Dgst-plugins-good:pulse=auto
-Dgst-plugins-good:qt5=disabled -Dgst-plugins-good:qt5=disabled
-Dgst-plugins-good:shout2=disabled -Dgst-plugins-good:shout2=disabled
-Dgst-plugins-good:soup=disabled #-Dgst-plugins-good:soup=disabled
-Dgst-plugins-good:twolame=disabled -Dgst-plugins-good:twolame=disabled
-Dgst-plugins-good:waveform=auto -Dgst-plugins-good:waveform=auto
-Dgst-plugins-good:wavpack=disabled # Error during plugin build -Dgst-plugins-good:wavpack=disabled # Error during plugin build

Просмотреть файл

@ -1,7 +1,7 @@
{ {
"name": "gstreamer", "name": "gstreamer",
"version": "1.22.5", "version": "1.22.5",
"port-version": 7, "port-version": 8,
"description": "GStreamer open-source multimedia framework core library", "description": "GStreamer open-source multimedia framework core library",
"homepage": "https://gstreamer.freedesktop.org/", "homepage": "https://gstreamer.freedesktop.org/",
"license": "LGPL-2.0-only", "license": "LGPL-2.0-only",
@ -648,6 +648,19 @@
"soundtouch" "soundtouch"
] ]
}, },
"soup": {
"description": "Enable support for the soup plugin",
"dependencies": [
{
"name": "gstreamer",
"default-features": false,
"features": [
"plugins-good"
]
},
"libsoup"
]
},
"speex": { "speex": {
"description": "Enable support for the speex codec", "description": "Enable support for the speex codec",
"dependencies": [ "dependencies": [

Просмотреть файл

@ -0,0 +1,48 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO rockdaboot/libpsl
REF "${VERSION}"
SHA512 "d8e224b2ce5d9a6ac78700eb8975d09aef4e5af7db29539e5e339c5cd100f1272371fe45757ab5383ddbcd569bdf9d697a78932ea9fdf43ff48d3cea02f644cd"
HEAD_REF master
)
vcpkg_download_distfile(
PUBLIC_SUFFIX_LIST_DAT
URLS https://raw.githubusercontent.com/publicsuffix/list/5db9b65997e3c9230ac4353b01994c2ae9667cb9/public_suffix_list.dat
FILENAME libpsl_public_suffix_list.dat
SHA512 08ae73cb028ce9d57ad5ce09afd76a5b379fa18e1370f6a1d094f4242ce66b0f4bf005b05e796c287ab8074aca7f30d023e430f64d3563fa93adbb2371bda220
)
file(COPY "${PUBLIC_SUFFIX_LIST_DAT}" DESTINATION "${SOURCE_PATH}/list")
file(RENAME "${SOURCE_PATH}/list/libpsl_public_suffix_list.dat" "${SOURCE_PATH}/list/public_suffix_list.dat")
vcpkg_list(SET RUNTIME_OPTIONS)
if(libidn2 IN_LIST FEATURES)
list(APPEND RUNTIME_OPTIONS -Druntime=libidn2)
endif()
if(libicu IN_LIST FEATURES)
list(APPEND RUNTIME_OPTIONS -Druntime=libicu)
endif()
if(RUNTIME_OPTIONS STREQUAL "")
message(FATAL_ERROR "At least one of libidn2 and libicu should be selected.")
endif()
vcpkg_configure_meson(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
${RUNTIME_OPTIONS}
-Ddocs=false
-Dtests=false
)
vcpkg_install_meson()
vcpkg_fixup_pkgconfig()
vcpkg_copy_tools(TOOL_NAMES psl AUTO_CLEAN)
vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}")
file(RENAME "${CURRENT_PACKAGES_DIR}/bin/psl-make-dafsa" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/psl-make-dafsa")
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
endif()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")

40
ports/libpsl/vcpkg.json Normal file
Просмотреть файл

@ -0,0 +1,40 @@
{
"name": "libpsl",
"version": "0.21.5",
"description": "C library for the Public Suffix List",
"homepage": "rockdaboot.github.io/libpsl",
"license": "MIT",
"supports": "!uwp",
"dependencies": [
{
"name": "vcpkg-tool-meson",
"host": true
}
],
"default-features": [
{
"name": "libicu",
"platform": "windows"
},
{
"name": "libidn2",
"platform": "!windows"
}
],
"features": {
"libicu": {
"description": "choose libicu as runtime",
"supports": "windows",
"dependencies": [
"icu"
]
},
"libidn2": {
"description": "choose libidn2 as runtime",
"supports": "!windows",
"dependencies": [
"libidn2"
]
}
}
}

Просмотреть файл

@ -0,0 +1,31 @@
vcpkg_from_gitlab(
GITLAB_URL https://gitlab.gnome.org
OUT_SOURCE_PATH SOURCE_PATH
REPO GNOME/libsoup
REF "${VERSION}"
SHA512 "780d360167af1c7b5497d79c6752f3fb917b552928f7e1af6476e2713285426de7803fc28d1b76c541d5246a404772abd0f412acc953d6a1441e632416f72f94"
HEAD_REF main
)
vcpkg_configure_meson(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
-Dtls_check=false
-Ddocs=disabled
-Dtests=false
-Ddoc_tests=false
ADDITIONAL_BINARIES
"gio-querymodules = '${CURRENT_HOST_INSTALLED_DIR}/tools/glib/gio-querymodules${CMAKE_EXECUTABLE_SUFFIX}'"
"glib-compile-schemas = '${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-compile-schemas${CMAKE_EXECUTABLE_SUFFIX}'"
"glib-compile-resources = '${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-compile-resources${CMAKE_EXECUTABLE_SUFFIX}'"
"gdbus-codegen = '${CURRENT_HOST_INSTALLED_DIR}/tools/glib/gdbus-codegen'"
"glib-genmarshal = '${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-genmarshal'"
"glib-mkenums = '${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-mkenums'"
)
vcpkg_install_meson()
vcpkg_fixup_pkgconfig()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")

23
ports/libsoup/vcpkg.json Normal file
Просмотреть файл

@ -0,0 +1,23 @@
{
"name": "libsoup",
"version": "3.4.4",
"description": "HTTP Library for GLib",
"homepage": "https://libsoup.org",
"license": "LGPL-2.0-or-later",
"supports": "!uwp & !xbox",
"dependencies": [
"glib",
{
"name": "glib",
"host": true
},
"glib-networking",
"libpsl",
"nghttp2",
"sqlite3",
{
"name": "vcpkg-tool-meson",
"host": true
}
]
}

Просмотреть файл

@ -3040,6 +3040,10 @@
"baseline": "2.78.4", "baseline": "2.78.4",
"port-version": 0 "port-version": 0
}, },
"glib-networking": {
"baseline": "2.78.0",
"port-version": 0
},
"glibmm": { "glibmm": {
"baseline": "2.78.1", "baseline": "2.78.1",
"port-version": 0 "port-version": 0
@ -3182,7 +3186,7 @@
}, },
"gstreamer": { "gstreamer": {
"baseline": "1.22.5", "baseline": "1.22.5",
"port-version": 7 "port-version": 8
}, },
"gtest": { "gtest": {
"baseline": "1.14.0", "baseline": "1.14.0",
@ -4764,6 +4768,10 @@
"baseline": "0.4.18", "baseline": "0.4.18",
"port-version": 3 "port-version": 3
}, },
"libpsl": {
"baseline": "0.21.5",
"port-version": 0
},
"libqcow": { "libqcow": {
"baseline": "20221124", "baseline": "20221124",
"port-version": 1 "port-version": 1
@ -4892,6 +4900,10 @@
"baseline": "2.0.0", "baseline": "2.0.0",
"port-version": 7 "port-version": 7
}, },
"libsoup": {
"baseline": "3.4.4",
"port-version": 0
},
"libspatialindex": { "libspatialindex": {
"baseline": "1.9.3", "baseline": "1.9.3",
"port-version": 3 "port-version": 3

Просмотреть файл

@ -0,0 +1,9 @@
{
"versions": [
{
"git-tree": "e302a8e03221f3ee0c3b1da60be13327bd1e6ed9",
"version": "2.78.0",
"port-version": 0
}
]
}

Просмотреть файл

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "a4f5984869f07999b31721a248e129b3de531436",
"version": "1.22.5",
"port-version": 8
},
{ {
"git-tree": "563a58509d4f74fed0d8819ec9182a5da8700d02", "git-tree": "563a58509d4f74fed0d8819ec9182a5da8700d02",
"version": "1.22.5", "version": "1.22.5",

9
versions/l-/libpsl.json Normal file
Просмотреть файл

@ -0,0 +1,9 @@
{
"versions": [
{
"git-tree": "6f4047fee938b55c21791aebff41556f270b510a",
"version": "0.21.5",
"port-version": 0
}
]
}

9
versions/l-/libsoup.json Normal file
Просмотреть файл

@ -0,0 +1,9 @@
{
"versions": [
{
"git-tree": "967e4400de0619b73df7b3a48e392b36fa4cf6ba",
"version": "3.4.4",
"port-version": 0
}
]
}