diff options
| -rw-r--r-- | .SRCINFO | 17 | ||||
| -rw-r--r-- | FindCapnProto.cmake | 191 | ||||
| -rw-r--r-- | PKGBUILD | 39 |
3 files changed, 15 insertions, 232 deletions
@@ -1,7 +1,7 @@ pkgbase = mir pkgdesc = Canonical's display server - pkgver = 1.5.0 - pkgrel = 3 + pkgver = 2.16.3 + pkgrel = 1 url = https://mir-server.io arch = x86_64 arch = i686 @@ -19,6 +19,7 @@ pkgbase = mir makedepends = python-dbusmock makedepends = umockdev makedepends = wlcs + makedepends = libxkbcommon-x11 depends = gtest depends = boost-libs depends = capnproto @@ -45,15 +46,7 @@ pkgbase = mir optdepends = ttf-ubuntu-font-family: required for miral demos optdepends = qt5-wayland: required for miral demos optdepends = xcursor-dmz: opt requirement for miral demos - optdepends = qtubuntu: opt requirement for miral demos - provides = mir - conflicts = mir - source = https://github.com/MirServer/mir/archive/v1.5.0.tar.gz - source = https://patch-diff.githubusercontent.com/raw/MirServer/mir/pull/1087.patch - source = https://patch-diff.githubusercontent.com/raw/MirServer/mir/pull/1088.patch - sha256sums = 526f844a7ac8ca7ede2ec33f3e942e0c130a76b1cf453d05a4f3f36e31b1cda8 - sha256sums = ec73c4694f2d0b5279979e96add335da286a51c413dfdaf19434d7218be46eef - sha256sums = 1e1a1b188db2fa540c200bf66e15473230f91cdadffa3040985ec4b7503ce2bd + source = mir-2.16.3.tar.gz::https://github.com/MirServer/mir/archive/v2.16.3.tar.gz + sha256sums = d0128d3061e72fc4cba811267e6ad988563f1a24487d8752d643abdcaa75272d pkgname = mir - diff --git a/FindCapnProto.cmake b/FindCapnProto.cmake deleted file mode 100644 index 55f79c24a72a..000000000000 --- a/FindCapnProto.cmake +++ /dev/null @@ -1,191 +0,0 @@ -# -# Finds the Cap'n Proto libraries, and compiles schema files. -# -# Configuration variables (optional): -# CAPNPC_OUTPUT_DIR -# Directory to place compiled schema sources (default: the same directory as the schema file). -# CAPNPC_IMPORT_DIRS -# List of additional include directories for the schema compiler. -# (CMAKE_CURRENT_SOURCE_DIR and CAPNP_INCLUDE_DIRS are always included.) -# CAPNPC_SRC_PREFIX -# Schema file source prefix (default: CMAKE_CURRENT_SOURCE_DIR). -# CAPNPC_FLAGS -# Additional flags to pass to the schema compiler. -# -# Variables that are discovered: -# CAPNP_EXECUTABLE -# Path to the `capnp` tool (can be set to override). -# CAPNPC_CXX_EXECUTABLE -# Path to the `capnpc-c++` tool (can be set to override). -# CAPNP_INCLUDE_DIRS -# Include directories for the library's headers (can be set to override). -# CANP_LIBRARIES -# The Cap'n Proto library paths. -# CAPNP_LIBRARIES_LITE -# Paths to only the 'lite' libraries. -# CAPNP_DEFINITIONS -# Compiler definitions required for building with the library. -# CAPNP_FOUND -# Set if the libraries have been located. -# -# Example usage: -# -# find_package(CapnProto REQUIRED) -# include_directories(${CAPNP_INCLUDE_DIRS}) -# add_definitions(${CAPNP_DEFINITIONS}) -# -# capnp_generate_cpp(CAPNP_SRCS CAPNP_HDRS schema.capnp) -# add_executable(a a.cc ${CAPNP_SRCS} ${CAPNP_HDRS}) -# target_link_library(a ${CAPNP_LIBRARIES}) -# -# For out-of-source builds: -# -# set(CAPNPC_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR}) -# include_directories(${CAPNPC_OUTPUT_DIR}) -# capnp_generate_cpp(...) -# - -# CAPNP_GENERATE_CPP =========================================================== - -function(CAPNP_GENERATE_CPP SOURCES HEADERS) - if(NOT ARGN) - message(SEND_ERROR "CAPNP_GENERATE_CPP() called without any source files.") - endif() - if(NOT CAPNP_EXECUTABLE) - message(SEND_ERROR "Could not locate capnp executable (CAPNP_EXECUTABLE).") - endif() - if(NOT CAPNPC_CXX_EXECUTABLE) - message(SEND_ERROR "Could not locate capnpc-c++ executable (CAPNPC_CXX_EXECUTABLE).") - endif() - if(NOT CAPNP_INCLUDE_DIRS) - message(SEND_ERROR "Could not locate capnp header files (CAPNP_INCLUDE_DIRS).") - endif() - - # Default compiler includes - set(include_path -I ${CMAKE_CURRENT_SOURCE_DIR} -I ${CAPNP_INCLUDE_DIRS}) - - if(DEFINED CAPNPC_IMPORT_DIRS) - # Append each directory as a series of '-I' flags in ${include_path} - foreach(directory ${CAPNPC_IMPORT_DIRS}) - get_filename_component(absolute_path "${directory}" ABSOLUTE) - list(APPEND include_path -I ${absolute_path}) - endforeach() - endif() - - if(DEFINED CAPNPC_OUTPUT_DIR) - # Prepend a ':' to get the format for the '-o' flag right - set(output_dir ":${CAPNPC_OUTPUT_DIR}") - else() - set(output_dir ":.") - endif() - - if(NOT DEFINED CAPNPC_SRC_PREFIX) - set(CAPNPC_SRC_PREFIX "${CMAKE_CURRENT_SOURCE_DIR}") - endif() - get_filename_component(CAPNPC_SRC_PREFIX "${CAPNPC_SRC_PREFIX}" ABSOLUTE) - - set(${SOURCES}) - set(${HEADERS}) - foreach(schema_file ${ARGN}) - get_filename_component(file_path "${schema_file}" ABSOLUTE) - get_filename_component(file_dir "${file_path}" PATH) - - # Figure out where the output files will go - if (NOT DEFINED CAPNPC_OUTPUT_DIR) - set(output_base "${file_path}") - else() - # Output files are placed in CAPNPC_OUTPUT_DIR, at a location as if they were - # relative to CAPNPC_SRC_PREFIX. - string(LENGTH "${CAPNPC_SRC_PREFIX}" prefix_len) - string(SUBSTRING "${file_path}" 0 ${prefix_len} output_prefix) - if(NOT "${CAPNPC_SRC_PREFIX}" STREQUAL "${output_prefix}") - message(SEND_ERROR "Could not determine output path for '${schema_file}' ('${file_path}') with source prefix '${CAPNPC_SRC_PREFIX}' into '${CAPNPC_OUTPUT_DIR}'.") - endif() - - string(SUBSTRING "${file_path}" ${prefix_len} -1 output_path) - set(output_base "${CAPNPC_OUTPUT_DIR}${output_path}") - endif() - - add_custom_command( - OUTPUT "${output_base}.c++" "${output_base}.h" - COMMAND "${CAPNP_EXECUTABLE}" - ARGS compile - -o ${CAPNPC_CXX_EXECUTABLE}${output_dir} - --src-prefix ${CAPNPC_SRC_PREFIX} - ${include_path} - ${CAPNPC_FLAGS} - ${file_path} - DEPENDS "${schema_file}" - COMMENT "Compiling Cap'n Proto schema ${schema_file}" - VERBATIM - ) - list(APPEND ${SOURCES} "${output_base}.c++") - list(APPEND ${HEADERS} "${output_base}.h") - endforeach() - - set_source_files_properties(${${SOURCES}} ${${HEADERS}} PROPERTIES GENERATED TRUE) - set(${SOURCES} ${${SOURCES}} PARENT_SCOPE) - set(${HEADERS} ${${HEADERS}} PARENT_SCOPE) -endfunction() - -# Find Libraries/Paths ========================================================= - -# Use pkg-config to get path hints and definitions -find_package(PkgConfig QUIET) -pkg_check_modules(PKGCONFIG_CAPNP capnp) -pkg_check_modules(PKGCONFIG_CAPNP_RPC capnp-rpc QUIET) - -find_library(CAPNP_LIB_KJ kj - HINTS "${PKGCONFIG_CAPNP_LIBDIR}" ${PKGCONFIG_CAPNP_LIBRARY_DIRS} -) -find_library(CAPNP_LIB_KJ-ASYNC kj-async - HINTS "${PKGCONFIG_CAPNP_RPC_LIBDIR}" ${PKGCONFIG_CAPNP_RPC_LIBRARY_DIRS} -) -find_library(CAPNP_LIB_CAPNP capnp - HINTS "${PKGCONFIG_CAPNP_LIBDIR}" ${PKGCONFIG_CAPNP_LIBRARY_DIRS} -) -find_library(CAPNP_LIB_CAPNP-RPC capnp-rpc - HINTS "${PKGCONFIG_CAPNP_RPC_LIBDIR}" ${PKGCONFIG_CAPNP_RPC_LIBRARY_DIRS} -) -mark_as_advanced(CAPNP_LIB_KJ CAPNP_LIB_KJ-ASYNC CAPNP_LIB_CAPNP CAPNP_LIB_CAPNP-RPC) -set(CAPNP_LIBRARIES_LITE - ${CAPNP_LIB_KJ} - ${CAPNP_LIB_CAPNP} -) -set(CAPNP_LIBRARIES - ${CAPNP_LIBRARIES_LITE} - ${CAPNP_LIB_KJ-ASYNC} - ${CAPNP_LIB_CAPNP-RPC} -) - -# Was only the 'lite' library found? -if(CAPNP_LIB_CAPNP AND NOT CAPNP_LIB_CAPNP-RPC) - set(CAPNP_DEFINITIONS -DCAPNP_LITE) -else() - set(CAPNP_DEFINITIONS) -endif() - -find_path(CAPNP_INCLUDE_DIRS capnp/generated-header-support.h - HINTS "${PKGCONFIG_CAPNP_INCLUDEDIR}" ${PKGCONFIG_CAPNP_INCLUDE_DIRS} -) - -find_program(CAPNP_EXECUTABLE - NAMES capnp - DOC "Cap'n Proto Command-line Tool" - HINTS "${PKGCONFIG_CAPNP_PREFIX}/bin" -) - -find_program(CAPNPC_CXX_EXECUTABLE - NAMES capnpc-c++ - DOC "Capn'n Proto C++ Compiler" - HINTS "${PKGCONFIG_CAPNP_PREFIX}/bin" -) - -# Only *require* the include directory, libkj, and libcapnp. If compiling with -# CAPNP_LITE, nothing else will be found. -include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(CAPNP DEFAULT_MSG - CAPNP_INCLUDE_DIRS - CAPNP_LIB_KJ - CAPNP_LIB_CAPNP -) @@ -1,53 +1,34 @@ -# Maintainer: Ivan Semkin (ivan at semkin dot ru) +# Maintainer: Neptune <neptune650@proton.me> +# Contributor: Bjoern Franke <bjo+aur<at>schafweide.org> +# Contributor: Ivan Semkin (ivan at semkin dot ru) # Contributor: kikadf <kikadf.01@gmail.com> pkgname=mir -pkgver=1.5.0 -pkgrel=3 +pkgver=2.16.3 +pkgrel=1 pkgdesc="Canonical's display server" url='https://mir-server.io' arch=(x86_64 i686) license=(GPL LGPL) -conflicts=(mir) -provides=(mir) depends=(gtest boost-libs capnproto google-glog gflags libglvnd liburcu lttng-ust libepoxy libxml++2.6 nettle libinput libxkbcommon python-pillow freetype2 libevdev protobuf python-dbus python-gobject hicolor-icon-theme libxcursor yaml-cpp) -makedepends=(git glm doxygen cmake boost gcovr gmock lcov valgrind python-dbusmock umockdev wlcs) +makedepends=(git glm doxygen cmake boost gcovr gmock lcov valgrind python-dbusmock umockdev wlcs libxkbcommon-x11) optdepends=('qterminal: required for miral demos' 'ttf-ubuntu-font-family: required for miral demos' 'qt5-wayland: required for miral demos' - 'xcursor-dmz: opt requirement for miral demos' - 'qtubuntu: opt requirement for miral demos') -source=("https://github.com/MirServer/mir/archive/v${pkgver}.tar.gz" - 'https://patch-diff.githubusercontent.com/raw/MirServer/mir/pull/1087.patch' - 'https://patch-diff.githubusercontent.com/raw/MirServer/mir/pull/1088.patch') -sha256sums=('526f844a7ac8ca7ede2ec33f3e942e0c130a76b1cf453d05a4f3f36e31b1cda8' - 'ec73c4694f2d0b5279979e96add335da286a51c413dfdaf19434d7218be46eef' - '1e1a1b188db2fa540c200bf66e15473230f91cdadffa3040985ec4b7503ce2bd') + 'xcursor-dmz: opt requirement for miral demos') +source=("${pkgname}-${pkgver}.tar.gz::https://github.com/MirServer/mir/archive/v${pkgver}.tar.gz") +sha256sums=('d0128d3061e72fc4cba811267e6ad988563f1a24487d8752d643abdcaa75272d') BUILD_DIR=build -prepare() { - cd ${pkgname}-${pkgver} - patch -Np1 -i "${srcdir}/1087.patch" - patch -Np1 -i "${srcdir}/1088.patch" -} - build() { cd ${pkgname}-${pkgver} mkdir -p ${BUILD_DIR} cd ${BUILD_DIR} - cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr -DCMAKE_INSTALL_LIBDIR="lib/" .. + cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr -DCMAKE_INSTALL_LIBDIR="lib/" -DMIR_USE_PRECOMPILED_HEADERS=OFF .. cmake --build ./ } -check() { - cd ${pkgname}-${pkgver}/${BUILD_DIR} - GTEST_OUTPUT=xml:./ - bin/mir_acceptance_tests - bin/mir_integration_tests - bin/mir_unit_tests -} - package() { cd ${pkgname}-${pkgver}/${BUILD_DIR} make DESTDIR="${pkgdir}/" install |