From: John Stebbins <jstebbins.hb@gmail.com>
Date: Wed, 20 Jun 2018 00:20:24 +0000 (-0700)
Subject: flatpak: prebuild some dependencies
X-Git-Tag: 1.2.0~281
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=337cceb17649f50537e16b4fd27ae41884f9ff0a;p=handbrake

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 216ae27c3..dac1985e9 100644
--- 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 13752bda7..9c2414f08 100644
--- 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 147e66c63..eea299b79 100644
--- 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,