From 3ddf92ad0215245dcbb87430cfdd57e00b7c4368 Mon Sep 17 00:00:00 2001 From: Shawn Anastasio Date: Fri, 5 Feb 2021 21:38:03 -0600 Subject: [PATCH 1/2] HACK: DONTMERGE: Allow building (not usable) with BACKEND_VMM=kvm --- rpm_spec/gui-agent.spec.in | 3 +++ xf86-video-dummy/src/dummy.h | 4 ++-- xf86-video-dummy/src/dummy_driver.c | 4 ++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/rpm_spec/gui-agent.spec.in b/rpm_spec/gui-agent.spec.in index d3b56090..93e2606a 100644 --- a/rpm_spec/gui-agent.spec.in +++ b/rpm_spec/gui-agent.spec.in @@ -38,6 +38,7 @@ URL: http://www.qubes-os.org %define pa_ver_full %((pkg-config --modversion libpulse 2>/dev/null || echo 0.0) | cut -d "-" -f 1) %define pa_ver_major_minor %((pkg-config --modversion libpulse 2>/dev/null || echo 0.0) | cut -d "-" -f 1 | cut -d "." -f 1,2) +%define backend_vmm @BACKEND_VMM@ BuildRequires: gcc BuildRequires: libX11-devel @@ -52,7 +53,9 @@ BuildRequires: pam-devel BuildRequires: qubes-libvchan-devel BuildRequires: qubes-gui-common-devel >= 4.1.0 BuildRequires: qubes-db-devel +%if x%{?backend_vmm} == xxen BuildRequires: xen-devel +%endif Requires: Xorg %(xserver-sdk-abi-requires ansic) Requires: Xorg %(xserver-sdk-abi-requires videodrv) Requires: libXfixes diff --git a/xf86-video-dummy/src/dummy.h b/xf86-video-dummy/src/dummy.h index 336118d4..764498d6 100644 --- a/xf86-video-dummy/src/dummy.h +++ b/xf86-video-dummy/src/dummy.h @@ -13,7 +13,7 @@ #include "compat-api.h" -#include +//#include #include "../../xf86-qubes-common/include/xf86-qubes-common.h" #define DUMMY_MAX_SCREENS 16 @@ -86,7 +86,7 @@ typedef struct dummyRec Bool (*CreateWindow)() ; /* wrapped CreateWindow */ Bool prop; - xengntshr_handle *xgs; + //xengntshr_handle *xgs; uint32_t gui_domid; } DUMMYRec, *DUMMYPtr; diff --git a/xf86-video-dummy/src/dummy_driver.c b/xf86-video-dummy/src/dummy_driver.c index e9a950ca..e37845a1 100644 --- a/xf86-video-dummy/src/dummy_driver.c +++ b/xf86-video-dummy/src/dummy_driver.c @@ -3,6 +3,8 @@ * Copyright 2002, SuSE Linux AG, Author: Egbert Eich */ +#if 0 + #ifdef HAVE_CONFIG_H #include "config.h" #endif @@ -1283,3 +1285,5 @@ dummyDriverFunc(ScrnInfoPtr pScrn, xorgDriverFuncOp op, pointer ptr) return FALSE; } } + +#endif From 137107e865a1750fcca09a47cbd4984a5fcafbb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Pierret=20=28fepitre=29?= Date: Sun, 21 Nov 2021 11:14:52 +0100 Subject: [PATCH 2/2] spec: update backend_vmm equal checks --- rpm_spec/gui-agent.spec.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpm_spec/gui-agent.spec.in b/rpm_spec/gui-agent.spec.in index 93e2606a..534b906a 100644 --- a/rpm_spec/gui-agent.spec.in +++ b/rpm_spec/gui-agent.spec.in @@ -53,7 +53,7 @@ BuildRequires: pam-devel BuildRequires: qubes-libvchan-devel BuildRequires: qubes-gui-common-devel >= 4.1.0 BuildRequires: qubes-db-devel -%if x%{?backend_vmm} == xxen +%if "%{?backend_vmm}" == "xen" BuildRequires: xen-devel %endif Requires: Xorg %(xserver-sdk-abi-requires ansic)