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.

diff --git a/make/include/main.defs b/make/include/main.defs
index 216ae27c311f9e82ae570244b55733e5239a2c56..dac1985e919d54b496ec0e6623c966e842a7ad59 100644 (file)
--- a/make/include/main.defs
+++ b/make/include/main.defs
@@ -35,10 +35,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 147e66c6357a959d496c62b673c41d992e116d18..eea299b79e2870a798cb772e5b5299836a37e0d9 100644 (file)
--- a/pkg/linux/flatpak/fr.handbrake.ghb.json
+++ b/pkg/linux/flatpak/fr.handbrake.ghb.json
@@ -14,6 +14,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,