[pitivi/1.0: 4/4] flatpak: Depend on Gst 1.12 by default



commit 14e40ba6fd38d010484322f3e420e74211624593
Author: Thibault Saunier <tsaunier gnome org>
Date:   Fri Aug 25 13:50:38 2017 -0300

    flatpak: Depend on Gst 1.12 by default

 build/flatpak/pitivi-flatpak       |    5 +++--
 build/flatpak/pitivi.template.json |    1 +
 2 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/build/flatpak/pitivi-flatpak b/build/flatpak/pitivi-flatpak
index e425707..c9f7377 100755
--- a/build/flatpak/pitivi-flatpak
+++ b/build/flatpak/pitivi-flatpak
@@ -43,6 +43,7 @@ SDK_BRANCH = {"0.96": "3.20",
               "stable": "3.24",
               "master": "3.24"}
 FLATPAK_REQ = "0.6.4"
+DEFAULT_GST_BRANCH = '1.12'
 
 
 class Colors:  # pylint: disable=too-few-public-methods
@@ -103,7 +104,7 @@ def expand_json_file(json_template, outfile, basedir, gst_version, branchname):
 
         if module["name"].startswith("gst"):
             module["sources"][0]["branch"] = gst_version
-            if gst_version != "master":
+            if gst_version != DEFAULT_GST_BRANCH:
                 continue
 
         repo = os.path.join(basedir, module["name"])
@@ -643,7 +644,7 @@ if __name__ == "__main__":
                        default="master")
     devel.add_argument("--gst-version", dest="gst_version",
                        help="The GStreamer version to build.",
-                       default="master")
+                       default=DEFAULT_GST_BRANCH)
     devel.add_argument("--check", dest="check",
                        help="Run unit tests once the build is done.",
                        action="store_true")
diff --git a/build/flatpak/pitivi.template.json b/build/flatpak/pitivi.template.json
index 997b422..7da12af 100644
--- a/build/flatpak/pitivi.template.json
+++ b/build/flatpak/pitivi.template.json
@@ -451,6 +451,7 @@
             "sources": [
                 {
                     "type": "git",
+                    "branch": "1.12",
                     "url": "git://anongit.freedesktop.org/gstreamer/gstreamer-vaapi"
                 }
             ]


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