Date: Wed, 24 Nov 2004 22:31:43 -0600 From: "Conrad J. Sabatier" <conrads@cox.net> To: Mathew Kanner <mat@cnd.mcgill.ca> Cc: freebsd-multimedia@freebsd.org Subject: Re: [john@utzweb.net: Holy Crap! It WORKS!!!!! Re: MIDI test patch] Message-ID: <20041124223143.0fcfdd8e@dolphin.local.net> In-Reply-To: <20041119162747.GD25010@cnd.mcgill.ca> References: <20041119162747.GD25010@cnd.mcgill.ca>
next in thread | previous in thread | raw e-mail | index | archive | help
Mat, I'm getting several failed hunks applying midi2-patch-aug22.diff against the latest CURRENT sources (see output below). Could you possibly provide an updated set of diffs against CURRENT? Thanks! dolphin:root:/usr/src# patch -p0 < ~conrads/midi2-patch-aug22.diff Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |--- sys.freebsd/conf/files Tue Aug 17 22:05:53 2004 |+++ sys/conf/files Sun Aug 22 16:14:27 2004 -------------------------- Patching file sys/conf/files using Plan A... Hunk #1 succeeded at 1723 (offset -2 lines). Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |--- sys.freebsd/conf/kmod.mk Sat Aug 14 23:53:04 2004 |+++ sys/conf/kmod.mk Sun Aug 22 16:28:50 2004 -------------------------- Patching file sys/conf/kmod.mk using Plan A... Hunk #1 failed at 300. 1 out of 1 hunks failed--saving rejects to sys/conf/kmod.mk.rej Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |--- sys.freebsd/dev/sound/pci/cmi.c Fri Jul 16 03:59:27 2004 |+++ sys/dev/sound/pci/cmi.c Sun Aug 22 16:12:00 2004 -------------------------- Patching file sys/dev/sound/pci/cmi.c using Plan A... Hunk #1 succeeded at 48. Hunk #2 succeeded at 114. Hunk #3 succeeded at 560. Hunk #4 succeeded at 759. Hunk #5 succeeded at 882. Hunk #6 succeeded at 943. Hunk #7 succeeded at 1024. Hunk #8 succeeded at 1100. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |--- sys.freebsd/dev/sound/pci/emu10k1.c Sat Jul 24 15:30:23 2004 |+++ sys/dev/sound/pci/emu10k1.c Sun Aug 22 16:56:15 2004 -------------------------- Patching file sys/dev/sound/pci/emu10k1.c using Plan A... Hunk #1 failed at 35. Hunk #2 succeeded at 68. Hunk #3 succeeded at 140. Hunk #4 succeeded at 1065. Hunk #5 succeeded at 1163. Hunk #6 succeeded at 1887. Hunk #7 succeeded at 1938. Hunk #8 succeeded at 2028. Hunk #9 succeeded at 2107. 1 out of 9 hunks failed--saving rejects to sys/dev/sound/pci/emu10k1.c.rej Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |--- /dev/null Sun Aug 22 22:22:01 2004 |+++ sys/dev/sound/midi/midi.h Sun Aug 22 16:12:00 2004 -------------------------- (Creating file sys/dev/sound/midi/midi.h...) Patching file sys/dev/sound/midi/midi.h using Plan A... Hunk #1 succeeded at 1. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |--- /dev/null Sun Aug 22 22:22:01 2004 |+++ sys/dev/sound/midi/midiq.h Sun Aug 22 16:12:00 2004 -------------------------- (Creating file sys/dev/sound/midi/midiq.h...) Patching file sys/dev/sound/midi/midiq.h using Plan A... Hunk #1 succeeded at 1. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |--- /dev/null Sun Aug 22 22:22:01 2004 |+++ sys/dev/sound/midi/mpu401.h Sun Aug 22 16:12:00 2004 -------------------------- (Creating file sys/dev/sound/midi/mpu401.h...) Patching file sys/dev/sound/midi/mpu401.h using Plan A... Hunk #1 succeeded at 1. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |--- /dev/null Sun Aug 22 22:22:01 2004 |+++ sys/dev/sound/midi/sequencer.h Sun Aug 22 16:12:00 2004 -------------------------- (Creating file sys/dev/sound/midi/sequencer.h...) Patching file sys/dev/sound/midi/sequencer.h using Plan A... Hunk #1 succeeded at 1. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |--- /dev/null Sun Aug 22 22:22:01 2004 |+++ sys/dev/sound/midi/mpu_if.m Sun Aug 22 16:12:00 2004 -------------------------- (Creating file sys/dev/sound/midi/mpu_if.m...) Patching file sys/dev/sound/midi/mpu_if.m using Plan A... Hunk #1 succeeded at 1. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |--- /dev/null Sun Aug 22 22:22:01 2004 |+++ sys/dev/sound/midi/mpufoi_if.m Sun Aug 22 16:12:00 2004 -------------------------- (Creating file sys/dev/sound/midi/mpufoi_if.m...) Patching file sys/dev/sound/midi/mpufoi_if.m using Plan A... Hunk #1 succeeded at 1. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |--- /dev/null Sun Aug 22 22:22:01 2004 |+++ sys/dev/sound/midi/synth_if.m Sun Aug 22 16:12:00 2004 -------------------------- (Creating file sys/dev/sound/midi/synth_if.m...) Patching file sys/dev/sound/midi/synth_if.m using Plan A... Hunk #1 succeeded at 1. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |--- /dev/null Sun Aug 22 22:22:01 2004 |+++ sys/dev/sound/midi/midi.c Sun Aug 22 16:39:58 2004 -------------------------- (Creating file sys/dev/sound/midi/midi.c...) Patching file sys/dev/sound/midi/midi.c using Plan A... Hunk #1 succeeded at 1. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |--- /dev/null Sun Aug 22 22:22:01 2004 |+++ sys/dev/sound/midi/mpu401.c Sun Aug 22 16:12:00 2004 -------------------------- (Creating file sys/dev/sound/midi/mpu401.c...) Patching file sys/dev/sound/midi/mpu401.c using Plan A... Hunk #1 succeeded at 1. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |--- /dev/null Sun Aug 22 22:22:01 2004 |+++ sys/dev/sound/midi/sequencer.c Sun Aug 22 16:40:33 2004 -------------------------- (Creating file sys/dev/sound/midi/sequencer.c...) Patching file sys/dev/sound/midi/sequencer.c using Plan A... Hunk #1 succeeded at 1. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |--- sys.freebsd/modules/sound/Makefile Fri Jul 16 03:58:46 2004 |+++ sys/modules/sound/Makefile Sun Aug 22 22:18:12 2004 -------------------------- Patching file sys/modules/sound/Makefile using Plan A... Hunk #1 succeeded at 3. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |--- sys.freebsd/modules/sound/driver/cmi/Makefile Fri Feb 7 13:56:31 2003|+++ sys/modules/sound/driver/cmi/Makefile Sun Aug 22 16:33:58 2004-------------------------- Patching file sys/modules/sound/driver/cmi/Makefile using Plan A... Hunk #1 succeeded at 4. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |--- sys.freebsd/modules/sound/driver/emu10k1/Makefile Sun Jan 11 10:30:56 2004|+++ sys/modules/sound/driver/emu10k1/Makefile Sun Aug 22 16:57:21 2004-------------------------- Patching file sys/modules/sound/driver/emu10k1/Makefile using Plan A... Hunk #1 succeeded at 5. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |--- /dev/null Sun Aug 22 22:22:01 2004 |+++ sys/modules/sound/midi/Makefile Sun Aug 22 16:26:02 2004 -------------------------- (Creating file sys/modules/sound/midi/Makefile...) Patching file sys/modules/sound/midi/Makefile using Plan A... Hunk #1 succeeded at 1. done -- Conrad J. Sabatier <conrads@cox.net> -- "In Unix veritas"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20041124223143.0fcfdd8e>