[pitivi/1.0] build: Update to GStreamer 1.14 in flatpak
- From: Thibault Saunier <tsaunier src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pitivi/1.0] build: Update to GStreamer 1.14 in flatpak
- Date: Fri, 20 Apr 2018 12:43:13 +0000 (UTC)
commit c9f50750f597d0751fc3fdc6e8c868f91c647b0b
Author: Thibault Saunier <tsaunier igalia com>
Date: Fri Mar 30 08:48:45 2018 -0300
build: Update to GStreamer 1.14 in flatpak
build/flatpak/org.pitivi.Pitivi.json | 46 ++++++++++++++++--------------------
build/flatpak/pitivi-flatpak | 2 +-
2 files changed, 21 insertions(+), 27 deletions(-)
---
diff --git a/build/flatpak/org.pitivi.Pitivi.json b/build/flatpak/org.pitivi.Pitivi.json
index 38e7e537..d98ce2ed 100644
--- a/build/flatpak/org.pitivi.Pitivi.json
+++ b/build/flatpak/org.pitivi.Pitivi.json
@@ -351,7 +351,7 @@
"sources": [
{
"type": "git",
- "branch": "1.12",
+ "branch": "1.14",
"url": "git://anongit.freedesktop.org/gstreamer/gstreamer"
}
]
@@ -364,7 +364,7 @@
"sources": [
{
"type": "git",
- "branch": "1.12",
+ "branch": "1.14",
"url": "git://anongit.freedesktop.org/gstreamer/gst-plugins-base"
}
]
@@ -377,7 +377,7 @@
"sources": [
{
"type": "git",
- "branch": "1.12",
+ "branch": "1.14",
"url": "git://anongit.freedesktop.org/gstreamer/gst-plugins-good"
}
]
@@ -390,7 +390,7 @@
"sources": [
{
"type": "git",
- "branch": "1.12",
+ "branch": "1.14",
"url": "git://anongit.freedesktop.org/gstreamer/gst-plugins-ugly"
}
]
@@ -403,12 +403,8 @@
"sources": [
{
"type": "git",
- "branch": "1.12",
+ "branch": "1.14",
"url": "git://anongit.freedesktop.org/gstreamer/gst-plugins-bad"
- },
- {
- "type": "patch",
- "path": "bad/0001-compositor-Add-support-for-crossfade-blending.patch"
}
]
},
@@ -420,8 +416,8 @@
"sources": [
{
"type": "git",
- "branch": "1.12",
- "disable-shallow-clone" : true,
+ "branch": "1.14",
+ "disable-shallow-clone": true,
"url": "git://anongit.freedesktop.org/gstreamer/gst-libav"
}
]
@@ -434,7 +430,7 @@
"sources": [
{
"type": "git",
- "branch": "1.12",
+ "branch": "1.14",
"url": "git://anongit.freedesktop.org/gstreamer/gst-python"
}
]
@@ -448,7 +444,7 @@
"sources": [
{
"type": "git",
- "branch": "1.12",
+ "branch": "1.14",
"url": "git://anongit.freedesktop.org/gstreamer/gst-devtools"
}
]
@@ -457,11 +453,14 @@
"name": "gstreamer-vaapi",
"buildsystem": "meson",
"builddir": true,
- "config-opts": ["-Ddisable_gtkdoc=true", "--libdir=lib"],
+ "config-opts": [
+ "-Ddisable_gtkdoc=true",
+ "--libdir=lib"
+ ],
"sources": [
{
"type": "git",
- "branch": "1.12",
+ "branch": "1.14",
"url": "git://anongit.freedesktop.org/gstreamer/gstreamer-vaapi"
}
]
@@ -474,16 +473,8 @@
"sources": [
{
"type": "git",
- "branch": "1.12",
+ "branch": "1.14",
"url": "git://anongit.freedesktop.org/gstreamer/gst-editing-services"
- },
- {
- "type": "patch",
- "path": "ges/0001-video-transition-Make-use-of-the-new-compositor-cros.patch"
- },
- {
- "type": "patch",
- "path": "ges/0002-transition-Fix-usage-of-transition-types-crossfade.patch"
}
]
},
@@ -491,11 +482,14 @@
"name": "gst-transcoder",
"buildsystem": "meson",
"builddir": true,
- "config-opts": ["-Ddisable_doc=true", "--libdir=lib"],
+ "config-opts": [
+ "-Ddisable_doc=true",
+ "--libdir=lib"
+ ],
"sources": [
{
"type": "git",
- "branch": "1.12",
+ "branch": "1.14",
"url": "https://github.com/pitivi/gst-transcoder"
}
]
diff --git a/build/flatpak/pitivi-flatpak b/build/flatpak/pitivi-flatpak
index 44e48bce..eb70351a 100755
--- a/build/flatpak/pitivi-flatpak
+++ b/build/flatpak/pitivi-flatpak
@@ -42,7 +42,7 @@ SDK_BRANCH = {"0.96": "3.20",
"stable": "3.24",
"master": "3.24"}
FLATPAK_REQ = "0.6.4"
-DEFAULT_GST_BRANCH = '1.12'
+DEFAULT_GST_BRANCH = '1.14'
class Colors: # pylint: disable=too-few-public-methods
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]