summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Baumann <mail@andreasbaumann.cc>2022-03-05 19:36:24 +0100
committerAndreas Baumann <mail@andreasbaumann.cc>2022-03-05 19:36:24 +0100
commitcb47279ec29d9f5e63ed29000be3c240dc8480a3 (patch)
treeb9216d5adebd9550554d477e8f06f8d365671a60
parent6732105cce273532c783727f4a93bab2d012e935 (diff)
downloadpackages-cb47279ec29d9f5e63ed29000be3c240dc8480a3.tar.xz
extra/xorg-server: patch for NULL in probed mode->names
-rw-r--r--extra/xorg-server/PKGBUILD14
-rw-r--r--extra/xorg-server/xorg-server-21.1.3-probed-mode-name-not-null.patch18
2 files changed, 32 insertions, 0 deletions
diff --git a/extra/xorg-server/PKGBUILD b/extra/xorg-server/PKGBUILD
new file mode 100644
index 00000000..1729fb17
--- /dev/null
+++ b/extra/xorg-server/PKGBUILD
@@ -0,0 +1,14 @@
+# backport of ed11c4d443ad2e82512df64358d38008e0ee7693 for initializing probed mode line names
+source+=('xorg-server-21.1.3-probed-mode-name-not-null.patch')
+sha512sums+=('d721fad70b417b40f6b29e77b21c530b8f6d91c37e65c1a82c2cfcde5012adc17022ac0faa50ca587583aab6f6a5e5bdcdc68e36ece6ada766813aca1ab8b76d')
+
+eval "$(
+ {
+ declare -f prepare || \
+ printf 'prepare() {\n}\n'
+ } \
+ | sed '
+ $i cd "$srcdir/$pkgname-$pkgver" \
+ patch -Np1 -i "$srcdir/xorg-server-21.1.3-probed-mode-name-not-null.patch"
+ '
+)"
diff --git a/extra/xorg-server/xorg-server-21.1.3-probed-mode-name-not-null.patch b/extra/xorg-server/xorg-server-21.1.3-probed-mode-name-not-null.patch
new file mode 100644
index 00000000..77d5de33
--- /dev/null
+++ b/extra/xorg-server/xorg-server-21.1.3-probed-mode-name-not-null.patch
@@ -0,0 +1,18 @@
+diff -rauN xorg-server-21.1.3/hw/xfree86/modes/xf86Modes.c xorg-server-21.1.3-probed-mode-name-not-null-patch/hw/xfree86/modes/xf86Modes.c
+--- xorg-server-21.1.3/hw/xfree86/modes/xf86Modes.c 2022-03-05 19:16:34.732713684 +0100
++++ xorg-server-21.1.3-probed-mode-name-not-null-patch/hw/xfree86/modes/xf86Modes.c 2022-03-05 19:17:39.749449014 +0100
+@@ -803,10 +803,14 @@
+ {
+ struct libxcvt_mode_info *libxcvt_mode_info;
+ DisplayModeRec *Mode = xnfcalloc(1, sizeof(DisplayModeRec));
++ char *tmp;
+
+ libxcvt_mode_info =
+ libxcvt_gen_mode_info(HDisplay, VDisplay, VRefresh, Reduced, Interlaced);
+
++ XNFasprintf(&tmp, "%dx%d", HDisplay, VDisplay);
++ Mode->name = tmp;
++
+ Mode->VDisplay = libxcvt_mode_info->vdisplay;
+ Mode->HDisplay = libxcvt_mode_info->hdisplay;
+ Mode->Clock = libxcvt_mode_info->dot_clock;