[SCM] mplayer/master.experimental: Select oss as default audio output module on kFreeBSD, Closes: #598431

[siretart at users.alioth.debian.org]

The following commit has been merged in the master.experimental branch:
commit 6664e6ffc09adebc447dabbfa48d9349877be2dd
Author: Robert Millan <rmh at debian.org>
Date:   Wed Aug 17 17:56:37 2011 +0200

    Select oss as default audio output module on kFreeBSD, Closes: #598431

diff --git a/debian/mplayer.conf b/debian/mplayer.conf
index 9e49dfb..b04119a 100644
--- a/debian/mplayer.conf
+++ b/debian/mplayer.conf
@@ -67,8 +67,8 @@
 # audio settings #
 ##################
 
-# Use pulse, then alsa, then SDL video with the aalib subdriver by default.
-ao=pulse,alsa,sdl:aalib
+# Use pulse, then @SOUND_BACKEND@, then SDL video with the aalib subdriver by default.
+ao=pulse, at SOUND_BACKEND@,sdl:aalib
 
 # Use SDL audio driver with the esd subdriver by default.
 #ao = sdl:esd
diff --git a/debian/rules b/debian/rules
index 7b3abdd..b279b26 100755
--- a/debian/rules
+++ b/debian/rules
@@ -89,6 +89,9 @@ endif
 
 ifeq (linux,$(DEB_HOST_ARCH_OS))
     CONFIGURE_FLAGS += --enable-mga --enable-3dfx --enable-tdfxfb
+    sound_backend := alsa
+else
+    sound_backend := oss
 endif
 
 # See http://wiki.debian.org/Teams/Dpkg/DebianRules; #465282  and
@@ -118,6 +121,8 @@ debian/mplayer/usr/bin/mplayer debian/mencoder/usr/bin/mencoder:
 	$(MAKE) install-mencoder-man DESTDIR=$(CURDIR)/debian/mplayer
 	install -D -m 644 debian/mplayer.conf \
 	                  $(CURDIR)/debian/mplayer/etc/mplayer/mplayer.conf
+	sed -e "s/@SOUND_BACKEND@/$(sound_backend)/" -i \
+	                  $(CURDIR)/debian/mplayer/etc/mplayer/mplayer.conf
 
 
 # binaries already installed via build rules as we have to build several flavors

-- 
mplayer packaging