Skip to content

externpro 26.01.5-5-gf047c17 sync #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
smanders merged 3 commits into from
Aug 18, 2026
Merged

externpro 26.01.5-5-gf047c17 sync #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9b26b55
cmake/FFmpeg-targets: add missing Apple frameworks for FFmpeg on Darwin
smanders Aug 18, 2026
eabc06c
externpro 26.01.5-5-gf047c17
github-actions[bot] Aug 18, 2026
36d4d26
update .github/release-tag.json
github-actions[bot] Aug 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .devcontainer
Open in desktop
Submodule .devcontainer updated 1 files
+2 −2 cmake/pros.cmake
4 changes: 2 additions & 2 deletions .github/release-tag.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
}
8 changes: 8 additions & 0 deletions cmake/FFmpeg-targets.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down