diff options
| author | Benoit Gschwind <gschwind@gnu-log.net> | 2016-04-15 20:28:32 -0700 |
|---|---|---|
| committer | Pekka Paalanen <pekka.paalanen@collabora.co.uk> | 2016-04-18 14:44:39 +0300 |
| commit | 3c53094e2413050617dcae400d117449a800c50e (patch) | |
| tree | e53141afcbe07c0222272c608acf40c7adcaf6c8 /Makefile.am | |
| parent | 98ab08bef865e061faaf9adb65aa214292f6d69c (diff) | |
| download | weston-3c53094e2413050617dcae400d117449a800c50e.tar.gz | |
headless: port the headless backend to the new init api
refactor configuration API of headless-backend
Signed-off-by: Bryce Harrington <bryce@osg.samsung.com>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
v6:
- Define version number in the header
- Don't use leading underscores in header guards
- Add stub config_init_to_defaults()
- Allocate config on stack
- Drop unused display_name parameter
- Add error message when config is invalid
- Install compositor-headless.h and list it in headless-backend sources
v5:
- Update to current trunk
- Fixed typo 'struct weston_wayland_backend_config'
- Dropped unused variables
- Dropped weston_headless_backend_config_create() in favor of
directly zalloc'ing the object
- Dropped weston_headless_backend_load() in favor of the more
generalized load_backend_new().
- Dropped typedef from header
- Restored use of 'backend_init' entry point
- Backend_init() takes a base weston_backend_config object
- Renamed 'param' to 'config' in a few places for consistency
- Renamed 'headless_options' variable to 'options for consistency
- Version the base struct
- Free config on error
- Don't free config during backend_init normal operations
- Adjust header ordering
- Make header guard naming consistent with other headers
- Light reformatting for code style and consistency with other
backend config patches
Signed-off-by: Bryce Harrington <bryce@osg.samsung.com>
Reviewed-by: Giulio Camuffo <giuliocamuffo@gmail.com>
[Pekka: rebased to apply before drm and x11 backends]
[Pekka: squashed in the headless part of "Enforce destruction of all
backend config objects after initialization"]
Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index 9bed32c7..d3c3f71e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -72,6 +72,7 @@ weston_SOURCES = \ src/log.c \ src/compositor.c \ src/compositor.h \ + src/compositor-headless.h \ src/input.c \ src/data-device.c \ src/screenshooter.c \ @@ -208,6 +209,7 @@ westonincludedir = $(includedir)/weston westoninclude_HEADERS = \ src/version.h \ src/compositor.h \ + src/compositor-headless.h \ src/timeline-object.h \ shared/matrix.h \ shared/config-parser.h \ @@ -353,6 +355,7 @@ headless_backend_la_LIBADD = $(COMPOSITOR_LIBS) libshared.la headless_backend_la_CFLAGS = $(COMPOSITOR_CFLAGS) $(AM_CFLAGS) headless_backend_la_SOURCES = \ src/compositor-headless.c \ + src/compositor-headless.h \ shared/helpers.h endif |