From f857b70856227c848bfdee2a2b2343ad2f7b6414a986dc7d70441c702db2be35 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Thu, 16 Apr 2009 00:19:01 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/qemu?expand=0&rev=30 --- qemu-cvs-alsa_ioctl.patch | 45 ++++++++++++++++++++++----------------- qemu.changes | 5 +++++ qemu.spec | 6 ++++-- 3 files changed, 34 insertions(+), 22 deletions(-) diff --git a/qemu-cvs-alsa_ioctl.patch b/qemu-cvs-alsa_ioctl.patch index ef73fba1..bdd7d339 100644 --- a/qemu-cvs-alsa_ioctl.patch +++ b/qemu-cvs-alsa_ioctl.patch @@ -1,18 +1,19 @@ Index: qemu/linux-user/ioctls.h ================================================================================ ---- qemu/linux-user/ioctls.h -+++ qemu/linux-user/ioctls.h -@@ -300,3 +300,8 @@ - - IOCTL(VFAT_IOCTL_READDIR_BOTH, IOC_R, MK_PTR(MK_ARRAY(MK_STRUCT(STRUCT_dirent), 2))) - IOCTL(VFAT_IOCTL_READDIR_SHORT, IOC_R, MK_PTR(MK_ARRAY(MK_STRUCT(STRUCT_dirent), 2))) +--- qemu-0.10.1/linux-user/ioctls.h ++++ qemu-0.10.1/linux-user/ioctls.h +@@ -314,3 +314,9 @@ + IOCTL(MTIOCTOP, IOC_W, MK_PTR(MK_STRUCT(STRUCT_mtop))) + IOCTL(MTIOCGET, IOC_R, MK_PTR(MK_STRUCT(STRUCT_mtget))) + IOCTL(MTIOCPOS, IOC_R, MK_PTR(MK_STRUCT(STRUCT_mtpos))) + +/* FIXME: including these on x86 / x86_64 breaks qemu-i386 */ +#ifdef __powerpc__ +#include "ioctls_alsa.h" +#endif ---- qemu/linux-user/ioctls_alsa.h -+++ qemu/linux-user/ioctls_alsa.h ++ +--- qemu-0.10.1/linux-user/ioctls_alsa.h ++++ qemu-0.10.1/linux-user/ioctls_alsa.h @@ -0,0 +1,467 @@ +#define SNDRV_SEQ_IOCTL_PVERSION _IOR ('S', 0x00, int) +#define SNDRV_SEQ_IOCTL_CLIENT_ID _IOR ('S', 0x01, int) @@ -481,8 +482,8 @@ Index: qemu/linux-user/ioctls.h +IOCTL( SNDRV_SB_CSP_IOCTL_RESTART , 0, TYPE_NULL ) +IOCTL( SND_SSCAPE_LOAD_BOOTB , IOC_RW, MK_PTR(MK_STRUCT(STRUCT_sscape_bootblock)) ) +IOCTL( SND_SSCAPE_LOAD_MCODE , IOC_W, MK_PTR(MK_STRUCT(STRUCT_sscape_microcode)) ) ---- qemu/linux-user/ioctls_alsa_structs.h -+++ qemu/linux-user/ioctls_alsa_structs.h +--- qemu-0.10.1/linux-user/ioctls_alsa_structs.h ++++ qemu-0.10.1/linux-user/ioctls_alsa_structs.h @@ -0,0 +1,1740 @@ +/* + * Advanced Linux Sound Architecture @@ -2224,26 +2225,30 @@ Index: qemu/linux-user/ioctls.h +{ + unsigned char *code; +}; ---- qemu/linux-user/syscall_defs.h -+++ qemu/linux-user/syscall_defs.h -@@ -1875,3 +1875,4 @@ +--- qemu-0.10.1/linux-user/syscall_defs.h ++++ qemu-0.10.1/linux-user/syscall_defs.h +@@ -2001,6 +2001,7 @@ #include "socket.h" #include "errno_defs.h" +#include "ioctls_alsa_structs.h" ---- qemu/linux-user/syscall_types.h -+++ qemu/linux-user/syscall_types.h -@@ -79,3 +79,8 @@ - STRUCT(mixer_info, - MK_ARRAY(TYPE_CHAR, 16), MK_ARRAY(TYPE_CHAR, 32), TYPE_INT, MK_ARRAY(TYPE_INT, 10)) + struct target_ipc64_perm + { +--- qemu-0.10.1/linux-user/syscall_types.h ++++ qemu-0.10.1/linux-user/syscall_types.h +@@ -114,3 +114,9 @@ + STRUCT(mtget, TYPE_LONG, TYPE_LONG, TYPE_LONG, TYPE_LONG, TYPE_LONG, + TYPE_INT, TYPE_INT) + STRUCT(mtpos, TYPE_LONG) + +/* FIXME: including these on x86 / x86_64 breaks qemu-i386 */ +#ifdef __powerpc__ +#include "syscall_types_alsa.h" +#endif ---- qemu/linux-user/syscall_types_alsa.h -+++ qemu/linux-user/syscall_types_alsa.h ++ +--- qemu-0.10.1/linux-user/syscall_types_alsa.h ++++ qemu-0.10.1/linux-user/syscall_types_alsa.h @@ -0,0 +1,1337 @@ +/* + * Advanced Linux Sound Architecture diff --git a/qemu.changes b/qemu.changes index 9bf0bf21..6ee26fe5 100644 --- a/qemu.changes +++ b/qemu.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Apr 16 01:53:59 CEST 2009 - ro@suse.de + +- buildfix: refresh patches + ------------------------------------------------------------------- Fri Mar 27 12:20:21 CET 2009 - crrodriguez@suse.de diff --git a/qemu.spec b/qemu.spec index 9223fcfc..7ad789d9 100644 --- a/qemu.spec +++ b/qemu.spec @@ -25,7 +25,7 @@ License: BSD 3-Clause; GPL v2 or later; LGPL v2.1 or later; X11/MIT Group: System/Emulators/PC Summary: Universal CPU emulator Version: 0.10.1 -Release: 1 +Release: 2 Source: %name-%version.tar.bz2 Patch1: qemu-0.9.0.cvs-binfmt.patch Patch6: qemu-0.7.0-amd64.patch @@ -161,6 +161,8 @@ rm -rf ${RPM_BUILD_ROOT} %endif %changelog +* Thu Apr 16 2009 ro@suse.de +- buildfix: refresh patches * Fri Mar 27 2009 crrodriguez@suse.de - BuildRequire zlib-devel-static * Tue Mar 24 2009 uli@suse.de @@ -411,7 +413,7 @@ rm -rf ${RPM_BUILD_ROOT} - added NWFPE glue code fix * Tue Mar 07 2006 schwab@suse.de - More fixes for ia64 port. -* Mon Mar 06 2006 schwab@suse.de +* Tue Mar 07 2006 schwab@suse.de - Remove obsolete hunk from ia64 patch. * Wed Jan 25 2006 mls@suse.de - converted neededforbuild to BuildRequires