upgpkg: libolm 3.1.0-1

upstream release and switch to cmake

2 files changed, 20 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bc230380c001..7110544308e0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,16 @@
 pkgbase = libolm
 	pkgdesc = An implementation of the Double Ratchet cryptographic ratchet in C++
-	pkgver = 3.0.0
+	pkgver = 3.1.0
 	pkgrel = 1
 	url = https://gitlab.matrix.org/matrix-org/olm
 	arch = x86_64
 	arch = i686
 	arch = armv7h
 	license = Apache
+	makedepends = cmake
 	depends = gcc-libs
-	source = https://gitlab.matrix.org/matrix-org/olm/-/archive/3.0.0/olm-3.0.0.tar.bz2
-	sha512sums = 4d83d7222f9fbc238a97156e4d22a6215e922c3e2567751b84243fb5081a9dd20d176fc7f187ccf92139a8fd7f36e851785def7fd448374c971964e4ba674dd6
+	source = https://gitlab.matrix.org/matrix-org/olm/-/archive/3.1.0/olm-3.1.0.tar.bz2
+	sha512sums = 9ee234902889ecbb816ce3fa7f1de7e438a4dfdbd0f55112c44fec75482a4cbe6614e2c81ec2e685046337ac53a444cbb46fdb899f43026cd6cda3f00f1242d2
 
 pkgname = libolm
 
diff --git a/PKGBUILD b/PKGBUILD
index a54eb4d52920..a16ee81bfbfd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,31 +4,38 @@
 
 pkgname=libolm
 _pkgname=olm
-pkgver=3.0.0
+pkgver=3.1.0
 pkgrel=1
 pkgdesc='An implementation of the Double Ratchet cryptographic ratchet in C++'
 arch=('x86_64' 'i686' 'armv7h')
 url="https://gitlab.matrix.org/matrix-org/olm"
 license=('Apache')
 depends=('gcc-libs')
+makedepends=('cmake')
 source=("https://gitlab.matrix.org/matrix-org/$_pkgname/-/archive/$pkgver/$_pkgname-$pkgver.tar.bz2")
-sha512sums=('4d83d7222f9fbc238a97156e4d22a6215e922c3e2567751b84243fb5081a9dd20d176fc7f187ccf92139a8fd7f36e851785def7fd448374c971964e4ba674dd6')
+sha512sums=('9ee234902889ecbb816ce3fa7f1de7e438a4dfdbd0f55112c44fec75482a4cbe6614e2c81ec2e685046337ac53a444cbb46fdb899f43026cd6cda3f00f1242d2')
+
+prepare() {
+  mkdir -p build
+}
 
 build() {
-  cd "$_pkgname-$pkgver"
-  # TODO: Switch build process to CMake as recommended by upstream
+  cd build
+  cmake \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_LIBDIR=lib \
+    ../"$_pkgname-$pkgver"
   make
 }
 
 check() {
-  cd "$_pkgname-$pkgver"
-  CPPFLAGS=${CPPFLAGS/-D_FORTIFY_SOURCE=2/}
-  make test
+  cd build/tests
+  ctest .
 }
 
 package() {
-  cd "$_pkgname-$pkgver"
-  make DESTDIR="$pkgdir" PREFIX=/usr install
+  cd build
+  make DESTDIR="$pkgdir" install
 }
 
 # vim:set ts=2 sts=2 sw=2 et: