]> git.proxmox.com Git - ceph.git/blame - ceph/src/jaegertracing/opentelemetry-cpp/tools/vcpkg/ports/ffmpeg/0006-fix-StaticFeatures.patch
update ceph source to reef 18.1.2
[ceph.git] / ceph / src / jaegertracing / opentelemetry-cpp / tools / vcpkg / ports / ffmpeg / 0006-fix-StaticFeatures.patch
CommitLineData
1e59de90
TL
1diff --git a/configure b/configure
2index 3bdcfc6..00b2f13 100644
3--- a/configure
4+++ b/configure
5@@ -6351,7 +6351,8 @@ if enabled libmfx; then
6 fi
7
8 enabled libmodplug && require_pkg_config libmodplug libmodplug libmodplug/modplug.h ModPlug_Load
9-enabled libmp3lame && require "libmp3lame >= 3.98.3" lame/lame.h lame_set_VBR_quality -lmp3lame $libm_extralibs
10+enabled libmp3lame && { check_lib libmp3lame lame/lame.h lame_set_VBR_quality -lmp3lame $libm_extralibs ||
11+ require libmp3lame lame/lame.h lame_set_VBR_quality -llibmp3lame-static -llibmpghip-static $libm_extralibs; }
12 enabled libmysofa && { check_pkg_config libmysofa libmysofa mysofa.h mysofa_neighborhood_init_withstepdefine ||
13 require libmysofa mysofa.h mysofa_neighborhood_init_withstepdefine -lmysofa $zlib_extralibs; }
14 enabled libnpp && { check_lib libnpp npp.h nppGetLibVersion -lnppig -lnppicc -lnppc -lnppidei ||
15@@ -6392,7 +6393,7 @@ if enabled debug_configure; then
16 else
17 enabled libsnappy && require libsnappy snappy-c.h snappy_compress -lsnappy -lstdc++
18 fi
19-enabled libsoxr && require libsoxr soxr.h soxr_create -lsoxr
20+enabled libsoxr && require libsoxr soxr.h soxr_create -lsoxr -lm
21 enabled libssh && require_pkg_config libssh libssh libssh/sftp.h sftp_init
22 enabled libspeex && require_pkg_config libspeex speex speex/speex.h speex_decoder_init
23 enabled libsrt && require_pkg_config libsrt "srt >= 1.3.0" srt/srt.h srt_socket
24@@ -6460,6 +6461,8 @@ enabled openal && { { for al_extralibs in "${OPENAL_LIBS}" "-lopenal"
25 enabled opencl && { check_pkg_config opencl OpenCL CL/cl.h clEnqueueNDRangeKernel ||
26 check_lib opencl OpenCL/cl.h clEnqueueNDRangeKernel -Wl,-framework,OpenCL ||
27 check_lib opencl CL/cl.h clEnqueueNDRangeKernel -lOpenCL ||
28+ check_lib opencl CL/cl.h clEnqueueNDRangeKernel -lOpenCL -lAdvapi32 -lOle32 -lCfgmgr32||
29+ check_lib opencl CL/cl.h clEnqueueNDRangeKernel -lOpenCL -pthread -ldl ||
30 die "ERROR: opencl not found"; } &&
31 { test_cpp_condition "OpenCL/cl.h" "defined(CL_VERSION_1_2)" ||
32 test_cpp_condition "CL/cl.h" "defined(CL_VERSION_1_2)" ||
33@@ -6479,6 +6482,7 @@ enabled openssl && { check_pkg_config openssl openssl openssl/ssl.h OP
34 check_lib openssl openssl/ssl.h SSL_library_init -lssl -lcrypto ||
35 check_lib openssl openssl/ssl.h SSL_library_init -lssl32 -leay32 ||
36 check_lib openssl openssl/ssl.h SSL_library_init -lssl -lcrypto -lws2_32 -lgdi32 ||
37+ check_lib openssl openssl/ssl.h OPENSSL_init_ssl -llibssl -llibcrypto -lws2_32 -lgdi32 -lcrypt32 -lAdvapi32 -lUser32||
38 die "ERROR: openssl not found"; }
39 enabled pocketsphinx && require_pkg_config pocketsphinx pocketsphinx pocketsphinx/pocketsphinx.h ps_init
40 enabled rkmpp && { require_pkg_config rkmpp rockchip_mpp rockchip/rk_mpi.h mpp_create &&
41@@ -6707,7 +6711,7 @@ enabled amf &&
42 if enabled libc_iconv; then
43 check_func_headers iconv.h iconv
44 elif enabled iconv; then
45- check_func_headers iconv.h iconv || check_lib iconv iconv.h iconv -liconv
46+ check_func_headers iconv.h iconv || check_lib iconv iconv.h iconv -liconv || check_lib iconv iconv.h iconv -liconv -llibcharset
47 fi
48
49 enabled debug && add_cflags -g"$debuglevel" && add_asflags -g"$debuglevel"