diff options
| -rw-r--r-- | ports/ffmpeg/CONTROL | 2 | ||||
| -rw-r--r-- | ports/ffmpeg/FindFFMPEG.cmake.in | 18 | ||||
| -rw-r--r-- | versions/baseline.json | 4 | ||||
| -rw-r--r-- | versions/f-/ffmpeg.json | 5 |
4 files changed, 17 insertions, 12 deletions
diff --git a/ports/ffmpeg/CONTROL b/ports/ffmpeg/CONTROL index 9fb3e5b5f..9d7162faf 100644 --- a/ports/ffmpeg/CONTROL +++ b/ports/ffmpeg/CONTROL @@ -1,6 +1,6 @@ Source: ffmpeg Version: 4.3.2 -Port-Version: 0 +Port-Version: 1 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 c06b355d3..afad38cb0 100644 --- a/ports/ffmpeg/FindFFMPEG.cmake.in +++ b/ports/ffmpeg/FindFFMPEG.cmake.in @@ -72,7 +72,7 @@ function(find_platform_dependent_libraries) set(FFMPEG_PLATFORM_DEPENDENT_LIBS ${FFMPEG_PLATFORM_DEPENDENT_LIBS} PARENT_SCOPE) endfunction() -set(FFMPEG_VERSION "4.3.1") +set(FFMPEG_VERSION "4.3.2") find_dependency(Threads) if(UNIX) @@ -287,28 +287,28 @@ FFMPEG_FIND(libavutil avutil avutil.h) if (FFMPEG_libavutil_FOUND) list(REMOVE_DUPLICATES FFMPEG_INCLUDE_DIRS) list(REMOVE_DUPLICATES FFMPEG_LIBRARY_DIRS) - set(FFMPEG_libavutil_VERSION "${FFMPEG_VERSION}" CACHE STRING "") + set(FFMPEG_libavutil_VERSION "56.51.100" CACHE STRING "") if(FFMPEG_libavcodec_FOUND) - set(FFMPEG_libavcodec_VERSION "${FFMPEG_VERSION}" CACHE STRING "") + set(FFMPEG_libavcodec_VERSION "58.91.100" CACHE STRING "") endif() if(FFMPEG_libavdevice_FOUND) - set(FFMPEG_libavdevice_VERSION "${FFMPEG_VERSION}" CACHE STRING "") + set(FFMPEG_libavdevice_VERSION "58.10.100" CACHE STRING "") endif() if(FFMPEG_libavfilter_FOUND) - set(FFMPEG_libavfilter_VERSION "${FFMPEG_VERSION}" CACHE STRING "") + set(FFMPEG_libavfilter_VERSION "7.85.100" CACHE STRING "") endif() if(FFMPEG_libavformat_FOUND) - set(FFMPEG_libavformat_VERSION "${FFMPEG_VERSION}" CACHE STRING "") + set(FFMPEG_libavformat_VERSION "58.45.100" CACHE STRING "") endif() if(FFMPEG_libavresample_FOUND) - set(FFMPEG_libavresample_VERSION "${FFMPEG_VERSION}" CACHE STRING "") + set(FFMPEG_libavresample_VERSION "4.0.0" CACHE STRING "") endif() if(FFMPEG_libswresample_FOUND) - set(FFMPEG_libswresample_VERSION "${FFMPEG_VERSION}" CACHE STRING "") + set(FFMPEG_libswresample_VERSION "3.7.100" CACHE STRING "") endif() if(FFMPEG_libswscale_FOUND) - set(FFMPEG_libswscale_VERSION "${FFMPEG_VERSION}" CACHE STRING "") + set(FFMPEG_libswscale_VERSION "5.7.100" CACHE STRING "") endif() list(APPEND FFMPEG_LIBRARIES diff --git a/versions/baseline.json b/versions/baseline.json index bbe16fdf8..d37be89bb 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1934,7 +1934,7 @@ }, "ffmpeg": { "baseline": "4.3.2", - "port-version": 0 + "port-version": 1 }, "ffnvcodec": { "baseline": "10.0.26.0", @@ -2552,7 +2552,7 @@ "baseline": "9.0.0", "port-version": 0 }, - "iir1": { + "iir1": { "baseline": "1.8.0", "port-version": 0 }, diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json index 5fbf8e4dd..42b7421a3 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "8d581e93ca7ee374d63bae07dff49356c79dee8c", + "version-string": "4.3.2", + "port-version": 1 + }, + { "git-tree": "fd3c02af90662935ece6ca6ced78f23319b753c9", "version-string": "4.3.2", "port-version": 0 |