Skip to content

Commit 4d09296

Browse files
committed
jhbuild: add monado
Use jhbuild to build monado instead of pulling it from packages. Fixes #159
1 parent fbf6f38 commit 4d09296

File tree

2 files changed

+14
-8
lines changed

2 files changed

+14
-8
lines changed

images/wkdev_sdk/jhbuild/webkit-sdk-deps.modules

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<dep package="libbacktrace"/>
1616
<dep package="sysprof"/>
1717
<dep package="libspiel"/>
18+
<dep package="monado"/>
1819
</dependencies>
1920
</metamodule>
2021

@@ -24,8 +25,8 @@
2425
href="https://wpewebkit.org/releases/"/>
2526
<repository type="tarball" name="xmlsoft.org"
2627
href="http://xmlsoft.org"/>
27-
<repository type="git" name="gstreamer.freedesktop.org"
28-
href="https://gitlab.freedesktop.org/gstreamer"/>
28+
<repository type="git" name="freedesktop.org"
29+
href="https://gitlab.freedesktop.org/"/>
2930
<repository type="tarball" name="github-tarball"
3031
href="https://github.com/"/>
3132
<repository type="git" name="github.com"
@@ -106,9 +107,9 @@
106107
</meson>
107108

108109
<meson id="gstreamer" mesonargs="-Dlibnice=enabled -Dpython=enabled -Dintrospection=enabled -Dgst-plugins-bad:microdns=disabled -Dgst-plugins-bad:avtp=disabled -Dgst-examples=disabled -Dexamples=disabled -Dtests=disabled -Ddoc=disabled -Dgtk_doc=disabled -Dwebrtc=enabled -Dgst-plugins-ugly:gpl=enabled -Dgst-plugins-bad:gpl=enabled -Dgpl=enabled">
109-
<branch repo="gstreamer.freedesktop.org"
110+
<branch repo="freedesktop.org"
110111
checkoutdir="gstreamer"
111-
module="gstreamer.git"
112+
module="gstreamer/gstreamer.git"
112113
tag="1.26.4"/>
113114
<dependencies>
114115
<dep package="openh264"/>
@@ -127,8 +128,8 @@
127128
<dep package="dav1d"/>
128129
<dep package="gstreamer"/>
129130
</dependencies>
130-
<branch repo="gstreamer.freedesktop.org"
131-
module="gst-plugins-rs"
131+
<branch repo="freedesktop.org"
132+
module="gstreamer/gst-plugins-rs"
132133
tag="gstreamer-1.26.4" />
133134
</meson>
134135

@@ -153,6 +154,12 @@
153154
module="GNOME/libsoup.git" tag="3.6.0"/>
154155
</meson>
155156

157+
<cmake id="monado">
158+
<branch repo="freedesktop.org"
159+
checkoutdir="monado"
160+
module="monado/monado.git" tag="v25.0.0"/>
161+
</cmake>
162+
156163
<!-- Everything in this section is just for Epiphany. -->
157164
<systemmodule id="sassc">
158165
<branch repo="system"/>

images/wkdev_sdk/required_system_packages/04-devtools.lst

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,4 @@ libappstream-dev
2727
desktop-file-utils
2828

2929
# For OpenXR tests
30-
libopenxr1-monado
31-
monado-service
30+
libeigen3-dev glslang-tools libudev-dev libv4l-dev libvulkan-dev

0 commit comments

Comments
 (0)