mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-19 04:43:02 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[gstreamer, gst-rtsp-server, libnice-gst] Move installed plugins into plugins/gstreamer (#30817)

Browse Source 
This aligns with the behaviour of other ports like QT and GStreamer
deadlocks when trying to load glib shared libraries if they are in
the plugin directory.
This commit is contained in:
gerard-ryan-immersaview 2023-04-15 07:50:53 +10:00 committed by GitHub
parent fc54955667
commit 6b7352ef91
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 65 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ports/gst-rtsp-server/portfile.cmake
View File

@ -24,16 +24,21 @@ vcpkg_configure_meson(
vcpkg_install_meson()
if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
file(GLOB DBG_BINS ${CURRENT_PACKAGES_DIR}/debug/lib/gstreamer-1.0/*.dll
${CURRENT_PACKAGES_DIR}/debug/lib/gstreamer-1.0/*.pdb
if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
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/gstreamer")
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 ${DBG_BINS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin)
file(GLOB REL_BINS ${CURRENT_PACKAGES_DIR}/lib/gstreamer-1.0/*.dll
${CURRENT_PACKAGES_DIR}/lib/gstreamer-1.0/*.pdb
)
file(COPY ${REL_BINS} DESTINATION ${CURRENT_PACKAGES_DIR}/bin)
file(COPY ${REL_BINS} DESTINATION "${CURRENT_PACKAGES_DIR}/plugins/gstreamer")
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()
endif()
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")

1
ports/gst-rtsp-server/vcpkg.json
View File

@ -1,6 +1,7 @@
{
"name": "gst-rtsp-server",
"version": "1.20.5",
"port-version": 1,
"description": "gst-rtsp-server is a library on top of GStreamer for building an RTSP server",
"homepage": "https://gstreamer.freedesktop.org/",
"license": "LGPL-2.1-only",

13
ports/gstreamer/portfile.cmake
View File

@ -702,18 +702,21 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/gstreamer-1.0/gst/gstconfig.h" "!defined(GST_STATIC_COMPILATION)" "0")
endif()
if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
if(NOT VCPKG_BUILD_TYPE)
file(GLOB DBG_BINS "${CURRENT_PACKAGES_DIR}/debug/lib/gstreamer-1.0/*.dll"
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/bin")
file(COPY ${DBG_BINS} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/plugins/${PORT}")
endif()
file(GLOB REL_BINS "${CURRENT_PACKAGES_DIR}/lib/gstreamer-1.0/*.dll"
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}/bin")
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()
endif()
vcpkg_fixup_pkgconfig()

2
ports/gstreamer/vcpkg.json
View File

@ -1,7 +1,7 @@
{
"name": "gstreamer",
"version": "1.20.5",
"port-version": 4,
"port-version": 5,
"description": "GStreamer open-source multimedia framework core library",
"homepage": "https://gstreamer.freedesktop.org/",
"license": "LGPL-2.0-only",

41
ports/libnice-gst/portfile.cmake
View File

@ -59,28 +59,33 @@ file(WRITE "${USAGE_FILE}" "${PORT} usage:\n\n")
if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
set(VCPKG_POLICY_SKIP_ABSOLUTE_PATHS_CHECK enabled)
file(APPEND "${USAGE_FILE}" "\tIf the plugin isn't found by the default paths add one of the following paths to the 'GST_PLUGIN_PATH' environment variable\n")
file(APPEND "${USAGE_FILE}" "\tMake sure one of the following paths is added to the 'GST_PLUGIN_PATH' environment variable\n")
file(APPEND "${USAGE_FILE}" "\tFor more information on GStreamer environment variables see https://gstreamer.freedesktop.org/documentation/gstreamer/running.html?gi-language=c#environment-variables\n")
if(VCPKG_TARGET_IS_WINDOWS)
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/bin")
file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/gstreamer-1.0/gstnice.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/gstnice.dll")
file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/gstreamer-1.0/gstnice.pdb" "${CURRENT_PACKAGES_DIR}/debug/bin/gstnice.pdb")
file(APPEND "${USAGE_FILE}" "\t\t* '${CURRENT_PACKAGES_DIR}/debug/bin/'\n")
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/plugins/gstreamer")
file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/gstreamer-1.0/${CMAKE_SHARED_LIBRARY_PREFIX}gstnice${CMAKE_SHARED_LIBRARY_SUFFIX}"
"${CURRENT_PACKAGES_DIR}/debug/plugins/gstreamer/${CMAKE_SHARED_LIBRARY_PREFIX}gstnice${CMAKE_SHARED_LIBRARY_SUFFIX}")
if(VCPKG_TARGET_IS_WINDOWS)
file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/gstreamer-1.0/gstnice.pdb"
"${CURRENT_PACKAGES_DIR}/debug/plugins/gstreamer/gstnice.pdb")
else()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib")
endif()
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin")
file(RENAME "${CURRENT_PACKAGES_DIR}/lib/gstreamer-1.0/gstnice.dll" "${CURRENT_PACKAGES_DIR}/bin/gstnice.dll")
file(RENAME "${CURRENT_PACKAGES_DIR}/lib/gstreamer-1.0/gstnice.pdb" "${CURRENT_PACKAGES_DIR}/bin/gstnice.pdb")
file(APPEND "${USAGE_FILE}" "\t\t* '${CURRENT_PACKAGES_DIR}/bin/'\n")
file(APPEND "${USAGE_FILE}" "\t\t* '${CURRENT_INSTALLED_DIR}/debug/plugins/gstreamer/'\n")
endif()
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/plugins/gstreamer")
file(RENAME "${CURRENT_PACKAGES_DIR}/lib/gstreamer-1.0/${CMAKE_SHARED_LIBRARY_PREFIX}gstnice${CMAKE_SHARED_LIBRARY_SUFFIX}"
"${CURRENT_PACKAGES_DIR}/plugins/gstreamer/${CMAKE_SHARED_LIBRARY_PREFIX}gstnice${CMAKE_SHARED_LIBRARY_SUFFIX}")
if(VCPKG_TARGET_IS_WINDOWS)
file(RENAME "${CURRENT_PACKAGES_DIR}/lib/gstreamer-1.0/gstnice.pdb"
"${CURRENT_PACKAGES_DIR}/plugins/gstreamer/gstnice.pdb")
else()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib")
endif()
else()
file(APPEND "${USAGE_FILE}" "\t\t* '${CURRENT_PACKAGES_DIR}/debug/lib/gstreamer-1.0/'\n")
file(APPEND "${USAGE_FILE}" "\t\t* '${CURRENT_PACKAGES_DIR}/lib/gstreamer-1.0/'\n")
file(APPEND "${USAGE_FILE}" "\t\t* '${CURRENT_INSTALLED_DIR}/plugins/gstreamer/'\n")
endif()
else()
file(APPEND "${USAGE_FILE}" "\tRegister static plugin with gst_plugin_register_static()\n")

1
ports/libnice-gst/vcpkg.json
View File

@ -1,6 +1,7 @@
{
"name": "libnice-gst",
"version": "0.1.21",
"port-version": 1,
"description": "Gstreamer Libnice plugins.",
"homepage": "https://nice.freedesktop.org",
"license": "LGPL-2.1-only AND MPL-1.1",

6
versions/baseline.json
View File

@ -2950,11 +2950,11 @@
},
"gst-rtsp-server": {
"baseline": "1.20.5",
"port-version": 0
"port-version": 1
},
"gstreamer": {
"baseline": "1.20.5",
"port-version": 4
"port-version": 5
},
"gtest": {
"baseline": "1.13.0",
@ -4246,7 +4246,7 @@
},
"libnice-gst": {
"baseline": "0.1.21",
"port-version": 0
"port-version": 1
},
"libnoise": {
"baseline": "1.0.0",

5
versions/g-/gst-rtsp-server.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "85ca43c538fdb1f41292003c458eb209a1478906",
"version": "1.20.5",
"port-version": 1
},
{
"git-tree": "6bde18badd06f4466ca4cb75b83aa98b1f24f3bd",
"version": "1.20.5",

5
versions/g-/gstreamer.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "86757cb6fd9f50813cadb3779f1096fe1377eef9",
"version": "1.20.5",
"port-version": 5
},
{
"git-tree": "084ea66aed42ba882e19b103de4042d676be1530",
"version": "1.20.5",

5
versions/l-/libnice-gst.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "9ea8f77a4a4f70cceb4d65650ee5de24e14e8190",
"version": "0.1.21",
"port-version": 1
},
{
"git-tree": "3d7072d7e0810ec844b7f4b3ecaa1e325e407be6",
"version": "0.1.21",