- merged 3.0.0 from PLD

diff --git a/qemu.spec b/qemu.spec
index 6302a68095edf7dc5beb220b747243cf95940bab..61e8d3e45d0f96aa31d6d4f9aeb28d49b353084b 100644 (file)
--- a/qemu.spec
+++ b/qemu.spec
@@ -37,12 +37,12 @@
 Summary:       QEMU CPU Emulator
 Summary(pl.UTF-8):     QEMU - emulator procesora
 Name:          qemu
-Version:       2.12.1
+Version:       3.0.0
 Release:       1
 License:       GPL v2
 Group:         Applications/Emulators
 Source0:       http://wiki.qemu-project.org/download/%{name}-%{version}.tar.xz
-# Source0-md5: 6e830a88e36908d9563ed01131ce72ec
+# Source0-md5: 6a5c8df583406ea24ef25b239c3243e0
 # Loads kvm kernel modules at boot
 Source3:       kvm-modules-load.conf
 # Creates /dev/kvm
@@ -54,12 +54,11 @@ Source9:    ksmtuned
 Source10:      ksmtuned.conf
 Source12:      99-%{name}-guest-agent.rules
 Patch0:                %{name}-cflags.patch
-Patch1:                vgabios-widescreens.patch
-Patch2:                %{name}-whitelist.patch
-Patch3:                %{name}-user-execve.patch
-Patch4:                %{name}-xattr.patch
-Patch5:                libjpeg-boolean.patch
-Patch6:                x32.patch
+Patch1:                %{name}-whitelist.patch
+Patch2:                %{name}-user-execve.patch
+Patch3:                %{name}-xattr.patch
+Patch4:                libjpeg-boolean.patch
+Patch5:                x32.patch
 URL:           http://www.qemu-project.org/
 %{?with_gl:BuildRequires:      OpenGL-GLX-devel}
 %{?with_gl:BuildRequires:      OpenGL-devel}
@@ -839,7 +838,6 @@ Moduł QEMU dla urządeń blokowych typu 'ssh'.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6 -p1
 
 # workaround for conflict with alsa/error.h
 ln -s ../error.h qapi/error.h
@@ -939,9 +937,6 @@ build static \
 
 %endif
 
-# rebuild patched vesa tables with additional widescreen modes.
-%{__make} -C roms/vgabios stdvga-bios
-
 %{__cc} %{SOURCE7} %{rpmcflags} -o ksmctl
 
 %install
@@ -993,9 +988,6 @@ install -p %{SOURCE12} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d
 # packaged as %doc
 %{__rm} $RPM_BUILD_ROOT%{_docdir}/qemu/qemu-doc.html
 
-# install patched vesa tables with additional widescreen modes.
-cp -p roms/vgabios/VGABIOS-lgpl-latest.stdvga.bin $RPM_BUILD_ROOT%{_datadir}/%{name}/vgabios-stdvga.bin
-
 %if %{with system_seabios}
 ln -sf /usr/share/seabios/bios.bin $RPM_BUILD_ROOT%{_datadir}/%{name}/bios-256k.bin
 # bios.bin provided by qemu is stripped to 128k, with no Xen support, keep it

diff --git a/vgabios-widescreens.patch b/vgabios-widescreens.patch
deleted file mode 100644 (file)
index e46293f..0000000
--- a/vgabios-widescreens.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urp qemu-2.6.1.orig/roms/vgabios/vbetables-gen.c qemu-2.6.1/roms/vgabios/vbetables-gen.c
---- qemu-2.6.1.orig/roms/vgabios/vbetables-gen.c       2016-08-22 12:44:56.027554000 +0000
-+++ qemu-2.6.1/roms/vgabios/vbetables-gen.c    2016-08-22 12:45:15.194554000 +0000
-@@ -76,6 +76,8 @@ ModeInfo modes[] = {
- { 2560, 1600, 16                     , 0x18a},
- { 2560, 1600, 24                     , 0x18b},
- { 2560, 1600, 32                     , 0x18c},
-+{ 1600,  900, 24                     , 0x18d},
-+{ 1600, 1000, 24                     , 0x18e},
- { 0, },
- };
-