summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Bermond2022-08-02 19:45:45 -0300
committerDaniel Bermond2022-08-02 19:45:45 -0300
commit7873f1295210b107ad09f6b9f78a9cdfa15fe265 (patch)
tree97a6b3d2428cc6c392dafd3933bef13518ddaf76
parent89b23908e54de4bd5dc971abc3c68a2db88f06a7 (diff)
downloadaur-7873f1295210b107ad09f6b9f78a9cdfa15fe265.tar.gz
Build fixes
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD20
2 files changed, 24 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 84317f9da18..17e85330626 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = monado
pkgdesc = An open source OpenXR runtime
pkgver = 21.0.0
- pkgrel = 1
+ pkgrel = 2
url = https://monado.dev/
arch = x86_64
license = Boost
@@ -32,9 +32,16 @@ pkgbase = monado
makedepends = systemd-libs
makedepends = vulkan-icd-loader
makedepends = wayland
+ makedepends = wayland-protocols
makedepends = zlib
source = https://gitlab.freedesktop.org/monado/monado/-/archive/v21.0.0/monado-v21.0.0.tar.bz2
+ source = 010-monado-meson-0.61.0-fix.patch::https://gitlab.freedesktop.org/monado/monado/-/commit/cce20942901211a6820654c31ce86d4bd06ab597.patch
+ source = 020-monado-gcc-10-fix-part001.patch::https://gitlab.freedesktop.org/monado/monado/-/commit/1a556740d5ba79af8f5e72d7145ab62b8867db0b.patch
+ source = 030-monado-gcc-10-fix-part002.patch::https://gitlab.freedesktop.org/monado/monado/-/commit/a0c8cc14f52f1b922c9c4fd1272652e01e130282.patch
sha256sums = 7849ef4123afef14ca401aa5f9b8923144bb6bc707fe35817a288285d4990458
+ sha256sums = 902de0126f2279800acb9bff8a6db9e59932d4eaf8a5a7dcf3e6631a6aa00347
+ sha256sums = 690fbd3f1d8e2f8b71924fc22dbfefe663dfa931741562033a9bcec5d2bb83b7
+ sha256sums = b1b430610995654ecfd8ea23d27543ba1e716076699fbc2eaf1fb622f111cf3e
pkgname = monado
install = monado.install
@@ -63,4 +70,3 @@ pkgname = monado
pkgname = monado-doc
pkgdesc = An open source OpenXR runtime (documentation)
arch = any
-
diff --git a/PKGBUILD b/PKGBUILD
index 59b4facdb13..5258ab8a07d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
pkgbase=monado
pkgname=('monado' 'monado-doc')
pkgver=21.0.0
-pkgrel=1
+pkgrel=2
pkgdesc='An open source OpenXR runtime'
arch=('x86_64')
url='https://monado.dev/'
@@ -13,9 +13,21 @@ makedepends=('git' 'meson' 'doxygen' 'eigen' 'glslang' 'qt5-base' 'v4l-utils'
'dbus' 'glib2' 'gstreamer' 'gst-plugins-base-libs' 'hidapi' 'libgl'
'libjpeg-turbo' 'librealsense' 'libsurvive' 'libusb' 'libuvc' 'libx11'
'libxcb' 'opencv' 'openhmd' 'sdl2' 'systemd-libs' 'vulkan-icd-loader'
- 'wayland' 'zlib')
-source=("https://gitlab.freedesktop.org/monado/monado/-/archive/v${pkgver}/${pkgname}-v${pkgver}.tar.bz2")
-sha256sums=('7849ef4123afef14ca401aa5f9b8923144bb6bc707fe35817a288285d4990458')
+ 'wayland' 'wayland-protocols' 'zlib')
+source=("https://gitlab.freedesktop.org/monado/monado/-/archive/v${pkgver}/${pkgname}-v${pkgver}.tar.bz2"
+ '010-monado-meson-0.61.0-fix.patch'::'https://gitlab.freedesktop.org/monado/monado/-/commit/cce20942901211a6820654c31ce86d4bd06ab597.patch'
+ '020-monado-gcc-10-fix-part001.patch'::'https://gitlab.freedesktop.org/monado/monado/-/commit/1a556740d5ba79af8f5e72d7145ab62b8867db0b.patch'
+ '030-monado-gcc-10-fix-part002.patch'::'https://gitlab.freedesktop.org/monado/monado/-/commit/a0c8cc14f52f1b922c9c4fd1272652e01e130282.patch')
+sha256sums=('7849ef4123afef14ca401aa5f9b8923144bb6bc707fe35817a288285d4990458'
+ '902de0126f2279800acb9bff8a6db9e59932d4eaf8a5a7dcf3e6631a6aa00347'
+ '690fbd3f1d8e2f8b71924fc22dbfefe663dfa931741562033a9bcec5d2bb83b7'
+ 'b1b430610995654ecfd8ea23d27543ba1e716076699fbc2eaf1fb622f111cf3e')
+
+prepare() {
+ patch -d "${pkgname}-v${pkgver}" -Np1 -i "${srcdir}/010-monado-meson-0.61.0-fix.patch"
+ patch -d "${pkgname}-v${pkgver}" -Np1 -i "${srcdir}/020-monado-gcc-10-fix-part001.patch"
+ patch -d "${pkgname}-v${pkgver}" -Np1 -i "${srcdir}/030-monado-gcc-10-fix-part002.patch"
+}
build() {
arch-meson -Dinstall-active-runtime='false' build "${pkgname}-v${pkgver}"