eessppeelllloo/vimix
1
0
Fork 0
mirror of https://github.com/brunoherbelin/vimix.git synced 2025-12-14 11:49:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update flatpak to Gnome 47 and latest dependencies

Browse Source
This commit is contained in:
Bruno Herbelin
2025-01-04 11:02:21 +01:00
parent 729cf52b68
commit 0161126153
6 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -3,7 +3,7 @@
##### **Copyright** (C) 2019-2023 Bruno Herbelin <bruno.herbelin@gmail.com> ##### **Copyright** (C) 2019-2023 Bruno Herbelin <bruno.herbelin@gmail.com>
##### #####
cmake_minimum_required(VERSION 3.8.2) cmake_minimum_required(VERSION 3.10)
project(vimix VERSION 0.0.1 LANGUAGES CXX C) project(vimix VERSION 0.0.1 LANGUAGES CXX C)
set(CMAKE_EXPORT_COMPILE_COMMANDS ON) set(CMAKE_EXPORT_COMPILE_COMMANDS ON)

3
flatpak/README.md
View File

@@ -35,7 +35,8 @@ Install the runtime environments:
flatpak install org.gnome.Sdk/x86_64 flatpak install org.gnome.Sdk/x86_64
flatpak install org.gnome.Platform flatpak install org.gnome.Platform
Select version **45** in the list of proposed version
_Select version **47** in the list of proposed versions_
### 2. Build vimix flatpak ### 2. Build vimix flatpak

29
flatpak/io.github.brunoherbelin.Vimix.json
View File

@@ -1,7 +1,7 @@
{ {
"app-id": "io.github.brunoherbelin.Vimix", "app-id": "io.github.brunoherbelin.Vimix",
"runtime": "org.gnome.Platform", "runtime": "org.gnome.Platform",
"runtime-version": "45", "runtime-version": "47",
"sdk": "org.gnome.Sdk", "sdk": "org.gnome.Sdk",
"command": "vimix", "command": "vimix",
"rename-desktop-file": "vimix.desktop", "rename-desktop-file": "vimix.desktop",
@@ -42,8 +42,8 @@
"sources": [ "sources": [
{ {
"type": "git", "type": "git",
"tag": "3.3.9", "tag": "3.4",
"commit": "e2c92645460f680fd272fd2eed591efb2be7dc31", "commit": "7b6aead9fb88b3623e3b3725ebb42670cbe4c579",
"url": "https://github.com/glfw/glfw.git" "url": "https://github.com/glfw/glfw.git"
} }
] ]
@@ -56,7 +56,7 @@
"sources": [ "sources": [
{ {
"type": "git", "type": "git",
"commit": "c1c9931dc87289b8aeba78150467f17bdb97d019", "commit": "373697b467f7cd0af88f1e9e32d4f10540df4687",
"url": "https://code.videolan.org/videolan/x264.git" "url": "https://code.videolan.org/videolan/x264.git"
} }
] ]
@@ -72,7 +72,8 @@
"sources": [ "sources": [
{ {
"type": "git", "type": "git",
"tag": "3.5", "tag": "4.1",
"commit": "1d117bed4747758b51bd2c124d738527e30392cb",
"url": "https://bitbucket.org/multicoreware/x265_git.git" "url": "https://bitbucket.org/multicoreware/x265_git.git"
} }
] ]
@@ -88,8 +89,8 @@
"sources": [ "sources": [
{ {
"type": "git", "type": "git",
"tag": "v1.5.3", "tag": "v1.5.4",
"commit": "09f35c0f1743e23f514cb41444504a7faeacf89e", "commit": "a8c6b65520f814c5bd8f801be48c33ceece7c4a6",
"url": "https://github.com/Haivision/srt.git" "url": "https://github.com/Haivision/srt.git"
} }
] ]
@@ -103,8 +104,8 @@
"sources": [ "sources": [
{ {
"type": "git", "type": "git",
"tag": "v2.3.1", "tag": "v2.3.3",
"commit": "49f759d9e153a4e2850127e368f7aa6f40d59aaf", "commit": "cdeddc7553bbfdc446c61d1bfa6a51bcc029b4a8",
"url": "https://github.com/dyne/frei0r.git" "url": "https://github.com/dyne/frei0r.git"
} }
] ]
@@ -138,8 +139,8 @@
"sources": [ "sources": [
{ {
"type": "git", "type": "git",
"tag": "1.22.8", "tag": "1.24.10",
"commit": "4af14db10e8355f980bbf79733af004e59d255fc", "commit": "5be4b6f03689ab438822f6cfcd13f1f300afe203",
"url": "https://gitlab.freedesktop.org/gstreamer/gstreamer.git", "url": "https://gitlab.freedesktop.org/gstreamer/gstreamer.git",
"disable-submodules": false "disable-submodules": false
} }
@@ -149,7 +150,7 @@
"name": "shmdata", "name": "shmdata",
"buildsystem": "cmake-ninja", "buildsystem": "cmake-ninja",
"config-opts": [ "config-opts": [
"-DCMAKE_BUILD_TYPE=Release", "-DCMAKE_BUILD_TYPE=RelWithDebInfo",
"-DWITH_PYTHON=OFF", "-DWITH_PYTHON=OFF",
"-DWITH_SDFLOW=OFF", "-DWITH_SDFLOW=OFF",
"-DWITH_SDCRASH=OFF", "-DWITH_SDCRASH=OFF",
@@ -158,8 +159,8 @@
"sources": [ "sources": [
{ {
"type": "git", "type": "git",
"tag": "1.3.73", "tag": "1.3.74",
"commit": "309d657fde6ac3493b0f857facd2c5e3356cb1e1", "commit": "43d2fe1b133cc9ded823fde6bd10560721a36e98",
"url": "https://gitlab.com/sat-mtl/tools/shmdata.git" "url": "https://gitlab.com/sat-mtl/tools/shmdata.git"
} }
] ]

BIN
rsc/images/icons.dds
View File

Binary file not shown.

2
src/CMakeLists.txt
View File

@@ -3,7 +3,7 @@
##### **Copyright** (C) 2019-2023 Bruno Herbelin <bruno.herbelin@gmail.com> ##### **Copyright** (C) 2019-2023 Bruno Herbelin <bruno.herbelin@gmail.com>
##### #####
cmake_minimum_required(VERSION 3.8.2) cmake_minimum_required(VERSION 3.10)
include( InstallRequiredSystemLibraries ) include( InstallRequiredSystemLibraries )
##### #####

2
src/UserInterfaceManager.cpp
View File

@@ -2175,7 +2175,7 @@ void UserInterface::RenderAbout(bool* p_open)
ImGui::Image((void*)(intptr_t)img_crow, ImVec2(512, 340)); ImGui::Image((void*)(intptr_t)img_crow, ImVec2(512, 340));
ImGui::Text("vimix performs graphical mixing and blending of\nseveral movie clips and computer generated graphics,\nwith image processing effects in real-time."); ImGui::Text("vimix performs graphical mixing and blending of\nseveral movie clips and computer generated graphics,\nwith image processing effects in real-time.");
ImGui::Text("\nvimix is licensed under GNU GPL version 3 or later.\n" UNICODE_COPYRIGHT " 2019-2023 Bruno Herbelin."); ImGui::Text("\nvimix is licensed under GNU GPL version 3 or later.\n" UNICODE_COPYRIGHT " 2019-2025 Bruno Herbelin.");
ImGui::Spacing(); ImGui::Spacing();
ImGuiToolkit::ButtonOpenUrl("Visit vimix website", "https://brunoherbelin.github.io/vimix/", ImVec2(ImGui::GetContentRegionAvail().x, 0)); ImGuiToolkit::ButtonOpenUrl("Visit vimix website", "https://brunoherbelin.github.io/vimix/", ImVec2(ImGui::GetContentRegionAvail().x, 0));