RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-22 14:57:05 +00:00
Code Issues Projects Releases Wiki Activity

configure: do not include -lvulkan to cflags in vulkan's pkg-config check

Browse Source 
Also fixes the non-pkg-config check.
This commit is contained in:
Lynne 2021-11-24 20:17:09 +01:00
parent e38551180e
commit 1e5acc1b59
No known key found for this signature in database
GPG Key ID: A2FEA5F03F034464
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
configure vendored
View File

@ -1464,13 +1464,13 @@ test_pkg_config_cpp(){
cond="$4" cond="$4"
shift 4 shift 4
disable $name disable $name
test_cmd $pkg_config --exists --print-errors $pkg_version || return test_cmd $pkg_config --exists --print-errors $pkg_version || returnddd
pkg_cflags=$($pkg_config --cflags $pkg_config_flags $pkg) pkg_cflags=$($pkg_config --cflags $pkg_config_flags $pkg)
pkg_incdir=$($pkg_config --variable=includedir $pkg_config_flags $pkg) pkg_incflags=$($pkg_config --cflags-onyl-I $pkg_config_flags $pkg)
test_cpp_condition "$pkg_incdir/$headers" "$cond" "$@" && test_cpp_condition "$pkg_incdir/$headers" "$cond" "$@" &&
enable $name && enable $name &&
set_sanitized "${name}_cflags" $pkg_cflags && set_sanitized "${name}_cflags" $pkg_cflags &&
set_sanitized "${name}_incdir" $pkg_incdir set_sanitized "${name}_incflags" $pkg_incflags
} }
check_pkg_config(){ check_pkg_config(){
@ -1487,6 +1487,13 @@ check_pkg_config_cpp(){
eval add_cflags \$${name}_cflags eval add_cflags \$${name}_cflags
} }
check_pkg_config_header_only(){
log check_pkg_config_cpp "$@"
name="$1"
test_pkg_config_cpp "$@" &&
eval add_cflags \$${name}_incflags
}
test_exec(){ test_exec(){
test_ld "cc" "$@" && { enabled cross_compile || $TMPE >> $logfile 2>&1; } test_ld "cc" "$@" && { enabled cross_compile || $TMPE >> $logfile 2>&1; }
} }
@ -6842,7 +6849,7 @@ enabled vdpau &&
enabled crystalhd && check_lib crystalhd "stdint.h libcrystalhd/libcrystalhd_if.h" DtsCrystalHDVersion -lcrystalhd enabled crystalhd && check_lib crystalhd "stdint.h libcrystalhd/libcrystalhd_if.h" DtsCrystalHDVersion -lcrystalhd
if enabled vulkan; then if enabled vulkan; then
require_pkg_config_cpp vulkan "vulkan >= 1.2.189" "vulkan/vulkan.h" "defined VK_VERSION_1_2" || check_pkg_config_header_only vulkan "vulkan >= 1.2.189" "vulkan/vulkan.h" "defined VK_VERSION_1_2" ||
require_cpp_condition vulkan "vulkan/vulkan.h" "defined VK_VERSION_1_2" require_cpp_condition vulkan "vulkan/vulkan.h" "defined VK_VERSION_1_2"
fi fi