[SCM] libav/master: Revert "Revert "temporarily disable opencv to work around dependency troubles""

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sat May 5 09:07:41 UTC 2012


The following commit has been merged in the master branch:
commit 19ddb65a4b35999c1e03b74bc7393e81bf80f744
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat May 5 10:59:29 2012 +0200

    Revert "Revert "temporarily disable opencv to work around dependency troubles""
    
    We need to keep opencv disabled until it has built on all
    architectures. After it has built on all architectures, we can enable it again.
    
    This reverts commit 2c84cb0fe83e14dc94653da48b7baa201eafe38d.
    
    Closes: #671302

diff --git a/debian/confflags b/debian/confflags
index 6c78316..49b5cac 100644
--- a/debian/confflags
+++ b/debian/confflags
@@ -103,7 +103,6 @@ confflags += --enable-frei0r
 confflags += --enable-gnutls
 confflags += --enable-libcdio
 confflags += --enable-libgsm
-confflags += --enable-libopencv
 confflags += --enable-libschroedinger
 confflags += --enable-libspeex
 confflags += --enable-libtheora
diff --git a/debian/control b/debian/control
index 7157b9e..bee330c 100644
--- a/debian/control
+++ b/debian/control
@@ -24,7 +24,6 @@ Build-Depends:
  libcdio-cdda-dev,
  libcdio-dev,
  libcdio-paranoia-dev,
- libcv-dev,
  libdc1394-22-dev [linux-any],
  libdirac-dev,
  libfreetype6-dev,
@@ -35,7 +34,6 @@ Build-Depends:
  libmp3lame-dev,
  libopencore-amrnb-dev,
  libopencore-amrwb-dev,
- libopencv-dev,
  libopenjpeg-dev,
  libpulse-dev,
  libraw1394-dev [linux-any],

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list