From 00b0e7878a26afb84d1bcc581f529b1b985f19d2 Mon Sep 17 00:00:00 2001 From: "Matthias C. M. Troffaes" Date: Thu, 6 May 2021 15:14:23 +0100 Subject: [ffmpeg] avdevice CoreAudio dependency fix for osx (#17204) * [ffmpeg] avdevice needs CoreAudio on osx * [ffmpeg] bump port version * [ffmpeg] x-add-version * [ffmpeg] version bump * [ffmpeg] x-add-version --- ports/ffmpeg/CONTROL | 2 +- ports/ffmpeg/FindFFMPEG.cmake.in | 2 +- versions/baseline.json | 2 +- versions/f-/ffmpeg.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/ffmpeg/CONTROL b/ports/ffmpeg/CONTROL index 2368a154d..7e077ceaf 100644 --- a/ports/ffmpeg/CONTROL +++ b/ports/ffmpeg/CONTROL @@ -1,6 +1,6 @@ Source: ffmpeg Version: 4.3.2 -Port-Version: 9 +Port-Version: 10 Homepage: https://ffmpeg.org 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/ports/ffmpeg/FindFFMPEG.cmake.in b/ports/ffmpeg/FindFFMPEG.cmake.in index 0419a0777..c810bb98b 100644 --- a/ports/ffmpeg/FindFFMPEG.cmake.in +++ b/ports/ffmpeg/FindFFMPEG.cmake.in @@ -375,7 +375,7 @@ if(APPLE) find_platform_dependent_libraries(NAMES OpenCL) endif() if(@ENABLE_AVDEVICE@) - find_platform_dependent_libraries(NAMES AVFoundation CoreFoundation CoreGraphics Foundation) + find_platform_dependent_libraries(NAMES AVFoundation CoreAudio CoreFoundation CoreGraphics Foundation) endif() if(@ENABLE_AVFILTER@) find_platform_dependent_libraries(NAMES OpenGL AppKit CoreImage) diff --git a/versions/baseline.json b/versions/baseline.json index ea3c27fe8..f05ef8da8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1954,7 +1954,7 @@ }, "ffmpeg": { "baseline": "4.3.2", - "port-version": 9 + "port-version": 10 }, "ffnvcodec": { "baseline": "10.0.26.0", diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json index d54ab1f5d..bc6c6a851 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2664b57a1b900287af6772394ec3c99a080f132b", + "version-string": "4.3.2", + "port-version": 10 + }, { "git-tree": "e497eda37bc7882949022c537489959d12c80f63", "version-string": "4.3.2", -- cgit v1.2.3