flatpak: prebuild some dependencies

Rather than using HandBrake's build for libass, fontconfig, freetype,
fribidi, harfbuzz.

The runtime platform already has fontconfig, freetype and harfbuzz.  We
just need to add libass and fribidi.

(cherry picked from commit 337cceb17649f50537e16b4fd27ae41884f9ff0a)

diff --git a/make/include/main.defs b/make/include/main.defs
index f316c0aa98b8128b278093e3039cd35d14f91a68..50a5636c8cb74cd1fc2e8e5aa022539c7a7a2453 100644 (file)
--- a/make/include/main.defs
+++ b/make/include/main.defs
@@ -62,10 +62,6 @@ ifeq (1,$(FEATURE.flatpak))
     MODULES += contrib/lame
     MODULES += contrib/jansson
     MODULES += contrib/x264
-    MODULES += contrib/harfbuzz
-    MODULES += contrib/fribidi
-    MODULES += contrib/freetype
-    MODULES += contrib/libass
 endif
 
 ifeq (1,$(FEATURE.fdk_aac))

diff --git a/pkg/linux/flatpak/fr.handbrake.HandBrakeCLI.json b/pkg/linux/flatpak/fr.handbrake.HandBrakeCLI.json
index 13752bda7241da86448548c77f1cdbc8710e12d5..9c2414f08b9bc3c7147b19c6897885cc23814bf9 100644 (file)
--- a/pkg/linux/flatpak/fr.handbrake.HandBrakeCLI.json
+++ b/pkg/linux/flatpak/fr.handbrake.HandBrakeCLI.json
@@ -8,6 +8,29 @@
         "--filesystem=host"
     ],
     "modules": [
+        {
+            "name": "fribidi",
+            "make-args": ["-j1"],
+            "sources": [
+                {
+                    "type": "archive",
+                    "url": "https://download.handbrake.fr/handbrake/contrib/fribidi-0.19.7.tar.gz",
+                    "sha256": "3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8"
+                }
+            ]
+        },
+        {
+            "name": "libass",
+            "config-opts": ["--enable-asm", "--enable-harfbuzz",
+                            "--enable-fontconfig"],
+            "sources": [
+                {
+                    "type": "archive",
+                    "url": "https://github.com/libass/libass/releases/download/0.14.0/libass-0.14.0.tar.gz",
+                    "sha256": "8d5a5c920b90b70a108007ffcd2289ac652c0e03fc88e6eecefa37df0f2e7fdf"
+                }
+            ]
+        },
         {
             "name": "handbrake",
             "no-autogen": true,

diff --git a/pkg/linux/flatpak/fr.handbrake.ghb.json b/pkg/linux/flatpak/fr.handbrake.ghb.json
index 867fc43fbde86771efa7b3cf6c2e5de11d0fcee1..45a4a5d647dfb87c16906319135e3caea4641609 100644 (file)
--- a/pkg/linux/flatpak/fr.handbrake.ghb.json
+++ b/pkg/linux/flatpak/fr.handbrake.ghb.json
@@ -15,6 +15,29 @@
         "--filesystem=host"
     ],
     "modules": [
+        {
+            "name": "fribidi",
+            "make-args": ["-j1"],
+            "sources": [
+                {
+                    "type": "archive",
+                    "url": "https://download.handbrake.fr/handbrake/contrib/fribidi-0.19.7.tar.gz",
+                    "sha256": "3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8"
+                }
+            ]
+        },
+        {
+            "name": "libass",
+            "config-opts": ["--enable-asm", "--enable-harfbuzz",
+                            "--enable-fontconfig"],
+            "sources": [
+                {
+                    "type": "archive",
+                    "url": "https://github.com/libass/libass/releases/download/0.14.0/libass-0.14.0.tar.gz",
+                    "sha256": "8d5a5c920b90b70a108007ffcd2289ac652c0e03fc88e6eecefa37df0f2e7fdf"
+                }
+            ]
+        },
         {
             "name": "libnotify",
             "sources": [