[Nightly Flatpak] Switch to Qt6

.flatpak-manifest.json

@@ -2,17 +2,17 @@
   "id": "org.kde.kdenlive",
   "default-branch": "master",
   "runtime": "org.kde.Platform",
-  "runtime-version": "5.15-22.08",
+  "runtime-version": "6.6-kf6preview",
   "sdk": "org.kde.Sdk",
-  "sdk-extensions" : [ "org.freedesktop.Sdk.Extension.llvm15" ],
+  "sdk-extensions" : [ "org.freedesktop.Sdk.Extension.llvm17" ],
   "command": "kdenlive",
   "rename-icon": "kdenlive",
   "desktop-file-name-suffix": " (Nightly)",
   "finish-args": [
     "--require-version=0.11.4",
     "--share=ipc",
-    "--socket=x11",
     "--socket=wayland",
+    "--socket=fallback-x11",
     "--device=all",
     "--socket=pulseaudio",
     "--share=network",
@@ -28,7 +28,7 @@
   "add-extensions": {
     "org.freedesktop.LinuxAudio.Plugins": {
       "directory": "extensions/Plugins",
-      "version": "22.08",
+      "version": "23.08",
       "add-ld-path": "lib",
       "merge-dirs": "ladspa",
       "subdirectories": true,
@@ -36,7 +36,7 @@
     },
     "org.freedesktop.LinuxAudio.Plugins.swh": {
       "directory": "extensions/Plugins/swh",
-      "version": "22.08",
+      "version": "23.08",
       "add-ld-path": "lib",
       "merge-dirs": "ladspa",
       "autodelete": false,
@@ -44,7 +44,7 @@
     },
     "org.freedesktop.LinuxAudio.Plugins.TAP": {
       "directory": "extensions/Plugins/TAP",
-      "version": "22.08",
+      "version": "23.08",
       "add-ld-path": "lib",
       "merge-dirs": "ladspa",
       "autodelete": false,

.gitlab-ci.yml

@@ -54,8 +54,15 @@ xml_lint:
     # enable globstar to be able to use ** as recursive wildcard
     - shopt -s globstar
     # exit shell on non-zero exit code
-    - set -e 
+    - set -e
     # execute xmllint for all xml files
     - for x in **/*.xml; do echo "Processing $x"; xmllint -noout "$x"; done
   rules:
     - changes: [ "**/*.xml" ]
+
+
+flatpak:
+  before_script:
+    - git clone https://invent.kde.org/sysadmin/ci-utilities.git --depth=1
+    - git clone https://invent.kde.org/sysadmin/ci-notary-service.git --depth=1
+    - flatpak --user install -y flathub org.freedesktop.Sdk.Extension.llvm17

packaging/flatpak/org.kde.kdenlive-dependencies.json

@@ -591,8 +591,8 @@
         "--enable-cuvid"
       ],
       "build-options": {
-        "append-path": "/usr/lib/sdk/llvm15/bin",
-        "prepend-ld-library-path": "/usr/lib/sdk/llvm15/lib"
+        "append-path": "/usr/lib/sdk/llvm17/bin",
+        "prepend-ld-library-path": "/usr/lib/sdk/llvm17/lib"
       },
       "cleanup": [
         "/share/ffmpeg/examples"
@@ -741,7 +741,10 @@
       "config-opts": [
         "-DMOD_OPENCV=ON",
         "-DMOD_MOVIT=ON",
-        "-DMOD_GLAXNIMATE=ON",
+        "-DMOD_GLAXNIMATE=OFF",
+        "-DMOD_QT=OFF",
+        "-DMOD_QT6=ON",
+        "-DMOD_GLAXNIMATE_QT6=ON",
         "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
       ],
       "sources": [