diff --git a/ports/ffmpeg/0046-fix-msvc-detection.patch b/ports/ffmpeg/0046-fix-msvc-detection.patch new file mode 100644 index 0000000000..62d1f60258 --- /dev/null +++ b/ports/ffmpeg/0046-fix-msvc-detection.patch @@ -0,0 +1,29 @@ +diff --git a/configure b/configure +index e8cce5d..d465a53 100644 +--- a/configure ++++ b/configure +@@ -5178,12 +5178,12 @@ probe_cc(){ + _flags_filter=msvc_flags_link + _ld_lib='lib%.a' + _ld_path='-libpath:' +- elif VSLANG=1033 $_cc -nologo- 2>&1 | grep -q ^Microsoft || { $_cc -v 2>&1 | grep -q clang && $_cc -? > /dev/null 2>&1; }; then ++ elif VSLANG=1033 $_cc -nologo- 2>&1 | grep -qi Microsoft || { $_cc -v 2>&1 | grep -q clang && $_cc -? > /dev/null 2>&1; }; then + _type=msvc +- if VSLANG=1033 $_cc -nologo- 2>&1 | grep -q ^Microsoft; then ++ if VSLANG=1033 $_cc -nologo- 2>&1 | grep -qi Microsoft; then + # Depending on the tool (cl.exe or link.exe), the version number + # is printed on the first line of stderr or stdout +- _ident=$(VSLANG=1033 $_cc 2>&1 | grep ^Microsoft | head -n1 | tr -d '\r') ++ _ident=$(VSLANG=1033 $_cc 2>&1 | grep -i Microsoft | head -n1 | tr -d '\r') + else + _ident=$($_cc --version 2>/dev/null | head -n1 | tr -d '\r') + fi +@@ -5293,7 +5293,7 @@ if [ -z "$CC_DEPFLAGS" ] && [ "$dep_cc" != "$cc" ]; then + DEPCCFLAGS=$_flags + fi + +-if VSLANG=1033 $ar 2>&1 | grep -q ^Microsoft; then ++if VSLANG=1033 $ar 2>&1 | grep -qi Microsoft; then + arflags="-nologo" + ar_o='-out:$@' + elif $ar 2>&1 | grep -q "\[D\] "; then diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake index 673b19c603..d80edb8f0a 100644 --- a/ports/ffmpeg/portfile.cmake +++ b/ports/ffmpeg/portfile.cmake @@ -17,6 +17,7 @@ vcpkg_from_github( 0040-ffmpeg-add-av_stream_get_first_dts-for-chromium.patch # Do not remove this patch. It is required by chromium 0044-fix-vulkan-debug-callback-abi.patch 0045-use-prebuilt-bin2c.patch + 0046-fix-msvc-detection.patch ) if(SOURCE_PATH MATCHES " ") diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json index e9067abe33..cb81a750fa 100644 --- a/ports/ffmpeg/vcpkg.json +++ b/ports/ffmpeg/vcpkg.json @@ -1,6 +1,7 @@ { "name": "ffmpeg", "version": "8.0.1", + "port-version": 1, "description": [ "A library to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created.", "FFmpeg is the leading multimedia framework, able to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created. It supports the most obscure ancient formats up to the cutting edge. No matter if they were designed by some standards committee, the community or a corporation. It is also highly portable: FFmpeg compiles, runs, and passes our testing infrastructure FATE across Linux, Mac OS X, Microsoft Windows, the BSDs, Solaris, etc. under a wide variety of build environments, machine architectures, and configurations." diff --git a/versions/baseline.json b/versions/baseline.json index 977ca25065..d107ad87ea 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2934,7 +2934,7 @@ }, "ffmpeg": { "baseline": "8.0.1", - "port-version": 0 + "port-version": 1 }, "ffmpeg-bin2c": { "baseline": "8.0.1", diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json index b229d7f8d1..c5bdbd405e 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "623bc25a61ec9c63c4621dd8c2e9c8596cd3b307", + "version": "8.0.1", + "port-version": 1 + }, { "git-tree": "109d41404a6701389e5fedf92ff1c903798aff54", "version": "8.0.1",