[SCM] ffmpeg/master: Drop workaround for sparc, which is no Debian architecture anymore.
aca-guest at users.alioth.debian.org
aca-guest at users.alioth.debian.org
Tue Sep 15 23:03:20 UTC 2015
The following commit has been merged in the master branch:
commit df18f1438aaef9d726b4cbe2b154752be4c78e10
Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Date: Tue Sep 15 20:13:37 2015 +0200
Drop workaround for sparc, which is no Debian architecture anymore.
diff --git a/debian/control b/debian/control
index 81c2523..9a4af28 100644
--- a/debian/control
+++ b/debian/control
@@ -99,7 +99,7 @@ Build-Depends:
# --enable-libspeex
libspeex-dev,
# --enable-libssh
- libssh-gcrypt-dev [!sparc],
+ libssh-gcrypt-dev,
# --enable-libtheora
libtheora-dev,
# --enable-libtwolame
diff --git a/debian/rules b/debian/rules
index 81cecfc..4247d49 100755
--- a/debian/rules
+++ b/debian/rules
@@ -89,6 +89,7 @@ CONFIG := --prefix=/usr \
--enable-libschroedinger \
--enable-libshine \
--enable-libspeex \
+ --enable-libssh \
--enable-libtheora \
--enable-libtwolame \
--enable-libvorbis \
@@ -131,11 +132,6 @@ 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/unusable (#792921) on sparc64.
ifneq ($(DEB_HOST_ARCH),sparc64)
CONFIG += --enable-libx264
--
ffmpeg packaging
More information about the pkg-multimedia-commits
mailing list