mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-29 21:11:47 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
8e03049b8c
vcpkg/ports/ffmpeg/0004-fix-debug-build.patch

41 lines
1.9 KiB
Diff
Raw Normal View History

[ffmpeg]Fix debug build in Windows. (#7476)
2019-08-07 04:25:50 +08:00
diff --git a/configure b/configure
[ffmpeg] Bump to 6.1 (#35042) * [ffmpeg] Bump to 6.1 * [ffnvcodec] Bump to 11.1.5.3 * vcpkg x-add-version --all * [avisynthplus] Bump to 3.7.3 * vcpkg x-add-version --all * [avisynthplus] Remove no more required patch * vcpkg x-add-version --all * Apply suggestions from code review Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> * vcpkg x-add-version --all --------- Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com>
2023-11-15 04:54:21 +08:00
index 3243e23021..6d3f31fc95 100644
[ffmpeg]Fix debug build in Windows. (#7476)
2019-08-07 04:25:50 +08:00
--- a/configure
+++ b/configure
[ffmpeg] Bump to 6.1 (#35042) * [ffmpeg] Bump to 6.1 * [ffnvcodec] Bump to 11.1.5.3 * vcpkg x-add-version --all * [avisynthplus] Bump to 3.7.3 * vcpkg x-add-version --all * [avisynthplus] Remove no more required patch * vcpkg x-add-version --all * Apply suggestions from code review Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> * vcpkg x-add-version --all --------- Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com>
2023-11-15 04:54:21 +08:00
@@ -4284,6 +4284,9 @@ for opt do
[ffmpeg]Fix debug build in Windows. (#7476)
2019-08-07 04:25:50 +08:00
--libfuzzer=*)
libfuzzer_path="$optval"
;;
+ --debug)
+ enable debug_configure
+ ;;
*)
optname="${opt%%=*}"
optname="${optname#--}"
[ffmpeg] Bump to 6.1 (#35042) * [ffmpeg] Bump to 6.1 * [ffnvcodec] Bump to 11.1.5.3 * vcpkg x-add-version --all * [avisynthplus] Bump to 3.7.3 * vcpkg x-add-version --all * [avisynthplus] Remove no more required patch * vcpkg x-add-version --all * Apply suggestions from code review Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> * vcpkg x-add-version --all --------- Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com>
2023-11-15 04:54:21 +08:00
@@ -6630,7 +6633,11 @@ fi
[ffmpeg]Fix debug build in Windows. (#7476)
2019-08-07 04:25:50 +08:00
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
+if enabled debug_configure; then
+ enabled bzlib && check_lib bzlib bzlib.h BZ2_bzlibVersion -lbz2d
+else
+ enabled bzlib && check_lib bzlib bzlib.h BZ2_bzlibVersion -lbz2
+fi
[liblzma] No debug postfix. Rewrite wrapper. (#22856) * Restore upstream's DLL name * Don't add debug postfix * Decouple wrapper from config * Don't inject Find module stuff into config * Cleanup * [skip actions] Trim lzmad and LibLZMA patching * [skip actions] Fix CMAKE_DISABLE_FIND_PACKAGE_LibLZMA * [skip actions] CI * Update manifests * Update versions * Backfill LibLZMA::LibLZMA to CMake < 3.14 * Update versions * Update versions
2022-03-01 02:25:31 +08:00
enabled lzma && check_lib lzma lzma.h lzma_version_number -llzma
[ffmpeg]Fix debug build in Windows. (#7476)
2019-08-07 04:25:50 +08:00
[ffmpeg] Update to 5.0 (#23312) * [ffmpeg] Update to 5.0 * update versions * Fix after merge. * ffmpeg: Fix lzma debug lib naming. * Update ffmpeg.json * Update ffmpeg.json * Update ffmpeg.json * fixup versions. * fixup * version fixup * Update ffmpeg.json * [ffmpeg] Disable autodetect. * [ffmpeg] Update version. * [ffmpeg] fixup autodetect on linux/uwp. * Update ffmpeg.json * [avcpp] Update to 2.1.0. * [pangolin] Update to 0.8. * Update versions. * [pangolin] Fixup port file. * Update pangolin.json * [aubio] Update to latest git master. * Update pangolin.json * [avcpp] Add license field. * [avcpp] Fix pkgconf detection of ffmpeg. * [ignition-cmake] Update to 2.16.0. * [ignition-math6] Update to 6.13.0. * [ignition-common3] Update to 3.14.1. * [avcpp] Reformat. * Update versions. * [avcpp] Fix pkgconfig cross compile. * [discordcoreapi] Disable on uwp. * Update versions * [aubio] Fix deprecated portfile functions. * Update versions. * [ffmpeg] Fix amf/mfx feature. * [ignition-math6] Require python 3.10. * Update versions. * fixup * [ignition-math6] Change version to last known good 6.9.2. * [discordcoreapi] Properly Fix. * Update versions. * Update versions. * Update ffmpeg.json * Update ffmpeg.json
2023-01-04 02:32:17 +08:00
enabled zlib && test_exec $zlib_extralibs <<EOF && enable zlib_gzip
[ffmpeg] Bump to 6.1 (#35042) * [ffmpeg] Bump to 6.1 * [ffnvcodec] Bump to 11.1.5.3 * vcpkg x-add-version --all * [avisynthplus] Bump to 3.7.3 * vcpkg x-add-version --all * [avisynthplus] Remove no more required patch * vcpkg x-add-version --all * Apply suggestions from code review Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> * vcpkg x-add-version --all --------- Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com>
2023-11-15 04:54:21 +08:00
@@ -6793,7 +6800,11 @@ enabled libshaderc && require_pkg_config spirv_compiler "shaderc >= 2019.
[ffmpeg] Add feature support for zlib, iconv, fdk-aac, mp3lame, opus, soxr, theora. (#11277) Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com>
2020-08-19 03:58:14 +08:00
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++
+if enabled debug_configure; then
[hpx] add some features, fix some bugs (#25059) * refine hpx port * v db * add tcmalloc on unix * refine comment * v db * remove hardcoded mpi dep * v db * portfile cleanup * v db * add pkgconf as a dep * v db * [snappy] remove debug suffix and add pc file * hpx pass through _HOST_TRIPLET for pkgconf * v db * fix snappy in ffmpeg * v db * fix name clash of output names * v db * remove tcmalloc * v db * remove bin dir; seems empty on !windows * v db * b v * v db * baseline stuff * fix jemalloc missing msvc_compat headers * v db * install usage for hpx * v db * Update versions/f-/ffmpeg.json * revert v db * bump ffmpeg * v db * remove jemalloc since I can force it thorugh the triplet any way. * v db Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
2022-09-20 03:30:40 +08:00
+ enabled libsnappy && require libsnappy snappy-c.h snappy_compress -lsnappy -lstdc++
[ffmpeg] Add feature support for zlib, iconv, fdk-aac, mp3lame, opus, soxr, theora. (#11277) Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com>
2020-08-19 03:58:14 +08:00
+else
+ enabled libsnappy && require libsnappy snappy-c.h snappy_compress -lsnappy -lstdc++
+fi
enabled libsoxr && require libsoxr soxr.h soxr_create -lsoxr
[ffmpeg] Bump to 6.1 (#35042) * [ffmpeg] Bump to 6.1 * [ffnvcodec] Bump to 11.1.5.3 * vcpkg x-add-version --all * [avisynthplus] Bump to 3.7.3 * vcpkg x-add-version --all * [avisynthplus] Remove no more required patch * vcpkg x-add-version --all * Apply suggestions from code review Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> * vcpkg x-add-version --all --------- Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com>
2023-11-15 04:54:21 +08:00
enabled libssh && require_pkg_config libssh "libssh >= 0.6.0" libssh/sftp.h sftp_init
[ffmpeg] Add feature support for zlib, iconv, fdk-aac, mp3lame, opus, soxr, theora. (#11277) Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com>
2020-08-19 03:58:14 +08:00
enabled libspeex && require_pkg_config libspeex speex speex/speex.h speex_decoder_init
Reference in New Issue Copy Permalink