libxrandr: update from 1.5.4 to 1.5.5

bgilbert · bgilbert · commit 41e42cd38d71 · 2026-02-08T11:55:26.000-08:00
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 &gt;= 1.1.0.
diff --git a/ci_config.json b/ci_config.json
@@ -932,11 +932,21 @@
     ]
   },
   "libxrandr": {
-    "_comment": "X11 needs a POSIX system",
+    "_comment": [
+      "X11 needs a POSIX system",
+      "https://gitlab.freedesktop.org/xorg/lib/libxrandr/-/merge_requests/11"
+    ],
     "build_on": {
       "msys2": false,
       "windows": false
-    }
+    },
+    "alpine_packages": [
+      "libx11-dev"
+    ],
+    "debian_packages": [
+      "libx11-dev"
+    ],
+    "ignore_upstream_meson": "1.5.5"
   },
   "libxrender": {
     "_comment": "X11 needs a POSIX system",
diff --git a/releases.json b/releases.json
@@ -2800,6 +2800,7 @@
       "xrandr"
     ],
     "versions": [
+      "1.5.5-1",
       "1.5.4-1",
       "1.5.2-1"
     ]
diff --git a/subprojects/libxrandr.wrap b/subprojects/libxrandr.wrap
@@ -1,9 +1,9 @@
 [wrap-file]
-directory = libXrandr-1.5.4
-source_url = https://xorg.freedesktop.org/releases/individual/lib/libXrandr-1.5.4.tar.xz
-source_filename = libXrandr-1.5.4.tar.xz
-source_hash = 1ad5b065375f4a85915aa60611cc6407c060492a214d7f9daf214be752c3b4d3
+directory = libXrandr-1.5.5
+source_url = https://xorg.freedesktop.org/releases/individual/lib/libXrandr-1.5.5.tar.xz
+source_filename = libXrandr-1.5.5.tar.xz
+source_hash = 72b922c2e765434e9e9f0960148070bd4504b288263e2868a4ccce1b7cf2767a
 patch_directory = libXrandr
 
 [provide]
-xrandr = xrandr_dep
+dependency_names = xrandr
diff --git a/subprojects/packagefiles/libXrandr/meson.build b/subprojects/packagefiles/libXrandr/meson.build
@@ -1,8 +1,10 @@
 project(
   'libxrandr',
   'c',
-  version: '1.5.4',
+  version: '1.5.5',
   default_options: ['warning_level=3'],
+  license: 'HPND-sell-variant',
+  meson_version: '>= 1.1.0',
 )
 
 incdirs = include_directories('include', 'include/X11/extensions')
@@ -28,7 +30,7 @@ xrandr = library(
 )
 
 xrandr_dep = declare_dependency(
-  dependencies: [xext_dep, xrender_dep],
   include_directories: incdirs,
   link_with: xrandr,
 )
+meson.override_dependency('xrandr', xrandr_dep)

Original file line number	Diff line number	Diff line change
`@@ -2800,6 +2800,7 @@`
`2800`	`2800`	`"xrandr"`
`2801`	`2801`	`],`
`2802`	`2802`	`"versions": [`
	`2803`	`+ "1.5.5-1",`
`2803`	`2804`	`"1.5.4-1",`
`2804`	`2805`	`"1.5.2-1"`
`2805`	`2806`	`]`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,10 @@`
`1`	`1`	`project(`
`2`	`2`	`'libxrandr',`
`3`	`3`	`'c',`
`4`		`- version: '1.5.4',`
	`4`	`+ version: '1.5.5',`
`5`	`5`	`default_options: ['warning_level=3'],`
	`6`	`+ license: 'HPND-sell-variant',`
	`7`	`+ meson_version: '>= 1.1.0',`
`6`	`8`	`)`
`7`	`9`
`8`	`10`	`incdirs = include_directories('include', 'include/X11/extensions')`
`@@ -28,7 +30,7 @@ xrandr = library(`
`28`	`30`	`)`
`29`	`31`
`30`	`32`	`xrandr_dep = declare_dependency(`
`31`		`- dependencies: [xext_dep, xrender_dep],`
`32`	`33`	`include_directories: incdirs,`
`33`	`34`	`link_with: xrandr,`
`34`	`35`	`)`
	`36`	`+meson.override_dependency('xrandr', xrandr_dep)`