From 36ae07192aa8321b86cfe5e2f617ac68fbdb71d4 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Sat, 2 Oct 2021 12:17:26 +0200 Subject: [PATCH 1/5] update gstreamer, add gst-rtsp-server --- ports/gst-rtsp-server/portfile.cmake | 34 ++++++++++++++++++++++++++++ ports/gst-rtsp-server/vcpkg.json | 7 ++++++ ports/gstreamer/portfile.cmake | 27 +++++++++++----------- ports/gstreamer/vcpkg.json | 2 +- 4 files changed, 56 insertions(+), 14 deletions(-) create mode 100644 ports/gst-rtsp-server/portfile.cmake create mode 100644 ports/gst-rtsp-server/vcpkg.json diff --git a/ports/gst-rtsp-server/portfile.cmake b/ports/gst-rtsp-server/portfile.cmake new file mode 100644 index 00000000000000..d184c1affc5d1d --- /dev/null +++ b/ports/gst-rtsp-server/portfile.cmake @@ -0,0 +1,34 @@ +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org + OUT_SOURCE_PATH SOURCE_PATH + REPO gstreamer/gst-rtsp-server + REF 1.19.2 + SHA512 a227471c790ea4f399748233128558cbd43e941ad9774b99ecd88c1b521a0adfe2932212e7d854f041892a7c3bfc63a1b3ea9dd06d2f0b75b7eee38e392d8c51 + HEAD_REF master +) + +vcpkg_configure_meson( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -Dgstreamer:examples=disabled + -Dgstreamer:tests=disabled + -Dpackage-origin="vcpkg" +) + +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 + ) + 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}) +endif() + +vcpkg_fixup_pkgconfig() + +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 new file mode 100644 index 00000000000000..17cdaa777a870f --- /dev/null +++ b/ports/gst-rtsp-server/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "gst-rtsp-server", + "version": "1.19.2", + "homepage": "", + "description": "", + "dependencies": ["gstreamer"] +} diff --git a/ports/gstreamer/portfile.cmake b/ports/gstreamer/portfile.cmake index add14ef7ddb88f..3aecf5c297ccee 100644 --- a/ports/gstreamer/portfile.cmake +++ b/ports/gstreamer/portfile.cmake @@ -3,15 +3,15 @@ vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp" "emscripten" "wasm32" "and vcpkg_from_github( OUT_SOURCE_PATH GST_BUILD_SOURCE_PATH REPO gstreamer/gst-build - REF 1.18.4 - SHA512 9b3927ba1a2ba1e384f2141c454978f582087795a70246709ed60875bc983a42eef54f3db7617941b8dacc20c434f81ef9931834861767d7a4dc09d42beeb900 + REF 1.19.2 + SHA512 d6b8e9fc195a60dfb83fe8a49040c21ca5603e3ada2036d56851e6e61a1cd2653ad45f33e39388bde859dfb4806f4a60d9dbfac5fe41b6d2a8b395c44d4525e3 HEAD_REF master ) vcpkg_from_github( OUT_SOURCE_PATH GST_SOURCE_PATH REPO gstreamer/gstreamer - REF 1.18.4 - SHA512 684a7ce93143a0c3e0ce627ab2bf1451d49735b4bab273f308bc3b48d8312f7c13c0afa7e71f3a3a7274b90373215636dd8ff0076f143cbe26061de0c4efa102 + REF 1.19.2 + SHA512 6070f1febf2a1bcc6e68f1e03c1b76891db210773065696e26fac20f0bd3ff47e1634222a49f93a10f6e47717ff21084c9ae0feed6a20facb9650aeb879cc380 HEAD_REF master ) if(VCPKG_TARGET_IS_WINDOWS) @@ -21,31 +21,31 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH GST_PLUGIN_BASE_SOURCE_PATH REPO gstreamer/gst-plugins-base - REF 1.18.4 - SHA512 b89924e90f880195740421f2eec3f2a667b96f6ca92ccaf87da246e9c9fd13646bf6235376844c012414a79d38dfaea8f10d56ffec900fe0b9cb8f19e722f05e + 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.18.4 - SHA512 d97f4b76b6fc089b7675a9b10cabf4c704d71d663a23f34133a2671761d98e931aa87df7158f663cd9ebb6a8febd9ab1833aef7eb8be2ef2b54fad288bd0ae66 + 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.18.4 - SHA512 0bf5344fbef883dbe0908495c9a50cd3bf915c5d328cf2768532ff077a9aa4255747f417a310c16c3ea86fcb79ac6ba4bf37375ff84776985451ab47b9d9ac6e + REF 1.19.2 + SHA512 f63ca3abf380bba92dca4ac3a51cba5ea95093693cf64d167a7a9c0bf6341c35a74fd42332673dbd1581ea70da0a35026aa3e2ce99b5e573268ccb55b5491c1d HEAD_REF master ) vcpkg_from_github( OUT_SOURCE_PATH GST_PLUGIN_UGLY_SOURCE_PATH REPO gstreamer/gst-plugins-ugly - REF 1.18.4 - SHA512 01413155d21f654a90bcf7235b5605c244d3700632ae6c56cafbbabfb11192a09c2ab01c4662ab452eabb004b09c9ec2efa72024db8be5863054d25569034a03 + REF 1.19.2 + SHA512 70dcd4a36d3bd35f680eaa3c980842fbb57f55f17d1453c6a95640709b1b33a263689bf54caa367154267d281e5474686fedaa980de24094de91886a57b6547a HEAD_REF master ) vcpkg_from_gitlab( @@ -259,4 +259,5 @@ if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") ) file(COPY ${REL_BINS} DESTINATION ${CURRENT_PACKAGES_DIR}/bin) file(REMOVE ${DBG_BINS} ${REL_BINS}) -endif() \ No newline at end of file +endif() +vcpkg_fixup_pkgconfig() diff --git a/ports/gstreamer/vcpkg.json b/ports/gstreamer/vcpkg.json index b1207ae3748e0d..7d3c171cb12fbc 100644 --- a/ports/gstreamer/vcpkg.json +++ b/ports/gstreamer/vcpkg.json @@ -1,6 +1,6 @@ { "name": "gstreamer", - "version": "1.18.4", + "version": "1.19.2", "description": "GStreamer open-source multimedia framework core library", "homepage": "https://gstreamer.freedesktop.org/", "license": "LGPL-2.0", From 63cc3b4a31bd08b0e79fbf7a18e7c9ee45575740 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Sat, 2 Oct 2021 12:19:08 +0200 Subject: [PATCH 2/5] format --- ports/gst-rtsp-server/vcpkg.json | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/ports/gst-rtsp-server/vcpkg.json b/ports/gst-rtsp-server/vcpkg.json index 17cdaa777a870f..6e31d225762c9f 100644 --- a/ports/gst-rtsp-server/vcpkg.json +++ b/ports/gst-rtsp-server/vcpkg.json @@ -1,7 +1,8 @@ -{ - "name": "gst-rtsp-server", - "version": "1.19.2", - "homepage": "", - "description": "", - "dependencies": ["gstreamer"] -} +{ + "name": "gst-rtsp-server", + "version": "1.19.2", + "description": "", + "dependencies": [ + "gstreamer" + ] +} From efd419b677ca6424dd0f4f385ecc0d0ed972a403 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Sat, 2 Oct 2021 12:19:16 +0200 Subject: [PATCH 3/5] versions --- versions/baseline.json | 6 +++++- versions/g-/gst-rtsp-server.json | 9 +++++++++ versions/g-/gstreamer.json | 5 +++++ 3 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 versions/g-/gst-rtsp-server.json diff --git a/versions/baseline.json b/versions/baseline.json index 6a26b732f4f454..03fe2c1babd5b3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2544,8 +2544,12 @@ "baseline": "2.8.112", "port-version": 0 }, + "gst-rtsp-server": { + "baseline": "1.19.2", + "port-version": 0 + }, "gstreamer": { - "baseline": "1.18.4", + "baseline": "1.19.2", "port-version": 0 }, "gtest": { diff --git a/versions/g-/gst-rtsp-server.json b/versions/g-/gst-rtsp-server.json new file mode 100644 index 00000000000000..220085f541544f --- /dev/null +++ b/versions/g-/gst-rtsp-server.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "714d7275b9c383d12dcc6f0720d2a3d16f014373", + "version": "1.19.2", + "port-version": 0 + } + ] +} diff --git a/versions/g-/gstreamer.json b/versions/g-/gstreamer.json index e38c1dcec04d42..d936260486d824 100644 --- a/versions/g-/gstreamer.json +++ b/versions/g-/gstreamer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "25482bf1d9dd85257c13e394b45745f77a29bf51", + "version": "1.19.2", + "port-version": 0 + }, { "git-tree": "308df77361916f76938e3a022feab2520e2ce2a3", "version": "1.18.4", From b93262b9b8e809f2d7bd49fdd66a9d6b6fa2338d Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Tue, 5 Oct 2021 21:47:17 +0200 Subject: [PATCH 4/5] update description --- 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 6e31d225762c9f..f9f495c64b760e 100644 --- a/ports/gst-rtsp-server/vcpkg.json +++ b/ports/gst-rtsp-server/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gst-rtsp-server", "version": "1.19.2", - "description": "", + "description": "gst-rtsp-server is a library on top of GStreamer for building an RTSP server", "dependencies": [ "gstreamer" ] From 71efc888a882efb6b814c4cc425f0b1bcf19eede Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Tue, 5 Oct 2021 21:47:50 +0200 Subject: [PATCH 5/5] verison --- 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 220085f541544f..e16a6ef93b8b40 100644 --- a/versions/g-/gst-rtsp-server.json +++ b/versions/g-/gst-rtsp-server.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "714d7275b9c383d12dcc6f0720d2a3d16f014373", + "git-tree": "0c628b2e09422aa3c82fc3d06757cdef559e9ce4", "version": "1.19.2", "port-version": 0 }