[SCM] ffmpeg/master: Disable libsoxr support to workaround glibc bug #793641.

[aca-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit d27d637f64b68ed977a0587135187a31611c575a
Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Date:   Mon Aug 17 22:44:50 2015 +0200

    Disable libsoxr support to workaround glibc bug #793641.

diff --git a/debian/control b/debian/control
index 2dab14f..35c6fc3 100644
--- a/debian/control
+++ b/debian/control
@@ -95,7 +95,7 @@ Build-Depends:
 # --enable-libshine
  libshine-dev (>= 3.0.0),
 # --enable-libsoxr
- libsoxr-dev [!sparc64],
+# libsoxr-dev [!sparc64],
 # --enable-libspeex
  libspeex-dev,
 # --enable-libssh
diff --git a/debian/rules b/debian/rules
index 4ebcf28..151fe65 100755
--- a/debian/rules
+++ b/debian/rules
@@ -46,6 +46,7 @@ FLAVORS = extra
 #   * --enable-libv4l2 [!hurd-any]: This is only needed for very old devices and may cause problems for others.
 #                                   Should anyone need it, using LD_PRELOAD pointing on libv4l2 has the same effect.
 #   * --enable-opencl [!hurd-any]:  This is considered an experimental API.
+#   * --enable-libsoxr:             This is disabled to workaround glibc bug #793641.
 # For the shared libraries there are several ways to build:
 #  * Without further option: This will have no compatibility with Libav, but some sonames clash. Therefore no good choice.
 #  * With --enable-incompatible-libav-abi, packages build against Libav would work with these libraries, but probably not the other way around.
@@ -137,8 +138,7 @@ endif
 
 # Some libraries are not available/unusable (#792921) on sparc64.
 ifneq ($(DEB_HOST_ARCH),sparc64)
-	CONFIG += --enable-libsoxr \
-	--enable-libx264
+	CONFIG += --enable-libx264
 endif
 
 # OpenCV is not available on some architectures.

-- 
ffmpeg packaging