From bd10ad0c1ae9517468318fedbd4e6cd5f20535bb Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Thu, 13 Apr 2023 21:51:55 +0200 Subject: [PATCH] [qtmultimedia] fix ffmpeg feature on osx (#30827) --- ports/qtmultimedia/portfile.cmake | 2 +- ports/qtmultimedia/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/q-/qtmultimedia.json | 5 +++++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/qtmultimedia/portfile.cmake b/ports/qtmultimedia/portfile.cmake index 2d2bd8fc63..90062d6c69 100644 --- a/ports/qtmultimedia/portfile.cmake +++ b/ports/qtmultimedia/portfile.cmake @@ -61,7 +61,7 @@ endif() if("ffmpeg" IN_LIST FEATURES) # Note: Requires pulsadio on linux and wmfsdk on windows list(APPEND FEATURE_OPTIONS "-DINPUT_ffmpeg='yes'") - if(VCPKG_TARGET_IS_WINDOWS) + if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_OSX) list(APPEND FEATURE_OPTIONS "-DINPUT_pulseaudio='no'") else() list(APPEND FEATURE_OPTIONS "-DINPUT_pulseaudio='yes'") diff --git a/ports/qtmultimedia/vcpkg.json b/ports/qtmultimedia/vcpkg.json index 81b385eab2..4ba4f643db 100644 --- a/ports/qtmultimedia/vcpkg.json +++ b/ports/qtmultimedia/vcpkg.json @@ -1,6 +1,7 @@ { "name": "qtmultimedia", "version": "6.4.3", + "port-version": 1, "description": "Qt Multimedia", "homepage": "https://www.qt.io/", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 10088c6389..9ef1082cd0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6666,7 +6666,7 @@ }, "qtmultimedia": { "baseline": "6.4.3", - "port-version": 0 + "port-version": 1 }, "qtnetworkauth": { "baseline": "6.4.3", diff --git a/versions/q-/qtmultimedia.json b/versions/q-/qtmultimedia.json index 8643b0e2c4..a07f50f896 100644 --- a/versions/q-/qtmultimedia.json +++ b/versions/q-/qtmultimedia.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "833b2e1397868c7a5ba8f195dca85ac73ddd93bc", + "version": "6.4.3", + "port-version": 1 + }, { "git-tree": "2a9eedae47a3b44c519f165c7fbceec2f1deb331", "version": "6.4.3",