rpms
/
qemu
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into f24

This commit is contained in:
Cole Robinson 2016-04-22 09:14:45 -04:00
parent bd8b34f6e4 b0b55fdca8
commit a10f883040
3 changed files with 42 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
0001-spice-F24-spice-has-backported-gl-support.patch Normal file
View File

@ -0,0 +1,30 @@
From ce63c44a0e88db0ff6ea7eceb5ac56139b93ad89 Mon Sep 17 00:00:00 2001
Message-Id: <ce63c44a0e88db0ff6ea7eceb5ac56139b93ad89.1461326482.git.crobinso@redhat.com>
From: Pavel Grunt <pgrunt@redhat.com>
Date: Fri, 11 Mar 2016 14:40:59 +0100
Subject: [PATCH] spice: F24 spice has backported gl support
Not for upstream, this just adjusts the version check to work with
f24 backported spice gl support
Signed-off-by: Cole Robinson <crobinso@redhat.com>
---
include/ui/spice-display.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/ui/spice-display.h b/include/ui/spice-display.h
index 30ccfe3..00e4a0b 100644
--- a/include/ui/spice-display.h
+++ b/include/ui/spice-display.h
@@ -25,7 +25,7 @@
#include "sysemu/sysemu.h"
#if defined(CONFIG_OPENGL_DMABUF)
-# if SPICE_SERVER_VERSION >= 0x000d01 /* release 0.13.1 */
+# if SPICE_SERVER_VERSION >= 0x000c07 /* release 0.12.7 */
# define HAVE_SPICE_GL 1
# include "ui/egl-helpers.h"
# include "ui/egl-context.h"
--
2.7.3

13
qemu.spec
View File

@ -39,7 +39,7 @@
%endif
# Release candidate version tracking
%global rcver rc2
%global rcver rc3
%if 0%{?rcver:1}
%global rcstr -%{rcver}
%endif
@ -80,6 +80,10 @@ Source20: kvm.conf
# /etc/sysctl.d/50-kvm-s390x.conf
Source21: 50-kvm-s390x.conf
# Adjust spice gl version check to expect F24 backported version
# Not for upstream, f24 only
Patch0001: 0001-spice-F24-spice-has-backported-gl-support.patch
BuildRequires: SDL2-devel
BuildRequires: zlib-devel
@ -658,7 +662,7 @@ install -m 0644 %{_sourcedir}/99-qemu-guest-agent.rules %{buildroot}%{_udevdir}
%ifarch s390x
install -d %{buildroot}%{_sysconfdir}/sysctl.d
install -m 0644 %{_sourcedir}/50-kvm-s390.conf %{buildroot}%{_sysconfdir}/sysctl.d
install -m 0644 %{_sourcedir}/50-kvm-s390x.conf %{buildroot}%{_sysconfdir}/sysctl.d
%endif
@ -1188,6 +1192,11 @@ getent passwd qemu >/dev/null || \
%changelog
* Mon Apr 18 2016 Cole Robinson <crobinso@redhat.com> 2:2.6.0-0.1.rc3
- Rebased to version 2.6.0-rc3
- Fix s390 sysctl file install (bz 1327870)
- Adjust spice gl version check to expect F24 backported version
* Thu Apr 14 2016 Cole Robinson <crobinso@redhat.com> 2:2.6.0-0.1.rc2
- Rebased to version 2.6.0-rc2
- Fix GL deps (bz 1325966)

2
sources
View File

@ -1 +1 @@
0c07d181f4fafcc651570b922881db88 qemu-2.6.0-rc2.tar.bz2
12b7fea35ec80d7486f303fab15e47c9 qemu-2.6.0-rc3.tar.bz2