Merge remote-tracking branch 'origin/master' into beta

This commit is contained in:
Bruno Herbelin
2024-09-05 09:37:25 +02:00
2 changed files with 5 additions and 2 deletions

View File

@@ -309,11 +309,14 @@ IF(APPLE)
## POST INSTALL DMG SIGNING AND NOTARIZATION
## 1. SIGN DMG
## codesign --verify --verbose=2 ./_CPack_Packages/OSX_13_arm64/DragNDrop/vimix_0.8.2_OSX_13_arm64.dm
## codesign
## codesign --verify --verbose=2 ./_CPack_Packages/OSX_13_arm64/DragNDrop/vimix_0.8.2_OSX_13_arm64.dmg
##
## 2. SUBMIT TO NOTARIZATION
## xcrun notarytool submit ./_CPack_Packages/OSX_13_arm64/DragNDrop/vimix_0.8.2_OSX_13_arm64.dmg --keychain-profile "vimix" --wait
##
## verify with: xcrun notarytool log xxxx-xxxx-xxx --keychain-profile "vimix"
##
## NB: "vimix" is the name of the app-specific password in keychain
## generated online : https://support.apple.com/en-us/102654
##

View File

@@ -2828,7 +2828,7 @@ void SourceControlWindow::RenderMediaPlayer(MediaSource *ms)
static uint _status = 0; // 0:unknown, 1:ok, 2:error
static std::string _status_message = "";
static std::vector< std::pair< std::string, std::string> > _examples = { {"Primary color", "frei0r-filter-primaries" },
{"Histogram", "frei0r-filter-rgb-parade mix=0.5"},
{"Histogram", "frei0r-filter-levels"},
{"Emboss", "frei0r-filter-emboss"},
{"Denoise", "frei0r-filter-hqdn3d spatial=0.05 temporal=0.1"},
{"Thermal", "coloreffects preset=heat"},