flatpak: builder options

- avoid vulkan from crashing the inspector
This commit is contained in:
Jakub Steiner
2020-08-10 15:10:12 +02:00
committed by Matthias Clasen
parent 2b0e9542cb
commit df4c57c001
3 changed files with 102 additions and 66 deletions

View File

@@ -1,29 +1,38 @@
{ {
"app-id": "org.gtk.Demo4", "app-id" : "org.gtk.Demo4",
"runtime": "org.gnome.Platform", "runtime" : "org.gnome.Platform",
"runtime-version": "master", "runtime-version" : "master",
"sdk": "org.gnome.Sdk", "sdk" : "org.gnome.Sdk",
"command": "gtk4-demo", "command" : "gtk4-demo",
"tags": ["devel", "development", "nightly"], "tags" : [
"desktop-file-name-prefix": "(Development) ", "devel",
"finish-args": [ "development",
"nightly"
],
"desktop-file-name-prefix" : "(Development) ",
"finish-args" : [
"--device=dri", "--device=dri",
"--share=ipc", "--share=ipc",
"--socket=fallback-x11", "--socket=fallback-x11",
"--socket=wayland", "--socket=wayland",
"--talk-name=org.gtk.vfs", "--talk-name=org.gtk.vfs.*" "--talk-name=org.gtk.vfs",
"--talk-name=org.gtk.vfs.*"
], ],
"cleanup": [ "cleanup" : [
"/include", "/include",
"/lib/pkgconfig", "/share/pkgconfig", "/lib/pkgconfig",
"/share/pkgconfig",
"/share/aclocal", "/share/aclocal",
"/man", "/share/man", "/share/gtk-doc", "/man",
"*.la", ".a", "/share/man",
"/share/gtk-doc",
"*.la",
".a",
"/lib/girepository-1.0", "/lib/girepository-1.0",
"/share/gir-1.0", "/share/gir-1.0",
"/share/doc" "/share/doc"
], ],
"modules": [ "modules" : [
{ {
"name" : "wayland", "name" : "wayland",
"buildsystem" : "autotools", "buildsystem" : "autotools",
@@ -39,18 +48,18 @@
] ]
}, },
{ {
"name": "graphene", "name" : "graphene",
"buildsystem": "meson", "buildsystem" : "meson",
"builddir": true, "builddir" : true,
"config-opts": [ "config-opts" : [
"--libdir=/app/lib", "--libdir=/app/lib",
"-Dtests=false", "-Dtests=false",
"-Dbenchmarks=false" "-Dbenchmarks=false"
], ],
"sources": [ "sources" : [
{ {
"type": "git", "type" : "git",
"url": "https://github.com/ebassi/graphene.git" "url" : "https://github.com/ebassi/graphene.git"
} }
] ]
}, },
@@ -58,7 +67,7 @@
"name" : "libsass", "name" : "libsass",
"buildsystem" : "meson", "buildsystem" : "meson",
"builddir" : true, "builddir" : true,
"config-opts": [ "config-opts" : [
"--libdir=/app/lib" "--libdir=/app/lib"
], ],
"sources" : [ "sources" : [
@@ -73,7 +82,7 @@
"name" : "sassc", "name" : "sassc",
"buildsystem" : "meson", "buildsystem" : "meson",
"builddir" : true, "builddir" : true,
"config-opts": [ "config-opts" : [
"--libdir=/app/lib" "--libdir=/app/lib"
], ],
"sources" : [ "sources" : [
@@ -85,18 +94,25 @@
] ]
}, },
{ {
"name": "gtk", "name" : "gtk",
"buildsystem": "meson", "buildsystem" : "meson",
"builddir": true, "builddir" : true,
"config-opts": [ "config-opts" : [
"--libdir=/app/lib" "--libdir=/app/lib",
"-Denable_vulkan=no",
"-Dbuildtype=debugoptimized"
], ],
"sources": [ "sources" : [
{ {
"type": "git", "type" : "git",
"url": "https://gitlab.gnome.org/GNOME/gtk.git" "url" : "https://gitlab.gnome.org/GNOME/gtk.git"
} }
] ]
} }
] ],
"build-options" : {
"env" : {
"GSK_RENDERER" : "opengl"
}
}
} }

View File

