[WIP] Attempt to align flatpak and codebase on mpv 0.35

com.stremio.Stremio.json

@@ -1,23 +1,24 @@
 {
   "app-id": "com.stremio.Stremio",
   "runtime": "org.kde.Platform",
-  "runtime-version": "5.12",
-  "branch": "beta",
+  "runtime-version": "5.15-21.08",
+  "base": "io.qt.qtwebengine.BaseApp",
+  "base-version": "5.15-21.08",
   "sdk": "org.kde.Sdk",
   "command": "/app/opt/stremio/stremio",
   "separate-locales": true,
   "finish-args": [
     "--share=ipc",
     "--share=network",
     "--device=dri",
+    "--filesystem=xdg-run/pipewire-0:ro",
     "--socket=fallback-x11",
     "--socket=wayland",
     "--socket=pulseaudio",
-    "--talk-name=org.a11y.Bus",
     "--talk-name=org.freedesktop.ScreenSaver",
     "--talk-name=org.freedesktop.Notifications",
     "--talk-name=org.kde.StatusNotifierWatcher",
-    "--own-name=org.kde.StatusNotifierItem-2-1",
+    "--own-name=org.kde.*",
     "--env=TMPDIR=/var/cache/tmp"
   ],
   "cleanup": [
@@ -36,26 +37,32 @@
       "sources": [
         {
           "type": "archive",
-          "url": "https://nodejs.org/dist/latest-v8.x/node-v8.17.0-linux-x64.tar.gz",
-          "sha256": "8b2c9e1f84317c4b02736c4c50db4dd2cd6c4f0ba910fa81f887c8c9294af596"
+          "url": "https://nodejs.org/dist/latest-v15.x/node-v15.14.0-linux-x64.tar.xz",
+          "sha256": "f40a52c77a5a98203d24d6e5213c1a189bfc9736d0d9f667cb61151e9431b2a8"
         }
       ]
     },
     {
       "name": "stremio",
-      "buildsystem": "qmake",
+      "buildsystem": "cmake",
+      "config-opts": [
+        "-DCMAKE_BUILD_TYPE=Debug"
+      ],
       "build-options": {
         "env": {
           "LIBRARY_PATH": "/app/lib:/usr/lib"
         }
       },
       "post-install": [
         "install -Dm755 server.js /app/opt/stremio/server.js",
-        "install -Dm644 com.stremio.Stremio.desktop /app/share/applications/com.stremio.Stremio.desktop",
-        "install -Dm644 com.stremio.Stremio.svg /app/share/icons/hicolor/scalable/apps/com.stremio.Stremio.svg",
-        "install -Dm644 com.stremio.Stremio-symbolic.svg /app/share/icons/hicolor/scalable/apps/com.stremio.Stremio-symbolic.svg",
-        "install -Dm644 com.stremio.Stremio.appdata.xml /app/share/metainfo/com.stremio.Stremio.appdata.xml",
-        "ln -s /app/bin/node /app/opt/stremio/node"
+        "install -Dm644 smartcode-stremio.desktop /app/share/applications/com.stremio.Stremio.desktop",
+        "desktop-file-edit --set-icon=com.stremio.Stremio /app/share/applications/com.stremio.Stremio.desktop",
+        "desktop-file-edit --set-key=Exec --set-value='/app/opt/stremio/stremio %U' /app/share/applications/com.stremio.Stremio.desktop",
+        "install -Dm644 ./images/stremio.svg /app/share/icons/hicolor/scalable/apps/com.stremio.Stremio.svg",
+        "install -Dm644 ./images/stremio_tray_black.svg /app/share/icons/hicolor/scalable/apps/com.stremio.Stremio-symbolic.svg",
+        "install -Dm644 com.stremio.Stremio.metainfo.xml /app/share/metainfo/com.stremio.Stremio.metainfo.xml",
+        "ln -s /app/bin/node /app/opt/stremio/node",
+        "ln -s /app/bin/QtWebEngineProcess /app/opt/stremio/QtWebEngineProcess"
       ],
       "sources": [
         {
@@ -64,8 +71,8 @@
         },
         {
           "type": "file",
-          "url": "https://dl.strem.io/four/v4.4.108/server.js",
-          "sha256": "35397d574282980c5b3a73f475f2e5bb6cc6d7919d3e6d23e8f737cd9d1c986f"
+          "url": "https://dl.strem.io/four/v4.4.159/server.js",
+          "sha256": "c31c98fe4cd8158523c45685ba2a949cffd3fc0f06dffef66797d07e3a2bbbee"
         },
         {
           "type": "file",
@@ -81,7 +88,7 @@
         },
         {
           "type": "file",
-          "path": "flatpak/assets/com.stremio.Stremio.appdata.xml"
+          "path": "flatpak/assets/com.stremio.Stremio.metainfo.xml"
         }
       ],
       "modules": [
@@ -93,53 +100,28 @@
             "/share/man"
           ],
           "buildsystem": "simple",
+          "build-options":{
+            "cflags": "-g2 -O0"
+          },
           "build-commands": [
-            "python3 waf configure --prefix=/app --enable-libmpv-shared --disable-cplayer --disable-build-date --disable-oss-audio --disable-alsa ",
+            "python3 waf configure --prefix=/app --disable-manpage-build --enable-libmpv-shared --disable-cplayer --disable-build-date --disable-alsa ",
             "python3 waf build",
             "python3 waf install"
           ],
           "sources": [
             {
               "type": "archive",
-              "url": "https://github.com/mpv-player/mpv/archive/v0.31.0.tar.gz",
-              "sha256": "805a3ac8cf51bfdea6087a6480c18835101da0355c8e469b6d488a1e290585a5"
+              "url": "https://github.com/mpv-player/mpv/archive/v0.35.0.tar.gz",
+              "sha256": "dc411c899a64548250c142bf1fa1aa7528f1b4398a24c86b816093999049ec00"
             },
             {
               "type": "file",
-              "url": "https://waf.io/waf-2.0.19",
-              "sha256": "ba63c90a865a9bcf46926c4e6776f9a3f73d29f33d49b7f61f96bc37b7397cef",
+              "url": "https://waf.io/waf-2.0.22",
+              "sha256": "0a09ad26a2cfc69fa26ab871cb558165b60374b5a653ff556a0c6aca63a00df1",
               "dest-filename": "waf"
             }
           ],
           "modules": [
-            {
-              "name": "libv4l2",
-              "cleanup": [
-                "/sbin",
-                "/bin",
-                "/include",
-                "/lib/*.la",
-                "/lib/*/*.la",
-                "/lib*/*/*/*.la",
-                "/lib/pkgconfig",
-                "/share/man"
-              ],
-              "config-opts": [
-                "--disable-static",
-                "--disable-bpf",
-                "--with-udevdir=/app/lib/udev"
-              ],
-              "sources": [
-                {
-                  "type": "archive",
-                  "url": "https://linuxtv.org/downloads/v4l-utils/v4l-utils-1.16.8.tar.bz2",
-                  "sha256": "84346bf200bd30efb8a80a65ded1b81d39ae7e0ff2272e98f478b4eee8f40d13"
-                }
-              ],
-              "modules": [
-                "flatpak/modules/udev-175.json"
-              ]
-            },
             {
               "name": "nv-codec-headers",
               "cleanup": [
@@ -153,7 +135,12 @@
                 {
                   "type": "git",
                   "url": "https://git.videolan.org/git/ffmpeg/nv-codec-headers.git",
-                  "commit": "40e7dd3f646f303e584da1951a4840414a0ace4d"
+                  "tag": "n11.1.5.2",
+                  "commit": "f8ae7a49bfef2f99d2c931a791dc3863fda67bf3",
+                  "x-checker-data": {
+                    "type": "git",
+                    "tag-pattern": "^n([\\d.]+)$"
+                  }
                 }
               ]
             },
@@ -172,14 +159,13 @@
                 "--disable-programs",
                 "--disable-encoders",
                 "--disable-muxers",
-                "--enable-encoder=png",
-                "--enable-libv4l2"
+                "--enable-encoder=png"
               ],
               "sources": [
                 {
                   "type": "archive",
-                  "url": "https://ffmpeg.org/releases/ffmpeg-4.2.2.tar.xz",
-                  "sha256": "cb754255ab0ee2ea5f66f8850e1bd6ad5cac1cd855d0a2f4990fb8c668b0d29c"
+                  "url": "https://ffmpeg.org/releases/ffmpeg-5.1.2.tar.xz",
+                  "sha256": "619e706d662c8420859832ddc259cd4d4096a48a2ce1eefd052db9e440eef3dc"
                 }
               ]
             },
@@ -207,8 +193,8 @@
               "sources": [
                 {
                   "type": "archive",
-                  "url": "https://github.com/libass/libass/releases/download/0.14.0/libass-0.14.0.tar.xz",
-                  "sha256": "881f2382af48aead75b7a0e02e65d88c5ebd369fe46bc77d9270a94aa8fd38a2"
+                  "url": "https://github.com/libass/libass/releases/download/0.15.0/libass-0.15.0.tar.gz",
+                  "sha256": "9cbddee5e8c87e43a5fe627a19cd2aa4c36552156eb4edcf6c5a30bd4934fe58"
                 }
               ]
             },
