mirror of
https://github.com/microsoft/vcpkg.git
synced 2025-01-15 00:48:01 +08:00
[ffmpeg] Fix build error on arm64-linux (#39268)
This commit is contained in:
parent
64fbc88bde
commit
48d9ad4f0c
9
ports/ffmpeg/0042-fix-arm64-linux.patch
Normal file
9
ports/ffmpeg/0042-fix-arm64-linux.patch
Normal file
@ -0,0 +1,9 @@
|
||||
diff --git a/ffbuild/libversion.sh b/ffbuild/libversion.sh
|
||||
index a94ab58..ecaa90c 100644
|
||||
--- a/ffbuild/libversion.sh
|
||||
+++ b/ffbuild/libversion.sh
|
||||
@@ -1,3 +1,4 @@
|
||||
+#!/bin/sh
|
||||
toupper(){
|
||||
echo "$@" | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ
|
||||
}
|
@ -16,6 +16,7 @@ vcpkg_from_github(
|
||||
0020-fix-aarch64-libswscale.patch
|
||||
0040-ffmpeg-add-av_stream_get_first_dts-for-chromium.patch # Do not remove this patch. It is required by chromium
|
||||
0041-add-const-for-opengl-definition.patch
|
||||
0042-fix-arm64-linux.patch #https://github.com/FFmpeg/FFmpeg/commit/fcfd17dbb4a6cf270cdd82e91c21a5efdc878d12
|
||||
)
|
||||
|
||||
if(SOURCE_PATH MATCHES " ")
|
||||
|
@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "ffmpeg",
|
||||
"version": "6.1.1",
|
||||
"port-version": 7,
|
||||
"port-version": 8,
|
||||
"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."
|
||||
|
@ -2682,7 +2682,7 @@
|
||||
},
|
||||
"ffmpeg": {
|
||||
"baseline": "6.1.1",
|
||||
"port-version": 7
|
||||
"port-version": 8
|
||||
},
|
||||
"ffnvcodec": {
|
||||
"baseline": "12.1.14.0",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "3217e79d02494d7441026d3e0a6757ea5ec5c3fd",
|
||||
"version": "6.1.1",
|
||||
"port-version": 8
|
||||
},
|
||||
{
|
||||
"git-tree": "43a794215eb84acb9f6e49f2aee3a3ee1ac1af92",
|
||||
"version": "6.1.1",
|
||||
|
Loading…
x
Reference in New Issue
Block a user