2020-04-28 05:43:29 +08:00
|
|
|
diff --git a/configure b/configure
|
[alsa,fdk-aac,ffmpeg,libsrt,snappy,x265] Code cleanup, fix and use pkg-config (#39077)
- Setup and use pkg-config for ffmpeg dependencies.
https://github.com/microsoft/vcpkg/pull/38011#discussion_r1623174355.
- Export actual c++ link libraries for fdk-aac via pkg-config. (Same
pattern as lerc, geos.)
- Rectify link libraries in pkg-config for alsa, libsrt, snappy, x265.
- Burn-in dllimport for libsrt and x265.
- Pass detected STRIP to ffmpeg. Fixes
https://github.com/microsoft/vcpkg/issues/36852.
2024-06-06 15:48:31 +08:00
|
|
|
index 3243e23021..6d3f31fc95 100755
|
|
|
|
|
@@ -6630,7 +6630,7 @@ fi
|
|
|
|
|
|
|
|
|
|
enabled zlib && { check_pkg_config zlib zlib "zlib.h" zlibVersion ||
|
|
|
|
|
check_lib zlib zlib.h zlibVersion -lz; }
|
|
|
|
|
-enabled bzlib && check_lib bzlib bzlib.h BZ2_bzlibVersion -lbz2
|
|
|
|
|
+enabled bzlib && require_pkg_config bzlib bzip2 bzlib.h BZ2_bzlibVersion
|
|
|
|
|
enabled lzma && check_lib lzma lzma.h lzma_version_number -llzma
|
|
|
|
|
|
|
|
|
|
enabled zlib && test_exec $zlib_extralibs <<EOF && enable zlib_gzip
|
|
|
|
|
@@ -6757,7 +6757,8 @@ if enabled libmfx; then
|
2020-10-07 15:23:23 +08:00
|
|
|
fi
|
|
|
|
|
|
2020-08-19 03:58:14 +08:00
|
|
|
enabled libmodplug && require_pkg_config libmodplug libmodplug libmodplug/modplug.h ModPlug_Load
|
|
|
|
|
-enabled libmp3lame && require "libmp3lame >= 3.98.3" lame/lame.h lame_set_VBR_quality -lmp3lame $libm_extralibs
|
|
|
|
|
+enabled libmp3lame && { check_lib libmp3lame lame/lame.h lame_set_VBR_quality -lmp3lame $libm_extralibs ||
|
|
|
|
|
+ require libmp3lame lame/lame.h lame_set_VBR_quality -llibmp3lame-static -llibmpghip-static $libm_extralibs; }
|
2020-10-07 15:23:23 +08:00
|
|
|
enabled libmysofa && { check_pkg_config libmysofa libmysofa mysofa.h mysofa_neighborhood_init_withstepdefine ||
|
|
|
|
|
require libmysofa mysofa.h mysofa_neighborhood_init_withstepdefine -lmysofa $zlib_extralibs; }
|
2023-01-04 02:32:17 +08:00
|
|
|
enabled libnpp && { check_lib libnpp npp.h nppGetLibVersion -lnppig -lnppicc -lnppc -lnppidei -lnppif ||
|
[alsa,fdk-aac,ffmpeg,libsrt,snappy,x265] Code cleanup, fix and use pkg-config (#39077)
- Setup and use pkg-config for ffmpeg dependencies.
https://github.com/microsoft/vcpkg/pull/38011#discussion_r1623174355.
- Export actual c++ link libraries for fdk-aac via pkg-config. (Same
pattern as lerc, geos.)
- Rectify link libraries in pkg-config for alsa, libsrt, snappy, x265.
- Burn-in dllimport for libsrt and x265.
- Pass detected STRIP to ffmpeg. Fixes
https://github.com/microsoft/vcpkg/issues/36852.
2024-06-06 15:48:31 +08:00
|
|
|
@@ -6793,8 +6794,8 @@ enabled libshaderc && require_pkg_config spirv_compiler "shaderc >= 2019.
|
|
|
|
|
enabled libshine && require_pkg_config libshine shine shine/layer3.h shine_encode_buffer
|
|
|
|
|
enabled libsmbclient && { check_pkg_config libsmbclient smbclient libsmbclient.h smbc_init ||
|
|
|
|
|
require libsmbclient libsmbclient.h smbc_init -lsmbclient; }
|
|
|
|
|
-enabled libsnappy && require libsnappy snappy-c.h snappy_compress -lsnappy -lstdc++
|
2020-08-19 03:58:14 +08:00
|
|
|
-enabled libsoxr && require libsoxr soxr.h soxr_create -lsoxr
|
[alsa,fdk-aac,ffmpeg,libsrt,snappy,x265] Code cleanup, fix and use pkg-config (#39077)
- Setup and use pkg-config for ffmpeg dependencies.
https://github.com/microsoft/vcpkg/pull/38011#discussion_r1623174355.
- Export actual c++ link libraries for fdk-aac via pkg-config. (Same
pattern as lerc, geos.)
- Rectify link libraries in pkg-config for alsa, libsrt, snappy, x265.
- Burn-in dllimport for libsrt and x265.
- Pass detected STRIP to ffmpeg. Fixes
https://github.com/microsoft/vcpkg/issues/36852.
2024-06-06 15:48:31 +08:00
|
|
|
+enabled libsnappy && require_pkg_config libsnappy snappy snappy-c.h snappy_compress
|
|
|
|
|
+enabled libsoxr && require libsoxr soxr.h soxr_create -lsoxr $libm_extralibs
|
2023-11-15 04:54:21 +08:00
|
|
|
enabled libssh && require_pkg_config libssh "libssh >= 0.6.0" libssh/sftp.h sftp_init
|
2020-08-19 03:58:14 +08:00
|
|
|
enabled libspeex && require_pkg_config libspeex speex speex/speex.h speex_decoder_init
|
|
|
|
|
enabled libsrt && require_pkg_config libsrt "srt >= 1.3.0" srt/srt.h srt_socket
|
[alsa,fdk-aac,ffmpeg,libsrt,snappy,x265] Code cleanup, fix and use pkg-config (#39077)
- Setup and use pkg-config for ffmpeg dependencies.
https://github.com/microsoft/vcpkg/pull/38011#discussion_r1623174355.
- Export actual c++ link libraries for fdk-aac via pkg-config. (Same
pattern as lerc, geos.)
- Rectify link libraries in pkg-config for alsa, libsrt, snappy, x265.
- Burn-in dllimport for libsrt and x265.
- Pass detected STRIP to ffmpeg. Fixes
https://github.com/microsoft/vcpkg/issues/36852.
2024-06-06 15:48:31 +08:00
|
|
|
@@ -6884,6 +6885,8 @@ enabled openal && { check_pkg_config openal "openal >= 1.1" "AL/al.h"
|
2020-04-28 05:43:29 +08:00
|
|
|
enabled opencl && { check_pkg_config opencl OpenCL CL/cl.h clEnqueueNDRangeKernel ||
|
|
|
|
|
check_lib opencl OpenCL/cl.h clEnqueueNDRangeKernel -Wl,-framework,OpenCL ||
|
|
|
|
|
check_lib opencl CL/cl.h clEnqueueNDRangeKernel -lOpenCL ||
|
|
|
|
|
+ check_lib opencl CL/cl.h clEnqueueNDRangeKernel -lOpenCL -lAdvapi32 -lOle32 -lCfgmgr32||
|
2020-08-19 03:58:14 +08:00
|
|
|
+ check_lib opencl CL/cl.h clEnqueueNDRangeKernel -lOpenCL -pthread -ldl ||
|
2020-04-28 05:43:29 +08:00
|
|
|
die "ERROR: opencl not found"; } &&
|
|
|
|
|
{ test_cpp_condition "OpenCL/cl.h" "defined(CL_VERSION_1_2)" ||
|
|
|
|
|
test_cpp_condition "CL/cl.h" "defined(CL_VERSION_1_2)" ||
|
[alsa,fdk-aac,ffmpeg,libsrt,snappy,x265] Code cleanup, fix and use pkg-config (#39077)
- Setup and use pkg-config for ffmpeg dependencies.
https://github.com/microsoft/vcpkg/pull/38011#discussion_r1623174355.
- Export actual c++ link libraries for fdk-aac via pkg-config. (Same
pattern as lerc, geos.)
- Rectify link libraries in pkg-config for alsa, libsrt, snappy, x265.
- Burn-in dllimport for libsrt and x265.
- Pass detected STRIP to ffmpeg. Fixes
https://github.com/microsoft/vcpkg/issues/36852.
2024-06-06 15:48:31 +08:00
|
|
|
@@ -7208,10 +7211,10 @@ enabled amf &&
|
|
|
|
|
"(AMF_VERSION_MAJOR << 48 | AMF_VERSION_MINOR << 32 | AMF_VERSION_RELEASE << 16 | AMF_VERSION_BUILD_NUM) >= 0x00010004001d0000"
|
|
|
|
|
|
|
|
|
|
# Funny iconv installations are not unusual, so check it after all flags have been set
|
|
|
|
|
-if enabled libc_iconv; then
|
|
|
|
|
+if enabled libc_iconv && disabled iconv; then
|
2020-08-19 03:58:14 +08:00
|
|
|
check_func_headers iconv.h iconv
|
|
|
|
|
elif enabled iconv; then
|
|
|
|
|
- check_func_headers iconv.h iconv || check_lib iconv iconv.h iconv -liconv
|
[alsa,fdk-aac,ffmpeg,libsrt,snappy,x265] Code cleanup, fix and use pkg-config (#39077)
- Setup and use pkg-config for ffmpeg dependencies.
https://github.com/microsoft/vcpkg/pull/38011#discussion_r1623174355.
- Export actual c++ link libraries for fdk-aac via pkg-config. (Same
pattern as lerc, geos.)
- Rectify link libraries in pkg-config for alsa, libsrt, snappy, x265.
- Burn-in dllimport for libsrt and x265.
- Pass detected STRIP to ffmpeg. Fixes
https://github.com/microsoft/vcpkg/issues/36852.
2024-06-06 15:48:31 +08:00
|
|
|
+ check_func_headers iconv.h iconv || check_lib iconv iconv.h iconv -liconv || check_lib iconv iconv.h iconv -liconv -lcharset
|
2020-08-19 03:58:14 +08:00
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
enabled debug && add_cflags -g"$debuglevel" && add_asflags -g"$debuglevel"
|
