diff options
author | Jakub Steiner <jimmac@gmail.com> | 2020-08-10 15:10:12 +0200 |
---|---|---|
committer | Jakub Steiner <jimmac@gmail.com> | 2020-08-10 15:10:12 +0200 |
commit | fee546083eb50584352f97d198aa792259019ab9 (patch) | |
tree | 0cebaa6d14c6ce8d9f5758163e6e1e94ab31bf48 | |
parent | bc20fe3cca72b384e9002ac47503e606e7247121 (diff) | |
download | gtk+-wip/jimmac/BuilderOptions.tar.gz |
flatpak: builder optionswip/jimmac/BuilderOptions
- avoid vulkan from crashing the inspector
-rw-r--r-- | build-aux/flatpak/org.gtk.Demo4.json | 76 | ||||
-rw-r--r-- | build-aux/flatpak/org.gtk.WidgetFactory4.json | 9 |
2 files changed, 52 insertions, 33 deletions
diff --git a/build-aux/flatpak/org.gtk.Demo4.json b/build-aux/flatpak/org.gtk.Demo4.json index acc57b3750..795b6b0c9d 100644 --- a/build-aux/flatpak/org.gtk.Demo4.json +++ b/build-aux/flatpak/org.gtk.Demo4.json @@ -1,29 +1,38 @@ { - "app-id": "org.gtk.Demo4", - "runtime": "org.gnome.Platform", - "runtime-version": "master", - "sdk": "org.gnome.Sdk", - "command": "gtk4-demo", - "tags": ["devel", "development", "nightly"], - "desktop-file-name-prefix": "(Development) ", - "finish-args": [ + "app-id" : "org.gtk.Demo4", + "runtime" : "org.gnome.Platform", + "runtime-version" : "master", + "sdk" : "org.gnome.Sdk", + "command" : "gtk4-demo", + "tags" : [ + "devel", + "development", + "nightly" + ], + "desktop-file-name-prefix" : "(Development) ", + "finish-args" : [ "--device=dri", "--share=ipc", "--socket=fallback-x11", "--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", - "/lib/pkgconfig", "/share/pkgconfig", + "/lib/pkgconfig", + "/share/pkgconfig", "/share/aclocal", - "/man", "/share/man", "/share/gtk-doc", - "*.la", ".a", + "/man", + "/share/man", + "/share/gtk-doc", + "*.la", + ".a", "/lib/girepository-1.0", "/share/gir-1.0", "/share/doc" ], - "modules": [ + "modules" : [ { "name" : "wayland", "buildsystem" : "autotools", @@ -39,18 +48,18 @@ ] }, { - "name": "graphene", - "buildsystem": "meson", - "builddir": true, - "config-opts": [ + "name" : "graphene", + "buildsystem" : "meson", + "builddir" : true, + "config-opts" : [ "--libdir=/app/lib", "-Dtests=false", "-Dbenchmarks=false" ], - "sources": [ + "sources" : [ { - "type": "git", - "url": "https://github.com/ebassi/graphene.git" + "type" : "git", + "url" : "https://github.com/ebassi/graphene.git" } ] }, @@ -58,7 +67,7 @@ "name" : "libsass", "buildsystem" : "meson", "builddir" : true, - "config-opts": [ + "config-opts" : [ "--libdir=/app/lib" ], "sources" : [ @@ -73,7 +82,7 @@ "name" : "sassc", "buildsystem" : "meson", "builddir" : true, - "config-opts": [ + "config-opts" : [ "--libdir=/app/lib" ], "sources" : [ @@ -85,18 +94,23 @@ ] }, { - "name": "gtk", - "buildsystem": "meson", - "builddir": true, - "config-opts": [ + "name" : "gtk", + "buildsystem" : "meson", + "builddir" : true, + "config-opts" : [ "--libdir=/app/lib" ], - "sources": [ + "sources" : [ { - "type": "git", - "url": "https://gitlab.gnome.org/GNOME/gtk.git" + "type" : "git", + "url" : "https://gitlab.gnome.org/GNOME/gtk.git" } ] } - ] + ], + "build-options" : { + "env" : { + "GSK_RENDERER" : "opengl" + } + } } diff --git a/build-aux/flatpak/org.gtk.WidgetFactory4.json b/build-aux/flatpak/org.gtk.WidgetFactory4.json index 3a729087cf..dbaee92474 100644 --- a/build-aux/flatpak/org.gtk.WidgetFactory4.json +++ b/build-aux/flatpak/org.gtk.WidgetFactory4.json @@ -98,7 +98,9 @@ "buildsystem" : "meson", "builddir" : true, "config-opts" : [ - "--libdir=/app/lib" + "--libdir=/app/lib", + "-Denable_vulkan=no", + "-Dbuildtype=debugoptimized" ], "sources" : [ { @@ -110,7 +112,10 @@ ], "build-options" : { "env" : { - "DBUS_SESSION_BUS_ADDRESS" : "''" + "DBUS_SESSION_BUS_ADDRESS" : "''", + "GSK_RENDERER" : "opengl", + "GDK_DEBUG" : "vulkan-disable", + "G_ENABLE_DEBUG" : "true" } } } |