configure.ac | 10 - debian/changelog | 11 + debian/compat | 2 debian/control | 44 +++++- debian/libweston-1-0.install | 9 + debian/libweston-1-0.symbols | 275 +++++++++++++++++++++++++++++++++++++++ debian/libweston-1-dev.install | 5 debian/rules | 7 debian/weston.install | 14 - libweston-desktop/wl-shell.c | 4 libweston-desktop/xdg-shell-v5.c | 8 - libweston-desktop/xdg-shell-v6.c | 8 - 12 files changed, 361 insertions(+), 36 deletions(-)
New commits: commit d40b415af03171b32af316c3311eb48ff08d816e Author: Emilio Pozuelo Monfort <po...@debian.org> Date: Wed Dec 7 19:17:50 2016 +0100 Release to unstable diff --git a/debian/changelog b/debian/changelog index 9ce2f03..4cbf530 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -weston (1.12.0-1) UNRELEASED; urgency=medium +weston (1.12.0-1) unstable; urgency=medium * New upstream release. Closes: #841735. * Ship the shared libraries in libweston-1-0 and libweston-1-dev. @@ -7,7 +7,7 @@ weston (1.12.0-1) UNRELEASED; urgency=medium * No need to pass --destdir=debian/tmp to dh_auto_install now that we have multiple binary packages. - -- Emilio Pozuelo Monfort <po...@debian.org> Wed, 07 Dec 2016 17:38:19 +0100 + -- Emilio Pozuelo Monfort <po...@debian.org> Wed, 07 Dec 2016 19:17:42 +0100 weston (1.11.94-1) experimental; urgency=medium commit 1b04d39217d671b2888149c6c21898e3064ed452 Author: Emilio Pozuelo Monfort <po...@debian.org> Date: Wed Dec 7 19:17:34 2016 +0100 Drop dh_auto_install override diff --git a/debian/changelog b/debian/changelog index 4fe8c15..9ce2f03 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ weston (1.12.0-1) UNRELEASED; urgency=medium * Ship the shared libraries in libweston-1-0 and libweston-1-dev. * Bump debhelper compat to 10. + debhelper now calls dh-autoreconf automatically. + * No need to pass --destdir=debian/tmp to dh_auto_install now that we + have multiple binary packages. -- Emilio Pozuelo Monfort <po...@debian.org> Wed, 07 Dec 2016 17:38:19 +0100 diff --git a/debian/rules b/debian/rules index bacee11..bc4869b 100755 --- a/debian/rules +++ b/debian/rules @@ -8,9 +8,6 @@ override_dh_auto_test: # the test suite does not 100% pass in headless mode dh_auto_test || true -override_dh_auto_install: - dh_auto_install --destdir=debian/tmp - override_dh_install: dh_install --fail-missing -X.la commit 224e0107fb7fa528d788e473187c46472f7cd891 Author: Emilio Pozuelo Monfort <po...@debian.org> Date: Wed Dec 7 19:16:42 2016 +0100 debhelper calls dh-autoreconf by default diff --git a/debian/changelog b/debian/changelog index bc92acd..4fe8c15 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ weston (1.12.0-1) UNRELEASED; urgency=medium * New upstream release. Closes: #841735. * Ship the shared libraries in libweston-1-0 and libweston-1-dev. * Bump debhelper compat to 10. + + debhelper now calls dh-autoreconf automatically. -- Emilio Pozuelo Monfort <po...@debian.org> Wed, 07 Dec 2016 17:38:19 +0100 diff --git a/debian/control b/debian/control index a4637b0..60cade0 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,6 @@ Uploaders: Build-Depends: debhelper (>= 10), quilt, - dh-autoreconf, pkg-config, libpixman-1-dev (>= 0.25.2), libpng-dev, diff --git a/debian/rules b/debian/rules index f8726bf..bacee11 100755 --- a/debian/rules +++ b/debian/rules @@ -21,7 +21,7 @@ override_dh_fixperms: dh_fixperms -Xusr/bin/weston-launch %: - dh $@ --with quilt,autoreconf + dh $@ --with quilt # For maintainer use only, generate a tarball: gentarball: SOURCE=$(shell dpkg-parsechangelog|awk '/^Source:/ {print $$2}') commit 789cbb73bae8f256e01019cc809daca26b6a31f2 Author: Emilio Pozuelo Monfort <po...@debian.org> Date: Wed Dec 7 19:15:57 2016 +0100 Bump debhelper compat to 10 diff --git a/debian/changelog b/debian/changelog index 6c8c989..bc92acd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ weston (1.12.0-1) UNRELEASED; urgency=medium * New upstream release. Closes: #841735. * Ship the shared libraries in libweston-1-0 and libweston-1-dev. + * Bump debhelper compat to 10. -- Emilio Pozuelo Monfort <po...@debian.org> Wed, 07 Dec 2016 17:38:19 +0100 diff --git a/debian/compat b/debian/compat index ec63514..f599e28 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/debian/control b/debian/control index d75d281..a4637b0 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Uploaders: Héctor Orón Martínez <zu...@debian.org>, Emilio Pozuelo Monfort <po...@debian.org>, Build-Depends: - debhelper (>= 9), + debhelper (>= 10), quilt, dh-autoreconf, pkg-config, commit 0d9cbd284b89e72fd65f079927ba32a8194558db Author: Emilio Pozuelo Monfort <po...@debian.org> Date: Wed Dec 7 18:19:33 2016 +0100 Add libweston-1-0 and libweston-1-dev packages diff --git a/debian/changelog b/debian/changelog index 59b68f3..6c8c989 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ weston (1.12.0-1) UNRELEASED; urgency=medium * New upstream release. Closes: #841735. + * Ship the shared libraries in libweston-1-0 and libweston-1-dev. -- Emilio Pozuelo Monfort <po...@debian.org> Wed, 07 Dec 2016 17:38:19 +0100 diff --git a/debian/control b/debian/control index f10d4b7..d75d281 100644 --- a/debian/control +++ b/debian/control @@ -61,4 +61,43 @@ Description: reference implementation of a wayland compositor of a Wayland compositor. Weston can run as an X client or under Linux KMS and ships with a few demo clients. The Weston compositor is a minimal and fast compositor and is suitable for many embedded and mobile use - cases. + cases. + +Package: libweston-1-0 +Section: libs +Architecture: linux-any +Depends: + ${shlibs:Depends}, + ${misc:Depends}, +Replaces: weston (<< 1.12.0-1) +Breaks: weston (<< 1.12.0-1) +Description: reference implementation of a wayland compositor (shared libs) + Part of the Wayland project is also the Weston reference implementation + of a Wayland compositor. Weston can run as an X client or under Linux + KMS and ships with a few demo clients. The Weston compositor is a minimal + and fast compositor and is suitable for many embedded and mobile use + cases. + . + This package includes the libweston shared libraries. + +Package: libweston-1-dev +Section: libdevel +Architecture: linux-any +Priority: extra +Depends: + libweston-1-0 (= ${binary:Version}), + libwayland-dev, + libpixman-1-dev, + libxkbcommon-dev, + ${shlibs:Depends}, + ${misc:Depends}, +Replaces: weston (<< 1.12.0-1) +Breaks: weston (<< 1.12.0-1) +Description: reference implementation of a wayland compositor (shared libs) + Part of the Wayland project is also the Weston reference implementation + of a Wayland compositor. Weston can run as an X client or under Linux + KMS and ships with a few demo clients. The Weston compositor is a minimal + and fast compositor and is suitable for many embedded and mobile use + cases. + . + This package includes the libweston headers. diff --git a/debian/libweston-1-0.install b/debian/libweston-1-0.install new file mode 100644 index 0000000..77518c3 --- /dev/null +++ b/debian/libweston-1-0.install @@ -0,0 +1,9 @@ +usr/lib/*/libweston-1.so.* +usr/lib/*/libweston-desktop-1.so.* +usr/lib/*/libweston-1/drm-backend.so +usr/lib/*/libweston-1/fbdev-backend.so +usr/lib/*/libweston-1/gl-renderer.so +usr/lib/*/libweston-1/headless-backend.so +usr/lib/*/libweston-1/wayland-backend.so +usr/lib/*/libweston-1/x11-backend.so +usr/lib/*/libweston-1/xwayland.so diff --git a/debian/libweston-1-0.symbols b/debian/libweston-1-0.symbols new file mode 100644 index 0000000..396d655 --- /dev/null +++ b/debian/libweston-1-0.symbols @@ -0,0 +1,275 @@ +libweston-1.so.0 libweston-1-0 #MINVER# +* Build-Depends-Package: libweston-1-dev + linux_dmabuf_buffer_get@Base 1.12.0 + linux_dmabuf_buffer_get_user_data@Base 1.12.0 + linux_dmabuf_buffer_send_server_error@Base 1.12.0 + linux_dmabuf_buffer_set_user_data@Base 1.12.0 + linux_dmabuf_setup@Base 1.12.0 + noop_renderer_init@Base 1.12.0 + notify_axis@Base 1.12.0 + notify_axis_source@Base 1.12.0 + notify_button@Base 1.12.0 + notify_key@Base 1.12.0 + notify_keyboard_focus_in@Base 1.12.0 + notify_keyboard_focus_out@Base 1.12.0 + notify_modifiers@Base 1.12.0 + notify_motion@Base 1.12.0 + notify_motion_absolute@Base 1.12.0 + notify_pointer_focus@Base 1.12.0 + notify_pointer_frame@Base 1.12.0 + notify_touch@Base 1.12.0 + notify_touch_cancel@Base 1.12.0 + notify_touch_frame@Base 1.12.0 + pixman_renderer_init@Base 1.12.0 + pixman_renderer_output_create@Base 1.12.0 + pixman_renderer_output_destroy@Base 1.12.0 + pixman_renderer_output_set_buffer@Base 1.12.0 + text_cursor_position_interface@Base 1.12.0 + weston_binding_destroy@Base 1.12.0 + weston_buffer_from_resource@Base 1.12.0 + weston_buffer_reference@Base 1.12.0 + weston_compositor_add_axis_binding@Base 1.12.0 + weston_compositor_add_button_binding@Base 1.12.0 + weston_compositor_add_debug_binding@Base 1.12.0 + weston_compositor_add_key_binding@Base 1.12.0 + weston_compositor_add_modifier_binding@Base 1.12.0 + weston_compositor_add_output@Base 1.12.0 + weston_compositor_add_touch_binding@Base 1.12.0 + weston_compositor_create@Base 1.12.0 + weston_compositor_damage_all@Base 1.12.0 + weston_compositor_destroy@Base 1.12.0 + weston_compositor_exit@Base 1.12.0 + weston_compositor_exit_with_code@Base 1.12.0 + weston_compositor_get_time@Base 1.12.0 + weston_compositor_get_user_data@Base 1.12.0 + weston_compositor_import_dmabuf@Base 1.12.0 + weston_compositor_load_backend@Base 1.12.0 + weston_compositor_load_xwayland@Base 1.12.0 + weston_compositor_offscreen@Base 1.12.0 + weston_compositor_pick_view@Base 1.12.0 + weston_compositor_read_presentation_clock@Base 1.12.0 + weston_compositor_schedule_repaint@Base 1.12.0 + weston_compositor_set_default_pointer_grab@Base 1.12.0 + weston_compositor_set_presentation_clock@Base 1.12.0 + weston_compositor_set_presentation_clock_software@Base 1.12.0 + weston_compositor_set_xkb_rule_names@Base 1.12.0 + weston_compositor_shutdown@Base 1.12.0 + weston_compositor_sleep@Base 1.12.0 + weston_compositor_stack_plane@Base 1.12.0 + weston_compositor_wake@Base 1.12.0 + weston_config_get_libexec_dir@Base 1.12.0 + weston_config_get_section@Base 1.12.0 + weston_config_section_get_bool@Base 1.12.0 + weston_config_section_get_color@Base 1.12.0 + weston_config_section_get_double@Base 1.12.0 + weston_config_section_get_int@Base 1.12.0 + weston_config_section_get_string@Base 1.12.0 + weston_config_section_get_uint@Base 1.12.0 + weston_environment_get_fd@Base 1.12.0 + weston_fade_run@Base 1.12.0 + weston_fade_update@Base 1.12.0 + weston_install_debug_key_binding@Base 1.12.0 + weston_keyboard_create@Base 1.12.0 + weston_keyboard_destroy@Base 1.12.0 + weston_keyboard_end_grab@Base 1.12.0 + weston_keyboard_has_focus_resource@Base 1.12.0 + weston_keyboard_send_key@Base 1.12.0 + weston_keyboard_send_modifiers@Base 1.12.0 + weston_keyboard_set_focus@Base 1.12.0 + weston_keyboard_set_locks@Base 1.12.0 + weston_keyboard_start_grab@Base 1.12.0 + weston_layer_entry_insert@Base 1.12.0 + weston_layer_entry_remove@Base 1.12.0 + weston_layer_init@Base 1.12.0 + weston_layer_set_mask@Base 1.12.0 + weston_layer_set_mask_infinite@Base 1.12.0 + weston_load_module@Base 1.12.0 + weston_log@Base 1.12.0 + weston_log_continue@Base 1.12.0 + weston_log_set_handler@Base 1.12.0 + weston_matrix_init@Base 1.12.0 + weston_matrix_invert@Base 1.12.0 + weston_matrix_multiply@Base 1.12.0 + weston_matrix_rotate_xy@Base 1.12.0 + weston_matrix_scale@Base 1.12.0 + weston_matrix_transform@Base 1.12.0 + weston_matrix_transform_region@Base 1.12.0 + weston_matrix_translate@Base 1.12.0 + weston_move_scale_run@Base 1.12.0 + weston_output_activate_zoom@Base 1.12.0 + weston_output_damage@Base 1.12.0 + weston_output_destroy@Base 1.12.0 + weston_output_finish_frame@Base 1.12.0 + weston_output_init@Base 1.12.0 + weston_output_init_zoom@Base 1.12.0 + weston_output_mode_set_native@Base 1.12.0 + weston_output_mode_switch_to_native@Base 1.12.0 + weston_output_mode_switch_to_temporary@Base 1.12.0 + weston_output_move@Base 1.12.0 + weston_output_schedule_repaint@Base 1.12.0 + weston_output_transform_coordinate@Base 1.12.0 + weston_output_update_matrix@Base 1.12.0 + weston_output_update_zoom@Base 1.12.0 + weston_plane_init@Base 1.12.0 + weston_plane_release@Base 1.12.0 + weston_plugin_api_get@Base 1.12.0 + weston_plugin_api_register@Base 1.12.0 + weston_pointer_clamp@Base 1.12.0 + weston_pointer_clear_focus@Base 1.12.0 + weston_pointer_create@Base 1.12.0 + weston_pointer_destroy@Base 1.12.0 + weston_pointer_end_grab@Base 1.12.0 + weston_pointer_has_focus_resource@Base 1.12.0 + weston_pointer_motion_to_abs@Base 1.12.0 + weston_pointer_move@Base 1.12.0 + weston_pointer_send_axis@Base 1.12.0 + weston_pointer_send_axis_source@Base 1.12.0 + weston_pointer_send_button@Base 1.12.0 + weston_pointer_send_frame@Base 1.12.0 + weston_pointer_send_motion@Base 1.12.0 + weston_pointer_set_focus@Base 1.12.0 + weston_pointer_start_drag@Base 1.12.0 + weston_pointer_start_grab@Base 1.12.0 + weston_recorder_start@Base 1.12.0 + weston_recorder_stop@Base 1.12.0 + weston_screenshooter_interface@Base 1.12.0 + weston_screenshooter_shoot@Base 1.12.0 + weston_seat_get_keyboard@Base 1.12.0 + weston_seat_get_pointer@Base 1.12.0 + weston_seat_get_touch@Base 1.12.0 + weston_seat_init@Base 1.12.0 + weston_seat_init_keyboard@Base 1.12.0 + weston_seat_init_pointer@Base 1.12.0 + weston_seat_init_touch@Base 1.12.0 + weston_seat_release@Base 1.12.0 + weston_seat_release_keyboard@Base 1.12.0 + weston_seat_release_pointer@Base 1.12.0 + weston_seat_release_touch@Base 1.12.0 + weston_seat_repick@Base 1.12.0 + weston_seat_send_selection@Base 1.12.0 + weston_seat_set_keyboard_focus@Base 1.12.0 + weston_seat_set_selection@Base 1.12.0 + weston_seat_update_keymap@Base 1.12.0 + weston_slide_run@Base 1.12.0 + weston_spring_done@Base 1.12.0 + weston_spring_init@Base 1.12.0 + weston_spring_update@Base 1.12.0 + weston_stable_fade_run@Base 1.12.0 + weston_surface_copy_content@Base 1.12.0 + weston_surface_create@Base 1.12.0 + weston_surface_damage@Base 1.12.0 + weston_surface_destroy@Base 1.12.0 + weston_surface_get_bounding_box@Base 1.12.0 + weston_surface_get_content_size@Base 1.12.0 + weston_surface_get_main_surface@Base 1.12.0 + weston_surface_get_role@Base 1.12.0 + weston_surface_is_mapped@Base 1.12.0 + weston_surface_schedule_repaint@Base 1.12.0 + weston_surface_set_color@Base 1.12.0 + weston_surface_set_label_func@Base 1.12.0 + weston_surface_set_role@Base 1.12.0 + weston_surface_set_size@Base 1.12.0 + weston_surface_to_buffer_float@Base 1.12.0 + weston_surface_to_buffer_rect@Base 1.12.0 + weston_surface_to_buffer_region@Base 1.12.0 + weston_surface_unmap@Base 1.12.0 + weston_timeline_enabled_@Base 1.12.0 + weston_timeline_point@Base 1.12.0 + weston_touch_create@Base 1.12.0 + weston_touch_destroy@Base 1.12.0 + weston_touch_end_grab@Base 1.12.0 + weston_touch_has_focus_resource@Base 1.12.0 + weston_touch_send_down@Base 1.12.0 + weston_touch_send_frame@Base 1.12.0 + weston_touch_send_motion@Base 1.12.0 + weston_touch_send_up@Base 1.12.0 + weston_touch_set_focus@Base 1.12.0 + weston_touch_start_drag@Base 1.12.0 + weston_touch_start_grab@Base 1.12.0 + weston_transformed_coord@Base 1.12.0 + weston_transformed_rect@Base 1.12.0 + weston_transformed_region@Base 1.12.0 + weston_version@Base 1.12.0 + weston_view_activate@Base 1.12.0 + weston_view_animation_destroy@Base 1.12.0 + weston_view_create@Base 1.12.0 + weston_view_damage_below@Base 1.12.0 + weston_view_destroy@Base 1.12.0 + weston_view_from_global@Base 1.12.0 + weston_view_from_global_fixed@Base 1.12.0 + weston_view_from_global_float@Base 1.12.0 + weston_view_geometry_dirty@Base 1.12.0 + weston_view_is_mapped@Base 1.12.0 + weston_view_move_to_plane@Base 1.12.0 + weston_view_schedule_repaint@Base 1.12.0 + weston_view_set_mask@Base 1.12.0 + weston_view_set_mask_infinite@Base 1.12.0 + weston_view_set_position@Base 1.12.0 + weston_view_set_transform_parent@Base 1.12.0 + weston_view_to_global_fixed@Base 1.12.0 + weston_view_to_global_float@Base 1.12.0 + weston_view_unmap@Base 1.12.0 + weston_view_update_transform@Base 1.12.0 + weston_vlog@Base 1.12.0 + weston_vlog_continue@Base 1.12.0 + weston_zoom_run@Base 1.12.0 + wl_data_device_manager_init@Base 1.12.0 + wl_data_device_set_keyboard_focus@Base 1.12.0 + wp_presentation_feedback_interface@Base 1.12.0 + wp_presentation_interface@Base 1.12.0 + wp_viewport_interface@Base 1.12.0 + wp_viewporter_interface@Base 1.12.0 + zwp_confined_pointer_v1_interface@Base 1.12.0 + zwp_input_method_context_v1_interface@Base 1.12.0 + zwp_input_method_v1_interface@Base 1.12.0 + zwp_input_panel_surface_v1_interface@Base 1.12.0 + zwp_input_panel_v1_interface@Base 1.12.0 + zwp_linux_buffer_params_v1_interface@Base 1.12.0 + zwp_linux_dmabuf_v1_interface@Base 1.12.0 + zwp_locked_pointer_v1_interface@Base 1.12.0 + zwp_pointer_constraints_v1_interface@Base 1.12.0 + zwp_relative_pointer_manager_v1_interface@Base 1.12.0 + zwp_relative_pointer_v1_interface@Base 1.12.0 + zwp_text_input_manager_v1_interface@Base 1.12.0 + zwp_text_input_v1_interface@Base 1.12.0 +libweston-desktop-1.so.0 libweston-1-0 #MINVER# +* Build-Depends-Package: libweston-1-dev + weston_desktop_client_for_each_surface@Base 1.12.0 + weston_desktop_client_get_client@Base 1.12.0 + weston_desktop_client_ping@Base 1.12.0 + weston_desktop_create@Base 1.12.0 + weston_desktop_destroy@Base 1.12.0 + weston_desktop_surface_close@Base 1.12.0 + weston_desktop_surface_create_view@Base 1.12.0 + weston_desktop_surface_get_activated@Base 1.12.0 + weston_desktop_surface_get_app_id@Base 1.12.0 + weston_desktop_surface_get_client@Base 1.12.0 + weston_desktop_surface_get_fullscreen@Base 1.12.0 + weston_desktop_surface_get_geometry@Base 1.12.0 + weston_desktop_surface_get_max_size@Base 1.12.0 + weston_desktop_surface_get_maximized@Base 1.12.0 + weston_desktop_surface_get_min_size@Base 1.12.0 + weston_desktop_surface_get_pid@Base 1.12.0 + weston_desktop_surface_get_resizing@Base 1.12.0 + weston_desktop_surface_get_surface@Base 1.12.0 + weston_desktop_surface_get_title@Base 1.12.0 + weston_desktop_surface_get_user_data@Base 1.12.0 + weston_desktop_surface_propagate_layer@Base 1.12.0 + weston_desktop_surface_set_activated@Base 1.12.0 + weston_desktop_surface_set_fullscreen@Base 1.12.0 + weston_desktop_surface_set_maximized@Base 1.12.0 + weston_desktop_surface_set_resizing@Base 1.12.0 + weston_desktop_surface_set_size@Base 1.12.0 + weston_desktop_surface_set_user_data@Base 1.12.0 + weston_desktop_surface_unlink_view@Base 1.12.0 + weston_seat_break_desktop_grabs@Base 1.12.0 + weston_surface_get_desktop_surface@Base 1.12.0 + weston_surface_is_desktop_surface@Base 1.12.0 + xdg_popup_interface@Base 1.12.0 + xdg_shell_interface@Base 1.12.0 + xdg_surface_interface@Base 1.12.0 + zxdg_popup_v6_interface@Base 1.12.0 + zxdg_positioner_v6_interface@Base 1.12.0 + zxdg_shell_v6_interface@Base 1.12.0 + zxdg_surface_v6_interface@Base 1.12.0 + zxdg_toplevel_v6_interface@Base 1.12.0 diff --git a/debian/libweston-1-dev.install b/debian/libweston-1-dev.install new file mode 100644 index 0000000..7ef793b --- /dev/null +++ b/debian/libweston-1-dev.install @@ -0,0 +1,5 @@ +usr/include/libweston-1 +usr/lib/*/libweston-1.so +usr/lib/*/libweston-desktop-1.so +usr/lib/*/pkgconfig/libweston-1.pc +usr/lib/*/pkgconfig/libweston-desktop-1.pc diff --git a/debian/rules b/debian/rules index 58acb37..f8726bf 100755 --- a/debian/rules +++ b/debian/rules @@ -15,7 +15,7 @@ override_dh_install: dh_install --fail-missing -X.la override_dh_makeshlibs: - # No-op: libraries are private, not shared. + dh_makeshlibs -Xlibweston-1/ -- -c4 override_dh_fixperms: dh_fixperms -Xusr/bin/weston-launch diff --git a/debian/weston.install b/debian/weston.install index d5d23da..d8b623b 100644 --- a/debian/weston.install +++ b/debian/weston.install @@ -4,25 +4,11 @@ usr/bin/weston-info usr/bin/weston-launch usr/bin/weston-terminal usr/include/weston -usr/include/libweston-1 usr/lib/weston/weston-desktop-shell usr/lib/weston/weston-keyboard usr/lib/weston/weston-ivi-shell-user-interface usr/lib/weston/weston-screenshooter usr/lib/weston/weston-simple-im -usr/lib/*/libweston-1.so -usr/lib/*/libweston-1.so.* -usr/lib/*/libweston-desktop-1.so.* -usr/lib/*/libweston-desktop-1.so -usr/lib/*/libweston-1/x11-backend.so -usr/lib/*/libweston-1/xwayland.so -usr/lib/*/libweston-1/headless-backend.so -usr/lib/*/libweston-1/gl-renderer.so -usr/lib/*/libweston-1/fbdev-backend.so -usr/lib/*/libweston-1/wayland-backend.so -usr/lib/*/libweston-1/drm-backend.so -usr/lib/*/pkgconfig/libweston-desktop-1.pc -usr/lib/*/pkgconfig/libweston-1.pc usr/lib/*/pkgconfig/weston.pc usr/lib/*/weston/cms-colord.so usr/lib/*/weston/cms-static.so commit 759616bfd75a3c6d96df05af89652c5881b3cb5a Author: Emilio Pozuelo Monfort <po...@debian.org> Date: Wed Dec 7 17:38:55 2016 +0100 New upstream release diff --git a/debian/changelog b/debian/changelog index 964c499..59b68f3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +weston (1.12.0-1) UNRELEASED; urgency=medium + + * New upstream release. Closes: #841735. + + -- Emilio Pozuelo Monfort <po...@debian.org> Wed, 07 Dec 2016 17:38:19 +0100 + weston (1.11.94-1) experimental; urgency=medium * New upstream release. commit a08dff5bce52804850595a5ff968336a60574f4f Author: Bryce Harrington <br...@osg.samsung.com> Date: Tue Sep 20 12:22:46 2016 -0700 configure.ac: bump to version 1.12.0 for the official release diff --git a/configure.ac b/configure.ac index bd59725..619d3f6 100644 --- a/configure.ac +++ b/configure.ac @@ -1,11 +1,11 @@ m4_define([weston_major_version], [1]) -m4_define([weston_minor_version], [11]) -m4_define([weston_micro_version], [94]) +m4_define([weston_minor_version], [12]) +m4_define([weston_micro_version], [0]) m4_define([weston_version], [weston_major_version.weston_minor_version.weston_micro_version]) m4_define([libweston_major_version], [1]) -m4_define([libweston_minor_version], [11]) -m4_define([libweston_patch_version], [94]) +m4_define([libweston_minor_version], [12]) +m4_define([libweston_patch_version], [0]) AC_PREREQ([2.64]) AC_INIT([weston], @@ -14,7 +14,7 @@ AC_INIT([weston], [weston], [http://wayland.freedesktop.org]) -WAYLAND_PREREQ_VERSION="1.11.91" +WAYLAND_PREREQ_VERSION="1.12.0" AC_SUBST([WESTON_VERSION_MAJOR], [weston_major_version]) AC_SUBST([WESTON_VERSION_MINOR], [weston_minor_version]) commit a56b053ee154fd8c5b6782fa120ddc045e4e0147 Author: Quentin Glidic <sardemff7+...@sardemff7.net> Date: Tue Sep 13 10:05:58 2016 +0200 libweston-desktop: Fix configure event for already well-sized surfaces Even if the surface size is already correct, we need to store the configured size in case some other state change triggers a configure event. Signed-off-by: Quentin Glidic <sardemff7+...@sardemff7.net> Reviewed-by: Arnaud Vrac <av...@freebox.fr> diff --git a/libweston-desktop/wl-shell.c b/libweston-desktop/wl-shell.c index 74ce473..ded69f7 100644 --- a/libweston-desktop/wl-shell.c +++ b/libweston-desktop/wl-shell.c @@ -67,8 +67,8 @@ weston_desktop_wl_shell_surface_set_size(struct weston_desktop_surface *dsurface struct weston_surface *wsurface = weston_desktop_surface_get_surface(surface->surface); - if (wsurface->width == width && wsurface->height == height) - return; + if ((wsurface->width == width && wsurface->height == height) || + (width == 0 && height == 0)) wl_shell_surface_send_configure(surface->resource, WL_SHELL_SURFACE_RESIZE_NONE, diff --git a/libweston-desktop/xdg-shell-v5.c b/libweston-desktop/xdg-shell-v5.c index 83e5d30..14216b0 100644 --- a/libweston-desktop/xdg-shell-v5.c +++ b/libweston-desktop/xdg-shell-v5.c @@ -192,11 +192,13 @@ weston_desktop_xdg_surface_set_size(struct weston_desktop_surface *dsurface, struct weston_desktop_xdg_surface *surface = user_data; struct weston_surface *wsurface = weston_desktop_surface_get_surface(surface->surface); - if (wsurface->width == width && wsurface->height == height) - return; - surface->requested_size.width = width; surface->requested_size.height = height; + + if ((wsurface->width == width && wsurface->height == height) || + (width == 0 && height == 0)) + return; + weston_desktop_xdg_surface_schedule_configure(surface); } diff --git a/libweston-desktop/xdg-shell-v6.c b/libweston-desktop/xdg-shell-v6.c index d4d0112..2afce81 100644 --- a/libweston-desktop/xdg-shell-v6.c +++ b/libweston-desktop/xdg-shell-v6.c @@ -607,11 +607,13 @@ weston_desktop_xdg_toplevel_set_size(struct weston_desktop_surface *dsurface, struct weston_surface *wsurface = weston_desktop_surface_get_surface(toplevel->base.desktop_surface); - if (wsurface->width == width && wsurface->height == height) - return; - toplevel->requested_size.width = width; toplevel->requested_size.height = height; + + if ((wsurface->width == width && wsurface->height == height) || + (width == 0 && height == 0)) + return; + weston_desktop_xdg_surface_schedule_configure(&toplevel->base); }