Update to 0.31.2

1 files changed, 40 insertions, 32 deletions

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: