Fix packaging issues

2 files changed, 38 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e7278f6f1bf9..7eeea6a3619a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,23 @@
 pkgbase = mir-git
-	pkgdesc = The Mir compositor
-	pkgver = v0.31.2+334+ge26dbf576b
+	pkgdesc = Canonical's display server
+	pkgver = v0.31.2+380+g3013b91849
 	pkgrel = 1
 	url = https://mir-server.io
 	arch = x86_64
+	arch = i686
 	license = GPL
 	license = LGPL
 	makedepends = git
 	makedepends = glm
 	makedepends = doxygen
+	makedepends = cmake
 	depends = boost
 	depends = gcovr
 	depends = lcov
 	depends = capnproto
 	depends = google-glog
 	depends = gflags
+	depends = libglvnd
 	depends = valgrind
 	depends = liburcu
 	depends = lttng-ust
@@ -29,8 +32,11 @@ pkgbase = mir-git
 	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
diff --git a/PKGBUILD b/PKGBUILD
index 4e41af30d132..ab310b68b0cb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,16 +3,16 @@
 
 pkgname=mir-git
 _pkgname=mir
-pkgver=v0.31.2+334+ge26dbf576b
+pkgver=v0.31.2+380+g3013b91849
 pkgrel=1
-pkgdesc='The Mir compositor'
+pkgdesc="Canonical's display server"
 url='https://mir-server.io'
-arch=(x86_64)
+arch=(x86_64 i686)
 license=(GPL LGPL)
 conflicts=(mir)
 provides=(mir)
-depends=(boost gcovr lcov capnproto google-glog gflags valgrind liburcu lttng-ust libepoxy nettle libinput libxml++2.6 libxkbcommon python-pillow freetype2 gmock libevdev umockdev python-dbusmock python-dbus python-gobject)
-makedepends=(git glm doxygen)
+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=(git glm doxygen cmake)
 optdepends=('qterminal: required for miral demos'
             'xcursor-dmz: required for miral demos'
             'ttf-ubuntu-font-family: required for miral demos'
@@ -22,26 +22,39 @@ source=('git+https://github.com/MirServer/mir.git'
 sha256sums=('SKIP'
             '83153402ea0220a9ed3f9d2c2c157eb49fedf340f368cd8173f0966b3fbf2647')
 
+BUILD_DIR=build
+
+prepare() {
+  cd ${_pkgname}
+  git submodule init
+  git submodule update
+  cp ../FindCapnProto.cmake cmake/
+}
+
 pkgver() {
   cd ${_pkgname}
   git describe --tags | sed 's/-/+/g'
 }
-            
-prepare() {
-    cd ${_pkgname}
-    git submodule init
-    git submodule update
-    cp ../FindCapnProto.cmake cmake/
-}
 
 build() {
-    cd ${_pkgname}
-    ./native-compile.sh
+  cd ${_pkgname}
+  mkdir -p ${BUILD_DIR}
+  cd ${BUILD_DIR}
+  cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr -DCMAKE_INSTALL_LIBDIR="lib/" ..
+  cmake --build ./
 }
 
-package() {
-    cd ${_pkgname}/build-linux-x86
-    make DESTDIR="${pkgdir}/" install
+check() {
+  cd ${_pkgname}/${BUILD_DIR}
+  GTEST_OUTPUT=xml:./
+  bin/mir_acceptance_tests
+  bin/mir_integration_tests
+  bin/mir_unit_tests
+}
 
+package() {
+  cd ${_pkgname}/${BUILD_DIR}
+  make DESTDIR="${pkgdir}/" install
 }
 # vim:set ts=2 sw=2 et:
+