diff options
-rw-r--r-- | .SRCINFO | 5 | ||||
-rw-r--r-- | PKGBUILD | 19 |
2 files changed, 8 insertions, 16 deletions
@@ -1,6 +1,6 @@ pkgbase = murmur-git pkgdesc = The voice chat application server for Mumble (git version) - pkgver = 1.4.0.r472.gdb3a28058 + pkgver = 1.4.0.r712.g414ab61b6 pkgrel = 1 url = https://www.mumble.info/ install = murmur.install @@ -17,7 +17,6 @@ pkgbase = murmur-git depends = protobuf depends = qt5-base depends = zeroc-ice - depends = grpc provides = murmur conflicts = murmur conflicts = murmur-static @@ -26,6 +25,7 @@ pkgbase = murmur-git source = git+https://github.com/mumble-voip/mumble.git source = git+https://github.com/Krzmbrzl/FindPythonInterpreter.git source = git+https://github.com/wolfpld/tracy.git + source = git+https://github.com/microsoft/GSL.git source = murmur.dbus.conf source = murmur.service source = murmur.sysusers @@ -33,6 +33,7 @@ pkgbase = murmur-git sha512sums = SKIP sha512sums = SKIP sha512sums = SKIP + sha512sums = SKIP sha512sums = 97c7effdddec324e40195c36ef4927950a5de26d2ee2d268d89df6fb547207bbbe30292773316cae6f57ec9923244f205fb0edc377b798771ba7385e3c11d86a sha512sums = 8454955b4a0e9c71d172ff5595a5d56078edf42a9060092660a7bf75ab36413ac8bcb275492c3b5293f11a5bada5ae1df34b77c488eb76289a871705f2cb3796 sha512sums = 5af28d0c2b2b072cfbd500b5f63549e88a86cf3fc15e4d2df89e787c4d2bafdecbe078a518e0d1b25d82f9873cb06838ec1c9ebed625ffb7e8c80fcd942ebf74 @@ -4,10 +4,9 @@ # Contributor: Malte Rabenseifner <malte@zearan.de> _use_zeroc_ice="1" -_use_grpc="1" pkgname=murmur-git -pkgver=1.4.0.r472.gdb3a28058 +pkgver=1.4.0.r712.g414ab61b6 pkgrel=1 pkgdesc="The voice chat application server for Mumble (git version)" arch=('i686' 'x86_64' 'armv7h') @@ -19,10 +18,6 @@ if [[ ${_use_zeroc_ice} == "1" ]]; then depends+=('zeroc-ice') fi -if [[ ${_use_grpc} == "1" ]]; then - depends+=('grpc') -fi - makedepends=('git' 'boost' 'python' 'cmake') conflicts=('murmur' 'murmur-static' 'murmur-ice') provides=('murmur') @@ -31,6 +26,7 @@ install="murmur.install" source=("git+https://github.com/mumble-voip/mumble.git" "git+https://github.com/Krzmbrzl/FindPythonInterpreter.git" "git+https://github.com/wolfpld/tracy.git" + "git+https://github.com/microsoft/GSL.git" "murmur.dbus.conf" "murmur.service" "murmur.sysusers" @@ -38,6 +34,7 @@ source=("git+https://github.com/mumble-voip/mumble.git" sha512sums=('SKIP' 'SKIP' 'SKIP' + 'SKIP' '97c7effdddec324e40195c36ef4927950a5de26d2ee2d268d89df6fb547207bbbe30292773316cae6f57ec9923244f205fb0edc377b798771ba7385e3c11d86a' '8454955b4a0e9c71d172ff5595a5d56078edf42a9060092660a7bf75ab36413ac8bcb275492c3b5293f11a5bada5ae1df34b77c488eb76289a871705f2cb3796' '5af28d0c2b2b072cfbd500b5f63549e88a86cf3fc15e4d2df89e787c4d2bafdecbe078a518e0d1b25d82f9873cb06838ec1c9ebed625ffb7e8c80fcd942ebf74' @@ -57,6 +54,8 @@ prepare() { git submodule update 3rdparty/FindPythonInterpreter git config submodule.3rdparty/tracy.url $srcdir/tracy git submodule update 3rdparty/tracy + git config submodule.3rdparty/gsl.url $srcdir/GSL + git submodule update 3rdparty/gsl } build() { @@ -66,10 +65,6 @@ build() { CMAKE_OPTS+=" -Dice:BOOL='OFF'" fi - if [[ ${_use_grpc} == "1" ]]; then - CMAKE_OPTS+=" -Dgrpc:BOOL='ON'" - fi - cmake -B build -S "${_gitname}" \ -DCMAKE_BUILD_TYPE=None \ -DCMAKE_INSTALL_PREFIX='/usr' \ @@ -101,8 +96,4 @@ package() { if [[ ${_use_zeroc_ice} == "1" ]]; then install -Dm644 src/murmur/Murmur.ice "${pkgdir}"/usr/share/murmur/Murmur.ice fi - - if [[ ${_use_grpc} == "1" ]]; then - install -Dm644 src/murmur/MurmurRPC.proto "${pkgdir}"/usr/share/murmur/MurmurRPC.proto - fi } |