[SCM] ffmpeg/master: Disable libdc1394 on sparc64, because it links against the broken due to #790560 libudev1.

aca-guest at users.alioth.debian.org aca-guest at users.alioth.debian.org
Tue Sep 15 23:03:21 UTC 2015


The following commit has been merged in the master branch:
commit 2267aaa47d4b3498c89447df719952ff9a51d773
Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Date:   Tue Sep 15 21:37:29 2015 +0200

    Disable libdc1394 on sparc64, because it links against the broken due to #790560 libudev1.

diff --git a/debian/control b/debian/control
index 0f11c74..9448b61 100644
--- a/debian/control
+++ b/debian/control
@@ -40,7 +40,7 @@ Build-Depends:
 # autodetected 'crystalhd'
  libcrystalhd-dev [amd64 i386],
 # --enable-libdc1394
- libdc1394-22-dev [linux-any],
+ libdc1394-22-dev [!kfreebsd-any !hurd-any !sparc64],
 # --enable-libfontconfig
  libfontconfig1-dev,
 # --enable-libfreetype
diff --git a/debian/rules b/debian/rules
index ffc7c3a..38ff977 100755
--- a/debian/rules
+++ b/debian/rules
@@ -125,8 +125,11 @@ endif
 
 # Some libraries are build only on linux.
 ifeq ($(DEB_HOST_ARCH_OS),linux)
-	CONFIG += --enable-libdc1394 \
-	--enable-libiec61883
+	CONFIG += --enable-libiec61883
+	# Some libraries are not available/unusable (#790560) on sparc64.
+	ifeq (,$(filter $(DEB_HOST_ARCH),sparc64))
+		CONFIG += --enable-libdc1394
+	endif
 endif
 
 # Some libraries are not build on hurd.

-- 
ffmpeg packaging



More information about the pkg-multimedia-commits mailing list