Bug#1035688: unblock: xorg-server/2:21.1.7-3

[Cyril Brulebois <kibi@debian.org>]

Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
X-Debbugs-Cc: debian-x@lists.debian.org, debian-boot@lists.debian.org, Keith Toh <ktprograms@gmail.com>
Control: affects -1 src:xorg-server

Hi,

[ Reason ]
We'd like to get modesetting_drv.so back into the udeb, which is helpful
to get a working graphical installer in some hypervisor setups (at
least). It was present in bullseye, but got dropped at the very
beginning of the bookworm release cycle, as a side-effect of build
system changes upstream.

For context, that's the one video driver that's shipped directly into
xserver-xorg-core, while other drivers are shipped in their own
xserver-xorg-video-*. We'd like to get back to this situation on the
udeb side as well.

[ Impact ]
Losing graphical installer support in some cases.

[ Tests ]
Keith, the bug submitter, tested this change with custom-built d-i
images (on two architectures, amd64 and arm64) before it was submitted
to the X team, who ACK'd it. We have a bunch of tests running inside KVM
and friends, confirming having both modesetting_drv.so and fbdev_drv.so
(the latter being shipped in its own udeb) is working fine.

(Keith X-D-Cc'd to let them know what happens during a freeze.)

[ Risks ]
The X server is a critical package, but the only change is a configure
flag for the udeb only (there are two separate builds)

[ Checklist ]
  [x] all changes are documented in the d/changelog
  [x] I reviewed all changes and I approve them
  [x] attach debdiff against the package in testing


Thanks for your time!


unblock xorg-server/2:21.1.7-3


Cheers,
-- 
Cyril Brulebois (kibi@debian.org)            <https://debamax.com/>
D-I release manager -- Release team member -- Freelance Consultant

diff -u xorg-server-21.1.7/debian/changelog xorg-server-21.1.7/debian/changelog
--- xorg-server-21.1.7/debian/changelog
+++ xorg-server-21.1.7/debian/changelog
@@ -1,3 +1,12 @@
+xorg-server (2:21.1.7-3) unstable; urgency=medium
+
+  * Enable DRI2 for the udeb build, needed in addition to DRM support
+    since 9c81b8f5b5 to build the modesetting driver. This fixes failures
+    to start X in the graphical installer under UTM (Closes: #1035014).
+    Thanks to Keith Toh for the report and the follow-up tests!
+
+ -- Cyril Brulebois <kibi@debian.org>  Wed, 03 May 2023 03:41:41 +0200
+
 xorg-server (2:21.1.7-2) unstable; urgency=high
 
   * composite: Fix use-after-free of the COW
diff -u xorg-server-21.1.7/debian/rules.flags xorg-server-21.1.7/debian/rules.flags
--- xorg-server-21.1.7/debian/rules.flags
+++ xorg-server-21.1.7/debian/rules.flags
@@ -75,7 +75,7 @@
 	--disable-xdm-auth-1 \
 	--disable-glx \
 	--disable-dri \
-	--disable-dri2 \
+	--enable-dri2 \
 	--disable-glamor \
 	--disable-xinerama \
 	--disable-xf86vidmode \