[SCM] ffmpeg/master: Re-enable x264 on sparc64 as the linker has been fixed

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 6bccb1079bcab6362413d69ff210ce4c030ca5b6
Author: James Clarke <jrtc27 at jrtc27.com>
Date:   Sun Jul 17 11:20:20 2016 +0100

    Re-enable x264 on sparc64 as the linker has been fixed
    
    See: #792921
    
    Signed-off-by: Sebastian Ramacher <sramacher at debian.org>

diff --git a/debian/control b/debian/control
index 56d6dd6..7006348 100644
--- a/debian/control
+++ b/debian/control
@@ -130,7 +130,7 @@ Build-Depends:
 # --enable-libwebp
  libwebp-dev,
 # --enable-libx264
- libx264-dev [!sparc64] <!stage1>,
+ libx264-dev <!stage1>,
 # --enable-libx265
  libx265-dev (>= 1.8),
 # --enable-x11grab
diff --git a/debian/rules b/debian/rules
index 6c4e655..7bdda7e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -138,12 +138,8 @@ ifneq ($(filter stage1,$(DEB_BUILD_PROFILES)),)
 else
 	CONFIG += --enable-frei0r \
 		--enable-chromaprint \
-		--enable-libopencv
-
-	# Some libraries are unusable (#792921) on sparc64.
-	ifeq (,$(filter $(DEB_HOST_ARCH),sparc64))
-		CONFIG += --enable-libx264
-	endif
+		--enable-libopencv \
+		--enable-libx264
 endif
 
 # Disable altivec optimizations on powerpc, because they are not always available on this architecture.

-- 
ffmpeg packaging