mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-27 19:01:48 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[mfx-dispatch] Fix non-msvc (#40460)

Browse Source
This commit is contained in:
Kai Pastor 2024-08-17 10:46:09 +02:00 committed by GitHub
parent 8fc52f40cc
commit 330dddb4f0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 41 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
ports/mfx-dispatch/portfile.cmake
View File

@ -1,25 +1,30 @@
vcpkg_from_github( vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
REPO lu-zero/mfx_dispatch REPO lu-zero/mfx_dispatch
REF 1.35.1 REF "${VERSION}"
SHA512 12517338342d3e653043a57e290eb9cffd190aede0c3a3948956f1c7f12f0ea859361cf3e534ab066b96b1c211f68409c67ef21fd6d76b68cc31daef541941b0 SHA512 12517338342d3e653043a57e290eb9cffd190aede0c3a3948956f1c7f12f0ea859361cf3e534ab066b96b1c211f68409c67ef21fd6d76b68cc31daef541941b0
HEAD_REF master HEAD_REF master
PATCHES PATCHES
fix-unresolved-symbol.patch fix-unresolved-symbol.patch
fix-pkgconf.patch fix-pkgconf.patch
) )
set(LIBRARY_TYPE ${VCPKG_LIBRARY_LINKAGE}) if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
if (LIBRARY_TYPE STREQUAL "dynamic") vcpkg_cmake_configure(
set(LIBRARY_TYPE "shared") SOURCE_PATH "${SOURCE_PATH}"
)
vcpkg_cmake_install()
vcpkg_copy_pdbs()
else()
if(VCPKG_TARGET_IS_MINGW)
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
endif()
vcpkg_configure_make(
SOURCE_PATH "${SOURCE_PATH}"
AUTOCONFIG
)
vcpkg_install_make()
endif() endif()
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
)
vcpkg_cmake_install()
vcpkg_copy_pdbs()
vcpkg_fixup_pkgconfig() vcpkg_fixup_pkgconfig()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")

7
ports/mfx-dispatch/vcpkg.json
View File

@ -1,15 +1,16 @@
{ {
"name": "mfx-dispatch", "name": "mfx-dispatch",
"version": "1.35.1", "version": "1.35.1",
"port-version": 3, "port-version": 4,
"description": "Open source Intel media sdk dispatcher", "description": "Open source Intel media sdk dispatcher",
"homepage": "https://github.com/lu-zero/mfx_dispatch", "homepage": "https://github.com/lu-zero/mfx_dispatch",
"license": "BSD-3-Clause", "license": "BSD-3-Clause",
"supports": "!linux & !uwp & !osx", "supports": "((x86 | x64) & (android | linux)) | (windows & !uwp)",
"dependencies": [ "dependencies": [
{ {
"name": "vcpkg-cmake", "name": "vcpkg-cmake",
"host": true "host": true,
"platform": "windows & !mingw"
} }
] ]
} }

3
scripts/ci.baseline.txt
View File

@ -723,9 +723,6 @@ memorymodule:x64-android=fail
mesa:x64-linux=fail mesa:x64-linux=fail
mesa:x64-osx=fail mesa:x64-osx=fail
mesa:arm64-osx=fail mesa:arm64-osx=fail
mfx-dispatch:arm-neon-android=fail
mfx-dispatch:arm64-android=fail
mfx-dispatch:x64-android=fail
milerius-sfml-imgui:x64-windows-static=fail milerius-sfml-imgui:x64-windows-static=fail
minifb:arm-neon-android=fail minifb:arm-neon-android=fail
minifb:arm64-android=fail minifb:arm64-android=fail

8
scripts/test_ports/vcpkg-ci-ffmpeg/vcpkg.json
View File

@ -158,6 +158,14 @@
], ],
"platform": "!uwp & !(arm64 & windows) & !android" "platform": "!uwp & !(arm64 & windows) & !android"
}, },
{
"name": "ffmpeg",
"default-features": false,
"features": [
"qsv"
],
"platform": "!arm & (android | linux | windows) & !uwp"
},
{ {
"name": "ffmpeg", "name": "ffmpeg",
"default-features": false, "default-features": false,

2
versions/baseline.json
View File

@ -5782,7 +5782,7 @@
}, },
"mfx-dispatch": { "mfx-dispatch": {
"baseline": "1.35.1", "baseline": "1.35.1",
"port-version": 3 "port-version": 4
}, },
"mgnlibs": { "mgnlibs": {
"baseline": "2019-09-29", "baseline": "2019-09-29",

5
versions/m-/mfx-dispatch.json
View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "0e2d18fc6010dd23044bade1a855669f8e9c9c86",
"version": "1.35.1",
"port-version": 4
},
{ {
"git-tree": "4372c27465a70b6b113adc8fb69ea86da3c21a3f", "git-tree": "4372c27465a70b6b113adc8fb69ea86da3c21a3f",
"version": "1.35.1", "version": "1.35.1",