From 9021cb001a46855a4c5061b63c8ce6d36372df2d Mon Sep 17 00:00:00 2001 From: Marc <31337222+marcbull@users.noreply.github.com> Date: Fri, 15 Dec 2023 07:51:50 +0100 Subject: [PATCH] [gstreamer] add feature to enable aom support (#35680) * [gstreamer] add feature to enable aom support * Update version database * [gstreamer] disable aom feature on windows * Update version database --- ports/gstreamer/portfile.cmake | 2 +- ports/gstreamer/vcpkg.json | 16 +++++++++++++++- versions/baseline.json | 2 +- versions/g-/gstreamer.json | 5 +++++ 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/ports/gstreamer/portfile.cmake b/ports/gstreamer/portfile.cmake index 099427ba6a2606..bd3908ff2bb95e 100644 --- a/ports/gstreamer/portfile.cmake +++ b/ports/gstreamer/portfile.cmake @@ -80,6 +80,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS plugins-bad bad aes gst-plugins-bad:aes + aom gst-plugins-bad:aom assrender gst-plugins-bad:assrender bzip2-bad gst-plugins-bad:bz2 chromaprint gst-plugins-bad:chromaprint @@ -214,7 +215,6 @@ vcpkg_configure_meson( -Dgst-plugins-ugly:mpeg2dec=disabled # libmpeg2 not found -Dgst-plugins-ugly:sidplay=disabled # gst-plugins-bad - -Dgst-plugins-bad:aom=disabled # Error during plugin build -Dgst-plugins-bad:avtp=disabled -Dgst-plugins-bad:androidmedia=auto -Dgst-plugins-bad:applemedia=auto diff --git a/ports/gstreamer/vcpkg.json b/ports/gstreamer/vcpkg.json index bbe5f43c3dfdcb..921550bb761a66 100644 --- a/ports/gstreamer/vcpkg.json +++ b/ports/gstreamer/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gstreamer", "version": "1.22.5", - "port-version": 5, + "port-version": 6, "description": "GStreamer open-source multimedia framework core library", "homepage": "https://gstreamer.freedesktop.org/", "license": "LGPL-2.0-only", @@ -55,6 +55,20 @@ } ] }, + "aom": { + "description": "Enable support for the Alliance for Open Media (AOM) AV1 encoder and decoder", + "supports": "!windows", + "dependencies": [ + "aom", + { + "name": "gstreamer", + "default-features": false, + "features": [ + "plugins-bad" + ] + } + ] + }, "asio": { "description": "Enable support for the Steinberg Audio Streaming Input Output (ASIO) library (Windows only)", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 39c5cc1f9415dd..1f9c479a5c5f8e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3146,7 +3146,7 @@ }, "gstreamer": { "baseline": "1.22.5", - "port-version": 5 + "port-version": 6 }, "gtest": { "baseline": "1.14.0", diff --git a/versions/g-/gstreamer.json b/versions/g-/gstreamer.json index d24e474933c0f2..453418a498f7e2 100644 --- a/versions/g-/gstreamer.json +++ b/versions/g-/gstreamer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "27425db97df2c329de0baf5d00c719982659c9c4", + "version": "1.22.5", + "port-version": 6 + }, { "git-tree": "c6339c24dbe60ed13ff8d6b5e646d11e192f4ec0", "version": "1.22.5",