mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-19 04:43:02 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[ffmpeg] Osx cross fix (#30692)

Browse Source 
* [ffmpeg] Fix off-by-one issue when looping over the OSX_ARCHS

This fixes crosscompiling e.g. arm64 on x64

* [ffmpeg] Remove redundant --enable-cross-compile flag

* [ffmpeg] Bump port version
This commit is contained in:
Daniel Schürmann 2023-04-07 02:29:23 +02:00 committed by GitHub
parent 5864fd7bec
commit 7f59e00136
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ports/ffmpeg/build.sh.in
View File

@ -130,13 +130,13 @@ build_ffmpeg() {
cd "$PATH_TO_BUILD_DIR"
if [ $OSX_ARCH_COUNT -gt 1 ]; then
if [ $OSX_ARCH_COUNT -gt 0 ]; then
for ARCH in $OSX_ARCHS; do
echo "=== CLEANING FOR $ARCH ==="
make clean && make distclean
build_ffmpeg $ARCH --enable-cross-compile --extra-cflags=-arch --extra-cflags=$ARCH --extra-ldflags=-arch --extra-ldflags=$ARCH
build_ffmpeg $ARCH --extra-cflags=-arch --extra-cflags=$ARCH --extra-ldflags=-arch --extra-ldflags=$ARCH
echo "=== COLLECTING BINARIES FOR $ARCH ==="

2
ports/ffmpeg/portfile.cmake
View File

@ -513,7 +513,7 @@ else()
set(OPTIONS "${OPTIONS} --disable-libmfx")
endif()
set(OPTIONS_CROSS " --enable-cross-compile")
set(OPTIONS_CROSS "--enable-cross-compile")
# ffmpeg needs --cross-prefix option to use appropriate tools for cross-compiling.
if(VCPKG_DETECTED_CMAKE_C_COMPILER MATCHES "([^\/]*-)gcc$")

2
ports/ffmpeg/vcpkg.json
View File

@ -1,7 +1,7 @@
{
"name": "ffmpeg",
"version": "5.1.2",
"port-version": 5,
"port-version": 6,
"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."

2
versions/baseline.json
View File

@ -2450,7 +2450,7 @@
},
"ffmpeg": {
"baseline": "5.1.2",
"port-version": 5
"port-version": 6
},
"ffnvcodec": {
"baseline": "11.1.5.0",

5
versions/f-/ffmpeg.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "a7e0c378cd0a6564b28c28d6d970e3d633b4382e",
"version": "5.1.2",
"port-version": 6
},
{
"git-tree": "14577b12f56accfce4428caf17e4b47542f365ec",
"version": "5.1.2",