[libvpl] Fix malformed paths in pkg-config for dynamic builds with static CRT (#52127)

This commit is contained in:
Erik White 2026-06-12 03:37:34 +02:00 committed by GitHub
parent b8b97e8e75
commit 2f35abfc8c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 14 additions and 6 deletions

View File

@ -2,7 +2,7 @@ diff --git a/libvpl/CMakeLists.txt b/libvpl/CMakeLists.txt
index 0419980..42a765a 100644
--- a/libvpl/CMakeLists.txt
+++ b/libvpl/CMakeLists.txt
@@ -188,10 +188,22 @@ if(INSTALL_DEV)
@@ -188,10 +188,24 @@ if(INSTALL_DEV)
if(MINGW)
# being conservative by restricting to MinGW, these are probably ok for
# WIN32 in general
@ -15,10 +15,12 @@ index 0419980..42a765a 100644
+ foreach(lib IN LISTS CMAKE_CXX_IMPLICIT_LINK_LIBRARIES)
+ if(lib IN_LIST CMAKE_C_IMPLICIT_LINK_LIBRARIES)
+ continue()
+ elseif(EXISTS "${lib}")
+ string(APPEND CXX_LIB " ${CMAKE_LINK_LIBRARY_FILE_FLAG}${lib}")
+ elseif(IS_ABSOLUTE "${lib}")
+ # An absolute archive path is already valid linker input; pass it
+ # through verbatim. Only bare library names get the "-l" prefix.
+ string(APPEND CXX_LIB " ${lib}")
+ else()
+ string(APPEND CXX_LIB " ${CMAKE_LINK_LIBRARY_FLAG}${lib}")
+ string(APPEND CXX_LIB " -l${lib}")
+ endif()
+ endforeach()
set(VPL_PKGCONFIG_DEPENDENT_LIBS
@ -38,6 +40,6 @@ index aa9b158..46b2c38 100644
+prefix=${pcfiledir}/../..
+libdir=${prefix}/lib
+includedir=${prefix}/include
Name: Intel(R) Video Processing Library
Description: Accelerated video decode, encode, and frame processing capabilities on Intel(R) GPUs

View File

@ -1,6 +1,7 @@
{
"name": "libvpl",
"version": "2.16.0",
"port-version": 1,
"description": "Intel Video Processing Library (oneVPL) dispatcher",
"homepage": "https://github.com/intel/libvpl",
"license": "MIT",

View File

@ -5890,7 +5890,7 @@
},
"libvpl": {
"baseline": "2.16.0",
"port-version": 0
"port-version": 1
},
"libvpx": {
"baseline": "1.16.0",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "f93444b39a19d32f09a2b544aff87fc306906fbf",
"version": "2.16.0",
"port-version": 1
},
{
"git-tree": "68c0ca356b8b51646714f4d1be05acadf1cd60a8",
"version": "2.16.0",