From 3640e7cb1dca74db63316e4b72adc6e974047a2b Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Mon, 9 Jan 2023 10:08:37 +0100 Subject: [PATCH] [gstreamer] fix core build (#28810) --- ports/gstreamer/portfile.cmake | 2 +- ports/gstreamer/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/g-/gstreamer.json | 5 +++++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/gstreamer/portfile.cmake b/ports/gstreamer/portfile.cmake index d7a7b120b4..ced5f7d215 100644 --- a/ports/gstreamer/portfile.cmake +++ b/ports/gstreamer/portfile.cmake @@ -614,7 +614,7 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/KHR" "${CURRENT_PACKAGES_DIR}/include/GL" ) -if(NOT VCPKG_TARGET_IS_LINUX) +if(NOT VCPKG_TARGET_IS_LINUX AND "plugins-base" 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" ) diff --git a/ports/gstreamer/vcpkg.json b/ports/gstreamer/vcpkg.json index e718f4d165..bd01e6b58d 100644 --- a/ports/gstreamer/vcpkg.json +++ b/ports/gstreamer/vcpkg.json @@ -1,6 +1,7 @@ { "name": "gstreamer", "version": "1.20.5", + "port-version": 1, "description": "GStreamer open-source multimedia framework core library", "homepage": "https://gstreamer.freedesktop.org/", "license": "LGPL-2.0-only", diff --git a/versions/baseline.json b/versions/baseline.json index 8b73e5d940..501dd29703 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2834,7 +2834,7 @@ }, "gstreamer": { "baseline": "1.20.5", - "port-version": 0 + "port-version": 1 }, "gtest": { "baseline": "1.12.1", diff --git a/versions/g-/gstreamer.json b/versions/g-/gstreamer.json index daab2eea72..5c04cfb8d3 100644 --- a/versions/g-/gstreamer.json +++ b/versions/g-/gstreamer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "774edb57247607baee04b2ff5eb8f12f4824f965", + "version": "1.20.5", + "port-version": 1 + }, { "git-tree": "e790c6925b367f31a0d7311288aada1c8d045e56", "version": "1.20.5",