From bf35e8f0ba169b1df5ac0f4201c253fe53aabc49 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 23 Apr 2019 21:38:30 -0500 Subject: [PATCH] qemu: drop fix-hda-recording.patch, appears applied upstream (across multiple commits, maybe?) --- .../virtualization/qemu/default.nix | 1 - .../qemu/fix-hda-recording.patch | 34 ------------------- 2 files changed, 35 deletions(-) delete mode 100644 pkgs/applications/virtualization/qemu/fix-hda-recording.patch diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 3034953f4b4..818f99b806e 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -78,7 +78,6 @@ stdenv.mkDerivation rec { ./fix-qemu-ga.patch ./9p-ignore-noatime.patch ] ++ optional nixosTestRunner ./force-uid0-on-9p.patch - ++ optional pulseSupport ./fix-hda-recording.patch ++ optionals stdenv.hostPlatform.isMusl [ (fetchpatch { url = https://raw.githubusercontent.com/alpinelinux/aports/2bb133986e8fa90e2e76d53369f03861a87a74ef/main/qemu/xattr_size_max.patch; diff --git a/pkgs/applications/virtualization/qemu/fix-hda-recording.patch b/pkgs/applications/virtualization/qemu/fix-hda-recording.patch deleted file mode 100644 index b4e21f4f347..00000000000 --- a/pkgs/applications/virtualization/qemu/fix-hda-recording.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/audio/paaudio.c b/audio/paaudio.c -index fea6071..c1169d4 100644 ---- a/audio/paaudio.c -+++ b/audio/paaudio.c -@@ -608,6 +608,7 @@ static int qpa_init_in(HWVoiceIn *hw, struct audsettings *as, void *drv_opaque) - { - int error; - pa_sample_spec ss; -+ pa_buffer_attr ba; - struct audsettings obt_as = *as; - PAVoiceIn *pa = (PAVoiceIn *) hw; - paaudio *g = pa->g = drv_opaque; -@@ -616,6 +617,12 @@ static int qpa_init_in(HWVoiceIn *hw, struct audsettings *as, void *drv_opaque) - ss.channels = as->nchannels; - ss.rate = as->freq; - -+ ba.fragsize = pa_frame_size (&ss) * g->conf.samples; -+ ba.maxlength = 5 * ba.fragsize; -+ ba.tlength = -1; -+ ba.prebuf = -1; -+ ba.minreq = -1; -+ - obt_as.fmt = pa_to_audfmt (ss.format, &obt_as.endianness); - - pa->stream = qpa_simple_new ( -@@ -625,7 +632,7 @@ static int qpa_init_in(HWVoiceIn *hw, struct audsettings *as, void *drv_opaque) - g->conf.source, - &ss, - NULL, /* channel map */ -- NULL, /* buffering attributes */ -+ &ba, /* buffering attributes */ - &error - ); - if (!pa->stream) {