Hi,

I do not understand why the maintainer would need help with a patch to 
implement this. He knows the package better than anyone and this is very 
trivial...

Anyway, here is a patch. Do you have an idea if it will be applied soon ? In 
this case, we could coordinate with a corresponding upload of oss4 and have a 
better state for this in squeeze..


Romain
diff -urN alsa-driver-1.0.21+dfsg/debian/changelog alsa-driver-1.0.21+dfsg~oss4/debian/changelog
--- alsa-driver-1.0.21+dfsg/debian/changelog	2010-04-12 14:50:22.000000000 +0200
+++ alsa-driver-1.0.21+dfsg~oss4/debian/changelog	2010-04-12 14:50:15.000000000 +0200
@@ -1,3 +1,10 @@
+alsa-driver (1.0.21+dfsg-3) unstable; urgency=low
+
+  [ Romain Beauxis ]
+  * Added option for OSS4
+
+ -- Romain Beauxis <[email protected]>  Mon, 12 Apr 2010 14:49:47 +0200
+
 alsa-driver (1.0.21+dfsg-2) unstable; urgency=low
 
   [ Elimar Rieseieter ]
diff -urN alsa-driver-1.0.21+dfsg/debian/control alsa-driver-1.0.21+dfsg~oss4/debian/control
--- alsa-driver-1.0.21+dfsg/debian/control	2010-04-12 14:50:22.000000000 +0200
+++ alsa-driver-1.0.21+dfsg~oss4/debian/control	2010-04-12 14:50:15.000000000 +0200
@@ -13,7 +13,7 @@
 Package: linux-sound-base
 Architecture: all
 Depends: ${misc:Depends}, module-init-tools (>= 3.2.1)
-Suggests: alsa-base (>= 1.0.18-1)
+Suggests: alsa-base (>= 1.0.18-1), oss4-modules
 Conflicts: alsa-base (<= 1.0.8-7)
 Replaces: alsa-base (<= 1.0.8-7)
 Description: base package for ALSA and OSS sound systems
diff -urN alsa-driver-1.0.21+dfsg/debian/linux-sound-base.config alsa-driver-1.0.21+dfsg~oss4/debian/linux-sound-base.config
--- alsa-driver-1.0.21+dfsg/debian/linux-sound-base.config	2010-04-12 14:50:22.000000000 +0200
+++ alsa-driver-1.0.21+dfsg~oss4/debian/linux-sound-base.config	2010-04-12 14:50:15.000000000 +0200
@@ -15,6 +15,11 @@
 	&& [ -f /etc/modprobe.d/linux-sound-base_noALSA.conf ]
 then
 	db_set linux-sound-base/sound_system OSS || :
+elif \
+	[ -f /etc/modprobe.d.d/linux-sound-base_noOSS.conf ] \
+	&& [ -f /etc/modprobe.d/linux-sound-base_noALSA.conf ]
+then
+	db_set linux-sound-base/sound_system OSS4 || :
 fi
 
 db_input low linux-sound-base/sound_system || :
diff -urN alsa-driver-1.0.21+dfsg/debian/linux-sound-base.postinst alsa-driver-1.0.21+dfsg~oss4/debian/linux-sound-base.postinst
--- alsa-driver-1.0.21+dfsg/debian/linux-sound-base.postinst	2010-04-12 14:50:22.000000000 +0200
+++ alsa-driver-1.0.21+dfsg~oss4/debian/linux-sound-base.postinst	2010-04-12 14:50:15.000000000 +0200
@@ -25,6 +25,11 @@
 		rm -f /etc/modprobe.d/linux-sound-base_noALSA
 		rm -f /etc/modprobe.d/linux-sound-base_noALSA.conf
 		;;
+	OSS4)
+		# Do not load both ALSA and (stock kernel) OSS
+		ln -sf /lib/linux-sound-base/noOSS.modprobe.conf /etc/modprobe.d/linux-sound-base_noOSS.conf
+		ln -sf /lib/linux-sound-base/noALSA.modprobe.conf /etc/modprobe.d/linux-sound-base_noALSA.conf
+		;;
 	default)
 		rm -f /etc/hotplug/blacklist.d/linux-sound-base_noOSS
 		rm -f /etc/discover.d/linux-sound-base_noOSS
diff -urN alsa-driver-1.0.21+dfsg/debian/linux-sound-base.templates alsa-driver-1.0.21+dfsg~oss4/debian/linux-sound-base.templates
--- alsa-driver-1.0.21+dfsg/debian/linux-sound-base.templates	2010-04-12 14:50:22.000000000 +0200
+++ alsa-driver-1.0.21+dfsg~oss4/debian/linux-sound-base.templates	2010-04-12 14:50:15.000000000 +0200
@@ -10,13 +10,13 @@
 Template: linux-sound-base/sound_system
 Type: select
 #flag:translate:3
-__Choices: ALSA, OSS, default
+__Choices: ALSA, OSS, OSS4, default
 Default: ALSA
 _Description: Sound system to use:
- ALSA and OSS are alternative systems of drivers for
+ ALSA, OSS and OSS4 are alternative systems of drivers for
  sound hardware.
  .
- Selecting ALSA or OSS will enforce the use of such a driver
+ Selecting one of them will enforce the use of such a driver
  even in cases where both drivers exist.
  .
  Choosing the "default" option will mean this decision is left to the
@@ -24,4 +24,4 @@
  Removing the linux-sound-base package effectively puts the system
  into "default" mode.
  .
- Choosing the ALSA sound system is strongly recommended.
+ Choosing the ALSA sound system is recommended for simple users.

Reply via email to