rpm/qemu
SHA256
1
0
Fork 0
forked from pool/qemu
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/qemu?expand=0&rev=30

Browse Source
This commit is contained in:
OBS User unknown 2009-04-16 00:19:01 +00:00 committed by Git OBS Bridge
parent a9eab62e5c
commit 5a52972728
3 changed files with 34 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
qemu-cvs-alsa_ioctl.patch
View File

@ -1,18 +1,19 @@
Index: qemu/linux-user/ioctls.h Index: qemu/linux-user/ioctls.h
================================================================================ ================================================================================
--- qemu/linux-user/ioctls.h --- qemu-0.10.1/linux-user/ioctls.h
+++ qemu/linux-user/ioctls.h +++ qemu-0.10.1/linux-user/ioctls.h
@@ -300,3 +300,8 @@ @@ -314,3 +314,9 @@
IOCTL(MTIOCTOP, IOC_W, MK_PTR(MK_STRUCT(STRUCT_mtop)))
IOCTL(VFAT_IOCTL_READDIR_BOTH, IOC_R, MK_PTR(MK_ARRAY(MK_STRUCT(STRUCT_dirent), 2))) IOCTL(MTIOCGET, IOC_R, MK_PTR(MK_STRUCT(STRUCT_mtget)))
IOCTL(VFAT_IOCTL_READDIR_SHORT, IOC_R, MK_PTR(MK_ARRAY(MK_STRUCT(STRUCT_dirent), 2))) IOCTL(MTIOCPOS, IOC_R, MK_PTR(MK_STRUCT(STRUCT_mtpos)))
+ +
+/* FIXME: including these on x86 / x86_64 breaks qemu-i386 */ +/* FIXME: including these on x86 / x86_64 breaks qemu-i386 */
+#ifdef __powerpc__ +#ifdef __powerpc__
+#include "ioctls_alsa.h" +#include "ioctls_alsa.h"
+#endif +#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 @@ @@ -0,0 +1,467 @@
+#define SNDRV_SEQ_IOCTL_PVERSION _IOR ('S', 0x00, int) +#define SNDRV_SEQ_IOCTL_PVERSION _IOR ('S', 0x00, int)
+#define SNDRV_SEQ_IOCTL_CLIENT_ID _IOR ('S', 0x01, 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( 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_BOOTB , IOC_RW, MK_PTR(MK_STRUCT(STRUCT_sscape_bootblock)) )
+IOCTL( SND_SSCAPE_LOAD_MCODE , IOC_W, MK_PTR(MK_STRUCT(STRUCT_sscape_microcode)) ) +IOCTL( SND_SSCAPE_LOAD_MCODE , IOC_W, MK_PTR(MK_STRUCT(STRUCT_sscape_microcode)) )
--- qemu/linux-user/ioctls_alsa_structs.h --- qemu-0.10.1/linux-user/ioctls_alsa_structs.h
+++ qemu/linux-user/ioctls_alsa_structs.h +++ qemu-0.10.1/linux-user/ioctls_alsa_structs.h
@@ -0,0 +1,1740 @@ @@ -0,0 +1,1740 @@
+/* +/*
+ * Advanced Linux Sound Architecture + * Advanced Linux Sound Architecture
@ -2224,26 +2225,30 @@ Index: qemu/linux-user/ioctls.h
+{ +{
+ unsigned char *code; + unsigned char *code;
+}; +};
--- qemu/linux-user/syscall_defs.h --- qemu-0.10.1/linux-user/syscall_defs.h
+++ qemu/linux-user/syscall_defs.h +++ qemu-0.10.1/linux-user/syscall_defs.h
@@ -1875,3 +1875,4 @@ @@ -2001,6 +2001,7 @@
#include "socket.h" #include "socket.h"
#include "errno_defs.h" #include "errno_defs.h"
+#include "ioctls_alsa_structs.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, struct target_ipc64_perm
MK_ARRAY(TYPE_CHAR, 16), MK_ARRAY(TYPE_CHAR, 32), TYPE_INT, MK_ARRAY(TYPE_INT, 10)) {
--- 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 */ +/* FIXME: including these on x86 / x86_64 breaks qemu-i386 */
+#ifdef __powerpc__ +#ifdef __powerpc__
+#include "syscall_types_alsa.h" +#include "syscall_types_alsa.h"
+#endif +#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 @@ @@ -0,0 +1,1337 @@
+/* +/*
+ * Advanced Linux Sound Architecture + * Advanced Linux Sound Architecture

5
qemu.changes
View File

@ -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 Fri Mar 27 12:20:21 CET 2009 - crrodriguez@suse.de

6
qemu.spec
View File

@ -25,7 +25,7 @@ License: BSD 3-Clause; GPL v2 or later; LGPL v2.1 or later; X11/MIT
Group: System/Emulators/PC Group: System/Emulators/PC
Summary: Universal CPU emulator Summary: Universal CPU emulator
Version: 0.10.1 Version: 0.10.1
Release: 1 Release: 2
Source: %name-%version.tar.bz2 Source: %name-%version.tar.bz2
Patch1: qemu-0.9.0.cvs-binfmt.patch Patch1: qemu-0.9.0.cvs-binfmt.patch
Patch6: qemu-0.7.0-amd64.patch Patch6: qemu-0.7.0-amd64.patch
@ -161,6 +161,8 @@ rm -rf ${RPM_BUILD_ROOT}
%endif %endif
%changelog %changelog
* Thu Apr 16 2009 ro@suse.de
- buildfix: refresh patches
* Fri Mar 27 2009 crrodriguez@suse.de * Fri Mar 27 2009 crrodriguez@suse.de
- BuildRequire zlib-devel-static - BuildRequire zlib-devel-static
* Tue Mar 24 2009 uli@suse.de * Tue Mar 24 2009 uli@suse.de
@ -411,7 +413,7 @@ rm -rf ${RPM_BUILD_ROOT}
- added NWFPE glue code fix - added NWFPE glue code fix
* Tue Mar 07 2006 schwab@suse.de * Tue Mar 07 2006 schwab@suse.de
- More fixes for ia64 port. - 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. - Remove obsolete hunk from ia64 patch.
* Wed Jan 25 2006 mls@suse.de * Wed Jan 25 2006 mls@suse.de
- converted neededforbuild to BuildRequires - converted neededforbuild to BuildRequires