From 70d3b0b3b47a553f148022b7f136c03522ea4d6b Mon Sep 17 00:00:00 2001 From: Jeremy Huddleston Date: Thu, 7 Oct 2004 20:35:04 +0000 Subject: [PATCH] Added patch to make emu10k1 passthrough work. Closes bug #66635. --- media-sound/alsa-driver/ChangeLog | 6 +++++- media-sound/alsa-driver/Manifest | 15 +++++++++++++-- media-sound/alsa-driver/alsa-driver-1.0.6a.ebuild | 3 ++- .../alsa-driver-1.0.6a-emu10k1-passthrough.patch | 12 ++++++++++++ 4 files changed, 32 insertions(+), 4 deletions(-) create mode 100644 media-sound/alsa-driver/files/alsa-driver-1.0.6a-emu10k1-passthrough.patch diff --git a/media-sound/alsa-driver/ChangeLog b/media-sound/alsa-driver/ChangeLog index 54723699b8ce..e3ae8102d0bf 100644 --- a/media-sound/alsa-driver/ChangeLog +++ b/media-sound/alsa-driver/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-sound/alsa-driver # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/ChangeLog,v 1.94 2004/09/22 09:32:22 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/ChangeLog,v 1.95 2004/10/07 20:35:04 eradicator Exp $ + + 07 Oct 2004; Jeremy Huddleston + +files/alsa-driver-1.0.6a-emu10k1-passthrough.patch: + Added patch to make emu10k1 passthrough work. Closes bug #66635. 22 Sep 2004; Jeremy Huddleston : Stable amd64, x86. Fixed build process to work on newer 2.6 kernels without diff --git a/media-sound/alsa-driver/Manifest b/media-sound/alsa-driver/Manifest index 5b410d261289..f3a0a8ef4e34 100644 --- a/media-sound/alsa-driver/Manifest +++ b/media-sound/alsa-driver/Manifest @@ -1,12 +1,15 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + MD5 44e635624b5b5e133fa8a786eebcda66 alsa-driver-0.5.12a.ebuild 1596 MD5 a5d38aa495772a8d5208b6962bee299b alsa-driver-0.9.0_rc2.ebuild 2611 MD5 7a2a32703f93af22aa6554bb5bb10b93 alsa-driver-0.9.2.ebuild 2685 MD5 d388a1b0706024ddccccc99045b976f9 alsa-driver-0.9.8.ebuild 2341 MD5 e5de43659b629d1e9f0ee8d3f1864840 alsa-driver-1.0.3.ebuild 3363 -MD5 0044afd671e767292881e7826818315a ChangeLog 16417 +MD5 36ae59296a2da95baf35d5db998d9afd ChangeLog 16598 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158 MD5 9f0283e4e9611766ad3110532d4976d7 alsa-driver-1.0.5a.ebuild 3603 -MD5 4a9787ae835aa5549fa22808e878b293 alsa-driver-1.0.6a.ebuild 3594 +MD5 00ed9680bf41723b3386d0008e132de4 alsa-driver-1.0.6a.ebuild 3653 MD5 038c19b8373300acfa319a0e6c73fb52 files/alsasound 4611 MD5 45f2cf526eaa8ff274ac6876f15302d1 files/alsa 518 MD5 87448a6155eb013f2b14e4a531ffc25a files/alsa-driver-0.9.0rc1-ppc.patch 358 @@ -22,7 +25,15 @@ MD5 439dab13c036317c9b308b234ecf7290 files/digest-alsa-driver-0.9.8 71 MD5 e1b13905eac70fe728dcb85fcaac27a9 files/digest-alsa-driver-1.0.6a 72 MD5 938a2ee36c54416322d1acd47b249c99 files/digest-alsa-driver-1.0.3 71 MD5 27684bd356b1a43809d3f8c847a6abce files/alsa-driver-1.0.6a-kbuild.patch 575 +MD5 f9d35aa6adca1137e05b1cb8852ff672 files/alsa-driver-1.0.6a-emu10k1-passthrough.patch 658 MD5 27ccbe36406f145c1d63725a53517233 files/makefile.patch 1122 MD5 deb0bfd8e2cfe0ba434fb5a820294502 files/digest-alsa-driver-1.0.5a 72 MD5 a2ee6fa920bbac70835b4a58e5759e8c files/alsa-driver-1.0.5a-cs46xx-passthrough.patch 446 MD5 8bb31a005a1db2e306c51d017fd44e70 files/alsa-driver-1.0.5a-xbox-ac97.patch 721 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.2.6 (GNU/Linux) + +iD8DBQFBZaiyArHZZzCEUG0RAna7AJ4ximC9XE8X+A3PSo4yFfjpbE9D3gCfa7us +Sjj3xCtsXehLWPg0OH6HzRg= +=DsvS +-----END PGP SIGNATURE----- diff --git a/media-sound/alsa-driver/alsa-driver-1.0.6a.ebuild b/media-sound/alsa-driver/alsa-driver-1.0.6a.ebuild index 8dc23b92433f..fdfc749ab8a8 100644 --- a/media-sound/alsa-driver/alsa-driver-1.0.6a.ebuild +++ b/media-sound/alsa-driver/alsa-driver-1.0.6a.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-1.0.6a.ebuild,v 1.2 2004/09/22 09:32:22 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-1.0.6a.ebuild,v 1.3 2004/10/07 20:35:04 eradicator Exp $ inherit kernel-mod flag-o-matic eutils @@ -43,6 +43,7 @@ src_unpack() { cd ${S} epatch ${FILESDIR}/${PN}-1.0.5-devfix.patch epatch ${FILESDIR}/${PN}-1.0.5a-cs46xx-passthrough.patch + epatch ${FILESDIR}/${PN}-1.0.6a-emu10k1-passthrough.patch # SUBDIRS -> M epatch ${FILESDIR}/${P}-kbuild.patch diff --git a/media-sound/alsa-driver/files/alsa-driver-1.0.6a-emu10k1-passthrough.patch b/media-sound/alsa-driver/files/alsa-driver-1.0.6a-emu10k1-passthrough.patch new file mode 100644 index 000000000000..ca1fc66d3730 --- /dev/null +++ b/media-sound/alsa-driver/files/alsa-driver-1.0.6a-emu10k1-passthrough.patch @@ -0,0 +1,12 @@ +diff -uNr alsa-driver-1.0.6a.org/sound/pci/emu10k1/emupcm.c alsa-driver-1.0.6a/sound/pci/emu10k1/emupcm.c +--- alsa-driver-1.0.6a.org/sound/pci/emu10k1/emupcm.c 2004-10-08 04:14:23.722015224 +0800 ++++ alsa-driver-1.0.6a/sound/pci/emu10k1/emupcm.c 2004-10-08 04:15:47.318306656 +0800 +@@ -1185,7 +1185,7 @@ + } + snd_emu10k1_fx8010_playback_tram_poke1((unsigned short *)emu->fx8010.etram_pages.area + tram_pos, + (unsigned short *)emu->fx8010.etram_pages.area + tram_pos + tram_size / 2, +- src, frames, tram_shift++); ++ src, frames, tram_shift); + tram_pos -= frames; + pcm->tram_pos = tram_pos; + pcm->tram_shift = tram_shift; -- 2.26.2