Commit 9a522b31 authored by Thibault Saunier's avatar Thibault Saunier

flatpak: Update meson version and remove dependencies that are now in the gnome SDK

Fixes T7635
parent 9a864482
......@@ -35,6 +35,7 @@ then
alias minstall=$minstall
alias autogen=$autogen
alias configure=$configure
alias ninja="$FLATPAK_ENVPATH/pitivi/build/flatpak/pitivi-flatpak -q -d ninja"
# Prefer to run the binaries in the sandbox. For example "python3".
for i in `$FLATPAK_ENVPATH/pitivi/build/flatpak/pitivi-flatpak -q -d ls /app/bin/`;
......
......@@ -34,21 +34,6 @@
}
]
},
{
"name": "ninja",
"sources": [
{
"type": "archive",
"url": "https://github.com/ninja-build/ninja/releases/download/v1.7.1/ninja-linux.zip",
"sha256": "eb541331792ac75ade60a7c0d7737a4851f2a131e0143b38c059dbfe731fb5a4"
},
{
"type": "file",
"path": "ninja-configure",
"dest-filename": "configure"
}
]
},
{
"name": "x264",
"config-opts": ["--enable-shared", "--enable-static", "--enable-pic", "--disable-lavf"],
......@@ -76,20 +61,6 @@
}
]
},
{
"name": "setuptools",
"build-options" : {
"build-args": ["--share=network"]
},
"config-opts": ["--module=setuptools==19.7"],
"sources": [
{
"type": "file",
"path": "py-configure",
"dest-filename": "configure"
}
]
},
{
"name": "ipdb",
"build-options" : {
......@@ -242,7 +213,7 @@
"build-options" : {
"build-args": ["--share=network"]
},
"config-opts": ["--module=meson==0.35.1"],
"config-opts": ["--module=meson==0.37.0"],
"sources": [
{
"type": "file",
......
......@@ -35,8 +35,8 @@ cdata.set('CONFIGURED_GST_PLUGIN_PATH',
run_command(geteenvvar, 'GST_PLUGIN_PATH').stdout().strip())
cdata.set('CONFIGURED_GST_PLUGIN_SYSTEM_PATH',
run_command(geteenvvar, 'GST_PLUGIN_SYSTEM_PATH').stdout().strip())
cdata.set('LIBDIR', join_paths(get_option('prefix'), get_option('libdir'))
cdata.set('DATADIR', join_paths(get_option('prefix'), get_option('datadir'))
cdata.set('LIBDIR', join_paths(get_option('prefix'), get_option('libdir')))
cdata.set('DATADIR', join_paths(get_option('prefix'), get_option('datadir')))
cdata.set('PACKAGE_NAME', 'Pitivi')
cdata.set('PACKAGE', 'pitivi')
cdata.set('GITVERSION', GITVERSION)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment