[SCM] vlc/master: Disable OSS on Linux (use ALSA instead).

[bdrung at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 714d69ee6df56f2815d4e673412986a0145c9579
Author: Benjamin Drung <bdrung at debian.org>
Date:   Sat Sep 6 20:31:13 2014 +0200

    Disable OSS on Linux (use ALSA instead).

diff --git a/debian/control b/debian/control
index 6260fb4..d9287f6 100644
--- a/debian/control
+++ b/debian/control
@@ -112,7 +112,7 @@ Build-Depends: autopoint,
                libxpm-dev,
                libzvbi-dev (>= 0.2.28),
                lua5.2,
-               oss4-dev,
+               oss4-dev [kfreebsd-any],
                pkg-config,
                zlib1g-dev
 Standards-Version: 3.9.5
diff --git a/debian/rules b/debian/rules
index 1bb1aeb..a3bdbd5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -179,16 +179,13 @@ endif
 # Hurd specific flags
 ifeq (,$(filter-out hurd,$(DEB_HOST_ARCH_OS)))
 confflags += \
-	--disable-oss \
 	--disable-vcd
 removeplugins += \
-	oss \
 	cdda \
 	vcd \
 	$(NULL)
 else
 confflags += \
-	--enable-oss \
 	--enable-vcd \
 	$(NULL)
 endif
@@ -210,6 +207,16 @@ confflags += --disable-v4l2
 removeplugins += libv4l2
 endif
 
+# kFreeBSD specific flags
+ifeq (,$(filter-out kfreebsd,$(DEB_HOST_ARCH_OS)))
+confflags += --enable-oss
+else
+# Note: Use ALSA on Linux instead of OSS.
+#       Ubuntu has disabled OSS support in their Linux kernel.
+confflags += --disable-oss
+removeplugins += oss
+endif
+
 # Linux amd64 and i386 specific flags
 ifeq (,$(filter-out amd64 i386,$(DEB_HOST_ARCH)))
 confflags += --enable-crystalhd

-- 
VLC media player packaging