Update build process for cmake

3 files changed, 34 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 113118caf36c..8331e6eade7a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = murmur-git
 	pkgdesc = The voice chat application server for Mumble (git version)
-	pkgver = 1.2.5.r3082.g713b92c3c
+	pkgver = 1.3.0.rc2.r990.gbf9550a68
 	pkgrel = 1
 	url = https://www.mumble.info/
 	install = murmur.install
@@ -11,11 +11,13 @@ pkgbase = murmur-git
 	makedepends = git
 	makedepends = boost
 	makedepends = python
+	makedepends = cmake
 	depends = avahi
 	depends = lsb-release
 	depends = protobuf
 	depends = qt5-base
 	depends = zeroc-ice
+	depends = grpc
 	provides = murmur
 	conflicts = murmur
 	conflicts = murmur-static
@@ -25,10 +27,12 @@ pkgbase = murmur-git
 	source = murmur.dbus.conf
 	source = murmur.service
 	source = murmur.sysusers
+	source = murmur.tmpfiles
 	sha512sums = SKIP
 	sha512sums = 97c7effdddec324e40195c36ef4927950a5de26d2ee2d268d89df6fb547207bbbe30292773316cae6f57ec9923244f205fb0edc377b798771ba7385e3c11d86a
 	sha512sums = fc230c3d7119afed34485eeb84fd935968dc69e4a00cbdbebc3a4f4d4ce155613b4581e43c07208d513a6ba4d240ba84058a85f04b2188bfa406f70256f13f65
 	sha512sums = 5af28d0c2b2b072cfbd500b5f63549e88a86cf3fc15e4d2df89e787c4d2bafdecbe078a518e0d1b25d82f9873cb06838ec1c9ebed625ffb7e8c80fcd942ebf74
+	sha512sums = 411784e8e0dcf6c163780ae895ae1a6bdad0bb2dd2b128911c484ac3eff073d95c5791b625493a2b8296d24bd7e6ac72d3c42180817e48b29f0c6a8fd841807c
 
 pkgname = murmur-git
 
diff --git a/PKGBUILD b/PKGBUILD
index c145595e3de6..76c2f823c74d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,10 +4,10 @@
 # Contributor: Malte Rabenseifner <malte@zearan.de>
 
 _use_zeroc_ice="1"
-_use_grpc="0"
+_use_grpc="1"
 
 pkgname=murmur-git
-pkgver=1.2.5.r3082.g713b92c3c
+pkgver=1.3.0.rc2.r990.gbf9550a68
 pkgrel=1
 pkgdesc="The voice chat application server for Mumble (git version)"
 arch=('i686' 'x86_64' 'armv7h')
@@ -23,7 +23,7 @@ if [[ ${_use_grpc} == "1" ]]; then
     depends+=('grpc')
 fi
 
-makedepends=('git' 'boost' 'python')
+makedepends=('git' 'boost' 'python' 'cmake')
 conflicts=('murmur' 'murmur-static' 'murmur-ice')
 provides=('murmur')
 backup=("etc/murmur.ini")
@@ -31,39 +31,48 @@ install="murmur.install"
 source=("git+https://github.com/mumble-voip/mumble.git"
     "murmur.dbus.conf"
     "murmur.service"
-    "murmur.sysusers")
+    "murmur.sysusers"
+    "murmur.tmpfiles")
 sha512sums=('SKIP'
             '97c7effdddec324e40195c36ef4927950a5de26d2ee2d268d89df6fb547207bbbe30292773316cae6f57ec9923244f205fb0edc377b798771ba7385e3c11d86a'
             'fc230c3d7119afed34485eeb84fd935968dc69e4a00cbdbebc3a4f4d4ce155613b4581e43c07208d513a6ba4d240ba84058a85f04b2188bfa406f70256f13f65'
-            '5af28d0c2b2b072cfbd500b5f63549e88a86cf3fc15e4d2df89e787c4d2bafdecbe078a518e0d1b25d82f9873cb06838ec1c9ebed625ffb7e8c80fcd942ebf74')
+            '5af28d0c2b2b072cfbd500b5f63549e88a86cf3fc15e4d2df89e787c4d2bafdecbe078a518e0d1b25d82f9873cb06838ec1c9ebed625ffb7e8c80fcd942ebf74'
+            '411784e8e0dcf6c163780ae895ae1a6bdad0bb2dd2b128911c484ac3eff073d95c5791b625493a2b8296d24bd7e6ac72d3c42180817e48b29f0c6a8fd841807c')
 
 _gitname="mumble"
 
 pkgver() {
-    cd "${srcdir}/${_gitname}"
-    git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+    cd "${_gitname}"
+    git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 build() {
-    cd "${srcdir}/${_gitname}"
-
-    CONFIG_OPTS="no-client"
+    CMAKE_OPTS="-Dclient:BOOL='OFF'"
 
     if [[ ${_use_zeroc_ice} == "0" ]]; then
-        CONFIG_OPTS+=" no-ice"
+        CMAKE_OPTS+=" -Dice:BOOL='OFF'"
     fi
 
     if [[ ${_use_grpc} == "1" ]]; then
-        CONFIG_OPTS+=" grpc"
+        CMAKE_OPTS+=" -Dgrpc:BOOL='ON'"
     fi
 
-    qmake-qt5 main.pro CONFIG+="${CONFIG_OPTS}"
-
-    make release
+    cmake -B build -S "${_gitname}" \
+        -DCMAKE_BUILD_TYPE=None \
+        -DCMAKE_INSTALL_PREFIX='/usr' \
+        ${CMAKE_OPTS}
+    make -C build
 }
 
 package() {
-    cd "${srcdir}/${_gitname}"
+    make -C build DESTDIR="${pkgdir}" install
+
+    install -Dm644 murmur.dbus.conf "${pkgdir}"/usr/share/dbus-1/system.d/murmur.conf
+    install -Dm644 murmur.service "${pkgdir}"/usr/lib/systemd/system/murmur.service
+    install -Dm644 murmur.sysusers "${pkgdir}"/usr/lib/sysusers.d/murmur.conf
+    install -Dm644 murmur.tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/murmur.conf
+
+    cd "${_gitname}"
 
     sed -e "1i; vi:ft=cfg" \
       -e "s|database=|database=/var/db/murmur/murmur.sqlite|" \
@@ -71,15 +80,10 @@ package() {
       -e "s|;uname=|uname=murmur|" \
       -i scripts/murmur.ini
 
-    install -dm755 -o 122 -g 122 "${pkgdir}"/var/db/murmur
-    install -Dm755 release/murmurd "${pkgdir}"/usr/bin/murmurd
     install -Dm644 scripts/murmur.ini "${pkgdir}"/etc/murmur.ini
-    install -Dm644 "${srcdir}"/murmur.dbus.conf "${pkgdir}"/usr/share/dbus-1/system.d/murmur.conf
-    install -Dm644 README "${pkgdir}"/usr/share/doc/murmur/README
-    install -Dm644 man/murmurd.1 "${pkgdir}"/usr/share/man/man1/murmurd.1
-    install -Dm644 "${srcdir}"/murmur.service "${pkgdir}"/usr/lib/systemd/system/murmur.service
+    install -Dm644 README.md "${pkgdir}"/usr/share/doc/murmur/README.md
     install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-    install -Dm644 "${srcdir}"/murmur.sysusers "${pkgdir}"/usr/lib/sysusers.d/murmur.conf
+
 
     if [[ ${_use_zeroc_ice} == "1" ]]; then
         install -Dm644 src/murmur/Murmur.ice "${pkgdir}"/usr/share/murmur/Murmur.ice
diff --git a/murmur.tmpfiles b/murmur.tmpfiles
new file mode 100644
index 000000000000..cf1c4dc8a69b
--- /dev/null
+++ b/murmur.tmpfiles
@@ -0,0 +1,2 @@
+z /etc/murmur.ini 0640 root murmur
+d /var/db/murmur 0750 murmur murmur -