[SCM] libav/ubuntu: Enable pulse support.

[siretart at users.alioth.debian.org]

The following commit has been merged in the ubuntu branch:
commit f67228d7abf1b51dbff9491bdfab13e15a310093
Author: Andres Mejia <amejia004 at gmail.com>
Date:   Sun Mar 18 16:04:45 2012 -0400

    Enable pulse support.
    
    (cherry picked from commit bd9e7a63fc132b240e8e9e70dfaffb962fc4c8d9)
    
    Conflicts:
    
    	debian/control

diff --git a/debian/confflags b/debian/confflags
index 9a3183a..5b66b03 100644
--- a/debian/confflags
+++ b/debian/confflags
@@ -126,6 +126,9 @@ confflags += $(extra_common_confflags)
 # vaapi is not available on s390 and on the hurd
 confflags += $(call cond_enable,/usr/include/va/va.h,vaapi)
 
+# pulse is not available on the hurd
+confflags += $(call cond_enable,/usr/include/pulse/simple.h,libpulse)
+
 # this part below is intended for the 'Libav' package in ubuntu/multiverse
 gpl_confflags += $(call cond_enable,/usr/include/dirac/libdirac_decoder/dirac_parser.h,libdirac)
 gpl_confflags += $(call cond_enable,/usr/include/lame/lame.h,libmp3lame)
diff --git a/debian/control b/debian/control
index e41b035..797623d 100644
--- a/debian/control
+++ b/debian/control
@@ -30,6 +30,7 @@ Build-Depends:
  libgsm1-dev,
  libimlib2-dev,
  libjack-dev [!hurd-i386],
+ libpulse-dev [!hurd-any],
  libraw1394-dev [linux-any],
  libschroedinger-dev,
  libsdl1.2-dev,

-- 
Libav/FFmpeg packaging