[SCM] ffmpeg/master: Re-enable libsoxr as glibc bug #793641 is now fixed in testing.

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

The following commit has been merged in the master branch:
commit 12857ed87de62faeb6ca2c715516aa60042d5048
Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Date:   Sun Dec 20 17:43:31 2015 +0100

    Re-enable libsoxr as glibc bug #793641 is now fixed in testing.

diff --git a/debian/control b/debian/control
index ee6592b..9532312 100644
--- a/debian/control
+++ b/debian/control
@@ -100,7 +100,7 @@ Build-Depends:
 # --enable-libsnappy
  libsnappy-dev,
 # --enable-libsoxr
-# libsoxr-dev [!sparc64],
+ libsoxr-dev,
 # --enable-libspeex
  libspeex-dev,
 # --enable-libssh
diff --git a/debian/rules b/debian/rules
index 4fc6328..ea049ba 100755
--- a/debian/rules
+++ b/debian/rules
@@ -47,7 +47,6 @@ 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.
@@ -86,13 +85,13 @@ CONFIG := --prefix=/usr \
 	--enable-libmodplug \
 	--enable-libmp3lame \
 	--enable-libopenjpeg \
-	--enable-openal \
 	--enable-libopus \
 	--enable-libpulse \
 	--enable-librtmp \
 	--enable-libschroedinger \
 	--enable-libshine \
 	--enable-libsnappy \
+	--enable-libsoxr \
 	--enable-libspeex \
 	--enable-libssh \
 	--enable-libtheora \
@@ -104,6 +103,7 @@ CONFIG := --prefix=/usr \
 	--enable-libx265 \
 	--enable-libxvid \
 	--enable-libzvbi \
+	--enable-openal \
 	--enable-opengl \
 	--enable-x11grab
 

-- 
ffmpeg packaging