[pitivi/1.0] flatpak: Change our flatpak maniphest name to accomodate gnome-builder
- From: Thibault Saunier <tsaunier src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pitivi/1.0] flatpak: Change our flatpak maniphest name to accomodate gnome-builder
- Date: Wed, 28 Feb 2018 11:44:23 +0000 (UTC)
commit 110cda2279f4f7ad434e9757a5f929be854e77b1
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} | 6 +++---
build/flatpak/pitivi-flatpak | 4 ++--
2 files changed, 5 insertions(+), 5 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 1e0e9a01..41bd9048 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",
@@ -314,8 +314,8 @@
"sources": [
{
"type": "git",
- "url": "https://git.ffmpeg.org/ffmpeg.git",
- "branch": "6d7192bcb7bbab17dc194e8dbb56c208bced0a92" /* From submodule
https://github.com/GStreamer/gst-libav/tree/master/gst-libs/ext */
+ "url": "https://github.com/FFmpeg/FFmpeg.git",
+ "branch": "6d7192bcb7bbab17dc194e8dbb56c208bced0a92"
}
]
},
diff --git a/build/flatpak/pitivi-flatpak b/build/flatpak/pitivi-flatpak
index de278a5a..173044c4 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]