From 0161126153ac1fdc9eda6e76a69b995dad868964 Mon Sep 17 00:00:00 2001
From: Bruno Herbelin <bruno.herbelin@gmail.com>
Date: Sat, 4 Jan 2025 11:02:21 +0100
Subject: [PATCH] Update flatpak to Gnome 47 and latest dependencies

---
 CMakeLists.txt                             |   2 +-
 flatpak/README.md                          |   3 ++-
 flatpak/io.github.brunoherbelin.Vimix.json |  29 +++++++++++----------
 rsc/images/icons.dds                       | Bin 1638528 -> 1638528 bytes
 src/CMakeLists.txt                         |   2 +-
 src/UserInterfaceManager.cpp               |   2 +-
 6 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 13f4ab5..a402332 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@
 #####  **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)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
diff --git a/flatpak/README.md b/flatpak/README.md
index b1fb7f5..5e2bd4d 100644
--- a/flatpak/README.md
+++ b/flatpak/README.md
@@ -35,7 +35,8 @@ Install the runtime environments:
     flatpak install org.gnome.Sdk/x86_64
     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
diff --git a/flatpak/io.github.brunoherbelin.Vimix.json b/flatpak/io.github.brunoherbelin.Vimix.json
index b3abea1..a5920de 100644
--- a/flatpak/io.github.brunoherbelin.Vimix.json
+++ b/flatpak/io.github.brunoherbelin.Vimix.json
@@ -1,7 +1,7 @@
 {
     "app-id": "io.github.brunoherbelin.Vimix",
     "runtime": "org.gnome.Platform",
-    "runtime-version": "45",
+    "runtime-version": "47",
     "sdk": "org.gnome.Sdk",
     "command": "vimix",
     "rename-desktop-file": "vimix.desktop",
@@ -42,8 +42,8 @@
             "sources": [
             {
                 "type": "git",
-                "tag": "3.3.9",
-                "commit": "e2c92645460f680fd272fd2eed591efb2be7dc31",
+                "tag": "3.4",
+                "commit": "7b6aead9fb88b3623e3b3725ebb42670cbe4c579",
                 "url": "https://github.com/glfw/glfw.git"
             }
             ]
@@ -56,7 +56,7 @@
             "sources": [
             {
                 "type": "git",
-                "commit": "c1c9931dc87289b8aeba78150467f17bdb97d019",
+                "commit": "373697b467f7cd0af88f1e9e32d4f10540df4687",
                 "url": "https://code.videolan.org/videolan/x264.git"
             }
             ]
@@ -72,7 +72,8 @@
             "sources": [
             {
                 "type": "git",
-                "tag": "3.5",
+                "tag": "4.1",
+                "commit": "1d117bed4747758b51bd2c124d738527e30392cb",
                 "url": "https://bitbucket.org/multicoreware/x265_git.git"
             }
             ]
@@ -88,8 +89,8 @@
             "sources": [
             {
                 "type": "git",
-                "tag": "v1.5.3",
-                "commit": "09f35c0f1743e23f514cb41444504a7faeacf89e",
+                "tag": "v1.5.4",
+                "commit": "a8c6b65520f814c5bd8f801be48c33ceece7c4a6",
                 "url": "https://github.com/Haivision/srt.git"
             }
             ]
@@ -103,8 +104,8 @@
             "sources": [
             {
                 "type": "git",
-                "tag": "v2.3.1",
-                "commit": "49f759d9e153a4e2850127e368f7aa6f40d59aaf",
+                "tag": "v2.3.3",
+                "commit": "cdeddc7553bbfdc446c61d1bfa6a51bcc029b4a8",
                 "url": "https://github.com/dyne/frei0r.git"
             }
             ]
@@ -138,8 +139,8 @@
             "sources": [
               {
                 "type": "git",
-                "tag": "1.22.8",
-                "commit": "4af14db10e8355f980bbf79733af004e59d255fc",
+                "tag": "1.24.10",
+                "commit": "5be4b6f03689ab438822f6cfcd13f1f300afe203",
                 "url": "https://gitlab.freedesktop.org/gstreamer/gstreamer.git",
                 "disable-submodules": false
               }
@@ -149,7 +150,7 @@
             "name": "shmdata",
             "buildsystem": "cmake-ninja",
             "config-opts": [
-                "-DCMAKE_BUILD_TYPE=Release",
+                "-DCMAKE_BUILD_TYPE=RelWithDebInfo",
                 "-DWITH_PYTHON=OFF",
                 "-DWITH_SDFLOW=OFF",
                 "-DWITH_SDCRASH=OFF",
@@ -158,8 +159,8 @@
             "sources": [
             {
                 "type": "git",
-                "tag": "1.3.73",
-                "commit": "309d657fde6ac3493b0f857facd2c5e3356cb1e1",
+                "tag": "1.3.74",
+                "commit": "43d2fe1b133cc9ded823fde6bd10560721a36e98",
                 "url": "https://gitlab.com/sat-mtl/tools/shmdata.git"
             }
             ]
diff --git a/rsc/images/icons.dds b/rsc/images/icons.dds
index 25ca184d4a1445070e5213a7548fa901d9d7eba6..ccda5c2414f167009fd3f7b98395bf3e146249aa 100644
GIT binary patch
delta 1883
zcmbVLZ%i9y7=PZj^o}coYYVjK47W)(0=kv$%a)n6izI5)(J%h_Vp<cx7!yj9ZH#CJ
z)i9XZq-UeAe-<b~GjtzXta>AH0fuZ#6k+<o#n2Q;oWz(F0!;q&IN!JR?jS@>e4qTT
z{XPHgd7k&V_E3F$s6IYkD0T?auOc&p665@wRqPa`o1Zc#5H9(Ic{g#nV%;i+1Ux##
zjNm<G=uK?A%Jd}qjwn_!Y{i2U%oJ6h#4F!1SNfyR*s|JLW-1c=su?e)m{@<*pHr@=
z$|b5ixl@^lb}d<P<RSK+6nc=|hZ2`B{cgo#4O?0`sgUzIIpk-e3cnYzoGqCKa&-N)
z0zZKZKY55fibK~6N(<_A+lx4{Xma7PMU#+ylsvaRwn2tDh~i2Y`<nRHfy8Kh%IZ)c
zD_WA6(yI_)XBir>%1S0Hnl%!13+7x%#PR+|xG#muv8UD8F1gCkC`yEG@ciF){KD6k
zcf^ir?El%qBjrCLBcU4&iMzjCDf++BzQoME!GDR~(WqOYQb!v-&xC;r8BMG4gIp_-
z(1}tB8_;^uj>z1I()iYxvG)PLIvYAEnG$lcS4cbFtH35~z>22q&f2pN>IBe=$C7-L
z9U2=|OIAO3PR11%jhAx8NTE{1^H>~U%TW{VJ5?OUw;Naizx)|1NTI0Fjii|wcFG`y
zs}U-a#B1zn6W(8j-tH9Lh`>N#Brp-=5ts=W0#*{;`TmUK4#Z&uM${@Nhf+vk$!yp+
z%)6zE$G8dmK4K;k*IZJ8jBh0nRXG9{+%POTyxg!|JXdts1*@tJZoA|)C4E=r0U-cX
zR4$wD?~Zr7lnDDnrR1sSPT9o{+p8YcOm<lGW->9Af2$}j^&o>5UNr-=R8)H|xt<=@
z;79Q4-%tVgU=poys=wGSU~gkyP#QhME!g(cPv(o@rfP*%^1fqD+S}6RD(V5)dDK>p
zX7Q2N*~&e0b>T@q1It<vAjl{4(71H`0_V32p8VDCsg4|a%W^E0*VCzU10H+=x!OoC
zU2D2FK<bU1);WE9OUo7>1-|7KoyR~nZ9J=U>R(&Cg~uUW+pqK7Kb=d>QO;#=yYL|k
z99Xm-&Uev7`WWw|y(u!<B^pSZNhS@%->3N}liU51^7d;=Cj-3ipZ#&~Q%v#0Jjv0l
zz2Ogjd`#Iqt8zt24^)To^Luv%rJG-J>o!LiXn<D2B$C<X1L2r@S67!%wIJ}nU8fnc
zMSC*yskHeKEh1(xOOM~;F53Nq3@c>eJ*uY(9)%bvMwRE9(YKDa;&TQ5)a*gOyfK_M
zt9-Mm4H>u8Mz&7!PIF;<%^Eiv@T6fw^`w~%vz)fiX+?Ru8xCqU9uq?@>G%Q{wF}G8
zPCHg3eG93%%>1&pyKY?bjp2}V*krk8cZL;ShWj697mMDPo9yR7=pE{0ofd)uf?WiK
b1VscqftA2UU?(UhC?O~%a7e7vd1n4EbF=uN

delta 1867
zcmZ8hZ%7+w7=JF8<TNqy&Zx0tRomJ!yREU5v96OEH_(+ijopWhb<hZYkTIqo>exOE
zFUVFM?ab{8S7<ktvI!ljk((T?bSg!<4=u4P#qJ-`jZIdHQJab}dhg!%lJ{c!KKwX-
z@9+8dKJS}|p>{FU9-VO?l4lTEm+=C;em7W-$1h|ysLn#XRJk8vZ(o|>E$WQ$7teQ@
z@izi!4Iz0>JmQUI^WYB&WuXTUhk8ippgK~OV5Bbub!6`bZ+`^oAexmIi}&+OF(C#q
zp!sxVY~14Gtne(3jw^E!_Dgm6a1|r}BfhEfuY?78sL890e9RQ?o|vFPBtZ-=m`S3D
zm^h)Vceu-oGF_35kQL=4CvuUF`iw-{-oh3}m$|pD%FE&&_3x(ZLRrRt%lH^k<%n2J
zIsblM`D+)=Dr9s3;ajwe48LXaEkrD{w&kJKg97J5#C}rFzhi%c+eE~0FKt)Vso=c8
zrBMp4qA7Xq-TijsfH7rc+;YV3#D`#GWHkNq(5Xsg-e-MV_H;+osZ;ZU67FC*d8Dt}
zi$@}$rCj+a8bdn1sm0>*f&@BA1kzQfEc8c}=?0-e=K8Ox(|x}PQtwXhV^pKVFqntU
z<hg|J`2asU%F<|LZw5xW7h!);qZjWmQpl%9zggg=P)$v1W**e@+QgH5;=Lz1qbx+&
zS#>%(g|qn8>9JW}TiD4jvvR08poH#mgKF2!U4^+l_0DfoPtc`pv{X|p%tlt$LZu9E
zWSg`~VZRoBo?#4$(E8I-9fM)PU@@#1HViukhmogAb@{<fWu==rr+r@Q_|PMT>a?1G
z<9p9>{yTa)a+do0dcx$by*i2<Gsjl~iNg;NoHKRof3_H32VUeBGP5|rXwS7f&U#+;
zgWpvAy<2D$O;Y|JLMQeCYi7P;V~k*`OJe2A{s+L5O}dA!j3YRn%UJ^PV;lIfQJwf&
zfz=v6aeUyZGeUF0`ewR)oqL>5okuPDM{QdmQBHzCV^A&Sl34X3KX-#r<7hSMe-rV2
z&zQ}`5)G4G1L2cYXSDh=j-W>w{*|fdS#{34hJ0P7NRpF9omB*j<ZP5zL&826<5QHw
z*8zR=t4RyxsA&K!+v1I6+j!JB>t1mt^RoVV*^2<B(d{~;-5qk=E>ea%+`G5|ei9x+
zO37=mRaeZz0<6FaEm8sH*xY7QlIX4EskmlKS^k7kQ_OatH12kZ+RYyw8$~^9kc3qj
zq7in;hog|NQvP($xb!M9s=I(#!P6CT+z&yB@@eWn0G-f+8>U<l2ke5@`m>|Q)0R3K
z&~Z0@ssV5?2s)k5Wq5=w2}!CKfYUI_aj!v0h0Wi=bX+g%1e;lll|mI-;15UG^U~cx
zJ`H2JtAykW$@uyP$z;46N2O!&Q=~Ujo~|8aIHmic^MLmHvg2EiFFO~iiwM@XKaH3r
z-|(QiB<|4;S)JEC+Oo~gkUyEz2X{Cz3NTz4Zj3?<9z(z=!th`eW0YW&VtBQKJIY!X
F{|6KJ;iUio

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b93da17..ff27f20 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -3,7 +3,7 @@
 #####  **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 )
 
 #####
diff --git a/src/UserInterfaceManager.cpp b/src/UserInterfaceManager.cpp
index 5824cfb..cb25757 100644
--- a/src/UserInterfaceManager.cpp
+++ b/src/UserInterfaceManager.cpp
@@ -2175,7 +2175,7 @@ void UserInterface::RenderAbout(bool* p_open)
     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("\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();
     ImGuiToolkit::ButtonOpenUrl("Visit vimix website", "https://brunoherbelin.github.io/vimix/", ImVec2(ImGui::GetContentRegionAvail().x, 0));