Update to 0.31.2

3 files changed, 75 insertions, 106 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 76808bf5f824..981c293303a4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,35 +1,51 @@
 pkgbase = mir
-	pkgdesc = Ubuntu's display server
-	pkgver = 0.26.2
-	pkgrel = 1
-	url = https://launchpad.net/mir
+	pkgdesc = Canonical's display server
+	pkgver = 0.31.2
+	pkgrel = 3
+	url = https://mir-server.io
 	arch = x86_64
+	arch = i686
 	license = GPL
 	license = LGPL
-	license = BSD
-	license = Apache
-	makedepends = extra-cmake-modules
 	makedepends = glm
 	makedepends = doxygen
-	makedepends = libdrm
+	makedepends = cmake
 	depends = boost
-	depends = libglvnd
-	depends = protobuf-mir
+	depends = gcovr
+	depends = lcov
 	depends = capnproto
 	depends = google-glog
 	depends = gflags
-	depends = glib2
+	depends = libglvnd
+	depends = valgrind
+	depends = liburcu
+	depends = lttng-ust
+	depends = libepoxy
 	depends = nettle
-	depends = libinput-mir
-	depends = udev
+	depends = libinput
+	depends = libxml++2.6
 	depends = libxkbcommon
+	depends = python-pillow
 	depends = freetype2
-	depends = abi-compliance-checker
-	depends = lttng-ust
-	source = https://launchpad.net/mir/0.26/0.26.2/+download/mir-0.26.2.tar.xz
-	source = https://raw.githubusercontent.com/sandstorm-io/capnproto/master/c%2B%2B/cmake/FindCapnProto.cmake
-	md5sums = 3c85ee4798ba6929f568c758fad18192
-	md5sums = 16e3a086ca0afe4eb71771da72c5e406
+	depends = gmock
+	depends = libevdev
+	depends = umockdev
+	depends = python-dbusmock
+	depends = protobuf
+	depends = python-dbus
+	depends = python-gobject
+	depends = hicolor-icon-theme
+	depends = lib32-glibc
+	optdepends = qterminal: required for miral demos
+	optdepends = xcursor-dmz: required for miral demos
+	optdepends = ttf-ubuntu-font-family: required for miral demos
+	optdepends = qt5-wayland: required for miral demos
+	provides = mir
+	conflicts = mir
+	source = https://github.com/MirServer/mir/releases/download/v0.31.2/mir-0.31.2.tar.xz
+	source = https://raw.githubusercontent.com/capnproto/capnproto/04fd66e2992a3ed38d686642a3c479a7f3e131c9/c%2B%2B/cmake/FindCapnProto.cmake
+	sha256sums = a4be0c36c9cd0c91f966c4d70ac21e916758adcbf2523ded71a672938a65bad3
+	sha256sums = 83153402ea0220a9ed3f9d2c2c157eb49fedf340f368cd8173f0966b3fbf2647
 
 pkgname = mir
 
diff --git a/0001-Build-fixes.patch b/0001-Build-fixes.patch
deleted file mode 100644
index 1a6b5bf1f654..000000000000
--- a/0001-Build-fixes.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 5c3a6130e7f64cfd64acd701e49cdb76e261ff1d Mon Sep 17 00:00:00 2001
-From: Xiao-Long Chen <chenxiaolong@cxl.epac.to>
-Date: Thu, 1 Jan 2015 00:33:56 -0500
-Subject: [PATCH] Build fixes
-
----
- CMakeLists.txt                       | 4 ++--
- examples/glog_logger.cpp             | 2 +-
- src/platforms/mesa/server/cursor.cpp | 2 +-
- 3 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 130fe58..517bea3 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -58,8 +58,8 @@ set(CMAKE_BUILD_TYPE ${CMAKE_BUILD_TYPE} CACHE STRING "${build_types}" FORCE)
- # Enable cmake-gui to display a drop down list for CMAKE_BUILD_TYPE
- set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "${build_types}")
- 
--set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pthread -g -Werror -Wall -pedantic -Wextra -fPIC")
--set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread -g -std=c++14 -Werror -Wall -fno-strict-aliasing -pedantic -Wnon-virtual-dtor -Wextra -fPIC")
-+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pthread -g -Wall -pedantic -Wextra -fPIC")
-+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread -g -std=c++14 -Wall -fno-strict-aliasing -pedantic -Wnon-virtual-dtor -Wextra -fPIC")
- 
- if ("${CMAKE_CXX_COMPILER}" MATCHES "clang")
-   set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-return-type-c-linkage -Wno-mismatched-tags")
-diff --git a/examples/glog_logger.cpp b/examples/glog_logger.cpp
-index 24f2ec4..58616bc 100644
---- a/examples/glog_logger.cpp
-+++ b/examples/glog_logger.cpp
-@@ -49,7 +49,7 @@ struct google_gflag_guard_t
- {
-     ~google_gflag_guard_t()
-     {
--        std::call_once(shutdown_flag_gflags, google::ShutDownCommandLineFlags);
-+        std::call_once(shutdown_flag_gflags, gflags::ShutDownCommandLineFlags);
-     }
- } google_gflag_guard;
- }
-diff --git a/src/platforms/mesa/server/cursor.cpp b/src/platforms/mesa/server/cursor.cpp
-index fee0ef7..6c18481 100644
---- a/src/platforms/mesa/server/cursor.cpp
-+++ b/src/platforms/mesa/server/cursor.cpp
-@@ -25,7 +25,7 @@
- #include "mir/graphics/cursor_image.h"
- 
- #include <xf86drm.h>
--#include <drm/drm.h>
-+#include <libdrm/drm.h>
- 
- #include <boost/exception/errinfo_errno.hpp>
- 
--- 
-2.4.2
-
diff --git a/PKGBUILD b/PKGBUILD
index d14a6c7be258..2bb2db59860c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,43 +1,51 @@
-# Maintainer: kikadf <kikadf.01@gmail.com>
+# Maintainer: Ivan Semkin (ivan at semkin dot ru)
+# Contributor: kikadf <kikadf.01@gmail.com>
 
 pkgname=mir
-pkgver=0.26.2
-pkgrel=1
-pkgdesc="Ubuntu's display server"
-url="https://launchpad.net/mir"
-arch=('x86_64')
-license=('GPL' 'LGPL' 'BSD' 'Apache')
-depends=('boost' 'libglvnd' 'protobuf-mir' 'capnproto' 'google-glog' 'gflags' 'glib2' \
-         'nettle' 'libinput-mir' 'udev' 'libxkbcommon' 'freetype2' 'abi-compliance-checker' \
-         'lttng-ust')
-makedepends=('extra-cmake-modules' 'glm' 'doxygen' 'libdrm')
-source=("https://launchpad.net/mir/0.26/$pkgver/+download/$pkgname-$pkgver.tar.xz"
-        "https://raw.githubusercontent.com/sandstorm-io/capnproto/master/c%2B%2B/cmake/FindCapnProto.cmake")
-md5sums=('3c85ee4798ba6929f568c758fad18192'
-         '16e3a086ca0afe4eb71771da72c5e406')
+pkgver=0.31.2
+pkgrel=3
+pkgdesc="Canonical's display server"
+url='https://mir-server.io'
+arch=(x86_64 i686)
+license=(GPL LGPL)
+conflicts=(mir)
+provides=(mir)
+depends=(boost gcovr lcov capnproto google-glog gflags libglvnd valgrind liburcu lttng-ust libepoxy nettle libinput libxml++2.6 libxkbcommon python-pillow freetype2 gmock libevdev umockdev python-dbusmock protobuf python-dbus python-gobject hicolor-icon-theme lib32-glibc)
+makedepends=(glm doxygen cmake)
+optdepends=('qterminal: required for miral demos'
+            'xcursor-dmz: required for miral demos'
+            'ttf-ubuntu-font-family: required for miral demos'
+            'qt5-wayland: required for miral demos')
+source=("https://github.com/MirServer/mir/releases/download/v${pkgver}/mir-${pkgver}.tar.xz"
+        'https://raw.githubusercontent.com/capnproto/capnproto/04fd66e2992a3ed38d686642a3c479a7f3e131c9/c%2B%2B/cmake/FindCapnProto.cmake')
+sha256sums=('a4be0c36c9cd0c91f966c4d70ac21e916758adcbf2523ded71a672938a65bad3'
+            '83153402ea0220a9ed3f9d2c2c157eb49fedf340f368cd8173f0966b3fbf2647')
+
+BUILD_DIR=build
 
 prepare() {
-    cd $pkgname-$pkgver
-    rm -rf build cmake/FindCapnProto.cmake
-    cp ../FindCapnProto.cmake cmake/
-    mkdir build
-    sed -i 's|#include <drm/drm.h>|#include <libdrm/drm.h>|' src/platforms/mesa/server/kms/cursor.cpp
+  cd ${pkgname}-${pkgver}
+  cp ../FindCapnProto.cmake cmake/
 }
 
 build() {
-    CXXFLAGS="${CXXFLAGS} -Wno-error=missing-field-initializers"
-    cd $pkgname-$pkgver/build
-    cmake .. -DMIR_PLATFORM='mesa-kms;mesa-x11' \
-             -DCMAKE_BUILD_TYPE=Release \
-             -DCMAKE_INSTALL_PREFIX=/usr \
-             -DCMAKE_INSTALL_LIBDIR=/usr/lib \
-             -DMIR_ENABLE_TESTS=NO
-    make -j2
+  cd ${pkgname}-${pkgver}
+  mkdir -p ${BUILD_DIR}
+  cd ${BUILD_DIR}
+  cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr -DCMAKE_INSTALL_LIBDIR="lib/" ..
+  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
-    make DESTDIR="${pkgdir}/" install
-    mv ${pkgdir}/usr/usr/lib/mir/server-platform ${pkgdir}/usr/lib/mir/
-    rm -rf ${pkgdir}/usr/usr
+  cd ${pkgname}-${pkgver}/${BUILD_DIR}
+  make DESTDIR="${pkgdir}/" install
 }
+# vim:set ts=2 sw=2 et: