diff --git a/qemu-cvs-alsa_ioctl.patch b/qemu-cvs-alsa_ioctl.patch index 1bfcfb89..4fe34c8b 100644 --- a/qemu-cvs-alsa_ioctl.patch +++ b/qemu-cvs-alsa_ioctl.patch @@ -15,7 +15,7 @@ Index: qemu/linux-user/ioctls_alsa.h =================================================================== --- /dev/null +++ qemu/linux-user/ioctls_alsa.h -@@ -0,0 +1,465 @@ +@@ -0,0 +1,467 @@ +#define SNDRV_SEQ_IOCTL_PVERSION _IOR ('S', 0x00, int) +#define SNDRV_SEQ_IOCTL_CLIENT_ID _IOR ('S', 0x01, int) +#define SNDRV_SEQ_IOCTL_SYSTEM_INFO _IOWR('S', 0x02, struct sndrv_seq_system_info) @@ -472,6 +472,7 @@ Index: qemu/linux-user/ioctls_alsa.h +IOCTL( SNDRV_HDSP_IOCTL_GET_VERSION , IOC_R, MK_PTR(MK_STRUCT(STRUCT_hdsp_version)) ) +IOCTL( SNDRV_HDSP_IOCTL_GET_MIXER , IOC_R, MK_PTR(MK_STRUCT(STRUCT_hdsp_mixer)) ) +IOCTL( SNDRV_HDSP_IOCTL_GET_9632_AEB , IOC_R, MK_PTR(MK_STRUCT(STRUCT_hdsp_9632_aeb)) ) ++#if 0 +IOCTL( SNDRV_SB_CSP_IOCTL_INFO , IOC_R, MK_PTR(MK_STRUCT(STRUCT_snd_sb_csp_info)) ) +IOCTL( SNDRV_SB_CSP_IOCTL_LOAD_CODE , IOC_W, MK_PTR(MK_STRUCT(STRUCT_snd_sb_csp_microcode)) ) +IOCTL( SNDRV_SB_CSP_IOCTL_UNLOAD_CODE , 0, TYPE_NULL ) @@ -479,6 +480,7 @@ Index: qemu/linux-user/ioctls_alsa.h +IOCTL( SNDRV_SB_CSP_IOCTL_STOP , 0, TYPE_NULL ) +IOCTL( SNDRV_SB_CSP_IOCTL_PAUSE , 0, TYPE_NULL ) +IOCTL( SNDRV_SB_CSP_IOCTL_RESTART , 0, TYPE_NULL ) ++#endif +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)) ) Index: qemu/linux-user/ioctls_alsa_structs.h diff --git a/qemu.changes b/qemu.changes index 663d7cc8..5b20b135 100644 --- a/qemu.changes +++ b/qemu.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Aug 9 16:39:10 CEST 2007 - olh@suse.de + +- disable some alsa SB ioctl declarations + ------------------------------------------------------------------- Mon Aug 6 22:35:06 CEST 2007 - olh@suse.de diff --git a/qemu.spec b/qemu.spec index ea6aa0d5..c4e90a3b 100644 --- a/qemu.spec +++ b/qemu.spec @@ -17,7 +17,7 @@ License: BSD 3-Clause, GPL v2 or later Group: System/Emulators/PC Summary: Universal CPU emulator Version: 0.9.0.cvs -Release: 13 +Release: 15 Source: %name-%version.tar.bz2 #Patch400: qemu-0.7.0-gcc4-dot-syms.patch #Patch401: qemu-0.8.0-gcc4-hacks.patch @@ -309,6 +309,8 @@ rm -rf %{gcc33tmp} %endif %changelog +* Thu Aug 09 2007 - olh@suse.de +- disable some alsa SB ioctl declarations * Mon Aug 06 2007 - olh@suse.de - remove inclusion of linux/compiler.h * Mon Jul 30 2007 - uli@suse.de