diff --git a/.devcontainer b/.devcontainer index 2adb16000a859..f047c17a8d681 160000 --- a/.devcontainer +++ b/.devcontainer @@ -1 +1 @@ -Subproject commit 2adb16000a859be345cbe8b7eca6ad19f4ebb473 +Subproject commit f047c17a8d681abd7fb2f179c27d8fbeee643dfd diff --git a/.github/release-tag.json b/.github/release-tag.json index 21e589af78ec2..e047d0d252ff2 100644 --- a/.github/release-tag.json +++ b/.github/release-tag.json @@ -1,4 +1,4 @@ { - "message": "xpro version 4.3.1.5 tag", - "tag": "xpv4.3.1.5" + "message": "xpro version 4.3.1.6 tag", + "tag": "xpv4.3.1.6" } diff --git a/cmake/FFmpeg-targets.cmake b/cmake/FFmpeg-targets.cmake index 104ea4de331fb..2652b13275750 100644 --- a/cmake/FFmpeg-targets.cmake +++ b/cmake/FFmpeg-targets.cmake @@ -14,12 +14,20 @@ set(_ffmpeg_avcodec_libs openh264::openh264) # _ffmpeg_*_deps set(_ffmpeg_avdevice_deps avfilter avformat) if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") + find_library(AudioToolbox_LIB AudioToolbox) + find_library(Security_LIB Security) + find_library(VideoToolbox_LIB VideoToolbox) + find_library(OpenGL_LIB OpenGL) find_library(Cocoa_LIB Cocoa) find_library(AVFoundation_LIB AVFoundation) find_library(CoreMedia_LIB CoreMedia) find_library(VideoDecodeAcceleration_LIB VideoDecodeAcceleration) find_library(QuartzCore_LIB QuartzCore) set(_ffmpeg_avdevice_libs + ${AudioToolbox_LIB} + ${Security_LIB} + ${VideoToolbox_LIB} + ${OpenGL_LIB} ${Cocoa_LIB} ${AVFoundation_LIB} ${CoreMedia_LIB}