[pitivi] Depend on meson 0.41.0 and use its new dist feature
- From: Thibault Saunier <tsaunier src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pitivi] Depend on meson 0.41.0 and use its new dist feature
- Date: Mon, 7 Aug 2017 14:02:20 +0000 (UTC)
commit e7dd3bbc37e064251916c4b1eb4d5b2d70a514fd
Author: Thibault Saunier <tsaunier gnome org>
Date: Sun Aug 6 09:58:26 2017 -0400
Depend on meson 0.41.0 and use its new dist feature
Reviewed-by: Alex Băluț <<alexandru balut gmail com>>
Differential Revision: https://phabricator.freedesktop.org/D1821
build/flatpak/pitivi.template.json | 16 ++++++++++++++++
docs/release.md | 1 -
meson.build | 16 +---------------
3 files changed, 17 insertions(+), 16 deletions(-)
---
diff --git a/build/flatpak/pitivi.template.json b/build/flatpak/pitivi.template.json
index c290ced..cfcb65a 100644
--- a/build/flatpak/pitivi.template.json
+++ b/build/flatpak/pitivi.template.json
@@ -290,6 +290,22 @@
]
},
{
+ "name": "meson",
+ "buildsystem": "simple",
+ "ensure-writable": ["easy-install.pth"],
+ "build-commands": [
+ "mkdir -p /app/lib/python3.5/site-packages",
+ "PYTHONUSERBASE=/app/ python3 setup.py install --prefix=/app"
+ ],
+ "sources": [
+ {
+ "type": "archive",
+ "url":
"https://pypi.python.org/packages/6d/32/a474702fcba1144aef89e7ec5d8a33d49be8389a0f983d11aab486c8392b/meson-0.41.2.tar.gz#md5=3b4a99beb09a0286ca1307449570c689",
+ "sha256": "ad1707717987fe8b7b65392b8327580105fcbdd5f2032bf3b7232b647284c95c"
+ }
+ ]
+ },
+ {
"name": "gstreamer",
"buildsystem": "meson",
"builddir": true,
diff --git a/docs/release.md b/docs/release.md
index e97d4e9..be0c81d 100644
--- a/docs/release.md
+++ b/docs/release.md
@@ -24,7 +24,6 @@ Most of the steps below should be done in the [development environment](HACKING.
3. Check your local repository:
* Make sure your sandbox is using the latest GStreamer release: `$ ptvenv --update
--gst-version=<gst-version>`
- * Install git-archive-all in your sandbox to be able to create the archive to be distributed: `$
build/flatpak/py-configure --module=git-archive-all && make install`
* Check `$ git status` does not show any change
* Check `$ ptvenv ./configure` is all green
diff --git a/meson.build b/meson.build
index b1cb61d..55971b5 100644
--- a/meson.build
+++ b/meson.build
@@ -1,4 +1,4 @@
-project('pitivi', 'c', version : '0.98', meson_version : '>= 0.36.0')
+project('pitivi', 'c', version : '0.98', meson_version : '>= 0.41.0')
python = find_program('python3')
intltool_merge = find_program('intltool-merge')
@@ -73,17 +73,3 @@ if not get_option('disable-help')
endif
subdir('tests')
subdir('tests/validate-tests')
-
-archiver = find_program('git-archive-all', required : false)
-if archiver.found()
- prefix = 'pitivi-' + meson.project_version()
- archive = 'pitivi-' + meson.project_version() + '.tar.gz'
- run_target('dist', command : ['git-archive-all', '--prefix=' + prefix, archive])
-else
- message('git-archive-all not found, you will not be able to run `ninja dist`')
- message('Install git-archive-all:')
- message(' - with pip:')
- message(' $ pip3 install git-archive-all')
- message(' - in the sandbox:')
- message(' (ptv-flatpak) $ build/flatpak/py-configure --module=git-archive-all && make install')
-endif
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]