Skip to content

Commit 350c1fb

Browse files
committed
libxxf86vm: update from 1.1.6 to 1.1.7
Continue using the downstream meson.build until upstream adds a declare_dependency(). However, upstream ships a meson.options file and CI thinks we use it, so require Meson >= 1.1.0.
1 parent 6b9454e commit 350c1fb

File tree

4 files changed

+16
-9
lines changed

4 files changed

+16
-9
lines changed

ci_config.json

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -965,7 +965,10 @@
965965
]
966966
},
967967
"libxxf86vm": {
968-
"_comment": "X11 needs a POSIX system",
968+
"_comment": [
969+
"X11 needs a POSIX system",
970+
"https://gitlab.freedesktop.org/xorg/lib/libxxf86vm/-/merge_requests/13"
971+
],
969972
"build_on": {
970973
"msys2": false,
971974
"windows": false
@@ -975,7 +978,8 @@
975978
],
976979
"debian_packages": [
977980
"libx11-dev"
978-
]
981+
],
982+
"ignore_upstream_meson": "1.1.7"
979983
},
980984
"lmdb": {
981985
"_comment": "Tests are disabled by default",

releases.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2851,6 +2851,7 @@
28512851
"xxf86vm"
28522852
],
28532853
"versions": [
2854+
"1.1.7-1",
28542855
"1.1.6-1",
28552856
"1.1.4-1"
28562857
]

subprojects/libxxf86vm.wrap

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
[wrap-file]
2-
directory = libXxf86vm-1.1.6
3-
source_url = https://xorg.freedesktop.org/releases/individual/lib/libXxf86vm-1.1.6.tar.xz
4-
source_filename = libXxf86vm-1.1.6.tar.xz
5-
source_hash = 96af414c73ce1d5449ad04be7f9f27fa8330f844b6dda843ef22e3e1befb3ee3
2+
directory = libXxf86vm-1.1.7
3+
source_url = https://xorg.freedesktop.org/releases/individual/lib/libXxf86vm-1.1.7.tar.xz
4+
source_filename = libXxf86vm-1.1.7.tar.xz
5+
source_hash = ae50c0f669e0af5a67cc4cd0f54f21d64a64d2660af883e80e95d3fe51b945d8
66
patch_directory = libXxf86vm
77

88
[provide]
9-
xxf86vm = xxf86vm_dep
9+
dependency_names = xxf86vm

subprojects/packagefiles/libXxf86vm/meson.build

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
project(
22
'libXxf86vm',
33
'c',
4-
version: '1.1.6',
4+
version: '1.1.7',
5+
license: 'X11',
6+
meson_version: '>= 1.1.0',
57
)
68

79
if host_machine.system() == 'windows'
@@ -22,7 +24,7 @@ xxf86vm = library(
2224
)
2325

2426
xxf86vm_dep = declare_dependency(
25-
dependencies: [x11_dep, xext_dep],
2627
include_directories: incdirs,
2728
link_with: xxf86vm,
2829
)
30+
meson.override_dependency('xxf86vm', xxf86vm_dep)

0 commit comments

Comments
 (0)