From f257db92b26fb86682378264e5c2a503a2974b96 Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Sun, 17 Oct 2021 23:43:01 -0700 Subject: [PATCH 01/30] [gstreamer] Support Linux and fix pkgconfig --- ports/gstreamer/portfile.cmake | 94 +++++++++++++++++++++++----------- ports/gstreamer/vcpkg.json | 4 +- 2 files changed, 65 insertions(+), 33 deletions(-) diff --git a/ports/gstreamer/portfile.cmake b/ports/gstreamer/portfile.cmake index 20d94fef7842a2..2f250f5263b571 100644 --- a/ports/gstreamer/portfile.cmake +++ b/ports/gstreamer/portfile.cmake @@ -57,12 +57,12 @@ vcpkg_from_gitlab( HEAD_REF master ) -file(RENAME ${GST_SOURCE_PATH} ${GST_BUILD_SOURCE_PATH}/subprojects/gstreamer) -file(RENAME ${GST_PLUGIN_BASE_SOURCE_PATH} ${GST_BUILD_SOURCE_PATH}/subprojects/gst-plugins-base) -file(RENAME ${GST_PLUGIN_GOOD_SOURCE_PATH} ${GST_BUILD_SOURCE_PATH}/subprojects/gst-plugins-good) -file(RENAME ${GST_PLUGIN_BAD_SOURCE_PATH} ${GST_BUILD_SOURCE_PATH}/subprojects/gst-plugins-bad) -file(RENAME ${GST_PLUGIN_UGLY_SOURCE_PATH} ${GST_BUILD_SOURCE_PATH}/subprojects/gst-plugins-ugly) -file(RENAME ${GST_MESON_PORTS_SOURCE_PATH} ${GST_BUILD_SOURCE_PATH}/subprojects/gl-headers) +file(RENAME "${GST_SOURCE_PATH}" "${GST_BUILD_SOURCE_PATH}/subprojects/gstreamer") +file(RENAME "${GST_PLUGIN_BASE_SOURCE_PATH}" "${GST_BUILD_SOURCE_PATH}/subprojects/gst-plugins-base") +file(RENAME "${GST_PLUGIN_GOOD_SOURCE_PATH}" "${GST_BUILD_SOURCE_PATH}/subprojects/gst-plugins-good") +file(RENAME "${GST_PLUGIN_BAD_SOURCE_PATH}" "${GST_BUILD_SOURCE_PATH}/subprojects/gst-plugins-bad") +file(RENAME "${GST_PLUGIN_UGLY_SOURCE_PATH}" "${GST_BUILD_SOURCE_PATH}/subprojects/gst-plugins-ugly") +file(RENAME "${GST_MESON_PORTS_SOURCE_PATH}" "${GST_BUILD_SOURCE_PATH}/subprojects/gl-headers") if(VCPKG_TARGET_IS_OSX) # In Darwin platform, there can be an old version of `bison`, @@ -82,7 +82,7 @@ if(VCPKG_TARGET_IS_OSX) endif() # make tools like 'glib-mkenums' visible -get_filename_component(GLIB_TOOL_DIR ${CURRENT_INSTALLED_DIR}/tools/glib ABSOLUTE) +get_filename_component(GLIB_TOOL_DIR "${CURRENT_INSTALLED_DIR}/tools/glib" ABSOLUTE) message(STATUS "Using glib tools: ${GLIB_TOOL_DIR}") vcpkg_add_to_path(PREPEND ${GLIB_TOOL_DIR}) @@ -217,48 +217,80 @@ vcpkg_configure_meson( ) if(VCPKG_TARGET_IS_WINDOWS) # note: can't find where z.lib comes from. replace it to appropriate library name manually - get_filename_component(BUILD_NINJA_DBG ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/build.ninja ABSOLUTE) + get_filename_component(BUILD_NINJA_DBG "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/build.ninja" ABSOLUTE) vcpkg_replace_string(${BUILD_NINJA_DBG} "z.lib" "zlibd.lib") - get_filename_component(BUILD_NINJA_REL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/build.ninja ABSOLUTE) + get_filename_component(BUILD_NINJA_REL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/build.ninja" ABSOLUTE) vcpkg_replace_string(${BUILD_NINJA_REL} "z.lib" "zlib.lib") vcpkg_replace_string(${BUILD_NINJA_REL} "\"-Wno-unused\"" "") # todo: may need a patch for `gst_debug=false` endif() + vcpkg_install_meson() +vcpkg_copy_pdbs() + +# For pkgconfig +if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "Release") + file(GLOB_RECURSE GST_EXT_PKGS "${CURRENT_PACKAGES_DIR}/lib/gstreamer-1.0/pkgconfig/*.pc") + if (GST_EXT_PKGS) + foreach(GST_EXT_PKG IN LISTS GST_EXT_PKGS) + file(READ "${GST_EXT_PKG}" GST_EXT_PKG_CONTENT) + string(REPLACE [[libdir=${prefix}/lib]] [[libdir=${prefix}/lib/gstreamer-1.0]] GST_EXT_PKG_CONTENT "${GST_EXT_PKG_CONTENT}") + string(REPLACE [[flac >= 1.1.4]] [[flac]] GST_EXT_PKG_CONTENT "${GST_EXT_PKG_CONTENT}") + file(WRITE "${GST_EXT_PKG}" "${GST_EXT_PKG_CONTENT}") + file(COPY "${GST_EXT_PKG}" DESTINATION "${CURRENT_PACKAGES_DIR}/lib/pkgconfig") + endforeach() + endif() +endif() + +if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "Debug") + file(GLOB_RECURSE GST_EXT_PKGS "${CURRENT_PACKAGES_DIR}/debug/lib/gstreamer-1.0/pkgconfig/*.pc") + if (GST_EXT_PKGS) + foreach(GST_EXT_PKG IN LISTS GST_EXT_PKGS) + file(READ "${GST_EXT_PKG}" GST_EXT_PKG_CONTENT) + string(REPLACE [[libdir=${prefix}/lib]] [[libdir=${prefix}/lib/gstreamer-1.0]] GST_EXT_PKG_CONTENT "${GST_EXT_PKG_CONTENT}") + string(REPLACE [[flac >= 1.1.4]] [[flac]] GST_EXT_PKG_CONTENT "${GST_EXT_PKG_CONTENT}") + file(WRITE "${GST_EXT_PKG}" "${GST_EXT_PKG_CONTENT}") + file(COPY "${GST_EXT_PKG}" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") + endforeach() + endif() +endif() + +vcpkg_fixup_pkgconfig() + # Remove duplicated GL headers (we already have `opengl-registry`) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/KHR - ${CURRENT_PACKAGES_DIR}/include/GL +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/KHR" + "${CURRENT_PACKAGES_DIR}/include/GL" ) -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 +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" ) -file(INSTALL ${GST_BUILD_SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -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 +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" ) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin - ${CURRENT_PACKAGES_DIR}/bin + 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} + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/${PREFIX}gstreamer-full-1.0${SUFFIX}" + "${CURRENT_PACKAGES_DIR}/lib/${PREFIX}gstreamer-full-1.0${SUFFIX}" ) endif() 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 + file(GLOB DBG_BINS "${CURRENT_PACKAGES_DIR}/debug/lib/gstreamer-1.0/*.dll" + "${CURRENT_PACKAGES_DIR}/debug/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 "${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(REMOVE ${DBG_BINS} ${REL_BINS}) + file(COPY "${REL_BINS}" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") + file(REMOVE "${DBG_BINS}" "${REL_BINS}") endif() -vcpkg_fixup_pkgconfig() + +file(INSTALL "${GST_BUILD_SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/gstreamer/vcpkg.json b/ports/gstreamer/vcpkg.json index d6d984817953b5..808719282d2291 100644 --- a/ports/gstreamer/vcpkg.json +++ b/ports/gstreamer/vcpkg.json @@ -1,11 +1,11 @@ { "name": "gstreamer", "version": "1.19.2", - "port-version": 1, + "port-version": 2, "description": "GStreamer open-source multimedia framework core library", "homepage": "https://gstreamer.freedesktop.org/", "license": "LGPL-2.0", - "supports": "(windows | osx) & (x64 | x86)", + "supports": "x64 | x86", "dependencies": [ { "name": "cairo", From e270e38812986364a7510f10db48a7fa27607e8f Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Sun, 17 Oct 2021 23:46:03 -0700 Subject: [PATCH 02/30] version --- versions/baseline.json | 2 +- versions/g-/gstreamer.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index 91f1fea11174d0..71d5a148e9dfd0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2562,7 +2562,7 @@ }, "gstreamer": { "baseline": "1.19.2", - "port-version": 1 + "port-version": 2 }, "gtest": { "baseline": "1.11.0", diff --git a/versions/g-/gstreamer.json b/versions/g-/gstreamer.json index c4906802ae6d42..2acb9e7e966114 100644 --- a/versions/g-/gstreamer.json +++ b/versions/g-/gstreamer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "577ebc431514191f6279ce69598255b3e0bb16f7", + "version": "1.19.2", + "port-version": 2 + }, { "git-tree": "9e1e058b933a63ff71eeaa2a7a59fa713d0ba51b", "version": "1.19.2", From 78fab4f796046618c6feb7055535349a0c3ab818 Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Sun, 17 Oct 2021 23:46:12 -0700 Subject: [PATCH 03/30] remove baseline record --- scripts/ci.baseline.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index c7d3065329a904..6dd70217e6f874 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -413,7 +413,6 @@ graphqlparser:arm-uwp=fail graphqlparser:x64-uwp=fail gsl:arm-uwp=fail gsl:x64-uwp=fail -gstreamer:x64-osx=fail gtk:x64-windows-static=fail gtk:x64-windows-static-md=fail gts:x64-osx=fail From e2c32fd7b6007fbe50e5ad295fcf68317bba0243 Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Sun, 17 Oct 2021 23:52:58 -0700 Subject: [PATCH 04/30] Fix installation --- ports/gstreamer/portfile.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/gstreamer/portfile.cmake b/ports/gstreamer/portfile.cmake index 2f250f5263b571..722b0d5416ad23 100644 --- a/ports/gstreamer/portfile.cmake +++ b/ports/gstreamer/portfile.cmake @@ -285,12 +285,12 @@ 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" ) - file(COPY "${DBG_BINS}" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + 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(REMOVE "${DBG_BINS}" "${REL_BINS}") + file(COPY ${REL_BINS} DESTINATION "${CURRENT_PACKAGES_DIR}/bin") + file(REMOVE ${DBG_BINS} ${REL_BINS}) endif() file(INSTALL "${GST_BUILD_SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) From 139ca90c93e09673fc00b2655d8ed50f8576b20d Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Sun, 17 Oct 2021 23:53:13 -0700 Subject: [PATCH 05/30] version --- versions/g-/gstreamer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/g-/gstreamer.json b/versions/g-/gstreamer.json index 2acb9e7e966114..ceecb2b109b6ca 100644 --- a/versions/g-/gstreamer.json +++ b/versions/g-/gstreamer.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "577ebc431514191f6279ce69598255b3e0bb16f7", + "git-tree": "07be58a4726cc70bfb1e44455804bb117805e8f0", "version": "1.19.2", "port-version": 2 }, From ad39d0c71aad142bd50b803b9266cc61c382e6f9 Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Mon, 18 Oct 2021 00:47:48 -0700 Subject: [PATCH 06/30] [gst-rtsp-server] Fix linux build --- ports/gst-rtsp-server/portfile.cmake | 45 ++++++++++++++++++++++------ ports/gst-rtsp-server/vcpkg.json | 2 ++ 2 files changed, 38 insertions(+), 9 deletions(-) diff --git a/ports/gst-rtsp-server/portfile.cmake b/ports/gst-rtsp-server/portfile.cmake index d184c1affc5d1d..bfc071e5bc3ff5 100644 --- a/ports/gst-rtsp-server/portfile.cmake +++ b/ports/gst-rtsp-server/portfile.cmake @@ -17,18 +17,45 @@ vcpkg_configure_meson( vcpkg_install_meson() +vcpkg_copy_pdbs() + +# For pkgconfig +if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(GLOB_RECURSE GST_EXT_PKGS "${CURRENT_PACKAGES_DIR}/lib/gstreamer-1.0/pkgconfig/*.pc") + if (GST_EXT_PKGS) + foreach(GST_EXT_PKG IN LISTS GST_EXT_PKGS) + file(READ "${GST_EXT_PKG}" GST_EXT_PKG_CONTENT) + string(REPLACE [[libdir=${prefix}/lib]] [[libdir=${prefix}/lib/gstreamer-1.0]] GST_EXT_PKG_CONTENT "${GST_EXT_PKG_CONTENT}") + file(WRITE "${GST_EXT_PKG}" "${GST_EXT_PKG_CONTENT}") + file(COPY "${GST_EXT_PKG}" DESTINATION "${CURRENT_PACKAGES_DIR}/lib/pkgconfig") + endforeach() + endif() +endif() + +if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(GLOB_RECURSE GST_EXT_PKGS "${CURRENT_PACKAGES_DIR}/debug/lib/gstreamer-1.0/pkgconfig/*.pc") + if (GST_EXT_PKGS) + foreach(GST_EXT_PKG IN LISTS GST_EXT_PKGS) + file(READ "${GST_EXT_PKG}" GST_EXT_PKG_CONTENT) + string(REPLACE [[libdir=${prefix}/lib]] [[libdir=${prefix}/lib/gstreamer-1.0]] GST_EXT_PKG_CONTENT "${GST_EXT_PKG_CONTENT}") + file(WRITE "${GST_EXT_PKG}" "${GST_EXT_PKG_CONTENT}") + file(COPY "${GST_EXT_PKG}" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") + endforeach() + endif() +endif() + +vcpkg_fixup_pkgconfig() + 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 + file(GLOB DBG_BINS "${CURRENT_PACKAGES_DIR}/debug/lib/gstreamer-1.0/*.dll" + "${CURRENT_PACKAGES_DIR}/debug/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 ${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}/bin") file(REMOVE ${DBG_BINS} ${REL_BINS}) endif() -vcpkg_fixup_pkgconfig() - -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/gst-rtsp-server/vcpkg.json b/ports/gst-rtsp-server/vcpkg.json index f9f495c64b760e..8e0875d94cf5d0 100644 --- a/ports/gst-rtsp-server/vcpkg.json +++ b/ports/gst-rtsp-server/vcpkg.json @@ -1,7 +1,9 @@ { "name": "gst-rtsp-server", "version": "1.19.2", + "port-version": 1, "description": "gst-rtsp-server is a library on top of GStreamer for building an RTSP server", + "homepage": "https://gstreamer.freedesktop.org", "dependencies": [ "gstreamer" ] From 0aa25dc3765e66580c855b667d5dcb48a0d4dbe9 Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Mon, 18 Oct 2021 00:49:38 -0700 Subject: [PATCH 07/30] version --- versions/baseline.json | 2 +- versions/g-/gst-rtsp-server.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index 71d5a148e9dfd0..b8821d4d83a7f3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2558,7 +2558,7 @@ }, "gst-rtsp-server": { "baseline": "1.19.2", - "port-version": 0 + "port-version": 1 }, "gstreamer": { "baseline": "1.19.2", diff --git a/versions/g-/gst-rtsp-server.json b/versions/g-/gst-rtsp-server.json index e16a6ef93b8b40..55ecdefcfc72f2 100644 --- a/versions/g-/gst-rtsp-server.json +++ b/versions/g-/gst-rtsp-server.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c3f6f8b057e816a54956a31a3ac0f776a135d7d5", + "version": "1.19.2", + "port-version": 1 + }, { "git-tree": "0c628b2e09422aa3c82fc3d06757cdef559e9ce4", "version": "1.19.2", From ff5890897dfb1e9722de654856d9b3645b2e4936 Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Mon, 18 Oct 2021 01:35:40 -0700 Subject: [PATCH 08/30] Add qtmultimedia:x64-linux to fail --- scripts/ci.baseline.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 6dd70217e6f874..2b7594a9145c02 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1260,6 +1260,7 @@ qt5-x11extras:x86-windows=fail qt5-x11extras:x64-windows=fail qt5-x11extras:x64-windows-static=fail qt5-x11extras:x64-windows-static-md=fail +qtmultimedia:x64-linux=fail quickfix:arm-uwp=fail quickfix:arm64-windows=fail quickfix:x64-uwp=fail From c10f745f11ecc486e6f8d99b68549f29a1a88f89 Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Mon, 18 Oct 2021 01:36:13 -0700 Subject: [PATCH 09/30] Test osx build --- ports/gstreamer/portfile.cmake | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/ports/gstreamer/portfile.cmake b/ports/gstreamer/portfile.cmake index 722b0d5416ad23..2f31df45b48090 100644 --- a/ports/gstreamer/portfile.cmake +++ b/ports/gstreamer/portfile.cmake @@ -105,6 +105,13 @@ else() set(LIBRARY_LINKAGE "static") endif() +set(GST_EXTRA_OPTS ) +# See issue https://gitlab.freedesktop.org/gstreamer/gst-build/-/issues/186 +if (VCPKG_TARGET_IS_OSX) + message(WARNING "${PORT} has bug when using Darwin, temporary disable feature gst-full-version-script automaticly.") + set(GST_EXTRA_OPTS "-Dgst-full-version-script=")# Keep this to empty to avoid osx build failure +endif() + # gst-build's meson configuration needs git. Make the tool visible. vcpkg_find_acquire_program(GIT) get_filename_component(GIT_DIR "${GIT}" DIRECTORY) @@ -139,6 +146,7 @@ vcpkg_configure_meson( -Dgstreamer:gtk_doc=disabled -Dgstreamer:introspection=disabled -Dgstreamer:nls=disabled + ${GST_EXTRA_OPTS} # gst-plugins-base -Dgst-plugins-base:default_library=${LIBRARY_LINKAGE} -Dgst-plugins-base:examples=disabled @@ -229,7 +237,7 @@ vcpkg_install_meson() vcpkg_copy_pdbs() # For pkgconfig -if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "Release") +if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") file(GLOB_RECURSE GST_EXT_PKGS "${CURRENT_PACKAGES_DIR}/lib/gstreamer-1.0/pkgconfig/*.pc") if (GST_EXT_PKGS) foreach(GST_EXT_PKG IN LISTS GST_EXT_PKGS) @@ -242,7 +250,7 @@ if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "Release") endif() endif() -if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "Debug") +if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") file(GLOB_RECURSE GST_EXT_PKGS "${CURRENT_PACKAGES_DIR}/debug/lib/gstreamer-1.0/pkgconfig/*.pc") if (GST_EXT_PKGS) foreach(GST_EXT_PKG IN LISTS GST_EXT_PKGS) From fc671927f27ce1ff78c45676034cd901bb88566f Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Mon, 18 Oct 2021 02:10:24 -0700 Subject: [PATCH 10/30] Revert test code --- ports/gstreamer/portfile.cmake | 8 -------- 1 file changed, 8 deletions(-) diff --git a/ports/gstreamer/portfile.cmake b/ports/gstreamer/portfile.cmake index 2f31df45b48090..22fb32d9bfd650 100644 --- a/ports/gstreamer/portfile.cmake +++ b/ports/gstreamer/portfile.cmake @@ -105,13 +105,6 @@ else() set(LIBRARY_LINKAGE "static") endif() -set(GST_EXTRA_OPTS ) -# See issue https://gitlab.freedesktop.org/gstreamer/gst-build/-/issues/186 -if (VCPKG_TARGET_IS_OSX) - message(WARNING "${PORT} has bug when using Darwin, temporary disable feature gst-full-version-script automaticly.") - set(GST_EXTRA_OPTS "-Dgst-full-version-script=")# Keep this to empty to avoid osx build failure -endif() - # gst-build's meson configuration needs git. Make the tool visible. vcpkg_find_acquire_program(GIT) get_filename_component(GIT_DIR "${GIT}" DIRECTORY) @@ -146,7 +139,6 @@ vcpkg_configure_meson( -Dgstreamer:gtk_doc=disabled -Dgstreamer:introspection=disabled -Dgstreamer:nls=disabled - ${GST_EXTRA_OPTS} # gst-plugins-base -Dgst-plugins-base:default_library=${LIBRARY_LINKAGE} -Dgst-plugins-base:examples=disabled From 374ef5963846108c8e3b462f1a76862128256190 Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Mon, 18 Oct 2021 02:17:51 -0700 Subject: [PATCH 11/30] Revert test code --- ports/gstreamer/portfile.cmake | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/ports/gstreamer/portfile.cmake b/ports/gstreamer/portfile.cmake index 22fb32d9bfd650..2f31df45b48090 100644 --- a/ports/gstreamer/portfile.cmake +++ b/ports/gstreamer/portfile.cmake @@ -105,6 +105,13 @@ else() set(LIBRARY_LINKAGE "static") endif() +set(GST_EXTRA_OPTS ) +# See issue https://gitlab.freedesktop.org/gstreamer/gst-build/-/issues/186 +if (VCPKG_TARGET_IS_OSX) + message(WARNING "${PORT} has bug when using Darwin, temporary disable feature gst-full-version-script automaticly.") + set(GST_EXTRA_OPTS "-Dgst-full-version-script=")# Keep this to empty to avoid osx build failure +endif() + # gst-build's meson configuration needs git. Make the tool visible. vcpkg_find_acquire_program(GIT) get_filename_component(GIT_DIR "${GIT}" DIRECTORY) @@ -139,6 +146,7 @@ vcpkg_configure_meson( -Dgstreamer:gtk_doc=disabled -Dgstreamer:introspection=disabled -Dgstreamer:nls=disabled + ${GST_EXTRA_OPTS} # gst-plugins-base -Dgst-plugins-base:default_library=${LIBRARY_LINKAGE} -Dgst-plugins-base:examples=disabled From 7c5d13cab78ad92606746e42ecdf7f79b17b3980 Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Mon, 18 Oct 2021 02:18:02 -0700 Subject: [PATCH 12/30] version --- versions/g-/gstreamer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/g-/gstreamer.json b/versions/g-/gstreamer.json index ceecb2b109b6ca..d813c8c1bf9ca6 100644 --- a/versions/g-/gstreamer.json +++ b/versions/g-/gstreamer.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "07be58a4726cc70bfb1e44455804bb117805e8f0", + "git-tree": "d0f8d5d0a7204411a1ef31c8de847525e879a732", "version": "1.19.2", "port-version": 2 }, From 9dadd27425d3f84d861e3731a0b3dc70a5aa5b28 Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Mon, 18 Oct 2021 02:19:36 -0700 Subject: [PATCH 13/30] Revert test code --- ports/gstreamer/portfile.cmake | 8 -------- 1 file changed, 8 deletions(-) diff --git a/ports/gstreamer/portfile.cmake b/ports/gstreamer/portfile.cmake index 2f31df45b48090..22fb32d9bfd650 100644 --- a/ports/gstreamer/portfile.cmake +++ b/ports/gstreamer/portfile.cmake @@ -105,13 +105,6 @@ else() set(LIBRARY_LINKAGE "static") endif() -set(GST_EXTRA_OPTS ) -# See issue https://gitlab.freedesktop.org/gstreamer/gst-build/-/issues/186 -if (VCPKG_TARGET_IS_OSX) - message(WARNING "${PORT} has bug when using Darwin, temporary disable feature gst-full-version-script automaticly.") - set(GST_EXTRA_OPTS "-Dgst-full-version-script=")# Keep this to empty to avoid osx build failure -endif() - # gst-build's meson configuration needs git. Make the tool visible. vcpkg_find_acquire_program(GIT) get_filename_component(GIT_DIR "${GIT}" DIRECTORY) @@ -146,7 +139,6 @@ vcpkg_configure_meson( -Dgstreamer:gtk_doc=disabled -Dgstreamer:introspection=disabled -Dgstreamer:nls=disabled - ${GST_EXTRA_OPTS} # gst-plugins-base -Dgst-plugins-base:default_library=${LIBRARY_LINKAGE} -Dgst-plugins-base:examples=disabled From 26360c41ffbb180b2f69ecd1dcf1bd4616fd1f41 Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Mon, 18 Oct 2021 02:19:48 -0700 Subject: [PATCH 14/30] version --- versions/g-/gstreamer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/g-/gstreamer.json b/versions/g-/gstreamer.json index d813c8c1bf9ca6..007940370ba20a 100644 --- a/versions/g-/gstreamer.json +++ b/versions/g-/gstreamer.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "d0f8d5d0a7204411a1ef31c8de847525e879a732", + "git-tree": "a00adb98f165162d5b2586632b33853bac62cfbb", "version": "1.19.2", "port-version": 2 }, From 319a91d261e405b70105679ba9b0351bc8901023 Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Sun, 6 Feb 2022 19:03:43 -0800 Subject: [PATCH 15/30] version --- versions/baseline.json | 4 ++-- versions/g-/gst-rtsp-server.json | 5 +++++ versions/g-/gstreamer.json | 5 +++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index 17aabba0090fd2..0e1c32b74d9555 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2618,11 +2618,11 @@ }, "gst-rtsp-server": { "baseline": "1.19.2", - "port-version": 1 + "port-version": 2 }, "gstreamer": { "baseline": "1.19.2", - "port-version": 3 + "port-version": 4 }, "gtest": { "baseline": "1.11.0", diff --git a/versions/g-/gst-rtsp-server.json b/versions/g-/gst-rtsp-server.json index 695937996b7e7a..233da6a61111e7 100644 --- a/versions/g-/gst-rtsp-server.json +++ b/versions/g-/gst-rtsp-server.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8804d874d5afbae844ee85257defb7ad52ba85f8", + "version": "1.19.2", + "port-version": 2 + }, { "git-tree": "d769d57cd8c5c732146992a174266c11e7ef52ec", "version": "1.19.2", diff --git a/versions/g-/gstreamer.json b/versions/g-/gstreamer.json index c3f52893a3d55b..108be7d999dbdc 100644 --- a/versions/g-/gstreamer.json +++ b/versions/g-/gstreamer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "af71b11cd5af08c43a080bf907b446ac952dfc61", + "version": "1.19.2", + "port-version": 4 + }, { "git-tree": "25482001e85b34b144a67fc9cc86127f9e8c89ea", "version": "1.19.2", From b136dafe142b07f825ee91c5d502ec1b18c77155 Mon Sep 17 00:00:00 2001 From: Park DongHa Date: Thu, 3 Mar 2022 11:54:56 +0900 Subject: [PATCH 16/30] [gstreamer] build with 1.19.3 (#4) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [gstreamer] exclude plugin sources from build * 1.19.2 version doesn't contain plugins folder for good/bad/ugly. Bump to 1.19.3 which has subprojects * Remove 'gstreamer-1.0' from install path. There might be a option for plugin scan... Need to check docs for it * [gstreamer] update vcpkg.json * remove gstreamer failure in ci.baseline.txt * [gstreamer] remove release options * [gstreamer] fix PDB, tool install in Windows * [gstreamer] remove 'gstreamer-1.0' from install path * [gstreamer] remove unused patches * [gstreamer] fix mp3lame link error in windows * [gstreamer] resurrect gstglconfig.h * [gstreamer] revert pkgconfig install path * [gstreamer] rewrite port/patch * [gstreamer] change pkgconfig fixup * [gstreamer] fix syntax error after merge * Update ports/gstreamer/portfile.cmake Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * Update ports/gstreamer/portfile.cmake Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * [gstremaer] fix license install * update version JSON Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> --- ports/gstreamer/fix-package-search.patch | 19 ++ ports/gstreamer/plugins-base-use-zlib.patch | 13 - ports/gstreamer/plugins-good-use-zlib.patch | 13 - ports/gstreamer/portfile.cmake | 255 ++++++-------------- ports/gstreamer/vcpkg.json | 4 +- versions/baseline.json | 4 +- versions/g-/gstreamer.json | 6 +- 7 files changed, 102 insertions(+), 212 deletions(-) create mode 100644 ports/gstreamer/fix-package-search.patch delete mode 100644 ports/gstreamer/plugins-base-use-zlib.patch delete mode 100644 ports/gstreamer/plugins-good-use-zlib.patch diff --git a/ports/gstreamer/fix-package-search.patch b/ports/gstreamer/fix-package-search.patch new file mode 100644 index 00000000000000..5bcec9551b1ee5 --- /dev/null +++ b/ports/gstreamer/fix-package-search.patch @@ -0,0 +1,19 @@ +diff --git a/subprojects/gst-plugins-good/ext/lame/meson.build b/subprojects/gst-plugins-good/ext/lame/meson.build +index 2169fde..4a33f6e 100644 +--- a/subprojects/gst-plugins-good/ext/lame/meson.build ++++ b/subprojects/gst-plugins-good/ext/lame/meson.build +@@ -1,9 +1,13 @@ + lame_option = get_option('lame') + + lame_extra_c_args = [] +-lame_dep = cc.find_library('mp3lame', required: false) + have_lame = cc.has_header_symbol('lame/lame.h', 'lame_init') + if have_lame ++ if host_system == 'windows' # vcpkg port 'mp3lame' ++ lame_dep = cc.find_library('libmp3lame', required: true) ++ else ++ lame_dep = cc.find_library('mp3lame', required: true) ++ endif + if cc.has_header_symbol('lame/lame.h', 'lame_set_VBR_quality') + lame_extra_c_args += ['-DHAVE_LAME_SET_VBR_QUALITY'] + endif diff --git a/ports/gstreamer/plugins-base-use-zlib.patch b/ports/gstreamer/plugins-base-use-zlib.patch deleted file mode 100644 index 57b997ca7d9d8c..00000000000000 --- a/ports/gstreamer/plugins-base-use-zlib.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/gst-libs/gst/tag/meson.build b/gst-libs/gst/tag/meson.build -index 5ec3739..a6cff8d 100644 ---- a/gst-libs/gst/tag/meson.build -+++ b/gst-libs/gst/tag/meson.build -@@ -70,7 +70,7 @@ endif - core_conf.set('HAVE_ISO_CODES', have_iso_codes) - - # could drop optional zlib dep and use g_zlib_decompressor_new() --zlib_dep = dependency('zlib', required : false) -+zlib_dep = dependency('zlib', required : true) - if not zlib_dep.found() - zlib_dep = cc.find_library('z', required : false) - if not zlib_dep.found() or not cc.has_header('zlib.h') diff --git a/ports/gstreamer/plugins-good-use-zlib.patch b/ports/gstreamer/plugins-good-use-zlib.patch deleted file mode 100644 index efea351f165ea6..00000000000000 --- a/ports/gstreamer/plugins-good-use-zlib.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/meson.build b/meson.build -index 9de3b01..091a7f0 100644 ---- a/meson.build -+++ b/meson.build -@@ -326,7 +326,7 @@ if have_gstgl - endif - endif - --zlib_dep = dependency('zlib', required : false) -+zlib_dep = dependency('zlib', required : true) - if not zlib_dep.found() - zlib_dep = cc.find_library('z', required : false) - if not zlib_dep.found() or not cc.has_header('zlib.h') diff --git a/ports/gstreamer/portfile.cmake b/ports/gstreamer/portfile.cmake index 791b3f16fa1f72..8fcf33504177fd 100644 --- a/ports/gstreamer/portfile.cmake +++ b/ports/gstreamer/portfile.cmake @@ -1,83 +1,11 @@ vcpkg_from_github( - OUT_SOURCE_PATH GST_BUILD_SOURCE_PATH - REPO gstreamer/gst-build - REF 1.19.2 - SHA512 d6b8e9fc195a60dfb83fe8a49040c21ca5603e3ada2036d56851e6e61a1cd2653ad45f33e39388bde859dfb4806f4a60d9dbfac5fe41b6d2a8b395c44d4525e3 - HEAD_REF master -) -vcpkg_from_github( - OUT_SOURCE_PATH GST_SOURCE_PATH + OUT_SOURCE_PATH SOURCE_PATH REPO gstreamer/gstreamer - REF 1.19.2 - SHA512 6070f1febf2a1bcc6e68f1e03c1b76891db210773065696e26fac20f0bd3ff47e1634222a49f93a10f6e47717ff21084c9ae0feed6a20facb9650aeb879cc380 - HEAD_REF master -) -if(VCPKG_TARGET_IS_WINDOWS) - list(APPEND PLUGIN_BASE_PATCHES plugins-base-use-zlib.patch) - list(APPEND PLUGIN_GOOD_PATCHES plugins-good-use-zlib.patch) -endif() -vcpkg_from_github( - OUT_SOURCE_PATH GST_PLUGIN_BASE_SOURCE_PATH - REPO gstreamer/gst-plugins-base - REF 1.19.2 - SHA512 d2005e6a3bda5f08395b131347e8f4054c2469e04e65d1acc1a1572bf10d81d4dad4e43d6a8600346b6175a2310f81157a0cd27398ef69b5363b16346febfb39 - HEAD_REF master - PATCHES ${PLUGIN_BASE_PATCHES} -) -vcpkg_from_github( - OUT_SOURCE_PATH GST_PLUGIN_GOOD_SOURCE_PATH - REPO gstreamer/gst-plugins-good - REF 1.19.2 - SHA512 71e9f36d407db3b75d9a68f6447093aa011b2b586b06e0a1bb79c7db37c9114de505699e99a4dad06d8d9c742e91f48dd35457283babe440f88a9e40d3da465b - HEAD_REF master - PATCHES ${PLUGIN_GOOD_PATCHES} -) -vcpkg_from_github( - OUT_SOURCE_PATH GST_PLUGIN_BAD_SOURCE_PATH - REPO gstreamer/gst-plugins-bad - REF 1.19.2 - SHA512 f63ca3abf380bba92dca4ac3a51cba5ea95093693cf64d167a7a9c0bf6341c35a74fd42332673dbd1581ea70da0a35026aa3e2ce99b5e573268ccb55b5491c1d + REF 1.19.3 + SHA512 a132b7d3eeae19a1021abf7d5604c212a29039847ec851c8a24b54a60559a4b68c5b4d26c6a2aaac0a4b03c8939fcf4bb1c2716371407cb75bf2e75dab35a805 HEAD_REF master + PATCHES fix-package-search.patch ) -vcpkg_from_github( - OUT_SOURCE_PATH GST_PLUGIN_UGLY_SOURCE_PATH - REPO gstreamer/gst-plugins-ugly - REF 1.19.2 - SHA512 70dcd4a36d3bd35f680eaa3c980842fbb57f55f17d1453c6a95640709b1b33a263689bf54caa367154267d281e5474686fedaa980de24094de91886a57b6547a - HEAD_REF master -) -vcpkg_from_gitlab( - GITLAB_URL https://gitlab.freedesktop.org - OUT_SOURCE_PATH GST_MESON_PORTS_SOURCE_PATH - REPO gstreamer/meson-ports/gl-headers - REF 5c8c7c0d3ca1f0b783272dac0b95e09414e49bc8 # master commit. Date 2021-04-21 - SHA512 d001535e1c1b5bb515ac96c7d15b25ca51460a5af0c858df53b11c7bae87c4a494e4a1b1b9c3c41a5989001db083645dde2054b82acbbeab7f9939308b676f9c - HEAD_REF master -) - -file(RENAME "${GST_SOURCE_PATH}" "${GST_BUILD_SOURCE_PATH}/subprojects/gstreamer") -file(RENAME "${GST_PLUGIN_BASE_SOURCE_PATH}" "${GST_BUILD_SOURCE_PATH}/subprojects/gst-plugins-base") -file(RENAME "${GST_PLUGIN_GOOD_SOURCE_PATH}" "${GST_BUILD_SOURCE_PATH}/subprojects/gst-plugins-good") -file(RENAME "${GST_PLUGIN_BAD_SOURCE_PATH}" "${GST_BUILD_SOURCE_PATH}/subprojects/gst-plugins-bad") -file(RENAME "${GST_PLUGIN_UGLY_SOURCE_PATH}" "${GST_BUILD_SOURCE_PATH}/subprojects/gst-plugins-ugly") -file(RENAME "${GST_MESON_PORTS_SOURCE_PATH}" "${GST_BUILD_SOURCE_PATH}/subprojects/gl-headers") - -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+ - vcpkg_find_acquire_program(BISON) - 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() # make tools like 'glib-mkenums' visible get_filename_component(GLIB_TOOL_DIR "${CURRENT_INSTALLED_DIR}/tools/glib" ABSOLUTE) @@ -97,47 +25,51 @@ else() set(PLUGIN_UGLY_SUPPORT disabled) endif() -if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - set(LIBRARY_LINKAGE "shared") -else() - set(LIBRARY_LINKAGE "static") -endif() - # gst-build's meson configuration needs git. Make the tool visible. vcpkg_find_acquire_program(GIT) get_filename_component(GIT_DIR "${GIT}" DIRECTORY) vcpkg_add_to_path("${GIT_DIR}") -# -# check scripts/cmake/vcpkg_configure_meson.cmake -# --wrap-mode=nodownload -# -# References -# https://github.com/GStreamer/gst-build/blob/1.18.4/meson_options.txt -# https://github.com/GStreamer/gst-plugins-base/blob/1.18.4/meson_options.txt -# https://github.com/GStreamer/gst-plugins-good/blob/1.18.4/meson_options.txt -# https://github.com/GStreamer/gst-plugins-bad/blob/1.18.4/meson_options.txt -# https://github.com/GStreamer/gst-plugins-ugly/blob/1.18.4/meson_options.txt -# +if(VCPKG_TARGET_IS_WINDOWS) + list(APPEND PLATFORM_OPTIONS + -Dgst-full-version-script=data/misc/gstreamer-full-default.map + # We can use EGL in Windows if port 'angle' is already installed. + # In the case, GL API should be 'gles2'. + -Dgst-plugins-base:gl_platform=auto # -Dgst-plugins-base:gl_platform=egl + -Dgst-plugins-base:gl_api=opengl # -Dgst-plugins-base:gl_api=gles2 + # use 'winrt' if system version is high enough? + -Dgst-plugins-base:gl_winsys=win32 + ) +elseif(VCPKG_TARGET_IS_OSX) + list(APPEND PLATFORM_OPTIONS + -Dgst-full-version-script= # this empty string intended + -Dgst-plugins-base:gl_platform=cgl + -Dgst-plugins-base:gl_winsys=cocoa + ) +elseif(VCPKG_TARGET_IS_ANDROID) + list(APPEND PLATFORM_OPTIONS + -Dgst-plugins-base:gl_platform=egl + -Dgst-plugins-base:gl_winsys=android + ) +endif() + vcpkg_configure_meson( - SOURCE_PATH ${GST_BUILD_SOURCE_PATH} + SOURCE_PATH ${SOURCE_PATH} OPTIONS - # gstreamer - -Dgstreamer:default_library=${LIBRARY_LINKAGE} - -Dgstreamer:check=disabled - -Dgstreamer:libunwind=disabled - -Dgstreamer:libdw=disabled - -Dgstreamer:dbghelp=disabled - -Dgstreamer:bash-completion=disabled - -Dgstreamer:coretracers=disabled - -Dgstreamer:examples=disabled - -Dgstreamer:tests=disabled - -Dgstreamer:benchmarks=disabled - -Dgstreamer:tools=disabled - -Dgstreamer:introspection=disabled - -Dgstreamer:nls=disabled + ${PLATFORM_OPTIONS} + # gstreamer/meson_options.txt + -Dtests=disabled + -Dexamples=disabled + -Dintrospection=disabled + -Dnls=disabled + -Ddoc=disabled + -Dorc=disabled + -Dges=disabled + # subprojects + -Drtsp_server=disabled + -Ddevtools=disabled # gst-plugins-base - -Dgst-plugins-base:default_library=${LIBRARY_LINKAGE} + -Dgst-plugins-base:package-origin="vcpkg" -Dgst-plugins-base:examples=disabled -Dgst-plugins-base:tests=disabled -Dgst-plugins-base:tools=disabled @@ -145,10 +77,12 @@ vcpkg_configure_meson( -Dgst-plugins-base:nls=disabled -Dgst-plugins-base:orc=disabled -Dgst-plugins-base:pango=disabled + -Dgst-plugins-base:doc=disabled # gst-plugins-good - -Dgst-plugins-good:default_library=${LIBRARY_LINKAGE} + -Dgst-plugins-good:package-origin="vcpkg" -Dgst-plugins-good:qt5=disabled -Dgst-plugins-good:soup=disabled + -Dgst-plugins-good:lame=enabled # mp3lame -Dgst-plugins-good:cairo=auto # cairo[gobject] -Dgst-plugins-good:speex=auto # speex -Dgst-plugins-good:taglib=auto # taglib @@ -159,58 +93,23 @@ vcpkg_configure_meson( -Dgst-plugins-good:orc=disabled # gst-plugins-bad -Dbad=${PLUGIN_BAD_SUPPORT} - -Dgst-plugins-bad:default_library=${LIBRARY_LINKAGE} + -Dgst-plugins-bad:package-origin="vcpkg" -Dgst-plugins-bad:opencv=disabled -Dgst-plugins-bad:hls-crypto=openssl -Dgst-plugins-bad:examples=disabled -Dgst-plugins-bad:tests=disabled -Dgst-plugins-bad:introspection=disabled - -Dgst-plugins-bad:nls=${LIBRARY_LINKAGE} + -Dgst-plugins-bad:nls=disabled -Dgst-plugins-bad:orc=disabled # gst-plugins-ugly -Dugly=${PLUGIN_UGLY_SUPPORT} - -Dgst-plugins-ugly:default_library=${LIBRARY_LINKAGE} + -Dgst-plugins-ugly:package-origin="vcpkg" -Dgst-plugins-ugly:tests=disabled -Dgst-plugins-ugly:nls=disabled -Dgst-plugins-ugly:orc=disabled - # see ${GST_BUILD_SOURCE_PATH}/meson_options.txt - -Dpython=disabled - -Dlibav=disabled - -Dlibnice=disabled # libnice - -Ddevtools=disabled - -Dges=disabled - -Drtsp_server=disabled - -Domx=disabled - -Dvaapi=disabled - -Dsharp=disabled - -Drs=disabled - -Dgst-examples=disabled - -Dtls=disabled - -Dtests=disabled # common options - -Dexamples=disabled - -Dintrospection=disabled - -Dnls=disabled - -Dorc=disabled - -Ddoc=disabled - -Dgtk_doc=disabled - -Ddevtools=disabled - OPTIONS_DEBUG - -Dgstreamer:gst_debug=true # plugins will reference this value OPTIONS_RELEASE - -Dgstreamer:gst_debug=false - -Dgstreamer:gobject-cast-checks=disabled - -Dgstreamer:glib-asserts=disabled - -Dgstreamer:glib-checks=disabled - -Dgstreamer:extra-checks=disabled - -Dgst-plugins-base:gobject-cast-checks=disabled -Dgst-plugins-base:glib-asserts=disabled -Dgst-plugins-base:glib-checks=disabled - -Dgst-plugins-good:gobject-cast-checks=disabled - -Dgst-plugins-good:glib-asserts=disabled - -Dgst-plugins-good:glib-checks=disabled - -Dgst-plugins-bad:gobject-cast-checks=disabled - -Dgst-plugins-bad:glib-asserts=disabled - -Dgst-plugins-bad:glib-checks=disabled ) if(VCPKG_TARGET_IS_WINDOWS) # note: can't find where z.lib comes from. replace it to appropriate library name manually @@ -222,12 +121,28 @@ if(VCPKG_TARGET_IS_WINDOWS) endif() vcpkg_install_meson() +vcpkg_copy_tools(TOOL_NAMES gst-inspect-1.0 gst-launch-1.0 gst-stats-1.0 gst-typefind-1.0 AUTO_CLEAN) +vcpkg_copy_pdbs() +set(pkg_name "gstreamer-1.0") +file(RENAME "${CURRENT_PACKAGES_DIR}/lib/${pkg_name}/include/gst/gl/gstglconfig.h" + "${CURRENT_PACKAGES_DIR}/include/${pkg_name}/gst/gl/gstglconfig.h" +) + +# Remove duplicated GL headers (we already have `opengl-registry`) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/KHR" + "${CURRENT_PACKAGES_DIR}/include/GL" + "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/debug/libexec" + "${CURRENT_PACKAGES_DIR}/debug/lib/${pkg_name}/include" + "${CURRENT_PACKAGES_DIR}/libexec" + "${CURRENT_PACKAGES_DIR}/lib/${pkg_name}/include" +) vcpkg_copy_pdbs() # For pkgconfig if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - file(GLOB_RECURSE GST_EXT_PKGS "${CURRENT_PACKAGES_DIR}/lib/gstreamer-1.0/pkgconfig/*.pc") + file(GLOB_RECURSE GST_EXT_PKGS "${CURRENT_PACKAGES_DIR}/lib/${pkg_name}/pkgconfig/*.pc") if (GST_EXT_PKGS) foreach(GST_EXT_PKG IN LISTS GST_EXT_PKGS) file(READ "${GST_EXT_PKG}" GST_EXT_PKG_CONTENT) @@ -238,9 +153,8 @@ if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") endforeach() endif() endif() - if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - file(GLOB_RECURSE GST_EXT_PKGS "${CURRENT_PACKAGES_DIR}/debug/lib/gstreamer-1.0/pkgconfig/*.pc") + file(GLOB_RECURSE GST_EXT_PKGS "${CURRENT_PACKAGES_DIR}/debug/lib/${pkg_name}/pkgconfig/*.pc") if (GST_EXT_PKGS) foreach(GST_EXT_PKG IN LISTS GST_EXT_PKGS) file(READ "${GST_EXT_PKG}" GST_EXT_PKG_CONTENT) @@ -252,42 +166,25 @@ if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") endif() endif() -vcpkg_fixup_pkgconfig() - -# Remove duplicated GL headers (we already have `opengl-registry`) -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/KHR" - "${CURRENT_PACKAGES_DIR}/include/GL" -) -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" +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/${pkg_name}/pkgconfig" + "${CURRENT_PACKAGES_DIR}/lib/${pkg_name}/pkgconfig" ) +vcpkg_fixup_pkgconfig() -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" -) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") 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}" - ) -endif() -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" +elseif(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + file(GLOB DBG_BINS "${CURRENT_PACKAGES_DIR}/debug/lib/${pkg_name}/*.dll" + "${CURRENT_PACKAGES_DIR}/debug/lib/${pkg_name}/*.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(GLOB REL_BINS "${CURRENT_PACKAGES_DIR}/lib/${pkg_name}/*.dll" + "${CURRENT_PACKAGES_DIR}/lib/${pkg_name}/*.pdb" ) - file(COPY ${REL_BINS} DESTINATION "${CURRENT_PACKAGES_DIR}/bin") + file(COPY ${DBG_BINS} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin/${pkg_name}") + file(COPY ${REL_BINS} DESTINATION "${CURRENT_PACKAGES_DIR}/bin/${pkg_name}") file(REMOVE ${DBG_BINS} ${REL_BINS}) endif() -file(INSTALL "${GST_BUILD_SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/gstreamer/vcpkg.json b/ports/gstreamer/vcpkg.json index a094f9ac440efe..052f456e3d9e59 100644 --- a/ports/gstreamer/vcpkg.json +++ b/ports/gstreamer/vcpkg.json @@ -1,7 +1,6 @@ { "name": "gstreamer", - "version": "1.19.2", - "port-version": 4, + "version": "1.19.3", "description": "GStreamer open-source multimedia framework core library", "homepage": "https://gstreamer.freedesktop.org/", "license": "LGPL-2.0", @@ -64,6 +63,7 @@ "libpng", "libraw", "libvpx", + "mp3lame", "mpg123", "speex", "taglib" diff --git a/versions/baseline.json b/versions/baseline.json index 0e1c32b74d9555..cca3fc234e9658 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2621,8 +2621,8 @@ "port-version": 2 }, "gstreamer": { - "baseline": "1.19.2", - "port-version": 4 + "baseline": "1.19.3", + "port-version": 0 }, "gtest": { "baseline": "1.11.0", diff --git a/versions/g-/gstreamer.json b/versions/g-/gstreamer.json index 108be7d999dbdc..377dc5725b43bf 100644 --- a/versions/g-/gstreamer.json +++ b/versions/g-/gstreamer.json @@ -1,9 +1,9 @@ { "versions": [ { - "git-tree": "af71b11cd5af08c43a080bf907b446ac952dfc61", - "version": "1.19.2", - "port-version": 4 + "git-tree": "bc19edce2b7947a71f4b5f6c900661c8d47b9dd6", + "version": "1.19.3", + "port-version": 0 }, { "git-tree": "25482001e85b34b144a67fc9cc86127f9e8c89ea", From ade3e077575258e0389b7a89170bbd997f143f21 Mon Sep 17 00:00:00 2001 From: Park DongHa Date: Thu, 17 Mar 2022 11:48:50 +0900 Subject: [PATCH 17/30] [gstreamer] fix feature option 'flac' (#5) * x264 requires GPL license --- ports/gstreamer/portfile.cmake | 7 +++++++ versions/baseline.json | 4 ++-- versions/g-/gstreamer.json | 5 +++++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/ports/gstreamer/portfile.cmake b/ports/gstreamer/portfile.cmake index 9fbb3d6131e66d..4cee4948bdaa66 100644 --- a/ports/gstreamer/portfile.cmake +++ b/ports/gstreamer/portfile.cmake @@ -12,11 +12,17 @@ get_filename_component(GLIB_TOOL_DIR "${CURRENT_INSTALLED_DIR}/tools/glib" ABSOL message(STATUS "Using glib tools: ${GLIB_TOOL_DIR}") vcpkg_add_to_path(PREPEND "${GLIB_TOOL_DIR}") +# Some features might require GPL option. -Dgpl=enabled if ("x264" IN_LIST FEATURES) set(PLUGIN_UGLY_X264 enabled) else() set(PLUGIN_UGLY_X264 disabled) endif() +if ("flac" IN_LIST FEATURES) + set(PLUGIN_GOOD_FLAC enabled) +else() + set(PLUGIN_GOOD_FLAC disabled) +endif() if("plugins-base" IN_LIST FEATURES) set(PLUGIN_BASE_SUPPORT enabled) @@ -123,6 +129,7 @@ vcpkg_configure_meson( -Dgst-plugins-ugly:doc=disabled -Dgst-plugins-ugly:nls=disabled -Dgst-plugins-ugly:orc=disabled + # -Dgst-plugins-ugly:x264=${PLUGIN_UGLY_X264} OPTIONS_RELEASE -Dgst-plugins-base:glib-asserts=disabled -Dgst-plugins-base:glib-checks=disabled diff --git a/versions/baseline.json b/versions/baseline.json index 26f28dd2b829eb..c70e2a6424433c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2621,8 +2621,8 @@ "port-version": 2 }, "gstreamer": { - "baseline": "1.19.2", - "port-version": 5 + "baseline": "1.19.3", + "port-version": 0 }, "gtest": { "baseline": "1.11.0", diff --git a/versions/g-/gstreamer.json b/versions/g-/gstreamer.json index 4accf168ca7504..95b8457e4db492 100644 --- a/versions/g-/gstreamer.json +++ b/versions/g-/gstreamer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "24bb7b36cb410cc0950e14a1f500714ac5c5a9a8", + "version": "1.19.3", + "port-version": 0 + }, { "git-tree": "0524a22dbda0c09201b9c677b6f72dbce870d6df", "version": "1.19.2", From 409e70fee06ad9633888db93330c36f6680211d8 Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Thu, 17 Mar 2022 19:53:06 -0700 Subject: [PATCH 18/30] Apply suggestion --- ports/gstreamer/portfile.cmake | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ports/gstreamer/portfile.cmake b/ports/gstreamer/portfile.cmake index 4cee4948bdaa66..efae7b46e01064 100644 --- a/ports/gstreamer/portfile.cmake +++ b/ports/gstreamer/portfile.cmake @@ -42,6 +42,12 @@ else() set(PLUGIN_UGLY_SUPPORT disabled) endif() +if ("gl-graphene" IN_LIST FEATURES) + set(GL_GRAPHENE enabled) +else() + set(GL_GRAPHENE disabled) +endif() + # gst-build's meson configuration needs git. Make the tool visible. vcpkg_find_acquire_program(GIT) get_filename_component(GIT_DIR "${GIT}" DIRECTORY) @@ -95,6 +101,7 @@ vcpkg_configure_meson( -Dgst-plugins-base:nls=disabled -Dgst-plugins-base:orc=disabled -Dgst-plugins-base:pango=disabled + -Dgst-plugins-base:gl-graphene=${GL_GRAPHENE} -Dgst-plugins-base:doc=disabled # gst-plugins-good -Dgst-plugins-good:package-origin="vcpkg" From 1199e8fa9b9e3963c021b66e84bca724d7fa99e5 Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Thu, 17 Mar 2022 19:53:40 -0700 Subject: [PATCH 19/30] version --- versions/g-/gstreamer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/g-/gstreamer.json b/versions/g-/gstreamer.json index 95b8457e4db492..512d7d974d2ad8 100644 --- a/versions/g-/gstreamer.json +++ b/versions/g-/gstreamer.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "24bb7b36cb410cc0950e14a1f500714ac5c5a9a8", + "git-tree": "a904126034e3a6a66642fd52e5f8c612cdba83fb", "version": "1.19.3", "port-version": 0 }, From 7c79a98902b7c080b353fb0626af1c7b9b6ae743 Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Tue, 12 Apr 2022 23:45:54 -0700 Subject: [PATCH 20/30] Add supports and dependency features --- ports/gst-rtsp-server/vcpkg.json | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/ports/gst-rtsp-server/vcpkg.json b/ports/gst-rtsp-server/vcpkg.json index fb81ad45a77aee..d598df4b3aa7c8 100644 --- a/ports/gst-rtsp-server/vcpkg.json +++ b/ports/gst-rtsp-server/vcpkg.json @@ -4,8 +4,18 @@ "port-version": 2, "description": "gst-rtsp-server is a library on top of GStreamer for building an RTSP server", "homepage": "https://gstreamer.freedesktop.org", + "supports": "!osx", "dependencies": [ - "gstreamer", + { + "name": "gstreamer", + "default-features": false, + "features": [ + "plugins-bad", + "plugins-base", + "plugins-good", + "plugins-ugly" + ] + }, { "name": "vcpkg-tool-meson", "host": true From 9036bef85be701f2f173d862aea51dec3f5c0821 Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Tue, 12 Apr 2022 23:46:16 -0700 Subject: [PATCH 21/30] version --- versions/g-/gst-rtsp-server.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/g-/gst-rtsp-server.json b/versions/g-/gst-rtsp-server.json index 233da6a61111e7..9041fd14ea0a37 100644 --- a/versions/g-/gst-rtsp-server.json +++ b/versions/g-/gst-rtsp-server.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "8804d874d5afbae844ee85257defb7ad52ba85f8", + "git-tree": "558c198063e3ae6c101414c74672884bfb80e9f8", "version": "1.19.2", "port-version": 2 }, From 61e795bb5396491313b4444a8ef1a369078e0de6 Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Wed, 13 Apr 2022 00:53:12 -0700 Subject: [PATCH 22/30] Correct the dependencies according to the platform --- ports/gst-rtsp-server/vcpkg.json | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/ports/gst-rtsp-server/vcpkg.json b/ports/gst-rtsp-server/vcpkg.json index d598df4b3aa7c8..00022dd5dbffdb 100644 --- a/ports/gst-rtsp-server/vcpkg.json +++ b/ports/gst-rtsp-server/vcpkg.json @@ -14,7 +14,18 @@ "plugins-base", "plugins-good", "plugins-ugly" - ] + ], + "platform": "osx" + }, + { + "name": "gstreamer", + "default-features": false, + "features": [ + "plugins-base", + "plugins-good", + "plugins-ugly" + ], + "platform": "!osx" }, { "name": "vcpkg-tool-meson", From 6caae4e8dbaecec9a2826710dccb44ac534ad4be Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Wed, 13 Apr 2022 00:53:23 -0700 Subject: [PATCH 23/30] version --- versions/g-/gst-rtsp-server.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/g-/gst-rtsp-server.json b/versions/g-/gst-rtsp-server.json index 9041fd14ea0a37..198d7e377baa94 100644 --- a/versions/g-/gst-rtsp-server.json +++ b/versions/g-/gst-rtsp-server.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "558c198063e3ae6c101414c74672884bfb80e9f8", + "git-tree": "7ee8619e03c47128fc5c633393e965436c769d29", "version": "1.19.2", "port-version": 2 }, From f85e52401657f8dc5e25e0c98e09f50a250a2dcb Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Wed, 13 Apr 2022 01:13:05 -0700 Subject: [PATCH 24/30] Add supports, add license --- ports/gst-rtsp-server/vcpkg.json | 1 + ports/qtmultimedia/vcpkg.json | 2 ++ 2 files changed, 3 insertions(+) diff --git a/ports/gst-rtsp-server/vcpkg.json b/ports/gst-rtsp-server/vcpkg.json index 00022dd5dbffdb..7b7c46ba3e2883 100644 --- a/ports/gst-rtsp-server/vcpkg.json +++ b/ports/gst-rtsp-server/vcpkg.json @@ -4,6 +4,7 @@ "port-version": 2, "description": "gst-rtsp-server is a library on top of GStreamer for building an RTSP server", "homepage": "https://gstreamer.freedesktop.org", + "license": "GPL-2.0-or-later", "supports": "!osx", "dependencies": [ { diff --git a/ports/qtmultimedia/vcpkg.json b/ports/qtmultimedia/vcpkg.json index b93a864ba6da94..4b8062f87bd5f1 100644 --- a/ports/qtmultimedia/vcpkg.json +++ b/ports/qtmultimedia/vcpkg.json @@ -1,9 +1,11 @@ { "name": "qtmultimedia", "version": "6.2.4", + "port-version": 1, "description": "Qt Multimedia", "homepage": "https://www.qt.io/", "license": null, + "supports": "!osx", "dependencies": [ { "name": "alsa", From e9fcd5ba73dc146ff8e3fa7b63ea1093c7821543 Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Wed, 13 Apr 2022 01:13:41 -0700 Subject: [PATCH 25/30] version --- versions/baseline.json | 2 +- versions/g-/gst-rtsp-server.json | 2 +- versions/q-/qtmultimedia.json | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index 4a518eb7c0b8d5..1b790e7329d3bc 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5910,7 +5910,7 @@ }, "qtmultimedia": { "baseline": "6.2.4", - "port-version": 0 + "port-version": 1 }, "qtnetworkauth": { "baseline": "6.2.4", diff --git a/versions/g-/gst-rtsp-server.json b/versions/g-/gst-rtsp-server.json index 198d7e377baa94..7ed967f32f6d1e 100644 --- a/versions/g-/gst-rtsp-server.json +++ b/versions/g-/gst-rtsp-server.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "7ee8619e03c47128fc5c633393e965436c769d29", + "git-tree": "df17772b4069b1cd540b21804cc3397582831032", "version": "1.19.2", "port-version": 2 }, diff --git a/versions/q-/qtmultimedia.json b/versions/q-/qtmultimedia.json index fc552d13028239..1bce662ecbbe6f 100644 --- a/versions/q-/qtmultimedia.json +++ b/versions/q-/qtmultimedia.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "270c58ea89a27c45c553756bb6a5f6d69b3a4b10", + "version": "6.2.4", + "port-version": 1 + }, { "git-tree": "d0e46329a8e66cf3f95eca5d4018c955a8b54a15", "version": "6.2.4", From 10f388e861df351031080dfdbc4492e532ffd612 Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Wed, 13 Apr 2022 01:20:44 -0700 Subject: [PATCH 26/30] Try to avoid trigger gstreamer[plugins-bad]:x64-osx --- scripts/ci.baseline.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 5175f964b035e6..268a5a8038221d 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -382,6 +382,7 @@ graphqlparser:arm-uwp=fail graphqlparser:x64-uwp=fail gsl:arm-uwp=fail gsl:x64-uwp=fail +gstreamer:x64-osx=fail gtk:x64-windows-static=fail gtk:x64-windows-static-md=fail gts:x64-osx=fail @@ -1043,6 +1044,8 @@ qt5-x11extras:x86-windows=fail qt5-x11extras:x64-windows=fail qt5-x11extras:x64-windows-static=fail qt5-x11extras:x64-windows-static-md=fail +# Don't trigger gstreamer[plugins-bad] because it requires other dependencies not included in vcpkg +qtmultimedia:x64-osx=skip qwt:x64-osx=fail qwt-qt6:x64-osx=fail qwtw:x64-windows=fail From 1c3fa6b8930cf71106012eb40bb0a75bb44b1475 Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Wed, 13 Apr 2022 01:23:55 -0700 Subject: [PATCH 27/30] Update dependencies --- ports/gst-rtsp-server/vcpkg.json | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/ports/gst-rtsp-server/vcpkg.json b/ports/gst-rtsp-server/vcpkg.json index 7b7c46ba3e2883..bd9c68c859e7d1 100644 --- a/ports/gst-rtsp-server/vcpkg.json +++ b/ports/gst-rtsp-server/vcpkg.json @@ -16,17 +16,6 @@ "plugins-good", "plugins-ugly" ], - "platform": "osx" - }, - { - "name": "gstreamer", - "default-features": false, - "features": [ - "plugins-base", - "plugins-good", - "plugins-ugly" - ], - "platform": "!osx" }, { "name": "vcpkg-tool-meson", From 29863b43a5ec9eec601e592a8c4f90d026cd1e1d Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Wed, 13 Apr 2022 01:25:02 -0700 Subject: [PATCH 28/30] Restore some changes --- ports/qtmultimedia/vcpkg.json | 2 -- versions/baseline.json | 2 +- versions/q-/qtmultimedia.json | 5 ----- 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/ports/qtmultimedia/vcpkg.json b/ports/qtmultimedia/vcpkg.json index 4b8062f87bd5f1..b93a864ba6da94 100644 --- a/ports/qtmultimedia/vcpkg.json +++ b/ports/qtmultimedia/vcpkg.json @@ -1,11 +1,9 @@ { "name": "qtmultimedia", "version": "6.2.4", - "port-version": 1, "description": "Qt Multimedia", "homepage": "https://www.qt.io/", "license": null, - "supports": "!osx", "dependencies": [ { "name": "alsa", diff --git a/versions/baseline.json b/versions/baseline.json index 1b790e7329d3bc..4a518eb7c0b8d5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5910,7 +5910,7 @@ }, "qtmultimedia": { "baseline": "6.2.4", - "port-version": 1 + "port-version": 0 }, "qtnetworkauth": { "baseline": "6.2.4", diff --git a/versions/q-/qtmultimedia.json b/versions/q-/qtmultimedia.json index 1bce662ecbbe6f..fc552d13028239 100644 --- a/versions/q-/qtmultimedia.json +++ b/versions/q-/qtmultimedia.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "270c58ea89a27c45c553756bb6a5f6d69b3a4b10", - "version": "6.2.4", - "port-version": 1 - }, { "git-tree": "d0e46329a8e66cf3f95eca5d4018c955a8b54a15", "version": "6.2.4", From b38f27c11cfc2dbbc593666c6754a3ff6c69a586 Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Wed, 13 Apr 2022 01:26:00 -0700 Subject: [PATCH 29/30] format manifest --- ports/gst-rtsp-server/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/gst-rtsp-server/vcpkg.json b/ports/gst-rtsp-server/vcpkg.json index bd9c68c859e7d1..d3037ae7530c9b 100644 --- a/ports/gst-rtsp-server/vcpkg.json +++ b/ports/gst-rtsp-server/vcpkg.json @@ -15,7 +15,7 @@ "plugins-base", "plugins-good", "plugins-ugly" - ], + ] }, { "name": "vcpkg-tool-meson", From 2c41b523daeb9458f3318d50da7299e1c8b97a73 Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Wed, 13 Apr 2022 01:26:08 -0700 Subject: [PATCH 30/30] version --- versions/g-/gst-rtsp-server.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/g-/gst-rtsp-server.json b/versions/g-/gst-rtsp-server.json index 7ed967f32f6d1e..26c958c64433f9 100644 --- a/versions/g-/gst-rtsp-server.json +++ b/versions/g-/gst-rtsp-server.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "df17772b4069b1cd540b21804cc3397582831032", + "git-tree": "16a3b1ae884d447b619cdee3c2e3c540236d4451", "version": "1.19.2", "port-version": 2 },