← Back to branch summary

~alan-griffiths/mir/fix-1654023

~alan-griffiths/mir/fix-1654023

Viewing all changes in revision 2619.2.11.

Committer: Daniel van Vugt
Date: 2015-06-05 06:28:36 UTC
mfrom: (2627 development-branch)
mto: This revision was merged to the branch mainline in revision 2719.
Revision ID: daniel.van.vugt@canonical.com-20150605062836-226k7wom97ttz48x

Merge latest trunk

files added:
examples/client_touch_validator.cpp

tests/unit-tests/graphics/mesa/common

tests/unit-tests/graphics/mesa/common/CMakeLists.txt

tests/unit-tests/graphics/mesa/kms

tests/unit-tests/graphics/mesa/kms/CMakeLists.txt

tests/unit-tests/test_data/empty_input.c

files renamed:
debian/mir-platform-graphics-mesa2.install => debian/mir-platform-graphics-mesa-kms2.install

tests/unit-tests/graphics/mesa/test_anonymous_shm_file.cpp => tests/unit-tests/graphics/mesa/common/test_anonymous_shm_file.cpp

tests/unit-tests/graphics/mesa/test_buffer_allocator.cpp => tests/unit-tests/graphics/mesa/common/test_buffer_allocator.cpp

tests/unit-tests/graphics/mesa/test_drm_helper.cpp => tests/unit-tests/graphics/mesa/common/test_drm_helper.cpp

tests/unit-tests/graphics/mesa/test_gbm_buffer.cpp => tests/unit-tests/graphics/mesa/common/test_gbm_buffer.cpp

tests/unit-tests/graphics/mesa/test_ipc_operations.cpp => tests/unit-tests/graphics/mesa/common/test_ipc_operations.cpp

tests/unit-tests/graphics/mesa/test_shm_buffer.cpp => tests/unit-tests/graphics/mesa/common/test_shm_buffer.cpp

tests/unit-tests/graphics/mesa/mock_kms_output.h => tests/unit-tests/graphics/mesa/kms/mock_kms_output.h

tests/unit-tests/graphics/mesa/test_bypass.cpp => tests/unit-tests/graphics/mesa/kms/test_bypass.cpp

tests/unit-tests/graphics/mesa/test_cursor.cpp => tests/unit-tests/graphics/mesa/kms/test_cursor.cpp

tests/unit-tests/graphics/mesa/test_display.cpp => tests/unit-tests/graphics/mesa/kms/test_display.cpp

tests/unit-tests/graphics/mesa/test_display_buffer.cpp => tests/unit-tests/graphics/mesa/kms/test_display_buffer.cpp

tests/unit-tests/graphics/mesa/test_display_configuration.cpp => tests/unit-tests/graphics/mesa/kms/test_display_configuration.cpp

tests/unit-tests/graphics/mesa/test_display_multi_monitor.cpp => tests/unit-tests/graphics/mesa/kms/test_display_multi_monitor.cpp

tests/unit-tests/graphics/mesa/test_guest_platform.cpp => tests/unit-tests/graphics/mesa/kms/test_guest_platform.cpp

tests/unit-tests/graphics/mesa/test_kms_page_flipper.cpp => tests/unit-tests/graphics/mesa/kms/test_kms_page_flipper.cpp

tests/unit-tests/graphics/mesa/test_linux_virtual_terminal.cpp => tests/unit-tests/graphics/mesa/kms/test_linux_virtual_terminal.cpp

tests/unit-tests/graphics/mesa/test_nested_authentication.cpp => tests/unit-tests/graphics/mesa/kms/test_nested_authentication.cpp

tests/unit-tests/graphics/mesa/test_platform.cpp => tests/unit-tests/graphics/mesa/kms/test_platform.cpp

tests/unit-tests/graphics/mesa/test_real_kms_output.cpp => tests/unit-tests/graphics/mesa/kms/test_real_kms_output.cpp

files modified:
CMakeLists.txt

cmake/ABICheck.cmake

cross-compile-chroot.sh

debian/control

debian/create_postinst_prerm_scripts.sh

debian/install_ld_so_conf.sh

debian/rules

doc/kernel_requirements.md

examples/CMakeLists.txt

examples/server_example_canonical_window_manager.cpp

include/client/mir_toolkit/version.h

src/platforms/CMakeLists.txt

src/platforms/mesa/server/CMakeLists.txt

src/platforms/mesa/server/kms/CMakeLists.txt

src/platforms/mesa/server/kms/platform.cpp

src/server/shell/canonical_window_manager.cpp

tests/CMakeLists.txt

tests/acceptance-tests/CMakeLists.txt

tests/integration-tests/CMakeLists.txt

tests/integration-tests/graphics/mesa/CMakeLists.txt

tests/integration-tests/test_server_shutdown.cpp

tests/mir_test_doubles/CMakeLists.txt

tests/unit-tests/CMakeLists.txt

tests/unit-tests/client/CMakeLists.txt

tests/unit-tests/client/test_client_platform.cpp

tests/unit-tests/client/test_probing_client_platform_factory.cpp

tests/unit-tests/graphics/CMakeLists.txt

tests/unit-tests/graphics/mesa/CMakeLists.txt

tests/unit-tests/graphics/test_platform_prober.cpp

tests/unit-tests/test_shared_library_prober.cpp

tools/generate-abi-base-dump.sh

tools/run_abi_compliance_checker.sh

tools/update_package_abis.sh

Show diffs side-by-side

added added

removed removed

cmake/ABICheck.cmake

cross-compile-chroot.sh

debian/create_postinst_prerm_scripts.sh

debian/install_ld_so_conf.sh

debian/mir-platform-graphics-mesa-kms2.install

doc/kernel_requirements.md

examples/CMakeLists.txt

examples/client_touch_validator.cpp

examples/server_example_canonical_window_manager.cpp

include/client/mir_toolkit/version.h

src/platforms/CMakeLists.txt

src/platforms/mesa/server/CMakeLists.txt

src/platforms/mesa/server/kms/CMakeLists.txt

src/platforms/mesa/server/kms/platform.cpp

src/server/shell/canonical_window_manager.cpp

tests/CMakeLists.txt

tests/acceptance-tests/CMakeLists.txt

tests/integration-tests/CMakeLists.txt

tests/integration-tests/graphics/mesa/CMakeLists.txt

tests/integration-tests/test_server_shutdown.cpp

tests/mir_test_doubles/CMakeLists.txt

tests/unit-tests/CMakeLists.txt

tests/unit-tests/client/CMakeLists.txt

tests/unit-tests/client/test_client_platform.cpp

tests/unit-tests/client/test_probing_client_platform_factory.cpp

tests/unit-tests/graphics/CMakeLists.txt

tests/unit-tests/graphics/mesa/CMakeLists.txt

tests/unit-tests/graphics/mesa/common/

tests/unit-tests/graphics/mesa/common/CMakeLists.txt

tests/unit-tests/graphics/mesa/kms/

tests/unit-tests/graphics/mesa/kms/CMakeLists.txt

tests/unit-tests/graphics/mesa/kms/test_platform.cpp

tests/unit-tests/graphics/test_platform_prober.cpp

tests/unit-tests/test_data/empty_input.c

tests/unit-tests/test_shared_library_prober.cpp

tools/generate-abi-base-dump.sh

tools/run_abi_compliance_checker.sh

tools/update_package_abis.sh

Older »