[pitivi] flatpak: Start using GNOME 3.24
- From: Thibault Saunier <tsaunier src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pitivi] flatpak: Start using GNOME 3.24
- Date: Sun, 30 Apr 2017 18:41:20 +0000 (UTC)
commit 229086f4bc09b1594cd5a2f3222a357890498a76
Author: Thibault Saunier <tsaunier gnome org>
Date: Sun Apr 30 14:02:37 2017 -0300
flatpak: Start using GNOME 3.24
build/flatpak/pitivi-flatpak | 2 +-
build/flatpak/pitivi.template.json | 59 ++++++++++-------------------------
2 files changed, 18 insertions(+), 43 deletions(-)
---
diff --git a/build/flatpak/pitivi-flatpak b/build/flatpak/pitivi-flatpak
index 8ef869d..0944dbc 100755
--- a/build/flatpak/pitivi-flatpak
+++ b/build/flatpak/pitivi-flatpak
@@ -41,7 +41,7 @@ SDK_BRANCH = {"0.96": "3.20",
"0.97.1": "3.20",
"0.98": "3.22",
"stable": "3.22",
- "master": "3.22"}
+ "master": "3.24"}
FLATPAK_REQ = "0.6.4"
diff --git a/build/flatpak/pitivi.template.json b/build/flatpak/pitivi.template.json
index 5961206..c904f27 100644
--- a/build/flatpak/pitivi.template.json
+++ b/build/flatpak/pitivi.template.json
@@ -1,8 +1,8 @@
{
"app-id": "org.pitivi.Pitivi",
- "version": "master",
+ "branch": "master",
"runtime": "org.gnome.Platform",
- "runtime-version": "3.22",
+ "runtime-version": "3.24",
"finish-args": ["--command=pitivi",
"--share=ipc", "--socket=x11", "--socket=session-bus", "--socket=pulseaudio",
"--talk-name=ca.desrt.dconf",
@@ -228,45 +228,8 @@
]
},
{
-
- "name": "meson",
- "build-options" : {
- "build-args": ["--share=network"]
- },
- "config-opts": ["--module=meson==0.38.1"],
- "sources": [
- {
- "type": "file",
- "path": "py-configure",
- "dest-filename": "configure"
- }
- ]
- },
- {
- "name": "yelp-xsl",
- "cleanup-platform": [ "*" ],
- "config-opts": ["--disable-doc"],
- "sources": [
- {
- "type": "git",
- "url": "git://git.gnome.org/yelp-xsl",
- "branch": "3.20.1"
- }
- ]
- },
- {
- "name": "yelp",
- "sources": [
- {
- "type": "git",
- "url": "https://git.gnome.org/browse/yelp",
- "branch": "3.20.1"
- }
- ]
- },
- {
"name": "ffmpeg",
- "config-opts": [
+ "config-opts": [ /* From
https://phabricator.freedesktop.org/diffusion/GSTLIBAV/browse/master/configure.ac;4b1c9ef6ace06ae82a08e28a1a1ef0e2278f9655$362
*/
"--disable-static",
"--disable-avdevice",
"--disable-postproc",
@@ -310,7 +273,7 @@
{
"type": "git",
"url": "https://git.ffmpeg.org/ffmpeg.git",
- "branch": "68ed682710f1cb1f4fdd1fd0447f402d6feabd01"
+ "branch": "1968a1e" /* From submodule
https://github.com/GStreamer/gst-libav/tree/master/gst-libs/ext */
}
]
},
@@ -390,7 +353,7 @@
"name": "gst-python",
"buildsystem": "meson",
"builddir": true,
- "config-opts": ["-Dpygi-overrides-dir=/app/lib/python3.4/site-packages/gi/overrides/",
"--libdir=lib"],
+ "config-opts": ["-Dpygi-overrides-dir=/app/lib/python3.5/site-packages/gi/overrides/",
"--libdir=lib"],
"sources": [
{
"type": "git",
@@ -424,6 +387,18 @@
]
},
{
+ "name": "gst-transcoder",
+ "buildsystem": "meson",
+ "builddir": true,
+ "config-opts": ["-Ddisable_doc=true", "--libdir=lib"],
+ "sources": [
+ {
+ "type": "git",
+ "url": "https://github.com/pitivi/gst-transcoder"
+ }
+ ]
+ },
+ {
"name": "pitivi",
"buildsystem": "meson",
"builddir": true,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]