@@ -1,29 +1,38 @@
{ {
"app-id": "org.gtk.IconBrowser4", "app-id" : "org.gtk.IconBrowser4",
"runtime": "org.gnome.Platform", "runtime" : "org.gnome.Platform",
"runtime-version": "master", "runtime-version" : "master",
"sdk": "org.gnome.Sdk", "sdk" : "org.gnome.Sdk",
"command": "gtk4-icon-browser", "command" : "gtk4-icon-browser",
"tags": ["devel", "development", "nightly"], "tags" : [
"desktop-file-name-prefix": "(Development) ", "devel",
"finish-args": [ "development",
"nightly"
],
"desktop-file-name-prefix" : "(Development) ",
"finish-args" : [
"--device=dri", "--device=dri",
"--share=ipc", "--share=ipc",
"--socket=fallback-x11", "--socket=fallback-x11",
"--socket=wayland", "--socket=wayland",
"--talk-name=org.gtk.vfs", "--talk-name=org.gtk.vfs.*" "--talk-name=org.gtk.vfs",
"--talk-name=org.gtk.vfs.*"
], ],
"cleanup": [ "cleanup" : [
"/include", "/include",
"/lib/pkgconfig", "/share/pkgconfig", "/lib/pkgconfig",
"/share/pkgconfig",
"/share/aclocal", "/share/aclocal",
"/man", "/share/man", "/share/gtk-doc", "/man",
"*.la", ".a", "/share/man",
"/share/gtk-doc",
"*.la",
".a",
"/lib/girepository-1.0", "/lib/girepository-1.0",
"/share/gir-1.0", "/share/gir-1.0",
"/share/doc" "/share/doc"
], ],
"modules": [ "modules" : [
{ {
"name" : "wayland", "name" : "wayland",
"buildsystem" : "autotools", "buildsystem" : "autotools",
@@ -39,18 +48,18 @@
] ]
}, },
{ {
"name": "graphene", "name" : "graphene",
"buildsystem": "meson", "buildsystem" : "meson",
"builddir": true, "builddir" : true,
"config-opts": [ "config-opts" : [
"--libdir=/app/lib", "--libdir=/app/lib",
"-Dtests=false", "-Dtests=false",
"-Dbenchmarks=false" "-Dbenchmarks=false"
], ],
"sources": [ "sources" : [
{ {
"type": "git", "type" : "git",
"url": "https://github.com/ebassi/graphene.git" "url" : "https://github.com/ebassi/graphene.git"
} }
] ]
}, },
@@ -58,7 +67,7 @@
"name" : "libsass", "name" : "libsass",
"buildsystem" : "meson", "buildsystem" : "meson",
"builddir" : true, "builddir" : true,
"config-opts": [ "config-opts" : [
"--libdir=/app/lib" "--libdir=/app/lib"
], ],
"sources" : [ "sources" : [
@@ -73,7 +82,7 @@
"name" : "sassc", "name" : "sassc",
"buildsystem" : "meson", "buildsystem" : "meson",
"builddir" : true, "builddir" : true,
"config-opts": [ "config-opts" : [
"--libdir=/app/lib" "--libdir=/app/lib"
], ],
"sources" : [ "sources" : [
@@ -85,18 +94,24 @@
] ]
}, },
{ {
"name": "gtk", "name" : "gtk",
"buildsystem": "meson", "buildsystem" : "meson",
"builddir": true, "builddir" : true,
"config-opts": [ "config-opts" : [
"--libdir=/app/lib" "--libdir=/app/lib",
"-Denable_vulkan=no",
"-Dbuildtype=debugoptimized"
], ],
"sources": [ "sources" : [
{ {
"type": "git", "type" : "git",
"url": "https://gitlab.gnome.org/GNOME/gtk.git" "url" : "https://gitlab.gnome.org/GNOME/gtk.git"
} }
] ]
} }
] ],
"build-options" : {
"env" : {
}
}
} }

View File

@@ -98,7 +98,9 @@
"buildsystem" : "meson", "buildsystem" : "meson",
"builddir" : true, "builddir" : true,
"config-opts" : [ "config-opts" : [
"--libdir=/app/lib" "--libdir=/app/lib",
"-Denable_vulkan=no",
"-Dbuildtype=debugoptimized"
], ],
"sources" : [ "sources" : [
{ {
@@ -110,7 +112,10 @@
], ],
"build-options" : { "build-options" : {
"env" : { "env" : {
"DBUS_SESSION_BUS_ADDRESS" : "''" "DBUS_SESSION_BUS_ADDRESS" : "''",
"GSK_RENDERER" : "opengl",
"GDK_DEBUG" : "vulkan-disable",
"G_ENABLE_DEBUG" : "true"
} }
} }
} }