[SCM] gmerlin/master: Disable esound plugin

[fsateler at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 0cca83f6028ab1d05af62605d6e501f57e326837
Author: Felipe Sateler <fsateler at debian.org>
Date:   Mon Jul 11 12:10:51 2016 -0400

    Disable esound plugin
    
    In debian, esound goes through pulseaudio and there is already a pulse plugin

diff --git a/debian/control b/debian/control
index 18c107e..4c033fa 100644
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,6 @@ Build-Depends:
  libasound2-dev [linux-any],
  libcddb2-dev,
  libcdio-paranoia-dev,
- libesd0-dev,
  libexif-dev,
  libfreetype6-dev,
  libgavl-dev (>= 1.4.0),
diff --git a/debian/control.in b/debian/control.in
index b1603ee..9584921 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -15,7 +15,6 @@ Build-Depends:
  libasound2-dev [linux-any],
  libcddb2-dev,
  libcdio-paranoia-dev,
- libesd0-dev,
  libexif-dev,
  libfreetype6-dev,
  libgavl-dev (>= 1.4.0),
diff --git a/debian/rules b/debian/rules
index 71b0563..b61622c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -46,6 +46,7 @@ DEB_DH_STRIP_ARGS := --ddeb-migration='gmerlin-dbg (<< 1.2.0~dfsg+1-5)'
 DEB_CONFIGURE_EXTRA_FLAGS := --docdir=\$${prefix}/share/doc/libgmerlin-doc \
  --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
  --enable-static=no \
+ --disable-esd \
  --with-cpuflags=none
 DEB_DH_MAKESHLIBS_ARGS_ALL := -- -v$(DEB_UPSTREAM_VERSION)
 

-- 
gmerlin packaging