Timo Aaltonen pushed to branch debian-unstable at X Strike Force / driver / xserver-xorg-video-qxl
Commits:
-
1e7516f7
by Timo Aaltonen at 2022-04-06T10:21:37+03:00
-
74d4b4c1
by Timo Aaltonen at 2022-04-06T10:23:51+03:00
3 changed files:
- debian/changelog
- + debian/patches/configure-Simplify-fragile-libdrm-detection.patch
- debian/patches/series
Changes:
| 1 | +xserver-xorg-video-qxl (0.1.5+git20200331-3) unstable; urgency=medium
|
|
| 2 | + |
|
| 3 | + * configure-Simplify-fragile-libdrm-detection.patch: Fix detecting
|
|
| 4 | + qxl_drm.h. (LP: #1967901)
|
|
| 5 | + |
|
| 6 | + -- Timo Aaltonen <tjaalton@debian.org> Wed, 06 Apr 2022 10:23:41 +0300
|
|
| 7 | + |
|
| 1 | 8 | xserver-xorg-video-qxl (0.1.5+git20200331-2) unstable; urgency=medium
|
| 2 | 9 | |
| 3 | 10 | * Fix build against xserver 21.1. (Closes: #1002143)
|
| 1 | +From 58b60cdad9fb201eb097777d6f1d17b5ccd9403a Mon Sep 17 00:00:00 2001
|
|
| 2 | +From: Adam Jackson <ajax@redhat.com>
|
|
| 3 | +Date: Wed, 10 Feb 2021 14:49:48 -0500
|
|
| 4 | +Subject: [PATCH] configure: Simplify fragile libdrm detection
|
|
| 5 | + |
|
| 6 | +libdrm 2.4.46 always installs qxl_drm.h
|
|
| 7 | +---
|
|
| 8 | + configure.ac | 8 +-------
|
|
| 9 | + 1 file changed, 1 insertion(+), 7 deletions(-)
|
|
| 10 | + |
|
| 11 | +diff --git a/configure.ac b/configure.ac
|
|
| 12 | +index e367558..d3e5f50 100644
|
|
| 13 | +--- a/configure.ac
|
|
| 14 | ++++ b/configure.ac
|
|
| 15 | +@@ -76,11 +76,6 @@ AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
|
|
| 16 | + [#include "xorg-server.h"])
|
|
| 17 | + CFLAGS="$save_CFLAGS"
|
|
| 18 | +
|
|
| 19 | +-save_CFLAGS="$CFLAGS"
|
|
| 20 | +-CFLAGS="$XORG_CFLAGS"
|
|
| 21 | +-AC_CHECK_HEADER(qxl_drm.h,[QXL_DRM=yes],[QXL_DRM=no],[#include <stdint.h>])
|
|
| 22 | +-CFLAGS="$save_CFLAGS"
|
|
| 23 | +-
|
|
| 24 | + AC_ARG_ENABLE(kms,
|
|
| 25 | + AS_HELP_STRING([--disable-kms],
|
|
| 26 | + [Disable KMS support [[default=enabled]]]),
|
|
| 27 | +@@ -88,10 +83,9 @@ AC_ARG_ENABLE(kms,
|
|
| 28 | + [DRM_MODE=yes])
|
|
| 29 | +
|
|
| 30 | + # Checks for libraries.
|
|
| 31 | +-if test "x$QXL_DRM" = xyes && test "x$DRM_MODE" = xyes; then
|
|
| 32 | ++if test "x$DRM_MODE" = xyes; then
|
|
| 33 | + # require support for kms cursor hotspot
|
|
| 34 | + PKG_CHECK_MODULES(DRM, [libdrm >= 2.4.46])
|
|
| 35 | +-
|
|
| 36 | + else
|
|
| 37 | + DRM_MODE=no
|
|
| 38 | + fi
|
|
| 39 | +--
|
|
| 40 | +2.26.2
|
|
| 41 | + |
| 1 | 1 | python3.diff
|
| 2 | 2 | Fix-a-build-error-with-Xorg-master.patch
|
| 3 | +configure-Simplify-fragile-libdrm-detection.patch |