Bug#831582: Please re-enable libx264 on sparc64

[James Clarke]

Source: ffmpeg
Version: 7:3.1.1-2
Severity: normal
User: debian-sparc at lists.debian.org
Usertags: sparc64
X-Debbugs-Cc: debian-sparc at lists.debian.org
Tags: patch

Hi,
Now that libx264 is working again (a fixed linker is in the unreleased
suite, and is pinned on the buildds), ffmpeg can be compiled with
support from it on sparc64. Please apply the attached patch, which I
have verified works.

Regards,
James
-------------- next part --------------
From d78dca9ce9335025450d00b5c17969a88442e972 Mon Sep 17 00:00:00 2001
From: James Clarke <jrtc27 at jrtc27.com>
Date: Sun, 17 Jul 2016 11:20:20 +0100
Subject: [PATCH] Re-enable x264 on sparc64 as the linker has been fixed

See: #792921
---
 debian/control | 2 +-
 debian/rules   | 8 ++------
 2 files changed, 3 insertions(+), 7 deletions(-)

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.
-- 
2.8.1.369.geae769a

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 801 bytes
Desc: not available
URL: <http://lists.alioth.debian.org/pipermail/pkg-multimedia-maintainers/attachments/20160717/1d22c8d0/attachment.sig>