Updating Ubuntu 22.04 build docs and tweak for build compatibility

Author: tedwaine

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "extern/otio/OpenTimelineIO"]
+	path = extern/otio/OpenTimelineIO
+	url = https://github.com/AcademySoftwareFoundation/OpenTimelineIO

docs/build_guides/ubuntu_22_04.md

@@ -3,8 +3,7 @@
 
 ### Note (May 2025)
 
-These docs are not accurate and are to be updated soon. Note that xSTUDIO now requires Qt6.5.3, where these notes incorrectly install qt5. You can install Qt6.5.3 using [these instructions](downloading_qt.md) instead.
-
+Note that xSTUDIO now requires Qt6.5.3. You can install Qt6.5.3 using [these instructions](downloading_qt.md) instead. 
 
 ### Distro installs
     sudo apt install build-essential cmake git python3-pip
@@ -14,12 +13,8 @@ These docs are not accurate and are to be updated soon. Note that xSTUDIO now re
     sudo apt install libglu1-mesa-dev freeglut3-dev mesa-common-dev libglew-dev libfreetype-dev
     sudo apt install libjpeg-dev libpulse-dev nlohmann-json3-dev
     sudo apt install yasm nasm libfdk-aac-dev libfdk-aac2 libmp3lame-dev libopus-dev libvpx-dev libx265-dev libx264-dev
-    sudo apt install  qttools5-dev qtbase5-dev qt5-qmake  qtdeclarative5-dev qtquickcontrols2-5-dev
-    sudo apt install qml-module-qtquick* qml-module-qt-labs-*
-
     pip install sphinx_rtd_theme
 
-
 ### Local installs
 #### OpenEXR
     git clone https://github.com/AcademySoftwareFoundation/openexr.git
@@ -34,32 +29,20 @@ These docs are not accurate and are to be updated soon. Note that xSTUDIO now re
 
 
 #### ActorFramework
-    wget https://github.com/actor-framework/actor-framework/archive/refs/tags/0.18.4.tar.gz
-    tar -xf 0.18.4.tar.gz
-    cd actor-framework-0.18.4
+    git clone https://github.com/actor-framework/actor-framework
+    cd actor-framework
+    git checkout 1.0.2
     ./configure
     cd build
     make -j $JOBS
     sudo make install
     cd ../..
 
 
-#### OpenTimelineIO
-    git clone https://github.com/AcademySoftwareFoundation/OpenTimelineIO.git
-    cd OpenTimelineIO
-    git checkout cxx17
-    mkdir build
-    cd build
-    cmake -DOTIO_PYTHON_INSTALL=ON -DOTIO_DEPENDENCIES_INSTALL=OFF -DOTIO_FIND_IMATH=ON ..
-    make -j $JOBS
-    sudo make install
-    cd ../..
-
-
 #### OCIO2
-    wget https://github.com/AcademySoftwareFoundation/OpenColorIO/archive/refs/tags/v2.2.0.tar.gz
-    tar -xf v2.2.0.tar.gz
-    cd OpenColorIO-2.2.0/
+    wget https://github.com/AcademySoftwareFoundation/OpenColorIO/archive/refs/tags/v2.2.1.tar.gz
+    tar -xf v2.2.1.tar.gz
+    cd OpenColorIO-2.2.1/
     mkdir build
     cd build
     cmake -DOCIO_BUILD_APPS=OFF -DOCIO_BUILD_TESTS=OFF -DOCIO_BUILD_GPU_TESTS=OFF ../
@@ -80,15 +63,31 @@ These docs are not accurate and are to be updated soon. Note that xSTUDIO now re
 
 
 ### xStudio
+
+You will need to set an environment variable to tell cmake where the Qt6 libraries are located. For example, if Qt6 was installed to **/home/maryjane/Qt6/** then you will need to run this command in your terminal:
+
+    export Qt6_DIR=/home/maryjane/Qt6/6.5.3/gcc_64/lib/cmake/Qt6
+
+Now we continue the build commands:
+
     export PKG_CONFIG_PATH=/usr/local/lib64/pkgconfig:/usr/local/lib64/pkgconfig
     cd  xstudio
+    git submodule init
+    git submodule update
     mkdir build
     cd build
-    cmake .. -DBUILD_DOCS=Off
+    cmake .. -DBUILD_DOCS=Off -DOTIO_SUBMODULE=On -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=1
+
     make -j $JOBS
 
-    export QV4_FORCE_INTERPRETER=1
+To run xstudio from your dev environment:
+
     export LD_LIBRARY_PATH=/usr/local/lib:/usr/local/lib64
     export PYTHONPATH=./bin/python/lib/python3.10/site-packages:/home/xstudio/.local/lib/python3.10/site-packages:
 
     ./bin/xstudio.bin
+
+Or you can install to your system and then run.
+
+    sudo make install
+    xstudio

src/launch/xstudio/src/xstudio.sh.in

@@ -12,7 +12,7 @@ then
 		export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$XSTUDIO_ROOT/lib
 	else
 		export XSTUDIO_ROOT=@CMAKE_INSTALL_PREFIX@/share/xstudio
-		export LD_LIBRARY_PATH=$XSTUDIO_ROOT/lib:/home/ted/Qt/5.15.2/gcc_64/lib:$LD_LIBRARY_PATH
+		export LD_LIBRARY_PATH=$XSTUDIO_ROOT/lib:$LD_LIBRARY_PATH
 		export PYTHONPATH=@CMAKE_INSTALL_PREFIX@/lib/python:$PYTHONPATH
 	fi
 fi

src/timeline/src/item.cpp

@@ -1075,7 +1075,7 @@ std::set<Uuid> Item::update(const JsonStore &event) {
     auto result = std::set<Uuid>();
     for (const auto &i : event)
         if (process_event(i.at("redo")))
-            result.insert(i.at("redo").at("event_id"));
+            result.insert(i.at("redo").at("event_id").get<utility::Uuid>());
     return result;
 }