[pitivi] flatpak: Change our flatpak maniphest name to accomodate gnome-builder



commit 5968a16591037c51d3c8b2dce950e811dd84352a
Author: Thibault Saunier <tsaunier igalia com>
Date:   Wed Feb 21 19:02:16 2018 -0300

    flatpak: Change our flatpak maniphest name to accomodate gnome-builder

 build/flatpak/{pitivi.template.json => org.pitivi.Pitivi.json} | 4 ++--
 build/flatpak/pitivi-flatpak                                   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/build/flatpak/pitivi.template.json b/build/flatpak/org.pitivi.Pitivi.json
similarity index 98%
rename from build/flatpak/pitivi.template.json
rename to build/flatpak/org.pitivi.Pitivi.json
index 7564eb56..62530b73 100644
--- a/build/flatpak/pitivi.template.json
+++ b/build/flatpak/org.pitivi.Pitivi.json
@@ -271,7 +271,7 @@
         },
         {
             "name": "ffmpeg",
-            "config-opts": [ /* From 
https://phabricator.freedesktop.org/diffusion/GSTLIBAV/browse/master/configure.ac;6d7192bcb7bbab17dc194e8dbb56c208bced0a92*/
+            "config-opts": [
                 "--disable-static",
                 "--disable-avdevice",
                 "--disable-postproc",
@@ -315,7 +315,7 @@
                 {
                     "type": "git",
                     "url": "https://github.com/FFmpeg/FFmpeg.git";,
-                    "branch": "6d7192bcb7bbab17dc194e8dbb56c208bced0a92" /* From submodule 
https://github.com/GStreamer/gst-libav/tree/master/gst-libs/ext */
+                    "branch": "6d7192bcb7bbab17dc194e8dbb56c208bced0a92"
                 }
             ]
         },
diff --git a/build/flatpak/pitivi-flatpak b/build/flatpak/pitivi-flatpak
index 441e2bb2..dc482013 100755
--- a/build/flatpak/pitivi-flatpak
+++ b/build/flatpak/pitivi-flatpak
@@ -33,6 +33,7 @@ from urllib.request import urlretrieve
 # The default branch is master because the script is used most often
 # for development.
 PITIVI_BRANCH = "master"
+MANIFEST_NAME = "org.pitivi.Pitivi.json"
 # To see the existing branches, run:
 # flatpak remote-ls pitivi --user -d
 SDK_BRANCH = {"0.96": "3.20",
@@ -493,8 +494,7 @@ class PitiviFlatpak:  # pylint: disable=too-many-instance-attributes
         Console.message("Building Pitivi %s and dependencies in %s",
                         self.branch, self.prefix)
 
-        json_template = os.path.join(
-            self.scriptdir, "%s.template.json" % self.name.lower())
+        json_template = os.path.join(self.scriptdir, MANIFEST_NAME)
         expand_json_file(json_template, self.json,
                          self.local_repos_path, self.gst_version,
                          self.branch)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]