- updated to 1.5.0 (nfy); 1.4.x left on qemu-1.4 branch

diff --git a/qemu-system-libcacard.patch b/qemu-system-libcacard.patch
index 713bb264b54bd3e157a0cfbbf26db3127ad89d95..c20dea5c9f4b85ca201c6e73bb340dfaa5003c5c 100644 (file)
--- a/qemu-system-libcacard.patch
+++ b/qemu-system-libcacard.patch
@@ -38,18 +38,6 @@
  fi
  
  if test "$usb_redir" = "yes" ; then
-diff -ur qemu-kvm-1.2.0/hw/ccid-card-passthru.c qemu-kvm-1.2.0-system-libcacard/hw/ccid-card-passthru.c
---- qemu-kvm-1.2.0/hw/ccid-card-passthru.c     2012-09-06 10:31:27.000000000 +0200
-+++ qemu-kvm-1.2.0-system-libcacard/hw/ccid-card-passthru.c    2012-11-09 07:44:11.286748135 +0100
-@@ -12,7 +12,7 @@
- #include "qemu_socket.h"
- #include "monitor.h"
- #include "hw/ccid.h"
--#include "libcacard/vscard_common.h"
-+#include <cacard/vscard_common.h>
- 
- #define DPRINTF(card, lvl, fmt, ...)                    \
- do {                                                    \
 --- qemu-1.3.0/Makefile.orig   2012-12-03 20:37:05.000000000 +0100
 +++ qemu-1.3.0/Makefile        2012-12-16 11:08:58.001201236 +0100
 @@ -111,9 +111,6 @@
@@ -62,31 +50,3 @@ diff -ur qemu-kvm-1.2.0/hw/ccid-card-passthru.c qemu-kvm-1.2.0-system-libcacard/
  
  all: $(DOCS) $(TOOLS) $(HELPERS-y) recurse-all
  
-diff -ur qemu-kvm-1.2.0/Makefile.objs qemu-kvm-1.2.0-system-libcacard/Makefile.objs
---- qemu-kvm-1.2.0/Makefile.objs       2012-09-06 10:31:27.000000000 +0200
-+++ qemu-kvm-1.2.0-system-libcacard/Makefile.objs      2012-11-09 07:45:10.880079366 +0100
-@@ -34,15 +34,6 @@
- endif
- 
- ######################################################################
--# smartcard
--
--libcacard-y += libcacard/cac.o libcacard/event.o
--libcacard-y += libcacard/vcard.o libcacard/vreader.o
--libcacard-y += libcacard/vcard_emul_nss.o
--libcacard-y += libcacard/vcard_emul_type.o
--libcacard-y += libcacard/card_7816.o
--
--######################################################################
- # Target independent part of system emulation. The long term path is to
- # suppress *all* target specific code in case of system emulation, i.e. a
- # single QEMU executable should support all CPUs and machines.
-@@ -81,8 +72,6 @@
- 
- common-obj-$(CONFIG_SECCOMP) += qemu-seccomp.o
- 
--common-obj-$(CONFIG_SMARTCARD_NSS) += $(libcacard-y)
--
- ######################################################################
- # qapi
- 

diff --git a/qemu.spec b/qemu.spec
index ed8ff37df9f81831f383f0891fc6a15a20e35875..ad78dac4b026fc417b28e23208adb5aa4eeaaf69 100644 (file)
--- a/qemu.spec
+++ b/qemu.spec
@@ -10,7 +10,7 @@
 #
 # Conditional build:
 %bcond_without sdl             # SDL UI and audio support
-%bcond_without opengl          # OpenGL support
+%bcond_without glx             # OpenGL support
 %bcond_without ceph            # Ceph/RBD support
 %bcond_with    glusterfs       # GlusterFS backend
 %bcond_without spice           # SPICE support
@@ -22,12 +22,12 @@
 Summary:       QEMU CPU Emulator
 Summary(pl.UTF-8):     QEMU - emulator procesora
 Name:          qemu
-Version:       1.4.1
-Release:       1
+Version:       1.5.0
+Release:       0.1
 License:       GPL v2+
 Group:         Applications/Emulators
 Source0:       http://wiki.qemu-project.org/download/%{name}-%{version}.tar.bz2
-# Source0-md5: eb2d696956324722b5ecfa46e41f9a75
+# Source0-md5: b6f3265b8ed39d77e8f354f35cc26e16
 Patch0:                %{name}-cflags.patch
 Patch1:                vgabios-widescreens.patch
 Patch2:                %{name}-whitelist.patch
@@ -509,7 +509,7 @@ ln -s ../error.h qapi/error.h
        %{__enable_disable glusterfs} \
        --enable-libiscsi \
        --enable-mixemu \
-       %{__enable_disable opengl} \
+       %{__enable_disable glx} \
        %{__enable_disable ceph rbd} \
        %{__enable_disable sdl} \
        --enable-seccomp \
@@ -524,7 +524,6 @@ ln -s ../error.h qapi/error.h
        --enable-vnc-sasl \
        --enable-vnc-tls \
        %{__enable_disable xen} \
-       --audio-card-list="ac97,es1370,sb16,cs4231a,adlib,gus,hda" \
        --audio-drv-list="alsa%{?with_iss:,oss}%{?with_sdl:,sdl}%{?with_esd:,esd}%{?with_pulseaudio:,pa}" \
        --interp-prefix=%{_libdir}/qemu/lib-%%M
 # note: CONFIG_QEMU_HELPERDIR is used when compiling, libexecdir when installing;