LinGui: update flatpak build

Upgrade to gnome 3.34
Upgrade Intel Media SDK to 19.2.1

6 files changed, 55 insertions, 30 deletions

diff --git a/.gitignore b/.gitignore
index 5d4ee057d..c68decbe4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,7 +27,7 @@ download/
 
 # Gtk autoconf spam
 gtk/Makefile.in*
-gtk/*/Makefile.in*
+gtk/src/Makefile.in*
 gtk/aclocal.m4
 gtk/autom4te.cache
 gtk/compile
diff --git a/pkg/linux/flatpak/fr.handbrake.HandBrakeCLI.json b/pkg/linux/flatpak/fr.handbrake.HandBrakeCLI.json
index 1df4e425c..abb439b3e 100644
--- a/pkg/linux/flatpak/fr.handbrake.HandBrakeCLI.json
+++ b/pkg/linux/flatpak/fr.handbrake.HandBrakeCLI.json
@@ -1,7 +1,7 @@
 {
     "app-id": "fr.handbrake.HandBrakeCLI",
     "runtime": "org.freedesktop.Platform",
-    "runtime-version": "18.08",
+    "runtime-version": "19.08",
     "sdk": "org.freedesktop.Sdk",
     "command": "HandBrakeCLI",
     "finish-args": [
diff --git a/pkg/linux/flatpak/fr.handbrake.ghb.json b/pkg/linux/flatpak/fr.handbrake.ghb.json
index 0741185a2..75a1112bd 100644
--- a/pkg/linux/flatpak/fr.handbrake.ghb.json
+++ b/pkg/linux/flatpak/fr.handbrake.ghb.json
@@ -1,8 +1,8 @@
 {
     "app-id": "fr.handbrake.ghb",
-    "runtime": "org.freedesktop.Platform",
-    "runtime-version": "18.08",
-    "sdk": "org.freedesktop.Sdk",
+    "runtime": "org.gnome.Platform",
+    "runtime-version": "3.34",
+    "sdk": "org.gnome.Sdk",
     "command": "ghb",
     "finish-args": [
         "--device=dri",
@@ -43,19 +43,6 @@
             ]
         },
         {
-            "name": "gvfs",
-            "cleanup": [ "/libexec/*", "/share/dbus-1/services/*", "/share/gvfs/mounts" ],
-            "config-opts": [ "--disable-hal", "--disable-gdu", "--disable-gcr", "--disable-obexftp",
-                             "--disable-avahi", "--disable-documentation", "--disable-admin" ],
-            "sources": [
-                {
-                    "type": "archive",
-                    "url": "https://download.gnome.org/sources/gvfs/1.36/gvfs-1.36.1.tar.xz",
-                    "sha256": "3840dff386c2c8a445337bea4ade0eb71339efaff8602767659fa2896792f026"
-                }
-            ]
-        },
-        {
             "name": "libass",
             "config-opts": ["--enable-asm", "--enable-harfbuzz",
                             "--enable-fontconfig"],
diff --git a/pkg/linux/flatpak/fr.handbrake.plugin.IntelMediaSDK.json b/pkg/linux/flatpak/fr.handbrake.plugin.IntelMediaSDK.json
index a1fc4cdeb..1ad47fa1b 100644
--- a/pkg/linux/flatpak/fr.handbrake.plugin.IntelMediaSDK.json
+++ b/pkg/linux/flatpak/fr.handbrake.plugin.IntelMediaSDK.json
@@ -3,18 +3,33 @@
     "branch": "1",
     "runtime": "fr.handbrake.ghb",
     "runtime-version": "development",
-    "sdk": "org.freedesktop.Sdk//18.08",
+    "sdk": "org.gnome.Sdk//3.34",
     "build-extension": true,
     "separate-locales": false,
     "appstream-compose": false,
     "modules": [
         {
+            "name": "libdrm",
+            "sources": [
+                {
+                    "type": "archive",
+                    "url": "https://dri.freedesktop.org/libdrm/libdrm-2.4.99.tar.gz",
+                    "sha256": "597fb879e2f45193431a0d352d10cd79ef61a24ab31f44320168583e10cb6302"
+                }
+            ],
+            "no-autogen": true,
+            "config-opts": [],
+            "build-options": {
+                "prefix" : "/app/extensions/IntelMediaSDK"
+            }
+        },
+        {
             "name": "intel-gmmlib",
             "sources": [
                 {
                     "type": "archive",
-                    "url": "https://github.com/intel/gmmlib/archive/intel-gmmlib-18.4.1.tar.gz",
-                    "sha256": "7970a8ae4e16efb98f38fbbc0346eea03227fc4462a9bd8e8077277cc3430a84"
+                    "url": "https://github.com/intel/gmmlib/archive/intel-gmmlib-19.2.3.tar.gz",
+                    "sha256": "60944d54a4992553f92d71ba9f8f4191d297407b564b0f24e9912b415689582e"
                 }
             ],
             "buildsystem": "cmake",
@@ -37,8 +52,8 @@
             "sources": [
                 {
                     "type": "archive",
-                    "url": "https://github.com/intel/libva/releases/download/2.4.0/libva-2.4.0.tar.bz2",
-                    "sha256": "99263056c21593a26f2ece812aee6fe60142b49e6cd46cb33c8dddf18fc19391"
+                    "url": "https://github.com/intel/libva/releases/download/2.5.0/libva-2.5.0.tar.bz2",
+                    "sha256": "3aa89cd369a506ac4dbe5de7c0ef5da4f3d220bf986403f02fa1f6f702af6878"
                 }
             ],
             "no-autogen": true,
@@ -52,8 +67,8 @@
             "sources": [
                 {
                     "type": "archive",
-                    "url": "https://github.com/intel/libva-utils/releases/download/2.4.0/libva-utils-2.4.0.tar.bz2",
-                    "sha256": "5b7d1954b40fcb2c0544be20125c71a0852049715ab85a3e8aba60434a40c6b3"
+                    "url": "https://github.com/intel/libva-utils/releases/download/2.5.0/libva-utils-2.5.0.tar.bz2",
+                    "sha256": "9238c9d5110d60f935683390b8383fdac3507346384cd5f117a23c6db1d72a17"
                 }
             ],
             "no-autogen": true,
@@ -67,14 +82,19 @@
             "sources": [
                 {
                     "type": "archive",
-                    "url": "https://github.com/intel/media-driver/archive/intel-media-18.4.1.tar.gz",
-                    "sha256": "f04467e725a530c2fb80e081a45d5b7910d1b3ccbf89ff2d0b1ea7996dd93ce1"
+                    "url": "https://github.com/intel/media-driver/archive/intel-media-19.2.1.tar.gz",
+                    "sha256": "79279c991d918deaa52239dac55787b9c7562e520cd58744171b468d28b8af40"
+                },
+                {
+                    "type": "patch",
+                    "path": "patch/intel-media-driver-implicit-function-decl-error.patch"
                 }
             ],
             "buildsystem": "cmake",
             "builddir": true,
             "config-opts": [
-                "-DCMAKE_BUILD_TYPE=Release"
+                "-DCMAKE_BUILD_TYPE=Release",
+                "-DMEDIA_RUN_TEST_SUITE=OFF"
             ],
             "build-options": {
                 "prefix" : "/app/extensions/IntelMediaSDK",
@@ -86,14 +106,18 @@
             "sources": [
                 {
                     "type": "archive",
-                    "url": "https://github.com/Intel-Media-SDK/MediaSDK/archive/intel-mediasdk-18.4.1.tar.gz",
-                    "sha256": "2a7b282f71e12f626a6cc70024a5b571a71ffdc5f673e2c8fc4858e9a1e1187b"
+                    "url": "https://github.com/Intel-Media-SDK/MediaSDK/archive/intel-mediasdk-19.2.1.tar.gz",
+                    "sha256": "03c11a0379b61e292e789fa3dc9308ce45f36d68b4ebf437806c0e2c32357970"
                 }
             ],
             "buildsystem": "cmake",
             "builddir": true,
             "config-opts": [
                 "-DCMAKE_BUILD_TYPE=Release",
+                "-DBUILD_SAMPLES=OFF",
+                "-DBUILD_TESTS=OFF",
+                "-DBUILD_TOOLS=OFF",
+                "-DBUILD_TESTS=OFF",
                 "-DMFX_ENABLE_SW_FALLBACK=OFF"
             ],
             "build-options": {
diff --git a/pkg/linux/flatpak/patch/intel-media-driver-implicit-function-decl-error.patch b/pkg/linux/flatpak/patch/intel-media-driver-implicit-function-decl-error.patch
new file mode 100644
index 000000000..06d309305
--- /dev/null
+++ b/pkg/linux/flatpak/patch/intel-media-driver-implicit-function-decl-error.patch
@@ -0,0 +1,11 @@
+diff -ur media-driver-intel-media-19.2.1.orig/media_driver/cmake/linux/media_compile_flags_linux.cmake media-driver-intel-media-19.2.1/media_driver/cmake/linux/media_compile_flags_linux.cmake
+--- media-driver-intel-media-19.2.1.orig/media_driver/cmake/linux/media_compile_flags_linux.cmake	2019-07-30 19:33:34.000000000 -0700
++++ media-driver-intel-media-19.2.1/media_driver/cmake/linux/media_compile_flags_linux.cmake	2019-09-13 12:15:31.275816235 -0700
+@@ -32,7 +32,6 @@
+     -Wno-overflow
+     -Wno-parentheses
+     -Wno-delete-incomplete
+-    -Werror=implicit-function-declaration
+     -Werror=address
+     -Werror=format-security
+     -Werror=non-virtual-dtor
diff --git a/pkg/linux/module.rules b/pkg/linux/module.rules
index 06a21ac1c..76b59cca3 100644
--- a/pkg/linux/module.rules
+++ b/pkg/linux/module.rules
@@ -5,6 +5,7 @@ pkg.create.deb:: $(PKG.gui.deb) $(PKG.cli.deb)
 pkg.create.rpm:: $(PKG.rpm.stamp)
 pkg.create.src.deb:: $(PKG.src.deb.stamp)
 pkg.create.tar:: pkg.create $(PKG.cli.tar)
+mediasdk:: $(PKG.mediasdk.flatpak)
 
 DEBIAN_CHANGELOG_DATE = $(shell date -R)
 
@@ -87,10 +88,12 @@ $(PKG.cli.flatpak): GNUmakefile $(PKG.cli.template.flatpak) $(PKG.src.tar.bz2)
 $(PKG.mediasdk.flatpak): GNUmakefile $(PKG.mediasdk.template.flatpak) $(PKG.gui.flatpak)
 	$(MKDIR.exe) -p $(STAGE.out.flatpak/)
 	$(MKDIR.exe) -p $(PKG.out.flatpak/)
+	$(CP.exe) -a $(PKG.flatpak/)patch $(STAGE.out.flatpak/)
 	$(SRC/)scripts/create_flatpak_manifest.py -p -r $(PKG.branch.flatpak) -t $(PKG.mediasdk.template.flatpak) $(PKG.mediasdk.manifest.flatpak)
 	-flatpak --user remove --noninteractive $(PKG.gui.name.flatpak)//$(PKG.branch.flatpak)
 	flatpak --user install --noninteractive $(PKG.gui.flatpak)
 	flatpak-builder --default-branch=$(PKG.branch.flatpak) --disable-cache --force-clean $(PGPSIGN) --repo=$(PKG.repo.flatpak) $(PKG.mediasdk.build.flatpak) $(PKG.mediasdk.manifest.flatpak)
+#	flatpak-builder --run $(PKG.mediasdk.build.flatpak) $(PKG.mediasdk.manifest.flatpak) bash
 	flatpak build-bundle --runtime $(PKG.repo.flatpak) $(PKG.mediasdk.flatpak) $(PKG.mediasdk.name.flatpak) $(PKG.plugin.version.flatpak)
 	-flatpak --user remove --noninteractive $(PKG.gui.name.flatpak)//$(PKG.branch.flatpak)