Commit 5968a165 authored by Thibault Saunier's avatar Thibault Saunier Committed by Thibault Saunier

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

parent 398f1409
......@@ -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"
}
]
},
......
......@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment