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 configure-Simplify-fragile-libdrm-detection.patch: Fix detecting qxl_drm.h. (LP: #1967901) - - - - - 74d4b4c1 by Timo Aaltonen at 2022-04-06T10:23:51+03:00 release to sid - - - - - 3 changed files: - debian/changelog - + debian/patches/configure-Simplify-fragile-libdrm-detection.patch - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,10 @@ +xserver-xorg-video-qxl (0.1.5+git20200331-3) unstable; urgency=medium + + * configure-Simplify-fragile-libdrm-detection.patch: Fix detecting + qxl_drm.h. (LP: #1967901) + + -- Timo Aaltonen <[email protected]> Wed, 06 Apr 2022 10:23:41 +0300 + xserver-xorg-video-qxl (0.1.5+git20200331-2) unstable; urgency=medium * Fix build against xserver 21.1. (Closes: #1002143) ===================================== debian/patches/configure-Simplify-fragile-libdrm-detection.patch ===================================== @@ -0,0 +1,41 @@ +From 58b60cdad9fb201eb097777d6f1d17b5ccd9403a Mon Sep 17 00:00:00 2001 +From: Adam Jackson <[email protected]> +Date: Wed, 10 Feb 2021 14:49:48 -0500 +Subject: [PATCH] configure: Simplify fragile libdrm detection + +libdrm 2.4.46 always installs qxl_drm.h +--- + configure.ac | 8 +------- + 1 file changed, 1 insertion(+), 7 deletions(-) + +diff --git a/configure.ac b/configure.ac +index e367558..d3e5f50 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -76,11 +76,6 @@ AC_CHECK_DECL(XSERVER_LIBPCIACCESS, + [#include "xorg-server.h"]) + CFLAGS="$save_CFLAGS" + +-save_CFLAGS="$CFLAGS" +-CFLAGS="$XORG_CFLAGS" +-AC_CHECK_HEADER(qxl_drm.h,[QXL_DRM=yes],[QXL_DRM=no],[#include <stdint.h>]) +-CFLAGS="$save_CFLAGS" +- + AC_ARG_ENABLE(kms, + AS_HELP_STRING([--disable-kms], + [Disable KMS support [[default=enabled]]]), +@@ -88,10 +83,9 @@ AC_ARG_ENABLE(kms, + [DRM_MODE=yes]) + + # Checks for libraries. +-if test "x$QXL_DRM" = xyes && test "x$DRM_MODE" = xyes; then ++if test "x$DRM_MODE" = xyes; then + # require support for kms cursor hotspot + PKG_CHECK_MODULES(DRM, [libdrm >= 2.4.46]) +- + else + DRM_MODE=no + fi +-- +2.26.2 + ===================================== debian/patches/series ===================================== @@ -1,2 +1,3 @@ python3.diff Fix-a-build-error-with-Xorg-master.patch +configure-Simplify-fragile-libdrm-detection.patch View it on GitLab: https://salsa.debian.org/xorg-team/driver/xserver-xorg-video-qxl/-/compare/055fc23087ded3a0a48b991569ae769b7f58cbfa...74d4b4c1e5ca9b4a254252f9778fb589213de427 -- View it on GitLab: https://salsa.debian.org/xorg-team/driver/xserver-xorg-video-qxl/-/compare/055fc23087ded3a0a48b991569ae769b7f58cbfa...74d4b4c1e5ca9b4a254252f9778fb589213de427 You're receiving this email because of your account on salsa.debian.org.
