[Pkg-alsa-devel] [Debian ALSA CVS] debian/alsa-driver/debian (5 files)
Steve Kowalik
stevenk@haydn.debian.org
Mon Aug 30 08:35:42 UTC 2004
Date: Sunday, August 29, 2004 @ 19:35:42
Author: stevenk
Path: /cvsroot/pkg-alsa/debian/alsa-driver/debian
Modified: changelog patches/04_make_minus_j_fix.dpatch
patches/09_alpha_build_fixes.dpatch
patches/10_disable_gcc_version_check1.dpatch
patches/15_es18xx_filter_fix.dpatch
Fix up patches 4, 9, part 1 of 10 and 15 to apply cleanly.
----------------------------------------------+
changelog | 3 ++-
patches/04_make_minus_j_fix.dpatch | 6 +++---
patches/09_alpha_build_fixes.dpatch | 10 +++++-----
patches/10_disable_gcc_version_check1.dpatch | 4 ++--
patches/15_es18xx_filter_fix.dpatch | 2 +-
5 files changed, 13 insertions(+), 12 deletions(-)
Index: debian/alsa-driver/debian/changelog
diff -u debian/alsa-driver/debian/changelog:1.262 debian/alsa-driver/debian/changelog:1.263
--- debian/alsa-driver/debian/changelog:1.262 Sun Aug 29 19:09:15 2004
+++ debian/alsa-driver/debian/changelog Sun Aug 29 19:35:41 2004
@@ -6,6 +6,7 @@
itself. (Closes: #268041)
- Sleep for five seconds before running alsactl restore.
(Closes: #268221)
+ - Fix up patches #4, #9, #10 and #15 to apply cleanly.
- Include a bunch of new cards in alsa-source's debconf prompting:
+ atiixp-modem: PCI: ATI IXP 150/200/250 Modem
+ cs46xx-new-dsp: Cirrus Logic (Sound Fusion) New DSP support
@@ -21,7 +22,7 @@
Carlos Galisteo)
* Unreleased.
- -- Steve Kowalik <stevenk@debian.org> Mon, 30 Aug 2004 10:57:51 +1000
+ -- Steve Kowalik <stevenk@debian.org> Mon, 30 Aug 2004 11:28:54 +1000
alsa-driver (1.0.5a-3) unstable; urgency=low
Index: debian/alsa-driver/debian/patches/04_make_minus_j_fix.dpatch
diff -u debian/alsa-driver/debian/patches/04_make_minus_j_fix.dpatch:1.10 debian/alsa-driver/debian/patches/04_make_minus_j_fix.dpatch:1.11
--- debian/alsa-driver/debian/patches/04_make_minus_j_fix.dpatch:1.10 Tue Mar 2 07:24:12 2004
+++ debian/alsa-driver/debian/patches/04_make_minus_j_fix.dpatch Sun Aug 29 19:35:42 2004
@@ -25,7 +25,7 @@
--- alsa-driver/Rules.make~ 25 Dec 2003 03:02:30 -0000 1.12
+++ alsa-driver/Rules.make 30 Dec 2003 08:00:56 -0000
-@@ -264,7 +264,7 @@
+@@ -278,7 +278,7 @@
genksyms_smp_prefix :=
endif
@@ -34,7 +34,7 @@
@if [ ! -r $(MODINCL)/$(MODPREFIX)$*.stamp -o $(MODINCL)/$(MODPREFIX)$*.stamp -ot $< ]; then \
if [ ! -f $(CONFIG_SND_KERNELDIR)/include/linux/modules/$*.stamp ]; then \
echo '$(CC) -D__KERNEL__ $(CFLAGS) $(EXTRA_CFLAGS) -E -D__GENKSYMS__ $<'; \
-@@ -285,7 +285,8 @@
+@@ -299,7 +299,8 @@
endif # export-objs
define update-sndvers
@@ -44,7 +44,7 @@
echo "#define _LINUX_SNDVERSIONS_H"; \
echo "#include <linux/modsetver.h>"; \
cd $(TOPDIR)/include/modules; \
-@@ -293,14 +294,14 @@
+@@ -307,14 +308,14 @@
if [ -f $$f ]; then echo "#include \"modules/$${f}\""; fi; \
done; \
echo "#endif"; \
Index: debian/alsa-driver/debian/patches/09_alpha_build_fixes.dpatch
diff -u debian/alsa-driver/debian/patches/09_alpha_build_fixes.dpatch:1.4 debian/alsa-driver/debian/patches/09_alpha_build_fixes.dpatch:1.5
--- debian/alsa-driver/debian/patches/09_alpha_build_fixes.dpatch:1.4 Thu Jun 12 06:44:17 2003
+++ debian/alsa-driver/debian/patches/09_alpha_build_fixes.dpatch Sun Aug 29 19:35:42 2004
@@ -27,7 +27,7 @@
--- alsa-driver/isa/msnd/msnd_pinnacle.c~ 23 Apr 2003 10:01:18 -0000 1.1.1.2
+++ alsa-driver/isa/msnd/msnd_pinnacle.c 14 May 2003 13:02:29 -0000
-@@ -421,7 +421,7 @@
+@@ -422,7 +422,7 @@
#endif
#ifdef CONFIG_SND_DEBUG0
{
@@ -36,7 +36,7 @@
printk( "%08X: P %X\n", (unsigned)jiffies, xx);
}
#endif
-@@ -940,7 +940,7 @@
+@@ -941,7 +941,7 @@
snd_msnd_enable_irq( &dev);
runtime->dma_area = dev.mappedbase;
@@ -45,7 +45,7 @@
runtime->dma_bytes = 0x3000;
dpcm->timer.data = (unsigned long) dpcm;
-@@ -992,13 +992,13 @@
+@@ -993,13 +993,13 @@
/* stuff i used to get it basically making noise:
{
double phase = 0.0;
@@ -62,7 +62,7 @@
0,
0x2400, &phase, 4, dev.play_sample_rate);
}*/
-@@ -1068,7 +1068,7 @@
+@@ -1069,7 +1069,7 @@
/* with the following mess i tried to generate a more precise pointer position
* it generated errors with the alsa framework i could not resolve.....
//int pos = dev.playDMAPos;
@@ -71,7 +71,7 @@
ljiffies = (unsigned)jiffies;
int diff;
if( -1 == played_bytes){
-@@ -1280,13 +1280,13 @@
+@@ -1281,13 +1281,13 @@
}
request_region(dev.io, dev.numio, dev.name);
Index: debian/alsa-driver/debian/patches/10_disable_gcc_version_check1.dpatch
diff -u debian/alsa-driver/debian/patches/10_disable_gcc_version_check1.dpatch:1.4 debian/alsa-driver/debian/patches/10_disable_gcc_version_check1.dpatch:1.5
--- debian/alsa-driver/debian/patches/10_disable_gcc_version_check1.dpatch:1.4 Tue Apr 13 13:58:44 2004
+++ debian/alsa-driver/debian/patches/10_disable_gcc_version_check1.dpatch Sun Aug 29 19:35:42 2004
@@ -28,7 +28,7 @@
diff -urNad /home/dbharris/source/debian/build/alsa-driver-1.0.4/configure.in alsa-driver-1.0.4/configure.in
--- /home/dbharris/source/debian/build/alsa-driver-1.0.4/configure.in 2004-04-13 15:43:16.000000000 -0400
+++ alsa-driver-1.0.4/configure.in 2004-04-13 15:44:05.000000000 -0400
-@@ -156,50 +156,50 @@
+@@ -157,50 +157,50 @@
AC_MSG_RESULT($kaversion)
dnl Check for GCC version...
@@ -123,7 +123,7 @@
dnl
dnl Test section, uncomment any of these double lines to verify the bellow code:
dnl
-@@ -218,85 +218,85 @@
+@@ -219,85 +219,85 @@
dnl kernel_compiler="gcc 2.95.3 20010315 (release)"
dnl my_compiler="2.95.3"
dnl
Index: debian/alsa-driver/debian/patches/15_es18xx_filter_fix.dpatch
diff -u debian/alsa-driver/debian/patches/15_es18xx_filter_fix.dpatch:1.1 debian/alsa-driver/debian/patches/15_es18xx_filter_fix.dpatch:1.2
--- debian/alsa-driver/debian/patches/15_es18xx_filter_fix.dpatch:1.1 Thu Sep 4 06:14:28 2003
+++ debian/alsa-driver/debian/patches/15_es18xx_filter_fix.dpatch Sun Aug 29 19:35:42 2004
@@ -26,7 +26,7 @@
--- alsa-driver/alsa-kernel/isa/es18xx.c 2003-08-05 00:19:21.000000000 +0200
+++ alsa-driver/alsa-kernel/isa/es18xx.c 2003-08-05 00:20:55.000000000 +0200
-@@ -422,6 +422,11 @@
+@@ -421,6 +421,11 @@
if ((chip->caps & ES18XX_PCM2) && mode == DAC2) {
snd_es18xx_mixer_write(chip, 0x70, bits);
More information about the Pkg-alsa-devel
mailing list