[SCM] libav/master: Disable opencv filter because of #737584

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Wed Feb 5 00:16:43 UTC 2014


The following commit has been merged in the master branch:
commit 62a187277bd34d216c6d37c152432c1791cad13c
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Feb 4 02:06:12 2014 +0000

    Disable opencv filter because of #737584

diff --git a/debian/confflags b/debian/confflags
index 1abf757..be9c5b4 100644
--- a/debian/confflags
+++ b/debian/confflags
@@ -122,7 +122,8 @@ confflags += $(call cond_enable,/usr/include/gnutls/gnutls.h,gnutls)
 confflags += $(call cond_enable,/usr/include/gsm/gsm.h,libgsm)
 confflags += $(call cond_enable,/usr/include/lame/lame.h,libmp3lame)
 confflags += $(call cond_enable,/usr/include/librtmp/http.h,librtmp)
-confflags += $(call cond_enable,/usr/include/opencv/cv.hpp,libopencv)
+# disabled because of #737584
+#confflags += $(call cond_enable,/usr/include/opencv/cv.hpp,libopencv)
 confflags += $(call cond_enable,/usr/include/openjpeg.h,libopenjpeg)
 confflags += $(call cond_enable,/usr/include/opus/opus.h,libopus)
 confflags += $(call cond_enable,/usr/include/pulse/simple.h,libpulse)
diff --git a/debian/control b/debian/control
index 09696f6..84fa523 100644
--- a/debian/control
+++ b/debian/control
@@ -31,7 +31,6 @@ Build-Depends:
  libmp3lame-dev,
  libopencore-amrnb-dev,
  libopencore-amrwb-dev,
- libopencv-dev,
  libopenjpeg-dev,
  libopus-dev (>= 1.0.1),
  libpulse-dev,

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list