@@ -238,4 +224,4 @@
       ]
     }
   ]
-}
+}

flatpak/assets/com.stremio.Stremio.appdata.xml → flatpak/assets/com.stremio.Stremio.metainfo.xml

@@ -29,8 +29,14 @@
       <caption>Keep track of everything you watch</caption>
     </screenshot>
   </screenshots>
+  <content_rating type="oars-1.1"/>
   <releases>
-    <release version="4.4.77" date="2019-07-02" />
+    <release version="4.4.159" date="2022-08-23" />
+    <release version="4.4.142" date="2021-07-07" />
+    <release version="4.4.137" date="2021-04-28" />
+    <release version="4.4.135" date="2021-03-25" />
+    <release version="4.4.132" date="2021-03-17" />
+    <release version="4.4.120" date="2020-10-11" />
   </releases>
 </component>
 

mpv.cpp

@@ -65,7 +65,7 @@ class MpvRenderer : public QQuickFramebufferObject::Renderer
         // init mpv_gl:
         if (!obj->mpv_gl)
         {
-            mpv_opengl_init_params gl_init_params{get_proc_address_mpv, nullptr, nullptr};
+            mpv_opengl_init_params gl_init_params{get_proc_address_mpv, nullptr};
             mpv_render_param params[]{
                 {MPV_RENDER_PARAM_API_TYPE, const_cast<char *>(MPV_RENDER_API_TYPE_OPENGL)},
                 {MPV_RENDER_PARAM_OPENGL_INIT_PARAMS, &gl_init_params},

mpv.h

@@ -6,7 +6,7 @@
 
 #include <mpv/client.h>
 #include <mpv/render_gl.h>
-#include <mpv/qthelper.hpp>
+#include "qthelper.hpp"
 
 class MpvRenderer;