[SCM] ffmpeg/master: Re-enable libdc1394 on sparc64, as libudev is working again.

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

The following commit has been merged in the master branch:
commit b33bb5354a4ee50700574aaba1b37cb8bddea0ab
Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Date:   Thu Nov 12 23:46:31 2015 +0100

    Re-enable libdc1394 on sparc64, as libudev is working again.
    
    See bug #803474 for details of the problems with the gold linker on sparc.

diff --git a/debian/control b/debian/control
index 6789f74..9ef75d5 100644
--- a/debian/control
+++ b/debian/control
@@ -43,7 +43,7 @@ Build-Depends:
 # autodetected 'crystalhd'
  libcrystalhd-dev [amd64 i386],
 # --enable-libdc1394
- libdc1394-22-dev [!kfreebsd-any !hurd-any !sparc64],
+ libdc1394-22-dev [linux-any],
 # --enable-libfontconfig
  libfontconfig1-dev,
 # --enable-libfreetype
diff --git a/debian/rules b/debian/rules
index 49ba199..4a5a50b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -127,11 +127,8 @@ endif
 
 # Some libraries are build only on linux.
 ifeq ($(DEB_HOST_ARCH_OS),linux)
-	CONFIG += --enable-libiec61883
-	# Some libraries are not available/unusable (#790560) on sparc64.
-	ifeq (,$(filter $(DEB_HOST_ARCH),sparc64))
-		CONFIG += --enable-libdc1394
-	endif
+	CONFIG += --enable-libdc1394 \
+		--enable-libiec61883
 endif
 
 # Some libraries are not build on hurd.

-- 
ffmpeg packaging