Flatpak: Update build manifests

- point to the upstream repo for wayland
- disable disabling of sassc
- switch wayland from autotools to meson
This commit is contained in:
Jakub Steiner
2021-03-05 18:00:17 +01:00
parent 490384c69f
commit 8e7e821033
3 changed files with 7 additions and 10 deletions

View File

@@ -43,7 +43,7 @@
"sources" : [ "sources" : [
{ {
"type" : "git", "type" : "git",
"url" : "https://github.com/wayland-project/wayland.git" "url" : "https://gitlab.freedesktop.org/wayland/wayland.git"
} }
] ]
}, },
@@ -70,7 +70,6 @@
"config-opts" : [ "config-opts" : [
"--libdir=/app/lib", "--libdir=/app/lib",
"-Denable_vulkan=no", "-Denable_vulkan=no",
"-Dsassc=disabled",
"-Dbuildtype=debugoptimized", "-Dbuildtype=debugoptimized",
"-Dprofile=devel" "-Dprofile=devel"
], ],

View File

@@ -35,15 +35,15 @@
"modules" : [ "modules" : [
{ {
"name" : "wayland", "name" : "wayland",
"buildsystem" : "autotools", "buildsystem" : "meson",
"builddir" : true, "builddir" : true,
"config-opts" : [ "config-opts" : [
"--disable-documentation" "-Ddocumentation=false"
], ],
"sources" : [ "sources" : [
{ {
"type" : "git", "type" : "git",
"url" : "https://github.com/wayland-project/wayland.git" "url" : "https://gitlab.freedesktop.org/wayland/wayland.git"
} }
] ]
}, },
@@ -70,7 +70,6 @@
"config-opts" : [ "config-opts" : [
"--libdir=/app/lib", "--libdir=/app/lib",
"-Denable_vulkan=no", "-Denable_vulkan=no",
"-Dsassc=disabled",
"-Dbuildtype=debugoptimized", "-Dbuildtype=debugoptimized",
"-Dprofile=devel" "-Dprofile=devel"
], ],

View File

@@ -35,15 +35,15 @@
"modules" : [ "modules" : [
{ {
"name" : "wayland", "name" : "wayland",
"buildsystem" : "autotools", "buildsystem" : "meson",
"builddir" : true, "builddir" : true,
"config-opts" : [ "config-opts" : [
"--disable-documentation" "-Ddocumentation=false"
], ],
"sources" : [ "sources" : [
{ {
"type" : "git", "type" : "git",
"url" : "https://github.com/wayland-project/wayland.git" "url" : "https://gitlab.freedesktop.org/wayland/wayland.git"
} }
] ]
}, },
@@ -70,7 +70,6 @@
"config-opts" : [ "config-opts" : [
"--libdir=/app/lib", "--libdir=/app/lib",
"-Denable_vulkan=no", "-Denable_vulkan=no",
"-Dsassc=disabled",
"-Dbuildtype=debugoptimized", "-Dbuildtype=debugoptimized",
"-Dprofile=devel" "-Dprofile=devel"
], ],