[SCM] ffmpeg/experimental: Disable libssh on sparc due to #790067.

aca-guest at users.alioth.debian.org aca-guest at users.alioth.debian.org
Thu Jul 9 22:22:01 UTC 2015


The following commit has been merged in the experimental branch:
commit 54e1b59259a127a93c59daf6fcd59b7cbd548143
Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Date:   Wed Jul 8 23:18:28 2015 +0200

    Disable libssh on sparc due to #790067.

diff --git a/debian/control b/debian/control
index 2e7e42a..20e7b77 100644
--- a/debian/control
+++ b/debian/control
@@ -100,7 +100,7 @@ Build-Depends:
 # --enable-libspeex
  libspeex-dev,
 # --enable-libssh
- libssh-gcrypt-dev,
+ libssh-gcrypt-dev [!sparc],
 # --enable-libtheora
  libtheora-dev,
 # --enable-libtwolame
diff --git a/debian/rules b/debian/rules
index 9a41d23..abf605b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -86,7 +86,6 @@ CONFIG := --prefix=/usr \
 	--enable-libschroedinger \
 	--enable-libshine \
 	--enable-libspeex \
-	--enable-libssh \
 	--enable-libtheora \
 	--enable-libtwolame \
 	--enable-libvorbis \
@@ -129,6 +128,11 @@ ifneq ($(DEB_HOST_ARCH_OS),hurd)
 	CONFIG += --enable-libzmq
 endif
 
+# libssh is not available on sparc due to #790067.
+ifneq ($(DEB_HOST_ARCH),sparc)
+	CONFIG += --enable-libssh
+endif
+
 # Some libraries are not available on x32.
 ifneq ($(DEB_HOST_ARCH),x32)
 	CONFIG += --enable-frei0r \

-- 
ffmpeg packaging



More information about the pkg-multimedia-commits mailing list