diff options
| author |   Daniel Stone <daniels@collabora.com> | 2019-11-25 12:30:34 +0000 |
|---|---|---|
| committer |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2019-11-26 17:51:09 +0000 |
| commit | 3a057eb3399bb6c34dfc76b503a6a98839d0ee89 (patch) | |
| tree | 556b27a09358211cb5e90c06456d902f5252af63 | |
| parent | 5563d5e8318950284228f026010bcb038c499dc0 (diff) | |
weston: Add patch to export more config-parser API
Used by the AGL compositor to implement configuration parsing.
Change-Id: I30b207f23bbc252dfee30ddf90d84e02779b0395
Upstream: https://gitlab.freedesktop.org/wayland/weston/merge_requests/314
Signed-off-by: Daniel Stone <daniels@collabora.com>
2 files changed, 37 insertions, 0 deletions
diff --git a/meta-agl-profile-graphical/recipes-graphics/wayland/weston/0001-config-parser-Export-get_full_path-and-destroy.patch b/meta-agl-profile-graphical/recipes-graphics/wayland/weston/0001-config-parser-Export-get_full_path-and-destroy.patch new file mode 100644 index 000000000..9dbd7a749 --- /dev/null +++ b/meta-agl-profile-graphical/recipes-graphics/wayland/weston/0001-config-parser-Export-get_full_path-and-destroy.patch @@ -0,0 +1,36 @@ +From 40ff644ac4da90c5cf5239c6ee6051d9bb2b099a Mon Sep 17 00:00:00 2001 +From: Daniel Stone <daniels@collabora.com> +Date: Mon, 25 Nov 2019 10:30:11 +0000 +Subject: [PATCH] config-parser: Export get_full_path and destroy + +Make sure we export the get_full_path() accessor (declared in the +header, used by Weston itself) and the parser's destroy function. + +Signed-off-by: Daniel Stone <daniels@collabora.com> +--- + shared/config-parser.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/shared/config-parser.c b/shared/config-parser.c +index 35f09f006..94eb24cc1 100644 +--- a/shared/config-parser.c ++++ b/shared/config-parser.c +@@ -470,6 +470,7 @@ weston_config_parse(const char *name) + return config; + } + ++WL_EXPORT + const char * + weston_config_get_full_path(struct weston_config *config) + { +@@ -500,6 +501,7 @@ weston_config_next_section(struct weston_config *config, + return 1; + } + ++WL_EXPORT + void + weston_config_destroy(struct weston_config *config) + { +-- +2.21.0 + diff --git a/meta-agl-profile-graphical/recipes-graphics/wayland/weston_6.0.0.bbappend b/meta-agl-profile-graphical/recipes-graphics/wayland/weston_6.0.0.bbappend index 9e29e2756..4e7e1d8a6 100644 --- a/meta-agl-profile-graphical/recipes-graphics/wayland/weston_6.0.0.bbappend +++ b/meta-agl-profile-graphical/recipes-graphics/wayland/weston_6.0.0.bbappend @@ -4,6 +4,7 @@ SRC_URI_append = "\ file://0001-Allow-regular-users-to-launch-Weston_2.0.0.patch \ file://use-XDG_RUNTIMESHARE_DIR.patch \ file://0003-compositor-drm-introduce-drm_get_dmafd_from_view.patch \ + file://0001-config-parser-Export-get_full_path-and-destroy.patch \ " # Disabled until SPEC-2827 H3ULCB v3.0 + Kingfisher issue is debugged: # file://0002-compositor-add-output-type-to-weston_output.patch |