rpms/xorg-x11-drv-qxl
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Merged update from upstream sources

Browse Source 
This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/xorg-x11-drv-qxl.git#b332ffb57b044b23c27100ada07d2ab7c752986e
This commit is contained in:
DistroBaker 2021-02-11 17:05:40 +00:00
parent 67e166483b
commit c03231bf44
2 changed files with 47 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
0001-configure-Simplify-fragile-libdrm-detection.patch Normal file
View File

@ -0,0 +1,41 @@
From 58b60cdad9fb201eb097777d6f1d17b5ccd9403a Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
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

9
xorg-x11-drv-qxl.spec
View File

@ -24,7 +24,7 @@ Name: xorg-x11-drv-qxl
Version: 0.1.5
Release: 18%{?gver}%{?dist}
Release: 19%{?gver}%{?dist}
URL: http://www.x.org
Source0: http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
#Source0: %{tarball}-%{gitdate}.tar.bz2
@ -35,7 +35,8 @@ Patch4: 0004-Xspice-Fix-Python3-str-vs-bytes-confusion.patch
# This shebang patch is currently downstream-only
Patch5: 0005-Xspice-Adjust-shebang-to-explicitly-mention-python3.patch
Patch6: 0006-qxl-call-provider-init.patch
# https://gitlab.freedesktop.org/xorg/driver/xf86-video-qxl/-/merge_requests/5
Patch7: 0001-configure-Simplify-fragile-libdrm-detection.patch
License: MIT
@ -86,7 +87,6 @@ autoreconf -ivf
%configure --disable-static %{?enable_xspice}
make %{?_smp_mflags}
%install
make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
@ -122,6 +122,9 @@ rm -f $RPM_BUILD_ROOT%{_sysconfdir}/X11/spiceqxl.xorg.conf
%changelog
* Wed Feb 10 2021 Adam Jackson <ajax@redhat.com> - 0.1.5-19
- Fix a configure bug that would disable KMS support
* Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.5-18
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild